Add patch to build with glibc 2.8, fixes bug #225623.

Package-Manager: portage-2.1.5.5

4 files changed, 52 insertions, 5 deletions

diff --git a/sys-apps/mtree/ChangeLog b/sys-apps/mtree/ChangeLog
index 05a508992727..aa2ef5a5e6f8 100644
--- a/sys-apps/mtree/ChangeLog
+++ b/sys-apps/mtree/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-apps/mtree
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/mtree/ChangeLog,v 1.11 2008/01/27 16:52:11 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/mtree/ChangeLog,v 1.12 2008/06/14 08:57:54 flameeyes Exp $
+
+  14 Jun 2008; Diego Pettenò <flameeyes@gentoo.org>
+  +files/mtree-2007.4+glibc-2.8.patch, mtree-2007.4.ebuild:
+  Add patch to build with glibc 2.8, fixes bug #225623.
 
   27 Jan 2008; Mike Frysinger <vapier@gentoo.org> mtree-2007.4.ebuild:
   Add workaround for parallel build failure in libnbcompat with nbtypes.h.
diff --git a/sys-apps/mtree/Manifest b/sys-apps/mtree/Manifest
index 212778089c43..d19bd6a8ee46 100644
--- a/sys-apps/mtree/Manifest
+++ b/sys-apps/mtree/Manifest
@@ -1,7 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX mtree-1.5-gcc4.patch 1417 RMD160 314f940d6072b1cb559660199fb7a4ad91d04aa8 SHA1 9248e06676c4b65eadf151b6e49520d79c2c61c6 SHA256 66d9b65ee3841c1467f3dd5525eac6e608a8d52a786f9f2668f5e8847618f085
+AUX mtree-2007.4+glibc-2.8.patch 727 RMD160 f8f4f3f761244715622c629a4671aa03a6b19695 SHA1 e0a749d005e7963127b4f52f9457a0087edc19eb SHA256 ab0ed6fe31390c9013c5fa1458c1a2fcaaabd37cbdbc676c7a27800ca6004059
 DIST bootstrap-pkgsrc.tar.gz 1193805 RMD160 94d6604e51bbded5a31db7950d4d460ddfaefc47 SHA1 52864525e4d7114195b5b30793d3772e3e289b9c SHA256 23c803ece9ac0a98f408bd693f17ed9de95b4adee1655b2074680eef421c15a5
 DIST pkgsrc-2007Q4.tar.bz2 19165770 RMD160 5b5682c44c80138967b03d59a60913b72cb31159 SHA1 82b99af750cdf61c1fda6d7c86db594b344aca08 SHA256 23bf97b835da49c3ea3732c5600a3b35ba1828f30bd4c97377b1d214a8d62652
 EBUILD mtree-1.5.ebuild 835 RMD160 ae86a118bd1d9e7b39d30a181c1d0f43aac75ce5 SHA1 45c55d0d7d808c5fec1a5d7201ba1d3c14307739 SHA256 65002fed44ad69b715273e3272b1ca9d3518fcac3a560f849a3a111eaddd67b0
-EBUILD mtree-2007.4.ebuild 1031 RMD160 46d655e604a29fdb125213ee90e644a81e72bfc3 SHA1 0c5f3b07fd52f5f19e8a58dd40631cb30a43d34b SHA256 29998707e2e6c471efcbf3799bc1a8d758da78ea43e434ef46eecc4028637744
-MISC ChangeLog 1296 RMD160 d28fe55fbf5c209e3e622fd96efd6bfcaca5b209 SHA1 7ac514487d93716e372e7fb35b6c432165996465 SHA256 d64a1d2f34f8dadba6e682bcf87aa42fac4d9e9fc589438e9c826ba607a8a4f7
+EBUILD mtree-2007.4.ebuild 1127 RMD160 5efc3742d0852d54d7cc336b628c6d0ac4d139b1 SHA1 dff482f0dce1a7561fa509a51d49f17bc2afc82e SHA256 fed3c208d2d7efa11573403f8fc78e4de1cbc05189ef9c28daa4a44405c589ed
+MISC ChangeLog 1469 RMD160 12f66869920cd7bb7f4e5ca584f00fcaa553064e SHA1 0dbc675eeaa35466cd51ce931e3df89b5f52932a SHA256 a5daa20e55ba78990817346cfa90d548624e184240fc721d2fe557e4b85f238a
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkhTiBsACgkQAiZjviIA2XhWbgCg4egsiGj9BjPsg0cb8Y+AkXog
+/kEAoK01W5nFfmUysYZMoPcNcjVdn6OM
+=nulU
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/mtree/files/mtree-2007.4+glibc-2.8.patch b/sys-apps/mtree/files/mtree-2007.4+glibc-2.8.patch
new file mode 100644
index 000000000000..998715766f65
--- /dev/null
+++ b/sys-apps/mtree/files/mtree-2007.4+glibc-2.8.patch
@@ -0,0 +1,25 @@
+Index: pkgsrc/pkgtools/libnbcompat/files/nbcompat/limits.h
+===================================================================
+--- pkgsrc.orig/pkgtools/libnbcompat/files/nbcompat/limits.h
++++ pkgsrc/pkgtools/libnbcompat/files/nbcompat/limits.h
+@@ -43,6 +43,11 @@
+ # include <limits.h>
+ #endif
+ 
++/* Needed for glibc 2.8 */
++#ifdef HAVE_SYS_PARAM_H
++# include <sys/param.h>
++#endif
++
+ /*
+  * Declare functions and macros that may be missing in <limits.h>.
+  */
+@@ -77,4 +82,8 @@
+ # define UID_MAX	2147483647U  /* max value for a uid_t (2^31-2) */
+ #endif
+ 
++#if !defined(ARG_MAX) && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 8) )
++# define ARG_MAX sysconf(_SC_ARG_MAX)
++#endif
++
+ #endif	/* !_NBCOMPAT_LIMITS_H_ */
diff --git a/sys-apps/mtree/mtree-2007.4.ebuild b/sys-apps/mtree/mtree-2007.4.ebuild
index c62e552aded7..5b78cc51c9ce 100644
--- a/sys-apps/mtree/mtree-2007.4.ebuild
+++ b/sys-apps/mtree/mtree-2007.4.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/mtree/mtree-2007.4.ebuild,v 1.2 2008/01/27 16:52:11 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/mtree/mtree-2007.4.ebuild,v 1.3 2008/06/14 08:57:54 flameeyes Exp $
 
-inherit flag-o-matic
+inherit flag-o-matic eutils
 
 MY_PV=${PV/./Q}
 DESCRIPTION="check the permissions of a file system against a spec file"
@@ -16,6 +16,13 @@ IUSE=""
 
 S=${WORKDIR}/pkgsrc/pkgtools
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}/${P}+glibc-2.8.patch"
+}
+
 src_compile() {
 	cd "${S}"/libnbcompat/files
 	econf || die "econf libnbcompat failed"