From 9747af9620b0effed1b51a854c35e4e2f0450e56 Mon Sep 17 00:00:00 2001
From: Diego Elio Pettenò <flameeyes@gentoo.org>
Date: Thu, 26 Jul 2007 16:59:42 +0000
Subject: Version bump, remove old version and merged patches. (Portage
 version: 2.1.3_rc9)

---
 sys-libs/pam/ChangeLog                             |   9 +-
 .../pam/files/Linux-PAM-0.99.8.0-setlocale.patch   |  12 --
 sys-libs/pam/files/digest-pam-0.99.8.0-r2          |   6 -
 sys-libs/pam/files/digest-pam-0.99.8.1             |   6 +
 sys-libs/pam/pam-0.99.8.0-r2.ebuild                | 171 ---------------------
 sys-libs/pam/pam-0.99.8.1.ebuild                   | 170 ++++++++++++++++++++
 6 files changed, 184 insertions(+), 190 deletions(-)
 delete mode 100644 sys-libs/pam/files/Linux-PAM-0.99.8.0-setlocale.patch
 delete mode 100644 sys-libs/pam/files/digest-pam-0.99.8.0-r2
 create mode 100644 sys-libs/pam/files/digest-pam-0.99.8.1
 delete mode 100644 sys-libs/pam/pam-0.99.8.0-r2.ebuild
 create mode 100644 sys-libs/pam/pam-0.99.8.1.ebuild

(limited to 'sys-libs')

diff --git a/sys-libs/pam/ChangeLog b/sys-libs/pam/ChangeLog
index a7d910bb12fd..d74c58c8b8ed 100644
--- a/sys-libs/pam/ChangeLog
+++ b/sys-libs/pam/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-libs/pam
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/pam/ChangeLog,v 1.166 2007/07/12 17:03:00 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/pam/ChangeLog,v 1.167 2007/07/26 16:59:42 flameeyes Exp $
+
+*pam-0.99.8.1 (26 Jul 2007)
+
+  26 Jul 2007; Diego Pettenò <flameeyes@gentoo.org>
+  -files/Linux-PAM-0.99.8.0-setlocale.patch, -pam-0.99.8.0-r2.ebuild,
+  +pam-0.99.8.1.ebuild:
+  Version bump, remove old version and merged patches.
 
   12 Jul 2007; Diego Pettenò <flameeyes@gentoo.org>
   files/system-auth.pamd.epam:
