Update the lseek patch to fix mkraid issues on amd64 #93694 by Radek "rush" Senfeld.

Package-Manager: portage-2.0.51.22-r1

5 files changed, 75 insertions, 5 deletions

diff --git a/sys-fs/raidtools/ChangeLog b/sys-fs/raidtools/ChangeLog
index 08e6053d27fa..54d8a41b9b3e 100644
--- a/sys-fs/raidtools/ChangeLog
+++ b/sys-fs/raidtools/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-fs/raidtools
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/raidtools/ChangeLog,v 1.20 2005/05/19 22:16:16 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/raidtools/ChangeLog,v 1.21 2005/05/28 21:36:14 vapier Exp $
+
+*raidtools-1.00.3-r6 (28 May 2005)
+
+  28 May 2005; Mike Frysinger <vapier@gentoo.org>
+  files/raidtools-1.00.3-PIC.patch, +raidtools-1.00.3-r6.ebuild:
+  Update the lseek patch to fix mkraid issues on amd64 #93694 by Radek "rush"
+  Senfeld.
 
 *raidtools-1.00.3-r5 (19 May 2005)
 
diff --git a/sys-fs/raidtools/Manifest b/sys-fs/raidtools/Manifest
index c0b0b2a034a5..8b33710df8bc 100644
--- a/sys-fs/raidtools/Manifest
+++ b/sys-fs/raidtools/Manifest
@@ -1,7 +1,8 @@
-MD5 fbed3db97387bad4540ee834b61d7e6f ChangeLog 5314
+MD5 e28f646063dfa5986006c9f36f4e76a4 ChangeLog 5555
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 MD5 e5925e14a9189114c4aac437b92ed49a raidtools-1.00.3-r5.ebuild 1689
 MD5 dd0b355eb26c0915dea409062a9d8fc3 raidtools-1.00.3-r4.ebuild 1760
+MD5 68cf8d2f2bbc05e54d66eefa562d28e3 raidtools-1.00.3-r6.ebuild 1689
 MD5 0fa91a341c38be56295db45f2a73aade files/raidtools-1.00.3-gcc33.patch 3044
 MD5 effa29906fa5b9b7755ac3f16442c07f files/raidtools-1.00.3-raidstop.patch 2921
 MD5 435ff32ca3b1b4451c986fe8f68fa819 files/raidtools-1.00.3-2.6.Headers.patch 1511
@@ -9,7 +10,8 @@ MD5 1ed9388ea5a0f44ceea181fc7ffa2552 files/raidtools-1.00.3-s390x.patch 1515
 MD5 5ff54c0c871ac497487c3bfaeffd09cb files/raidtools.cron 555
 MD5 0e634a08f8e4be8ff116a2c419d91ecb files/raid-start.sh 1394
 MD5 402cd2a18b3b385d4af9458ba862607b files/raidtools-1.00.3-mkraid.patch 578
-MD5 ff1baef0dbbc5cd525aa9c13014242ea files/raidtools-1.00.3-PIC.patch 726
+MD5 709b59b7f6b66ab6515513ef420d0d07 files/raidtools-1.00.3-PIC.patch 954
+MD5 54b6277ec8d8f24e23ece051ea2e8680 files/digest-raidtools-1.00.3-r6 68
 MD5 6d940ee820e10c9e01a1fe6f25424740 files/raidtools-1.00.3-quiet-raidstart.patch 1824
 MD5 54b6277ec8d8f24e23ece051ea2e8680 files/digest-raidtools-1.00.3-r5 68
 MD5 54b6277ec8d8f24e23ece051ea2e8680 files/digest-raidtools-1.00.3-r4 68
diff --git a/sys-fs/raidtools/files/digest-raidtools-1.00.3-r6 b/sys-fs/raidtools/files/digest-raidtools-1.00.3-r6
new file mode 100644
index 000000000000..8b9f5451a2c5
--- /dev/null
+++ b/sys-fs/raidtools/files/digest-raidtools-1.00.3-r6
@@ -0,0 +1 @@
+MD5 cb41f8093cd7381ee07adb2951cc53fa raidtools-1.00.3.tar.gz 167779
diff --git a/sys-fs/raidtools/files/raidtools-1.00.3-PIC.patch b/sys-fs/raidtools/files/raidtools-1.00.3-PIC.patch
index 756ff21a4049..65518a2836f9 100644
--- a/sys-fs/raidtools/files/raidtools-1.00.3-PIC.patch
+++ b/sys-fs/raidtools/files/raidtools-1.00.3-PIC.patch
@@ -1,5 +1,10 @@
 Fix building with -fPIC
 http://bugs.gentoo.org/show_bug.cgi?id=34712
