Add a patch to fix building with USE=selinux and glibc 2.16. Thanks to Anarchy for report and patch.

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

4 files changed, 47 insertions, 11 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/Manifest b/sys-libs/pam/Manifest
index 1087b8f63ee6..d15e85d1614f 100644
--- a/sys-libs/pam/Manifest
+++ b/sys-libs/pam/Manifest
@@ -2,23 +2,24 @@
 Hash: SHA256
 
 AUX Linux-PAM-1.1.5+glibc-2.16.patch 645 SHA256 a466a2db74a0fe304fb3bffe405b31e42b4e252611ebae32d785930b1c12be2a SHA512 a9c49301c39a45518ebe42ecfdd4bf099d699e7d02eaeb2c4d75c228e0ba59557b4b2d0d5a94751f6cc4811d8556d58d8ef69896e9ca285e10c07d5ee0cfe4f4 WHIRLPOOL 977c1b048640d54fe82a7ccbd995bfd4c4c74bf2df6162573f112f66fd84e0bb92dd51b6bbcd98768013f4d0811268e6d1b0085e43776163ebf600e56917cf2d
+AUX Linux-PAM-1.1.6+glibc-2.16.patch 824 SHA256 53f927050fd080f0d8b48dbf0993c5999c79f6eed22a292dec89169a87060b5e SHA512 9f49493fd66b9c244c990baed24d29cde3b4818951ab6d0e91fbf12b4980a07b8992cd600d338d5d0c8ba4e693fefb74cbaf93d1d15642b114c3c04ac26f2f49 WHIRLPOOL 1932c3ba42ef8e45e05f7dd066a20153168e1d976d16581d955a39eced5bacb0a3b04db807a9a8d1c55e59243a4cbdf3fcf7000942801355cf9ac0a8edc2399a
 AUX Linux-PAM-1.1.6-destdir.patch 1551 SHA256 21a6eb5d7a20b2f586a1747fc6a9819af356a6cbf205338a526a87d0b92a8f2e SHA512 be5c1b9c58f7727f9436d8d4876eae77e868ecc5c8acb1a29c808bf2ad479daeda5c42e576860165ac07af825298e438f7e36176ddfb43671c6a4d4841e08210 WHIRLPOOL 1e3f85d802f7b539891b73803d59b671ce42736a4a804dd5eabed046b1842ab986f3b634dccdd30e5520460e0db9d1aca0ece32075ad2ee08802cde78806d0a7
 DIST Linux-PAM-1.1.5-docs.tar.bz2 498228 SHA256 e4b10ffebe2e5cc355bd37c4e17a2288eb90d1396b06961738a7e7ef848c754c SHA512 6209b3d1936e0c0aef3a7bf24d497b867995261ad227f7d0c4b28796c0b1f9262c99e3e12d7e1d37e286af39367f6e2d79e06915dff77c65b547d62ee8772c5b WHIRLPOOL a26c778be99b21c6701260871ffd7348f7a302c5e4358b8419e9436131b83650bdf0f5bc1d845dba419bab6c50c89733bea4518f619b7b75d66b2f02408c3df1
 DIST Linux-PAM-1.1.5.tar.bz2 1123524 SHA256 65def4df04254dc4c5156859d36c34ad6d7afbcf3adbf2780530ebc4dbf2a116 SHA512 c898c3db3da1856b1b16c2bfe19963c30696345982253888c2edf85317cf82ab4daaf9d105a162975d4cfd818b7bbca3d0e63ea7267af435e8f88b8fdc83ddd0 WHIRLPOOL 29ad881f6b1d908fb84e8d5802cceff70838bd0e29f6c700ad64d3c5d43c189f0c122fdddfa4333f008a8ef2828bb0e2fd68cdd479b43efac9456b6d6a5bb25a
 DIST Linux-PAM-1.1.6-docs.tar.bz2 147359 SHA256 0244321b1c4b8a71064d984880566890cc809b1c77bdd0550f121fa7d8450497 SHA512 f158116c2a3d604a9195d96263f094a1c9c0e2ba78b54e0f8a92bfa73955d8cec36d68b985eb70f1bf0958fc54be5590b61669b3b777ba6bd2138bc156cec782 WHIRLPOOL 73b42d795b3ca06c3a22ea8a91258da9bd4662e72de8a72751eec3824524a44e13dbc13a7c0e79256429f583d21c2764512363921d5709e61752e391f8227577
 DIST Linux-PAM-1.1.6.tar.bz2 1147538 SHA256 bab887d6280f47fc3963df3b95735a27a16f0f663636163ddf3acab5f1149fc2 SHA512 f68e3a0d648441eef7589efe0fad65c621d030a9425635f461f2882a5129240830a55d5a5b81d02b439c633870a96f61b4c4dea22d0eacfdd583f4fac353928a WHIRLPOOL 619214ecf859e1fc4e6f59e37045e370b98bae57ceeaed3f6a5e0732fc0caba41c040bea926830b678f6e5c243d73a607daea438f55cf28d339ce458eded7db5
 EBUILD pam-1.1.5.ebuild 5784 SHA256 a003975168a13a6ddd06fe26ce33e0da007bcd26ca145786abd525abd9fe72e3 SHA512 647b6c5c9aad340fbbf32efc0988e5678cef8175297eb921ce36b097838aa1bd8cfef6f96157235ff0e9017f938b72429d741b01ea1692f7134f2871473d9fa3 WHIRLPOOL 7296e3adcb6e04eacc61b563a2f00f40b84f4f3f247b77acc3c79d4c87ae61513c20eca12d2b442d10dadda40963387343d87a54c03ce74a06c06a521d1b6f8b
