Remove old; fix building when e2fsprogs is not installed (by using linux-headers instead), closes bug #432128.

Package-Manager: portage-2.2.0_alpha120/cvs/Linux x86_64

5 files changed, 78 insertions, 54 deletions

diff --git a/sys-auth/pam_mktemp/ChangeLog b/sys-auth/pam_mktemp/ChangeLog
index ebd18891ded5..e9b505f28f21 100644
--- a/sys-auth/pam_mktemp/ChangeLog
+++ b/sys-auth/pam_mktemp/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-auth/pam_mktemp
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/pam_mktemp/ChangeLog,v 1.27 2012/04/26 17:54:38 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/pam_mktemp/ChangeLog,v 1.28 2012/08/21 02:32:02 flameeyes Exp $
+
+  21 Aug 2012; Diego E. Pettenò <flameeyes@gentoo.org>
+  +files/pam_mktemp-1.1.1-e2fsprogs-libs.patch, -pam_mktemp-1.0.3.ebuild,
+  pam_mktemp-1.1.1.ebuild:
+  Remove old; fix building when e2fsprogs is not installed (by using linux-
+  headers instead), closes bug #432128.
 
   26 Apr 2012; Alexis Ballier <aballier@gentoo.org> pam_mktemp-1.1.1.ebuild:
   keyword ~amd64-fbsd
@@ -95,4 +101,3 @@
   17 Apr 2007; Sven Wegener <swegener@gentoo.org> +metadata.xml,
   +pam_mktemp-1.0.2.ebuild:
   Initial commit, ebuild written by me.
