summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiego Elio Pettenò <flameeyes@gentoo.org>2008-07-31 14:08:58 +0000
committerDiego Elio Pettenò <flameeyes@gentoo.org>2008-07-31 14:08:58 +0000
commit30e0840dfa338837ea6b0f69d4c64afc675cc751 (patch)
tree4a738daaeb9ce0a49f868d12b8d1396afe23a902
parentRevision bump to fix bug #230640 (CVE-2008-2315, CVE-2008-2316) and bug #2321... (diff)
downloadgentoo-2-30e0840dfa338837ea6b0f69d4c64afc675cc751.tar.gz
gentoo-2-30e0840dfa338837ea6b0f69d4c64afc675cc751.tar.bz2
gentoo-2-30e0840dfa338837ea6b0f69d4c64afc675cc751.zip
Some very basic fixes to the econf call: set all the directories at the top, provide htmldir as well as docdir (bug #2333360)
(Portage version: 2.2_rc5/cvs/Linux 2.6.26-gentoo x86_64)
-rw-r--r--sys-libs/pam/ChangeLog6
-rw-r--r--sys-libs/pam/pam-1.0.1.ebuild19
2 files changed, 19 insertions, 6 deletions
diff --git a/sys-libs/pam/ChangeLog b/sys-libs/pam/ChangeLog
index 1cde709440fe..d428de6e4b97 100644
--- a/sys-libs/pam/ChangeLog
+++ b/sys-libs/pam/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sys-libs/pam
# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/pam/ChangeLog,v 1.221 2008/07/23 15:26:28 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/pam/ChangeLog,v 1.222 2008/07/31 14:08:58 flameeyes Exp $
+
+ 31 Jul 2008; Diego Pettenò <flameeyes@gentoo.org> pam-1.0.1.ebuild:
+ Some very basic fixes to the econf call: set all the directories at the
+ top, provide htmldir as well as docdir (bug #2333360)
23 Jul 2008; Diego Pettenò <flameeyes@gentoo.org> pam-1.0.1.ebuild:
Remove --enable-docdir option and use --docdir instead so that
diff --git a/sys-libs/pam/pam-1.0.1.ebuild b/sys-libs/pam/pam-1.0.1.ebuild
index 6b85e33a4a84..74c72c9ce3da 100644
--- a/sys-libs/pam/pam-1.0.1.ebuild
+++ b/sys-libs/pam/pam-1.0.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/pam/pam-1.0.1.ebuild,v 1.11 2008/07/23 15:26:28 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/pam/pam-1.0.1.ebuild,v 1.12 2008/07/31 14:08:58 flameeyes Exp $
WANT_AUTOCONF="latest"
WANT_AUTOMAKE="latest"
@@ -123,18 +123,27 @@ src_compile() {
myconf="${myconf} --disable-pie"
fi
+ # KEEP COMMENTED OUT! It seems like it fails to build with USE=debug!
+ # Do _not_ move this to $(use_enable) without checking if the
+ # configure.in has been fixed. As of 2008/07/31 it's still broken
+ # on upstream's CVS, and --disable-debug means --enable-debug too.
+ # if use debug; then
+ # myconf="${myconf} --enable-debug"
+ # fi
+
econf \
+ --libdir=/usr/$(get_libdir) \
+ --docdir=/usr/share/doc/${PF} \
+ --htmldir=/usr/share/doc/${PF}/html \
+ --enable-securedir=/$(get_libdir)/security \
+ --enable-isadir=/$(get_libdir)/security \
$(use_enable nls) \
$(use_enable selinux) \
$(use_enable cracklib) \
$(use_enable audit) \
- --libdir=/usr/$(get_libdir) \
--disable-db \
- --enable-securedir=/$(get_libdir)/security \
- --enable-isadir=/$(get_libdir)/security \
--disable-dependency-tracking \
--disable-prelude \
- --docdir=/usr/share/doc/${PF} \
--disable-regenerate-man \
${myconf} || die "econf failed"
emake sepermitlockdir="/var/run/sepermit" || die "emake failed"