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/extundelete | |
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/extundelete')
-rw-r--r-- | community/extundelete/PKGBUILD | 22 | ||||
-rw-r--r-- | community/extundelete/extundelete-build.patch | 22 | ||||
-rw-r--r-- | community/extundelete/extundelete.changelog | 7 |
3 files changed, 43 insertions, 8 deletions
diff --git a/community/extundelete/PKGBUILD b/community/extundelete/PKGBUILD index 9d28c5acb..be39273c9 100644 --- a/community/extundelete/PKGBUILD +++ b/community/extundelete/PKGBUILD @@ -1,23 +1,33 @@ -# $Id: PKGBUILD 20292 2010-07-04 06:40:48Z jlichtblau $ +# $Id: PKGBUILD 66632 2012-02-26 16:13:47Z jlichtblau $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: snuo pkgname=extundelete pkgver=0.2.0 -pkgrel=1 +pkgrel=2 pkgdesc="Utility for recovering deleted files from ext2, ext3 or ext4 partitions by parsing the journal" arch=('i686' 'x86_64' 'mips64el') url="http://extundelete.sourceforge.net" license=('GPL') makedepends=('e2fsprogs') changelog=$pkgname.changelog -source=(http://downloads.sourceforge.net/project/$pkgname/$pkgname/$pkgver/$pkgname-$pkgver.tar.bz2) -md5sums=('6dac74b12a747f133326ff7b81fceedd') +source=(http://downloads.sourceforge.net/project/$pkgname/$pkgname/$pkgver/$pkgname-$pkgver.tar.bz2 \ + $pkgname-build.patch) +sha256sums=('0f6a3004d8ddcafe63059a104c174f753c7fc95455081f3ff5aaf3b8c100f97b' + '6e59a025b98838f43146a9309f5c84b09ca8a314e90a6c9f68837d23ee4d9443') build() { cd ${srcdir}/$pkgname-$pkgver +#http://patch-tracker.debian.org/package/extundelete/0.2.0-2 + patch -Np1 -i ${srcdir}/$pkgname-build.patch + ./configure --prefix=/usr - make || return 1 + make +} + +package() { + cd ${srcdir}/$pkgname-$pkgver + make DESTDIR=${pkgdir} install -}
\ No newline at end of file +} diff --git a/community/extundelete/extundelete-build.patch b/community/extundelete/extundelete-build.patch new file mode 100644 index 000000000..f068dc31f --- /dev/null +++ b/community/extundelete/extundelete-build.patch @@ -0,0 +1,22 @@ +diff -ruN1 extundelete-0.2.0-orig/src/extundelete.cc extundelete-0.2.0/src/extundelete.cc +--- extundelete-0.2.0-orig/src/extundelete.cc 2010-05-16 03:51:15.000000000 +0200 ++++ extundelete-0.2.0/src/extundelete.cc 2012-02-26 16:49:20.000000000 +0100 +@@ -943,3 +943,3 @@ + { +- group_descriptor_table[n] = fs->group_desc[n]; ++ group_descriptor_table[n] = *ext2fs_group_desc(fs, fs->group_desc, n); + } +@@ -2613,3 +2613,4 @@ + inode->osd2.linux2.l_i_gid_high = le16_to_cpu( (uint16_t *) &inodebuf[item*60] ); +- inode->osd2.linux2.l_i_reserved2 = le32_to_cpu( (uint32_t *) &inodebuf[item*62] ); ++ inode->osd2.linux2.l_i_checksum_lo = le16_to_cpu( (uint16_t *) &inodebuf[item*62] ); ++ inode->osd2.linux2.l_i_reserved = le16_to_cpu( (uint16_t *) &inodebuf[item*63] ); + } +diff -ruN1 extundelete-0.2.0-orig/src/insertionops.cc extundelete-0.2.0/src/insertionops.cc +--- extundelete-0.2.0-orig/src/insertionops.cc 2010-03-21 07:05:15.000000000 +0100 ++++ extundelete-0.2.0/src/insertionops.cc 2012-02-26 16:49:27.000000000 +0100 +@@ -65,3 +65,3 @@ + os << "# Blocks per group: " << s_block->s_blocks_per_group << std::endl; +- os << "# Fragments per group: " << s_block->s_frags_per_group << std::endl; ++ os << "# Fragments per group: " << s_block->s_clusters_per_group << std::endl; + os << "# Inodes per group: " << s_block->s_inodes_per_group << std::endl; diff --git a/community/extundelete/extundelete.changelog b/community/extundelete/extundelete.changelog index 32a04346c..ff334face 100644 --- a/community/extundelete/extundelete.changelog +++ b/community/extundelete/extundelete.changelog @@ -1,3 +1,6 @@ -2010-07-04 Jaroslav Lichtblau <tu@dragonlord.cz> +2012-02-26 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * extundelete 0.2.0-2 package signed + +2010-07-04 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> * Package moved to [community] from AUR - 83 votes - * Version 0.2.0
\ No newline at end of file + * Version 0.2.0-1 |