+(note: this is outdated since we fixed the PIC issues in our linux-headers 
+ebuilds when doing syscall()'s on x86)
+
+Fix running on amd64
+http://bugs.gentoo.org/show_bug.cgi?id=93694
 
 --- raidtools-1.00.3/raid_io.c
 +++ raidtools-1.00.3/raid_io.c
@@ -8,7 +13,7 @@ http://bugs.gentoo.org/show_bug.cgi?id=34712
  #undef F
  
 -#if !(defined(__alpha__) || defined(__sparc_v9__) || defined(__ia64__))
-+#if !(defined(__alpha__) || defined(__sparc_v9__) || defined(__ia64__) || defined(__PIC__))
++#if !(defined(__alpha__) || defined(__sparc_v9__) || defined(__ia64__) || defined(__x86_64__) || defined(__PIC__))
  # ifndef __NR__llseek
  #  ifdef __sparc__
  #   define __NR__llseek		236
@@ -17,7 +22,7 @@ http://bugs.gentoo.org/show_bug.cgi?id=34712
  	int retval;
  
 -#if defined(__alpha__) || defined(__sparc_v9__) || defined(__ia64__)
-+#if defined(__alpha__) || defined(__sparc_v9__) || defined(__ia64__) || defined(__PIC__)
++#if defined(__alpha__) || defined(__sparc_v9__) || defined(__ia64__) || defined(__x86_64__) || defined(__PIC__)
  	return lseek(fd, offset, SEEK_SET);
  #else
  	retval = _llseek (fd, ((unsigned long long) offset) >> 32,
diff --git a/sys-fs/raidtools/raidtools-1.00.3-r6.ebuild b/sys-fs/raidtools/raidtools-1.00.3-r6.ebuild
new file mode 100644
index 000000000000..9fdfec12088e
--- /dev/null
+++ b/sys-fs/raidtools/raidtools-1.00.3-r6.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/raidtools/raidtools-1.00.3-r6.ebuild,v 1.1 2005/05/28 21:36:14 vapier Exp $
+
+inherit flag-o-matic eutils
+
+DESCRIPTION="Linux RAID 0/1/4/5 utilities"
+HOMEPAGE="http://people.redhat.com/mingo/raidtools/"
+SRC_URI="http://people.redhat.com/mingo/raidtools/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
+IUSE=""
+
+# We link statically with popt so that libpopt can
+# live in /usr but keep critical raid binaries in /
+DEPEND="dev-libs/popt"
+RDEPEND=""
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-gcc33.patch
+	epatch "${FILESDIR}"/${P}-2.6.Headers.patch
+	epatch "${FILESDIR}"/${P}-mkraid.patch
+	epatch "${FILESDIR}"/${P}-s390x.patch
+	epatch "${FILESDIR}"/${P}-raidstop.patch
+	epatch "${FILESDIR}"/${P}-PIC.patch
+	epatch "${FILESDIR}"/${P}-quiet-raidstart.patch
+
+	# Buffer overflow fix
+	sed -i -e "/define MAX_LINE_LENGTH/s:100:1000:" common.h
+	# Don't create device nodes (pisses off selinux) #73928
+	sed -i \
+		-e '/^CFLAGS/s:-O2:@CFLAGS@:' \
+		-e "s:mknod:echo mknod means MonKey NOD:" \
+		Makefile.in || die "sed Makefile.in failed"
+}
+
+src_install() {
+	make install ROOTDIR="${D}" || die
+	insinto /$(get_libdir)/rcscripts/addons
+	doins "${FILESDIR}"/raid-start.sh || die "addon failed"
+
+	exeinto /etc/cron.daily
+	newexe "${FILESDIR}"/raidtools.cron raidtools
+
+	doman *.8 *.5
+	dodoc README *raidtab raidreconf-HOWTO reconf.notes retry summary \
+		Software-RAID.HOWTO/Software-RAID.HOWTO.txt
+	dohtml Software-RAID.HOWTO/Software-RAID.HOWTO.html
+	docinto config
+	dodoc *.sample
+}