Tue Feb 4 14:23:01 2014 UTC ()
Changes 3.4.3:
* Update CONTRIBUTORS
* Fix peerSelectDnsResults() IP address cycling
* Comm job callbacks need job's cbdata pointer, not a job pointer.
* Bug 3975: atomic detection cross-compilation failure
* Bug 3954: compile failure in CpuAffinity.cc
* Bug 3971: "cannot aggregate mgr:client_list: cmd->profile != NULL" in SMP mode
* Initialize asyncLoopDepth_ in constructor
* Fix external_acl_type async loop failures
* Bug 4008: HttpHeader warnOnError should be an int not a bool
* Fix memory leak in peer cache Digest exchange
* Bug 3927: tests/testRock fatal.cc required
* Bug 4002: clang 3.4 unable to compile
* Document and enforce invariant on Format::Token.divisor
* Bug 4002: clang 3.4 unable to compile
* Bug 3996: Malformed DNS reply leads to crash
* Disable error page translation by default in builds
* Bug 3995: compile error on CentOS 5 with GCC 4.1.2
* Centrally destroy all ACLs to avoid destruction segfaults


(adam)
diff -r1.25 -r1.26 pkgsrc/www/squid3/Makefile
diff -r1.18 -r1.19 pkgsrc/www/squid3/distinfo
diff -r1.2 -r0 pkgsrc/www/squid3/patches/patch-compat_os_hpux.h
diff -r1.1 -r0 pkgsrc/www/squid3/patches/patch-include_SquidNew.h
diff -r1.1 -r0 pkgsrc/www/squid3/patches/patch-src_base_Vector.h
cvs diff -r1.25 -r1.26 pkgsrc/www/squid3/Attic/Makefile (switch to unified diff)

