From bc37de765c525b47d6805e2afd14317fa1027205 Mon Sep 17 00:00:00 2001 From: Diego Elio Pettenò Date: Thu, 28 Feb 2013 05:59:27 +0000 Subject: Fix build on non-multilib systems, should close bug #459536. (Portage version: 2.2.0_alpha163/cvs/Linux x86_64, signed Manifest commit with key 1CD13C8AD4301342) --- sys-libs/pam/ChangeLog | 8 +- sys-libs/pam/pam-1.1.6-r3.ebuild | 184 -------------------------------------- sys-libs/pam/pam-1.1.6-r4.ebuild | 185 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 192 insertions(+), 185 deletions(-) delete mode 100644 sys-libs/pam/pam-1.1.6-r3.ebuild create mode 100644 sys-libs/pam/pam-1.1.6-r4.ebuild diff --git a/sys-libs/pam/ChangeLog b/sys-libs/pam/ChangeLog index d89775f29078..cca86aa01b3f 100644 --- a/sys-libs/pam/ChangeLog +++ b/sys-libs/pam/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for sys-libs/pam # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/pam/ChangeLog,v 1.327 2013/02/27 11:08:52 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/pam/ChangeLog,v 1.328 2013/02/28 05:59:27 flameeyes Exp $ + +*pam-1.1.6-r4 (28 Feb 2013) + + 28 Feb 2013; Diego E. Pettenò +pam-1.1.6-r4.ebuild, + -pam-1.1.6-r3.ebuild: + Fix build on non-multilib systems, should close bug #459536. *pam-1.1.6-r3 (27 Feb 2013) diff --git a/sys-libs/pam/pam-1.1.6-r3.ebuild b/sys-libs/pam/pam-1.1.6-r3.ebuild deleted file mode 100644 index bac5ba6a85f1..000000000000 --- a/sys-libs/pam/pam-1.1.6-r3.ebuild +++ /dev/null @@ -1,184 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/pam/pam-1.1.6-r3.ebuild,v 1.1 2013/02/27 11:08:52 flameeyes Exp $ - -EAPI=5 - -inherit libtool multilib eutils pam toolchain-funcs flag-o-matic db-use autotools autotools-utils - -MY_PN="Linux-PAM" -MY_P="${MY_PN}-${PV}" - -HOMEPAGE="https://fedorahosted.org/linux-pam/" -DESCRIPTION="Linux-PAM (Pluggable Authentication Modules)" - -SRC_URI="http://www.linux-pam.org/library/${MY_P}.tar.bz2 - http://www.linux-pam.org/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 ~amd64-linux ~ia64-linux ~x86-linux" -IUSE="cracklib nls elibc_FreeBSD selinux vim-syntax audit test elibc_glibc debug berkdb nis" - -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 - nis? ( || ( >=net-libs/libtirpc-0.2.2-r1 /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 "" - - retval=1 - fi - - if sed -e 's:#.*::' "${EROOT}"/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 "" - - retval=1 - fi - - return $retval -} - -pkg_pretend() { - # do not error out, this is just a warning, one could build a binpkg - # with old modules enabled. - check_old_modules -} - -src_prepare() { - epatch "${FILESDIR}"/${MY_P}-destdir.patch - epatch "${FILESDIR}"/${MY_P}+glibc-2.16.patch - - eautoreconf - elibtoolize -} - -src_configure() { - # 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 - - local myeconfargs=( - --htmldir="${EPREFIX}"/usr/share/doc/${PF}/html - --enable-securedir="${EPREFIX}"/$(get_libdir)/security - --enable-isadir="${EPREFIX}"/$(get_libdir)/security - $(use_enable nls) - $(use_enable selinux) - $(use_enable cracklib) - $(use_enable audit) - $(use_enable debug) - $(use_enable berkdb db) - $(use_enable nis) - --with-db-uniquename=-$(db_findver sys-libs/db) - --disable-prelude - ) - - if use hppa || use elibc_FreeBSD; then - myeconfargs+=( --disable-pie ) - fi - - autotools-utils_src_configure -} - -src_compile() { - autotools-utils_src_compile sepermitlockdir="${EPREFIX}/run/sepermit" -} - -DOCS=( CHANGELOG ChangeLog README AUTHORS Copyright NEWS ) - -src_install() { - autotools-utils_src_install sepermitlockdir="${EPREFIX}/run/sepermit" - - # Need to be suid - fperms u+s /sbin/unix_chkpwd - - gen_usr_ldscript -a pam pamc pam_misc - - # create extra symlinks just in case something depends on them... - local lib - for lib in pam pamc pam_misc; do - if ! [[ -f "${ED}"/$(get_libdir)/lib${lib}$(get_libname) ]]; then - dosym lib${lib}$(get_libname 0) /$(get_libdir)/lib${lib}$(get_libname) - fi - done - - docinto modules - for dir in modules/pam_*; do - newdoc "${dir}"/README README."$(basename "${dir}")" - done - - prune_libtool_files --all - - if use selinux; then - dodir /usr/lib/tmpfiles.d - cat - > "${D}"/usr/lib/tmpfiles.d/${CATEGORY}:${PN}:${SLOT}.conf </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 "" + + retval=1 + fi + + if sed -e 's:#.*::' "${EROOT}"/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 "" + + retval=1 + fi + + return $retval +} + +pkg_pretend() { + # do not error out, this is just a warning, one could build a binpkg + # with old modules enabled. + check_old_modules +} + +src_prepare() { + epatch "${FILESDIR}"/${MY_P}-destdir.patch + epatch "${FILESDIR}"/${MY_P}+glibc-2.16.patch + + eautoreconf + elibtoolize +} + +src_configure() { + # 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 + + local myeconfargs=( + --htmldir="${EPREFIX}"/usr/share/doc/${PF}/html + --libdir="${EPREFIX}"/usr/$(get_libdir) \ + --enable-securedir="${EPREFIX}"/$(get_libdir)/security + --enable-isadir="${EPREFIX}"/$(get_libdir)/security + $(use_enable nls) + $(use_enable selinux) + $(use_enable cracklib) + $(use_enable audit) + $(use_enable debug) + $(use_enable berkdb db) + $(use_enable nis) + --with-db-uniquename=-$(db_findver sys-libs/db) + --disable-prelude + ) + + if use hppa || use elibc_FreeBSD; then + myeconfargs+=( --disable-pie ) + fi + + autotools-utils_src_configure +} + +src_compile() { + autotools-utils_src_compile sepermitlockdir="${EPREFIX}/run/sepermit" +} + +DOCS=( CHANGELOG ChangeLog README AUTHORS Copyright NEWS ) + +src_install() { + autotools-utils_src_install sepermitlockdir="${EPREFIX}/run/sepermit" + + # Need to be suid + fperms u+s /sbin/unix_chkpwd + + gen_usr_ldscript -a pam pamc pam_misc + + # create extra symlinks just in case something depends on them... + local lib + for lib in pam pamc pam_misc; do + if ! [[ -f "${ED}"/$(get_libdir)/lib${lib}$(get_libname) ]]; then + dosym lib${lib}$(get_libname 0) /$(get_libdir)/lib${lib}$(get_libname) + fi + done + + docinto modules + for dir in modules/pam_*; do + newdoc "${dir}"/README README."$(basename "${dir}")" + done + + prune_libtool_files --all + + if use selinux; then + dodir /usr/lib/tmpfiles.d + cat - > "${D}"/usr/lib/tmpfiles.d/${CATEGORY}:${PN}:${SLOT}.conf <