-
diff --git a/sys-auth/pam_mktemp/Manifest b/sys-auth/pam_mktemp/Manifest
index 39d66009f6db..6e120ed1aad2 100644
--- a/sys-auth/pam_mktemp/Manifest
+++ b/sys-auth/pam_mktemp/Manifest
@@ -1,16 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
-DIST pam_mktemp-1.0.3.tar.gz 4563 RMD160 2c65426818519e89429807de81bf493caa9a4e26 SHA1 430779f2ecbe5bd6d612fba6b784a14cbe0960aa SHA256 b16b78c5ed4cc04cc8e656d530900e70a7c2e45d3dece6e53fbd94e4470ba734
-DIST pam_mktemp-1.1.1.tar.gz 6754 RMD160 6e9dcf8e1c4ca2ca171b972f87ff8ef114111ab5 SHA1 0c8a2efce9675720813256120c9a753c13505557 SHA256 66cf80c18439ca3456db96402f2eeac14b1a0503cc1d1be7f2b16d5f079f3f3d
-EBUILD pam_mktemp-1.0.3.ebuild 1031 RMD160 63c781bccbb8704a9580f1ef67ddd6eba4d0ab1a SHA1 27fda715d20a58ad35102babcf2d1169daa0aad1 SHA256 45daf6a5fd5b7d4a5c0b3ef3abdeddc6994c23f7c639cff703375ca2b7884169
-EBUILD pam_mktemp-1.1.1.ebuild 1259 RMD160 93b10681e1a52cde44c4cccc08247aad27884d91 SHA1 cc0a0903e1115d4458234759940e78a9d583d616 SHA256 2b57cae79d9143bf72923841449da811210d7914c053a7477b70a721fca26108
-MISC ChangeLog 3287 RMD160 a85f333b9c6af98dfde5d14e16b829e571b74f8c SHA1 7b2b7b8d31f3a58c59c60824e468e9e2547642d6 SHA256 2707476117bef03cf0fa3aac0d56887ab98177d9842730197814e43a5c240532
-MISC metadata.xml 369 RMD160 35d72a9ee31aacade1fb063e0fbabf591c5d58d0 SHA1 d894c3d2c72d95ca7870c30db34777caed80feaf SHA256 ce32ad8230dfd3db48d3bdb99be63f5b4910e8828c01d048378aac8e36da09dc
+AUX pam_mktemp-1.1.1-e2fsprogs-libs.patch 1613 SHA256 a271e66a96c758d752eb185dfc03d6367ca5dfaf8735b0bbb6dd178beeaafaac SHA512 8ba4836d9fcf4fd44f8f210c81c9bb3152051dff291b5e9b94f569b94bc1602990fd27defe80a3c971061a94a076aedb1289a06599d16749ebaacac923d4e488 WHIRLPOOL dc70da019d6767529ebe217cd80dd01bf61a60bdce28c6213a75d902e54273dba02351682bd238a1b2429409ebeaac6957c08ed7d0f9d6fd0424f69a4ba038d6
+DIST pam_mktemp-1.1.1.tar.gz 6754 SHA256 66cf80c18439ca3456db96402f2eeac14b1a0503cc1d1be7f2b16d5f079f3f3d SHA512 e2e42115a1fe70c128397d842dc69f96863d721dfa886ebc21b5e8249333adc671d74213ecf1222d65417cd4747eb6114f515271fd7eac4376a2b7e28925996d WHIRLPOOL 3d59873ffad85de82c385a3d5f6c221a2fac061463bc85c176e401ba2456995b21448ba9b6518a876763753a654d880c5a4e723e123c5a5e10ecdf005cd0c7e4
+EBUILD pam_mktemp-1.1.1.ebuild 1382 SHA256 880c54b7b2f8277a61a8266142836f01deb6af43f704d6115548183c50eb4f8e SHA512 b6f1a754d58df55075e9d9521f816e832d3a48a15d4f09543c648f1e695dadd7cbcdda69aad18d03bd0d3c2db7bc73bfbee991f290c50ba1dcb6a0f75ff8c11b WHIRLPOOL f6e503ea4de9cc79e7f1a60983e7eb3f10bfae161529f2705cf4d2643fc0ff64242c5e5cb3b7a719fbd5574eced9e8dc76c38d31861c230de277bd36ae02f70e
+MISC ChangeLog 3561 SHA256 9b8e13bf1ad774aa471ca45e1c7b3739bae093ac4eae0651ceb3d836aa552af8 SHA512 03324dea8dc11a2a8ff2bdb388f8765044aaeeb4f79db85f2a3793ba16366dcfe48586d116ca9b239f0ea610aba42122672215578b0ffe37aadb6689d22bd7c3 WHIRLPOOL 2ba18cc1778b97ce891944a8d276b90156cb35f0ebb56df612b831820631a44836a1a49a1621b79f3063086e91fc9be313fd8dd5edc9d51ea3bd85e28eb617c3
+MISC metadata.xml 369 SHA256 ce32ad8230dfd3db48d3bdb99be63f5b4910e8828c01d048378aac8e36da09dc SHA512 441fac35c6e5793789615735323ef819d0bc461fab87625f5f1e6b7510425ede9e7f03a0d5ea6f4e9b7af0b9359e17f40ac41b98e2d242fba5bc2ad00861c8ea WHIRLPOOL 6a59d83b1403b759dd1445fa405b05bf1d78914232819364384e1611fc3f7227b76e0c5d28cc56ee99e4148203a7c11f6ad4b3597feb2e4cc05eb399aa2bf0ee
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAk+Zi+QACgkQvFcC4BYPU0rnSQCfWZekkOIsgfnN0vQrnm1D9NPu
-oEkAniVS4/LWJBixkBcv1R1KzVjD9wSS
-=AcM/
+iQEcBAEBCAAGBQJQMvMrAAoJEBzRPIrUMBNClxYH/jVe7t9f7/gXhAqEP5h+9OJM
+cWlQ6Q/QhSTnm5pQrZvIwdCjYz8dCsA23x6j1aV6ZYpTOuuPOye8mSbzUICS5eUl
+BcE4GBlio7+UiMq1aVyGHpaKzF3DaitH36ck8I7x5ihRZHH8s5HPTpCZ5lP9/Chj
+XSUn3Z4JjV1Y9WWS2u42c9IejaXMZuLqOcKUkPS8eV3EDjaq/Zs7VWfjYsf8a0bS
+xoMB7VmAibEMPCo7kg9yCmM5n9lz84YPnIrtsOg/w8TaDnBK0mLnAVXQeRdGYN3L
+yKhrl2WyHzPL3XQJ+HC1a8SEsytGtRQswT45mMVaRXD3kk8KaL3WWVyBXHjtLFE=
+=1EP7
 -----END PGP SIGNATURE-----
