# ChangeLog for net-proxy/squid
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/ChangeLog,v 1.326 2011/09/03 13:29:43 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/ChangeLog,v 1.327 2011/10/17 19:18:33 eras Exp $
+
+ 17 Oct 2011; Eray Aslan <eras@gentoo.org> -squid-3.1.8.ebuild,
+ -files/squid-3.1.8-gentoo.patch, -files/squid-3.1.8-libmd5.patch,
+ -files/squid-3.1.8-qafixes.patch, -squid-3.1.9.ebuild,
+ -files/squid-3.1.9-gentoo.patch, -files/squid-3.1.9-libmd5.patch,
+ -files/squid-3.1.9-qafixes.patch, -squid-3.1.12.ebuild,
+ -files/squid-3.1.12-gentoo.patch:
+ remove vulnerable versions
03 Sep 2011; Raúl Porcel <armin76@gentoo.org> squid-3.1.15.ebuild:
alpha/arm/ia64/sparc/x86 stable wrt #381065
-----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
AUX squid-2-heimdal.patch 776 RMD160 2ced12e7682356ee2eb660d877437c3ddad6476e SHA1 3a693c2c975fe4c77ee729d8af8ef28097b11fb6 SHA256 bd0083836321c596db3fc8749152bc77d5a4bd03070d33541b7b489af59e4c25
AUX squid-2.7.9-gentoo.patch 13118 RMD160 44d2482b9c998c1641ab3e2d5c5701a4f6fb6165 SHA1 b5007d3d2df28c35b88c814b41fd4e182ad34f2b SHA256 981588dc2d599a2b49f550a1ae111e96515b437a03c8d0dccc6f96f078009d11
-AUX squid-3.1.12-gentoo.patch 10489 RMD160 ab6366c939cbe317238ae47f3f0ee938d52d8946 SHA1 9e986c234e92742f8f07f401542065de195b0fff SHA256 b6f1db509748178889e8d4be042f07dbddbd2dfc3d354733b084dfed0245eff6
AUX squid-3.1.15-gentoo.patch 10538 RMD160 f4ac679e89bdd8d43a2cd00b1a63d555a25b9528 SHA1 63b2c8a1767019b35b75403dd9a7bf6b33c69edc SHA256 75549600815236932f549e1c4e0286b6cbb4dc26a7e545abb96b7d29f0128ab3
-AUX squid-3.1.8-gentoo.patch 12364 RMD160 5a825dfd6d18ce8c91e16d8f0841737bc87b3d74 SHA1 29ae980d9b5ecf6b6b1481a36d2d4abb254c4a0a SHA256 bef6ba17f25aa07a5d3691c7a4af7ff478a6c0948b20a867808184a2839417b6
-AUX squid-3.1.8-libmd5.patch 588 RMD160 ae825720524b07bd2c0ae77b15b657fdd9392617 SHA1 5deb1d7a5f6c91b9a910f6460d2df6bc7b07c18e SHA256 c09de18fbcc1b5c4dda19f91c2182e179d05938a235774113a7a3af5862909d5
-AUX squid-3.1.8-qafixes.patch 2214 RMD160 ed05e224d5f392b43f88d1d72415d7539fb3e77b SHA1 4991eb402b9192e3cd18871d3cca7469d10eef35 SHA256 f02b1dbd7afca670b804b616b74e006a2f7aa0bd08988c3120b4064258754af8
-AUX squid-3.1.9-gentoo.patch 12414 RMD160 b261ae7d3f63a4742794d1b2a98432dafd7c2f66 SHA1 aca221c21ed7ba3c4dcd18c5a45bedbd27ff12c9 SHA256 3504457649b4a7f16a41295c2c129ea76aa348f82c64bd8ecf0b17362d72ecca
-AUX squid-3.1.9-libmd5.patch 588 RMD160 ef4357d2d50093fe6cb4dc0ffa7a1b794b6929d8 SHA1 856cb71969c4d782425b4daa04d75e8f51e90f2d SHA256 4fd728d41485999b806b91b25ae28de2194a95cacc2b03c6ebda2ef8cdfb84d5
-AUX squid-3.1.9-qafixes.patch 2214 RMD160 4b1bab32406f41f0da0d0e359201de5167bde53c SHA1 0d803778589c6ffbbe13125d27487457a9015cad SHA256 44b32ef611ace4665ab0b671ecb2d9996da207bd3e6632246874651dc6741918
AUX squid.confd 540 RMD160 aa4ec5a6eebad1222667aff6b3180931cf566b13 SHA1 1c0c23b08bd0450eae14604c2b45ca67c7ac25c5 SHA256 aeef7060c50074b65c664fc106d7319ce380d25320ee2ee00f7d6021846b88ec
AUX squid.cron 143 RMD160 0706a7ad04691b9a93a2897c319008440483ba11 SHA1 6138db0eccb7320e707b8d60c2970ef684e29336 SHA256 4c9e2afe5b0bba583ce896233ea1f9262beeb1b6cf51b4adb48d5f5c03933b2f
AUX squid.initd 3315 RMD160 a6209a27770eb2aebdd533c946e790efec0de53b SHA1 08519fa20a7286cba9ea82e7b23dd8116ab7f77b SHA256 d3eac36c2fc313688e19cde7ace63783cd202315b23c0b2bd0219a4504cb2b35
AUX squid.logrotate 103 RMD160 e7e4a6bde48e2735632692a6e628955b270f30ad SHA1 6e8d42f6a1a3109f0a26ed30edc7d91c6816e23f SHA256 e5ddce1c9af851040affa15e1a59e89d8db0f2eea7c461320a1d3784578f4482
AUX squid.pam 315 RMD160 afb3f1cc36ba5ef0015c40040b6d5c18485ec828 SHA1 40933fabaaa2a9cb38d57c3acb77857082c82ae5 SHA256 68ef4282f9fb8506df710d0ae16e84e991e9b138c7f1d0af922682219c7a971f
DIST squid-2.7.STABLE9.tar.gz 1789462 RMD160 59c63348beed9a672612d48f9ef5e7ca81fa9840 SHA1 6d90fe06468b662b2eefd7ffeb47b9a78f0a871d SHA256 d54ca048313c4b64609fcdf9f1934a70fc1702032a5f04073056d7491d3dd781
-DIST squid-3.1.12.tar.gz 3357403 RMD160 0cdba1fddd9a9510d82f1bad3a1f693c0518da4a SHA1 410f1bb080a6d07dee822f6daa7af79fa7195738 SHA256 2f662e9e42250796fc4cd4ba7742d5e28787e35acc1fa815bcd4cb331521ee40
DIST squid-3.1.15.tar.gz 3397495 RMD160 cf5910e15ed594cde5f205206d4c1ec65aa445f3 SHA1 c0cfdf54db5ca6ffc23c3f328175ec19f6465d8c SHA256 c56207691ec6ce19f7d19805b290b8f58c63c81e2070d7cd3a824a0b49509b2b
-DIST squid-3.1.8.tar.gz 3253846 RMD160 d5264a517b57774a9f536bee7977ac9769fca63f SHA1 1b3e14e653a77462607aefa7931605a5e24829b9 SHA256 7a8bf96fb0f8245ff0ad6bd7895d6f4f79518c80deb4ef05e0c2a36b22c9b9ac
-DIST squid-3.1.9.tar.gz 3264260 RMD160 731e56d026048c2430d8860a074855c62515ec0e SHA1 53f2000e73d838f8419c5643d335e9996e51303c SHA256 3f690ff31dc4df361235c7253530624f52364ea8783eec41e3ab068c3264aff1
EBUILD squid-2.7.9.ebuild 6175 RMD160 a235925ac773d7d569a958366923e5a03adcc17c SHA1 0dbb84b76302c265ef4ee193035f5882d46146ed SHA256 587b0f52d2fb973f2686d947893191acf3a1770d467cd8134091fa2c07f01f3d
-EBUILD squid-3.1.12.ebuild 6634 RMD160 df632e270901d6b9625c79aaa73a3082bb9587d8 SHA1 50ccad62a52157912828a30c36a18ea063e960d2 SHA256 9e7ef6c8e105f5c1595e5801a25cc586737b714e71d536e8749b595475e2968e
EBUILD squid-3.1.15.ebuild 6621 RMD160 c959b10a7905e000bcf49ea296cbb191555ddfa0 SHA1 dde6be2583ce96050a23f964ae1bed8b58170b5b SHA256 911d065d38544a59af7ce6f4299fc282fdf10aa4bd0869503b45b214fdf87bbc
-EBUILD squid-3.1.8.ebuild 7018 RMD160 ebeb8889012c8a9b05813b5e1e8cd955887db0bf SHA1 48bbda8dc9d056fe98ff6024e3acf41b8fb8df99 SHA256 7f98d3bcedae6eb83455744f76951ea35fd15c39fbc270dd6b3a59fd2873e8ce
-EBUILD squid-3.1.9.ebuild 6901 RMD160 75a2da88dc484c9bb514d06b78ead88913bb14c7 SHA1 9311e92baca95e50c39f7b3592705d9999e98257 SHA256 d9a09b9bd151fde57a609ba462758cfaaf04e89dfbc01c4155cb11de122c5dfd
-MISC ChangeLog 69422 RMD160 f6d1680a99e5756d37be1fce81ebc9dc25fea4d4 SHA1 9cb362c3e72833534fd0115fcbb6cca9eefe9cc5 SHA256 f3fa401efe14dcbca36d652781011de42c409d584a8774555e02999e381d5706
+MISC ChangeLog 69801 RMD160 837b2089a7ca13669ddf0c57ebf4331adc72545c SHA1 47b7c87f729fc65291b9ac092aac361951a8eb1c SHA256 53cc831caa2d3eb02064e92a2b9223606110f6fb9469cbf0864ba6dcf16823ea
MISC metadata.xml 1015 RMD160 03ac3fffc7b01e366b173a4c3bf1dc6be1bb9202 SHA1 3c1681981e2a143ee50d0ee5bc901ac81e7c5cc4 SHA256 06d8e8a7909b9140eb2e70193db754b84d864da260d6cdf9bde9fa58442ce34a
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.17 (GNU/Linux)
-iEYEARECAAYFAk5iK80ACgkQuQc30/atMkAzlACgveM+nBV8FVznaamVbY/0qFly
-cucAnRCYjHZIXqrGohgsmz6pypyCdEmB
-=UhHl
+iQIcBAEBCAAGBQJOnH+ZAAoJEHfx8XVYajsfHC0P/A5O2lU8/MSYF2X80rD1IjPd
++y4yZV5XlRZibUK4u2/zJYfKSc/XD33d4wsSGiFvnLEDgTbZnvolx/F9nxNg81ua
+aLy4dAk7m5gqTp+buHMlqEP5pZWU243mTBcor33zg4XTlGt012eOJj/JGCBVSlXT
+f4EP0X5B+lpEvLO3H9biZVZaQXVs9lQCvaxcpWAPnoVWmhmUgFYS2fcqU1KWx4nE
+iv5fFdderLCy0Q7t7fR1sbl3LbUSH85p3vj/KJiYnSnH+Yh9A40jF5PCw4mN2dhK
+OWEr7MND1f1tCJRyf8N7a+NE1IDHOt+AG56O3Uy1d3MLdL+NqoLXXm8ZAGR2BOS6
+ux8Hvrp3+MIZBbHHWjOhecJgUKsAODmMphlX6Z+L8keQsZZ/sr+DgwkaQRvpmq0o
+1DSQaawG1z/uu+bexZZ6Bn6Vb6N3+oQ5R+WFPOnuPlWdMD808SlYdNd5FltBL35/
+BQeLk+THf5jOB+IA2TZ74nt0YuZhICulRyzP4wiG8sVKgk6HrkaGu7tMwhsebFb9
+LGahXa2ADhY77yaClqMtpGRcsPzV/DT2v/d32x3cSaSUlxYhHgFeJ8Q/w1LcGSJQ
+R5paGd/jIjYGTOtynZZlX4wxbW5DoAnE0/3t2fPiy0HaQgxSmCnCoUT3hRLLTT09
+qkRFl38CwhBaEtrgmWVc
+=4VLv
-----END PGP SIGNATURE-----
+++ /dev/null
-diff --git a/configure.ac b/configure.ac
-index 23922c0..f359a00 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -16,9 +16,9 @@ PRESET_CFLAGS="$CFLAGS"
- PRESET_LDFLAGS="$LDFLAGS"
-
- dnl Set default LDFLAGS
--if test -z "$LDFLAGS"; then
-- LDFLAGS="-g"
--fi
-+dnl if test -z "$LDFLAGS"; then
-+dnl LDFLAGS="-g"
-+dnl fi
-
- dnl Check for GNU cc
- AC_PROG_CC
-diff --git a/helpers/basic_auth/MSNT/confload.c b/helpers/basic_auth/MSNT/confload.c
-index e04365e..7241b3f 100644
---- a/helpers/basic_auth/MSNT/confload.c
-+++ b/helpers/basic_auth/MSNT/confload.c
-@@ -27,7 +27,7 @@
-
- /* Path to configuration file */
- #ifndef SYSCONFDIR
--#define SYSCONFDIR "/usr/local/squid/etc"
-+#define SYSCONFDIR "/etc/squid"
- #endif
- #define CONFIGFILE SYSCONFDIR "/msntauth.conf"
-
-diff --git a/helpers/basic_auth/MSNT/msntauth.conf.default b/helpers/basic_auth/MSNT/msntauth.conf.default
-index 323bc1c..c3d7d21 100644
---- a/helpers/basic_auth/MSNT/msntauth.conf.default
-+++ b/helpers/basic_auth/MSNT/msntauth.conf.default
-@@ -8,6 +8,6 @@ server my_PDC my_BDC my_NTdomain
- server other_PDC other_BDC otherdomain
-
- # Denied and allowed users. Comment these if not needed.
--#denyusers /usr/local/squid/etc/msntauth.denyusers
--#allowusers /usr/local/squid/etc/msntauth.allowusers
-+#denyusers /etc/squid/msntauth.denyusers
-+#allowusers /etc/squid/msntauth.allowusers
-
-diff --git a/helpers/basic_auth/SMB/smb_auth.sh b/helpers/basic_auth/SMB/smb_auth.sh
-index 2a1abb3..b3ebb7a 100755
---- a/helpers/basic_auth/SMB/smb_auth.sh
-+++ b/helpers/basic_auth/SMB/smb_auth.sh
-@@ -24,7 +24,7 @@ read NMBCAST
- read AUTHSHARE
- read AUTHFILE
- read SMBUSER
--read SMBPASS
-+read -r SMBPASS
-
- # Find domain controller
- echo "Domain name: $DOMAINNAME"
-@@ -47,7 +47,7 @@ else
- addropt=""
- fi
- echo "Query address options: $addropt"
--dcip=`nmblookup $addropt "$PASSTHROUGH#1c" | awk '/^[0-9.]+ / { print $1 ; exit }'`
-+dcip=`nmblookup $addropt "$PASSTHROUGH#1c" | awk '/^[0-9.]+\..+ / { print $1 ; exit }'`
- echo "Domain controller IP address: $dcip"
- [ -n "$dcip" ] || exit 1
-
-diff --git a/helpers/external_acl/session/squid_session.8 b/helpers/external_acl/session/squid_session.8
-index 7808f41..d86e320 100644
---- a/helpers/external_acl/session/squid_session.8
-+++ b/helpers/external_acl/session/squid_session.8
-@@ -35,7 +35,7 @@ the first request.
- .P
- Configuration example using the default automatic mode
- .IP
--external_acl_type session ttl=300 negative_ttl=0 children=1 concurrency=200 %LOGIN /usr/local/squid/libexec/squid_session
-+external_acl_type session ttl=300 negative_ttl=0 children=1 concurrency=200 %LOGIN /usr/libexec/squid/squid_session
- .IP
- acl session external session
- .IP
-diff --git a/helpers/external_acl/unix_group/squid_unix_group.8 b/helpers/external_acl/unix_group/squid_unix_group.8
-index 72aa1a3..cde5f20 100644
---- a/helpers/external_acl/unix_group/squid_unix_group.8
-+++ b/helpers/external_acl/unix_group/squid_unix_group.8
-@@ -27,7 +27,7 @@ Strip NT domain name component from user names (/ or \\ separated)
- This squid.conf example defines two Squid acls. usergroup1 matches users in group1, and usergroup2
- matches users in group2 or group3
- .IP
--external_acl_type unix_group %LOGIN /usr/local/squid/libexec/squid_unix_group -p
-+external_acl_type unix_group %LOGIN /usr/libexec/squid/squid_unix_group -p
- .IP
- acl usergroup1 external unix_group group1
- .IP
-diff --git a/helpers/negotiate_auth/squid_kerb_auth/configure.ac b/helpers/negotiate_auth/squid_kerb_auth/configure.ac
-index e78f61e..ca6c0c2 100644
---- a/helpers/negotiate_auth/squid_kerb_auth/configure.ac
-+++ b/helpers/negotiate_auth/squid_kerb_auth/configure.ac
-@@ -17,6 +17,7 @@ dnl Process this file with autoconf to produce a configure script.
-
- AC_INIT([squid_kerb_auth],[1.0.5],[markus_moeller@compuserve.com])
- AM_INIT_AUTOMAKE(squid_kerb_auth,1.0.5)
-+AM_MAINTAINER_MODE
- AC_CONFIG_SRCDIR([squid_kerb_auth.c])
-
- AC_PROG_CC
-diff --git a/src/Makefile.am b/src/Makefile.am
-index e1c0be4..423553e 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -639,7 +639,6 @@ BUILT_SOURCES = \
-
- sysconf_DATA = \
- squid.conf.default \
-- squid.conf.documented \
- mime.conf.default
-
- data_DATA = \
-@@ -720,8 +719,8 @@ DEFAULT_CACHE_LOG = $(DEFAULT_LOG_PREFIX)/cache.log
- DEFAULT_ACCESS_LOG = $(DEFAULT_LOG_PREFIX)/access.log
- DEFAULT_STORE_LOG = $(DEFAULT_LOG_PREFIX)/store.log
- DEFAULT_PID_FILE = $(DEFAULT_PIDFILE)
--DEFAULT_NETDB_FILE = $(DEFAULT_LOG_PREFIX)/netdb.state
--DEFAULT_SWAP_DIR = $(localstatedir)/cache
-+DEFAULT_NETDB_FILE = $(localstatedir)/run/netdb.state
-+DEFAULT_SWAP_DIR = $(localstatedir)/cache/squid
- DEFAULT_PINGER = $(libexecdir)/`echo pinger | sed '$(transform);s/$$/$(EXEEXT)/'`
- DEFAULT_UNLINKD = $(libexecdir)/`echo unlinkd | sed '$(transform);s/$$/$(EXEEXT)/'`
- DEFAULT_DISKD = $(libexecdir)/`echo diskd | sed '$(transform);s/$$/$(EXEEXT)/'`
-@@ -798,13 +797,11 @@ install-data-local: install-sysconfDATA install-dataDATA
- @if test -f $(DESTDIR)$(DEFAULT_CONFIG_FILE) ; then \
- echo "$@ will not overwrite existing $(DESTDIR)$(DEFAULT_CONFIG_FILE)" ; \
- else \
-- echo "$(INSTALL_DATA) squid.conf.default $(DESTDIR)$(DEFAULT_CONFIG_FILE)"; \
-- $(INSTALL_DATA) squid.conf.default $(DESTDIR)$(DEFAULT_CONFIG_FILE); \
-+ echo "$(INSTALL_DATA) squid.conf.documented $(DESTDIR)$(DEFAULT_CONFIG_FILE)"; \
-+ $(INSTALL_DATA) squid.conf.documented $(DESTDIR)$(DEFAULT_CONFIG_FILE); \
- fi
-- echo "$(INSTALL_DATA) squid.conf.default $(DESTDIR)$(DEFAULT_CONFIG_FILE).default"; \
-- $(INSTALL_DATA) squid.conf.default $(DESTDIR)$(DEFAULT_CONFIG_FILE).default; \
-- echo "$(INSTALL_DATA) squid.conf.documented $(DESTDIR)$(DEFAULT_CONFIG_FILE).documented"; \
-- $(INSTALL_DATA) squid.conf.documented $(DESTDIR)$(DEFAULT_CONFIG_FILE).documented; \
-+ echo "$(INSTALL_DATA) squid.conf.documented $(DESTDIR)$(DEFAULT_CONFIG_FILE).default"; \
-+ $(INSTALL_DATA) squid.conf.documented $(DESTDIR)$(DEFAULT_CONFIG_FILE).default; \
- $(mkinstalldirs) $(DESTDIR)$(DEFAULT_LOG_PREFIX); \
- $(mkinstalldirs) $(DESTDIR)$(DEFAULT_SWAP_DIR); \
- $(mkinstalldirs) $(DESTDIR)`dirname $(DEFAULT_PID_FILE)`
-diff --git a/src/cf.data.pre b/src/cf.data.pre
-index b504918..56928c4 100644
---- a/src/cf.data.pre
-+++ b/src/cf.data.pre
-@@ -768,6 +768,7 @@ acl Safe_ports port 280 # http-mgmt
- acl Safe_ports port 488 # gss-http
- acl Safe_ports port 591 # filemaker
- acl Safe_ports port 777 # multiling http
-+acl Safe_ports port 901 # SWAT
- acl CONNECT method CONNECT
- NOCOMMENT_END
- DOC_END
-@@ -917,6 +918,9 @@ http_access deny CONNECT !SSL_ports
- http_access allow localnet
- http_access allow localhost
-
-+# Allow the localhost to have access by default
-+http_access allow localhost
-+
- # And finally deny all other access to this proxy
- http_access deny all
- NOCOMMENT_END
-@@ -4138,11 +4142,11 @@ COMMENT_END
-
- NAME: cache_mgr
- TYPE: string
--DEFAULT: webmaster
-+DEFAULT: root
- LOC: Config.adminEmail
- DOC_START
- Email-address of local cache manager who will receive
-- mail if the cache dies. The default is "webmaster."
-+ mail if the cache dies. The default is "root."
- DOC_END
-
- NAME: mail_from
-@@ -6456,7 +6460,7 @@ DOC_END
- NAME: forwarded_for
- COMMENT: on|off|transparent|truncate|delete
- TYPE: string
--DEFAULT: on
-+DEFAULT: delete
- LOC: opt_forwarded_for
- DOC_START
- If set to "on", Squid will append your client's IP address
-diff --git a/src/debug.cc b/src/debug.cc
-index 32813bf..6de334a 100644
---- a/src/debug.cc
-+++ b/src/debug.cc
-@@ -452,7 +452,7 @@ _db_init(const char *logfile, const char *options)
- #if HAVE_SYSLOG && defined(LOG_LOCAL4)
-
- if (Debug::log_syslog)
-- openlog(APP_SHORTNAME, LOG_PID | LOG_NDELAY | LOG_CONS, syslog_facility);
-+ openlog(APP_SHORTNAME, LOG_PID | LOG_NDELAY, syslog_facility);
-
- #endif /* HAVE_SYSLOG */
-
-diff --git a/src/main.cc b/src/main.cc
-index 941126d..71f3c3b 100644
---- a/src/main.cc
-+++ b/src/main.cc
-@@ -1555,7 +1555,7 @@ watch_child(char *argv[])
- if (*(argv[0]) == '(')
- return;
-
-- openlog(APP_SHORTNAME, LOG_PID | LOG_NDELAY | LOG_CONS, LOG_LOCAL4);
-+ openlog(APP_SHORTNAME, LOG_PID | LOG_NDELAY, LOG_DAEMON);
-
- if ((pid = fork()) < 0)
- syslog(LOG_ALERT, "fork failed: %s", xstrerror());
-@@ -1599,7 +1599,7 @@ watch_child(char *argv[])
-
- if ((pid = fork()) == 0) {
- /* child */
-- openlog(APP_SHORTNAME, LOG_PID | LOG_NDELAY | LOG_CONS, LOG_LOCAL4);
-+ openlog(APP_SHORTNAME, LOG_PID | LOG_NDELAY, LOG_DAEMON);
- prog = xstrdup(argv[0]);
- argv[0] = xstrdup("(squid)");
- execvp(prog, argv);
-@@ -1607,7 +1607,7 @@ watch_child(char *argv[])
- }
-
- /* parent */
-- openlog(APP_SHORTNAME, LOG_PID | LOG_NDELAY | LOG_CONS, LOG_LOCAL4);
-+ openlog(APP_SHORTNAME, LOG_PID | LOG_NDELAY, LOG_DAEMON);
-
- syslog(LOG_NOTICE, "Squid Parent: child process %d started", pid);
-
-commit e3f6cc6438869766751556f2d9747669b4c51fe1
-Author: Eray Aslan <eras@gentoo.org>
-Date: Fri Apr 29 10:55:17 2011 +0000
-
- Do not auto detect kerberos.
-
- No need for automagic dependencies. We already give the necessary flags
- to the configure script.
-
-diff --git a/helpers/negotiate_auth/squid_kerb_auth/configure.ac b/helpers/negotiate_auth/squid_kerb_auth/configure.ac
-index e78f61e..dc739b2 100644
---- a/helpers/negotiate_auth/squid_kerb_auth/configure.ac
-+++ b/helpers/negotiate_auth/squid_kerb_auth/configure.ac
-@@ -279,40 +279,6 @@ AC_ARG_ENABLE(seam-64,
- check_seam_64
- fi ])
-
--dnl Define system default
--if test "$enable_arg" = "no"; then
-- dnl Autodetect system
-- dnl Check krb5-config first
-- AC_CHECK_PROG(ac_krb5_config,krb5-config,yes,no)
-- case $sys in
-- Linux) rpm -q heimdal-lib >/dev/null 2>&1
-- if test $? = 0 ; then
-- check_heimdal
-- else
-- check_mit
-- fi
-- ;;
-- AIX) lslpp -L krb5.client.rte >/dev/null 2>&1
-- if test $? = 0 ; then
-- check_nas
-- else
-- check_mit
-- fi
-- ;;
-- SunOS) pkginfo SUNWgss >/dev/null 2>&1
-- if test $? = 0 ; then
-- check_seam
-- else
-- check_mit
-- fi
-- ;;
-- FreeBSD) check_heimdal
-- ;;
-- *) check_mit
-- ;;
-- esac
--fi
--
- AC_C_BIGENDIAN
-
- AC_CHECK_HEADERS( \
+++ /dev/null
-diff -Nru squid-3.1.8.orig/acinclude.m4 squid-3.1.8/acinclude.m4
---- squid-3.1.8.orig/acinclude.m4 2010-09-04 05:25:57.000000000 +0200
-+++ squid-3.1.8/acinclude.m4 2010-09-23 23:34:10.000000000 +0200
-@@ -75,7 +75,7 @@
- AC_MSG_CHECKING([whether compiler accepts -fhuge-objects])
- AC_CACHE_VAL([ac_cv_test_checkforhugeobjects],[
- ac_cv_test_checkforhugeobjects=`echo "int main(int argc, char **argv) { int foo; }" > conftest.cc
--${CXX} -Werror -fhuge-objects -o conftest.bin conftest.cc 2>/dev/null
-+${CXX} -fhuge-objects -o conftest.bin conftest.cc 2>/dev/null
- res=$?
- rm -f conftest.*
- echo yes
-diff -Nru squid-3.1.8.orig/configure.in squid-3.1.8/configure.in
---- squid-3.1.8.orig/configure.in 2010-09-04 05:26:52.000000000 +0200
-+++ squid-3.1.8/configure.in 2010-09-23 23:34:10.000000000 +0200
-@@ -16,9 +16,9 @@
- PRESET_LDFLAGS="$LDFLAGS"
-
- dnl Set default LDFLAGS
--if test -z "$LDFLAGS"; then
-- LDFLAGS="-g"
--fi
-+dnl if test -z "$LDFLAGS"; then
-+dnl LDFLAGS="-g"
-+dnl fi
-
- dnl Check for GNU cc
- AC_PROG_CC
-diff -Nru squid-3.1.8.orig/helpers/basic_auth/MSNT/confload.c squid-3.1.8/helpers/basic_auth/MSNT/confload.c
---- squid-3.1.8.orig/helpers/basic_auth/MSNT/confload.c 2010-09-04 05:25:57.000000000 +0200
-+++ squid-3.1.8/helpers/basic_auth/MSNT/confload.c 2010-09-23 23:34:10.000000000 +0200
-@@ -27,7 +27,7 @@
-
- /* Path to configuration file */
- #ifndef SYSCONFDIR
--#define SYSCONFDIR "/usr/local/squid/etc"
-+#define SYSCONFDIR "/etc/squid"
- #endif
- #define CONFIGFILE SYSCONFDIR "/msntauth.conf"
-
-diff -Nru squid-3.1.8.orig/helpers/basic_auth/MSNT/msntauth.conf.default squid-3.1.8/helpers/basic_auth/MSNT/msntauth.conf.default
---- squid-3.1.8.orig/helpers/basic_auth/MSNT/msntauth.conf.default 2010-09-04 05:25:57.000000000 +0200
-+++ squid-3.1.8/helpers/basic_auth/MSNT/msntauth.conf.default 2010-09-23 23:34:10.000000000 +0200
-@@ -8,6 +8,6 @@
- server other_PDC other_BDC otherdomain
-
- # Denied and allowed users. Comment these if not needed.
--#denyusers /usr/local/squid/etc/msntauth.denyusers
--#allowusers /usr/local/squid/etc/msntauth.allowusers
-+#denyusers /etc/squid/msntauth.denyusers
-+#allowusers /etc/squid/msntauth.allowusers
-
-diff -Nru squid-3.1.8.orig/helpers/basic_auth/SMB/Makefile.am squid-3.1.8/helpers/basic_auth/SMB/Makefile.am
---- squid-3.1.8.orig/helpers/basic_auth/SMB/Makefile.am 2010-09-04 05:25:57.000000000 +0200
-+++ squid-3.1.8/helpers/basic_auth/SMB/Makefile.am 2010-09-23 23:34:10.000000000 +0200
-@@ -16,7 +16,7 @@
- ## FIXME: autoconf should test for the samba path.
-
- SMB_AUTH_HELPER = smb_auth.sh
--SAMBAPREFIX=/usr/local/samba
-+SAMBAPREFIX=/usr
- SMB_AUTH_HELPER_PATH = $(libexecdir)/$(SMB_AUTH_HELPER)
-
- libexec_SCRIPTS = $(SMB_AUTH_HELPER)
-diff -Nru squid-3.1.8.orig/helpers/basic_auth/SMB/smb_auth.sh squid-3.1.8/helpers/basic_auth/SMB/smb_auth.sh
---- squid-3.1.8.orig/helpers/basic_auth/SMB/smb_auth.sh 2010-09-04 05:25:57.000000000 +0200
-+++ squid-3.1.8/helpers/basic_auth/SMB/smb_auth.sh 2010-09-23 23:34:10.000000000 +0200
-@@ -24,7 +24,7 @@
- read AUTHSHARE
- read AUTHFILE
- read SMBUSER
--read SMBPASS
-+read -r SMBPASS
-
- # Find domain controller
- echo "Domain name: $DOMAINNAME"
-@@ -47,7 +47,7 @@
- addropt=""
- fi
- echo "Query address options: $addropt"
--dcip=`$SAMBAPREFIX/bin/nmblookup $addropt "$PASSTHROUGH#1c" | awk '/^[0-9.]+ / { print $1 ; exit }'`
-+dcip=`$SAMBAPREFIX/bin/nmblookup $addropt "$PASSTHROUGH#1c" | awk '/^[0-9.]+\..+ / { print $1 ; exit }'`
- echo "Domain controller IP address: $dcip"
- [ -n "$dcip" ] || exit 1
-
-diff -Nru squid-3.1.8.orig/helpers/external_acl/session/squid_session.8 squid-3.1.8/helpers/external_acl/session/squid_session.8
---- squid-3.1.8.orig/helpers/external_acl/session/squid_session.8 2010-09-04 05:25:57.000000000 +0200
-+++ squid-3.1.8/helpers/external_acl/session/squid_session.8 2010-09-23 23:34:10.000000000 +0200
-@@ -35,7 +35,7 @@
- .P
- Configuration example using the default automatic mode
- .IP
--external_acl_type session ttl=300 negative_ttl=0 children=1 concurrency=200 %LOGIN /usr/local/squid/libexec/squid_session
-+external_acl_type session ttl=300 negative_ttl=0 children=1 concurrency=200 %LOGIN /usr/libexec/squid/squid_session
- .IP
- acl session external session
- .IP
-diff -Nru squid-3.1.8.orig/helpers/external_acl/unix_group/squid_unix_group.8 squid-3.1.8/helpers/external_acl/unix_group/squid_unix_group.8
---- squid-3.1.8.orig/helpers/external_acl/unix_group/squid_unix_group.8 2010-09-04 05:25:58.000000000 +0200
-+++ squid-3.1.8/helpers/external_acl/unix_group/squid_unix_group.8 2010-09-23 23:34:10.000000000 +0200
-@@ -27,7 +27,7 @@
- This squid.conf example defines two Squid acls. usergroup1 matches users in group1, and usergroup2
- matches users in group2 or group3
- .IP
--external_acl_type unix_group %LOGIN /usr/local/squid/libexec/squid_unix_group -p
-+external_acl_type unix_group %LOGIN /usr/libexec/squid/squid_unix_group -p
- .IP
- acl usergroup1 external unix_group group1
- .IP
-diff -Nru squid-3.1.8.orig/helpers/negotiate_auth/squid_kerb_auth/configure.in squid-3.1.8/helpers/negotiate_auth/squid_kerb_auth/configure.in
---- squid-3.1.8.orig/helpers/negotiate_auth/squid_kerb_auth/configure.in 2010-09-04 05:25:58.000000000 +0200
-+++ squid-3.1.8/helpers/negotiate_auth/squid_kerb_auth/configure.in 2010-09-23 23:34:10.000000000 +0200
-@@ -17,6 +17,7 @@
-
- AC_INIT([squid_kerb_auth],[1.0.5],[markus_moeller@compuserve.com])
- AM_INIT_AUTOMAKE(squid_kerb_auth,1.0.5)
-+AM_MAINTAINER_MODE
- AC_CONFIG_SRCDIR([squid_kerb_auth.c])
-
- AC_PROG_CC
-@@ -467,7 +468,7 @@
- echo "configure: ##"
- echo "configure: ## -----------------------------##"
-
--MY_CFLAGS="-Wall -Wextra -Werror -Wcomment -Wpointer-arith -Wcast-align -Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wdeclaration-after-statement -Wshadow"
-+MY_CFLAGS="-Wall -Wextra -Wpointer-arith -Wcast-align -Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wdeclaration-after-statement -Wshadow"
- for ac_cv_my_cflag in $MY_CFLAGS; do
- echo "int main()
- {
-diff -Nru squid-3.1.8.orig/lib/libTrie/acinclude.m4 squid-3.1.8/lib/libTrie/acinclude.m4
---- squid-3.1.8.orig/lib/libTrie/acinclude.m4 2010-09-04 05:25:57.000000000 +0200
-+++ squid-3.1.8/lib/libTrie/acinclude.m4 2010-09-23 23:34:10.000000000 +0200
-@@ -11,7 +11,7 @@
- AC_MSG_CHECKING([whether compiler accepts -fhuge-objects])
- AC_CACHE_VAL([ac_cv_test_checkforhugeobjects],[
- ac_cv_test_checkforhugeobjects=`echo "int main(int argc, char **argv) { int foo; }" > conftest.cc
--${CXX} -Werror -fhuge-objects -o conftest.bin conftest.cc 2>/dev/null
-+${CXX} -fhuge-objects -o conftest.bin conftest.cc 2>/dev/null
- res=$?
- rm -f conftest.*
- echo yes
-diff -Nru squid-3.1.8.orig/lib/libTrie/configure.in squid-3.1.8/lib/libTrie/configure.in
---- squid-3.1.8.orig/lib/libTrie/configure.in 2010-09-04 05:25:57.000000000 +0200
-+++ squid-3.1.8/lib/libTrie/configure.in 2010-09-23 23:34:10.000000000 +0200
-@@ -59,8 +59,8 @@
-
- dnl set useful flags
- if test "$GCC" = "yes"; then
-- TRIE_CFLAGS="-Werror -Wall -Wpointer-arith -Wwrite-strings -Wmissing-prototypes -Wmissing-declarations -Wcomments"
-- TRIE_CXXFLAGS="-Werror -Wall -Wpointer-arith -Wwrite-strings -Wcomments"
-+ TRIE_CFLAGS="-Wall -Wpointer-arith -Wwrite-strings -Wmissing-prototypes -Wmissing-declarations"
-+ TRIE_CXXFLAGS="-Wall -Wpointer-arith -Wwrite-strings"
- else
- TRIE_CFLAGS=
- TRIE_CXXFLAGS=
-diff -Nru squid-3.1.8.orig/src/cf.data.pre squid-3.1.8/src/cf.data.pre
---- squid-3.1.8.orig/src/cf.data.pre 2010-09-04 05:25:57.000000000 +0200
-+++ squid-3.1.8/src/cf.data.pre 2010-09-23 23:34:10.000000000 +0200
-@@ -716,6 +716,7 @@
- acl Safe_ports port 488 # gss-http
- acl Safe_ports port 591 # filemaker
- acl Safe_ports port 777 # multiling http
-+acl Safe_ports port 901 # SWAT
- acl CONNECT method CONNECT
- NOCOMMENT_END
- DOC_END
-@@ -864,6 +865,9 @@
- http_access allow localnet
- http_access allow localhost
-
-+# Allow the localhost to have access by default
-+http_access allow localhost
-+
- # And finally deny all other access to this proxy
- http_access deny all
- NOCOMMENT_END
-@@ -4036,11 +4040,11 @@
-
- NAME: cache_mgr
- TYPE: string
--DEFAULT: webmaster
-+DEFAULT: root
- LOC: Config.adminEmail
- DOC_START
- Email-address of local cache manager who will receive
-- mail if the cache dies. The default is "webmaster."
-+ mail if the cache dies. The default is "root".
- DOC_END
-
- NAME: mail_from
-@@ -6357,7 +6361,7 @@
- NAME: forwarded_for
- COMMENT: on|off|transparent|truncate|delete
- TYPE: string
--DEFAULT: on
-+DEFAULT: delete
- LOC: opt_forwarded_for
- DOC_START
- If set to "on", Squid will append your client's IP address
-diff -Nru squid-3.1.8.orig/src/debug.cc squid-3.1.8/src/debug.cc
---- squid-3.1.8.orig/src/debug.cc 2010-09-04 05:25:57.000000000 +0200
-+++ squid-3.1.8/src/debug.cc 2010-09-23 23:34:10.000000000 +0200
-@@ -452,7 +452,7 @@
- #if HAVE_SYSLOG && defined(LOG_LOCAL4)
-
- if (Debug::log_syslog)
-- openlog(APP_SHORTNAME, LOG_PID | LOG_NDELAY | LOG_CONS, syslog_facility);
-+ openlog(APP_SHORTNAME, LOG_PID | LOG_NDELAY, syslog_facility);
-
- #endif /* HAVE_SYSLOG */
-
-diff -Nru squid-3.1.8.orig/src/main.cc squid-3.1.8/src/main.cc
---- squid-3.1.8.orig/src/main.cc 2010-09-04 05:25:57.000000000 +0200
-+++ squid-3.1.8/src/main.cc 2010-09-23 23:34:10.000000000 +0200
-@@ -1556,7 +1556,7 @@
- if (*(argv[0]) == '(')
- return;
-
-- openlog(APP_SHORTNAME, LOG_PID | LOG_NDELAY | LOG_CONS, LOG_LOCAL4);
-+ openlog(APP_SHORTNAME, LOG_PID | LOG_NDELAY, LOG_DAEMON);
-
- if ((pid = fork()) < 0)
- syslog(LOG_ALERT, "fork failed: %s", xstrerror());
-@@ -1600,7 +1600,7 @@
-
- if ((pid = fork()) == 0) {
- /* child */
-- openlog(APP_SHORTNAME, LOG_PID | LOG_NDELAY | LOG_CONS, LOG_LOCAL4);
-+ openlog(APP_SHORTNAME, LOG_PID | LOG_NDELAY, LOG_DAEMON);
- prog = xstrdup(argv[0]);
- argv[0] = xstrdup("(squid)");
- execvp(prog, argv);
-@@ -1608,7 +1608,7 @@
- }
-
- /* parent */
-- openlog(APP_SHORTNAME, LOG_PID | LOG_NDELAY | LOG_CONS, LOG_LOCAL4);
-+ openlog(APP_SHORTNAME, LOG_PID | LOG_NDELAY, LOG_DAEMON);
-
- syslog(LOG_NOTICE, "Squid Parent: child process %d started", pid);
-
-diff -Nru squid-3.1.8.orig/src/Makefile.am squid-3.1.8/src/Makefile.am
---- squid-3.1.8.orig/src/Makefile.am 2010-09-04 05:25:57.000000000 +0200
-+++ squid-3.1.8/src/Makefile.am 2010-09-23 23:34:10.000000000 +0200
-@@ -638,7 +638,6 @@
-
- sysconf_DATA = \
- squid.conf.default \
-- squid.conf.documented \
- mime.conf.default
-
- data_DATA = \
-@@ -719,8 +718,8 @@
- DEFAULT_ACCESS_LOG = $(DEFAULT_LOG_PREFIX)/access.log
- DEFAULT_STORE_LOG = $(DEFAULT_LOG_PREFIX)/store.log
- DEFAULT_PID_FILE = $(DEFAULT_PIDFILE)
--DEFAULT_NETDB_FILE = $(DEFAULT_LOG_PREFIX)/netdb.state
--DEFAULT_SWAP_DIR = $(localstatedir)/cache
-+DEFAULT_NETDB_FILE = $(localstatedir)/run/netdb.state
-+DEFAULT_SWAP_DIR = $(localstatedir)/cache/squid
- DEFAULT_PINGER = $(libexecdir)/`echo pinger | sed '$(transform);s/$$/$(EXEEXT)/'`
- DEFAULT_UNLINKD = $(libexecdir)/`echo unlinkd | sed '$(transform);s/$$/$(EXEEXT)/'`
- DEFAULT_DISKD = $(libexecdir)/`echo diskd | sed '$(transform);s/$$/$(EXEEXT)/'`
-@@ -797,13 +796,11 @@
- @if test -f $(DESTDIR)$(DEFAULT_CONFIG_FILE) ; then \
- echo "$@ will not overwrite existing $(DESTDIR)$(DEFAULT_CONFIG_FILE)" ; \
- else \
-- echo "$(INSTALL_DATA) squid.conf.default $(DESTDIR)$(DEFAULT_CONFIG_FILE)"; \
-- $(INSTALL_DATA) squid.conf.default $(DESTDIR)$(DEFAULT_CONFIG_FILE); \
-+ echo "$(INSTALL_DATA) squid.conf.documented $(DESTDIR)$(DEFAULT_CONFIG_FILE)"; \
-+ $(INSTALL_DATA) squid.conf.documented $(DESTDIR)$(DEFAULT_CONFIG_FILE); \
- fi
-- echo "$(INSTALL_DATA) squid.conf.default $(DESTDIR)$(DEFAULT_CONFIG_FILE).default"; \
-- $(INSTALL_DATA) squid.conf.default $(DESTDIR)$(DEFAULT_CONFIG_FILE).default; \
-- echo "$(INSTALL_DATA) squid.conf.documented $(DESTDIR)$(DEFAULT_CONFIG_FILE).documented"; \
-- $(INSTALL_DATA) squid.conf.documented $(DESTDIR)$(DEFAULT_CONFIG_FILE).documented; \
-+ echo "$(INSTALL_DATA) squid.conf.documented $(DESTDIR)$(DEFAULT_CONFIG_FILE).default"; \
-+ $(INSTALL_DATA) squid.conf.documented $(DESTDIR)$(DEFAULT_CONFIG_FILE).default; \
- $(mkinstalldirs) $(DESTDIR)$(DEFAULT_LOG_PREFIX); \
- $(mkinstalldirs) $(DESTDIR)`dirname $(DEFAULT_PIDFILE)`
-
+++ /dev/null
-diff -Nru squid-3.1.8.orig/configure.in squid-3.1.8/configure.in
---- squid-3.1.8.orig/configure.in 2010-09-23 23:34:49.000000000 +0200
-+++ squid-3.1.8/configure.in 2010-09-23 23:36:41.000000000 +0200
-@@ -2730,7 +2730,11 @@
- dnl libcrypt (eg FreeBSD)
- AC_CHECK_LIB(crypt, crypt, [CRYPTLIB="-lcrypt"])
- dnl Solaris10 provides MD5 natively through libmd5
--AC_CHECK_LIB(md5, MD5Init, [CRYPTLIB="$CRYPTLIB -lmd5"])
-+case "$host" in
-+ *-solaris*)
-+ AC_CHECK_LIB(md5, MD5Init, [CRYPTLIB="$CRYPTLIB -lmd5"])
-+ ;;
-+esac
- AC_SUBST(CRYPTLIB)
-
- dnl Check for libdl, used by auth_modules/PAM
+++ /dev/null
-diff -Nru squid-3.1.8.orig/helpers/negotiate_auth/squid_kerb_auth/configure.in squid-3.1.8/helpers/negotiate_auth/squid_kerb_auth/configure.in
---- squid-3.1.8.orig/helpers/negotiate_auth/squid_kerb_auth/configure.in 2010-09-23 23:34:49.000000000 +0200
-+++ squid-3.1.8/helpers/negotiate_auth/squid_kerb_auth/configure.in 2010-09-23 23:35:45.000000000 +0200
-@@ -94,7 +94,7 @@
- else
- ac_gssapi_libs=`krb5-config --libs gssapi 2>/dev/null`
- if test "x$ac_gssapi_libs" != "x" ; then
-- LDFLAGS="$LDFLAGS $ac_gssapi_libs"
-+ LIBS="$LIBS $ac_gssapi_libs"
- else
- for lib in $ac_gss_libs; do
- AC_CHECK_LIB($lib,main)
-@@ -118,7 +118,7 @@
- fi
- ac_gssapi_libs=`krb5-config --libs gssapi 2>/dev/null`
- if test "x$ac_gssapi_libs" != "x" ; then
-- LDFLAGS="$LDFLAGS $ac_gssapi_libs"
-+ LIBS="$LIBS $ac_gssapi_libs"
- else
- for lib in $ac_gss_libs; do
- AC_CHECK_LIB($lib,main)
-@@ -172,7 +172,7 @@
- ac_libdir=`echo $ac_gssapi_libs | sed -e 's/.*-L//' | sed -e 's/ .*//'`
- LDFLAGS="$LDFLAGS $w_flag$ac_libdir$w_flag_2"
- fi
-- LDFLAGS="$LDFLAGS $ac_gssapi_libs"
-+ LIBS="$LIBS $ac_gssapi_libs"
- else
- for lib in $ac_gss_libs; do
- AC_CHECK_LIB($lib,main)
-@@ -201,7 +201,7 @@
- ac_libdir=`echo $ac_gssapi_libs | sed -e 's/.*-L//' | sed -e 's/ .*//'`
- LDFLAGS="$LDFLAGS $w_flag$ac_libdir$w_flag_2"
- fi
-- LDFLAGS="$LDFLAGS $ac_gssapi_libs"
-+ LIBS="$LIBS $ac_gssapi_libs"
- else
- for lib in $ac_gss_libs; do
- AC_CHECK_LIB($lib,main)
+++ /dev/null
-diff -Nru squid-3.1.9.orig/acinclude.m4 squid-3.1.9/acinclude.m4
---- squid-3.1.9.orig/acinclude.m4 2010-10-25 13:34:24.000000000 +0200
-+++ squid-3.1.9/acinclude.m4 2010-11-27 13:43:30.000000000 +0100
-@@ -75,7 +75,7 @@
- AC_MSG_CHECKING([whether compiler accepts -fhuge-objects])
- AC_CACHE_VAL([ac_cv_test_checkforhugeobjects],[
- ac_cv_test_checkforhugeobjects=`echo "int main(int argc, char **argv) { int foo; }" > conftest.cc
--${CXX} -Werror -fhuge-objects -o conftest.bin conftest.cc 2>/dev/null
-+${CXX} -fhuge-objects -o conftest.bin conftest.cc 2>/dev/null
- res=$?
- rm -f conftest.*
- echo yes
-diff -Nru squid-3.1.9.orig/configure.in squid-3.1.9/configure.in
---- squid-3.1.9.orig/configure.in 2010-10-25 13:35:32.000000000 +0200
-+++ squid-3.1.9/configure.in 2010-11-27 13:43:30.000000000 +0100
-@@ -16,9 +16,9 @@
- PRESET_LDFLAGS="$LDFLAGS"
-
- dnl Set default LDFLAGS
--if test -z "$LDFLAGS"; then
-- LDFLAGS="-g"
--fi
-+dnl if test -z "$LDFLAGS"; then
-+dnl LDFLAGS="-g"
-+dnl fi
-
- dnl Check for GNU cc
- AC_PROG_CC
-diff -Nru squid-3.1.9.orig/helpers/basic_auth/MSNT/confload.c squid-3.1.9/helpers/basic_auth/MSNT/confload.c
---- squid-3.1.9.orig/helpers/basic_auth/MSNT/confload.c 2010-10-25 13:34:23.000000000 +0200
-+++ squid-3.1.9/helpers/basic_auth/MSNT/confload.c 2010-11-27 13:43:30.000000000 +0100
-@@ -27,7 +27,7 @@
-
- /* Path to configuration file */
- #ifndef SYSCONFDIR
--#define SYSCONFDIR "/usr/local/squid/etc"
-+#define SYSCONFDIR "/etc/squid"
- #endif
- #define CONFIGFILE SYSCONFDIR "/msntauth.conf"
-
-diff -Nru squid-3.1.9.orig/helpers/basic_auth/MSNT/msntauth.conf.default squid-3.1.9/helpers/basic_auth/MSNT/msntauth.conf.default
---- squid-3.1.9.orig/helpers/basic_auth/MSNT/msntauth.conf.default 2010-10-25 13:34:24.000000000 +0200
-+++ squid-3.1.9/helpers/basic_auth/MSNT/msntauth.conf.default 2010-11-27 13:43:30.000000000 +0100
-@@ -8,6 +8,6 @@
- server other_PDC other_BDC otherdomain
-
- # Denied and allowed users. Comment these if not needed.
--#denyusers /usr/local/squid/etc/msntauth.denyusers
--#allowusers /usr/local/squid/etc/msntauth.allowusers
-+#denyusers /etc/squid/msntauth.denyusers
-+#allowusers /etc/squid/msntauth.allowusers
-
-diff -Nru squid-3.1.9.orig/helpers/basic_auth/SMB/Makefile.am squid-3.1.9/helpers/basic_auth/SMB/Makefile.am
---- squid-3.1.9.orig/helpers/basic_auth/SMB/Makefile.am 2010-10-25 13:34:24.000000000 +0200
-+++ squid-3.1.9/helpers/basic_auth/SMB/Makefile.am 2010-11-27 13:43:30.000000000 +0100
-@@ -16,7 +16,7 @@
- ## FIXME: autoconf should test for the samba path.
-
- SMB_AUTH_HELPER = smb_auth.sh
--SAMBAPREFIX=/usr/local/samba
-+SAMBAPREFIX=/usr
- SMB_AUTH_HELPER_PATH = $(libexecdir)/$(SMB_AUTH_HELPER)
-
- libexec_SCRIPTS = $(SMB_AUTH_HELPER)
-diff -Nru squid-3.1.9.orig/helpers/basic_auth/SMB/smb_auth.sh squid-3.1.9/helpers/basic_auth/SMB/smb_auth.sh
---- squid-3.1.9.orig/helpers/basic_auth/SMB/smb_auth.sh 2010-10-25 13:34:25.000000000 +0200
-+++ squid-3.1.9/helpers/basic_auth/SMB/smb_auth.sh 2010-11-27 13:43:30.000000000 +0100
-@@ -24,7 +24,7 @@
- read AUTHSHARE
- read AUTHFILE
- read SMBUSER
--read SMBPASS
-+read -r SMBPASS
-
- # Find domain controller
- echo "Domain name: $DOMAINNAME"
-@@ -47,7 +47,7 @@
- addropt=""
- fi
- echo "Query address options: $addropt"
--dcip=`$SAMBAPREFIX/bin/nmblookup $addropt "$PASSTHROUGH#1c" | awk '/^[0-9.]+ / { print $1 ; exit }'`
-+dcip=`$SAMBAPREFIX/bin/nmblookup $addropt "$PASSTHROUGH#1c" | awk '/^[0-9.]+\..+ / { print $1 ; exit }'`
- echo "Domain controller IP address: $dcip"
- [ -n "$dcip" ] || exit 1
-
-diff -Nru squid-3.1.9.orig/helpers/external_acl/session/squid_session.8 squid-3.1.9/helpers/external_acl/session/squid_session.8
---- squid-3.1.9.orig/helpers/external_acl/session/squid_session.8 2010-10-25 13:34:23.000000000 +0200
-+++ squid-3.1.9/helpers/external_acl/session/squid_session.8 2010-11-27 13:43:30.000000000 +0100
-@@ -35,7 +35,7 @@
- .P
- Configuration example using the default automatic mode
- .IP
--external_acl_type session ttl=300 negative_ttl=0 children=1 concurrency=200 %LOGIN /usr/local/squid/libexec/squid_session
-+external_acl_type session ttl=300 negative_ttl=0 children=1 concurrency=200 %LOGIN /usr/libexec/squid/squid_session
- .IP
- acl session external session
- .IP
-diff -Nru squid-3.1.9.orig/helpers/external_acl/unix_group/squid_unix_group.8 squid-3.1.9/helpers/external_acl/unix_group/squid_unix_group.8
---- squid-3.1.9.orig/helpers/external_acl/unix_group/squid_unix_group.8 2010-10-25 13:34:25.000000000 +0200
-+++ squid-3.1.9/helpers/external_acl/unix_group/squid_unix_group.8 2010-11-27 13:43:30.000000000 +0100
-@@ -27,7 +27,7 @@
- This squid.conf example defines two Squid acls. usergroup1 matches users in group1, and usergroup2
- matches users in group2 or group3
- .IP
--external_acl_type unix_group %LOGIN /usr/local/squid/libexec/squid_unix_group -p
-+external_acl_type unix_group %LOGIN /usr/libexec/squid/squid_unix_group -p
- .IP
- acl usergroup1 external unix_group group1
- .IP
-diff -Nru squid-3.1.9.orig/helpers/negotiate_auth/squid_kerb_auth/configure.in squid-3.1.9/helpers/negotiate_auth/squid_kerb_auth/configure.in
---- squid-3.1.9.orig/helpers/negotiate_auth/squid_kerb_auth/configure.in 2010-10-25 13:34:25.000000000 +0200
-+++ squid-3.1.9/helpers/negotiate_auth/squid_kerb_auth/configure.in 2010-11-27 13:43:30.000000000 +0100
-@@ -17,6 +17,7 @@
-
- AC_INIT([squid_kerb_auth],[1.0.5],[markus_moeller@compuserve.com])
- AM_INIT_AUTOMAKE(squid_kerb_auth,1.0.5)
-+AM_MAINTAINER_MODE
- AC_CONFIG_SRCDIR([squid_kerb_auth.c])
-
- AC_PROG_CC
-@@ -467,7 +468,7 @@
- echo "configure: ##"
- echo "configure: ## -----------------------------##"
-
--MY_CFLAGS="-Wall -Wextra -Werror -Wcomment -Wpointer-arith -Wcast-align -Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wdeclaration-after-statement -Wshadow"
-+MY_CFLAGS="-Wall -Wextra -Wpointer-arith -Wcast-align -Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wdeclaration-after-statement -Wshadow"
- for ac_cv_my_cflag in $MY_CFLAGS; do
- echo "int main()
- {
-diff -Nru squid-3.1.9.orig/lib/libTrie/acinclude.m4 squid-3.1.9/lib/libTrie/acinclude.m4
---- squid-3.1.9.orig/lib/libTrie/acinclude.m4 2010-10-25 13:34:24.000000000 +0200
-+++ squid-3.1.9/lib/libTrie/acinclude.m4 2010-11-27 13:43:30.000000000 +0100
-@@ -11,7 +11,7 @@
- AC_MSG_CHECKING([whether compiler accepts -fhuge-objects])
- AC_CACHE_VAL([ac_cv_test_checkforhugeobjects],[
- ac_cv_test_checkforhugeobjects=`echo "int main(int argc, char **argv) { int foo; }" > conftest.cc
--${CXX} -Werror -fhuge-objects -o conftest.bin conftest.cc 2>/dev/null
-+${CXX} -fhuge-objects -o conftest.bin conftest.cc 2>/dev/null
- res=$?
- rm -f conftest.*
- echo yes
-diff -Nru squid-3.1.9.orig/lib/libTrie/configure.in squid-3.1.9/lib/libTrie/configure.in
---- squid-3.1.9.orig/lib/libTrie/configure.in 2010-10-25 13:34:23.000000000 +0200
-+++ squid-3.1.9/lib/libTrie/configure.in 2010-11-27 13:43:30.000000000 +0100
-@@ -59,8 +59,8 @@
-
- dnl set useful flags
- if test "$GCC" = "yes"; then
-- TRIE_CFLAGS="-Werror -Wall -Wpointer-arith -Wwrite-strings -Wmissing-prototypes -Wmissing-declarations -Wcomments"
-- TRIE_CXXFLAGS="-Werror -Wall -Wpointer-arith -Wwrite-strings -Wcomments"
-+ TRIE_CFLAGS="-Wall -Wpointer-arith -Wwrite-strings -Wmissing-prototypes -Wmissing-declarations"
-+ TRIE_CXXFLAGS="-Wall -Wpointer-arith -Wwrite-strings"
- else
- TRIE_CFLAGS=
- TRIE_CXXFLAGS=
-diff -Nru squid-3.1.9.orig/src/cf.data.pre squid-3.1.9/src/cf.data.pre
---- squid-3.1.9.orig/src/cf.data.pre 2010-10-25 13:34:25.000000000 +0200
-+++ squid-3.1.9/src/cf.data.pre 2010-11-27 13:43:30.000000000 +0100
-@@ -716,6 +716,7 @@
- acl Safe_ports port 488 # gss-http
- acl Safe_ports port 591 # filemaker
- acl Safe_ports port 777 # multiling http
-+acl Safe_ports port 901 # SWAT
- acl CONNECT method CONNECT
- NOCOMMENT_END
- DOC_END
-@@ -862,6 +863,9 @@
- http_access allow localnet
- http_access allow localhost
-
-+# Allow the localhost to have access by default
-+http_access allow localhost
-+
- # And finally deny all other access to this proxy
- http_access deny all
- NOCOMMENT_END
-@@ -4027,11 +4031,11 @@
-
- NAME: cache_mgr
- TYPE: string
--DEFAULT: webmaster
-+DEFAULT: root
- LOC: Config.adminEmail
- DOC_START
- Email-address of local cache manager who will receive
-- mail if the cache dies. The default is "webmaster."
-+ mail if the cache dies. The default is "root".
- DOC_END
-
- NAME: mail_from
-@@ -6345,7 +6349,7 @@
- NAME: forwarded_for
- COMMENT: on|off|transparent|truncate|delete
- TYPE: string
--DEFAULT: on
-+DEFAULT: delete
- LOC: opt_forwarded_for
- DOC_START
- If set to "on", Squid will append your client's IP address
-diff -Nru squid-3.1.9.orig/src/debug.cc squid-3.1.9/src/debug.cc
---- squid-3.1.9.orig/src/debug.cc 2010-10-25 13:34:24.000000000 +0200
-+++ squid-3.1.9/src/debug.cc 2010-11-27 13:43:30.000000000 +0100
-@@ -452,7 +452,7 @@
- #if HAVE_SYSLOG && defined(LOG_LOCAL4)
-
- if (Debug::log_syslog)
-- openlog(APP_SHORTNAME, LOG_PID | LOG_NDELAY | LOG_CONS, syslog_facility);
-+ openlog(APP_SHORTNAME, LOG_PID | LOG_NDELAY, syslog_facility);
-
- #endif /* HAVE_SYSLOG */
-
-diff -Nru squid-3.1.9.orig/src/main.cc squid-3.1.9/src/main.cc
---- squid-3.1.9.orig/src/main.cc 2010-10-25 13:34:25.000000000 +0200
-+++ squid-3.1.9/src/main.cc 2010-11-27 13:43:30.000000000 +0100
-@@ -1556,7 +1556,7 @@
- if (*(argv[0]) == '(')
- return;
-
-- openlog(APP_SHORTNAME, LOG_PID | LOG_NDELAY | LOG_CONS, LOG_LOCAL4);
-+ openlog(APP_SHORTNAME, LOG_PID | LOG_NDELAY, LOG_DAEMON);
-
- if ((pid = fork()) < 0)
- syslog(LOG_ALERT, "fork failed: %s", xstrerror());
-@@ -1600,7 +1600,7 @@
-
- if ((pid = fork()) == 0) {
- /* child */
-- openlog(APP_SHORTNAME, LOG_PID | LOG_NDELAY | LOG_CONS, LOG_LOCAL4);
-+ openlog(APP_SHORTNAME, LOG_PID | LOG_NDELAY, LOG_DAEMON);
- prog = xstrdup(argv[0]);
- argv[0] = xstrdup("(squid)");
- execvp(prog, argv);
-@@ -1608,7 +1608,7 @@
- }
-
- /* parent */
-- openlog(APP_SHORTNAME, LOG_PID | LOG_NDELAY | LOG_CONS, LOG_LOCAL4);
-+ openlog(APP_SHORTNAME, LOG_PID | LOG_NDELAY, LOG_DAEMON);
-
- syslog(LOG_NOTICE, "Squid Parent: child process %d started", pid);
-
-diff -Nru squid-3.1.9.orig/src/Makefile.am squid-3.1.9/src/Makefile.am
---- squid-3.1.9.orig/src/Makefile.am 2010-10-25 13:34:23.000000000 +0200
-+++ squid-3.1.9/src/Makefile.am 2010-11-27 13:43:30.000000000 +0100
-@@ -639,7 +639,6 @@
-
- sysconf_DATA = \
- squid.conf.default \
-- squid.conf.documented \
- mime.conf.default
-
- data_DATA = \
-@@ -720,8 +719,8 @@
- DEFAULT_ACCESS_LOG = $(DEFAULT_LOG_PREFIX)/access.log
- DEFAULT_STORE_LOG = $(DEFAULT_LOG_PREFIX)/store.log
- DEFAULT_PID_FILE = $(DEFAULT_PIDFILE)
--DEFAULT_NETDB_FILE = $(DEFAULT_LOG_PREFIX)/netdb.state
--DEFAULT_SWAP_DIR = $(localstatedir)/cache
-+DEFAULT_NETDB_FILE = $(localstatedir)/run/netdb.state
-+DEFAULT_SWAP_DIR = $(localstatedir)/cache/squid
- DEFAULT_PINGER = $(libexecdir)/`echo pinger | sed '$(transform);s/$$/$(EXEEXT)/'`
- DEFAULT_UNLINKD = $(libexecdir)/`echo unlinkd | sed '$(transform);s/$$/$(EXEEXT)/'`
- DEFAULT_DISKD = $(libexecdir)/`echo diskd | sed '$(transform);s/$$/$(EXEEXT)/'`
-@@ -798,13 +797,11 @@
- @if test -f $(DESTDIR)$(DEFAULT_CONFIG_FILE) ; then \
- echo "$@ will not overwrite existing $(DESTDIR)$(DEFAULT_CONFIG_FILE)" ; \
- else \
-- echo "$(INSTALL_DATA) squid.conf.default $(DESTDIR)$(DEFAULT_CONFIG_FILE)"; \
-- $(INSTALL_DATA) squid.conf.default $(DESTDIR)$(DEFAULT_CONFIG_FILE); \
-+ echo "$(INSTALL_DATA) squid.conf.documented $(DESTDIR)$(DEFAULT_CONFIG_FILE)"; \
-+ $(INSTALL_DATA) squid.conf.documented $(DESTDIR)$(DEFAULT_CONFIG_FILE); \
- fi
-- echo "$(INSTALL_DATA) squid.conf.default $(DESTDIR)$(DEFAULT_CONFIG_FILE).default"; \
-- $(INSTALL_DATA) squid.conf.default $(DESTDIR)$(DEFAULT_CONFIG_FILE).default; \
-- echo "$(INSTALL_DATA) squid.conf.documented $(DESTDIR)$(DEFAULT_CONFIG_FILE).documented"; \
-- $(INSTALL_DATA) squid.conf.documented $(DESTDIR)$(DEFAULT_CONFIG_FILE).documented; \
-+ echo "$(INSTALL_DATA) squid.conf.documented $(DESTDIR)$(DEFAULT_CONFIG_FILE).default"; \
-+ $(INSTALL_DATA) squid.conf.documented $(DESTDIR)$(DEFAULT_CONFIG_FILE).default; \
- $(mkinstalldirs) $(DESTDIR)$(DEFAULT_LOG_PREFIX); \
- $(mkinstalldirs) $(DESTDIR)$(DEFAULT_SWAP_DIR); \
- $(mkinstalldirs) $(DESTDIR)`dirname $(DEFAULT_PIDFILE)`
+++ /dev/null
-diff -Nru squid-3.1.9.orig/configure.in squid-3.1.9/configure.in
---- squid-3.1.9.orig/configure.in 2010-11-27 13:44:10.000000000 +0100
-+++ squid-3.1.9/configure.in 2010-11-27 13:45:47.000000000 +0100
-@@ -2786,7 +2786,11 @@
- dnl libcrypt (eg FreeBSD)
- AC_CHECK_LIB(crypt, crypt, [CRYPTLIB="-lcrypt"])
- dnl Solaris10 provides MD5 natively through libmd5
--AC_CHECK_LIB(md5, MD5Init, [CRYPTLIB="$CRYPTLIB -lmd5"])
-+case "$host" in
-+ *-solaris*)
-+ AC_CHECK_LIB(md5, MD5Init, [CRYPTLIB="$CRYPTLIB -lmd5"])
-+ ;;
-+esac
- AC_SUBST(CRYPTLIB)
-
- dnl Check for libdl, used by auth_modules/PAM
+++ /dev/null
-diff -Nru squid-3.1.9.orig/helpers/negotiate_auth/squid_kerb_auth/configure.in squid-3.1.9/helpers/negotiate_auth/squid_kerb_auth/configure.in
---- squid-3.1.9.orig/helpers/negotiate_auth/squid_kerb_auth/configure.in 2010-11-27 13:44:10.000000000 +0100
-+++ squid-3.1.9/helpers/negotiate_auth/squid_kerb_auth/configure.in 2010-11-27 13:44:46.000000000 +0100
-@@ -94,7 +94,7 @@
- else
- ac_gssapi_libs=`krb5-config --libs gssapi 2>/dev/null`
- if test "x$ac_gssapi_libs" != "x" ; then
-- LDFLAGS="$LDFLAGS $ac_gssapi_libs"
-+ LIBS="$LIBS $ac_gssapi_libs"
- else
- for lib in $ac_gss_libs; do
- AC_CHECK_LIB($lib,main)
-@@ -118,7 +118,7 @@
- fi
- ac_gssapi_libs=`krb5-config --libs gssapi 2>/dev/null`
- if test "x$ac_gssapi_libs" != "x" ; then
-- LDFLAGS="$LDFLAGS $ac_gssapi_libs"
-+ LIBS="$LIBS $ac_gssapi_libs"
- else
- for lib in $ac_gss_libs; do
- AC_CHECK_LIB($lib,main)
-@@ -172,7 +172,7 @@
- ac_libdir=`echo $ac_gssapi_libs | sed -e 's/.*-L//' | sed -e 's/ .*//'`
- LDFLAGS="$LDFLAGS $w_flag$ac_libdir$w_flag_2"
- fi
-- LDFLAGS="$LDFLAGS $ac_gssapi_libs"
-+ LIBS="$LIBS $ac_gssapi_libs"
- else
- for lib in $ac_gss_libs; do
- AC_CHECK_LIB($lib,main)
-@@ -201,7 +201,7 @@
- ac_libdir=`echo $ac_gssapi_libs | sed -e 's/.*-L//' | sed -e 's/ .*//'`
- LDFLAGS="$LDFLAGS $w_flag$ac_libdir$w_flag_2"
- fi
-- LDFLAGS="$LDFLAGS $ac_gssapi_libs"
-+ LIBS="$LIBS $ac_gssapi_libs"
- else
- for lib in $ac_gss_libs; do
- AC_CHECK_LIB($lib,main)
+++ /dev/null
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/squid-3.1.12.ebuild,v 1.2 2011/04/30 12:46:52 flameeyes Exp $
-
-EAPI="4"
-
-inherit eutils pam toolchain-funcs autotools linux-info
-
-DESCRIPTION="A full-featured web proxy cache"
-HOMEPAGE="http://www.squid-cache.org/"
-SRC_URI="http://www.squid-cache.org/Versions/v3/3.1/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="caps ipv6 pam ldap samba sasl kerberos nis radius ssl snmp selinux logrotate test \
- ecap icap-client \
- mysql postgres sqlite \
- zero-penalty-hit \
- pf-transparent ipf-transparent kqueue \
- elibc_uclibc kernel_linux +epoll tproxy"
-
-COMMON_DEPEND="caps? ( >=sys-libs/libcap-2.16 )
- pam? ( virtual/pam )
- ldap? ( net-nds/openldap )
- kerberos? ( virtual/krb5 )
- ssl? ( dev-libs/openssl )
- sasl? ( dev-libs/cyrus-sasl )
- ecap? ( net-libs/libecap )
- selinux? ( sec-policy/selinux-squid )
- !x86-fbsd? ( logrotate? ( app-admin/logrotate ) )
- >=sys-libs/db-4
- dev-lang/perl"
-DEPEND="${COMMON_DEPEND}
- sys-apps/ed
- test? ( dev-util/cppunit )"
-RDEPEND="${COMMON_DEPEND}
- samba? ( net-fs/samba )
- mysql? ( dev-perl/DBD-mysql )
- postgres? ( dev-perl/DBD-Pg )
- sqlite? ( dev-perl/DBD-SQLite )"
-
-REQUIRED_USE="tproxy? ( caps )"
-
-pkg_pretend() {
- if grep -qs '^[[:space:]]*cache_dir[[:space:]]\+coss' "${ROOT}"etc/squid/squid.conf; then
- eerror "coss store IO has been disabled by upstream due to stability issues!"
- eerror "If you want to install this version, switch the store type to something else"
- eerror "before attempting to install this version again."
-
- die "/etc/squid/squid.conf: cache_dir uses a disabled store type"
- fi
-
- if use tproxy; then
- echo
- elog "Checking kernel configuration for full Tproxy4 support"
- local CONFIG_CHECK="~NF_CONNTRACK ~NETFILTER_TPROXY ~NETFILTER_XT_MATCH_SOCKET ~NETFILTER_XT_TARGET_TPROXY"
- linux-info_pkg_setup
- echo
- fi
-}
-
-pkg_setup() {
- enewgroup squid 31
- enewuser squid 31 -1 /var/cache/squid squid
-}
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-gentoo.patch
- eautoreconf
-}
-
-src_configure() {
- local myconf=""
-
- local basic_modules="getpwnam,NCSA,MSNT"
- use samba && basic_modules="SMB,multi-domain-NTLM,${basic_modules}"
- use ldap && basic_modules="LDAP,${basic_modules}"
- use pam && basic_modules="PAM,${basic_modules}"
- use sasl && basic_modules="SASL,${basic_modules}"
- use nis && ! use elibc_uclibc && basic_modules="YP,${basic_modules}"
- use radius && basic_modules="squid_radius_auth,${basic_modules}"
- if use mysql || use postgres || use sqlite ; then
- basic_modules="DB,${basic_modules}"
- fi
-
- local digest_modules="password"
- use ldap && digest_modules="ldap,${digest_modules}"
-
- local ext_helpers="ip_user,session,unix_group"
- use samba && ext_helpers="wbinfo_group,${ext_helpers}"
- use ldap && ext_helpers="ldap_group,${ext_helpers}"
-
- local ntlm_helpers="fakeauth"
- use samba && ntlm_helpers="smb_lm,${ntlm_helpers}"
-
- local negotiate_helpers=
- if use kerberos; then
- negotiate_helpers="squid_kerb_auth"
- if has_version app-crypt/mit-krb5; then
- myconf="--enable-mit --disable-heimdal"
- elif has_version app-crypt/heimdal; then
- myconf="--disable-mit --enable-heimdal"
- fi
- else
- myconf="--disable-mit --disable-heimdal"
- fi
-
- # coss support has been disabled
- # If it is re-enabled again, make sure you don't enable it for elibc_uclibc (#61175)
- myconf="${myconf} --enable-storeio=ufs,diskd,aufs"
-
- if use kernel_linux; then
- myconf="${myconf} --enable-linux-netfilter \
- $(use_enable tproxy linux-tproxy) \
- $(use_enable epoll)"
- elif use kernel_FreeBSD || use kernel_OpenBSD || use kernel_NetBSD ; then
- myconf="${myconf} $(use_enable kqueue)"
- if use pf-transparent; then
- myconf="${myconf} --enable-pf-transparent"
- elif use ipf-transparent; then
- myconf="${myconf} --enable-ipf-transparent"
- fi
- fi
-
- export CC=$(tc-getCC)
-
- econf \
- --sysconfdir=/etc/squid \
- --libexecdir=/usr/libexec/squid \
- --localstatedir=/var \
- --with-pidfile=/var/run/squid.pid \
- --datadir=/usr/share/squid \
- --with-logdir=/var/log/squid \
- --with-default-user=squid \
- --enable-auth="basic,digest,negotiate,ntlm" \
- --enable-removal-policies="lru,heap" \
- --enable-digest-auth-helpers="${digest_modules}" \
- --enable-basic-auth-helpers="${basic_modules}" \
- --enable-external-acl-helpers="${ext_helpers}" \
- --enable-ntlm-auth-helpers="${ntlm_helpers}" \
- --enable-negotiate-auth-helpers="${negotiate_helpers}" \
- --enable-useragent-log \
- --enable-cache-digests \
- --enable-delay-pools \
- --enable-referer-log \
- --enable-arp-acl \
- --with-large-files \
- --with-filedescriptors=8192 \
- --disable-strict-error-checking \
- $(use_with caps libcap) \
- $(use_enable ipv6) \
- $(use_enable snmp) \
- $(use_enable ssl) \
- $(use_enable icap-client) \
- $(use_enable ecap) \
- $(use_enable zero-penalty-hit zph-qos) \
- ${myconf}
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die "emake install failed"
-
- # need suid root for looking into /etc/shadow
- fowners root:squid /usr/libexec/squid/ncsa_auth
- fperms 4750 /usr/libexec/squid/ncsa_auth
- if use pam; then
- fowners root:squid /usr/libexec/squid/pam_auth
- fperms 4750 /usr/libexec/squid/pam_auth
- fi
-
- # some cleanups
- rm -f "${D}"/usr/bin/Run*
-
- dodoc CONTRIBUTORS CREDITS ChangeLog QUICKSTART SPONSORS doc/*.txt \
- helpers/ntlm_auth/no_check/README.no_check_ntlm_auth
- newdoc helpers/basic_auth/SMB/README README.auth_smb
- dohtml helpers/basic_auth/MSNT/README.html RELEASENOTES.html
- newdoc helpers/basic_auth/LDAP/README README.auth_ldap
- doman helpers/basic_auth/LDAP/*.8
- dodoc helpers/basic_auth/SASL/squid_sasl_auth*
-
- newpamd "${FILESDIR}/squid.pam" squid
- newconfd "${FILESDIR}/squid.confd" squid
- if use logrotate; then
- newinitd "${FILESDIR}/squid.initd-logrotate" squid
- insinto /etc/logrotate.d
- newins "${FILESDIR}/squid.logrotate" squid
- else
- newinitd "${FILESDIR}/squid.initd" squid
- exeinto /etc/cron.weekly
- newexe "${FILESDIR}/squid.cron" squid.cron
- fi
-
- rm -rf "${D}"/var
- diropts -m0755 -o squid -g squid
- keepdir /var/cache/squid /var/log/squid
-}
-
-pkg_postinst() {
- echo
- elog "Squid authentication helpers have been installed suid root."
- elog "This allows shadow based authentication (see bug #52977 for more)."
- echo
- elog "Be careful what type of cache_dir you select!"
- elog " 'diskd' is optimized for high levels of traffic, but it might seem slow"
- elog "when there isn't sufficient traffic to keep squid reasonably busy."
- elog " If your traffic level is low to moderate, use 'aufs' or 'ufs'."
-}
+++ /dev/null
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/squid-3.1.8.ebuild,v 1.9 2010/10/09 16:31:59 armin76 Exp $
-
-EAPI="2"
-
-inherit eutils pam toolchain-funcs
-
-DESCRIPTION="A full-featured web proxy cache"
-HOMEPAGE="http://www.squid-cache.org/"
-SRC_URI="http://www.squid-cache.org/Versions/v3/3.1/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="caps ipv6 pam ldap samba sasl kerberos nis radius ssl snmp selinux logrotate test \
- ecap icap-client \
- mysql postgres sqlite \
- zero-penalty-hit \
- pf-transparent ipf-transparent kqueue \
- elibc_uclibc kernel_linux +epoll tproxy"
-RESTRICT=test
-
-COMMON_DEPEND="caps? ( >=sys-libs/libcap-2.16 )
- pam? ( virtual/pam )
- ldap? ( net-nds/openldap )
- kerberos? ( virtual/krb5 )
- ssl? ( dev-libs/openssl )
- sasl? ( dev-libs/cyrus-sasl )
- ecap? ( net-libs/libecap )
- selinux? ( sec-policy/selinux-squid )
- !x86-fbsd? ( logrotate? ( app-admin/logrotate ) )
- >=sys-libs/db-4
- dev-lang/perl"
-DEPEND="${COMMON_DEPEND}
- sys-devel/automake
- sys-devel/autoconf
- sys-devel/libtool
- sys-apps/ed
- test? ( dev-util/cppunit )"
-RDEPEND="${COMMON_DEPEND}
- samba? ( net-fs/samba )
- mysql? ( dev-perl/DBD-mysql )
- postgres? ( dev-perl/DBD-Pg )
- sqlite? ( dev-perl/DBD-SQLite )"
-
-pkg_setup() {
- if grep -qs '^[[:space:]]*cache_dir[[:space:]]\+coss' "${ROOT}"etc/squid/squid.conf; then
- eerror "coss store IO has been disabled by upstream due to stability issues!"
- eerror "If you want to install this version, switch the store type to something else"
- eerror "before attempting to install this version again."
-
- die "/etc/squid/squid.conf: cache_dir use a disabled store type"
- fi
-
- if use tproxy && ! use caps; then
- eerror "libcap is required by Transparent Proxy support for Netfilter TPROXY!"
- eerror "Please enable caps USE flag and try again."
-
- die "invalid combination of USE flags"
- fi
-
- enewgroup squid 31
- enewuser squid 31 -1 /var/cache/squid squid
-}
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-gentoo.patch
- epatch "${FILESDIR}"/${P}-qafixes.patch
- epatch "${FILESDIR}"/${P}-libmd5.patch
-
- # eautoreconf breaks lib/libLtdl/libtool script
- ./bootstrap.sh || die "autoreconf failed"
-}
-
-src_configure() {
- local myconf=""
-
- local basic_modules="getpwnam,NCSA,MSNT"
- use samba && basic_modules="SMB,multi-domain-NTLM,${basic_modules}"
- use ldap && basic_modules="LDAP,${basic_modules}"
- use pam && basic_modules="PAM,${basic_modules}"
- use sasl && basic_modules="SASL,${basic_modules}"
- use nis && ! use elibc_uclibc && basic_modules="YP,${basic_modules}"
- use radius && basic_modules="squid_radius_auth,${basic_modules}"
- if use mysql || use postgres || use sqlite ; then
- basic_modules="DB,${basic_modules}"
- fi
-
- local digest_modules="password"
- use ldap && digest_modules="ldap,${digest_modules}"
-
- local ext_helpers="ip_user,session,unix_group"
- use samba && ext_helpers="wbinfo_group,${ext_helpers}"
- use ldap && ext_helpers="ldap_group,${ext_helpers}"
-
- local ntlm_helpers="fakeauth"
- use samba && ntlm_helpers="smb_lm,${ntlm_helpers}"
-
- local negotiate_helpers=
- if use kerberos; then
- negotiate_helpers="squid_kerb_auth"
- has_version app-crypt/mit-krb5 \
- && myconf="--enable-mit --disable-heimdal" \
- || myconf="--disable-mit --enable-heimdal"
- fi
-
- # coss support has been disabled
- # If it is re-enabled again, make sure you don't enable it for elibc_uclibc (#61175)
- myconf="${myconf} --enable-storeio=ufs,diskd,aufs"
-
- if use kernel_linux; then
- myconf="${myconf} --enable-linux-netfilter
- $(use_enable tproxy linux-tproxy)
- $(use_enable epoll)"
- elif use kernel_FreeBSD || use kernel_OpenBSD || use kernel_NetBSD ; then
- myconf="${myconf} $(use_enable kqueue)"
- if use pf-transparent; then
- myconf="${myconf} --enable-pf-transparent"
- elif use ipf-transparent; then
- myconf="${myconf} --enable-ipf-transparent"
- fi
- fi
-
- export CC=$(tc-getCC)
-
- econf \
- --sysconfdir=/etc/squid \
- --libexecdir=/usr/libexec/squid \
- --localstatedir=/var \
- --with-pidfile=/var/run/squid.pid \
- --datadir=/usr/share/squid \
- --with-logdir=/var/log/squid \
- --with-default-user=squid \
- --enable-auth="basic,digest,negotiate,ntlm" \
- --enable-removal-policies="lru,heap" \
- --enable-digest-auth-helpers="${digest_modules}" \
- --enable-basic-auth-helpers="${basic_modules}" \
- --enable-external-acl-helpers="${ext_helpers}" \
- --enable-ntlm-auth-helpers="${ntlm_helpers}" \
- --enable-negotiate-auth-helpers="${negotiate_helpers}" \
- --enable-useragent-log \
- --enable-cache-digests \
- --enable-delay-pools \
- --enable-referer-log \
- --enable-arp-acl \
- --with-large-files \
- --with-filedescriptors=8192 \
- --disable-strict-error-checking \
- $(use_enable caps) \
- $(use_enable ipv6) \
- $(use_enable snmp) \
- $(use_enable ssl) \
- $(use_enable icap-client) \
- $(use_enable ecap) \
- $(use_enable zero-penalty-hit zph-qos) \
- ${myconf} || die "econf failed"
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die "emake install failed"
-
- # need suid root for looking into /etc/shadow
- fowners root:squid /usr/libexec/squid/ncsa_auth
- fowners root:squid /usr/libexec/squid/pam_auth
- fperms 4750 /usr/libexec/squid/ncsa_auth
- fperms 4750 /usr/libexec/squid/pam_auth
-
- # some cleanups
- rm -f "${D}"/usr/bin/Run*
-
- dodoc CONTRIBUTORS CREDITS ChangeLog QUICKSTART SPONSORS doc/*.txt \
- helpers/ntlm_auth/no_check/README.no_check_ntlm_auth
- newdoc helpers/basic_auth/SMB/README README.auth_smb
- dohtml helpers/basic_auth/MSNT/README.html RELEASENOTES.html
- newdoc helpers/basic_auth/LDAP/README README.auth_ldap
- doman helpers/basic_auth/LDAP/*.8
- dodoc helpers/basic_auth/SASL/squid_sasl_auth*
-
- newpamd "${FILESDIR}/squid.pam" squid
- newconfd "${FILESDIR}/squid.confd" squid
- if use logrotate; then
- newinitd "${FILESDIR}/squid.initd-logrotate" squid
- insinto /etc/logrotate.d
- newins "${FILESDIR}/squid.logrotate" squid
- else
- newinitd "${FILESDIR}/squid.initd" squid
- exeinto /etc/cron.weekly
- newexe "${FILESDIR}/squid.cron" squid.cron
- fi
-
- rm -rf "${D}"/var
- diropts -m0755 -o squid -g squid
- keepdir /var/cache/squid /var/log/squid
-}
-
-pkg_postinst() {
- echo
- ewarn "Squid authentication helpers have been installed suid root."
- ewarn "This allows shadow based authentication (see bug #52977 for more)."
- echo
- ewarn "Be careful what type of cache_dir you select!"
- ewarn " 'diskd' is optimized for high levels of traffic, but it might seem slow"
- ewarn "when there isn't sufficient traffic to keep squid reasonably busy."
- ewarn " If your traffic level is low to moderate, use 'aufs' or 'ufs'."
- echo
- ewarn "Squid can be configured to run in transparent mode like this:"
- ewarn " ${HILITE}http_port internal-addr:3128 transparent${NORMAL}"
- if use zero-penalty-hit; then
- echo
- ewarn "In order for zph_preserve_miss_tos to work, you will have to alter your kernel"
- ewarn "with the patch that can be found on http://zph.bratcheda.org site."
- fi
-}
+++ /dev/null
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/squid-3.1.9.ebuild,v 1.2 2010/12/03 16:29:41 flameeyes Exp $
-
-EAPI="2"
-
-inherit eutils pam toolchain-funcs autotools
-
-DESCRIPTION="A full-featured web proxy cache"
-HOMEPAGE="http://www.squid-cache.org/"
-SRC_URI="http://www.squid-cache.org/Versions/v3/3.1/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="caps ipv6 pam ldap samba sasl kerberos nis radius ssl snmp selinux logrotate test \
- ecap icap-client \
- mysql postgres sqlite \
- zero-penalty-hit \
- pf-transparent ipf-transparent kqueue \
- elibc_uclibc kernel_linux +epoll tproxy"
-RESTRICT=test
-
-COMMON_DEPEND="caps? ( >=sys-libs/libcap-2.16 )
- pam? ( virtual/pam )
- ldap? ( net-nds/openldap )
- kerberos? ( virtual/krb5 )
- ssl? ( dev-libs/openssl )
- sasl? ( dev-libs/cyrus-sasl )
- ecap? ( net-libs/libecap )
- selinux? ( sec-policy/selinux-squid )
- !x86-fbsd? ( logrotate? ( app-admin/logrotate ) )
- >=sys-libs/db-4
- dev-lang/perl"
-DEPEND="${COMMON_DEPEND}
- sys-apps/ed
- test? ( dev-util/cppunit )"
-RDEPEND="${COMMON_DEPEND}
- samba? ( net-fs/samba )
- mysql? ( dev-perl/DBD-mysql )
- postgres? ( dev-perl/DBD-Pg )
- sqlite? ( dev-perl/DBD-SQLite )"
-
-pkg_setup() {
- if grep -qs '^[[:space:]]*cache_dir[[:space:]]\+coss' "${ROOT}"etc/squid/squid.conf; then
- eerror "coss store IO has been disabled by upstream due to stability issues!"
- eerror "If you want to install this version, switch the store type to something else"
- eerror "before attempting to install this version again."
-
- die "/etc/squid/squid.conf: cache_dir use a disabled store type"
- fi
-
- if use tproxy && ! use caps; then
- eerror "libcap is required by Transparent Proxy support for Netfilter TPROXY!"
- eerror "Please enable caps USE flag and try again."
-
- die "invalid combination of USE flags"
- fi
-
- enewgroup squid 31
- enewuser squid 31 -1 /var/cache/squid squid
-}
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-gentoo.patch
- epatch "${FILESDIR}"/${P}-qafixes.patch
- epatch "${FILESDIR}"/${P}-libmd5.patch
-
- eautoreconf
-}
-
-src_configure() {
- local myconf=""
-
- local basic_modules="getpwnam,NCSA,MSNT"
- use samba && basic_modules="SMB,multi-domain-NTLM,${basic_modules}"
- use ldap && basic_modules="LDAP,${basic_modules}"
- use pam && basic_modules="PAM,${basic_modules}"
- use sasl && basic_modules="SASL,${basic_modules}"
- use nis && ! use elibc_uclibc && basic_modules="YP,${basic_modules}"
- use radius && basic_modules="squid_radius_auth,${basic_modules}"
- if use mysql || use postgres || use sqlite ; then
- basic_modules="DB,${basic_modules}"
- fi
-
- local digest_modules="password"
- use ldap && digest_modules="ldap,${digest_modules}"
-
- local ext_helpers="ip_user,session,unix_group"
- use samba && ext_helpers="wbinfo_group,${ext_helpers}"
- use ldap && ext_helpers="ldap_group,${ext_helpers}"
-
- local ntlm_helpers="fakeauth"
- use samba && ntlm_helpers="smb_lm,${ntlm_helpers}"
-
- local negotiate_helpers=
- if use kerberos; then
- negotiate_helpers="squid_kerb_auth"
- has_version app-crypt/mit-krb5 \
- && myconf="--enable-mit --disable-heimdal" \
- || myconf="--disable-mit --enable-heimdal"
- fi
-
- # coss support has been disabled
- # If it is re-enabled again, make sure you don't enable it for elibc_uclibc (#61175)
- myconf="${myconf} --enable-storeio=ufs,diskd,aufs"
-
- if use kernel_linux; then
- myconf="${myconf} --enable-linux-netfilter
- $(use_enable tproxy linux-tproxy)
- $(use_enable epoll)"
- elif use kernel_FreeBSD || use kernel_OpenBSD || use kernel_NetBSD ; then
- myconf="${myconf} $(use_enable kqueue)"
- if use pf-transparent; then
- myconf="${myconf} --enable-pf-transparent"
- elif use ipf-transparent; then
- myconf="${myconf} --enable-ipf-transparent"
- fi
- fi
-
- export CC=$(tc-getCC)
-
- econf \
- --sysconfdir=/etc/squid \
- --libexecdir=/usr/libexec/squid \
- --localstatedir=/var \
- --with-pidfile=/var/run/squid.pid \
- --datadir=/usr/share/squid \
- --with-logdir=/var/log/squid \
- --with-default-user=squid \
- --enable-auth="basic,digest,negotiate,ntlm" \
- --enable-removal-policies="lru,heap" \
- --enable-digest-auth-helpers="${digest_modules}" \
- --enable-basic-auth-helpers="${basic_modules}" \
- --enable-external-acl-helpers="${ext_helpers}" \
- --enable-ntlm-auth-helpers="${ntlm_helpers}" \
- --enable-negotiate-auth-helpers="${negotiate_helpers}" \
- --enable-useragent-log \
- --enable-cache-digests \
- --enable-delay-pools \
- --enable-referer-log \
- --enable-arp-acl \
- --with-large-files \
- --with-filedescriptors=8192 \
- --disable-strict-error-checking \
- $(use_enable caps) \
- $(use_enable ipv6) \
- $(use_enable snmp) \
- $(use_enable ssl) \
- $(use_enable icap-client) \
- $(use_enable ecap) \
- $(use_enable zero-penalty-hit zph-qos) \
- ${myconf} || die "econf failed"
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die "emake install failed"
-
- # need suid root for looking into /etc/shadow
- fowners root:squid /usr/libexec/squid/ncsa_auth
- fowners root:squid /usr/libexec/squid/pam_auth
- fperms 4750 /usr/libexec/squid/ncsa_auth
- fperms 4750 /usr/libexec/squid/pam_auth
-
- # some cleanups
- rm -f "${D}"/usr/bin/Run*
-
- dodoc CONTRIBUTORS CREDITS ChangeLog QUICKSTART SPONSORS doc/*.txt \
- helpers/ntlm_auth/no_check/README.no_check_ntlm_auth
- newdoc helpers/basic_auth/SMB/README README.auth_smb
- dohtml helpers/basic_auth/MSNT/README.html RELEASENOTES.html
- newdoc helpers/basic_auth/LDAP/README README.auth_ldap
- doman helpers/basic_auth/LDAP/*.8
- dodoc helpers/basic_auth/SASL/squid_sasl_auth*
-
- newpamd "${FILESDIR}/squid.pam" squid
- newconfd "${FILESDIR}/squid.confd" squid
- if use logrotate; then
- newinitd "${FILESDIR}/squid.initd-logrotate" squid
- insinto /etc/logrotate.d
- newins "${FILESDIR}/squid.logrotate" squid
- else
- newinitd "${FILESDIR}/squid.initd" squid
- exeinto /etc/cron.weekly
- newexe "${FILESDIR}/squid.cron" squid.cron
- fi
-
- rm -rf "${D}"/var
- diropts -m0755 -o squid -g squid
- keepdir /var/cache/squid /var/log/squid
-}
-
-pkg_postinst() {
- echo
- ewarn "Squid authentication helpers have been installed suid root."
- ewarn "This allows shadow based authentication (see bug #52977 for more)."
- echo
- ewarn "Be careful what type of cache_dir you select!"
- ewarn " 'diskd' is optimized for high levels of traffic, but it might seem slow"
- ewarn "when there isn't sufficient traffic to keep squid reasonably busy."
- ewarn " If your traffic level is low to moderate, use 'aufs' or 'ufs'."
- echo
- ewarn "Squid can be configured to run in transparent mode like this:"
- ewarn " ${HILITE}http_port internal-addr:3128 transparent${NORMAL}"
- if use zero-penalty-hit; then
- echo
- ewarn "In order for zph_preserve_miss_tos to work, you will have to alter your kernel"
- ewarn "with the patch that can be found on http://zph.bratcheda.org site."
- fi
-}
projects / gentoo.git / commitdiff