summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiego Elio Pettenò <flameeyes@gentoo.org>2008-04-18 04:19:00 +0000
committerDiego Elio Pettenò <flameeyes@gentoo.org>2008-04-18 04:19:00 +0000
commite86dd0760f1ec4b2abad5e1fdde21076af060ac2 (patch)
treeef9a3f10de2ce99f46b21286ee16d093c88823f4 /sys-libs/pam
parentFix broken Manifest. (diff)
downloadhistorical-e86dd0760f1ec4b2abad5e1fdde21076af060ac2.tar.gz
historical-e86dd0760f1ec4b2abad5e1fdde21076af060ac2.tar.bz2
historical-e86dd0760f1ec4b2abad5e1fdde21076af060ac2.zip
Version bump, no functional changes but I can do some spring cleaning, and it has sr locale support.
Package-Manager: portage-2.1.5_rc4
Diffstat (limited to 'sys-libs/pam')
-rw-r--r--sys-libs/pam/ChangeLog11
-rw-r--r--sys-libs/pam/Manifest17
-rw-r--r--sys-libs/pam/files/Linux-PAM-1.0.0-set-item.patch67
-rw-r--r--sys-libs/pam/pam-0.99.10.0.ebuild166
-rw-r--r--sys-libs/pam/pam-0.99.9.0-r1.ebuild166
-rw-r--r--sys-libs/pam/pam-1.0.0-r1.ebuild172
-rw-r--r--sys-libs/pam/pam-1.0.1.ebuild (renamed from sys-libs/pam/pam-1.0.0-r2.ebuild)3
7 files changed, 17 insertions, 585 deletions
diff --git a/sys-libs/pam/ChangeLog b/sys-libs/pam/ChangeLog
index 96a7fe08bbea..150e0f7c8856 100644
--- a/sys-libs/pam/ChangeLog
+++ b/sys-libs/pam/ChangeLog
@@ -1,6 +1,15 @@
# 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.210 2008/04/14 14:01:11 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/pam/ChangeLog,v 1.211 2008/04/18 04:18:59 flameeyes Exp $
+
+*pam-1.0.1 (18 Apr 2008)
+
+ 18 Apr 2008; Diego Pettenò <flameeyes@gentoo.org>
+ -files/Linux-PAM-1.0.0-set-item.patch, -pam-0.99.9.0-r1.ebuild,
+ -pam-0.99.10.0.ebuild, -pam-1.0.0-r1.ebuild, -pam-1.0.0-r2.ebuild,
+ +pam-1.0.1.ebuild:
+ Version bump, no functional changes but I can do some spring cleaning, and
+ it has sr locale support.
14 Apr 2008; Diego Pettenò <flameeyes@gentoo.org> pam-1.0.0-r2.ebuild:
Re-add ~ppc, that was added after I copied the ebuild to -r2.
diff --git a/sys-libs/pam/Manifest b/sys-libs/pam/Manifest
index a43f464fa434..4a8416f98e51 100644
--- a/sys-libs/pam/Manifest
+++ b/sys-libs/pam/Manifest
@@ -3,26 +3,21 @@ Hash: SHA1
AUX Linux-PAM-0.99.7.0-disable-regenerate-man.patch 667 RMD160 ad4b61f010ec6f3e8bd9ff137375c64ec594f438 SHA1 7b578fedf5ee73f82575feadfeea7a8d5b98bda0 SHA256 e4deb0732039dd29774248bb33271d578c69b76f86c015e8ffd296fa2bb6be3b
AUX Linux-PAM-0.99.8.1-xtests.patch 726 RMD160 4740f7039305c2520add212a576c9f16eb6c0db9 SHA1 716cd42c4c785db666b6c9911222760285a79e8f SHA256 6dbbadc4d9a5d08e55b381746dffd501bdd7dc07fdcb741b8ac95df07d5e1223
-AUX Linux-PAM-1.0.0-set-item.patch 1988 RMD160 b3884ab56e84b27a0e5fd6ab0003ea17191afff2 SHA1 fd319d2fd0e5eef6852257b84f52401a84a4eec8 SHA256 dc7ab0a2b867a979be397b7f1d41ea9df380c07a89881a985939fa6b4091a998
AUX other.pamd 139 RMD160 d0f52fd0b830c86b0e933ebfaa8c2c1545337e43 SHA1 6d1f1a5f55c65f13b7fd35396c7f302c1946116e SHA256 3df996d0f5713c92598ac2d3be2b139ec79f3d1e2010bbc53da14c3dd55e64c2
AUX system-auth.pamd.epam 593 RMD160 262c88da0e6ac9ae09f0f1190de2f76396877807 SHA1 926c91cfa56c1480a7fe867ba902a94cf7e36ab7 SHA256 7896556f671ee88582babce4edd851fdc105a101bd8da48d2ef1dfd940b32eca
-DIST Linux-PAM-0.99.10.0.tar.bz2 932090 RMD160 11ffd03e0078f08096208aa546cdc10894af346e SHA1 bd4269170b20f3fcde1416e97920ce43b8c11b35 SHA256 a91c595bc941dc39fa22286c55bbae4a5e1625631a9f6d25863ecebf22f4cf77
DIST Linux-PAM-0.99.8.1-ldflags-to-libadd.patch.bz2 2556 RMD160 e15c0cccb05e32c5a5bf3946525c65044b7ac627 SHA1 44ddff4111fc24de1e00524bdaae4da6070ce3c7 SHA256 2017cbe72cc3440061446e4edd0cd48ae431a99ba6db2b80e1a19e8e8aebf3a6
DIST Linux-PAM-0.99.8.1.tar.bz2 903827 RMD160 bac7908aebb4671bdf95d0c31086f2ed2d879ef8 SHA1 41ea4d3296cfd0f1709e8b250d5afd3c4e98ef8b SHA256 47abe93a4d451ff6403c04898d386fb568ba7578520c4cf2687122a12e286cd2
DIST Linux-PAM-0.99.9.0.tar.bz2 909240 RMD160 824ff71efd5e4ea29a65462bcab08d41b583e8db SHA1 19876eee4890ec94bf81da8506d24c3762be8860 SHA256 606158db75d5a474ac52a8bd884e27cc2da13edb4e7bc7a1a2f39686cb5568d6
-DIST Linux-PAM-1.0.0.tar.bz2 965144 RMD160 ec65b71680efd96f08b84f084a06c1f5f3a99dfb SHA1 e35bcc558b002032e6a655898ad30758055bff6c SHA256 e9a8be47b149567b823c9524db250e8339f58e211cff72839c499244e48506da
-EBUILD pam-0.99.10.0.ebuild 4983 RMD160 091e82150a9a60d35ba89fab5317d5ab7bf0a6c2 SHA1 8f9032f8c002a6f78400cfb609d86f7313161dda SHA256 eb2f4cc4aad4f039e95b1f2ad1c8e5fe838f7cab296244edfc6aa5cf7426bb5c
+DIST Linux-PAM-1.0.1.tar.bz2 979878 RMD160 f8233647163287d3b559d1b8ccb292e2be75326b SHA1 c1cdcd28141344b3501121d32e0d57d2a3c14422 SHA256 209c911dac4cdfe0ecafc41b835b75fc01ac19e68c8382411fb1e0c836e61e09
EBUILD pam-0.99.8.1-r1.ebuild 5141 RMD160 8d7b0c5dc053e30b7b2b4a7e3477a0a395244850 SHA1 eabef364ff9a0f6fd4750f064b7005557e44d911 SHA256 1fe79be9691cd44b5f8de55c3bde4c9d705616be2daaac0222eff623ba22b13f
-EBUILD pam-0.99.9.0-r1.ebuild 4932 RMD160 f318e50f8b1f0caf8e6bdb134d80e42201f4f550 SHA1 102ec567fd4c80e1ccb3f55a50407c288e25e412 SHA256 f5b9c50bff1052a869173d09662c664272b10879efcb3ef69c61d400187c6905
EBUILD pam-0.99.9.0.ebuild 5247 RMD160 51e5b7ef8b7134dc3cdcee88c6dd393e2c405948 SHA1 574460368f85e605fe756d49720bbb8304c1c4e6 SHA256 a7f627b289ed16040aa3ce81a45ed470e0036af337b2d6258e952d54e1731b33
-EBUILD pam-1.0.0-r1.ebuild 5275 RMD160 9eee395a8bdbf63020055e19e3aa7bf852dfa9ca SHA1 8298cdcdc70bbf47a124e5afdbe73e4a513f5f64 SHA256 127e1b3e824e3a07c9f9fb51914fdcb25ab4b61a9d943221a6ebac5815925590
-EBUILD pam-1.0.0-r2.ebuild 5390 RMD160 a0b64cdf807b7afabc29f8db7a9f62201dba508a SHA1 da153fb65f62e543cf6d66542e5bf6f91e12feff SHA256 9bf81e699a6b4a21f4046292d1a323a5f68c44686d19c4deac753dd2071d932e
-MISC ChangeLog 33571 RMD160 3a03c3c1fb98a115477ec876678c656fa26c16ac SHA1 6d47fe440016e5d4fd75f465cbe60d0e557a5d95 SHA256 4b5d18dab96b1a1acae224330929b079a69862152611ecf03c03cc707ed8c21e
+EBUILD pam-1.0.1.ebuild 5335 RMD160 c8287c7f7ff502944b729d659668c75790255d5a SHA1 e4666c3055ce8fcb42c0536832dfa2c3e1f6b8d5 SHA256 13c5aafe4b262b43a3c9b9dff167a1e07e4f02fabeacf89eee696e5dafbb099f
+MISC ChangeLog 33912 RMD160 5beaf1d16e45540fb4e5d7a6c611f9d13aaf1698 SHA1 ef1e229c11f8ef7c0ea80ddc7b042e9d1ae200ce SHA256 7d35ce18e8793c2a168141bd0c098c98ef5e940f6a4b08ce65a1e43e684fd18e
MISC metadata.xml 218 RMD160 1955c7446d4ceb77506ba7b58ee35913c576a72c SHA1 02dacc356a39905402083cb54ae4f6dd0ac59fad SHA256 e0bb49cab71cc84d8bdad26876197164073722b378d27a5bf55bbfd2afdbd19c
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.9 (GNU/Linux)
-iEYEARECAAYFAkgDY64ACgkQAiZjviIA2XgCiQCfRZJeu8nqOjDs0bDJo+oi36UK
-yh4An16MOsycUTteBaBA5X0M1ijUoEQd
-=DTC/
+iEYEARECAAYFAkgIIeUACgkQAiZjviIA2XjSigCfThKKP4ZGzKSxf2R8H1HD8iOG
+HZsAn3UsDUiJvPf8OFT9MLKfXAKWp6SQ
+=3j2y
-----END PGP SIGNATURE-----
diff --git a/sys-libs/pam/files/Linux-PAM-1.0.0-set-item.patch b/sys-libs/pam/files/Linux-PAM-1.0.0-set-item.patch
deleted file mode 100644
index 4a08ee0be9ad..000000000000
--- a/sys-libs/pam/files/Linux-PAM-1.0.0-set-item.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-Bug #216702, allow changing password from user.
-
-Index: pam_item.c
-===================================================================
-RCS file: /cvsroot/pam/Linux-PAM/libpam/pam_item.c,v
-retrieving revision 1.16
-diff -u -p -r1.16 pam_item.c
---- libpam/pam_item.c 3 Mar 2008 13:23:45 -0000 1.16
-+++ libpam/pam_item.c 7 Apr 2008 09:04:50 -0000
-@@ -11,13 +11,15 @@
- #include <string.h>
- #include <syslog.h>
-
--#define TRY_SET(X, Y) \
--{ \
-- char *_TMP_ = _pam_strdup(Y); \
-- if (_TMP_ == NULL && (Y) != NULL) \
-- return PAM_BUF_ERR; \
-- free(X); \
-- (X) = _TMP_; \
-+#define TRY_SET(X, Y) \
-+{ \
-+ if ((X) != (Y)) { \
-+ char *_TMP_ = _pam_strdup(Y); \
-+ if (_TMP_ == NULL && (Y) != NULL) \
-+ return PAM_BUF_ERR; \
-+ free(X); \
-+ (X) = _TMP_; \
-+ } \
- }
-
- /* functions */
-@@ -76,8 +78,10 @@ int pam_set_item (pam_handle_t *pamh, in
- * modules.
- */
- if (__PAM_FROM_MODULE(pamh)) {
-- _pam_overwrite(pamh->authtok);
-- TRY_SET(pamh->authtok, item);
-+ if (pamh->authtok != item) {
-+ _pam_overwrite(pamh->authtok);
-+ TRY_SET(pamh->authtok, item);
-+ }
- } else {
- retval = PAM_BAD_ITEM;
- }
-@@ -90,8 +94,10 @@ int pam_set_item (pam_handle_t *pamh, in
- * modules.
- */
- if (__PAM_FROM_MODULE(pamh)) {
-- _pam_overwrite(pamh->oldauthtok);
-- TRY_SET(pamh->oldauthtok, item);
-+ if (pamh->oldauthtok != item) {
-+ _pam_overwrite(pamh->oldauthtok);
-+ TRY_SET(pamh->oldauthtok, item);
-+ }
- } else {
- retval = PAM_BAD_ITEM;
- }
-@@ -130,6 +136,8 @@ int pam_set_item (pam_handle_t *pamh, in
- break;
-
- case PAM_XAUTHDATA:
-+ if (&pamh->xauth == item)
-+ break;
- if (pamh->xauth.namelen) {
- _pam_overwrite(pamh->xauth.name);
- free(pamh->xauth.name);
diff --git a/sys-libs/pam/pam-0.99.10.0.ebuild b/sys-libs/pam/pam-0.99.10.0.ebuild
deleted file mode 100644
index 52add92d6662..000000000000
--- a/sys-libs/pam/pam-0.99.10.0.ebuild
+++ /dev/null
@@ -1,166 +0,0 @@
-# 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-0.99.10.0.ebuild,v 1.8 2008/03/29 02:49:07 vapier Exp $
-
-WANT_AUTOCONF="latest"
-WANT_AUTOMAKE="latest"
-
-inherit libtool multilib eutils autotools pam toolchain-funcs
-
-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/pre/library/${MY_P}.tar.bz2"
-
-LICENSE="PAM"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~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|radius|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_radius, 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; 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"
-
- AT_M4DIR="m4" eautoreconf
-
- elibtoolize
-}
-
-src_compile() {
- local myconf
-
- if use hppa || use elibc_FreeBSD; then
- myconf="${myconf} --disable-pie"
- fi
-
- econf \
- $(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 \
- --enable-docdir=/usr/share/doc/${PF} \
- --disable-regenerate-man \
- ${myconf} || die "econf failed"
- emake || die "emake failed"
-}
-
-src_install() {
- emake DESTDIR="${D}" install || 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
-
- # No, we don't really need .la files for PAM modules.
- rm -f "${D}/$(get_libdir)/security/"*.la
-
- 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*
-}
-
-pkg_preinst() {
- check_old_modules || die "deprecated PAM modules still used"
-
- pam_epam_expand "${D}"/etc/pam.d/*
-}
diff --git a/sys-libs/pam/pam-0.99.9.0-r1.ebuild b/sys-libs/pam/pam-0.99.9.0-r1.ebuild
deleted file mode 100644
index 3d20239230e7..000000000000
--- a/sys-libs/pam/pam-0.99.9.0-r1.ebuild
+++ /dev/null
@@ -1,166 +0,0 @@
-# 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-0.99.9.0-r1.ebuild,v 1.3 2008/03/05 17:55:59 fmccor Exp $
-
-WANT_AUTOCONF="latest"
-WANT_AUTOMAKE="latest"
-
-inherit libtool multilib eutils autotools pam toolchain-funcs
-
-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/pre/library/${MY_P}.tar.bz2"
-
-LICENSE="PAM"
-SLOT="0"
-KEYWORDS="~hppa ~sparc"
-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|radius|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_radius, 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; 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"
-
- AT_M4DIR="m4" eautoreconf
-
- elibtoolize
-}
-
-src_compile() {
- local myconf
-
- if use hppa || use elibc_FreeBSD; then
- myconf="${myconf} --disable-pie"
- fi
-
- econf \
- $(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 \
- --enable-docdir=/usr/share/doc/${PF} \
- --disable-regenerate-man \
- ${myconf} || die "econf failed"
- emake || die "emake failed"
-}
-
-src_install() {
- emake DESTDIR="${D}" install || 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
-
- # No, we don't really need .la files for PAM modules.
- rm -f "${D}/$(get_libdir)/security/"*.la
-
- 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*
-}
-
-pkg_preinst() {
- check_old_modules || die "deprecated PAM modules still used"
-
- pam_epam_expand "${D}"/etc/pam.d/*
-}
diff --git a/sys-libs/pam/pam-1.0.0-r1.ebuild b/sys-libs/pam/pam-1.0.0-r1.ebuild
deleted file mode 100644
index eef8a15fdcc2..000000000000
--- a/sys-libs/pam/pam-1.0.0-r1.ebuild
+++ /dev/null
@@ -1,172 +0,0 @@
-# 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.0-r1.ebuild,v 1.3 2008/04/14 11:55:51 flameeyes Exp $
-
-WANT_AUTOCONF="latest"
-WANT_AUTOMAKE="latest"
-
-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="PAM"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~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|radius|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_radius, 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; 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"
- epatch "${FILESDIR}/${MY_PN}-1.0.0-set-item.patch"
-
- AT_M4DIR="m4" eautoreconf
-
- elibtoolize
-}
-
-src_compile() {
- local myconf
-
- # Workarounds autoconf 2.62 bug, libintl.h is included before
- # _GNU_SOURCE is defined in config.h. See bug #217154
- append-flags -D_GNU_SOURCE
-
- if use hppa || use elibc_FreeBSD; then
- myconf="${myconf} --disable-pie"
- fi
-
- econf \
- $(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 \
- --enable-docdir=/usr/share/doc/${PF} \
- --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
-
- # No, we don't really need .la files for PAM modules.
- rm -f "${D}/$(get_libdir)/security/"*.la
-
- 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*
-}
-
-pkg_preinst() {
- check_old_modules || die "deprecated PAM modules still used"
-
- pam_epam_expand "${D}"/etc/pam.d/*
-}
diff --git a/sys-libs/pam/pam-1.0.0-r2.ebuild b/sys-libs/pam/pam-1.0.1.ebuild
index 553683a02a2d..6f33df633251 100644
--- a/sys-libs/pam/pam-1.0.0-r2.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.0-r2.ebuild,v 1.2 2008/04/14 14:01:11 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/pam/pam-1.0.1.ebuild,v 1.1 2008/04/18 04:18:59 flameeyes Exp $
WANT_AUTOCONF="latest"
WANT_AUTOMAKE="latest"
@@ -106,7 +106,6 @@ src_unpack() {
epatch "${FILESDIR}/${MY_PN}-0.99.7.0-disable-regenerate-man.patch"
epatch "${FILESDIR}/${MY_PN}-0.99.8.1-xtests.patch"
- epatch "${FILESDIR}/${MY_PN}-1.0.0-set-item.patch"
AT_M4DIR="m4" eautoreconf