summaryrefslogtreecommitdiff
path: root/sys-fs
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2006-02-15 00:18:56 +0000
committerMike Frysinger <vapier@gentoo.org>2006-02-15 00:18:56 +0000
commit18a8a3b86915e5eb9d46bd74f1a654a34e2bde2b (patch)
treea67c443cc9c10a737318006075a5103ced80a761 /sys-fs
parentAdded ~amd64 keyword. (diff)
downloadgentoo-2-18a8a3b86915e5eb9d46bd74f1a654a34e2bde2b.tar.gz
gentoo-2-18a8a3b86915e5eb9d46bd74f1a654a34e2bde2b.tar.bz2
gentoo-2-18a8a3b86915e5eb9d46bd74f1a654a34e2bde2b.zip
Add patch from upstream to fix BLKGETSIZE64 error #122787 by Sean Davidson.
(Portage version: 2.1_pre4-r1)
Diffstat (limited to 'sys-fs')
-rw-r--r--sys-fs/ext2resize/ChangeLog6
-rw-r--r--sys-fs/ext2resize/ext2resize-1.1.19.ebuild3
-rw-r--r--sys-fs/ext2resize/files/ext2resize-1.1.19-blkgetsize64.patch18
3 files changed, 25 insertions, 2 deletions
diff --git a/sys-fs/ext2resize/ChangeLog b/sys-fs/ext2resize/ChangeLog
index 9ee2c76586ca..1ee02ec2c109 100644
--- a/sys-fs/ext2resize/ChangeLog
+++ b/sys-fs/ext2resize/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sys-fs/ext2resize
# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/ext2resize/ChangeLog,v 1.15 2006/02/08 06:26:44 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/ext2resize/ChangeLog,v 1.16 2006/02/15 00:18:56 vapier Exp $
+
+ 15 Feb 2006; Mike Frysinger <vapier@gentoo.org>
+ +files/ext2resize-1.1.19-blkgetsize64.patch, ext2resize-1.1.19.ebuild:
+ Add patch from upstream to fix BLKGETSIZE64 error #122787 by Sean Davidson.
08 Feb 2006; Mike Frysinger <vapier@gentoo.org>
+files/ext2resize-1.1.19-build.patch, ext2resize-1.1.19.ebuild:
diff --git a/sys-fs/ext2resize/ext2resize-1.1.19.ebuild b/sys-fs/ext2resize/ext2resize-1.1.19.ebuild
index 711281e41090..c934568c1722 100644
--- a/sys-fs/ext2resize/ext2resize-1.1.19.ebuild
+++ b/sys-fs/ext2resize/ext2resize-1.1.19.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/ext2resize/ext2resize-1.1.19.ebuild,v 1.9 2006/02/08 06:26:44 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/ext2resize/ext2resize-1.1.19.ebuild,v 1.10 2006/02/15 00:18:56 vapier Exp $
inherit flag-o-matic eutils autotools
@@ -24,6 +24,7 @@ src_unpack() {
sed -i '/^CFLAGS/d' src/Makefile.in
epatch "${FILESDIR}"/${P}-build.patch
+ epatch "${FILESDIR}"/${P}-blkgetsize64.patch #122787
eautoreconf || die
}
diff --git a/sys-fs/ext2resize/files/ext2resize-1.1.19-blkgetsize64.patch b/sys-fs/ext2resize/files/ext2resize-1.1.19-blkgetsize64.patch
new file mode 100644
index 000000000000..fde74e5318e6
--- /dev/null
+++ b/sys-fs/ext2resize/files/ext2resize-1.1.19-blkgetsize64.patch
@@ -0,0 +1,18 @@
+http://bugs.gentoo.org/122787
+
+===================================================================
+RCS file: /cvsroot/ext2resize/ext2resize/src/ext2_unix_io.c,v
+retrieving revision 1.15
+retrieving revision 1.17
+diff -u -r1.15 -r1.17
+--- ext2resize/ext2resize/src/ext2_unix_io.c 2004/09/30 14:04:04 1.15
++++ ext2resize/ext2resize/src/ext2_unix_io.c 2005/12/18 10:39:45 1.17
+@@ -47,7 +47,7 @@
+ #endif
+
+ #ifndef BLKGETSIZE64
+-#define BLKGETSIZE64 _IOR(0x12,114,sizeof(unsigned long long))
++#define BLKGETSIZE64 _IOR(0x12,114,size_t)
+ #endif
+
+ struct my_cookie