-EBUILD pam-1.1.6.ebuild 5891 SHA256 fda25aec816a0bd0eded79d0f9797a7d22e7a3cc7a9201d9ad5c736e3a075bf1 SHA512 f53380c3e358d377589a87ce7a27de9fd4c595c9ecc61276efc98541b10a6dd6db3163bab959b62cfbb7de2916c936b489d6f7d3fc90151ba43eddfcdd66c9d4 WHIRLPOOL 679677a1879e832a00fc40d61af80ac540963efbdc01555936d41c9302c00b7d4eecffd45686aa6289c054a3cae0e0d6c5b1cfcc6c48d8ce8d85944b59a032d5
-MISC ChangeLog 50059 SHA256 e1b4504b260442029bd5c3f07774051b99124813da37c048fa8fd3e1db199a2b SHA512 7f972b48d4e7b5f12569dd4b2ebeebc7a560ddd9423abe6b27803d83c166674936a2c04db954a7e2f71dc5b871efb67ae9531de54e1a0ac449a914c2c2f4a4da WHIRLPOOL 1abf966fcf3464af870e4ea600ed06dcfbc70217ed4d98972ab40a45cc05ad4d73b0805c2afe90bbaf892af58d598ec30108734209c670f981eb6636de2c3230
+EBUILD pam-1.1.6.ebuild 5938 SHA256 e8c22f257fcb28bf3c1a71d9e282ec17fc16e60d875697fee64ed310730238d0 SHA512 ce6b722731bb8b1a28244c55f9e66b6d5537bd934d6eb4998578945b60f181d578a8f7cc7e573d2a15b390ee272ff3a153e0924618ccd74f09aedf2095ccb39e WHIRLPOOL c73957b6af05157189fd52f371b09b447805c6d7cf796cd85049b58a6e2a427f900e968c6e1a0a1eccc5d1e19ee62384dd612755247d7636c891638f47275cf4
+MISC ChangeLog 50282 SHA256 6701b075f563ea6819486fdc6d5c5685f038c1a698eafc4ec8f7667928b4e524 SHA512 dc026a5329296f75a898b51f796f0411802ac00e9e424a1a04f4693f2d9850ce4a808b2fd5c31fdac26fa825fe9a3e81654dbb2aebe8d7322879f64a8ab6b2f8 WHIRLPOOL 61eaac25ec44c313b74589fcba203c419f4176c157bb7680bf1ca0f5afd86fa9f8ca4fbbbc2f9d3a05514f03ddd2c67a351a9b77588d8661bb2b5b2061b05c55
 MISC metadata.xml 1129 SHA256 e160643aca26e0418b31429836ae1b4c673474cd6130b7e2ac0d0bf41380df0b SHA512 ad3fa4cbe664d992849c7ef17fbf49519289d1a8d2e568014ae5c08eec1030eb2d6874c5b6f877d311cb9f920c5f78b1199aa7d778ffbffea377a7f539281362 WHIRLPOOL 69d3406bd7f903292a3c84e806fe9ae5ee0e63473c4c7005449dba7af09e7d405209b66c25ef8369a53aaa92626bea8dc84ad1e34da1a717d6926ee9925e2c62
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQLlSeAAoJEBzRPIrUMBNCNMMH/RsEh8Kbw1X8ZAjiRC2SjqAy
-1DRjK74bKO9QXKefR9ZAhkoyOsunINdbqSahLEVU3gUl6AxghTXS9dcaS5PuDpvh
-d6mNlkNGbI9l+EYwqdV4pLxG4rVbjUX0bXvDsY22E+ZUwQW5hqDhycLnw1N7Gm0M
-PoJdz9dbpRLWsvRdtwyNfM1q0Il5RaVxmSAqbYHz9MGTPgYAgFgDFF40AXyiiPOm
-rh81SMv6Dl9hNyibghuVO2Vkjr34152CIYISvBio4dxp9WB8Q6Xwd+9o3SD8Rs4M
-hr3q1u5Un43R3yHsZjj8SUFz2559BHKO9/7cDsVoPz4U7npTVhO555bhhgHEhNA=
-=Rbbk
+iQEcBAEBCAAGBQJQcc+TAAoJEBzRPIrUMBNCozUH/ij7GcDdbbZOArQjLjHnM65l
+4rPQGF6nQqGNI8yGOGBxP80g7LjLOgnLbswaLu5jZcN7ygU3G9QjEeNVghyklP1h
+SRDugBXj/TElk1HM+DWiJFDI0CTRUSEcPsg/SVoTMCpI92akB5UQnItYxUH64OXT
+YD1RC3YQDhzEM7RBDTwzo6J6Y7RXeOTIgcdLvZLEg5CulpeLoK75vA/AV9ai5rOf
+XmWI1M1hg4URsLMCw6kjWKzDRSUHFD4RPWzPnun0r/SJ0y4A+WD/nx0nE3fzYkbK
+kk4iJ8UnuRKXFxvD5OVQdEGOVf4G6WLD1HDahZQTzstRaJvFOAW+MFyCK1w5qiA=
+=P/gg
 -----END PGP SIGNATURE-----
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