Fix from upstream for building with newer kernel headers #131483 by Markus Rothe.

Package-Manager: portage-2.1.2_pre1-r1

4 files changed, 69 insertions, 13 deletions

diff --git a/sys-fs/xfsprogs/ChangeLog b/sys-fs/xfsprogs/ChangeLog
index ef3ea47a3e22..0c15f4438dd2 100644
--- a/sys-fs/xfsprogs/ChangeLog
+++ b/sys-fs/xfsprogs/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-fs/xfsprogs
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/xfsprogs/ChangeLog,v 1.54 2006/09/26 16:52:33 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/xfsprogs/ChangeLog,v 1.55 2006/09/27 06:36:18 vapier Exp $
+
+  27 Sep 2006; Mike Frysinger <vapier@gentoo.org>
+  +files/xfsprogs-2.8.11-kern-types.patch, xfsprogs-2.8.11.ebuild:
+  Fix from upstream for building with newer kernel headers #131483 by Markus
+  Rothe.
 
 *xfsprogs-2.8.11 (26 Sep 2006)
 
diff --git a/sys-fs/xfsprogs/Manifest b/sys-fs/xfsprogs/Manifest
index ce5c69e014b8..9135b02c993c 100644
--- a/sys-fs/xfsprogs/Manifest
+++ b/sys-fs/xfsprogs/Manifest
@@ -9,6 +9,10 @@ AUX xfsprogs-2.7.11-no-compress-docs.patch 532 RMD160 26ed4d45fe9d964e09620d96dd
 MD5 889076a01be6f110a20417afcbbd831f files/xfsprogs-2.7.11-no-compress-docs.patch 532
 RMD160 26ed4d45fe9d964e09620d96dda22a740cc3e42a files/xfsprogs-2.7.11-no-compress-docs.patch 532
 SHA256 bbcde354b276b7f5bf7f4277c4a478a23cbdfc0e5a3c4b5116190fade584a772 files/xfsprogs-2.7.11-no-compress-docs.patch 532
+AUX xfsprogs-2.8.11-kern-types.patch 1352 RMD160 258863bc324833ad26939d3982b1038ffcb42492 SHA1 aed946e306ea705a39bd01ce4688d39e1ba64751 SHA256 e0d1bcc4fb8ce57b1fb4d6188964bf06457f22172705f3e70ce113b00bb95046
+MD5 dfa9fe25d343add7538accb8bc95e73b files/xfsprogs-2.8.11-kern-types.patch 1352
+RMD160 258863bc324833ad26939d3982b1038ffcb42492 files/xfsprogs-2.8.11-kern-types.patch 1352
+SHA256 e0d1bcc4fb8ce57b1fb4d6188964bf06457f22172705f3e70ce113b00bb95046 files/xfsprogs-2.8.11-kern-types.patch 1352
 DIST xfsprogs-2.7.11.src.tar.gz 878186 RMD160 e4c91513b9621a213727ec069359555e84dc16ce SHA1 c73f96dba7e60d4ec75f669c1a178946c21a3e60 SHA256 011740a254dedcaa7109c3337945a4b95296831ef1c98ec48f6eda6d268ed95f
 DIST xfsprogs-2.7.3.src.tar.gz 895400 RMD160 7a4f6b0d5da640041334cef4b4aa2e60ba43af53 SHA1 abfe3ea13475810a0ef854f48b9ca9912ee7fbc5 SHA256 12bb398036d780e3778d54c59d7f33368507f166b50f02a1f90b402327cf1aa3
 DIST xfsprogs_2.8.10-1.tar.gz 922425 RMD160 d21b06bf7beb711a53554f75a13331837d837ea1 SHA1 510e29f1e19db0eb29b16fa511798e9d696f465a SHA256 f2cfe23ae337aa3d51fd74ceb51b51947cebf8e608783ecc7e42eda547277709
@@ -25,14 +29,14 @@ EBUILD xfsprogs-2.8.10.ebuild 1733 RMD160 a156307fe55c776b79e66221c5109518f1f482
 MD5 15854ac8bfa5ff936d3d532542cf9e95 xfsprogs-2.8.10.ebuild 1733
 RMD160 a156307fe55c776b79e66221c5109518f1f482d6 xfsprogs-2.8.10.ebuild 1733
 SHA256 4515c60bc44c8c2acc9a32057372c6c4175268aa1f9fa138d09bee5fde98ca79 xfsprogs-2.8.10.ebuild 1733
