Wed Aug 5 08:10:56 2015 UTC ()
Changes 3.5.7:
* Bug 4293: wrong SNI sent to server after URL-rewrite
* Add ENABLE_POD2MAN_DOC automake conditional for pod2man builds
* basic_smb_auth: rejecting valid credentials
* basic_smb_auth: doesn't handle passwords with backslashes
* basic_smb_auth: nmblookup fails when smb.conf contaisn WINS servers
* Docs: fix man(8) page syntax for lexgrof tool
* Make pod2man an optional dependency
* Handle exceptions during squid.conf parse
* When SBuf chop()s away everything, always clear the buffer.
* Cleanup: avoid mentioning compiler directives in configure output
* Bug 4251: incorrect instance name for memory segments in /dev/shm
* Bug 3345: Support %un (any available user name) format code for external ACLs.
* AUFS: Raise I/O queue congestion limits
* Improve handling of client connections on shutdown
* Avoid SSL certificate db corruption with empty index.txt as a symptom.
* Errors served using invalid certificates when dealing with SSL server errors.
* IPv6: improve BCP 177 compliance
* Polish debugs on NAT failure
* Fix crash in TcpAccepter with profiler enabled
* Splice to origin cache_peer.
* Bug 4227: invalid key in AuthUserHashPointer causing assertation failure


(adam)
diff -r1.49 -r1.50 pkgsrc/www/squid3/Makefile
diff -r1.35 -r1.36 pkgsrc/www/squid3/distinfo
cvs diff -r1.49 -r1.50 pkgsrc/www/squid3/Attic/Makefile (switch to unified diff)

--- pkgsrc/www/squid3/Attic/Makefile 2015/07/06 09:39:40 1.49
+++ pkgsrc/www/squid3/Attic/Makefile 2015/08/05 08:10:56 1.50
@@ -1,83 +1,83 @@ @@ -1,83 +1,83 @@
1# $NetBSD: Makefile,v 1.49 2015/07/06 09:39:40 adam Exp $ 1# $NetBSD: Makefile,v 1.50 2015/08/05 08:10:56 adam Exp $
2 2
3DISTNAME= squid-3.5.6 3DISTNAME= squid-3.5.7
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 errors/errorpage.css tools/cachemgr.conf 43 errors/errorpage.css tools/cachemgr.conf
44EGDIR= share/examples/squid 44EGDIR= share/examples/squid
45.for f in cachemgr.conf errorpage.css mime.conf squid.conf 45.for f in cachemgr.conf errorpage.css mime.conf squid.conf
46CONF_FILES+= ${PREFIX}/${EGDIR}/${f} ${PKG_SYSCONFDIR}/${f} 46CONF_FILES+= ${PREFIX}/${EGDIR}/${f} ${PKG_SYSCONFDIR}/${f}
47.endfor 47.endfor
48OWN_DIRS= ${SQUID_DATADIR} 48OWN_DIRS= ${SQUID_DATADIR}
49OWN_DIRS_PERMS+=${SQUID_DATADIR}/cache ${SQUID_USER} ${SQUID_GROUP} 0750 \ 49OWN_DIRS_PERMS+=${SQUID_DATADIR}/cache ${SQUID_USER} ${SQUID_GROUP} 0750 \
50 ${SQUID_DATADIR}/logs ${SQUID_USER} ${SQUID_GROUP} 0750 50 ${SQUID_DATADIR}/logs ${SQUID_USER} ${SQUID_GROUP} 0750
51 51
52.include "Makefile.common" 52.include "Makefile.common"
53.include "options.mk" 53.include "options.mk"
54 54
55# Incorrect check for <netinet/ip_icmp.h> on FreeBSD: 55# Incorrect check for <netinet/ip_icmp.h> on FreeBSD:
56.if $(OPSYS) == "FreeBSD" 56.if $(OPSYS) == "FreeBSD"
57CONFIGURE_ENV+= ac_cv_header_netinet_ip_icmp_h=yes 57CONFIGURE_ENV+= ac_cv_header_netinet_ip_icmp_h=yes
58.endif 58.endif
59 59
60INSTALLATION_DIRS= ${EGDIR} 60INSTALLATION_DIRS= ${EGDIR}
61 61
62SPECIAL_PERMS+= libexec/pinger ${SETUID_ROOT_PERMS} 62SPECIAL_PERMS+= libexec/pinger ${SETUID_ROOT_PERMS}
63 63
64RCD_SCRIPTS= squid 64RCD_SCRIPTS= squid
65RCD_SCRIPT_SRC.squid= files/squid.sh 65RCD_SCRIPT_SRC.squid= files/squid.sh
66 66
67SUBST_CLASSES+= confs 67SUBST_CLASSES+= confs
68SUBST_STAGE.confs= pre-configure 68SUBST_STAGE.confs= pre-configure
69SUBST_FILES.confs= src/cf.data.pre 69SUBST_FILES.confs= src/cf.data.pre
70SUBST_SED.confs= -e "s/@USER@/${SQUID_USER}/" 70SUBST_SED.confs= -e "s/@USER@/${SQUID_USER}/"
71SUBST_MESSAGE.confs= Fixing configuration files. 71SUBST_MESSAGE.confs= Fixing configuration files.
72 72
73post-build: 73post-build:
74 cd ${WRKSRC}/src && ${CP} -pf squid.conf.documented squid.conf.default 74 cd ${WRKSRC}/src && ${CP} -pf squid.conf.documented squid.conf.default
75 75
76post-install: 76post-install:
77.for f in ${EGFILES} 77.for f in ${EGFILES}
78 ${INSTALL_DATA} ${WRKSRC}/${f} \ 78 ${INSTALL_DATA} ${WRKSRC}/${f} \
79 ${DESTDIR}${PREFIX}/${EGDIR}/`basename ${f} .default` 79 ${DESTDIR}${PREFIX}/${EGDIR}/`basename ${f} .default`
80.endfor 80.endfor
81 81
82.include "../../devel/libltdl/buildlink3.mk" 82.include "../../devel/libltdl/buildlink3.mk"
83.include "../../mk/bsd.pkg.mk" 83.include "../../mk/bsd.pkg.mk"
cvs diff -r1.35 -r1.36 pkgsrc/www/squid3/Attic/distinfo (switch to unified diff)

