Apply amd64 patches. Fixes bug #293955

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

5 files changed, 131 insertions, 3 deletions

diff --git a/sys-block/gpart/ChangeLog b/sys-block/gpart/ChangeLog
index 20dbf0785416..a61e3bb07a9c 100644
--- a/sys-block/gpart/ChangeLog
+++ b/sys-block/gpart/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-block/gpart
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/gpart/ChangeLog,v 1.5 2007/03/03 05:34:51 vapier Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-block/gpart/ChangeLog,v 1.6 2009/12/19 11:46:13 hwoarang Exp $
+
+*gpart-0.1h-r2 (19 Dec 2009)
+
+  19 Dec 2009; <hwoarang@gentoo.org> +gpart-0.1h-r2.ebuild,
+  +files/gpart-0.1h-l64seek.patch, +files/gpart-0.1h-openmode.patch:
+  Apply amd64 patches. Thanks to Fabio Rossi <rossi.f@inwind.it>. Fixes bug
+  #293955
 
   03 Mar 2007; Mike Frysinger <vapier@gentoo.org>
   +files/gpart-0.1h-no-_syscall.patch, gpart-0.1h-r1.ebuild:
diff --git a/sys-block/gpart/Manifest b/sys-block/gpart/Manifest
index 10f73081290b..e81e61121056 100644
--- a/sys-block/gpart/Manifest
+++ b/sys-block/gpart/Manifest
@@ -1,10 +1,13 @@
 AUX gpart-0.1h-PIC.patch 523 RMD160 1118f353dd90b36d4352104a486f7ef049af5acb SHA1 6261a9737fbf547a249cd217b8e4edbd75ba17f8 SHA256 b3dccfa6ce89fe9c4b8c3071ca2c9a995c5b2c3d3e6e090f79cf36e003a596e7
 AUX gpart-0.1h-errno.patch 384 RMD160 5ed7a9dd0382aad1eb998509faef8d6795efbfb1 SHA1 5495cd8520ebc7e8681760bc799bf0f2c0f98e85 SHA256 fe910231e5cf8640d8b07b2767219f0a3794a57f3b18d3af49d3980ca96058f5
+AUX gpart-0.1h-l64seek.patch 1352 RMD160 f9ce606373f21ac91a4eb80d52aa500a96d60cbe SHA1 440d756c5bcbdcadd6f82fbdc97587ff6793ffcd SHA256 d8f7bef414e079fc49d74d38c5537e3e8a3588fd71d84be0ac265efcc78b45b5
 AUX gpart-0.1h-no-_syscall.patch 373 RMD160 7eca6b4d2f004a1e667bfdc25e74b87d51c8529d SHA1 9442f29c06c02762a510e4d3550e9633691b447d SHA256 4f8bd601119bec32fe108487c120bd623b2de1e606047125516bc537d3014725
 AUX gpart-0.1h-ntfs.patch 2430 RMD160 bd6888a82f0e8c8663cc336b48f2f0e67307aea2 SHA1 f7a887558abb8e244de3e5bd0566e407cff21368 SHA256 01617b0fdb729232073d808efb137bc33790c3d071b7d945ce1ac8e0f697761b
+AUX gpart-0.1h-openmode.patch 404 RMD160 4cb8931f8f899f5066e2ed0a48cdf0c99acda7fa SHA1 df20dc3f40f497af30e3d6d0f89788a783c5b93c SHA256 a90c2b7663c828dae8ab35de4f91eee01148d602297a1c52223573e0d481ff00
 AUX gpart-0.1h-vfat.patch 515 RMD160 c992bebc62017de118fe61eee0655ba01bdc7b57 SHA1 ba31fcba223e39d9f94d4db629992b8f792b22b0 SHA256 39d542bb6ee52008b08fd161b051dc08658d363076df56a1b054b5403ceb4661
 DIST gpart-0.1h-reiserfs-3.6.patch.gz 3658 RMD160 b049e0ba9d6e1c54877c54ac0d1f12f9f7d235e2 SHA1 4b1042bf0dcf570d2e7ed6bd34f5116879bca7b0 SHA256 769f5587853cb7d9c3ba4d0496bbb57d42d04ad561a42d24bcbe5f4723849a3c
 DIST gpart-0.1h.tar.gz 52352 RMD160 1cdfb1779801ee8755b05975ced24441a3a2b639 SHA1 23f66162e1d85977ea43bfe6b5e5bff0ad2d566e SHA256 b9fdb064efabf5d63d7db6f07605c2fca3d011ecfa05ab3723dd98b9bde3a2ff
 EBUILD gpart-0.1h-r1.ebuild 1004 RMD160 fce85edea33d59acf499036cc642877b5154f301 SHA1 cf3ea9cbfafc9d4389b715c8607d4f366f344a58 SHA256 8f3e49d677c391f382aa7519dde8986079980e0c9e8a20d1cbf7ca67b3fc7b18