-EBUILD xfsprogs-2.8.11.ebuild 1735 RMD160 7f40689cba0ebb2b284b0cb02d28e7a84e2105b4 SHA1 2bb0ed0934e5481d8c841f9dee0a68e8bab27bc8 SHA256 77b66303c3e41f775bed6aaed9650a5756099c6c4e8ef781a11bbeb6825e1af4
-MD5 7dd19b49d475d9eddc2779449d9d33ea xfsprogs-2.8.11.ebuild 1735
-RMD160 7f40689cba0ebb2b284b0cb02d28e7a84e2105b4 xfsprogs-2.8.11.ebuild 1735
-SHA256 77b66303c3e41f775bed6aaed9650a5756099c6c4e8ef781a11bbeb6825e1af4 xfsprogs-2.8.11.ebuild 1735
-MISC ChangeLog 10604 RMD160 0310630294d083e18c9ea34dbb37660fc991eabb SHA1 c6a44abefc4cca168f2351bb6c8c41e99d97cb62 SHA256 fa2deb2494d0468df015739ab9f1ab62845922f1d84f74159d85b57113c78175
-MD5 26edf7a9498b330a05882944d9400938 ChangeLog 10604
-RMD160 0310630294d083e18c9ea34dbb37660fc991eabb ChangeLog 10604
-SHA256 fa2deb2494d0468df015739ab9f1ab62845922f1d84f74159d85b57113c78175 ChangeLog 10604
+EBUILD xfsprogs-2.8.11.ebuild 1831 RMD160 fc6b81b310eaae5699a7374224520bd1ff267748 SHA1 30f287407e25d493a78c89da2da2be425093d9d9 SHA256 ec076b348626c35200badeb5ae569dd9432e10575a2fd9772acabd0f4bcf18e1
+MD5 5780fd2665ea7815586e3f305d79d23a xfsprogs-2.8.11.ebuild 1831
+RMD160 fc6b81b310eaae5699a7374224520bd1ff267748 xfsprogs-2.8.11.ebuild 1831
+SHA256 ec076b348626c35200badeb5ae569dd9432e10575a2fd9772acabd0f4bcf18e1 xfsprogs-2.8.11.ebuild 1831
+MISC ChangeLog 10806 RMD160 de64f954f395fda018a64e47826050c9ade6f1a0 SHA1 a682a519abe16a99957c80c07cc894d86f5ab6ce SHA256 a4cca6566b558373fe90ef90fd9514bf4a8c69066d9ae146ae1fdd7b85ac4560
+MD5 059ee672073e55b0676f803b31468d4e ChangeLog 10806
+RMD160 de64f954f395fda018a64e47826050c9ade6f1a0 ChangeLog 10806
+SHA256 a4cca6566b558373fe90ef90fd9514bf4a8c69066d9ae146ae1fdd7b85ac4560 ChangeLog 10806
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164
@@ -52,7 +56,7 @@ SHA256 1bd340061b5e86dc65702b15e672c296a2ae13c3fa44802bd6a5662e18ed9cdf files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFGVruWt/XSf2CZdkRAl7vAJ4tWqU7OGD0uDEFXyMfraGEYh7dtwCeKe0X
-/N+tRIdCrPdwo4fkd7T9tpk=
-=zq45
+iD8DBQFFGhv3amhnQswr0vIRAvmEAKCfa76MmsMxZy57JUQNJaJKUEGTUQCeNPbH
+4XloPWvrpaWLj9bw1q2/6OQ=
+=Ej5i
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/xfsprogs/files/xfsprogs-2.8.11-kern-types.patch b/sys-fs/xfsprogs/files/xfsprogs-2.8.11-kern-types.patch
new file mode 100644
index 000000000000..1f3992b76db9
--- /dev/null
+++ b/sys-fs/xfsprogs/files/xfsprogs-2.8.11-kern-types.patch
@@ -0,0 +1,44 @@
+http://bugs.gentoo.org/131483
+http://oss.sgi.com/bugzilla/show_bug.cgi?id=707
+
+===========================================================================
+Index: xfsprogs/configure.in
+===========================================================================
+
+--- a/xfsprogs/configure.in	2006-09-26 11:14:51.000000000 +1000
++++ b/xfsprogs/configure.in	2006-09-26 11:14:51.000000000 +1000
+@@ -57,6 +57,7 @@ AC_HAVE_GETMNTINFO
+ 
+ AC_TYPE_PSINT
+ AC_TYPE_PSUNSIGNED
++AC_CHECK_TYPES(__u32,,,[#include <asm/types.h>])
+ AC_SIZEOF_POINTERS_AND_LONG
+ AC_MANUAL_FORMAT
+ 
+
+===========================================================================
+Index: xfsprogs/include/platform_defs.h.in
+===========================================================================
+
+--- a/xfsprogs/include/platform_defs.h.in	2006-09-26 11:14:52.000000000 +1000
++++ b/xfsprogs/include/platform_defs.h.in	2006-09-26 11:14:52.000000000 +1000
+@@ -31,6 +31,10 @@
+ #include <unistd.h>
+ #include <sys/types.h>
+ 
++#undef HAVE___U32
++#ifdef HAVE___U32
++#include <asm/types.h>
++#else
+ typedef unsigned char		__u8;
+ typedef signed char		__s8;
+ typedef unsigned short		__u16;
+@@ -39,6 +43,7 @@ typedef unsigned int		__u32;
+ typedef signed int		__s32;
+ typedef unsigned long long int	__u64;
+ typedef signed long long int	__s64;
++#endif
+ 
+ typedef __u16			__be16;
+ typedef __u32			__be32;
+
diff --git a/sys-fs/xfsprogs/xfsprogs-2.8.11.ebuild b/sys-fs/xfsprogs/xfsprogs-2.8.11.ebuild
index 85d4012de30b..1275486be05d 100644
--- a/sys-fs/xfsprogs/xfsprogs-2.8.11.ebuild
+++ b/sys-fs/xfsprogs/xfsprogs-2.8.11.ebuild
@@ -1,7 +1,9 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/xfsprogs/xfsprogs-2.8.11.ebuild,v 1.1 2006/09/26 16:52:33 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/xfsprogs/xfsprogs-2.8.11.ebuild,v 1.2 2006/09/27 06:36:18 vapier Exp $
 
+WANT_AUTOCONF="latest"
+WANT_AUTOMAKE="latest"
 inherit flag-o-matic eutils autotools toolchain-funcs
 
 MY_P="${PN}_${PV}-1"
@@ -21,6 +23,7 @@ DEPEND="${RDEPEND}
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
+	epatch "${FILESDIR}"/${P}-kern-types.patch #131483
 	epatch "${FILESDIR}"/${PN}-2.7.11-no-compress-docs.patch #129486
 	# Inject our own CFLAGS / docpath
 	sed -i \