From 415856bdd4f48ab4f2732996f0bae58595092bbe Mon Sep 17 00:00:00 2001 From: Parabola Date: Tue, 5 Apr 2011 14:26:38 +0000 Subject: Tue Apr 5 14:26:38 UTC 2011 --- extra/gpart/PKGBUILD | 43 ++++++++++++++++++ extra/gpart/gpart-0.1h-PIC.patch | 20 +++++++++ extra/gpart/gpart-0.1h-errno.patch | 20 +++++++++ extra/gpart/gpart-0.1h-no-_syscall.patch | 15 +++++++ extra/gpart/gpart-0.1h-ntfs.patch | 75 ++++++++++++++++++++++++++++++++ extra/gpart/gpart-0.1h-vfat.patch | 17 ++++++++ 6 files changed, 190 insertions(+) create mode 100644 extra/gpart/PKGBUILD create mode 100644 extra/gpart/gpart-0.1h-PIC.patch create mode 100644 extra/gpart/gpart-0.1h-errno.patch create mode 100644 extra/gpart/gpart-0.1h-no-_syscall.patch create mode 100644 extra/gpart/gpart-0.1h-ntfs.patch create mode 100644 extra/gpart/gpart-0.1h-vfat.patch (limited to 'extra/gpart') diff --git a/extra/gpart/PKGBUILD b/extra/gpart/PKGBUILD new file mode 100644 index 000000000..8798449cd --- /dev/null +++ b/extra/gpart/PKGBUILD @@ -0,0 +1,43 @@ +# $Id: PKGBUILD 112735 2011-03-06 12:44:20Z giovanni $ +# Maintainer: Giovanni Scafora +# Contributor: dale +# Contributor: Tom Newsom + +pkgname=gpart +pkgver=0.1h +pkgrel=4 +pkgdesc="A program for recovering corrupt partition tables" +arch=('i686' 'x86_64') +url="http://www.stud.uni-hannover.de/user/76201/gpart/" +license=('GPL') +depends=('glibc') +source=(http://www.sfr-fresh.com/linux/misc/${pkgname}-${pkgver}.tar.gz + gpart-0.1h-errno.patch + gpart-0.1h-vfat.patch + gpart-0.1h-ntfs.patch + gpart-0.1h-PIC.patch + gpart-0.1h-no-_syscall.patch) +md5sums=('ee3a2d2dde70bcf404eb354b3d1ee6d4' + '81eee5d9985df9bf9c23624e46cf945f' + 'ae6d86b0268618d34e618824dcd82754' + '8161c02116ee4575906587eb09e35bde' + 'd3f5b05d12816375f5dcd9a251f72f61' + 'f811c6e132b2c0cd2d9cb0fd4933063a') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + patch -Np1 -i ${srcdir}/gpart-0.1h-errno.patch + patch -Np1 -i ${srcdir}/gpart-0.1h-vfat.patch + patch -Np1 -i ${srcdir}/gpart-0.1h-ntfs.patch + patch -Np1 -i ${srcdir}/gpart-0.1h-PIC.patch + patch -Np0 -i ${srcdir}/gpart-0.1h-no-_syscall.patch + + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + + make prefix=${pkgdir}/usr mandir=${pkgdir}/usr/share/man install +} diff --git a/extra/gpart/gpart-0.1h-PIC.patch b/extra/gpart/gpart-0.1h-PIC.patch new file mode 100644 index 000000000..e810bd999 --- /dev/null +++ b/extra/gpart/gpart-0.1h-PIC.patch @@ -0,0 +1,20 @@ +--- gpart-0.1h/src/l64seek.c ++++ gpart-0.1h/src/l64seek.c +@@ -26,7 +26,7 @@ + } ostck[OSTACKLEN]; + static int osptr = -1; + +-#if defined(__linux__) && defined(__i386__) ++#if defined(__linux__) && defined(__i386__) && ! defined(__PIC__) + _syscall5(int,_llseek,uint,fd,ulong,hi,ulong,lo,loff_t *,res,uint,wh) + #endif + +@@ -36,7 +36,7 @@ + { + off64_t ret = (off64_t)-1; + +-#if defined(__linux__) && defined(__i386__) ++#if defined(__linux__) && defined(__i386__) && ! defined(__PIC__) + int iret; + unsigned long ohi, olo; + diff --git a/extra/gpart/gpart-0.1h-errno.patch b/extra/gpart/gpart-0.1h-errno.patch new file mode 100644 index 000000000..13041c202 --- /dev/null +++ b/extra/gpart/gpart-0.1h-errno.patch @@ -0,0 +1,20 @@ +--- gpart-0.1h/src/l64seek.c ++++ gpart-0.1h-working/src/l64seek.c +@@ -16,6 +16,7 @@ + + #include "l64seek.h" + ++#include + + #define OSTACKLEN 16 + static struct +--- gpart-0.1h/src/disku.c ++++ gpart-0.1h-working/src/disku.c +@@ -20,6 +20,7 @@ + #include + #include + #include "gpart.h" ++#include + + #if defined(__linux__) + #include diff --git a/extra/gpart/gpart-0.1h-no-_syscall.patch b/extra/gpart/gpart-0.1h-no-_syscall.patch new file mode 100644 index 000000000..fe68d08b6 --- /dev/null +++ b/extra/gpart/gpart-0.1h-no-_syscall.patch @@ -0,0 +1,15 @@ +use syscall() rather than _syscall#() + +http://bugs.gentoo.org/163800 + +--- src/l64seek.c ++++ src/l64seek.c +@@ -27,7 +27,7 @@ + static int osptr = -1; + + #if defined(__linux__) && defined(__i386__) && ! defined(__PIC__) +-_syscall5(int,_llseek,uint,fd,ulong,hi,ulong,lo,loff_t *,res,uint,wh) ++#define _llseek(fd,hi,lo,res,wh) syscall(__NR__llseek,fd,hi,lo,res,wh) + #endif + + diff --git a/extra/gpart/gpart-0.1h-ntfs.patch b/extra/gpart/gpart-0.1h-ntfs.patch new file mode 100644 index 000000000..1f887ac47 --- /dev/null +++ b/extra/gpart/gpart-0.1h-ntfs.patch @@ -0,0 +1,75 @@ +Ripped out of debian + +--- gpart-0.1h.orig/src/gm_ntfs.h ++++ gpart-0.1h/src/gm_ntfs.h +@@ -14,6 +14,9 @@ + * + */ + ++#include ++#include ++ + #ifndef _GM_NTFS_H + #define _GM_NTFS_H + +@@ -29,32 +32,38 @@ + /* 'NTFS' in little endian */ + #define NTFS_SUPER_MAGIC 0x5346544E + +-#if defined(i386) || defined(__i386__) || defined(__alpha__) +- + /* unsigned integral types */ + #ifndef NTFS_INTEGRAL_TYPES + #define NTFS_INTEGRAL_TYPES +-typedef unsigned char ntfs_u8; +-typedef unsigned short ntfs_u16; +-typedef unsigned int ntfs_u32; +-typedef s64_t ntfs_u64; ++typedef uint8_t ntfs_u8; ++typedef uint16_t ntfs_u16; ++typedef uint32_t ntfs_u32; ++typedef uint64_t ntfs_u64; ++typedef int8_t ntfs_s8; ++typedef int16_t ntfs_s16; + #endif /* NTFS_INTEGRAL_TYPES */ +-#endif /* defined(i386) || defined(__i386__) || defined(__alpha__) */ +- +- +-/* Macros reading unsigned integers from a byte pointer */ +-/* these should work for all little endian machines */ +-#define NTFS_GETU8(p) (*(ntfs_u8*)(p)) +-#define NTFS_GETU16(p) (*(ntfs_u16*)(p)) +-#define NTFS_GETU24(p) (NTFS_GETU32(p) & 0xFFFFFF) +-#define NTFS_GETU32(p) (*(ntfs_u32*)(p)) +-#define NTFS_GETU64(p) (*(ntfs_u64*)(p)) +- +-/* Macros reading signed integers, returning int */ +-#define NTFS_GETS8(p) ((int)(*(char*)(p))) +-#define NTFS_GETS16(p) ((int)(*(short*)(p))) +-#define NTFS_GETS24(p) (NTFS_GETU24(p) < 0x800000 ? (int)NTFS_GETU24(p) : +- + ++#define CPU_TO_LE16(a) __cpu_to_le16(a) ++#define CPU_TO_LE32(a) __cpu_to_le32(a) ++#define CPU_TO_LE64(a) __cpu_to_le64(a) ++ ++#define LE16_TO_CPU(a) __cpu_to_le16(a) ++#define LE32_TO_CPU(a) __cpu_to_le32(a) ++#define LE64_TO_CPU(a) __cpu_to_le64(a) ++ ++/* Macros reading unsigned integers */ ++#define NTFS_GETU8(p) (*(ntfs_u8*)(p)) ++#define NTFS_GETU16(p) ((ntfs_u16)LE16_TO_CPU(*(ntfs_u16*)(p))) ++#define NTFS_GETU24(p) ((ntfs_u32)NTFS_GETU16(p) | \ ++ ((ntfs_u32)NTFS_GETU8(((char*)(p)) + 2) << 16)) ++#define NTFS_GETU32(p) ((ntfs_u32)LE32_TO_CPU(*(ntfs_u32*)(p))) ++#define NTFS_GETU64(p) ((ntfs_u64)LE64_TO_CPU(*(ntfs_u64*)(p))) ++ ++/* Macros reading signed integers */ ++#define NTFS_GETS8(p) ((*(ntfs_s8*)(p))) ++#define NTFS_GETS16(p) ((ntfs_s16)LE16_TO_CPU(*(short*)(p))) ++#define NTFS_GETS24(p) (NTFS_GETU24(p) < 0x800000 ? \ ++ (int)NTFS_GETU24(p) : \ ++ (int)(NTFS_GETU24(p) - 0x1000000)) + + #endif /* _GM_NTFS_H */ diff --git a/extra/gpart/gpart-0.1h-vfat.patch b/extra/gpart/gpart-0.1h-vfat.patch new file mode 100644 index 000000000..7234ac689 --- /dev/null +++ b/extra/gpart/gpart-0.1h-vfat.patch @@ -0,0 +1,17 @@ +Ripped out of debian + +--- gpart-0.1h.orig/src/gm_fat.h ++++ gpart-0.1h/src/gm_fat.h +@@ -60,6 +60,10 @@ + __u16 info_sector; /* filesystem info sector */ + __u16 backup_boot; /* backup boot sector */ + __u16 reserved2[6]; /* Unused */ +-}; +- ++} __attribute__ ((packed)); ++/* "__attribute__ ((packed))" ++ added by davidc@debian.org, ++ as suggested by falk@zxmjz18.extern.uni-tuebingen.de ++ Fri Jul 07 18:04:15 2000 ++ in debian bug report #66893 "FAT detection broken on Alpha" */ + #endif /* _GM_FAT_H */ -- cgit v1.2.3-54-g00ecf