diff options
Diffstat (limited to 'net-proxy')
| -rw-r--r-- | net-proxy/squid/ChangeLog | 13 | ||||
| -rw-r--r-- | net-proxy/squid/Manifest | 28 | ||||
| -rw-r--r-- | net-proxy/squid/files/squid-2-capability.patch | 38 | ||||
| -rw-r--r-- | net-proxy/squid/files/squid-2.7.7-gentoo.patch | 319 | ||||
| -rw-r--r-- | net-proxy/squid/files/squid-3-capability.patch | 35 | ||||
| -rw-r--r-- | net-proxy/squid/files/squid-3.1.6-bug3011.patch | 116 | ||||
| -rw-r--r-- | net-proxy/squid/files/squid-3.1.9-gentoo.patch (renamed from net-proxy/squid/files/squid-3.1.6-gentoo.patch) | 104 | ||||
| -rw-r--r-- | net-proxy/squid/files/squid-3.1.9-libmd5.patch (renamed from net-proxy/squid/files/squid-3.1.6-libmd5.patch) | 8 | ||||
| -rw-r--r-- | net-proxy/squid/files/squid-3.1.9-qafixes.patch (renamed from net-proxy/squid/files/squid-3.1.6-qafixes.patch) | 6 | ||||
| -rw-r--r-- | net-proxy/squid/squid-2.7.7.ebuild | 189 | ||||
| -rw-r--r-- | net-proxy/squid/squid-3.1.9.ebuild (renamed from net-proxy/squid/squid-3.1.6-r1.ebuild) | 5 |
11 files changed, 89 insertions, 772 deletions
diff --git a/net-proxy/squid/ChangeLog b/net-proxy/squid/ChangeLog index 672f776e7761..949374a340a6 100644 --- a/net-proxy/squid/ChangeLog +++ b/net-proxy/squid/ChangeLog @@ -1,6 +1,17 @@ # ChangeLog for net-proxy/squid # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/ChangeLog,v 1.316 2010/10/09 16:32:02 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/ChangeLog,v 1.317 2010/11/27 12:57:05 mrness Exp $ + +*squid-3.1.9 (27 Nov 2010) + + 27 Nov 2010; Alin Năstac <mrness@gentoo.org> -squid-2.7.7.ebuild, + -files/squid-2.7.7-gentoo.patch, -files/squid-2-capability.patch, + -squid-3.1.6-r1.ebuild, -files/squid-3.1.6-bug3011.patch, + -files/squid-3.1.6-gentoo.patch, -files/squid-3.1.6-libmd5.patch, + -files/squid-3.1.6-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, -files/squid-3-capability.patch: + Version bump (#342997). 09 Oct 2010; Raúl Porcel <armin76@gentoo.org> squid-3.1.8.ebuild: ia64/sparc stable wrt #334263 diff --git a/net-proxy/squid/Manifest b/net-proxy/squid/Manifest index 96e980d11dbf..52eb208c727d 100644 --- a/net-proxy/squid/Manifest +++ b/net-proxy/squid/Manifest @@ -1,28 +1,32 @@ -AUX squid-2-capability.patch 970 RMD160 01edc052d32b6531e6db93ff1addef91e193c6df SHA1 533bff849dbcbfb2d85c4a995eaea6585a593fd7 SHA256 4e0cef8fc9643e7b4922c510bf25fbd902eaeaec0846eb49a809229ab75b21c6 +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + AUX squid-2-heimdal.patch 776 RMD160 2ced12e7682356ee2eb660d877437c3ddad6476e SHA1 3a693c2c975fe4c77ee729d8af8ef28097b11fb6 SHA256 bd0083836321c596db3fc8749152bc77d5a4bd03070d33541b7b489af59e4c25 -AUX squid-2.7.7-gentoo.patch 13118 RMD160 c4912b2e6746cb5f96d58f68f55d394c32053de2 SHA1 20482baae9ca9861ce5c1eac1e165b885058ad22 SHA256 c26c59fe2b0f3ac1c6ca4eeafb7c561b21729ab0d8918e1823a868814ee9f0e2 AUX squid-2.7.9-gentoo.patch 13118 RMD160 44d2482b9c998c1641ab3e2d5c5701a4f6fb6165 SHA1 b5007d3d2df28c35b88c814b41fd4e182ad34f2b SHA256 981588dc2d599a2b49f550a1ae111e96515b437a03c8d0dccc6f96f078009d11 -AUX squid-3-capability.patch 902 RMD160 40ccc1c7b39f2f877ebec5cd5e9556e0b5499af0 SHA1 436104235c71c8c9a81431fd8bbbf4da0f280ff3 SHA256 ff6fa8ee56aedc461b840295f072f7568258edc0ac48ffbeadd15ebab030e846 -AUX squid-3.1.6-bug3011.patch 4424 RMD160 665397f98ac28a76aa78c462a7d03d37be6c440b SHA1 9db304a6e93a7bffafb938d2a0a73b9f497153b1 SHA256 bbb4df609b711965ad7b76afca7b4c7016be24cb978e085ddc024ab4fd1be023 -AUX squid-3.1.6-gentoo.patch 12364 RMD160 f9cfd349d4d0fbb231b4293387eb1f21d2648adc SHA1 c1230d8ffe4135a966aeb365f552931240cb7e67 SHA256 30a282ccfb2cdf1b7abdc4fc7b3fe787e6ba63d0da8d5d7c82ee2789c06d94bf -AUX squid-3.1.6-libmd5.patch 588 RMD160 54666cae870b49c77dc7c009c2e333a3ef37d70c SHA1 dc30a416194388248c24488331818e58e44c5817 SHA256 c4587780d5fdd5a662b1051c1427f8c7a8e844fd60af6efae76795cb0716aa0d -AUX squid-3.1.6-qafixes.patch 2214 RMD160 985c4ffb9c40403b2ab0899ea195f66f9018b653 SHA1 c6199fc6c2faedc9a952655f9f4ef1bba6496177 SHA256 7a07ec0e44e741d88125ca15b9978913468eda227ead44412bef9821d799f797 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.initd-logrotate 3163 RMD160 b7d58517e4198ceb7416c00004c91ac30a241bfb SHA1 714d51e0c449817c12e7230942f89c1a62012107 SHA256 b403b7ffebc08c2ce76cd2b8b6c53a639f24e3e35933ba9766aa4623a34a1279 AUX squid.logrotate 103 RMD160 e7e4a6bde48e2735632692a6e628955b270f30ad SHA1 6e8d42f6a1a3109f0a26ed30edc7d91c6816e23f SHA256 e5ddce1c9af851040affa15e1a59e89d8db0f2eea7c461320a1d3784578f4482 AUX squid.pam 315 RMD160 afb3f1cc36ba5ef0015c40040b6d5c18485ec828 SHA1 40933fabaaa2a9cb38d57c3acb77857082c82ae5 SHA256 68ef4282f9fb8506df710d0ae16e84e991e9b138c7f1d0af922682219c7a971f -DIST squid-2.7.STABLE7.tar.gz 1784325 RMD160 c2ada1aab388244aaa20476a5884e94b3107fbfc SHA1 94a385a494f50cf3394e226ce743ae3a3ad51440 SHA256 2b926aece7d4beac0370d9b72899d3be7f48c29e973a1328666938a2e4c4ffa6 DIST squid-2.7.STABLE9.tar.gz 1789462 RMD160 59c63348beed9a672612d48f9ef5e7ca81fa9840 SHA1 6d90fe06468b662b2eefd7ffeb47b9a78f0a871d SHA256 d54ca048313c4b64609fcdf9f1934a70fc1702032a5f04073056d7491d3dd781 -DIST squid-3.1.6.tar.gz 3245533 RMD160 52e0bd930b24cb967e088c7edc7068af704b1055 SHA1 b2bc188ec7ac99f830f8d88b45d3a41d3b9a74e8 SHA256 22bbbd39dc52374bd42d01bf936ccf4d672545c3b84571d03bb44d399fc7db24 DIST squid-3.1.8.tar.gz 3253846 RMD160 d5264a517b57774a9f536bee7977ac9769fca63f SHA1 1b3e14e653a77462607aefa7931605a5e24829b9 SHA256 7a8bf96fb0f8245ff0ad6bd7895d6f4f79518c80deb4ef05e0c2a36b22c9b9ac -EBUILD squid-2.7.7.ebuild 5992 RMD160 03ca98a46403bec990febbc7b28053dc6e89d519 SHA1 01bcc4587e615b1f8c3911e91b140e0ec0c9f105 SHA256 67388f9af31f6e48b1fc3fead1dbf7d401011c1f3562ff5858c38ed2ed7c9f52 +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.6-r1.ebuild 7061 RMD160 23b60a726729a5aad97450cbbbf5a4f8018cec85 SHA1 d010a2d12916fdd761d1e78bb778ffc56eed2dee SHA256 5a7dc380fb839cacbe26c96c4f42650d8e3ae731cc0ffc1e85cefd9f1712aa3b EBUILD squid-3.1.8.ebuild 7018 RMD160 ebeb8889012c8a9b05813b5e1e8cd955887db0bf SHA1 48bbda8dc9d056fe98ff6024e3acf41b8fb8df99 SHA256 7f98d3bcedae6eb83455744f76951ea35fd15c39fbc270dd6b3a59fd2873e8ce -MISC ChangeLog 67784 RMD160 c75a6a396d482013beaf994925ca102d01a47c70 SHA1 de5a23f114cfae318349f953f51a83465d25fcaf SHA256 e0ca60babcb77c70851b3cde2e86114c0cd4b4472277e9179277351b129b106f +EBUILD squid-3.1.9.ebuild 7026 RMD160 43abef8a76e1c0669208e66c7b6b09c648b491ab SHA1 eee4bb6c84158204ece4978853c7b5622e17e827 SHA256 885a6fff78010517700e12b94cc58ac345261c69bb60722c43af5e4b0b702df4 +MISC ChangeLog 68297 RMD160 5f146d0ece8d7db1816dac7104721fb848b35d7d SHA1 e91d1ca2dbb15f89c8ae164324cdd0576e1c7b23 SHA256 52ffaf8830c090084548a479001655a53b77a7a6af7c00fef52691801713b0d1 MISC metadata.xml 1015 RMD160 03ac3fffc7b01e366b173a4c3bf1dc6be1bb9202 SHA1 3c1681981e2a143ee50d0ee5bc901ac81e7c5cc4 SHA256 06d8e8a7909b9140eb2e70193db754b84d864da260d6cdf9bde9fa58442ce34a +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.11 (GNU/Linux) + +iEYEARECAAYFAkzxAC0ACgkQ1564UogppBKLpACfQgQhz4B76isvixQf/gQ8LiQs +zO0An2n4nXTvR5ryhqvhsfD4DafsuNmn +=rh+u +-----END PGP SIGNATURE----- diff --git a/net-proxy/squid/files/squid-2-capability.patch b/net-proxy/squid/files/squid-2-capability.patch deleted file mode 100644 index a17d22e1ffd0..000000000000 --- a/net-proxy/squid/files/squid-2-capability.patch +++ /dev/null @@ -1,38 +0,0 @@ ---- configure.in 2009-02-04 01:44:06.000000000 +0100 -+++ configure.in 2009-06-23 20:59:28.000000000 +0200 -@@ -1694,7 +1694,6 @@ - db.h \ - db_185.h \ - aio.h \ -- sys/capability.h \ - ,,,[ - #if HAVE_SYS_TYPES_H - #include <sys/types.h> -@@ -1728,6 +1727,13 @@ - #endif - ]) - -+dnl Check for libcap header -+AC_ARG_ENABLE(caps, -+[ --disable-caps disable usage of Linux capabilities library to control privileges]) -+if test "x$enable_caps" != xno; then -+ AC_CHECK_HEADERS( sys/capability.h ) -+fi -+ - dnl Check for IP-Filter headers. These are a bit nasty.. - AC_CHECK_HEADERS( \ - ip_compat.h \ ---- src/tools.c 2008-10-06 23:27:17.000000000 +0200 -+++ src/tools.c 2009-06-23 20:57:42.000000000 +0200 -@@ -42,11 +42,6 @@ - - #ifdef _SQUID_LINUX_ - #if HAVE_SYS_CAPABILITY_H --#undef _POSIX_SOURCE --/* Ugly glue to get around linux header madness colliding with glibc */ --#define _LINUX_TYPES_H --#define _LINUX_FS_H --typedef uint32_t __u32; - #include <sys/capability.h> - #endif - #endif diff --git a/net-proxy/squid/files/squid-2.7.7-gentoo.patch b/net-proxy/squid/files/squid-2.7.7-gentoo.patch deleted file mode 100644 index a41c030838cf..000000000000 --- a/net-proxy/squid/files/squid-2.7.7-gentoo.patch +++ /dev/null @@ -1,319 +0,0 @@ -diff -Nru squid-2.7.STABLE7.orig/configure.in squid-2.7.STABLE7/configure.in ---- squid-2.7.STABLE7.orig/configure.in 2009-09-22 17:57:06.000000000 +0200 -+++ squid-2.7.STABLE7/configure.in 2009-09-22 17:58:34.000000000 +0200 -@@ -18,9 +18,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-2.7.STABLE7.orig/helpers/basic_auth/MSNT/confload.c squid-2.7.STABLE7/helpers/basic_auth/MSNT/confload.c ---- squid-2.7.STABLE7.orig/helpers/basic_auth/MSNT/confload.c 2002-06-26 21:09:48.000000000 +0200 -+++ squid-2.7.STABLE7/helpers/basic_auth/MSNT/confload.c 2009-09-22 17:58:34.000000000 +0200 -@@ -24,7 +24,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-2.7.STABLE7.orig/helpers/basic_auth/MSNT/msntauth.conf.default squid-2.7.STABLE7/helpers/basic_auth/MSNT/msntauth.conf.default ---- squid-2.7.STABLE7.orig/helpers/basic_auth/MSNT/msntauth.conf.default 2002-06-26 20:44:28.000000000 +0200 -+++ squid-2.7.STABLE7/helpers/basic_auth/MSNT/msntauth.conf.default 2009-09-22 17:58:34.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-2.7.STABLE7.orig/helpers/basic_auth/SMB/Makefile.am squid-2.7.STABLE7/helpers/basic_auth/SMB/Makefile.am ---- squid-2.7.STABLE7.orig/helpers/basic_auth/SMB/Makefile.am 2005-05-17 18:56:26.000000000 +0200 -+++ squid-2.7.STABLE7/helpers/basic_auth/SMB/Makefile.am 2009-09-22 17:58:34.000000000 +0200 -@@ -14,7 +14,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-2.7.STABLE7.orig/helpers/basic_auth/SMB/smb_auth.sh squid-2.7.STABLE7/helpers/basic_auth/SMB/smb_auth.sh ---- squid-2.7.STABLE7.orig/helpers/basic_auth/SMB/smb_auth.sh 2001-01-08 00:36:46.000000000 +0100 -+++ squid-2.7.STABLE7/helpers/basic_auth/SMB/smb_auth.sh 2009-09-22 17:58:34.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-2.7.STABLE7.orig/helpers/external_acl/session/squid_session.8 squid-2.7.STABLE7/helpers/external_acl/session/squid_session.8 ---- squid-2.7.STABLE7.orig/helpers/external_acl/session/squid_session.8 2007-01-06 18:28:35.000000000 +0100 -+++ squid-2.7.STABLE7/helpers/external_acl/session/squid_session.8 2009-09-22 17:58:34.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-2.7.STABLE7.orig/helpers/external_acl/unix_group/squid_unix_group.8 squid-2.7.STABLE7/helpers/external_acl/unix_group/squid_unix_group.8 ---- squid-2.7.STABLE7.orig/helpers/external_acl/unix_group/squid_unix_group.8 2006-05-14 17:07:24.000000000 +0200 -+++ squid-2.7.STABLE7/helpers/external_acl/unix_group/squid_unix_group.8 2009-09-22 17:58:34.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-2.7.STABLE7.orig/helpers/negotiate_auth/squid_kerb_auth/do.sh squid-2.7.STABLE7/helpers/negotiate_auth/squid_kerb_auth/do.sh ---- squid-2.7.STABLE7.orig/helpers/negotiate_auth/squid_kerb_auth/do.sh 2007-06-25 00:23:18.000000000 +0200 -+++ squid-2.7.STABLE7/helpers/negotiate_auth/squid_kerb_auth/do.sh 2009-09-22 17:58:34.000000000 +0200 -@@ -7,7 +7,7 @@ - # - CC=gcc - #CFLAGS="-Wall -Wextra -Werror -Wcomment -Wpointer-arith -Wcast-align -Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wdeclaration-after-statement -Wshadow -O2" --CFLAGS="-Wall -Werror -Wcomment -Wpointer-arith -Wcast-align -Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wshadow -O2" -+CFLAGS="-Wall -Wpointer-arith -Wcast-align -Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wshadow -O2" - if [ "$1" = "HEIMDAL" ]; then - DEFINE="-DHEIMDAL -D__LITTLE_ENDIAN__" - INCLUDE="-I/usr/include/heimdal -Ispnegohelp" -diff -Nru squid-2.7.STABLE7.orig/src/access_log.c squid-2.7.STABLE7/src/access_log.c ---- squid-2.7.STABLE7.orig/src/access_log.c 2008-03-18 03:48:43.000000000 +0100 -+++ squid-2.7.STABLE7/src/access_log.c 2009-09-22 17:58:34.000000000 +0200 -@@ -1261,7 +1261,7 @@ - LogfileStatus = LOG_ENABLE; - } - #if HEADERS_LOG -- headerslog = logfileOpen("/usr/local/squid/logs/headers.log", MAX_URL << 1, 0); -+ headerslog = logfileOpen("/var/log/squid/headers.log", MAX_URL << 1, 0); - assert(NULL != headerslog); - #endif - #if FORW_VIA_DB -diff -Nru squid-2.7.STABLE7.orig/src/cf.data.pre squid-2.7.STABLE7/src/cf.data.pre ---- squid-2.7.STABLE7.orig/src/cf.data.pre 2009-08-16 23:52:42.000000000 +0200 -+++ squid-2.7.STABLE7/src/cf.data.pre 2009-09-22 17:58:34.000000000 +0200 -@@ -678,6 +678,8 @@ - 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 purge method PURGE - acl CONNECT method CONNECT - NOCOMMENT_END - DOC_END -@@ -711,6 +713,9 @@ - # Only allow cachemgr access from localhost - http_access allow manager localhost - http_access deny manager -+# Only allow purge requests from localhost -+http_access allow purge localhost -+http_access deny purge - # Deny requests to unknown ports - http_access deny !Safe_ports - # Deny CONNECT to other than SSL ports -@@ -728,6 +733,9 @@ - # from where browsing should be allowed - http_access allow localnet - -+# 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 -@@ -3754,11 +3762,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 -@@ -3787,12 +3795,12 @@ - - NAME: cache_effective_user - TYPE: string --DEFAULT: nobody -+DEFAULT: squid - LOC: Config.effectiveUser - DOC_START - If you start Squid as root, it will change its effective/real - UID/GID to the user specified below. The default is to change -- to UID to nobody. If you define cache_effective_user, but not -+ to UID to squid. If you define cache_effective_user, but not - cache_effective_group, Squid sets the GID to the effective - user's default group ID (taken from the password file) and - supplementary group list from the from groups membership of -@@ -4429,12 +4437,12 @@ - NAME: snmp_port - TYPE: ushort - LOC: Config.Port.snmp --DEFAULT: 3401 -+DEFAULT: 0 - IFDEF: SQUID_SNMP - DOC_START - Squid can now serve statistics and status information via SNMP. -- By default it listens to port 3401 on the machine. If you don't -- wish to use SNMP, set this to "0". -+ By default snmp_port is disabled. If you wish to use SNMP, -+ set this to "3401" (or any other number you like). - DOC_END - - NAME: snmp_access -@@ -4505,12 +4513,12 @@ - NAME: htcp_port - IFDEF: USE_HTCP - TYPE: ushort --DEFAULT: 4827 -+DEFAULT: 0 - LOC: Config.Port.htcp - DOC_START - The port number where Squid sends and receives HTCP queries to -- and from neighbor caches. Default is 4827. To disable use -- "0". -+ and from neighbor caches. To turn it on you want to set it to -+ 4827. By default it is set to "0" (disabled). - DOC_END - - NAME: log_icp_queries -@@ -5407,6 +5415,9 @@ - If you disable this, it will appear as - - X-Forwarded-For: unknown -+NOCOMMENT_START -+forwarded_for off -+NOCOMMENT_END - DOC_END - - NAME: cachemgr_passwd -diff -Nru squid-2.7.STABLE7.orig/src/client_side.c squid-2.7.STABLE7/src/client_side.c ---- squid-2.7.STABLE7.orig/src/client_side.c 2009-08-16 23:43:51.000000000 +0200 -+++ squid-2.7.STABLE7/src/client_side.c 2009-09-22 17:58:34.000000000 +0200 -@@ -4693,14 +4693,7 @@ - debug(83, 2) ("clientNegotiateSSL: Session %p reused on FD %d (%s:%d)\n", SSL_get_session(ssl), fd, fd_table[fd].ipaddr, (int) fd_table[fd].remote_port); - } else { - if (do_debug(83, 4)) { -- /* Write out the SSL session details.. actually the call below, but -- * OpenSSL headers do strange typecasts confusing GCC.. */ -- /* PEM_write_SSL_SESSION(debug_log, SSL_get_session(ssl)); */ --#if defined(OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x00908000L -- PEM_ASN1_write((i2d_of_void *) i2d_SSL_SESSION, PEM_STRING_SSL_SESSION, debug_log, (char *) SSL_get_session(ssl), NULL, NULL, 0, NULL, NULL); --#else - PEM_ASN1_write(i2d_SSL_SESSION, PEM_STRING_SSL_SESSION, debug_log, (char *) SSL_get_session(ssl), NULL, NULL, 0, NULL, NULL); --#endif - /* Note: This does not automatically fflush the log file.. */ - } - debug(83, 2) ("clientNegotiateSSL: New session %p on FD %d (%s:%d)\n", SSL_get_session(ssl), fd, fd_table[fd].ipaddr, (int) fd_table[fd].remote_port); -diff -Nru squid-2.7.STABLE7.orig/src/defines.h squid-2.7.STABLE7/src/defines.h ---- squid-2.7.STABLE7.orig/src/defines.h 2009-06-26 00:49:28.000000000 +0200 -+++ squid-2.7.STABLE7/src/defines.h 2009-09-22 17:58:34.000000000 +0200 -@@ -259,7 +259,7 @@ - - /* were to look for errors if config path fails */ - #ifndef DEFAULT_SQUID_ERROR_DIR --#define DEFAULT_SQUID_ERROR_DIR "/usr/local/squid/etc/errors" -+#define DEFAULT_SQUID_ERROR_DIR "/usr/share/squid/errors/English" - #endif - - /* gb_type operations */ -diff -Nru squid-2.7.STABLE7.orig/src/main.c squid-2.7.STABLE7/src/main.c ---- squid-2.7.STABLE7.orig/src/main.c 2009-06-26 00:53:15.000000000 +0200 -+++ squid-2.7.STABLE7/src/main.c 2009-09-22 17:58:34.000000000 +0200 -@@ -376,6 +376,22 @@ - asnFreeMemory(); - } - -+#if USE_UNLINKD -+static int -+needUnlinkd(void) -+{ -+ int i; -+ int r = 0; -+ for (i = 0; i < Config.cacheSwap.n_configured; i++) { -+ if (strcmp(Config.cacheSwap.swapDirs[i].type, "ufs") == 0 || -+ strcmp(Config.cacheSwap.swapDirs[i].type, "aufs") == 0 || -+ strcmp(Config.cacheSwap.swapDirs[i].type, "diskd") == 0) -+ r++; -+ } -+ return r; -+} -+#endif -+ - static void - mainReconfigure(void) - { -@@ -613,7 +629,7 @@ - - if (!configured_once) { - #if USE_UNLINKD -- unlinkdInit(); -+ if (needUnlinkd()) unlinkdInit(); - #endif - urlInitialize(); - cachemgrInit(); -@@ -636,6 +652,9 @@ - #if USE_WCCPv2 - wccp2Init(); - #endif -+#if USE_UNLINKD -+ if (needUnlinkd()) unlinkdInit(); -+#endif - serverConnectionsOpen(); - neighbors_init(); - if (Config.chroot_dir) -diff -Nru squid-2.7.STABLE7.orig/src/Makefile.am squid-2.7.STABLE7/src/Makefile.am ---- squid-2.7.STABLE7.orig/src/Makefile.am 2008-01-02 16:50:39.000000000 +0100 -+++ squid-2.7.STABLE7/src/Makefile.am 2009-09-22 17:58:34.000000000 +0200 -@@ -340,13 +340,13 @@ - DEFAULT_CONFIG_FILE = $(sysconfdir)/squid.conf - DEFAULT_MIME_TABLE = $(sysconfdir)/mime.conf - DEFAULT_DNSSERVER = $(libexecdir)/`echo dnsserver | sed '$(transform);s/$$/$(EXEEXT)/'` --DEFAULT_LOG_PREFIX = $(localstatedir)/logs -+DEFAULT_LOG_PREFIX = $(localstatedir)/log/squid - 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_LOG_PREFIX)/squid.pid -+DEFAULT_PID_FILE = $(localstatedir)/run/squid.pid - DEFAULT_NETDB_FILE = $(DEFAULT_LOG_PREFIX)/netdb.state --DEFAULT_SWAP_DIR = $(localstatedir)/cache -+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-daemon | sed '$(transform);s/$$/$(EXEEXT)/'` diff --git a/net-proxy/squid/files/squid-3-capability.patch b/net-proxy/squid/files/squid-3-capability.patch deleted file mode 100644 index e82d77d8e80d..000000000000 --- a/net-proxy/squid/files/squid-3-capability.patch +++ /dev/null @@ -1,35 +0,0 @@ ---- configure.in 2009-04-11 10:35:42.000000000 +0200 -+++ configure.in 2009-06-23 21:12:56.000000000 +0200 -@@ -1940,10 +1940,16 @@ - inttypes.h \ - grp.h \ - db.h \ -- db_185.h \ -- sys/capability.h -+ db_185.h - ) - -+dnl Check for libcap header -+AC_ARG_ENABLE(caps, -+[ --disable-caps disable usage of Linux capabilities library to control privileges]) -+if test "x$enable_caps" != xno; then -+ AC_CHECK_HEADERS( sys/capability.h ) -+fi -+ - AC_CHECK_HEADERS( - linux/netfilter_ipv4.h \ - linux/netfilter_ipv4/ip_tproxy.h \ ---- src/tools.cc 2009-04-11 10:35:42.000000000 +0200 -+++ src/tools.cc 2009-06-23 21:11:11.000000000 +0200 -@@ -42,11 +42,6 @@ - - #ifdef _SQUID_LINUX_ - #if HAVE_SYS_CAPABILITY_H --#undef _POSIX_SOURCE --/* Ugly glue to get around linux header madness colliding with glibc */ --#define _LINUX_TYPES_H --#define _LINUX_FS_H --typedef uint32_t __u32; - #include <sys/capability.h> - #endif - #endif diff --git a/net-proxy/squid/files/squid-3.1.6-bug3011.patch b/net-proxy/squid/files/squid-3.1.6-bug3011.patch deleted file mode 100644 index fe431d2dbd63..000000000000 --- a/net-proxy/squid/files/squid-3.1.6-bug3011.patch +++ /dev/null @@ -1,116 +0,0 @@ -diff -ur ./src/dns_internal.cc /var/tmp/squid-3.1.6/src/dns_internal.cc ---- ./src/dns_internal.cc 2010-08-01 22:01:37.000000000 +0800 -+++ /var/tmp/squid-3.1.6/src/dns_internal.cc 2010-08-10 19:31:46.000000000 +0800 -@@ -201,10 +201,15 @@ - - if (A.IsAnyAddr()) { - debugs(78, 0, "WARNING: Squid does not accept " << A << " in DNS server specifications."); -- A = "127.0.0.1"; -+ A.SetLocalhost(); - debugs(78, 0, "Will be using " << A << " instead, assuming you meant that DNS is running on the same machine"); - } - -+ if (!Ip::EnableIpv6 && !A.SetIPv4()) { -+ debugs(78, DBG_IMPORTANT, "WARNING: IPv6 is disabled. Discarding " << A << " in DNS server specifications."); -+ return; -+ } -+ - if (nns == nns_alloc) { - int oldalloc = nns_alloc; - ns *oldptr = nameservers; -@@ -742,6 +747,12 @@ - else - addr = Config.Addrs.udp_incoming; - -+ if (nameservers[ns].S.IsIPv4() && !addr.SetIPv4()) { -+ debugs(31, DBG_CRITICAL, "ERROR: Cannot contact DNS nameserver " << nameservers[ns].S << " from " << addr); -+ addr.SetAnyAddr(); -+ addr.SetIPv4(); -+ } -+ - vc->queue = new MemBuf; - - vc->msg = new MemBuf; -diff -ur ./src/forward.cc /var/tmp/squid-3.1.6/src/forward.cc ---- ./src/forward.cc 2010-08-01 22:01:37.000000000 +0800 -+++ /var/tmp/squid-3.1.6/src/forward.cc 2010-08-10 19:31:46.000000000 +0800 -@@ -870,9 +870,9 @@ - - // if IPv6 is disabled try to force IPv4-only outgoing. - if (!Ip::EnableIpv6 && !outgoing.SetIPv4()) { -- debugs(50, 4, "fwdConnectStart: " << xstrerror()); -+ debugs(50, 4, "fwdConnectStart: IPv6 is Disabled. Cannot connect from " << outgoing); - ErrorState *anErr = errorCon(ERR_CONNECT_FAIL, HTTP_SERVICE_UNAVAILABLE, request); -- anErr->xerrno = errno; -+ anErr->xerrno = EAFNOSUPPORT; - fail(anErr); - self = NULL; // refcounted - return; -diff -ur ./src/neighbors.cc /var/tmp/squid-3.1.6/src/neighbors.cc ---- ./src/neighbors.cc 2010-08-01 22:01:38.000000000 +0800 -+++ /var/tmp/squid-3.1.6/src/neighbors.cc 2010-08-10 19:49:16.000000000 +0800 -@@ -46,6 +46,7 @@ - #include "Store.h" - #include "icmp/net_db.h" - #include "ip/IpAddress.h" -+#include "ip/tools.h" - - /* count mcast group peers every 15 minutes */ - #define MCAST_COUNT_RATE 900 -@@ -1387,6 +1388,20 @@ - - IpAddress temp(getOutgoingAddr(NULL,p)); - -+ // if IPv6 is disabled try to force IPv4-only outgoing. -+ if (!Ip::EnableIpv6 && !temp.SetIPv4()) { -+ debugs(50, DBG_IMPORTANT, "WARNING: IPv6 is disabled. Failed to use " << temp << " to probe " << p->host); -+ return ret; -+ } -+ -+ // if IPv6 is split-stack, prefer IPv4 -+ if (Ip::EnableIpv6&IPV6_SPECIAL_SPLITSTACK) { -+ // NP: This is not a great choice of default, -+ // but with the current Internet being IPv4-majority has a higher success rate. -+ // if setting to IPv4 fails we dont care, that just means to use IPv6 outgoing. -+ temp.SetIPv4(); -+ } -+ - fd = comm_open(SOCK_STREAM, IPPROTO_TCP, temp, COMM_NONBLOCKING, p->host); - - if (fd < 0) -diff -ur ./src/tunnel.cc /var/tmp/squid-3.1.6/src/tunnel.cc ---- ./src/tunnel.cc 2010-08-01 22:01:38.000000000 +0800 -+++ /var/tmp/squid-3.1.6/src/tunnel.cc 2010-08-10 20:02:46.000000000 +0800 -@@ -46,6 +46,7 @@ - #include "client_side.h" - #include "MemBuf.h" - #include "http.h" -+#include "ip/tools.h" - - class TunnelStateData - { -@@ -641,6 +642,24 @@ - statCounter.server.other.requests++; - /* Create socket. */ - IpAddress temp = getOutgoingAddr(request,NULL); -+ -+ // if IPv6 is disabled try to force IPv4-only outgoing. -+ if (!Ip::EnableIpv6 && !temp.SetIPv4()) { -+ debugs(50, 4, "tunnelStart: IPv6 is Disabled. Tunnel failed from " << temp); -+ err = errorCon(ERR_CONNECT_FAIL, HTTP_SERVICE_UNAVAILABLE, request); -+ err->xerrno = EAFNOSUPPORT; -+ errorSend(fd, err); -+ return; -+ } -+ -+ // if IPv6 is split-stack, prefer IPv4 -+ if (Ip::EnableIpv6&IPV6_SPECIAL_SPLITSTACK) { -+ // NP: This is not a great choice of default, -+ // but with the current Internet being IPv4-majority has a higher success rate. -+ // if setting to IPv4 fails we dont care, that just means to use IPv6 outgoing. -+ temp.SetIPv4(); -+ } -+ - int flags = COMM_NONBLOCKING; - if (request->flags.spoof_client_ip) { - flags |= COMM_TRANSPARENT; diff --git a/net-proxy/squid/files/squid-3.1.6-gentoo.patch b/net-proxy/squid/files/squid-3.1.9-gentoo.patch index 25905f0242d5..d8782bbb28ae 100644 --- a/net-proxy/squid/files/squid-3.1.6-gentoo.patch +++ b/net-proxy/squid/files/squid-3.1.9-gentoo.patch @@ -1,6 +1,6 @@ -diff -Nru squid-3.1.6.orig/acinclude.m4 squid-3.1.6/acinclude.m4 ---- squid-3.1.6.orig/acinclude.m4 2010-08-01 16:01:37.000000000 +0200 -+++ squid-3.1.6/acinclude.m4 2010-08-07 07:24:05.000000000 +0200 +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],[ @@ -10,9 +10,9 @@ diff -Nru squid-3.1.6.orig/acinclude.m4 squid-3.1.6/acinclude.m4 res=$? rm -f conftest.* echo yes -diff -Nru squid-3.1.6.orig/configure.in squid-3.1.6/configure.in ---- squid-3.1.6.orig/configure.in 2010-08-01 16:03:14.000000000 +0200 -+++ squid-3.1.6/configure.in 2010-08-07 07:24:05.000000000 +0200 +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" @@ -26,9 +26,9 @@ diff -Nru squid-3.1.6.orig/configure.in squid-3.1.6/configure.in dnl Check for GNU cc AC_PROG_CC -diff -Nru squid-3.1.6.orig/helpers/basic_auth/MSNT/confload.c squid-3.1.6/helpers/basic_auth/MSNT/confload.c ---- squid-3.1.6.orig/helpers/basic_auth/MSNT/confload.c 2010-08-01 16:01:37.000000000 +0200 -+++ squid-3.1.6/helpers/basic_auth/MSNT/confload.c 2010-08-07 07:24:05.000000000 +0200 +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 */ @@ -38,9 +38,9 @@ diff -Nru squid-3.1.6.orig/helpers/basic_auth/MSNT/confload.c squid-3.1.6/helper #endif #define CONFIGFILE SYSCONFDIR "/msntauth.conf" -diff -Nru squid-3.1.6.orig/helpers/basic_auth/MSNT/msntauth.conf.default squid-3.1.6/helpers/basic_auth/MSNT/msntauth.conf.default ---- squid-3.1.6.orig/helpers/basic_auth/MSNT/msntauth.conf.default 2010-08-01 16:01:38.000000000 +0200 -+++ squid-3.1.6/helpers/basic_auth/MSNT/msntauth.conf.default 2010-08-07 07:24:05.000000000 +0200 +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 @@ -50,9 +50,9 @@ diff -Nru squid-3.1.6.orig/helpers/basic_auth/MSNT/msntauth.conf.default squid-3 +#denyusers /etc/squid/msntauth.denyusers +#allowusers /etc/squid/msntauth.allowusers -diff -Nru squid-3.1.6.orig/helpers/basic_auth/SMB/Makefile.am squid-3.1.6/helpers/basic_auth/SMB/Makefile.am ---- squid-3.1.6.orig/helpers/basic_auth/SMB/Makefile.am 2010-08-01 16:01:37.000000000 +0200 -+++ squid-3.1.6/helpers/basic_auth/SMB/Makefile.am 2010-08-07 07:24:05.000000000 +0200 +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. @@ -62,9 +62,9 @@ diff -Nru squid-3.1.6.orig/helpers/basic_auth/SMB/Makefile.am squid-3.1.6/helper SMB_AUTH_HELPER_PATH = $(libexecdir)/$(SMB_AUTH_HELPER) libexec_SCRIPTS = $(SMB_AUTH_HELPER) -diff -Nru squid-3.1.6.orig/helpers/basic_auth/SMB/smb_auth.sh squid-3.1.6/helpers/basic_auth/SMB/smb_auth.sh ---- squid-3.1.6.orig/helpers/basic_auth/SMB/smb_auth.sh 2010-08-01 16:01:38.000000000 +0200 -+++ squid-3.1.6/helpers/basic_auth/SMB/smb_auth.sh 2010-08-07 07:24:05.000000000 +0200 +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 @@ -83,9 +83,9 @@ diff -Nru squid-3.1.6.orig/helpers/basic_auth/SMB/smb_auth.sh squid-3.1.6/helper echo "Domain controller IP address: $dcip" [ -n "$dcip" ] || exit 1 -diff -Nru squid-3.1.6.orig/helpers/external_acl/session/squid_session.8 squid-3.1.6/helpers/external_acl/session/squid_session.8 ---- squid-3.1.6.orig/helpers/external_acl/session/squid_session.8 2010-08-01 16:01:37.000000000 +0200 -+++ squid-3.1.6/helpers/external_acl/session/squid_session.8 2010-08-07 07:24:05.000000000 +0200 +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 @@ -95,9 +95,9 @@ diff -Nru squid-3.1.6.orig/helpers/external_acl/session/squid_session.8 squid-3. .IP acl session external session .IP -diff -Nru squid-3.1.6.orig/helpers/external_acl/unix_group/squid_unix_group.8 squid-3.1.6/helpers/external_acl/unix_group/squid_unix_group.8 ---- squid-3.1.6.orig/helpers/external_acl/unix_group/squid_unix_group.8 2010-08-01 16:01:39.000000000 +0200 -+++ squid-3.1.6/helpers/external_acl/unix_group/squid_unix_group.8 2010-08-07 07:24:05.000000000 +0200 +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 @@ -107,9 +107,9 @@ diff -Nru squid-3.1.6.orig/helpers/external_acl/unix_group/squid_unix_group.8 sq .IP acl usergroup1 external unix_group group1 .IP -diff -Nru squid-3.1.6.orig/helpers/negotiate_auth/squid_kerb_auth/configure.in squid-3.1.6/helpers/negotiate_auth/squid_kerb_auth/configure.in ---- squid-3.1.6.orig/helpers/negotiate_auth/squid_kerb_auth/configure.in 2010-08-01 16:01:38.000000000 +0200 -+++ squid-3.1.6/helpers/negotiate_auth/squid_kerb_auth/configure.in 2010-08-07 07:24:05.000000000 +0200 +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]) @@ -127,9 +127,9 @@ diff -Nru squid-3.1.6.orig/helpers/negotiate_auth/squid_kerb_auth/configure.in s for ac_cv_my_cflag in $MY_CFLAGS; do echo "int main() { -diff -Nru squid-3.1.6.orig/lib/libTrie/acinclude.m4 squid-3.1.6/lib/libTrie/acinclude.m4 ---- squid-3.1.6.orig/lib/libTrie/acinclude.m4 2010-08-01 16:01:37.000000000 +0200 -+++ squid-3.1.6/lib/libTrie/acinclude.m4 2010-08-07 07:28:11.000000000 +0200 +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],[ @@ -139,9 +139,9 @@ diff -Nru squid-3.1.6.orig/lib/libTrie/acinclude.m4 squid-3.1.6/lib/libTrie/acin res=$? rm -f conftest.* echo yes -diff -Nru squid-3.1.6.orig/lib/libTrie/configure.in squid-3.1.6/lib/libTrie/configure.in ---- squid-3.1.6.orig/lib/libTrie/configure.in 2010-08-01 16:01:37.000000000 +0200 -+++ squid-3.1.6/lib/libTrie/configure.in 2010-08-07 07:24:05.000000000 +0200 +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 @@ -153,9 +153,9 @@ diff -Nru squid-3.1.6.orig/lib/libTrie/configure.in squid-3.1.6/lib/libTrie/conf else TRIE_CFLAGS= TRIE_CXXFLAGS= -diff -Nru squid-3.1.6.orig/src/cf.data.pre squid-3.1.6/src/cf.data.pre ---- squid-3.1.6.orig/src/cf.data.pre 2010-08-01 16:01:38.000000000 +0200 -+++ squid-3.1.6/src/cf.data.pre 2010-08-07 07:24:05.000000000 +0200 +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 @@ -164,7 +164,7 @@ diff -Nru squid-3.1.6.orig/src/cf.data.pre squid-3.1.6/src/cf.data.pre acl CONNECT method CONNECT NOCOMMENT_END DOC_END -@@ -864,6 +865,9 @@ +@@ -862,6 +863,9 @@ http_access allow localnet http_access allow localhost @@ -174,7 +174,7 @@ diff -Nru squid-3.1.6.orig/src/cf.data.pre squid-3.1.6/src/cf.data.pre # And finally deny all other access to this proxy http_access deny all NOCOMMENT_END -@@ -4034,11 +4038,11 @@ +@@ -4027,11 +4031,11 @@ NAME: cache_mgr TYPE: string @@ -188,7 +188,7 @@ diff -Nru squid-3.1.6.orig/src/cf.data.pre squid-3.1.6/src/cf.data.pre DOC_END NAME: mail_from -@@ -6350,7 +6354,7 @@ +@@ -6345,7 +6349,7 @@ NAME: forwarded_for COMMENT: on|off|transparent|truncate|delete TYPE: string @@ -197,9 +197,9 @@ diff -Nru squid-3.1.6.orig/src/cf.data.pre squid-3.1.6/src/cf.data.pre LOC: opt_forwarded_for DOC_START If set to "on", Squid will append your client's IP address -diff -Nru squid-3.1.6.orig/src/debug.cc squid-3.1.6/src/debug.cc ---- squid-3.1.6.orig/src/debug.cc 2010-08-01 16:01:37.000000000 +0200 -+++ squid-3.1.6/src/debug.cc 2010-08-07 07:24:05.000000000 +0200 +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) @@ -209,9 +209,9 @@ diff -Nru squid-3.1.6.orig/src/debug.cc squid-3.1.6/src/debug.cc #endif /* HAVE_SYSLOG */ -diff -Nru squid-3.1.6.orig/src/main.cc squid-3.1.6/src/main.cc ---- squid-3.1.6.orig/src/main.cc 2010-08-01 16:01:39.000000000 +0200 -+++ squid-3.1.6/src/main.cc 2010-08-07 07:24:05.000000000 +0200 +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; @@ -239,10 +239,10 @@ diff -Nru squid-3.1.6.orig/src/main.cc squid-3.1.6/src/main.cc syslog(LOG_NOTICE, "Squid Parent: child process %d started", pid); -diff -Nru squid-3.1.6.orig/src/Makefile.am squid-3.1.6/src/Makefile.am ---- squid-3.1.6.orig/src/Makefile.am 2010-08-01 16:01:39.000000000 +0200 -+++ squid-3.1.6/src/Makefile.am 2010-08-07 07:27:43.000000000 +0200 -@@ -638,7 +638,6 @@ +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 \ @@ -250,7 +250,7 @@ diff -Nru squid-3.1.6.orig/src/Makefile.am squid-3.1.6/src/Makefile.am mime.conf.default data_DATA = \ -@@ -719,8 +718,8 @@ +@@ -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) @@ -261,7 +261,7 @@ diff -Nru squid-3.1.6.orig/src/Makefile.am squid-3.1.6/src/Makefile.am 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 @@ +@@ -798,13 +797,11 @@ @if test -f $(DESTDIR)$(DEFAULT_CONFIG_FILE) ; then \ echo "$@ will not overwrite existing $(DESTDIR)$(DEFAULT_CONFIG_FILE)" ; \ else \ @@ -277,5 +277,5 @@ diff -Nru squid-3.1.6.orig/src/Makefile.am squid-3.1.6/src/Makefile.am + 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)` - diff --git a/net-proxy/squid/files/squid-3.1.6-libmd5.patch b/net-proxy/squid/files/squid-3.1.9-libmd5.patch index f4ab60057ed4..1effc760eaa1 100644 --- a/net-proxy/squid/files/squid-3.1.6-libmd5.patch +++ b/net-proxy/squid/files/squid-3.1.9-libmd5.patch @@ -1,7 +1,7 @@ -diff -Nru squid-3.1.6.orig/configure.in squid-3.1.6/configure.in ---- squid-3.1.6.orig/configure.in 2010-08-07 07:29:18.000000000 +0200 -+++ squid-3.1.6/configure.in 2010-08-07 07:32:16.000000000 +0200 -@@ -2728,7 +2728,11 @@ +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 diff --git a/net-proxy/squid/files/squid-3.1.6-qafixes.patch b/net-proxy/squid/files/squid-3.1.9-qafixes.patch index a0d5f234083c..e61bba1e4008 100644 --- a/net-proxy/squid/files/squid-3.1.6-qafixes.patch +++ b/net-proxy/squid/files/squid-3.1.9-qafixes.patch @@ -1,6 +1,6 @@ -diff -Nru squid-3.1.6.orig/helpers/negotiate_auth/squid_kerb_auth/configure.in squid-3.1.6/helpers/negotiate_auth/squid_kerb_auth/configure.in ---- squid-3.1.6.orig/helpers/negotiate_auth/squid_kerb_auth/configure.in 2010-08-07 07:29:18.000000000 +0200 -+++ squid-3.1.6/helpers/negotiate_auth/squid_kerb_auth/configure.in 2010-08-07 07:29:50.000000000 +0200 +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` diff --git a/net-proxy/squid/squid-2.7.7.ebuild b/net-proxy/squid/squid-2.7.7.ebuild deleted file mode 100644 index ed05c8e1ed49..000000000000 --- a/net-proxy/squid/squid-2.7.7.ebuild +++ /dev/null @@ -1,189 +0,0 @@ -# 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-2.7.7.ebuild,v 1.7 2010/03/21 14:59:50 ranger Exp $ - -EAPI="2" - -inherit eutils pam toolchain-funcs autotools - -#lame archive versioning scheme.. -S_PMV="${PV%%.*}" -S_PV="${PV%.*}" -S_PL="${PV##*.}" -S_PL="${S_PL/_rc/-RC}" -S_PP="${PN}-${S_PV}.STABLE${S_PL}" - -DESCRIPTION="A full-featured web proxy cache" -HOMEPAGE="http://www.squid-cache.org/" -SRC_URI="http://www.squid-cache.org/Versions/v${S_PMV}/${S_PV}/${S_PP}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd" -IUSE="caps pam ldap samba sasl kerberos nis ssl snmp selinux logrotate \ - mysql postgres sqlite \ - zero-penalty-hit \ - pf-transparent ipf-transparent kqueue \ - elibc_uclibc kernel_linux +epoll" - -DEPEND="caps? ( >=sys-libs/libcap-2.16 ) - pam? ( virtual/pam ) - ldap? ( net-nds/openldap ) - kerberos? ( || ( app-crypt/mit-krb5 app-crypt/heimdal ) ) - ssl? ( dev-libs/openssl ) - sasl? ( dev-libs/cyrus-sasl ) - selinux? ( sec-policy/selinux-squid ) - !x86-fbsd? ( logrotate? ( app-admin/logrotate ) ) - >=sys-libs/db-4 - dev-lang/perl" -RDEPEND="${DEPEND} - samba? ( net-fs/samba ) - mysql? ( dev-perl/DBD-mysql ) - postgres? ( dev-perl/DBD-Pg ) - sqlite? ( dev-perl/DBD-SQLite )" - -S="${WORKDIR}/${S_PP}" - -pkg_setup() { - if use zero-penalty-hit; then - ewarn "This version supports natively IP TOS/Priority mangling," - ewarn "but it does not support zph_preserve_miss_tos." - ewarn "If you need that, please use >=${CATEGORY}/${PN}-3 ." - fi - enewgroup squid 31 - enewuser squid 31 -1 /var/cache/squid squid -} - -src_prepare() { - epatch "${FILESDIR}"/${PN}-2-capability.patch - epatch "${FILESDIR}"/${P}-gentoo.patch - has_version app-crypt/mit-krb5 || epatch "${FILESDIR}"/${PN}-2-heimdal.patch - eautoreconf -} - -src_configure() { - 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}" - if use mysql || use postgres || use sqlite ; then - basic_modules="DB,${basic_modules}" - fi - - 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,${ntlm_helpers}" - - local negotiate_helpers= - use kerberos && local negotiate_helpers="squid_kerb_auth" - - local myconf="" - - # Support for uclibc #61175 - if use elibc_uclibc; then - myconf="${myconf} --enable-storeio=ufs,diskd,aufs,null" - myconf="${myconf} --disable-async-io" - else - myconf="${myconf} --enable-storeio=ufs,diskd,coss,aufs,null" - myconf="${myconf} --enable-async-io" - fi - - if use kernel_linux; then - myconf="${myconf} --enable-linux-netfilter - $(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 \ - --datadir=/usr/share/squid \ - --enable-auth="basic,digest,ntlm,negotiate" \ - --enable-removal-policies="lru,heap" \ - --enable-digest-auth-helpers="password" \ - --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-ident-lookups \ - --enable-useragent-log \ - --enable-cache-digests \ - --enable-delay-pools \ - --enable-referer-log \ - --enable-arp-acl \ - --with-pthreads \ - --with-large-files \ - --enable-htcp \ - --enable-carp \ - --enable-follow-x-forwarded-for \ - --with-maxfd=8192 \ - $(use_enable caps) \ - $(use_enable snmp) \ - $(use_enable ssl) \ - ${myconf} || die "econf failed" -} - -src_install() { - make DESTDIR="${D}" install || die "make 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}" -} diff --git a/net-proxy/squid/squid-3.1.6-r1.ebuild b/net-proxy/squid/squid-3.1.9.ebuild index 95af6005900f..1ded19c20fe6 100644 --- a/net-proxy/squid/squid-3.1.6-r1.ebuild +++ b/net-proxy/squid/squid-3.1.9.ebuild @@ -1,6 +1,6 @@ # 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.6-r1.ebuild,v 1.3 2010/09/06 20:26:02 ranger Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/squid-3.1.9.ebuild,v 1.1 2010/11/27 12:57:05 mrness Exp $ EAPI="2" @@ -12,7 +12,7 @@ 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" +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 \ @@ -68,7 +68,6 @@ src_prepare() { epatch "${FILESDIR}"/${P}-gentoo.patch epatch "${FILESDIR}"/${P}-qafixes.patch epatch "${FILESDIR}"/${P}-libmd5.patch - epatch "${FILESDIR}"/${P}-bug3011.patch # eautoreconf breaks lib/libLtdl/libtool script ./bootstrap.sh || die "autoreconf failed" |