Grab some fixes from upstream to fix building on uClibc systems #256784.

Package-Manager: portage-2.2_rc23/cvs/Linux x86_64

5 files changed, 136 insertions, 4 deletions

diff --git a/sys-apps/shadow/ChangeLog b/sys-apps/shadow/ChangeLog
index 8386541cf79b..6651ad2137a3 100644
--- a/sys-apps/shadow/ChangeLog
+++ b/sys-apps/shadow/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-apps/shadow
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/ChangeLog,v 1.219 2009/02/02 19:35:06 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/ChangeLog,v 1.220 2009/02/11 03:39:39 vapier Exp $
+
+  11 Feb 2009; Mike Frysinger <vapier@gentoo.org>
+  +files/4.1.2.2/shadow-svn-2298.patch,
+  +files/4.1.2.2/shadow-svn-2364.patch, shadow-4.1.2.2.ebuild:
+  Grab some fixes from upstream to fix building on uClibc systems #256784.
 
   02 Feb 2009; Raúl Porcel <armin76@gentoo.org> shadow-4.1.2.2.ebuild:
   ia64 stable wrt #251320
diff --git a/sys-apps/shadow/Manifest b/sys-apps/shadow/Manifest
index ab81b53a06dc..e835fb102488 100644
--- a/sys-apps/shadow/Manifest
+++ b/sys-apps/shadow/Manifest
@@ -1,3 +1,8 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX 4.1.2.2/shadow-svn-2298.patch 1702 RMD160 0c9acfa0a9664e58012dfc86aea2b328aedcfc24 SHA1 aae2e1aa5b40269258f7bef890e93685bd7ff6b4 SHA256 a19dfd9a3f884930f7a1458e9e9767853d09949a9c04274762097ceddfd8129b
+AUX 4.1.2.2/shadow-svn-2364.patch 1944 RMD160 b70c637777ce46115fff0ce1796feff0b5d32e24 SHA1 861172fb52ccafe0e7c35cb740dbfae472a5b59d SHA256 32f1da89c135aaa03062e973b3f2281f560c1cc35663af739ae2b4c2dafc6277
 AUX default/useradd 96 RMD160 55c38953c800c6aae1ebe4312028560f77e7414f SHA1 348916abd4f794ee99310e1c006fbf00296ea2d7 SHA256 31aa2cbe4a34a9f7d4d134c1fecd007c9bbf4d40e19d0dcddbcd396f1853b490
 AUX login.defs 6254 RMD160 1daa093f13d56126833e6e97d6dd60498a68304a SHA1 0cb67ea901d9544f1bb6f8f147aa25bb2f50628e SHA256 b7bfd7b1c34ce3d35865b572abc69d278dea4eef4f349c26b238735547c4ac22
 AUX login.pamd 1019 RMD160 062e018d7c0e6c3b9963f695051322f762809edc SHA1 9d7d986a0e89efab8454c6528722e6e0d2ad5cb2 SHA256 4d1844dbfc9292ae82789c26767190b6ca2cad0f77a55fee86dbf292444762e0
@@ -42,6 +47,13 @@ EBUILD shadow-4.1.0.ebuild 4714 RMD160 d815b6327373a047eba8f9d00274c071f4443f70
 EBUILD shadow-4.1.1.ebuild 4569 RMD160 6148a7a986d1ff26414cc4b32cbed95ad06727d2 SHA1 650609e70f8a9b1025e37cc87361d996acd4d5c7 SHA256 1ab2f49316c43eaf632c2ff4cae54647b5c49383cc80cf2f219b7366195e4bdd
 EBUILD shadow-4.1.2-r1.ebuild 4517 RMD160 3dd0a823fbc4fee713d2403589939d320b454c73 SHA1 1dceb66f78f6b8ab95460e13ec981050654bcb1a SHA256 1c875201c210f7fa7871c863abec2eee61df2762181e53fe21c8bed243232705
 EBUILD shadow-4.1.2.1.ebuild 4522 RMD160 2729dccd4c8a50dca991873f1acb9dadda6ebf64 SHA1 717ba208c8ff2d7ecbb3633fb38980d0278214f4 SHA256 3309b638868d1cbdf73d680232678822763dc38b0b374859450cf17fc0f45652
