Fixed compilation on newer kernels.

Package-Manager: portage-2.1.4.5

4 files changed, 46 insertions, 14 deletions

diff --git a/sys-cluster/drbd/ChangeLog b/sys-cluster/drbd/ChangeLog
index dfc4e5f85e69..075fa7ea6e5b 100644
--- a/sys-cluster/drbd/ChangeLog
+++ b/sys-cluster/drbd/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-cluster/drbd
 # Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/drbd/ChangeLog,v 1.95 2009/08/17 11:34:46 xmerlin Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/drbd/ChangeLog,v 1.96 2009/09/30 14:00:20 xmerlin Exp $
+
+  30 Sep 2009; Christian Zoffoli <xmerlin@gentoo.org>
+  +files/drbd-8.3.2-bitsperlong.h.patch, drbd-8.3.2.ebuild:
+  Fixed compilation on newer kernels.
 
 *drbd-8.3.2 (17 Aug 2009)
 
diff --git a/sys-cluster/drbd/Manifest b/sys-cluster/drbd/Manifest
index 6662927e04c1..ccd0acb7afbb 100644
--- a/sys-cluster/drbd/Manifest
+++ b/sys-cluster/drbd/Manifest
@@ -1,9 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX drbd-0.7.rc 1629 RMD160 ad1ea38cd85a1d1260164d24f890cc38317433a3 SHA1 14a5e94ff3e6c08411be4591b4627eb0d6a9ec7f SHA256 1d9d4fb35ef63a7c0517ed5e599b080f0f7e2b20ef8218c8c008d1acb1526734
 AUX drbd-8.0.8-missing-include.patch 310 RMD160 75934cabe504549d6ef3c9cf8b186dd800c7b718 SHA1 27eb329415257dc840757640c6cf82587d12b31c SHA256 1f8a6cbccb94292a50f75ab2643623d6bcb0e0bb811a828ab63df40bcf7ca2bf
 AUX drbd-8.0.rc 3067 RMD160 741017b59b33b435e3f02497a10edbb4addfdc42 SHA1 f7288a4e1d57738018b460f2c0c40890a9b47cd0 SHA256 53bf3a766c654b32d3dd1644ea377a4006f56095bec880f7c4d94ebe976d9b50
+AUX drbd-8.3.2-bitsperlong.h.patch 1181 RMD160 54b64d577538d19512b3c993bf1676a9fed79c93 SHA1 c44e9a6c01bbeb98875a6581ee74dd2c87022ec7 SHA256 f0b0a45228e15a6fad413ebf40c2da4e9d28fd05b1abcada3e093dc6fbf6b1de
 DIST drbd-0.7.24.tar.gz 292132 RMD160 3f8e5540e1040ec30926c1f7e114c56c499151e2 SHA1 b38846eb3cbb8aa356e3c28ebf4c4da6e971b06d SHA256 bdeec861bdab2b9a43eda2da743f3e7fd3974126d589f853ed2b22e1f27da5e4
 DIST drbd-0.7.25.tar.gz 287737 RMD160 992eaf67114d027f7f2891d35e96dc939e9f60a2 SHA1 9f507ffd41306409357e1eb4e6f73e3671acad28 SHA256 1ad7c91416026b70afc92bcbe64df16f685807f5608ff52ab52a5201935ccd6e
 DIST drbd-8.0.11.tar.gz 319026 RMD160 19c202a6b00862b4482f395fca1538763fcf65f8 SHA1 f1f3cffeac2896aa94e2d42773028ec540b0ec5f SHA256 5afb3d867be54ed833b7a1c7b149ae7ea93465aead7d2be68f0753bf4da7feac
@@ -25,13 +23,6 @@ EBUILD drbd-8.0.16.ebuild 1396 RMD160 22ab1c11355a53988cf3a2b878fd9fcbd2ded74e S
 EBUILD drbd-8.0.6-r1.ebuild 1408 RMD160 a6dd97bc879cb7a588d761b8dab6fb51c29a2b1f SHA1 8333e12d9cd9acb973d8adf41ed5b9a21ac4cfe0 SHA256 9c0909961f6209d6893a7ea7c4a65c393132c5c6fa55353401bc9eb420114d73
 EBUILD drbd-8.0.7.ebuild 1403 RMD160 d471e0c78f7c75381aa96e08c951522af74006f1 SHA1 dfafd76e1abb3cd7176a7f27a180367eb6c60056 SHA256 4816746768487cefac4a67eb868046318f39abd406767d24b54eafaf1e12ddc5
 EBUILD drbd-8.0.8.ebuild 1502 RMD160 08ec878a2a67f9ba420585117298ee80b81cbb89 SHA1 100ae30df0eaf003500379600a0f44835765a8c9 SHA256 7ce9298972b29c6f75e15d5815856331472612d3114794140b3f7743f60d6bb1
