[gentoo-commits] gentoo-x86 commit in sys-libs/pam: pam-1.1.1-r2.ebuild pam-1.1.0.ebuild ChangeLog pam-1.1.1-r1.ebuild pam-1.1.1.ebuild pam-1.0.4.ebuild

[Diego Petteno (flameeyes)]

flameeyes    10/04/26 12:04:09

  Modified:             pam-1.1.1-r2.ebuild pam-1.1.0.ebuild ChangeLog
  Removed:              pam-1.1.1-r1.ebuild pam-1.1.1.ebuild
                        pam-1.0.4.ebuild
  Log:
  Cleanup old ebuilds and files; add patches to disable libxcrypt automagic dependency (bug #317195).
  (Portage version: 2.2_rc67/cvs/Linux x86_64)

Revision  Changes    Path
1.2                  sys-libs/pam/pam-1.1.1-r2.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-libs/pam/pam-1.1.1-r2.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-libs/pam/pam-1.1.1-r2.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-libs/pam/pam-1.1.1-r2.ebuild?r1=1.1&r2=1.2

Index: pam-1.1.1-r2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-libs/pam/pam-1.1.1-r2.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pam-1.1.1-r2.ebuild	6 Apr 2010 05:39:37 -0000	1.1
+++ pam-1.1.1-r2.ebuild	26 Apr 2010 12:04:09 -0000	1.2
@@ -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 @@
 	# 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 @@
 		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 @@
 	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
 



1.15                 sys-libs/pam/pam-1.1.0.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-libs/pam/pam-1.1.0.ebuild?rev=1.15&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-libs/pam/pam-1.1.0.ebuild?rev=1.15&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-libs/pam/pam-1.1.0.ebuild?r1=1.14&r2=1.15

Index: pam-1.1.0.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-libs/pam/pam-1.1.0.ebuild,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- pam-1.1.0.ebuild	24 Jan 2010 18:27:13 -0000	1.14
+++ pam-1.1.0.ebuild	26 Apr 2010 12:04:09 -0000	1.15
@@ -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 @@
 	# 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 @@
 		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} \



1.258                sys-libs/pam/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-libs/pam/ChangeLog?rev=1.258&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-libs/pam/ChangeLog?rev=1.258&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-libs/pam/ChangeLog?r1=1.257&r2=1.258

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-libs/pam/ChangeLog,v
retrieving revision 1.257
retrieving revision 1.258
diff -u -r1.257 -r1.258
--- ChangeLog	6 Apr 2010 05:39:37 -0000	1.257
+++ ChangeLog	26 Apr 2010 12:04:09 -0000	1.258
@@ -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@g.o>
+  -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)