--- pkgsrc/www/squid3/Attic/Makefile 2013/12/31 11:54:32 1.25
+++ pkgsrc/www/squid3/Attic/Makefile 2014/02/04 14:23:01 1.26
@@ -1,83 +1,83 @@ @@ -1,83 +1,83 @@
1# $NetBSD: Makefile,v 1.25 2013/12/31 11:54:32 adam Exp $ 1# $NetBSD: Makefile,v 1.26 2014/02/04 14:23:01 adam Exp $
2 2
3DISTNAME= squid-3.4.2 3DISTNAME= squid-3.4.3
4CATEGORIES= www 4CATEGORIES= www
5MASTER_SITES= http://www.squid-cache.org/Versions/v3/${PKGVERSION_NOREV:R}/ \ 5MASTER_SITES= http://www.squid-cache.org/Versions/v3/${PKGVERSION_NOREV:R}/ \
6 ftp://ftp.squid-cache.org/pub/squid/ \ 6 ftp://ftp.squid-cache.org/pub/squid/ \
7 http://ftp.nluug.nl/internet/squid/ 7 http://ftp.nluug.nl/internet/squid/
8EXTRACT_SUFX= .tar.xz 8EXTRACT_SUFX= .tar.xz
9 9
10MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
11HOMEPAGE= http://www.squid-cache.org/ 11HOMEPAGE= http://www.squid-cache.org/
12COMMENT= Post-Harvest_cached WWW proxy cache and accelerator 12COMMENT= Post-Harvest_cached WWW proxy cache and accelerator
13LICENSE= gnu-gpl-v2 13LICENSE= gnu-gpl-v2
14 14
15USE_LANGUAGES= c c++ 15USE_LANGUAGES= c c++
16USE_TOOLS+= perl:run gmake 16USE_TOOLS+= perl:run gmake
17GNU_CONFIGURE= yes 17GNU_CONFIGURE= yes
18CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} 18CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
19CONFIGURE_ARGS+= --localstatedir=${SQUID_DATADIR} 19CONFIGURE_ARGS+= --localstatedir=${SQUID_DATADIR}
20CONFIGURE_ARGS+= --datarootdir=${PREFIX}/share/squid 20CONFIGURE_ARGS+= --datarootdir=${PREFIX}/share/squid
21CONFIGURE_ARGS+= --disable-strict-error-checking 21CONFIGURE_ARGS+= --disable-strict-error-checking
22CONFIGURE_ARGS+= --enable-auth 22CONFIGURE_ARGS+= --enable-auth
23CONFIGURE_ARGS+= --enable-cachemgr-hostname=localhost 23CONFIGURE_ARGS+= --enable-cachemgr-hostname=localhost
24CONFIGURE_ARGS+= --enable-delay-pools 24CONFIGURE_ARGS+= --enable-delay-pools
25CONFIGURE_ARGS+= --enable-icap-client 25CONFIGURE_ARGS+= --enable-icap-client
26CONFIGURE_ARGS+= --enable-icmp 26CONFIGURE_ARGS+= --enable-icmp
27CONFIGURE_ARGS+= --enable-poll 27CONFIGURE_ARGS+= --enable-poll
28CONFIGURE_ARGS+= --enable-removal-policies=lru,heap 28CONFIGURE_ARGS+= --enable-removal-policies=lru,heap
29CONFIGURE_ARGS+= --enable-storeio=${SQUID_BACKENDS:Q} 29CONFIGURE_ARGS+= --enable-storeio=${SQUID_BACKENDS:Q}
30CONFIGURE_ARGS+= --with-aio 30CONFIGURE_ARGS+= --with-aio
31CONFIGURE_ARGS+= --with-default-user=${SQUID_USER} 31CONFIGURE_ARGS+= --with-default-user=${SQUID_USER}
32CONFIGURE_ARGS+= --with-pidfile=${VARBASE}/run/squid.pid 32CONFIGURE_ARGS+= --with-pidfile=${VARBASE}/run/squid.pid
33 33
34# Explicitly disable using CPU optimized instruction 34# Explicitly disable using CPU optimized instruction
35CONFIGURE_ARGS+= --disable-arch-native 35CONFIGURE_ARGS+= --disable-arch-native
36 36
37BUILD_DEFS+= VARBASE 37BUILD_DEFS+= VARBASE
38MAKE_ENV+= INSTALL_SCRIPT=${INSTALL_SCRIPT:Q} 38MAKE_ENV+= INSTALL_SCRIPT=${INSTALL_SCRIPT:Q}
39MAKE_ENV+= PKG_PREFIX=${PREFIX} VARBASE=${VARBASE} 39MAKE_ENV+= PKG_PREFIX=${PREFIX} VARBASE=${VARBASE}
40REPLACE_PERL+= helpers/ssl/cert_valid.pl tools/helper-mux.pl 40REPLACE_PERL+= helpers/ssl/cert_valid.pl tools/helper-mux.pl
41 41
42EGFILES= src/mime.conf.default src/squid.conf.default \ 42EGFILES= src/mime.conf.default src/squid.conf.default \
43 helpers/basic_auth/MSNT/msntauth.conf.default \ 43 helpers/basic_auth/MSNT/msntauth.conf.default \
44 errors/errorpage.css tools/cachemgr.conf 44 errors/errorpage.css tools/cachemgr.conf
45EGDIR= share/examples/squid 45EGDIR= share/examples/squid
46.for f in cachemgr.conf errorpage.css mime.conf squid.conf msntauth.conf 46.for f in cachemgr.conf errorpage.css mime.conf squid.conf msntauth.conf
47CONF_FILES+= ${PREFIX}/${EGDIR}/${f} ${PKG_SYSCONFDIR}/${f} 47CONF_FILES+= ${PREFIX}/${EGDIR}/${f} ${PKG_SYSCONFDIR}/${f}
48.endfor 48.endfor
49OWN_DIRS= ${SQUID_DATADIR} 49OWN_DIRS= ${SQUID_DATADIR}
50OWN_DIRS_PERMS+=${SQUID_DATADIR}/cache ${SQUID_USER} ${SQUID_GROUP} 0750 \ 50OWN_DIRS_PERMS+=${SQUID_DATADIR}/cache ${SQUID_USER} ${SQUID_GROUP} 0750 \
51 ${SQUID_DATADIR}/logs ${SQUID_USER} ${SQUID_GROUP} 0750 51 ${SQUID_DATADIR}/logs ${SQUID_USER} ${SQUID_GROUP} 0750
52 52
53.include "Makefile.common" 53.include "Makefile.common"
54.include "options.mk" 54.include "options.mk"
55 55
56.if !empty(MACHINE_PLATFORM:MNetBSD-[0-5]*-i386) 56.if !empty(MACHINE_PLATFORM:MNetBSD-[0-5]*-i386)
57GNU_ARCH.i386= i486 57GNU_ARCH.i386= i486
58CFLAGS+= -march=i486 58CFLAGS+= -march=i486
59.endif 59.endif
60 60
61INSTALLATION_DIRS= bin libexec ${PKGMANDIR}/man8 sbin ${EGDIR} \ 61INSTALLATION_DIRS= bin libexec ${PKGMANDIR}/man8 sbin ${EGDIR} \
62 share/squid share/squid/errors share/squid/icons \ 62 share/squid share/squid/errors share/squid/icons \
63SPECIAL_PERMS+= libexec/pinger ${SETUID_ROOT_PERMS} 63SPECIAL_PERMS+= libexec/pinger ${SETUID_ROOT_PERMS}
64 64
65RCD_SCRIPTS= squid 65RCD_SCRIPTS= squid
66RCD_SCRIPT_SRC.squid= files/squid.sh 66RCD_SCRIPT_SRC.squid= files/squid.sh
67 67
68SUBST_CLASSES+= confs 68SUBST_CLASSES+= confs
69SUBST_STAGE.confs= pre-configure 69SUBST_STAGE.confs= pre-configure
70SUBST_FILES.confs= src/cf.data.pre 70SUBST_FILES.confs= src/cf.data.pre
71SUBST_SED.confs= -e "s/@USER@/${SQUID_USER}/" 71SUBST_SED.confs= -e "s/@USER@/${SQUID_USER}/"
72SUBST_MESSAGE.confs= Fixing configuration files. 72SUBST_MESSAGE.confs= Fixing configuration files.
73 73
74post-build: 74post-build:
75 cd ${WRKSRC}/src && ${CP} -pf squid.conf.documented squid.conf.default 75 cd ${WRKSRC}/src && ${CP} -pf squid.conf.documented squid.conf.default
76 76
77post-install: 77post-install:
78.for f in ${EGFILES} 78.for f in ${EGFILES}
79 ${INSTALL_DATA} ${WRKSRC}/${f} \ 79 ${INSTALL_DATA} ${WRKSRC}/${f} \
80 ${DESTDIR}${PREFIX}/${EGDIR}/`basename ${f} .default` 80 ${DESTDIR}${PREFIX}/${EGDIR}/`basename ${f} .default`
81.endfor 81.endfor
82 82
83.include "../../mk/bsd.pkg.mk" 83.include "../../mk/bsd.pkg.mk"
cvs diff -r1.18 -r1.19 pkgsrc/www/squid3/Attic/distinfo (switch to unified diff)

