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
commitc5ff596b645e3eea6352bd4fbbed7a60dad924c6 (patch)
treeabbeaa64ccd22fd2f14566bba8ad284cede55695 /net-proxy/squid
parentExtend the gold patch to work even when trousers is not installing .la files. (diff)
downloadgentoo-2-c5ff596b645e3eea6352bd4fbbed7a60dad924c6.tar.gz
gentoo-2-c5ff596b645e3eea6352bd4fbbed7a60dad924c6.tar.bz2
gentoo-2-c5ff596b645e3eea6352bd4fbbed7a60dad924c6.zip
Fix install with USE=-pam.
(Portage version: 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/squid-3.1.12.ebuild8
2 files changed, 9 insertions, 4 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/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*