On 2013/04/27 09:19, Stuart Henderson wrote:
> CVSROOT: /cvs
> Module name: ports
> Changes by: [email protected] 2013/04/27 09:19:48
>
> Modified files:
> www/squid : Makefile distinfo
> Added files:
> www/squid/patches: patch-src_ip_Intercept_cc
> Removed files:
> www/squid/patches: patch-helpers_basic_auth_LDAP_config_test
> patch-helpers_basic_auth_SASL_config_test
> patch-helpers_digest_auth_LDAP_config_test
> patch-helpers_digest_auth_eDirectory_config_test
> patch-helpers_external_acl_LDAP_group_config_test
>
> patch-helpers_external_acl_eDirectory_userip_config_test
>
> Log message:
> update to squid-3.2.10: fixes & rolling in some patches committed upstream
>
I'm intending to move www/squid to the (now stable) 3.3 series soon;
here's a provisional diff if anyone would like to try it sooner. I've
been snapshots in production (with c-icap and squidclamav), but not
tested transparent with this yet (which needs doing as this has had
recent changes).
Index: Makefile
===================================================================
RCS file: /cvs/ports/www/squid/Makefile,v
retrieving revision 1.152
diff -u -p -r1.152 Makefile
--- Makefile 27 Apr 2013 15:19:48 -0000 1.152
+++ Makefile 27 Apr 2013 15:26:09 -0000
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.152 2013/04/27 15:19:48 sthen Exp $
+# $OpenBSD: Makefile,v 1.151 2013/04/25 21:29:52 sthen Exp $
MULTI_PACKAGES= -main -ntlm
@@ -9,9 +9,10 @@ COMMENT-main= WWW and FTP proxy cache an
COMMENT-ldap= LDAP authentication/ACL support for Squid
COMMENT-ntlm= NTLM authentication/ACL support for Squid
-V= 3.2.10
+V= 3.3.4
DISTNAME= squid-$V
+EXTRACT_SUFX= .tar.bz2
PKGNAME-main= squid-$V
PKGNAME-ldap= squid-ldap-$V
PKGNAME-ntlm= squid-ntlm-$V
@@ -80,6 +81,7 @@ CONFIGURE_ARGS+= ${CONFIGURE_SHARED} \
--enable-http-violations \
--enable-icap-client \
--enable-ipv6 \
+ --enable-pf-transparent \
--enable-referer-log \
--enable-removal-policies="lru heap" \
--enable-ssl \
@@ -90,11 +92,6 @@ CONFIGURE_ARGS+= ${CONFIGURE_SHARED} \
--with-pidfile="/var/run/squid.pid" \
--with-pthreads \
--with-swapdir="${LOCALSTATEDIR}/cache"
-# PF transparent support requires access to /dev/pf to retrieve the original
-# source address; ipfw-transparent (which requires divert-to) uses an
-# unprivileged getsockname() call instead.
-CONFIGURE_ARGS+= --disable-pf-transparent \
- --enable-ipfw-transparent
CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib" \
ac_cv_header_et_com_err_h=false
Index: distinfo
===================================================================
RCS file: /cvs/ports/www/squid/distinfo,v
retrieving revision 1.61
diff -u -p -r1.61 distinfo
--- distinfo 27 Apr 2013 15:19:48 -0000 1.61
+++ distinfo 27 Apr 2013 15:26:09 -0000
@@ -1,2 +1,2 @@
-SHA256 (squid-3.2.10.tar.gz) = je+T0BnB9W2JGA4utF1umoJyp6i8PLfDp7bMSq1TXjY=
-SIZE (squid-3.2.10.tar.gz) = 4114308
+SHA256 (squid-3.3.4.tar.bz2) = 6WLCeilPbdV6Mv3Ek+MsFtJGhwNfA/EUDEkfuMEs4XA=
+SIZE (squid-3.3.4.tar.bz2) = 2987756
Index: patches/patch-bootstrap_sh
===================================================================
RCS file: /cvs/ports/www/squid/patches/patch-bootstrap_sh,v
retrieving revision 1.1
diff -u -p -r1.1 patch-bootstrap_sh
--- patches/patch-bootstrap_sh 22 Jan 2013 14:30:46 -0000 1.1
+++ patches/patch-bootstrap_sh 27 Apr 2013 15:26:09 -0000
@@ -1,9 +1,9 @@
$OpenBSD: patch-bootstrap_sh,v 1.1 2013/01/22 14:30:46 sthen Exp $
---- bootstrap.sh.orig Tue Jan 22 12:29:39 2013
-+++ bootstrap.sh Tue Jan 22 12:29:42 2013
-@@ -129,7 +129,7 @@ do
+--- bootstrap.sh.orig Sat Apr 27 04:34:48 2013
++++ bootstrap.sh Sat Apr 27 16:24:25 2013
+@@ -137,7 +137,7 @@ do
mkdir -p cfgaux
-
+
if test -n "$ltpath"; then
- acincludeflag="-I $ltpath/../share/aclocal"
+ acincludeflag="-I ${LOCALBASE}/share/aclocal"
Index: patches/patch-configure_ac
===================================================================
RCS file: /cvs/ports/www/squid/patches/patch-configure_ac,v
retrieving revision 1.5
diff -u -p -r1.5 patch-configure_ac
--- patches/patch-configure_ac 22 Jan 2013 14:30:46 -0000 1.5
+++ patches/patch-configure_ac 27 Apr 2013 15:26:09 -0000
@@ -1,24 +1,7 @@
$OpenBSD: patch-configure_ac,v 1.5 2013/01/22 14:30:46 sthen Exp $
---- configure.ac.orig Wed Jan 9 01:42:47 2013
-+++ configure.ac Tue Jan 22 12:58:39 2013
-@@ -566,6 +566,16 @@ for module in $squid_disk_module_candidates none; do
- fi
- fi
- ;;
-+ openbsd)
-+ if test `echo "$squid_host_os_version" | tr -d .` -lt 52 ; then
-+ AC_MSG_NOTICE(pthread library requires OpenBSD 5.2 or later)
-+ squid_opt_use_diskthreads="no"
-+ else
-+ SQUID_CFLAGS="$SQUID_CFLAGS -D_REENTRANT"
-+ SQUID_CXXFLAGS="$SQUID_CXXFLAGS -D_REENTRANT"
-+ LDFLAGS="$LDFLAGS -lpthread"
-+ fi
-+ ;;
- solaris)
- if test "x$GCC" = "xyes" ; then
- SQUID_CFLAGS="$SQUID_CFLAGS -D_REENTRANT -pthreads"
-@@ -3112,9 +3122,16 @@ if test "x$squid_host_os" = "xmingw" ; then
+--- configure.ac.orig Sat Apr 27 04:35:47 2013
++++ configure.ac Sat Apr 27 16:25:56 2013
+@@ -3162,6 +3162,14 @@ if test "x$squid_host_os" = "xmingw" ; then
ac_cv_func_statfs='yes'
fi
@@ -32,7 +15,4 @@ $OpenBSD: patch-configure_ac,v 1.5 2013/
+
dnl Check for library functions
AC_CHECK_FUNCS(\
-- backtrace_symbols_fd \
- bcopy \
- bswap_16 \
- bswap_32 \
+ backtrace_symbols_fd \
Index: patches/patch-src_Makefile_am
===================================================================
RCS file: /cvs/ports/www/squid/patches/patch-src_Makefile_am,v
retrieving revision 1.1
diff -u -p -r1.1 patch-src_Makefile_am
--- patches/patch-src_Makefile_am 22 Jan 2013 14:30:46 -0000 1.1
+++ patches/patch-src_Makefile_am 27 Apr 2013 15:26:09 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-src_Makefile_am,v 1.1 2013/01/22 14:30:46 sthen Exp $
---- src/Makefile.am.orig Tue Jan 22 12:19:59 2013
-+++ src/Makefile.am Tue Jan 22 12:20:03 2013
-@@ -593,6 +593,7 @@ squid_LDADD = \
+--- src/Makefile.am.orig Sat Apr 27 04:34:48 2013
++++ src/Makefile.am Sat Apr 27 16:24:25 2013
+@@ -649,6 +649,7 @@ squid_LDADD = \
$(MINGW_LIBS) \
$(KRB5LIBS) \
$(COMPAT_LIB) \
Index: patches/patch-src_cf_data_pre
===================================================================
RCS file: /cvs/ports/www/squid/patches/patch-src_cf_data_pre,v
retrieving revision 1.35
diff -u -p -r1.35 patch-src_cf_data_pre
--- patches/patch-src_cf_data_pre 12 Mar 2013 14:58:16 -0000 1.35
+++ patches/patch-src_cf_data_pre 27 Apr 2013 15:26:09 -0000
@@ -2,9 +2,9 @@ $OpenBSD: patch-src_cf_data_pre,v 1.35 2
30 seconds is too slow for rc.d
---- src/cf.data.pre.orig Tue Mar 12 10:15:58 2013
-+++ src/cf.data.pre Tue Mar 12 14:21:28 2013
-@@ -4850,7 +4850,7 @@ NAME: shutdown_lifetime
+--- src/cf.data.pre.orig Sat Apr 27 04:34:48 2013
++++ src/cf.data.pre Sat Apr 27 16:24:25 2013
+@@ -5284,7 +5284,7 @@ NAME: shutdown_lifetime
COMMENT: time-units
TYPE: time_t
LOC: Config.shutdownLifetime
Index: patches/patch-src_client_side_reply_cc
===================================================================
RCS file: /cvs/ports/www/squid/patches/patch-src_client_side_reply_cc,v
retrieving revision 1.1
diff -u -p -r1.1 patch-src_client_side_reply_cc
--- patches/patch-src_client_side_reply_cc 25 Apr 2013 21:29:52 -0000
1.1
+++ patches/patch-src_client_side_reply_cc 27 Apr 2013 15:26:09 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-src_client_side_reply_cc,v 1.1 2013/04/25 21:29:52 sthen Exp $
---- src/client_side_reply.cc.orig Tue Mar 12 04:15:58 2013
-+++ src/client_side_reply.cc Thu Apr 25 15:09:38 2013
-@@ -1309,7 +1309,7 @@ clientReplyContext::buildReplyHeader()
+--- src/client_side_reply.cc.orig Sat Apr 27 04:34:48 2013
++++ src/client_side_reply.cc Sat Apr 27 16:24:25 2013
+@@ -1333,7 +1333,7 @@ clientReplyContext::buildReplyHeader()
if (http->storeEntry()->timestamp <= squid_curtime) {
// put X-Cache-Age: instead of Age:
char age[64];
Index: patches/patch-src_ip_Intercept_cc
===================================================================
RCS file: patches/patch-src_ip_Intercept_cc
diff -N patches/patch-src_ip_Intercept_cc
--- patches/patch-src_ip_Intercept_cc 27 Apr 2013 15:19:48 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,11 +0,0 @@
-$OpenBSD: patch-src_ip_Intercept_cc,v 1.1 2013/04/27 15:19:48 sthen Exp $
---- src/ip/Intercept.cc.orig Sat Apr 27 15:00:14 2013
-+++ src/ip/Intercept.cc Sat Apr 27 15:05:50 2013
-@@ -34,7 +34,6 @@
- #include "comm/Connection.h"
- #include "ip/Intercept.h"
- #include "fde.h"
--#include "src/tools.h"
-
- #if IPF_TRANSPARENT
-
Index: pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/www/squid/pkg/PLIST-main,v
retrieving revision 1.1
diff -u -p -r1.1 PLIST-main
--- pkg/PLIST-main 28 Nov 2012 17:45:29 -0000 1.1
+++ pkg/PLIST-main 27 Apr 2013 15:26:09 -0000
@@ -16,6 +16,7 @@ libexec/squid/
@bin libexec/squid/ext_file_userip_acl
@bin libexec/squid/ext_unix_group_acl
libexec/squid/helper-mux.pl
+libexec/squid/log_db_daemon
@bin libexec/squid/log_file_daemon
@bin libexec/squid/negotiate_kerberos_auth
@bin libexec/squid/negotiate_kerberos_auth_test
@@ -28,6 +29,7 @@ libexec/squid/url_fake_rewrite.sh
@man man/man8/digest_file_auth.8
@man man/man8/ext_file_userip_acl.8
@man man/man8/ext_unix_group_acl.8
+@man man/man8/log_db_daemon.8
@man man/man8/negotiate_kerberos_auth.8
@man man/man8/squid.8
@bin sbin/squid
