summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiego Elio Pettenò <flameeyes@gentoo.org>2011-04-30 12:46:52 +0000
committerDiego Elio Pettenò <flameeyes@gentoo.org>2011-04-30 12:46:52 +0000
commit8c182170bcf42b6cacdcd4907233dd122ecec25b (patch)
tree75d8c1afe878b6ca6fe686b8080d1e35ed7e2950 /net-proxy/squid
parentExtend the gold patch to work even when trousers is not installing .la files. (diff)
downloadhistorical-8c182170bcf42b6cacdcd4907233dd122ecec25b.tar.gz
historical-8c182170bcf42b6cacdcd4907233dd122ecec25b.tar.bz2
historical-8c182170bcf42b6cacdcd4907233dd122ecec25b.zip
Fix install with USE=-pam.
Package-Manager: portage-2.2.0_alpha30/cvs/Linux x86_64
Diffstat (limited to 'net-proxy/squid')
-rw-r--r--net-proxy/squid/ChangeLog5
-rw-r--r--net-proxy/squid/Manifest22
-rw-r--r--net-proxy/squid/squid-3.1.12.ebuild8
3 files changed, 15 insertions, 20 deletions
diff --git a/net-proxy/squid/ChangeLog b/net-proxy/squid/ChangeLog
index 5d0f2fd7821f..92a9b8835c62 100644
--- a/net-proxy/squid/ChangeLog
+++ b/net-proxy/squid/ChangeLog
@@ -1,6 +1,9 @@
# 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.319 2011/04/29 13:24:18 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/ChangeLog,v 1.320 2011/04/30 12:46:52 flameeyes Exp $
+
+ 30 Apr 2011; Diego E. Pettenò <flameeyes@gentoo.org> squid-3.1.12.ebuild:
+ Fix install with USE=-pam.
*squid-3.1.12 (29 Apr 2011)
diff --git a/net-proxy/squid/Manifest b/net-proxy/squid/Manifest
index dca0ad0e7331..23c8bb45e792 100644
--- a/net-proxy/squid/Manifest
+++ b/net-proxy/squid/Manifest
@@ -1,5 +1,5 @@
-----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
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
@@ -21,25 +21,15 @@ DIST squid-3.1.12.tar.gz 3357403 RMD160 0cdba1fddd9a9510d82f1bad3a1f693c0518da4a
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 6605 RMD160 3a7fc69acdaad00a42517187319e22c43861c9ec SHA1 93d541c4568e72770c616c10918543426c4a57e7 SHA256 87ef9d30f44b9b0a9879beb60e28c7ee2067c92c0423566754315ad9d06bcf5f
+EBUILD squid-3.1.12.ebuild 6634 RMD160 df632e270901d6b9625c79aaa73a3082bb9587d8 SHA1 50ccad62a52157912828a30c36a18ea063e960d2 SHA256 9e7ef6c8e105f5c1595e5801a25cc586737b714e71d536e8749b595475e2968e
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 68622 RMD160 a7605c2351e4d5ca0b0baf145db4c961bfc8875c SHA1 19a5b98038df07665a7fa06747cde7a50f410668 SHA256 c45394b72ada4761d69a97ddca3f8116563517ee7108c5acd1cfe3a5fcc75f3c
+MISC ChangeLog 68734 RMD160 8daa2ad78bec144bf97ad7e808e56a69c5630857 SHA1 c6dcdfd1056b1cb3787b550602da47c08d837e0a SHA256 c70491f4d7332514ea5890a60d2e606d63626adbbc53a429a5d68442cf115873
MISC metadata.xml 1015 RMD160 03ac3fffc7b01e366b173a4c3bf1dc6be1bb9202 SHA1 3c1681981e2a143ee50d0ee5bc901ac81e7c5cc4 SHA256 06d8e8a7909b9140eb2e70193db754b84d864da260d6cdf9bde9fa58442ce34a
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.17 (GNU/Linux)
-iQIcBAEBCAAGBQJNurwRAAoJEHfx8XVYajsfyLkQAKBWFmgyJ2u0FUc835DQWX7R
-aKAGUSCKGH5OzSYyTFufM+j+Km8PKyMii//lFCcYI1j4mOsnoJYYhvR0NuYzFHO7
-ft+s7FqETsLh2Urx2jzN847FyF5KUVwfaIuxlo/+3u7hJJddo2PMucTytmW6l7ZA
-3bQYAIA38P5DfpSiE34iMl/SsHU3vTpSLyrtAvSQS3CrohDk8t5NMfOZ7Wb44l3+
-F/rw2HrLn6uxE7629sHb8HRkynon3Vl1qkor275RcqkiG6qFyMQNtiCXVlwd+W6z
-HI6zpl3NkrUJnDT4DlNLHPo2nOL58Ox66IHI/OVIknkume1dxXeayi6f+GNUvImk
-qR8U99LhKAbqZbe6zeHi5mbb00u0SlkE/Us+O36m+oX73gXyDKacCA69p5emo/VB
-5wSXBnF5sBeeNbnI8y+lqA1hQ1oYbFJ3WGJ8iE9gx+jxFW0p1I3W0ct/ZvQ4M540
-WA3nbC0RC81wU58kKbAtcZvHpsEhJkPZzlpE12DoCXZ7qbZT54bYlwYn53I06Y6V
-+OyMXBOuMbEtO7aE05sV2KQOXn6v1e/Ftj/d1kgiciQnfHm3xymDODXYdVPBPln5
-BxAE0i+onVwC9MyQaJdfNGGi/5f+9DZid3CA5xnGle7R2klUplssGgXmvLrTVHSR
-kbpbMJX/gW6b4x4Hw55G
-=tmfE
+iEYEARECAAYFAk28BLgACgkQAiZjviIA2Xir+ACfdq3l8Ok2dLtj6C6Jzu0ritYt
+JV8AoMXRUU8pxIkA5zgDHh7CicBj8bZU
+=cK/A
-----END PGP SIGNATURE-----
diff --git a/net-proxy/squid/squid-3.1.12.ebuild b/net-proxy/squid/squid-3.1.12.ebuild
index 9ccc121a6136..bb0c7f0c5b89 100644
--- a/net-proxy/squid/squid-3.1.12.ebuild
+++ b/net-proxy/squid/squid-3.1.12.ebuild
@@ -1,6 +1,6 @@
# 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.1 2011/04/29 13:24:18 eras Exp $
+# $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"
@@ -163,9 +163,11 @@ src_install() {
# 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
+ 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*