--- pkgsrc/www/squid3/Attic/distinfo 2013/12/31 11:54:32 1.18
+++ pkgsrc/www/squid3/Attic/distinfo 2014/02/04 14:23:01 1.19
@@ -1,18 +1,15 @@ @@ -1,18 +1,15 @@
1$NetBSD: distinfo,v 1.18 2013/12/31 11:54:32 adam Exp $ 1$NetBSD: distinfo,v 1.19 2014/02/04 14:23:01 adam Exp $
2 2
3SHA1 (squid-3.4.2.tar.xz) = 2874ce2dbf578b22a3fe066138962b0c23e17cc2 3SHA1 (squid-3.4.3.tar.xz) = 6590e2d2c73b190f91062975f00996a0ca131197
4RMD160 (squid-3.4.2.tar.xz) = 7286ebfd5acb75384c8375c880bd883cd2890932 4RMD160 (squid-3.4.3.tar.xz) = c3459bd2e120d4ff59079b18d902df88c7c7eb78
5Size (squid-3.4.2.tar.xz) = 2224616 bytes 5Size (squid-3.4.3.tar.xz) = 2225044 bytes
6SHA1 (patch-compat_os_hpux.h) = f36b396282b1ee8ded7588519d266cced7dfdc40 
7SHA1 (patch-compat_unsafe.h) = 89e6741432357a0523a43ef410d81bffcb263f81 6SHA1 (patch-compat_unsafe.h) = 89e6741432357a0523a43ef410d81bffcb263f81
8SHA1 (patch-configure) = 86400fd701a84eb174395755eec7b13cbfce55ec 7SHA1 (patch-configure) = 86400fd701a84eb174395755eec7b13cbfce55ec
9SHA1 (patch-errors_Makefile.in) = afbac822ac84d5e1734d55fc625e949ae0b85289 8SHA1 (patch-errors_Makefile.in) = afbac822ac84d5e1734d55fc625e949ae0b85289
10SHA1 (patch-helpers_basic_auth_MSNT_Makefile.in) = 74a0379d3ec0c2601dbb62b16df889bf4edcaedf 9SHA1 (patch-helpers_basic_auth_MSNT_Makefile.in) = 74a0379d3ec0c2601dbb62b16df889bf4edcaedf
11SHA1 (patch-include_SquidNew.h) = 0c46a95a3da117ec263f29c0233e35047c0db570 
12SHA1 (patch-src_Makefile.in) = 130e223568a07c474b30a8fa3678c60f8b487c3e 10SHA1 (patch-src_Makefile.in) = 130e223568a07c474b30a8fa3678c60f8b487c3e
13SHA1 (patch-src_SquidNew.cc) = eef6e72e168cf7f40518fab13dc2f55ed0268db9 11SHA1 (patch-src_SquidNew.cc) = eef6e72e168cf7f40518fab13dc2f55ed0268db9
14SHA1 (patch-src_base_TidyPointer.h) = 93428d26bb2479fc845764a324658eaacd26588e 12SHA1 (patch-src_base_TidyPointer.h) = 93428d26bb2479fc845764a324658eaacd26588e
15SHA1 (patch-src_base_Vector.h) = 63d14c78ba5bc6a5a928f67f116ab82c83740081 
16SHA1 (patch-src_ip_Intercept.cc) = 8a8640d5f7eef217b2536646513eb872c67a7ffc 13SHA1 (patch-src_ip_Intercept.cc) = 8a8640d5f7eef217b2536646513eb872c67a7ffc
17SHA1 (patch-src_store.cc) = 055d98a59103b02a51876a5c8ffed9514954beb4 14SHA1 (patch-src_store.cc) = 055d98a59103b02a51876a5c8ffed9514954beb4
18SHA1 (patch-tools_Makefile.in) = 3a7678c63a11a35fabef091a3b18e63859f0796f 15SHA1 (patch-tools_Makefile.in) = 3a7678c63a11a35fabef091a3b18e63859f0796f
File Deleted: pkgsrc/www/squid3/patches/Attic/patch-compat_os_hpux.h
File Deleted: pkgsrc/www/squid3/patches/Attic/patch-include_SquidNew.h
File Deleted: pkgsrc/www/squid3/patches/Attic/patch-src_base_Vector.h