diff --git a/sys-auth/pam_mktemp/files/pam_mktemp-1.1.1-e2fsprogs-libs.patch b/sys-auth/pam_mktemp/files/pam_mktemp-1.1.1-e2fsprogs-libs.patch
new file mode 100644
index 000000000000..34e1a8591f77
--- /dev/null
+++ b/sys-auth/pam_mktemp/files/pam_mktemp-1.1.1-e2fsprogs-libs.patch
@@ -0,0 +1,49 @@
+Index: pam_mktemp-1.1.1/pam_mktemp.c
+===================================================================
+--- pam_mktemp-1.1.1.orig/pam_mktemp.c
++++ pam_mktemp-1.1.1/pam_mktemp.c
+@@ -55,7 +55,7 @@
+  */
+ # include <fcntl.h>
+ # include <sys/ioctl.h>
+-# include <ext2fs/ext2_fs.h>
++# include <linux/fs.h>
+ #else
+ # undef USE_APPEND_FL
+ #endif /* HAVE_APPEND_FL */
+@@ -88,7 +88,7 @@ static int ext2fs_chflags(const char *na
+ 	if ((fd = open(name, O_RDONLY)) < 0)
+ 		return -1;
+ 
+-	if (ioctl(fd, EXT2_IOC_GETFLAGS, &old_flags)) {
++	if (ioctl(fd, FS_IOC_GETFLAGS, &old_flags)) {
+ 		if ((errno == ENOTTY) /* Inappropriate ioctl for device */
+ 		    || (errno == ENOSYS)) /* Function not implemented */
+ 			errno = EOPNOTSUPP;
+@@ -98,7 +98,7 @@ static int ext2fs_chflags(const char *na
+ 
+ 	new_flags = (old_flags | set) & ~clear;
+ 	if (new_flags != old_flags)
+-		retval = ioctl(fd, EXT2_IOC_SETFLAGS, &new_flags);
++		retval = ioctl(fd, FS_IOC_SETFLAGS, &new_flags);
+ 
+ 	if (close(fd))
+ 		retval = -1;
+@@ -233,7 +233,7 @@ PAM_EXTERN int pam_sm_open_session(pam_h
+  */
+ 
+ #ifdef USE_APPEND_FL
+-	ext2fs_chflags(PRIVATE_PREFIX, EXT2_APPEND_FL, 0);
++	ext2fs_chflags(PRIVATE_PREFIX, FS_APPEND_FL, 0);
+ #endif /* USE_APPEND_FL */
+ 
+ 	userdir = malloc(strlen(PRIVATE_PREFIX) + strlen(user) + 2);
+@@ -260,7 +260,7 @@ PAM_EXTERN int pam_sm_open_session(pam_h
+ 	} else {
+ 		/* Don't let the append-only flag get inherited
+ 		 * from the parent directory. */
+-		if (ext2fs_chflags(userdir, 0, EXT2_APPEND_FL) &&
++		if (ext2fs_chflags(userdir, 0, FS_APPEND_FL) &&
+ 		    errno != EOPNOTSUPP)
+ 			goto out;
+ #endif /* HAVE_APPEND_FL */
diff --git a/sys-auth/pam_mktemp/pam_mktemp-1.0.3.ebuild b/sys-auth/pam_mktemp/pam_mktemp-1.0.3.ebuild
deleted file mode 100644
index 7ddbfb604e47..000000000000
--- a/sys-auth/pam_mktemp/pam_mktemp-1.0.3.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/pam_mktemp/pam_mktemp-1.0.3.ebuild,v 1.18 2011/04/30 20:28:32 ulm Exp $
-
-inherit toolchain-funcs pam
-
-DESCRIPTION="Create per-user private temporary directories during login"
-HOMEPAGE="http://www.openwall.com/pam/"
-SRC_URI="http://www.openwall.com/pam/modules/${PN}/${P}.tar.gz"
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux"
-IUSE=""
-
-DEPEND="virtual/pam"
-RDEPEND="${DEPEND}"
-
-src_compile() {
-	emake \
-		CC="$(tc-getCC)" \
-		CFLAGS="${CFLAGS} -fPIC" \
-		LDFLAGS="${LDFLAGS} --shared -Wl,--version-script,\$(MAP)" \
-		|| die "emake failed"
-}
-
-src_install() {
-	dopammod pam_mktemp.so
-	dodoc README
-}
-
-pkg_postinst() {
-	elog "To enable pam_mktemp put something like"
-	elog
-	elog "session    optional    pam_mktemp.so"
-	elog
-	elog "into /etc/pam.d/system-auth!"
-}
diff --git a/sys-auth/pam_mktemp/pam_mktemp-1.1.1.ebuild b/sys-auth/pam_mktemp/pam_mktemp-1.1.1.ebuild
index f394dbce289a..81c76b3525be 100644
--- a/sys-auth/pam_mktemp/pam_mktemp-1.1.1.ebuild
+++ b/sys-auth/pam_mktemp/pam_mktemp-1.1.1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/pam_mktemp/pam_mktemp-1.1.1.ebuild,v 1.10 2012/04/26 17:54:38 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/pam_mktemp/pam_mktemp-1.1.1.ebuild,v 1.11 2012/08/21 02:32:02 flameeyes Exp $
 
 EAPI="4"
 
-inherit toolchain-funcs pam
+inherit toolchain-funcs pam eutils
 
 DESCRIPTION="Create per-user private temporary directories during login"
 HOMEPAGE="http://www.openwall.com/pam/"
@@ -15,9 +15,14 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 m68k ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux"
 IUSE="selinux +prevent-removal"
 
-DEPEND="virtual/pam
+RDEPEND="virtual/pam
 	selinux? ( sys-libs/libselinux )"
-RDEPEND="${DEPEND}"
+DEPEND="${RDEPEND}
+	prevent-removal? ( sys-kernel/linux-headers )"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-e2fsprogs-libs.patch
+}
 
 src_compile() {
 	emake \