-EBUILD drbd-8.3.2.ebuild 1639 RMD160 954e8839f1f45dcfd73f4a6a39c27ff563524268 SHA1 4060c35b4c6e47ba364cbcdb5cdb1fa458b5d88d SHA256 01ff318807b4d16dda5db12f1ac6355425f615394110cc1a6e6478b784160ded
-MISC ChangeLog 15377 RMD160 762fbaf8c5a5fd60b071efafd9fc067e1deb186f SHA1 85081b3b4b044e51956cc8901f3e2fb41ccaf082 SHA256 04fb53a92d09ed1e4cfc57e96b822a3d5d32533f2747835a001f3a6cc84ff051
+EBUILD drbd-8.3.2.ebuild 1700 RMD160 00d3dc91a17f7166140705e1f3f1e9866b2d372c SHA1 f14de7cb0052bb2f3c5df6a9da8936db099dac7b SHA256 741f018b2b21de100328fd419a75cd1c29b30ba730477b2d12fb97dc3eac7fe1
+MISC ChangeLog 15530 RMD160 f29fd80a90d4b5e94a91e9d112de024912f4f922 SHA1 157becc5f8e0423973038c8c7f1519c0206fb646 SHA256 a5971ee9848b56e183ca6c5ba6fd19686979e18395e73b2f9433213f2deac591
 MISC metadata.xml 229 RMD160 4dcf17b88c5f4db2e817f473f3e8269b0bff2e6e SHA1 e6315be43241c55bdc0d12a42fa05632c5ff9b79 SHA256 49e13d2d49bef7298e3bb665ebeceeff9b0880fae5ff639cb8405993504f244f
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkqJW6kACgkQgMUyd/cdjWuCegCgjDQwFpeeyPkvaftX1Rro18oa
-XLoAn3sH4kCr+ogitTnAOcUMyNIGIdYH
-=gRBh
------END PGP SIGNATURE-----
diff --git a/sys-cluster/drbd/drbd-8.3.2.ebuild b/sys-cluster/drbd/drbd-8.3.2.ebuild
index 651317b99235..273290663128 100644
--- a/sys-cluster/drbd/drbd-8.3.2.ebuild
+++ b/sys-cluster/drbd/drbd-8.3.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-cluster/drbd/drbd-8.3.2.ebuild,v 1.1 2009/08/17 11:34:46 xmerlin Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/drbd/drbd-8.3.2.ebuild,v 1.2 2009/09/30 14:00:20 xmerlin Exp $
 
 inherit eutils versionator
 
@@ -24,6 +24,8 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 
+	epatch "${FILESDIR}"/drbd-8.3.2-bitsperlong.h.patch || die
+
 	# disable udev detect / installation
 	sed -i -e 's/install: install-most install-udev-rules/install: install-most/g' scripts/Makefile || die
 }
diff --git a/sys-cluster/drbd/files/drbd-8.3.2-bitsperlong.h.patch b/sys-cluster/drbd/files/drbd-8.3.2-bitsperlong.h.patch
new file mode 100644
index 000000000000..1a17b9b0f014
--- /dev/null
+++ b/sys-cluster/drbd/files/drbd-8.3.2-bitsperlong.h.patch
@@ -0,0 +1,35 @@
+From: Lars Ellenberg <lars.ellenberg@linbit.com>
+Date: Mon, 14 Sep 2009 11:33:26 +0000 (+0200)
+Subject: compat: remove special -I$(KDIR)/include for drbdsetup
+X-Git-Url: http://git.drbd.org/?p=drbd-8.3.git;a=commitdiff_plain;h=a6e36c389adb4485313191fd50405395fa3c1a74
+
+compat: remove special -I$(KDIR)/include for drbdsetup
+
+Finally get rid of that special case hack.
+---
+
+diff --git a/user/Makefile b/user/Makefile
+index 04cdcae..0143e09 100644
+--- a/user/Makefile
++++ b/user/Makefile
+@@ -22,8 +22,6 @@ KDIR := /lib/modules/$(shell uname -r)/build
+ CC = gcc
+ OPTFLAGS = -O1
+ CFLAGS = $(OPTFLAGS) -c -W -Wall -I../drbd
+-# for the netlink connector stuff <linux/connector.h>:
+-drbdsetup: CFLAGS += -I$(KDIR)/include
+ 
+ drbdadm-obj = drbdadm_scanner.o drbdadm_parser.o drbdadm_main.o \
+ 	      drbdadm_adjust.o drbdtool_common.o drbdadm_usage_cnt.o \
+diff --git a/user/drbdsetup.c b/user/drbdsetup.c
+index 4c3d132..d3b353d 100644
+--- a/user/drbdsetup.c
++++ b/user/drbdsetup.c
+@@ -46,6 +46,7 @@
+ #include <time.h>
+ 
+ #define __bitwise /* Build-workaround for broken RHEL4 kernels (2.6.9_78.0.1) */
++#include <linux/types.h>
+ #include <linux/netlink.h>
+ #include <linux/connector.h>
+