--- pkgsrc/www/squid3/Attic/distinfo 2015/07/06 09:39:40 1.35
+++ pkgsrc/www/squid3/Attic/distinfo 2015/08/05 08:10:56 1.36
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: distinfo,v 1.35 2015/07/06 09:39:40 adam Exp $ 1$NetBSD: distinfo,v 1.36 2015/08/05 08:10:56 adam Exp $
2 2
3SHA1 (squid-3.5.6.tar.xz) = c5f3ab47e61a08fa6a8767d45befeffd7d26fd9f 3SHA1 (squid-3.5.7.tar.xz) = e7dcc0cbcee6fd10a8c8bf3e9bff0dc6359ccc48
4RMD160 (squid-3.5.6.tar.xz) = 76dd531fef1419f3e220ff55a5dc8e2e06579d90 4RMD160 (squid-3.5.7.tar.xz) = 7284dda15e27c643cf69db1c53cc798404f6f53a
5Size (squid-3.5.6.tar.xz) = 2291152 bytes 5Size (squid-3.5.7.tar.xz) = 2294580 bytes
6SHA1 (patch-compat_compat.h) = d6cd93fa7a6d0faad3bf1aca8ae4fa5c984fe288 6SHA1 (patch-compat_compat.h) = d6cd93fa7a6d0faad3bf1aca8ae4fa5c984fe288
7SHA1 (patch-configure) = 0c3370eead6e3f3a8534c26b74d6ef8f3f13ec8f 7SHA1 (patch-configure) = 0c3370eead6e3f3a8534c26b74d6ef8f3f13ec8f
8SHA1 (patch-errors_Makefile.in) = afbac822ac84d5e1734d55fc625e949ae0b85289 8SHA1 (patch-errors_Makefile.in) = afbac822ac84d5e1734d55fc625e949ae0b85289
9SHA1 (patch-src_Makefile.in) = 7233a92a4f6ecc06d88e125f08f7413e0741f3b6 9SHA1 (patch-src_Makefile.in) = 7233a92a4f6ecc06d88e125f08f7413e0741f3b6
10SHA1 (patch-src_SquidNew.cc) = eef6e72e168cf7f40518fab13dc2f55ed0268db9 10SHA1 (patch-src_SquidNew.cc) = eef6e72e168cf7f40518fab13dc2f55ed0268db9
11SHA1 (patch-src_base_TidyPointer.h) = d05017d7db904286afb02600ed3cc2f0f253b939 11SHA1 (patch-src_base_TidyPointer.h) = d05017d7db904286afb02600ed3cc2f0f253b939
12SHA1 (patch-src_ip_Intercept.cc) = 80de6ca56d61e389641b35515e3509b264b1950f 12SHA1 (patch-src_ip_Intercept.cc) = 80de6ca56d61e389641b35515e3509b264b1950f
13SHA1 (patch-src_store.cc) = 055d98a59103b02a51876a5c8ffed9514954beb4 13SHA1 (patch-src_store.cc) = 055d98a59103b02a51876a5c8ffed9514954beb4
14SHA1 (patch-tools_Makefile.in) = 3a7678c63a11a35fabef091a3b18e63859f0796f 14SHA1 (patch-tools_Makefile.in) = 3a7678c63a11a35fabef091a3b18e63859f0796f