diff --git a/www/squid/Makefile.inc b/www/squid/Makefile.inc index b5aec84314d..2b39e682662 100644 --- a/www/squid/Makefile.inc +++ b/www/squid/Makefile.inc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.inc,v 1.5 2014/04/21 23:37:55 sthen Exp $ +# $OpenBSD: Makefile.inc,v 1.6 2014/04/24 14:26:21 sthen Exp $ MULTI_PACKAGES= -main # -ntlm may come back with samba 4 @@ -24,13 +24,14 @@ HOMEPAGE= http://www.squid-cache.org/ # GPLv2+ PERMIT_PACKAGE_CDROM= Yes -WANTLIB += c m pthread stdc++ +WANTLIB += c m nettle pthread stdc++ WANTLIB-main += ${WANTLIB} crypto db execinfo ssl LIB_DEPENDS-main += ${LIB_DEPENDS} \ databases/db/v4 \ - devel/libexecinfo + devel/libexecinfo \ + security/libnettle SYSCONFDIR= ${BASESYSCONFDIR}/squid LOCALSTATEDIR= ${BASELOCALSTATEDIR}/squid @@ -107,10 +108,14 @@ WANTLIB-ldap += ${WANTLIB} crypto lber-2.4 ldap-2.4 sasl2 ssl .endif #RUN_DEPENDS-ntlm= net/samba,ads ${BASE_PKGPATH} +#LIB_DEPENDS-ntlm += security/libnettle #WANTLIB-ntlm += ${WANTLIB} post-patch: - cd ${WRKSRC}; AUTOCONF_VERSION=${AUTOCONF_VERSION} AUTOMAKE_VERSION=${AUTOMAKE_VERSION} LOCALBASE=${LOCALBASE} ./bootstrap.sh + cd ${WRKSRC}; \ + AUTOCONF_VERSION=${AUTOCONF_VERSION} \ + AUTOMAKE_VERSION=${AUTOMAKE_VERSION} \ + LOCALBASE=${LOCALBASE} ./bootstrap.sh pre-build: @cd ${WRKSRC}; \ diff --git a/www/squid/snapshot/Makefile b/www/squid/snapshot/Makefile index 7b071de726e..41ec4b4c3d8 100644 --- a/www/squid/snapshot/Makefile +++ b/www/squid/snapshot/Makefile @@ -1,9 +1,9 @@ -# $OpenBSD: Makefile,v 1.12 2014/04/21 23:37:55 sthen Exp $ +# $OpenBSD: Makefile,v 1.13 2014/04/24 14:26:21 sthen Exp $ D= 20140413-r13351 V= 3.5pre${D:C/-.*//} DISTNAME= squid-3.HEAD-$D -REVISION= 0 +REVISION= 1 EXTRACT_SUFX= .tar.bz2 EXTERNAL_ACL= LDAP_group SQL_session file_userip time_quota session \ @@ -13,11 +13,4 @@ CONFIGURE_ARGS= --disable-strict-error-checking \ --disable-arch-native \ --enable-ssl-crtd -WANTLIB-main += nettle -#WANTLIB-ntlm += nettle -WANTLIB-ldap += nettle -LIB_DEPENDS-main += security/libnettle -#LIB_DEPENDS-ntlm += security/libnettle -LIB_DEPENDS-ldap += security/libnettle - .include diff --git a/www/squid/snapshot/pkg/PLIST-main b/www/squid/snapshot/pkg/PLIST-main index b2e7f823994..7d62bb77130 100644 --- a/www/squid/snapshot/pkg/PLIST-main +++ b/www/squid/snapshot/pkg/PLIST-main @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST-main,v 1.3 2014/04/21 20:29:50 sthen Exp $ +@comment $OpenBSD: PLIST-main,v 1.4 2014/04/24 14:26:21 sthen Exp $ @newgroup _squid:515 @newuser _squid:515:_squid:daemon:Squid Account:/nonexistent:/sbin/nologin @extraunexec rm -rf ${LOCALSTATEDIR}/cache/* @@ -13,6 +13,8 @@ libexec/squid/basic_db_auth @bin libexec/squid/basic_ncsa_auth libexec/squid/basic_pop3_auth @bin libexec/squid/basic_radius_auth +@comment @bin libexec/squid/basic_smb_auth +@comment libexec/squid/basic_smb_auth.sh @bin libexec/squid/cachemgr.cgi libexec/squid/cert_valid.pl @bin libexec/squid/digest_file_auth @@ -21,10 +23,13 @@ libexec/squid/cert_valid.pl libexec/squid/ext_sql_session_acl @bin libexec/squid/ext_time_quota_acl @bin libexec/squid/ext_unix_group_acl +@comment libexec/squid/ext_wbinfo_group_acl libexec/squid/helper-mux.pl libexec/squid/log_db_daemon @bin libexec/squid/log_file_daemon @bin libexec/squid/negotiate_wrapper_auth +@comment @bin libexec/squid/ntlm_fake_auth +@comment @bin libexec/squid/ntlm_smb_lm_auth @bin libexec/squid/ssl_crtd libexec/squid/storeid_file_rewrite @bin libexec/squid/unlinkd @@ -40,6 +45,7 @@ libexec/squid/url_fake_rewrite.sh @man man/man8/ext_sql_session_acl.8 @man man/man8/ext_time_quota_acl.8 @man man/man8/ext_unix_group_acl.8 +@comment @man man/man8/ext_wbinfo_group_acl.8 @man man/man8/log_db_daemon.8 @man man/man8/squid.8 @man man/man8/storeid_file_rewrite.8 diff --git a/www/squid/stable/Makefile b/www/squid/stable/Makefile index 5cc4eead82c..8583ed73cd8 100644 --- a/www/squid/stable/Makefile +++ b/www/squid/stable/Makefile @@ -1,7 +1,6 @@ -# $OpenBSD: Makefile,v 1.6 2014/04/21 20:29:50 sthen Exp $ +# $OpenBSD: Makefile,v 1.7 2014/04/24 14:26:21 sthen Exp $ -V= 3.4.4 -REVISION= 1 +V= 3.4.4.2 EXTERNAL_ACL= LDAP_group SQL_session file_userip time_quota session \ unix_group wbinfo_group diff --git a/www/squid/stable/distinfo b/www/squid/stable/distinfo index 6052691f0b7..d826b0df947 100644 --- a/www/squid/stable/distinfo +++ b/www/squid/stable/distinfo @@ -1,2 +1,2 @@ -SHA256 (squid-3.4.4.tar.xz) = gH8SzHvS/hE/hmqa0W2y6JuNLlPdLH5huNQnk+aPBBQ= -SIZE (squid-3.4.4.tar.xz) = 2226656 +SHA256 (squid-3.4.4.2.tar.xz) = UKCS1DVIJRRpoe525UEWWvdyaOrQ1lAUIIq8fiZSUS0= +SIZE (squid-3.4.4.2.tar.xz) = 2242132 diff --git a/www/squid/stable/patches/patch-configure_ac b/www/squid/stable/patches/patch-configure_ac index fc628d1ce07..1a017699b58 100644 --- a/www/squid/stable/patches/patch-configure_ac +++ b/www/squid/stable/patches/patch-configure_ac @@ -1,7 +1,7 @@ -$OpenBSD: patch-configure_ac,v 1.3 2014/04/08 12:22:48 sthen Exp $ ---- configure.ac.orig Sun Mar 9 09:42:04 2014 -+++ configure.ac Sun Mar 16 13:07:07 2014 -@@ -3051,6 +3051,14 @@ if test "x$squid_host_os" = "xmingw" ; then +$OpenBSD: patch-configure_ac,v 1.4 2014/04/24 14:26:21 sthen Exp $ +--- configure.ac.orig Wed Apr 23 15:03:44 2014 ++++ configure.ac Thu Apr 24 14:30:34 2014 +@@ -3060,6 +3060,14 @@ if test "x$squid_host_os" = "xmingw" ; then ac_cv_func_statfs='yes' fi @@ -16,7 +16,7 @@ $OpenBSD: patch-configure_ac,v 1.3 2014/04/08 12:22:48 sthen Exp $ dnl Check for library functions AC_CHECK_FUNCS(\ backtrace_symbols_fd \ -@@ -3203,6 +3211,9 @@ AC_CHECK_TYPE(struct cmsghdr,AC_DEFINE(HAVE_CMSGHDR,1, +@@ -3211,6 +3219,9 @@ AC_CHECK_TYPE(struct cmsghdr,AC_DEFINE(HAVE_CMSGHDR,1, ]) AC_CHECK_TYPE(struct iovec,AC_DEFINE(HAVE_IOVEC,1,[The system provides struct iovec]),,[ diff --git a/www/squid/stable/patches/patch-src_Makefile_am b/www/squid/stable/patches/patch-src_Makefile_am index c1f1f17348f..5053b18e5c8 100644 --- a/www/squid/stable/patches/patch-src_Makefile_am +++ b/www/squid/stable/patches/patch-src_Makefile_am @@ -1,7 +1,7 @@ -$OpenBSD: patch-src_Makefile_am,v 1.2 2014/04/08 12:22:48 sthen Exp $ ---- src/Makefile.am.orig Thu Oct 3 13:32:47 2013 -+++ src/Makefile.am Mon Oct 21 13:49:36 2013 -@@ -652,6 +652,7 @@ squid_LDADD = \ +$OpenBSD: patch-src_Makefile_am,v 1.3 2014/04/24 14:26:21 sthen Exp $ +--- src/Makefile.am.orig Wed Apr 23 15:02:16 2014 ++++ src/Makefile.am Thu Apr 24 14:30:34 2014 +@@ -653,6 +653,7 @@ squid_LDADD = \ $(MINGW_LIBS) \ $(KRB5LIBS) \ $(COMPAT_LIB) \ diff --git a/www/squid/stable/patches/patch-src_cf_data_pre b/www/squid/stable/patches/patch-src_cf_data_pre index 2e6a738108c..6dfba909b67 100644 --- a/www/squid/stable/patches/patch-src_cf_data_pre +++ b/www/squid/stable/patches/patch-src_cf_data_pre @@ -1,10 +1,10 @@ -$OpenBSD: patch-src_cf_data_pre,v 1.3 2014/04/08 12:22:48 sthen Exp $ +$OpenBSD: patch-src_cf_data_pre,v 1.4 2014/04/24 14:26:21 sthen Exp $ 30 seconds is too long for rc.d ---- src/cf.data.pre.orig Sat Nov 30 13:20:43 2013 -+++ src/cf.data.pre Wed Dec 4 14:34:52 2013 -@@ -5735,7 +5735,7 @@ NAME: shutdown_lifetime +--- src/cf.data.pre.orig Wed Apr 23 15:02:16 2014 ++++ src/cf.data.pre Thu Apr 24 14:30:34 2014 +@@ -5757,7 +5757,7 @@ NAME: shutdown_lifetime COMMENT: time-units TYPE: time_t LOC: Config.shutdownLifetime diff --git a/www/squid/stable/pkg/PLIST-main b/www/squid/stable/pkg/PLIST-main index eda5e4cc9a2..1b14438918c 100644 --- a/www/squid/stable/pkg/PLIST-main +++ b/www/squid/stable/pkg/PLIST-main @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST-main,v 1.4 2014/04/21 20:29:50 sthen Exp $ +@comment $OpenBSD: PLIST-main,v 1.5 2014/04/24 14:26:21 sthen Exp $ @pkgpath www/squid[,ldap][,ntlm][,snmp][,transparent] @pkgpath www/squid,-main @newgroup _squid:515 @@ -16,6 +16,8 @@ libexec/squid/basic_db_auth @bin libexec/squid/basic_nis_auth libexec/squid/basic_pop3_auth @bin libexec/squid/basic_radius_auth +@comment @bin libexec/squid/basic_smb_auth +@comment libexec/squid/basic_smb_auth.sh @bin libexec/squid/cachemgr.cgi libexec/squid/cert_valid.pl @bin libexec/squid/digest_file_auth @@ -24,10 +26,13 @@ libexec/squid/cert_valid.pl libexec/squid/ext_sql_session_acl @bin libexec/squid/ext_time_quota_acl @bin libexec/squid/ext_unix_group_acl +@comment libexec/squid/ext_wbinfo_group_acl libexec/squid/helper-mux.pl libexec/squid/log_db_daemon @bin libexec/squid/log_file_daemon @bin libexec/squid/negotiate_wrapper_auth +@comment @bin libexec/squid/ntlm_fake_auth +@comment @bin libexec/squid/ntlm_smb_lm_auth libexec/squid/storeid_file_rewrite @bin libexec/squid/unlinkd @bin libexec/squid/url_fake_rewrite @@ -42,6 +47,7 @@ libexec/squid/url_fake_rewrite.sh @man man/man8/ext_sql_session_acl.8 @man man/man8/ext_time_quota_acl.8 @man man/man8/ext_unix_group_acl.8 +@comment @man man/man8/ext_wbinfo_group_acl.8 @man man/man8/log_db_daemon.8 @man man/man8/squid.8 @man man/man8/storeid_file_rewrite.8