diff --git a/sys-libs/pam/files/Linux-PAM-0.99.8.0-setlocale.patch b/sys-libs/pam/files/Linux-PAM-0.99.8.0-setlocale.patch
deleted file mode 100644
index 38e20627e475..000000000000
--- a/sys-libs/pam/files/Linux-PAM-0.99.8.0-setlocale.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: Linux-PAM-0.99.8.0/modules/pam_limits/pam_limits.c
-===================================================================
---- Linux-PAM-0.99.8.0.orig/modules/pam_limits/pam_limits.c
-+++ Linux-PAM-0.99.8.0/modules/pam_limits/pam_limits.c
-@@ -27,6 +27,7 @@
- #include <errno.h>
- #include <syslog.h>
- #include <stdarg.h>
-+#include <locale.h>
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <sys/resource.h>
diff --git a/sys-libs/pam/files/digest-pam-0.99.8.0-r2 b/sys-libs/pam/files/digest-pam-0.99.8.0-r2
deleted file mode 100644
index 0ae5144edf74..000000000000
--- a/sys-libs/pam/files/digest-pam-0.99.8.0-r2
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 dd508b5289b554630be66ea1f2a9ea52 Linux-PAM-0.99.8.0-ldflags-to-libadd.patch.bz2 2554
-RMD160 734f41e1e040f737ae9a229ce15c3a14caeb8922 Linux-PAM-0.99.8.0-ldflags-to-libadd.patch.bz2 2554
-SHA256 f79f52e60390c1d131d4b590097ccb9e9705a4842c3b63de24f9867c6ea55336 Linux-PAM-0.99.8.0-ldflags-to-libadd.patch.bz2 2554
-MD5 e05a9a1e95ec9bcfa5c09d44f46ad943 Linux-PAM-0.99.8.0.tar.bz2 903366
-RMD160 9e2c9bc00318ef711a2af4561a1c763c2ca28db5 Linux-PAM-0.99.8.0.tar.bz2 903366
-SHA256 4b42990b4cada5ad0abefd6048b8646b17813448fbf13d758cbce605908f02a2 Linux-PAM-0.99.8.0.tar.bz2 903366
diff --git a/sys-libs/pam/files/digest-pam-0.99.8.1 b/sys-libs/pam/files/digest-pam-0.99.8.1
new file mode 100644
index 000000000000..aa8ca976bf09
--- /dev/null
+++ b/sys-libs/pam/files/digest-pam-0.99.8.1
@@ -0,0 +1,6 @@
+MD5 c4b775bf151291f84fd3166e8845e6c9 Linux-PAM-0.99.8.1-ldflags-to-libadd.patch.bz2 2556
+RMD160 e15c0cccb05e32c5a5bf3946525c65044b7ac627 Linux-PAM-0.99.8.1-ldflags-to-libadd.patch.bz2 2556
+SHA256 2017cbe72cc3440061446e4edd0cd48ae431a99ba6db2b80e1a19e8e8aebf3a6 Linux-PAM-0.99.8.1-ldflags-to-libadd.patch.bz2 2556
+MD5 a6472db4afe13850cb401922211bba4e Linux-PAM-0.99.8.1.tar.bz2 903827
+RMD160 bac7908aebb4671bdf95d0c31086f2ed2d879ef8 Linux-PAM-0.99.8.1.tar.bz2 903827
+SHA256 47abe93a4d451ff6403c04898d386fb568ba7578520c4cf2687122a12e286cd2 Linux-PAM-0.99.8.1.tar.bz2 903827
diff --git a/sys-libs/pam/pam-0.99.8.0-r2.ebuild b/sys-libs/pam/pam-0.99.8.0-r2.ebuild
deleted file mode 100644
index b9645dffa0ca..000000000000
--- a/sys-libs/pam/pam-0.99.8.0-r2.ebuild
+++ /dev/null
@@ -1,171 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/pam/pam-0.99.8.0-r2.ebuild,v 1.2 2007/07/15 02:08:20 mr_bones_ 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
-	mirror://gentoo/${MY_P}-ldflags-to-libadd.patch.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"
-
-RDEPEND="nls? ( virtual/libintl )
-	cracklib? ( >=sys-libs/cracklib-2.8.3 )
-	sys-libs/pwdb
-	selinux? ( >=sys-libs/libselinux-1.28 )"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )"
-PDEPEND="vim-syntax? ( app-vim/pam-syntax )"
-
-S="${WORKDIR}/${MY_P}"
-
-PROVIDE="virtual/pam"
-
-check_old_modules() {
-	local retval="0"
-
-	if sed -e 's:#.*::' /etc/pam.d/* | fgrep -q pam_stack.so; then
-		eerror ""
-		eerror "Your current setup is using the pam_stack module."
-		eerror "This module is deprecated and no more supported, and since version"
-		eerror "0.99 is no more 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:#.*::' /etc/pam.d/* | egrep -q 'pam_(pwdb|radius|timestamp)'; 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"
-		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."
-		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_console pam_userdb; do
-		if sed -e 's:#.*::' /etc/pam.d/* | 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 "${DISTDIR}/${MY_P}-ldflags-to-libadd.patch.bz2"
-	epatch "${FILESDIR}/${MY_PN}-0.99.7.0-disable-regenerate-man.patch"
-	epatch "${FILESDIR}/${MY_P}-setlocale.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) \
-		--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.*
-
-	newpamd "${FILESDIR}/system-auth.pamd.epam" system-auth
-	newpamd "${FILESDIR}/other.pamd" other
-
-	# 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/*
-}
-
-pkg_postinst() {
-	if ! use cracklib; then
-		ewarn "You chosen not to enable cracklib. Make sure you run etc-update or"
-		ewarn "you won't be able to change users' passwords."
-	fi
-}
diff --git a/sys-libs/pam/pam-0.99.8.1.ebuild b/sys-libs/pam/pam-0.99.8.1.ebuild
new file mode 100644
index 000000000000..585265d59e67
--- /dev/null
+++ b/sys-libs/pam/pam-0.99.8.1.ebuild
@@ -0,0 +1,170 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/pam/pam-0.99.8.1.ebuild,v 1.1 2007/07/26 16:59:42 flameeyes 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
+	mirror://gentoo/${MY_P}-ldflags-to-libadd.patch.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"
+
+RDEPEND="nls? ( virtual/libintl )
+	cracklib? ( >=sys-libs/cracklib-2.8.3 )
+	sys-libs/pwdb
+	selinux? ( >=sys-libs/libselinux-1.28 )"
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )"
+PDEPEND="vim-syntax? ( app-vim/pam-syntax )"
+
+S="${WORKDIR}/${MY_P}"
+
+PROVIDE="virtual/pam"
+
+check_old_modules() {
+	local retval="0"
+
+	if sed -e 's:#.*::' /etc/pam.d/* | fgrep -q pam_stack.so; then
+		eerror ""
+		eerror "Your current setup is using the pam_stack module."
+		eerror "This module is deprecated and no more supported, and since version"
+		eerror "0.99 is no more 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:#.*::' /etc/pam.d/* | egrep -q 'pam_(pwdb|radius|timestamp)'; 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"
+		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."
+		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_console pam_userdb; do
+		if sed -e 's:#.*::' /etc/pam.d/* | 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 "${DISTDIR}/${MY_P}-ldflags-to-libadd.patch.bz2"
+	epatch "${FILESDIR}/${MY_PN}-0.99.7.0-disable-regenerate-man.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) \
+		--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.*
+
+	newpamd "${FILESDIR}/system-auth.pamd.epam" system-auth
+	newpamd "${FILESDIR}/other.pamd" other
+
+	# 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/*
+}
+
+pkg_postinst() {
+	if ! use cracklib; then
+		ewarn "You chosen not to enable cracklib. Make sure you run etc-update or"
+		ewarn "you won't be able to change users' passwords."
+	fi
+}
-- 
cgit v1.2.3-65-gdbad