Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--sys-libs/pam/ChangeLog11
-rw-r--r--sys-libs/pam/files/Linux-PAM-0.99.7.0-disable-regenerate-man.patch18
-rw-r--r--sys-libs/pam/files/Linux-PAM-1.0.4-fix-tests.patch13
-rw-r--r--sys-libs/pam/files/Linux-PAM-1.1.0-xcrypt.patch16
-rw-r--r--sys-libs/pam/files/Linux-PAM-1.1.1-xcrypt.patch21
-rw-r--r--sys-libs/pam/pam-1.0.4.ebuild182
-rw-r--r--sys-libs/pam/pam-1.1.0.ebuild11
-rw-r--r--sys-libs/pam/pam-1.1.1-r1.ebuild160
-rw-r--r--sys-libs/pam/pam-1.1.1-r2.ebuild16
-rw-r--r--sys-libs/pam/pam-1.1.1.ebuild156
10 files changed, 72 insertions, 532 deletions
diff --git a/sys-libs/pam/ChangeLog b/sys-libs/pam/ChangeLog
index e5fd00c136d5..d18253b9f8ca 100644
--- a/sys-libs/pam/ChangeLog
+++ b/sys-libs/pam/ChangeLog
@@ -1,6 +1,15 @@
# ChangeLog for sys-libs/pam
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/pam/ChangeLog,v 1.257 2010/04/06 05:39:37 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/pam/ChangeLog,v 1.258 2010/04/26 12:04:09 flameeyes Exp $
+
+ 26 Apr 2010; Diego E. Pettenò <flameeyes@gentoo.org>
+ -files/Linux-PAM-0.99.7.0-disable-regenerate-man.patch, -pam-1.0.4.ebuild,
+ -files/Linux-PAM-1.0.4-fix-tests.patch, pam-1.1.0.ebuild,
+ +files/Linux-PAM-1.1.0-xcrypt.patch, -pam-1.1.1.ebuild,
+ -pam-1.1.1-r1.ebuild, pam-1.1.1-r2.ebuild,
+ +files/Linux-PAM-1.1.1-xcrypt.patch:
+ Cleanup old ebuilds and files; add patches to disable libxcrypt automagic
+ dependency (bug #317195).
*pam-1.1.1-r2 (06 Apr 2010)
diff --git a/sys-libs/pam/files/Linux-PAM-0.99.7.0-disable-regenerate-man.patch b/sys-libs/pam/files/Linux-PAM-0.99.7.0-disable-regenerate-man.patch
deleted file mode 100644
index a988b18bf7ed..000000000000
--- a/sys-libs/pam/files/Linux-PAM-0.99.7.0-disable-regenerate-man.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Index: Linux-PAM-0.99.7.0/configure.in
-===================================================================
---- Linux-PAM-0.99.7.0.orig/configure.in
-+++ Linux-PAM-0.99.7.0/configure.in
-@@ -420,10 +420,12 @@ AC_CHECK_FUNCS(inet_ntop inet_pton ruser
- AC_CHECK_FUNCS(unshare, [UNSHARE=yes], [UNSHARE=no])
- AM_CONDITIONAL([HAVE_UNSHARE], [test "$UNSHARE" = yes])
-
-+AC_ARG_ENABLE([regenerate-man],
-+ AC_HELP_STRING([--disable-regenerate-man], [Don't re-build manpages from XML souces]),
-+ [enable_man=$enableval], [enable_man=yes])
- dnl
- dnl Check for xsltproc
- dnl
--enable_man=yes
- AC_PATH_PROG([XSLTPROC], [xsltproc])
- if test -z "$XSLTPROC"; then
- enable_man=no
diff --git a/sys-libs/pam/files/Linux-PAM-1.0.4-fix-tests.patch b/sys-libs/pam/files/Linux-PAM-1.0.4-fix-tests.patch
deleted file mode 100644
index b705f3655ce3..000000000000
--- a/sys-libs/pam/files/Linux-PAM-1.0.4-fix-tests.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: Linux-PAM-1.0.4/tests/tst-pam_mkargv.c
-===================================================================
---- Linux-PAM-1.0.4.orig/tests/tst-pam_mkargv.c
-+++ Linux-PAM-1.0.4/tests/tst-pam_mkargv.c
-@@ -35,7 +35,7 @@ int main(void)
- printf ("\n");
- #endif
-
-- if (argvlen != 333)
-+ if (argvlen != ( 37 + ( 37 * sizeof(char*) ) ))
- return 1;
-
- if (myargc != 4)
diff --git a/sys-libs/pam/files/Linux-PAM-1.1.0-xcrypt.patch b/sys-libs/pam/files/Linux-PAM-1.1.0-xcrypt.patch
new file mode 100644
index 000000000000..4f4872db6bde
--- /dev/null
+++ b/sys-libs/pam/files/Linux-PAM-1.1.0-xcrypt.patch
@@ -0,0 +1,16 @@
+Index: Linux-PAM-1.1.1/configure.in
+===================================================================
+--- Linux-PAM-1.1.1.orig/configure.in
++++ Linux-PAM-1.1.1/configure.in
+@@ -360,6 +360,10 @@ AC_SUBST(LIBAUDIT)
+ AC_CHECK_HEADERS(xcrypt.h crypt.h)
++AS_IF([test "x$ac_cv_header_xcrypt_h" = "xyes"],
++ [crypt_libs="xcrypt crypt"],
++ [crypt_libs="crypt"])
++
+ BACKUP_LIBS=$LIBS
+-AC_SEARCH_LIBS([crypt],[xcrypt crypt], LIBCRYPT="-l$ac_lib", LIBCRYPT="")
++AC_SEARCH_LIBS([crypt],[$crypt_libs], LIBCRYPT="-l$ac_lib", LIBCRYPT="")
+ AC_CHECK_FUNCS(crypt_r crypt_gensalt_rn)
+ LIBS=$BACKUP_LIBS
+ AC_SUBST(LIBCRYPT)
diff --git a/sys-libs/pam/files/Linux-PAM-1.1.1-xcrypt.patch b/sys-libs/pam/files/Linux-PAM-1.1.1-xcrypt.patch
new file mode 100644
index 000000000000..f842da7dfe5e
--- /dev/null
+++ b/sys-libs/pam/files/Linux-PAM-1.1.1-xcrypt.patch
@@ -0,0 +1,21 @@
+Index: Linux-PAM-1.1.1/configure.in
+===================================================================
+--- Linux-PAM-1.1.1.orig/configure.in
++++ Linux-PAM-1.1.1/configure.in
+@@ -361,10 +361,14 @@ AM_CONDITIONAL([HAVE_AUDIT_TTY_STATUS],
+ [test "x$HAVE_AUDIT_TTY_STATUS" = xyes])
+
+ AC_CHECK_HEADERS(xcrypt.h crypt.h)
++AS_IF([test "x$ac_cv_header_xcrypt_h" = "xyes"],
++ [crypt_libs="xcrypt crypt"],
++ [crypt_libs="crypt"])
++
+ BACKUP_LIBS=$LIBS
+-AC_SEARCH_LIBS([crypt],[xcrypt crypt], LIBCRYPT="-l$ac_lib", LIBCRYPT="")
++AC_SEARCH_LIBS([crypt],[$crypt_libs], LIBCRYPT="-l$ac_lib", LIBCRYPT="")
+ AC_CHECK_FUNCS(crypt_r crypt_gensalt_r)
+-Libs=$BACKUP_LIBS
++LIBS=$BACKUP_LIBS
+ AC_SUBST(LIBCRYPT)
+ if test "$LIBCRYPT" = "-lxcrypt" -a "$ac_cv_header_xcrypt_h" = "yes" ; then
+ AC_DEFINE([HAVE_LIBXCRYPT], 1, [Define to 1 if xcrypt support should be compiled in.])
diff --git a/sys-libs/pam/pam-1.0.4.ebuild b/sys-libs/pam/pam-1.0.4.ebuild
deleted file mode 100644
index 96b729dda931..000000000000
--- a/sys-libs/pam/pam-1.0.4.ebuild
+++ /dev/null
@@ -1,182 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/pam/pam-1.0.4.ebuild,v 1.13 2010/01/06 15:51:10 ulm Exp $
-
-inherit libtool multilib eutils autotools pam toolchain-funcs flag-o-matic
-
-MY_PN="Linux-PAM"
-MY_P="${MY_PN}-${PV}"
-
-HOMEPAGE="http://www.kernel.org/pub/linux/libs/pam/"
-DESCRIPTION="Linux-PAM (Pluggable Authentication Modules)"
-
-SRC_URI="mirror://kernel/linux/libs/pam/library/${MY_P}.tar.bz2"
-
-LICENSE="|| ( BSD GPL-2 )"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
-IUSE="cracklib nls elibc_FreeBSD selinux vim-syntax audit test elibc_glibc"
-
-RDEPEND="nls? ( virtual/libintl )
- cracklib? ( >=sys-libs/cracklib-2.8.3 )
- audit? ( sys-process/audit )
- selinux? ( >=sys-libs/libselinux-1.28 )"
-DEPEND="${RDEPEND}
- sys-devel/flex
- test? ( elibc_glibc? ( >=sys-libs/glibc-2.4 ) )
- nls? ( sys-devel/gettext )"
-PDEPEND="sys-auth/pambase
- vim-syntax? ( app-vim/pam-syntax )"
-
-S="${WORKDIR}/${MY_P}"
-
-PROVIDE="virtual/pam"
-
-check_old_modules() {
- local retval="0"
-
- if sed -e 's:#.*::' "${ROOT}"/etc/pam.d/* 2>/dev/null | fgrep -q pam_stack.so; then
- eerror ""
- eerror "Your current setup is using the pam_stack module."
- eerror "This module is deprecated and no longer supported, and since version"
- eerror "0.99 is no longer installed, nor provided by any other package."
- eerror "The package will be built (to allow binary package builds), but will"
- eerror "not be installed."
- eerror "Please replace pam_stack usage with proper include directive usage,"
- eerror "following the PAM Upgrade guide at the following URL"
- eerror " http://www.gentoo.org/proj/en/base/pam/upgrade-0.99.xml"
- eerror ""
- ebeep 15
-
- retval=1
- fi
-
- if sed -e 's:#.*::' "${ROOT}"/etc/pam.d/* 2>/dev/null | egrep -q 'pam_(pwdb|timestamp|console)'; then
- eerror ""
- eerror "Your current setup is using one or more of the following modules,"
- eerror "that are not built or supported anymore:"
- eerror "pam_pwdb, pam_timestamp, pam_console"
- eerror "If you are in real need for these modules, please contact the maintainers"
- eerror "of PAM through http://bugs.gentoo.org/ providing information about its"
- eerror "use cases."
- eerror "Please also make sure to read the PAM Upgrade guide at the following URL:"
- eerror " http://www.gentoo.org/proj/en/base/pam/upgrade-0.99.xml"
- eerror ""
- ebeep 10
-
- retval=1
- fi
-
- # Produce the warnings only during upgrade, for the following two
- has_version '<sys-libs/pam-0.99' || return $retval
-
- # This works only for those modules that are moved to sys-auth/$module, or the
- # message will be wrong.
- for module in pam_chroot pam_userdb pam_radius; do
- if sed -e 's:#.*::' "${ROOT}"/etc/pam.d/* 2>/dev/null | fgrep -q ${module}.so; then
- ewarn ""
- ewarn "Your current setup is using the ${module} module."
- ewarn "Since version 0.99, ${CATEGORY}/${PN} does not provide this module"
- ewarn "anymore; if you want to continue using this module, you should install"
- ewarn "sys-auth/${module}."
- ewarn ""
- ebeep 5
- fi
- done
-
- return $retval
-}
-
-pkg_setup() {
- check_old_modules
-}
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
-
- mkdir -p doc/txts
- for readme in modules/pam_*/README; do
- cp -f "${readme}" doc/txts/README.$(dirname "${readme}" | \
- sed -e 's|^modules/||')
- done
-
- epatch "${FILESDIR}/${MY_PN}-0.99.7.0-disable-regenerate-man.patch"
- epatch "${FILESDIR}/${MY_PN}-0.99.8.1-xtests.patch"
-
- # Remove NIS dependencies, see bug #235431
- epatch "${FILESDIR}/${MY_PN}-1.0.2-noyp.patch"
-
- # Fix tests on systems where sizeof(void*) != 8
- epatch "${FILESDIR}/${MY_PN}-1.0.4-fix-tests.patch"
-
- # Remove libtool-2 libtool macros, see bug 261167
- rm m4/libtool.m4 m4/lt*.m4 || die "rm libtool macros failed."
-
- AT_M4DIR="m4" eautoreconf
-
- elibtoolize
-}
-
-src_compile() {
- local myconf
-
- if use hppa || use elibc_FreeBSD; then
- 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 2009/03/03 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) \
- --disable-db \
- --disable-dependency-tracking \
- --disable-prelude \
- --disable-regenerate-man \
- ${myconf} || die "econf failed"
- emake sepermitlockdir="/var/run/sepermit" || die "emake failed"
-}
-
-src_install() {
- emake DESTDIR="${D}" install \
- sepermitlockdir="/var/run/sepermit" || die "make install failed"
-
- # Need to be suid
- fperms u+s /sbin/unix_chkpwd
-
- dodir /$(get_libdir)
- mv "${D}/usr/$(get_libdir)/libpam.so"* "${D}/$(get_libdir)/"
- mv "${D}/usr/$(get_libdir)/libpamc.so"* "${D}/$(get_libdir)/"
- mv "${D}/usr/$(get_libdir)/libpam_misc.so"* "${D}/$(get_libdir)/"
- gen_usr_ldscript libpam.so libpamc.so libpam_misc.so
-
- dodoc CHANGELOG ChangeLog README AUTHORS Copyright
- docinto modules ; dodoc doc/txts/README.*
-
- # Remove the wrongly installed manpages
- rm "${D}"/usr/share/man/man8/pam_userdb.8*
- use cracklib || rm "${D}"/usr/share/man/man8/pam_cracklib.8*
-
- # Get rid of the .la files. We certainly don't need them for PAM
- # modules, and libpam is installed as a shared object only, so we
- # don't ned them for static linking either.
- find "${D}" -name '*.la' -delete
-}
-
-pkg_preinst() {
- check_old_modules || die "deprecated PAM modules still used"
-}
diff --git a/sys-libs/pam/pam-1.1.0.ebuild b/sys-libs/pam/pam-1.1.0.ebuild
index 542d5d99db9a..43aa070ba67b 100644
--- a/sys-libs/pam/pam-1.1.0.ebuild
+++ b/sys-libs/pam/pam-1.1.0.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/sys-libs/pam/pam-1.1.0.ebuild,v 1.14 2010/01/24 18:27:13 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/pam/pam-1.1.0.ebuild,v 1.15 2010/04/26 12:04:09 flameeyes Exp $
inherit libtool multilib eutils autotools pam toolchain-funcs flag-o-matic
@@ -93,6 +93,10 @@ src_unpack() {
# Fix building with nls USE flag disabled
epatch "${FILESDIR}/${MY_PN}-1.1.0-nonls.patch"
+ # make it possible to skip libxcrypt detection if header is not
+ # found
+ epatch "${FILESDIR}/${MY_PN}-1.1.0-xcrypt.patch"
+
# Remove libtool-2 libtool macros, see bug 261167
rm m4/libtool.m4 m4/lt*.m4 || die "rm libtool macros failed."
@@ -108,6 +112,11 @@ src_compile() {
myconf="${myconf} --disable-pie"
fi
+ # Disable automatic detection of libxcrypt; we _don't_ want the
+ # user to link libxcrypt in by default, since we won't track the
+ # dependency and allow to break PAM this way.
+ export ac_cv_header_xcrypt_h=no
+
econf \
--libdir=/usr/$(get_libdir) \
--docdir=/usr/share/doc/${PF} \
diff --git a/sys-libs/pam/pam-1.1.1-r1.ebuild b/sys-libs/pam/pam-1.1.1-r1.ebuild
deleted file mode 100644
index 275631b254b3..000000000000
--- a/sys-libs/pam/pam-1.1.1-r1.ebuild
+++ /dev/null
@@ -1,160 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/pam/pam-1.1.1-r1.ebuild,v 1.1 2010/03/10 16:04:07 flameeyes Exp $
-
-inherit libtool multilib eutils autotools pam toolchain-funcs flag-o-matic db-use
-
-MY_PN="Linux-PAM"
-MY_P="${MY_PN}-${PV}"
-
-HOMEPAGE="http://www.kernel.org/pub/linux/libs/pam/"
-DESCRIPTION="Linux-PAM (Pluggable Authentication Modules)"
-
-SRC_URI="mirror://kernel/linux/libs/pam/library/${MY_P}.tar.bz2
- mirror://kernel/linux/libs/pam/documentation/${MY_P}-docs.tar.bz2"
-
-LICENSE="|| ( BSD GPL-2 )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="cracklib nls elibc_FreeBSD selinux vim-syntax audit test elibc_glibc debug berkdb"
-
-RDEPEND="nls? ( virtual/libintl )
- cracklib? ( >=sys-libs/cracklib-2.8.3 )
- audit? ( sys-process/audit )
- selinux? ( >=sys-libs/libselinux-1.28 )
- berkdb? ( sys-libs/db )
- elibc_glibc? ( >=sys-libs/glibc-2.7 )"
-DEPEND="${RDEPEND}
- sys-devel/flex
- nls? ( sys-devel/gettext )"
-PDEPEND="sys-auth/pambase
- vim-syntax? ( app-vim/pam-syntax )"
-RDEPEND="${RDEPEND}
- !sys-auth/pam_userdb"
-
-S="${WORKDIR}/${MY_P}"
-
-PROVIDE="virtual/pam"
-
-check_old_modules() {
- local retval="0"
-
- if sed -e 's:#.*::' "${ROOT}"/etc/pam.d/* 2>/dev/null | fgrep -q pam_stack.so; then
- eerror ""
- eerror "Your current setup is using the pam_stack module."
- eerror "This module is deprecated and no longer supported, and since version"
- eerror "0.99 is no longer installed, nor provided by any other package."
- eerror "The package will be built (to allow binary package builds), but will"
- eerror "not be installed."
- eerror "Please replace pam_stack usage with proper include directive usage,"
- eerror "following the PAM Upgrade guide at the following URL"
- eerror " http://www.gentoo.org/proj/en/base/pam/upgrade-0.99.xml"
- eerror ""
- ebeep 15
-
- retval=1
- fi
-
- if sed -e 's:#.*::' "${ROOT}"/etc/pam.d/* 2>/dev/null | egrep -q 'pam_(pwdb|console)'; then
- eerror ""
- eerror "Your current setup is using one or more of the following modules,"
- eerror "that are not built or supported anymore:"
- eerror "pam_pwdb, pam_console"
- eerror "If you are in real need for these modules, please contact the maintainers"
- eerror "of PAM through http://bugs.gentoo.org/ providing information about its"
- eerror "use cases."
- eerror "Please also make sure to read the PAM Upgrade guide at the following URL:"
- eerror " http://www.gentoo.org/proj/en/base/pam/upgrade-0.99.xml"
- eerror ""
- ebeep 10
-
- retval=1
- fi
-
- return $retval
-}
-
-pkg_setup() {
- check_old_modules
-}
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
-
- # Avoid building xtests during "make all"; note that for what
- # we're concerned xtests are not even executed, so we should
- # probably use EXTRA_PROGRAMS.
- epatch "${FILESDIR}/${MY_PN}-0.99.8.1-xtests.patch"
-
- # Fix building on uClibc; it is added since 1.1.1 but applies to
- # 1.1.0 as well.
- epatch "${FILESDIR}/${MY_PN}-1.1.0-uclibc.patch"
-
- # Fix tests to find Berkeley DB as installed by Gentoo (with a
- # library suffix but no suffix on the ELF symbols).
- epatch "${FILESDIR}/${MY_PN}-1.1.1-gentoodb.patch"
-
- # Remove libtool-2 libtool macros, see bug 261167
- rm m4/libtool.m4 m4/lt*.m4 || die "rm libtool macros failed."
-
- AT_M4DIR="m4" eautoreconf
-
- elibtoolize
-}
-
-src_compile() {
- local myconf
-
- if use hppa || use elibc_FreeBSD; then
- myconf="${myconf} --disable-pie"
- 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) \
- $(use_enable debug) \
- $(use_enable berkdb db) \
- --with-db-uniquename=-$(db_findver sys-libs/db) \
- --disable-dependency-tracking \
- --disable-prelude \
- ${myconf} || die "econf failed"
- emake sepermitlockdir="/var/run/sepermit" || die "emake failed"
-}
-
-src_install() {
- emake DESTDIR="${D}" install \
- sepermitlockdir="/var/run/sepermit" || die "make install failed"
-
- # Need to be suid
- fperms u+s /sbin/unix_chkpwd
-
- dodir /$(get_libdir)
- mv "${D}/usr/$(get_libdir)/libpam.so"* "${D}/$(get_libdir)/"
- mv "${D}/usr/$(get_libdir)/libpamc.so"* "${D}/$(get_libdir)/"
- mv "${D}/usr/$(get_libdir)/libpam_misc.so"* "${D}/$(get_libdir)/"
- gen_usr_ldscript libpam.so libpamc.so libpam_misc.so
-
- dodoc CHANGELOG ChangeLog README AUTHORS Copyright NEWS || die
-
- docinto modules
- for dir in modules/pam_*; do
- newdoc "${dir}"/README README."$(basename "${dir}")"
- done
-
- # Get rid of the .la files. We certainly don't need them for PAM
- # modules, and libpam is installed as a shared object only, so we
- # don't ned them for static linking either.
- find "${D}" -name '*.la' -delete
-}
-
-pkg_preinst() {
- check_old_modules || die "deprecated PAM modules still used"
-}
diff --git a/sys-libs/pam/pam-1.1.1-r2.ebuild b/sys-libs/pam/pam-1.1.1-r2.ebuild
index 370e21cfcc91..4a7195a2e871 100644
--- a/sys-libs/pam/pam-1.1.1-r2.ebuild
+++ b/sys-libs/pam/pam-1.1.1-r2.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/sys-libs/pam/pam-1.1.1-r2.ebuild,v 1.1 2010/04/06 05:39:37 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/pam/pam-1.1.1-r2.ebuild,v 1.2 2010/04/26 12:04:09 flameeyes Exp $
EAPI="3"
@@ -94,6 +94,10 @@ src_prepare() {
# library suffix but no suffix on the ELF symbols).
epatch "${FILESDIR}/${MY_PN}-1.1.1-gentoodb.patch"
+ # make it possible to skip libxcrypt detection if header is not
+ # found
+ epatch "${FILESDIR}/${MY_PN}-1.1.1-xcrypt.patch"
+
# Remove libtool-2 libtool macros, see bug 261167
rm m4/libtool.m4 m4/lt*.m4 || die "rm libtool macros failed."
@@ -109,6 +113,11 @@ src_configure() {
myconf="${myconf} --disable-pie"
fi
+ # Disable automatic detection of libxcrypt; we _don't_ want the
+ # user to link libxcrypt in by default, since we won't track the
+ # dependency and allow to break PAM this way.
+ export ac_cv_header_xcrypt_h=no
+
econf \
--libdir="${EPREFIX}"/usr/$(get_libdir) \
--docdir="${EPREFIX}"/usr/share/doc/${PF} \
@@ -131,6 +140,11 @@ src_compile() {
emake sepermitlockdir="${EPREFIX}/var/run/sepermit" || die "emake failed"
}
+src_test() {
+ # explicitly allow parallel-build during testing
+ emake sepermitlockdir="${EPREFIX}/var/run/sepermit" check || die "emake check failed"
+}
+
src_install() {
local lib
diff --git a/sys-libs/pam/pam-1.1.1.ebuild b/sys-libs/pam/pam-1.1.1.ebuild
deleted file mode 100644
index 70f2f8be961a..000000000000
--- a/sys-libs/pam/pam-1.1.1.ebuild
+++ /dev/null
@@ -1,156 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/pam/pam-1.1.1.ebuild,v 1.3 2010/01/06 15:51:10 ulm Exp $
-
-inherit libtool multilib eutils autotools pam toolchain-funcs flag-o-matic
-
-MY_PN="Linux-PAM"
-MY_P="${MY_PN}-${PV}"
-
-HOMEPAGE="http://www.kernel.org/pub/linux/libs/pam/"
-DESCRIPTION="Linux-PAM (Pluggable Authentication Modules)"
-
-SRC_URI="mirror://kernel/linux/libs/pam/library/${MY_P}.tar.bz2
- mirror://kernel/linux/libs/pam/documentation/${MY_P}-docs.tar.bz2"
-
-LICENSE="|| ( BSD GPL-2 )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="cracklib nls elibc_FreeBSD selinux vim-syntax audit test elibc_glibc debug"
-
-RDEPEND="nls? ( virtual/libintl )
- cracklib? ( >=sys-libs/cracklib-2.8.3 )
- audit? ( sys-process/audit )
- selinux? ( >=sys-libs/libselinux-1.28 )
- elibc_glibc? ( >=sys-libs/glibc-2.7 )"
-DEPEND="${RDEPEND}
- sys-devel/flex
- nls? ( sys-devel/gettext )"
-PDEPEND="sys-auth/pambase
- vim-syntax? ( app-vim/pam-syntax )"
-
-S="${WORKDIR}/${MY_P}"
-
-PROVIDE="virtual/pam"
-
-check_old_modules() {
- local retval="0"
-
- if sed -e 's:#.*::' "${ROOT}"/etc/pam.d/* 2>/dev/null | fgrep -q pam_stack.so; then
- eerror ""
- eerror "Your current setup is using the pam_stack module."
- eerror "This module is deprecated and no longer supported, and since version"
- eerror "0.99 is no longer installed, nor provided by any other package."
- eerror "The package will be built (to allow binary package builds), but will"
- eerror "not be installed."
- eerror "Please replace pam_stack usage with proper include directive usage,"
- eerror "following the PAM Upgrade guide at the following URL"
- eerror " http://www.gentoo.org/proj/en/base/pam/upgrade-0.99.xml"
- eerror ""
- ebeep 15
-
- retval=1
- fi
-
- if sed -e 's:#.*::' "${ROOT}"/etc/pam.d/* 2>/dev/null | egrep -q 'pam_(pwdb|console)'; then
- eerror ""
- eerror "Your current setup is using one or more of the following modules,"
- eerror "that are not built or supported anymore:"
- eerror "pam_pwdb, pam_console"
- eerror "If you are in real need for these modules, please contact the maintainers"
- eerror "of PAM through http://bugs.gentoo.org/ providing information about its"
- eerror "use cases."
- eerror "Please also make sure to read the PAM Upgrade guide at the following URL:"
- eerror " http://www.gentoo.org/proj/en/base/pam/upgrade-0.99.xml"
- eerror ""
- ebeep 10
-
- retval=1
- fi
-
- return $retval
-}
-
-pkg_setup() {
- check_old_modules
-}
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
-
- # Avoid building xtests during "make all"; note that for what
- # we're concerned xtests are not even executed, so we should
- # probably use EXTRA_PROGRAMS.
- epatch "${FILESDIR}/${MY_PN}-0.99.8.1-xtests.patch"
-
- # Fix building on uClibc; it is added since 1.1.1 but applies to
- # 1.1.0 as well.
- epatch "${FILESDIR}/${MY_PN}-1.1.0-uclibc.patch"
-
- # Remove libtool-2 libtool macros, see bug 261167
- rm m4/libtool.m4 m4/lt*.m4 || die "rm libtool macros failed."
-
- AT_M4DIR="m4" eautoreconf
-
- elibtoolize
-}
-
-src_compile() {
- local myconf
-
- if use hppa || use elibc_FreeBSD; then
- myconf="${myconf} --disable-pie"
- 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) \
- $(use_enable debug) \
- --disable-db \
- --disable-dependency-tracking \
- --disable-prelude \
- ${myconf} || die "econf failed"
- emake sepermitlockdir="/var/run/sepermit" || die "emake failed"
-}
-
-src_install() {
- emake DESTDIR="${D}" install \
- sepermitlockdir="/var/run/sepermit" || die "make install failed"
-
- # Need to be suid
- fperms u+s /sbin/unix_chkpwd
-
- dodir /$(get_libdir)
- mv "${D}/usr/$(get_libdir)/libpam.so"* "${D}/$(get_libdir)/"
- mv "${D}/usr/$(get_libdir)/libpamc.so"* "${D}/$(get_libdir)/"
- mv "${D}/usr/$(get_libdir)/libpam_misc.so"* "${D}/$(get_libdir)/"
- gen_usr_ldscript libpam.so libpamc.so libpam_misc.so
-
- dodoc CHANGELOG ChangeLog README AUTHORS Copyright NEWS || die
-
- docinto modules
- for dir in modules/pam_*; do
- newdoc "${dir}"/README README."$(basename "${dir}")"
- done
-
- # Remove the wrongly installed manpages
- rm "${D}"/usr/share/man/man8/pam_userdb.8*
- use cracklib || rm "${D}"/usr/share/man/man8/pam_cracklib.8*
-
- # Get rid of the .la files. We certainly don't need them for PAM
- # modules, and libpam is installed as a shared object only, so we
- # don't ned them for static linking either.
- find "${D}" -name '*.la' -delete
-}
-
-pkg_preinst() {
- check_old_modules || die "deprecated PAM modules still used"
-}