diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-02-28 12:05:35 +0100 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-02-28 12:05:35 +0100 |
| commit | 7cd4823a20b85a5e516ae51fc04a4d1b72b5d0b9 (patch) | |
| tree | 31c86c3a5284a8b8a7f1720d27ce9e5dbf09fee4 /community/ext3grep | |
| parent | d17a0ec458b03b0ed38eff13d399567f36156a73 (diff) | |
| parent | 1f567a9d58d16b76320168f0624aa55bd6320284 (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/cairo-clock/PKGBUILD
community/flashrom/PKGBUILD
community/kmess/PKGBUILD
core/tzdata/PKGBUILD
extra/gc/PKGBUILD
extra/libsigc++/PKGBUILD
extra/libxcomposite/PKGBUILD
extra/libxdmcp/PKGBUILD
extra/libxevie/PKGBUILD
extra/libxext/PKGBUILD
extra/libxinerama/PKGBUILD
extra/libxkbfile/PKGBUILD
extra/libxpm/PKGBUILD
extra/libxres/PKGBUILD
extra/libxss/PKGBUILD
extra/libxt/PKGBUILD
extra/libxtst/PKGBUILD
extra/libxv/PKGBUILD
extra/libxvmc/PKGBUILD
extra/llvm/PKGBUILD
extra/pdns-recursor/PKGBUILD
extra/pdns/PKGBUILD
extra/procmail/PKGBUILD
extra/ptlib/PKGBUILD
extra/pycrypto/PKGBUILD
extra/pyorbit/PKGBUILD
extra/vlc/PKGBUILD
extra/xfce4-battery-plugin/PKGBUILD
Diffstat (limited to 'community/ext3grep')
| -rw-r--r-- | community/ext3grep/PKGBUILD | 23 | ||||
| -rw-r--r-- | community/ext3grep/ext3grep-build.patch | 26 | ||||
| -rw-r--r-- | community/ext3grep/ext3grep.changelog | 7 |
3 files changed, 47 insertions, 9 deletions
diff --git a/community/ext3grep/PKGBUILD b/community/ext3grep/PKGBUILD index b44e3a01e..f7056634d 100644 --- a/community/ext3grep/PKGBUILD +++ b/community/ext3grep/PKGBUILD @@ -1,24 +1,33 @@ -# $Id: PKGBUILD 20288 2010-07-04 06:26:43Z jlichtblau $ +# $Id: PKGBUILD 66637 2012-02-26 16:26:55Z jlichtblau $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: ivh pkgname=ext3grep pkgver=0.10.2 -pkgrel=1 +pkgrel=2 pkgdesc="A tool to investigate an ext3 file system for deleted content and possibly recover it" arch=('i686' 'x86_64' 'mips64el') url="http://code.google.com/p/ext3grep/" license=('GPL') -depends=('gcc-libs') -makedepends=('e2fsprogs') +makedepends=('e2fsprogs' 'patch') changelog=$pkgname.changelog -source=(http://ext3grep.googlecode.com/files/$pkgname-$pkgver.tar.gz) -md5sums=('38e134734d6c8856370ed00a9c73dbee') +source=(http://ext3grep.googlecode.com/files/$pkgname-$pkgver.tar.gz \ + $pkgname-build.patch) +sha256sums=('586f3e939d2ffd782f6f006b81a3df2dc477c6da03f21edb8860c5c4f7198f3e' + '6f57d5012fcfb063012ade80b25c356defc2d22411bbb9086ea89c0de10f3117') build() { cd ${srcdir}/$pkgname-$pkgver +#http://code.google.com/p/ext3grep/issues/detail?id=34 + patch -Np1 -i ${srcdir}/$pkgname-build.patch + ./configure --prefix=/usr - make || return 1 + make +} + +package() { + cd ${srcdir}/$pkgname-$pkgver + make DESTDIR=${pkgdir} install } diff --git a/community/ext3grep/ext3grep-build.patch b/community/ext3grep/ext3grep-build.patch new file mode 100644 index 000000000..82af728bd --- /dev/null +++ b/community/ext3grep/ext3grep-build.patch @@ -0,0 +1,26 @@ +diff -ruN1 ext3grep-0.10.2-orig/src/ext3.h ext3grep-0.10.2/src/ext3.h +--- ext3grep-0.10.2-orig/src/ext3.h 2008-04-09 13:20:31.000000000 +0200 ++++ ext3grep-0.10.2/src/ext3.h 2012-02-26 17:05:42.000000000 +0100 +@@ -26,2 +26,13 @@ + ++// this trickery needs to happen before ext2_fs is included so ++// bail out if it has already been included by another path ++#ifdef _LINUX_EXT2_FS_H ++ #error please include this file before any other includes of ext2fs/ext2_fs.h ++#endif ++ ++// some versions of the ext2 headers call this s_frags_per_group and some ++// call it s_clusters_per_group, define one to the other so our code works ++// with both ++#define s_clusters_per_group s_frags_per_group ++ + // Use the header files from e2progs (http://e2fsprogs.sourceforge.net) +@@ -112,2 +123,8 @@ + __u16 gid_high(void) const { return i_gid_high; } ++#ifndef i_reseved2 ++ //i_reseved2 has been split into two fields in recent ++ //versions of the headers, luckilly we can still access ++ //it in one peice through the hurd side of the union ++ #define i_reserved2 osd2.hurd2.h_i_author ++#endif + __u32 reserved2(void) const { return i_reserved2; } diff --git a/community/ext3grep/ext3grep.changelog b/community/ext3grep/ext3grep.changelog index 60326bf7b..fb86cf94b 100644 --- a/community/ext3grep/ext3grep.changelog +++ b/community/ext3grep/ext3grep.changelog @@ -1,3 +1,6 @@ -2010-07-04 Jaroslav Lichtblau <tu@dragonlord.cz> +2012-02-26 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * ext3grep 0.10.2-2 package signed + +2010-07-04 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> * Package moved to [community] from AUR - 65 votes - * Version 0.10.2
\ No newline at end of file + * Version 0.10.2-1 |