Restore the default cache_effective_group to none (#166950). Add samba USE flag ...

Package-Manager: portage-2.1.2-r9

diff --git a/net-proxy/squid/ChangeLog b/net-proxy/squid/ChangeLog
index f0f2f4dc5d7eebce20ea64523ffd7d829b5087d1..7cc976893175b46ffcd71037d5a76b11b01138b4 100644 (file)
--- a/net-proxy/squid/ChangeLog
+++ b/net-proxy/squid/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-proxy/squid
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/ChangeLog,v 1.123 2007/01/27 09:17:35 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/ChangeLog,v 1.124 2007/02/25 20:30:45 mrness Exp $
+
+*squid-2.6.9-r1 (25 Feb 2007)
+
+  25 Feb 2007; Alin Năstac <mrness@gentoo.org>
+  files/squid-2.6.9-gentoo.patch, files/squid.cron, -squid-2.6.9.ebuild,
+  +squid-2.6.9-r1.ebuild:
+  Restore the default cache_effective_group to none (#166950). Add samba USE
+  flag (#167712). Make squid.cron return 0 when pid doesn't exist (#168075).
 
 *squid-2.6.9 (27 Jan 2007)
 

diff --git a/net-proxy/squid/Manifest b/net-proxy/squid/Manifest
index 03c0d592941cfe8979345d1316efe31785222bf4..4acae229eb7915145d810aecbaf4e6ed49ea11e6 100644 (file)
--- a/net-proxy/squid/Manifest
+++ b/net-proxy/squid/Manifest
@@ -5,18 +5,18 @@ AUX squid-2.6.9-ToS_Hit_ToS_Preserve.patch 7794 RMD160 768c087050681d20d8fa680c1
 MD5 e310b7604b6d8da5fa03f4ad4973d2a5 files/squid-2.6.9-ToS_Hit_ToS_Preserve.patch 7794
 RMD160 768c087050681d20d8fa680c1d3e1264ac1863fb files/squid-2.6.9-ToS_Hit_ToS_Preserve.patch 7794
 SHA256 0ab6611c2cd6fe5f7b57385d7b86b58c6b6aa7158de007d8d56d0546a49892dc files/squid-2.6.9-ToS_Hit_ToS_Preserve.patch 7794
-AUX squid-2.6.9-gentoo.patch 13282 RMD160 8c05b600666bcaf5c56793ad2df4ee01acb40a86 SHA1 2a679c35b43d18f001c424909c07a3087a089066 SHA256 d7c010097c477bfd6ecdaa58df6f9e5aba4e0e133b7873e4ff842820180cc26c
-MD5 ad27c78bfc84cc29c5e9d1c558444325 files/squid-2.6.9-gentoo.patch 13282
-RMD160 8c05b600666bcaf5c56793ad2df4ee01acb40a86 files/squid-2.6.9-gentoo.patch 13282
-SHA256 d7c010097c477bfd6ecdaa58df6f9e5aba4e0e133b7873e4ff842820180cc26c files/squid-2.6.9-gentoo.patch 13282
+AUX squid-2.6.9-gentoo.patch 13084 RMD160 8eb5948fcbc73118373cc0ac9cb7ba0cefc87e39 SHA1 3d09fb88e74a4c7a90def35982751d6079ec90e8 SHA256 dfda498807b0adc85ba0e7b1bc628f019577f932e3f4a45f58e1dadc2803f76d
+MD5 d582aa8ccd44542c4dbcaf71b50a1a67 files/squid-2.6.9-gentoo.patch 13084
+RMD160 8eb5948fcbc73118373cc0ac9cb7ba0cefc87e39 files/squid-2.6.9-gentoo.patch 13084
+SHA256 dfda498807b0adc85ba0e7b1bc628f019577f932e3f4a45f58e1dadc2803f76d files/squid-2.6.9-gentoo.patch 13084
 AUX squid.confd 437 RMD160 8fdfc1416b2f5aaa2964affc25e5fb140f6555c5 SHA1 59e15695bf4d7269002eac5015592419ad8155cc SHA256 d90a92f886764f56fd928ec3340da078a8ff35576a8339fa91b1ce59d0d02a34
 MD5 8e7207b10699502e573d9d60ff0e07a6 files/squid.confd 437
 RMD160 8fdfc1416b2f5aaa2964affc25e5fb140f6555c5 files/squid.confd 437
 SHA256 d90a92f886764f56fd928ec3340da078a8ff35576a8339fa91b1ce59d0d02a34 files/squid.confd 437
-AUX squid.cron 133 RMD160 f1ecb5957645deea4cd1ecedbf808172ee8330a6 SHA1 96cfa6866d3b8eda3efd21e26c7981e614d7da2c SHA256 e3522246629d51381313db1632e083b1df06d1caee9790d4345f2b9f1ba05210
-MD5 6f30a7f5c48ec35a7044acb189c858c5 files/squid.cron 133
-RMD160 f1ecb5957645deea4cd1ecedbf808172ee8330a6 files/squid.cron 133
-SHA256 e3522246629d51381313db1632e083b1df06d1caee9790d4345f2b9f1ba05210 files/squid.cron 133
+AUX squid.cron 143 RMD160 0706a7ad04691b9a93a2897c319008440483ba11 SHA1 6138db0eccb7320e707b8d60c2970ef684e29336 SHA256 4c9e2afe5b0bba583ce896233ea1f9262beeb1b6cf51b4adb48d5f5c03933b2f
+MD5 ed6522652e94a0fe875adaa0c396d539 files/squid.cron 143
+RMD160 0706a7ad04691b9a93a2897c319008440483ba11 files/squid.cron 143
+SHA256 4c9e2afe5b0bba583ce896233ea1f9262beeb1b6cf51b4adb48d5f5c03933b2f files/squid.cron 143
 AUX squid.initd 2037 RMD160 c39b6a35ba5fba6a0a967c5bb0ad8ac7d3952fa6 SHA1 9c88e297d0c7e86ec61a078dd33cb8ba3d95069b SHA256 c5ab9064323d751755e2879f7c485182612d95d05e239b913b6283b56674df61
 MD5 0f5091218dbf9023c09781b0fa8436f8 files/squid.initd 2037
 RMD160 c39b6a35ba5fba6a0a967c5bb0ad8ac7d3952fa6 files/squid.initd 2037
@@ -40,14 +40,14 @@ EBUILD squid-2.6.7.ebuild 6071 RMD160 1c91ed9abdea7f1f06b0211635d4ced136ef7835 S
 MD5 9821afa2318f7a6d9195a6c2e4c92048 squid-2.6.7.ebuild 6071
 RMD160 1c91ed9abdea7f1f06b0211635d4ced136ef7835 squid-2.6.7.ebuild 6071
 SHA256 cca9c9eb4a52f5600210198ff6250751de65334e19b17d5fa5c1bf677e008579 squid-2.6.7.ebuild 6071
-EBUILD squid-2.6.9.ebuild 5939 RMD160 d852bed2aed1dffa76a143f24df607550fbb2774 SHA1 73dcf4cc5dc8f76c417fced40f888a9f9bde0073 SHA256 fa5eae0b4f2a4406e4407766e15ec4b1360242127639c8405c6b509ce6498520
-MD5 52cf35cc210d1152272232c15f2718aa squid-2.6.9.ebuild 5939
-RMD160 d852bed2aed1dffa76a143f24df607550fbb2774 squid-2.6.9.ebuild 5939
-SHA256 fa5eae0b4f2a4406e4407766e15ec4b1360242127639c8405c6b509ce6498520 squid-2.6.9.ebuild 5939
-MISC ChangeLog 32436 RMD160 35122067313d64c3a35ee0bed039915a587a7c71 SHA1 6bbd20f21084523bc213e1277515e1537a3223dd SHA256 d9cdffe9cc1061f520c5d758363adc683ea314fff3113a6e64a06cbd2a29723c
-MD5 27409a0fe3d6ed5068800bb7fbc80b2e ChangeLog 32436
-RMD160 35122067313d64c3a35ee0bed039915a587a7c71 ChangeLog 32436
-SHA256 d9cdffe9cc1061f520c5d758363adc683ea314fff3113a6e64a06cbd2a29723c ChangeLog 32436
+EBUILD squid-2.6.9-r1.ebuild 6148 RMD160 58892e9b93328dbae01c1bdb647388160a99ef1c SHA1 f1542d061d4dbcb4f760cfec2bbf7717c47fd95f SHA256 71e215059ecf5406a98ce9f3b004c9932140a9466d4935088f14cfe047284a94
+MD5 bb0a1a651d38b24f574c55e2fc0f580e squid-2.6.9-r1.ebuild 6148
+RMD160 58892e9b93328dbae01c1bdb647388160a99ef1c squid-2.6.9-r1.ebuild 6148
+SHA256 71e215059ecf5406a98ce9f3b004c9932140a9466d4935088f14cfe047284a94 squid-2.6.9-r1.ebuild 6148
+MISC ChangeLog 32769 RMD160 5cde67255be99628e937ea9d728d26d5f91c423c SHA1 c16ced0f57fdaac64305a5ff54705b4ba70d26f1 SHA256 df8a7bfc06793bcd9dd7adfd796f8d198b8caa5d14557471d28bb366478563c5
+MD5 eeebe650c222c3f37b5282c0956fddfa ChangeLog 32769
+RMD160 5cde67255be99628e937ea9d728d26d5f91c423c ChangeLog 32769
+SHA256 df8a7bfc06793bcd9dd7adfd796f8d198b8caa5d14557471d28bb366478563c5 ChangeLog 32769
 MISC metadata.xml 229 RMD160 3017fab68c82b875738f1df5bb414f46480f142f SHA1 975a764b9c2b956a744795d61a702bd3545bbfb9 SHA256 b986c2ccab6337ef434285c558ed764218d7ca79a82cb5ee3d2615cd03360e87
 MD5 24a10e76803f4cc98cdc979586096c6f metadata.xml 229
 RMD160 3017fab68c82b875738f1df5bb414f46480f142f metadata.xml 229
@@ -55,13 +55,13 @@ SHA256 b986c2ccab6337ef434285c558ed764218d7ca79a82cb5ee3d2615cd03360e87 metadata
 MD5 5a1e44725f0f6da3a63f95721a3fe4e0 files/digest-squid-2.6.7 554
 RMD160 be687a353ce0c44ae93e2c4a986af23f0dda7e12 files/digest-squid-2.6.7 554
 SHA256 dbfcd684010150818fae13125c64f85b792786a412ac4d58703b8a437468b689 files/digest-squid-2.6.7 554
-MD5 abce45f2679e15f9efb147ed7492b6bd files/digest-squid-2.6.9 256
-RMD160 d75f3cc9f3a1889d5d91ce2cc41e9a983955f9e8 files/digest-squid-2.6.9 256
-SHA256 9ed721fecb9f6488cf0dc959522f0f515f315e7c1641bd164917cfea2e75d58f files/digest-squid-2.6.9 256
+MD5 abce45f2679e15f9efb147ed7492b6bd files/digest-squid-2.6.9-r1 256
+RMD160 d75f3cc9f3a1889d5d91ce2cc41e9a983955f9e8 files/digest-squid-2.6.9-r1 256
+SHA256 9ed721fecb9f6488cf0dc959522f0f515f315e7c1641bd164917cfea2e75d58f files/digest-squid-2.6.9-r1 256
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.1 (GNU/Linux)
+Version: GnuPG v2.0.2 (GNU/Linux)
 
-iD8DBQFFuxi+JnxX6mF440QRAvExAJ4wPlMyyaAQSXVDU3o0Uk6dwKgnhwCfUNJ+
-Zxsya/nvVuS7St1l/bpDPhg=
-=ojty
+iD8DBQFF4fIAJnxX6mF440QRAmm6AKDO4h7chIA8NFWnISUda6Rstv20ZwCeNRuN
+LD0Kzwc7eHytDVi+3vH7EuQ=
+=OogC
 -----END PGP SIGNATURE-----

diff --git a/net-proxy/squid/files/digest-squid-2.6.9 b/net-proxy/squid/files/digest-squid-2.6.9-r1
similarity index 100%
rename from net-proxy/squid/files/digest-squid-2.6.9
rename to net-proxy/squid/files/digest-squid-2.6.9-r1

diff --git a/net-proxy/squid/files/squid-2.6.9-gentoo.patch b/net-proxy/squid/files/squid-2.6.9-gentoo.patch
index 948f5c110426642159408280483ac3cc4558bc4c..01abea3780ee25f708630448d3cfc6c6d82682ba 100644 (file)
--- a/net-proxy/squid/files/squid-2.6.9-gentoo.patch
+++ b/net-proxy/squid/files/squid-2.6.9-gentoo.patch
@@ -132,15 +132,6 @@ diff -Nru squid-2.6.STABLE9.orig/src/cf.data.pre squid-2.6.STABLE9/src/cf.data.p
  LOC: Config.effectiveUser
  DOC_START
        If you start Squid as root, it will change its effective/real
-@@ -3324,7 +3332,7 @@
- 
- NAME: cache_effective_group
- TYPE: string
--DEFAULT: none
-+DEFAULT: squid
- LOC: Config.effectiveGroup
- DOC_START
-       If you want Squid to run with a specific GID regardless of
 @@ -3693,6 +3701,9 @@
        If you disable this, it will appear as
  

diff --git a/net-proxy/squid/files/squid.cron b/net-proxy/squid/files/squid.cron
index 02309459b0bbdf70b7cfc65969f2b79b594ee01b..8726ddd72955f95979a1890358dddc32afb73f9f 100644 (file)
--- a/net-proxy/squid/files/squid.cron
+++ b/net-proxy/squid/files/squid.cron
@@ -1,4 +1,5 @@
 #!/bin/sh
-test -e /var/run/squid.pid && \
-test -n "$(cat /var/run/squid.pid|xargs ps -p|grep squid)" && \
-       /usr/sbin/squid -k rotate
+if test -e /var/run/squid.pid ; then
+       test -n "$(cat /var/run/squid.pid|xargs ps -p|grep squid)" && \
+               /usr/sbin/squid -k rotate
+fi

diff --git a/net-proxy/squid/squid-2.6.9.ebuild b/net-proxy/squid/squid-2.6.9-r1.ebuild
similarity index 89%
rename from net-proxy/squid/squid-2.6.9.ebuild
rename to net-proxy/squid/squid-2.6.9-r1.ebuild
index 13540a74bcc0d7824b7a5205bcbf7c8d8c3c5e91..ab2fe6e746cd0e365390c8e21a4c273ee3d8aa8b 100644 (file)
--- a/net-proxy/squid/squid-2.6.9.ebuild
+++ b/net-proxy/squid/squid-2.6.9-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/squid-2.6.9.ebuild,v 1.1 2007/01/27 09:17:35 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/squid-2.6.9-r1.ebuild,v 1.1 2007/02/25 20:30:45 mrness Exp $
 
 WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="latest"
@@ -20,18 +20,20 @@ SRC_URI="http://www.squid-cache.org/Versions/v2/${S_PV}/${S_PP}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="pam ldap sasl nis ssl snmp selinux logrotate zero-penalty-hit \
+IUSE="pam ldap samba sasl nis ssl snmp selinux logrotate zero-penalty-hit \
        pf-transparent ipf-transparent \
        elibc_uclibc kernel_linux"
 
-RDEPEND="pam? ( virtual/pam )
+DEPEND="pam? ( virtual/pam )
        ldap? ( >=net-nds/openldap-2.1.26 )
        ssl? ( >=dev-libs/openssl-0.9.7j )
        sasl? ( >=dev-libs/cyrus-sasl-2.1.21 )
        selinux? ( sec-policy/selinux-squid )
        !x86-fbsd? ( logrotate? ( app-admin/logrotate ) )
-       >=sys-libs/db-4"
-DEPEND="${RDEPEND} dev-lang/perl"
+       >=sys-libs/db-4
+       dev-lang/perl"
+RDEPEND="${DEPEND}
+       samba? ( net-fs/samba )"
 
 S="${WORKDIR}/${S_PP}"
 
@@ -57,15 +59,20 @@ src_unpack() {
 }
 
 src_compile() {
-       local basic_modules="getpwnam,NCSA,SMB,MSNT,multi-domain-NTLM"
+       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}"
 
-       local ext_helpers="ip_user,session,unix_group,wbinfo_group"
+       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 myconf=""
 
        # Support for uclibc #61175
@@ -103,7 +110,7 @@ src_compile() {
                --enable-digest-auth-helpers="password" \
                --enable-basic-auth-helpers="${basic_modules}" \
                --enable-external-acl-helpers="${ext_helpers}" \
-               --enable-ntlm-auth-helpers="SMB,fakeauth" \
+               --enable-ntlm-auth-helpers="${ntlm_helpers}" \
                --enable-ident-lookups \
                --enable-useragent-log \
                --enable-cache-digests \
@@ -134,7 +141,7 @@ src_install() {
        fperms 4750 /usr/libexec/squid/ncsa_auth
        fperms 4750 /usr/libexec/squid/pam_auth
 
-       #some clean ups
+       #some cleanups
        rm -f "${D}"/usr/bin/Run*
 
        dodoc CONTRIBUTORS CREDITS ChangeLog QUICKSTART SPONSORS doc/*.txt \