-MISC ChangeLog 1583 RMD160 1626247ee97d1d9dfb5ff7ae066780a8260c0099 SHA1 0607949ddb6caea4ae6ae00cf96cfb3255c2df9b SHA256 d66ba4ba7949edb461322b5d1d65b7fc362eb52a5102cd291e77637bae9ca110
+EBUILD gpart-0.1h-r2.ebuild 1059 RMD160 377a80694defbc29272030020086f45b12209e3c SHA1 28572de42a5e7a8c619701b89b88f81790e802df SHA256 0c3c4b2d05b48acae7aecaac8f202cab489036867a96f3b031577569762c3cfc
+MISC ChangeLog 1831 RMD160 ed27d60f51485f5d0c37dd0f2bd864c81c3858d9 SHA1 623202ca92510aa421a5116cbfa778364f18c5a9 SHA256 c66ec97f50443b1f52778ebc98dc1f831d19433f07dab27cc971964ea53960d7
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
diff --git a/sys-block/gpart/files/gpart-0.1h-l64seek.patch b/sys-block/gpart/files/gpart-0.1h-l64seek.patch
new file mode 100644
index 000000000000..8a14411a5ccc
--- /dev/null
+++ b/sys-block/gpart/files/gpart-0.1h-l64seek.patch
@@ -0,0 +1,71 @@
+--- gpart-0.1h.orig/src/l64seek.c
++++ gpart-0.1h/src/l64seek.c
+@@ -25,30 +25,11 @@
+ } ostck[OSTACKLEN];
+ static int		osptr = -1;
+ 
+-#if defined(__linux__) && defined(__i386__)
+-_syscall5(int,_llseek,uint,fd,ulong,hi,ulong,lo,loff_t *,res,uint,wh)
+-#endif
+-
+-
+-
+ off64_t l64seek(int fd,off64_t offset,int whence)
+ {
+ 	off64_t		ret = (off64_t)-1;
+ 
+-#if defined(__linux__) && defined(__i386__)
+-	int		iret;
+-	unsigned long	ohi, olo;
+-
+-	ohi = (unsigned long)((offset >> 32) & 0xFFFFFFFF);
+-	olo = (unsigned long)(offset & 0xFFFFFFFF);
+-	iret = _llseek(fd,ohi,olo,&ret,whence);
+-	if (iret == -1)
+-		ret = (off64_t)-1;
+-#endif
+-
+-#if defined(__FreeBSD__) || (defined(__linux__) && defined(__alpha__))
+ 	ret = lseek(fd,offset,whence);
+-#endif
+ 
+ 	return (ret);
+ }
+--- gpart-0.1h.orig/src/l64seek.h
++++ gpart-0.1h/src/l64seek.h
+@@ -17,6 +17,8 @@
+ #ifndef _L64SEEK_H
+ #define _L64SEEK_H
+ 
++#include <sys/stat.h>
++#include <sys/types.h>
+ #include <unistd.h>
+ 
+ /*
+@@ -25,19 +27,7 @@
+  * offsets.
+  */
+ 
+-
+-#if defined(__linux__)
+-#	include <linux/unistd.h>
+-#	include <sys/types.h>
+-	typedef int64_t off64_t;
+-#endif
+-
+-
+-#if defined(__FreeBSD__)
+-	typedef off_t off64_t;
+-#endif
+-
+-
++typedef loff_t off64_t;
+ typedef off64_t s64_t;
+ 
+ off64_t l64seek(int fd, off64_t offset, int whence);
+@@ -45,5 +35,4 @@
+ int l64opush(int);
+ s64_t l64opop(int);
+ 
+-
+ #endif
diff --git a/sys-block/gpart/files/gpart-0.1h-openmode.patch b/sys-block/gpart/files/gpart-0.1h-openmode.patch
new file mode 100644
index 000000000000..ca13cc9420e6
--- /dev/null
+++ b/sys-block/gpart/files/gpart-0.1h-openmode.patch
@@ -0,0 +1,11 @@
+--- gpart.orig/src/gpart.c	2008-10-19 15:06:06.000000000 +0000
++++ gpart/src/gpart.c	2008-11-25 07:34:47.000000000 +0000
+@@ -1221,7 +1221,7 @@ static int make_mbr_backup(disk_desc *d,
+ {
+ 	int		fd, ret = 0;
+ 
+-	if ((fd = open(bfile,O_WRONLY|O_CREAT)) < 0)
++	if ((fd = open(bfile,O_WRONLY|O_CREAT, S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH)) < 0)
+ 		return (ret);
+ 
+ 	if (write(fd,d->d_pt.t_boot,512) == 512)
diff --git a/sys-block/gpart/gpart-0.1h-r2.ebuild b/sys-block/gpart/gpart-0.1h-r2.ebuild
new file mode 100644
index 000000000000..8aa2ec799462
--- /dev/null
+++ b/sys-block/gpart/gpart-0.1h-r2.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-block/gpart/gpart-0.1h-r2.ebuild,v 1.1 2009/12/19 11:46:13 hwoarang Exp $
+
+inherit eutils
+
+DESCRIPTION="Partition table rescue/guessing tool"
+HOMEPAGE="http://www.stud.uni-hannover.de/user/76201/gpart/"
+SRC_URI="http://www.stud.uni-hannover.de/user/76201/gpart/${P}.tar.gz
+	ftp://ftp.namesys.com/pub/misc-patches/gpart-0.1h-reiserfs-3.6.patch.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~x86"
+IUSE=""
+
+RDEPEND=""
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-errno.patch
+	epatch "${FILESDIR}"/${P}-vfat.patch
+	epatch "${FILESDIR}"/${P}-ntfs.patch
+	epatch "${WORKDIR}"/gpart-0.1h-reiserfs-3.6.patch
+	epatch "${FILESDIR}"/${P}-l64seek.patch
+	epatch "${FILESDIR}"/${P}-openmode.patch
+	sed -i -e "/^CFLAGS/s: -O2 : ${CFLAGS} :" make.defs
+	sed -i -e "/^LDFLAGS/s:=:=${LDFLAGS} :" make.defs
+}
+
+src_install() {
+	dobin src/gpart || die
+	doman man/gpart.8
+	dodoc README Changes INSTALL LSM
+}