summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiego Elio Pettenò <flameeyes@gentoo.org>2012-08-21 02:32:02 +0000
committerDiego Elio Pettenò <flameeyes@gentoo.org>2012-08-21 02:32:02 +0000
commit197cf1c2427ac84311518930cc9bebd1f1c05449 (patch)
tree6ecbc53ad24d7e7a74cd05cbbfae39fb802ad8c9 /sys-auth/pam_mktemp
parentAdd patch from upstrem to fix build failure with gcc 4.7. #427490 (diff)
downloadgentoo-2-197cf1c2427ac84311518930cc9bebd1f1c05449.tar.gz
gentoo-2-197cf1c2427ac84311518930cc9bebd1f1c05449.tar.bz2
gentoo-2-197cf1c2427ac84311518930cc9bebd1f1c05449.zip
Remove old; fix building when e2fsprogs is not installed (by using linux-headers instead), closes bug #432128.
(Portage version: 2.2.0_alpha120/cvs/Linux x86_64)
Diffstat (limited to 'sys-auth/pam_mktemp')
-rw-r--r--sys-auth/pam_mktemp/ChangeLog9
-rw-r--r--sys-auth/pam_mktemp/files/pam_mktemp-1.1.1-e2fsprogs-libs.patch49
-rw-r--r--sys-auth/pam_mktemp/pam_mktemp-1.0.3.ebuild38
-rw-r--r--sys-auth/pam_mktemp/pam_mktemp-1.1.1.ebuild13
4 files changed, 65 insertions, 44 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/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 \