-EBUILD shadow-4.1.2.2.ebuild 4508 RMD160 1dcfe6a12c3d0c9461c5cb8c2670beeb4f900674 SHA1 4862423edfe58d3e1fdb20a52e5cd478ee8349db SHA256 057d079b994ee5e012a13877cab73791873c54807056aa759f4c8c0e5628178f
-MISC ChangeLog 37688 RMD160 be4fb962faea02b6e1bd5281774943f2054dc29e SHA1 207f7de5b1872590f223b4af76e3d620fa7af2c3 SHA256 be191bea9ee348a3d4c748a444a39e1a9b48d2340fb2e20542cfc874f1b6a36c
+EBUILD shadow-4.1.2.2.ebuild 4544 RMD160 7995e966eb39b27c42b25ae13cd2a68e86749f5a SHA1 c4e8b1910332039f5899512171cc898035d8ed94 SHA256 f78f7132da4a589235c9b1d4deae78119cecb20b8fe5c0fa4088acbfb4f54bcd
+MISC ChangeLog 37916 RMD160 db5f3d9d1418ecdf0e6e79a1b5ba3a36bd9a6b5d SHA1 11a1e60ab7610198063ffa80e2d45480138b8f87 SHA256 550efff711bcc2d81ed5a431d5ed8bf623ae48d0f4c8be9e87133571c0e823f0
 MISC metadata.xml 412 RMD160 8cb1c2ffd3365f4334c78591e9349d394771dfed SHA1 e32195b6f24c7feae2ddfa3c9410a109c1e357f2 SHA256 41b211af54ade1542ce67559eeeb233c9fde4c97e66ef3602ae0f2dc228d7504
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkmSSIEACgkQn/5bYzqsSmG0iwCeLsfPNoD81i3O1W7EAu/o894g
+OgcAnj025oKVq8Fogn4szhqaG57aZq3w
+=XxTb
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/shadow/files/4.1.2.2/shadow-svn-2298.patch b/sys-apps/shadow/files/4.1.2.2/shadow-svn-2298.patch
new file mode 100644
index 000000000000..5489001cc1fa
--- /dev/null
+++ b/sys-apps/shadow/files/4.1.2.2/shadow-svn-2298.patch
@@ -0,0 +1,52 @@
+http://bugs.gentoo.org/256784
+
+From 6f74a20a3002280f23033dea64d7186896d0dfc0 Mon Sep 17 00:00:00 2001
+From: nekral-guest <nekral-guest@5a98b0ae-9ef6-0310-add3-de5d479b70d7>
+Date: Sat, 30 Aug 2008 18:31:21 +0000
+Subject: [PATCH] 	* configure.in: Check if the stat structure has a st_atim or
+ 	st_atimensec field.
+ 	* libmisc/copydir.c: Conditionally use the stat's st_atim and
+ 	st_atimensec fields.
+
+git-svn-id: svn://svn.debian.org/pkg-shadow/upstream/trunk@2298 5a98b0ae-9ef6-0310-add3-de5d479b70d7
+---
+ ChangeLog         |    4 ++++
+ libmisc/copydir.c |    9 +++++++--
+ 2 files changed, 11 insertions(+), 2 deletions(-)
+
++	* configure.in: Check if the stat structure has a st_atim or
++	st_atimensec field.
++	* libmisc/copydir.c: Conditionally use the stat's st_atim and
++	st_atimensec fields.
+
+diff --git a/libmisc/copydir.c b/libmisc/copydir.c
+index b887303..cdd2037 100644
+--- a/libmisc/copydir.c
++++ b/libmisc/copydir.c
+@@ -288,16 +288,21 @@ static int copy_entry (const char *src, const char *dst,
+ 	if (LSTAT (src, &sb) == -1) {
+ 		/* If we cannot stat the file, do not care. */
+ 	} else {
+-#if  defined(_BSD_SOURCE) || defined(_SVID_SOURCE)
++#ifdef	HAVE_STRUCT_STAT_ST_ATIM
+ 		mt[0].tv_sec  = sb.st_atim.tv_sec;
+ 		mt[0].tv_usec = sb.st_atim.tv_nsec / 1000;
+ 		mt[1].tv_sec  = sb.st_mtim.tv_sec;
+ 		mt[1].tv_usec = sb.st_mtim.tv_nsec / 1000;
+ #else
+ 		mt[0].tv_sec  = sb.st_atime;
+-		mt[0].tv_usec = sb.st_atimensec / 1000;
+ 		mt[1].tv_sec  = sb.st_mtime;
++#ifdef HAVE_STRUCT_STAT_ST_ATIMENSEC
++		mt[0].tv_usec = sb.st_atimensec / 1000;
+ 		mt[1].tv_usec = sb.st_mtimensec / 1000;
++#else
++		mt[0].tv_usec = 0;
++		mt[1].tv_usec = 0;
++#endif
+ #endif
+ 
+ 		if (S_ISDIR (sb.st_mode)) {
+-- 
+1.6.1.2
+
diff --git a/sys-apps/shadow/files/4.1.2.2/shadow-svn-2364.patch b/sys-apps/shadow/files/4.1.2.2/shadow-svn-2364.patch
new file mode 100644
index 000000000000..59333feb0be7
--- /dev/null
+++ b/sys-apps/shadow/files/4.1.2.2/shadow-svn-2364.patch
@@ -0,0 +1,61 @@
+http://bugs.gentoo.org/256784
+
+From 060292366348d55eb90b5c3f4f15768ffc7639d2 Mon Sep 17 00:00:00 2001
+From: nekral-guest <nekral-guest@5a98b0ae-9ef6-0310-add3-de5d479b70d7>
+Date: Sun, 7 Sep 2008 00:05:38 +0000
+Subject: [PATCH] 	* libmisc/copydir.c, configure.in: Check for the presence of
+ 	st_mtim and st_mtimensec, as for st_atim and st_atimensec.
+
+git-svn-id: svn://svn.debian.org/pkg-shadow/upstream/trunk@2364 5a98b0ae-9ef6-0310-add3-de5d479b70d7
+---
+ ChangeLog         |    5 +++++
+ configure.in      |    2 ++
+ libmisc/copydir.c |   17 ++++++++++++-----
+ 3 files changed, 19 insertions(+), 5 deletions(-)
+
++2008-09-07  Nicolas François  <nicolas.francois@centraliens.net>
++
++	* libmisc/copydir.c, configure.in: Check for the presence of
++	st_mtim and st_mtimensec, as for st_atim and st_atimensec.
+
+/* configure.in changes are in the 4.1.2.2 configure.in ... */
+ 
+diff --git a/libmisc/copydir.c b/libmisc/copydir.c
+index cdd2037..a9aec98 100644
+--- a/libmisc/copydir.c
++++ b/libmisc/copydir.c
+@@ -288,19 +288,26 @@ static int copy_entry (const char *src, const char *dst,
+ 	if (LSTAT (src, &sb) == -1) {
+ 		/* If we cannot stat the file, do not care. */
+ 	} else {
+-#ifdef	HAVE_STRUCT_STAT_ST_ATIM
++#ifdef HAVE_STRUCT_STAT_ST_ATIM
+ 		mt[0].tv_sec  = sb.st_atim.tv_sec;
+ 		mt[0].tv_usec = sb.st_atim.tv_nsec / 1000;
+-		mt[1].tv_sec  = sb.st_mtim.tv_sec;
+-		mt[1].tv_usec = sb.st_mtim.tv_nsec / 1000;
+ #else
+ 		mt[0].tv_sec  = sb.st_atime;
+-		mt[1].tv_sec  = sb.st_mtime;
+ #ifdef HAVE_STRUCT_STAT_ST_ATIMENSEC
+ 		mt[0].tv_usec = sb.st_atimensec / 1000;
+-		mt[1].tv_usec = sb.st_mtimensec / 1000;
+ #else
+ 		mt[0].tv_usec = 0;
++#endif
++#endif
++
++#ifdef HAVE_STRUCT_STAT_ST_MTIM
++		mt[1].tv_sec  = sb.st_mtim.tv_sec;
++		mt[1].tv_usec = sb.st_mtim.tv_nsec / 1000;
++#else
++		mt[1].tv_sec  = sb.st_mtime;
++#ifdef HAVE_STRUCT_STAT_ST_MTIMENSEC
++		mt[1].tv_usec = sb.st_mtimensec / 1000;
++#else
+ 		mt[1].tv_usec = 0;
+ #endif
+ #endif
+-- 
+1.6.1.2
+
diff --git a/sys-apps/shadow/shadow-4.1.2.2.ebuild b/sys-apps/shadow/shadow-4.1.2.2.ebuild
index bde47be9826c..d283d7adebb0 100644
--- a/sys-apps/shadow/shadow-4.1.2.2.ebuild
+++ b/sys-apps/shadow/shadow-4.1.2.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/shadow-4.1.2.2.ebuild,v 1.12 2009/02/02 19:35:06 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/shadow-4.1.2.2.ebuild,v 1.13 2009/02/11 03:39:39 vapier Exp $
 
 inherit eutils libtool toolchain-funcs autotools pam multilib
 
@@ -30,6 +30,8 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 
+	epatch "${FILESDIR}"/${PV}/*.patch
+
 	# tweak the default login.defs
 	epatch "${FILESDIR}"/${PN}-4.0.17-login.defs.patch
 	sed -i "s:@LIBDIR@:$(get_libdir):" etc/login.defs || die