summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiego Elio Pettenò <flameeyes@gentoo.org>2012-10-07 18:52:57 +0000
committerDiego Elio Pettenò <flameeyes@gentoo.org>2012-10-07 18:52:57 +0000
commitf8b3f06ba5c191408a6591254fa1c74e86a3eebf (patch)
treeb37a82b7615f70bcd7f1166560e5842dea645c44 /sys-libs/pam
parentbump, fixed bug #414251; thx to Martin Dummer (diff)
downloadgentoo-2-f8b3f06ba5c191408a6591254fa1c74e86a3eebf.tar.gz
gentoo-2-f8b3f06ba5c191408a6591254fa1c74e86a3eebf.tar.bz2
gentoo-2-f8b3f06ba5c191408a6591254fa1c74e86a3eebf.zip
Add a patch to fix building with USE=selinux and glibc 2.16. Thanks to Anarchy for report and patch.
(Portage version: 2.2.0_alpha134/cvs/Linux x86_64)
Diffstat (limited to 'sys-libs/pam')
-rw-r--r--sys-libs/pam/ChangeLog7
-rw-r--r--sys-libs/pam/files/Linux-PAM-1.1.6+glibc-2.16.patch29
-rw-r--r--sys-libs/pam/pam-1.1.6.ebuild3
3 files changed, 37 insertions, 2 deletions
diff --git a/sys-libs/pam/ChangeLog b/sys-libs/pam/ChangeLog
index 7d69629aaf65..b7ac55b362cd 100644
--- a/sys-libs/pam/ChangeLog
+++ b/sys-libs/pam/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for sys-libs/pam
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/pam/ChangeLog,v 1.313 2012/08/17 14:26:10 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/pam/ChangeLog,v 1.314 2012/10/07 18:52:57 flameeyes Exp $
+
+ 07 Oct 2012; Diego E. Pettenò <flameeyes@gentoo.org>
+ +files/Linux-PAM-1.1.6+glibc-2.16.patch, pam-1.1.6.ebuild:
+ Add a patch to fix building with USE=selinux and glibc 2.16. Thanks to Anarchy
+ for report and patch.
17 Aug 2012; Diego E. Pettenò <flameeyes@gentoo.org>
+files/Linux-PAM-1.1.6-destdir.patch, pam-1.1.6.ebuild:
diff --git a/sys-libs/pam/files/Linux-PAM-1.1.6+glibc-2.16.patch b/sys-libs/pam/files/Linux-PAM-1.1.6+glibc-2.16.patch
new file mode 100644
index 000000000000..cddda35fbeb9
--- /dev/null
+++ b/sys-libs/pam/files/Linux-PAM-1.1.6+glibc-2.16.patch
@@ -0,0 +1,29 @@
+From 18da0c4763f5e079f8b2df45fa462b0b70b6fd3a Mon Sep 17 00:00:00 2001
+From: "Jory A. Pratt" <anarchy@gentoo.org>
+Date: Sun, 7 Oct 2012 11:44:17 -0700
+Subject: [PATCH] Fix building with GLIBC 2.16 and SELinux.
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+
+Signed-off-by: Diego Elio Pettenò <flameeyes@flameeyes.eu>
+---
+ modules/pam_unix/pam_unix_passwd.c | 1 +
+ 1 file modificato, 1 inserzione(+)
+
+diff --git a/modules/pam_unix/pam_unix_passwd.c b/modules/pam_unix/pam_unix_passwd.c
+index 9e1302d..b5f5ae9 100644
+--- a/modules/pam_unix/pam_unix_passwd.c
++++ b/modules/pam_unix/pam_unix_passwd.c
+@@ -46,6 +46,7 @@
+ #include <unistd.h>
+ #include <errno.h>
+ #include <sys/types.h>
++#include <sys/resource.h>
+ #include <pwd.h>
+ #include <syslog.h>
+ #include <shadow.h>
+--
+1.7.12
+
diff --git a/sys-libs/pam/pam-1.1.6.ebuild b/sys-libs/pam/pam-1.1.6.ebuild
index 390f946d1296..429a03c1d85a 100644
--- a/sys-libs/pam/pam-1.1.6.ebuild
+++ b/sys-libs/pam/pam-1.1.6.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/pam/pam-1.1.6.ebuild,v 1.2 2012/08/17 14:26:10 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/pam/pam-1.1.6.ebuild,v 1.3 2012/10/07 18:52:57 flameeyes Exp $
EAPI=4
@@ -86,6 +86,7 @@ pkg_pretend() {
src_prepare() {
epatch "${FILESDIR}"/${MY_P}-destdir.patch
+ epatch "${FILESDIR}"/${MY_P}+glibc-2.16.patch
eautoreconf
elibtoolize