[arch-commits] Commit in ext3grep/repos/community-x86_64 (7 files)
Antonio Rojas
arojas at archlinux.org
Mon Jun 4 22:16:32 UTC 2018
Date: Monday, June 4, 2018 @ 22:16:32
Author: arojas
Revision: 340470
archrelease: copy trunk to community-x86_64
Added:
ext3grep/repos/community-x86_64/PKGBUILD
(from rev 340469, ext3grep/trunk/PKGBUILD)
ext3grep/repos/community-x86_64/ext3grep-build.patch
(from rev 340469, ext3grep/trunk/ext3grep-build.patch)
ext3grep/repos/community-x86_64/ext3grep-e2fsprogs-1.44.1.patch
(from rev 340469, ext3grep/trunk/ext3grep-e2fsprogs-1.44.1.patch)
ext3grep/repos/community-x86_64/ext3grep.changelog
(from rev 340469, ext3grep/trunk/ext3grep.changelog)
Deleted:
ext3grep/repos/community-x86_64/PKGBUILD
ext3grep/repos/community-x86_64/ext3grep-build.patch
ext3grep/repos/community-x86_64/ext3grep.changelog
---------------------------------+
PKGBUILD | 73 ++++++++++++++++++++------------------
ext3grep-build.patch | 52 +++++++++++++--------------
ext3grep-e2fsprogs-1.44.1.patch | 12 ++++++
ext3grep.changelog | 18 ++++-----
4 files changed, 87 insertions(+), 68 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2018-06-04 22:16:08 UTC (rev 340469)
+++ PKGBUILD 2018-06-04 22:16:32 UTC (rev 340470)
@@ -1,33 +0,0 @@
-# $Id$
-# Maintainer: Jaroslav Lichtblau <svetlemodry at archlinux.org>
-# Contributor: ivh
-
-pkgname=ext3grep
-pkgver=0.10.2
-pkgrel=4
-pkgdesc="A tool to investigate an ext3 file system for deleted content and possibly recover it"
-arch=('i686' 'x86_64')
-url="https://code.google.com/archive/p/ext3grep/"
-license=('GPL')
-makedepends=('e2fsprogs' 'patch')
-changelog=$pkgname.changelog
-source=(https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/$pkgname/$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
-}
-
-package() {
- cd "${srcdir}"/$pkgname-$pkgver
-
- make DESTDIR="${pkgdir}" install
-}
Copied: ext3grep/repos/community-x86_64/PKGBUILD (from rev 340469, ext3grep/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2018-06-04 22:16:32 UTC (rev 340470)
@@ -0,0 +1,40 @@
+# $Id$
+# Maintainer: Jaroslav Lichtblau <svetlemodry at archlinux.org>
+# Contributor: ivh
+
+pkgname=ext3grep
+pkgver=0.10.2
+pkgrel=5
+pkgdesc="A tool to investigate an ext3 file system for deleted content and possibly recover it"
+arch=('x86_64')
+url="https://code.google.com/archive/p/ext3grep/"
+license=('GPL')
+makedepends=('e2fsprogs' 'patch')
+changelog=$pkgname.changelog
+source=(https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/$pkgname/$pkgname-$pkgver.tar.gz
+ $pkgname-build.patch ext3grep-e2fsprogs-1.44.1.patch)
+sha256sums=('586f3e939d2ffd782f6f006b81a3df2dc477c6da03f21edb8860c5c4f7198f3e'
+ '6f57d5012fcfb063012ade80b25c356defc2d22411bbb9086ea89c0de10f3117'
+ 'f85913a797ddca5ee63481e0982536cf7b0dc062f58f3dae1121113380c30a21')
+
+prepare() {
+ cd $pkgname-$pkgver
+
+#http://code.google.com/p/ext3grep/issues/detail?id=34
+ patch -Np1 -i ${srcdir}/$pkgname-build.patch
+
+ patch -p1 -i ../ext3grep-e2fsprogs-1.44.1.patch # Fix build with e2fsprogs 1.44.1
+}
+
+build() {
+ cd "${srcdir}"/$pkgname-$pkgver
+
+ ./configure --prefix=/usr
+ make
+}
+
+package() {
+ cd "${srcdir}"/$pkgname-$pkgver
+
+ make DESTDIR="${pkgdir}" install
+}
Deleted: ext3grep-build.patch
===================================================================
--- ext3grep-build.patch 2018-06-04 22:16:08 UTC (rev 340469)
+++ ext3grep-build.patch 2018-06-04 22:16:32 UTC (rev 340470)
@@ -1,26 +0,0 @@
-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; }
Copied: ext3grep/repos/community-x86_64/ext3grep-build.patch (from rev 340469, ext3grep/trunk/ext3grep-build.patch)
===================================================================
--- ext3grep-build.patch (rev 0)
+++ ext3grep-build.patch 2018-06-04 22:16:32 UTC (rev 340470)
@@ -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; }
Copied: ext3grep/repos/community-x86_64/ext3grep-e2fsprogs-1.44.1.patch (from rev 340469, ext3grep/trunk/ext3grep-e2fsprogs-1.44.1.patch)
===================================================================
--- ext3grep-e2fsprogs-1.44.1.patch (rev 0)
+++ ext3grep-e2fsprogs-1.44.1.patch 2018-06-04 22:16:32 UTC (rev 340470)
@@ -0,0 +1,12 @@
+diff -ru ext3grep-0.10.2.orig/src/ext3.h ext3grep-0.10.2/src/ext3.h
+--- ext3grep-0.10.2.orig/src/ext3.h 2018-06-04 22:13:06.563391984 +0000
++++ ext3grep-0.10.2/src/ext3.h 2018-06-04 22:13:44.486724597 +0000
+@@ -117,7 +117,7 @@
+ __u32 const* block(void) const { return i_block; }
+ __u32 generation(void) const { return i_generation; }
+ __u32 file_acl(void) const { return i_file_acl; }
+- __u32 dir_acl(void) const { return i_dir_acl; }
++ __u32 dir_acl(void) const { return i_size_high; }
+ __u32 faddr(void) const { return i_faddr; }
+ __u16 uid_high(void) const { return i_uid_high; }
+ __u16 gid_high(void) const { return i_gid_high; }
Deleted: ext3grep.changelog
===================================================================
--- ext3grep.changelog 2018-06-04 22:16:08 UTC (rev 340469)
+++ ext3grep.changelog 2018-06-04 22:16:32 UTC (rev 340470)
@@ -1,9 +0,0 @@
-2017-10-21 Jaroslav Lichtblau <dragonlord at aur.archlinux.org>
- * ext3grep 0.10.2-4 code.google.com retired, links changed
-
-2012-02-26 Jaroslav Lichtblau <dragonlord at aur.archlinux.org>
- * ext3grep 0.10.2-2 package signed
-
-2010-07-04 Jaroslav Lichtblau <dragonlord at aur.archlinux.org>
- * Package moved to [community] from AUR - 65 votes
- * Version 0.10.2-1
Copied: ext3grep/repos/community-x86_64/ext3grep.changelog (from rev 340469, ext3grep/trunk/ext3grep.changelog)
===================================================================
--- ext3grep.changelog (rev 0)
+++ ext3grep.changelog 2018-06-04 22:16:32 UTC (rev 340470)
@@ -0,0 +1,9 @@
+2017-10-21 Jaroslav Lichtblau <dragonlord at aur.archlinux.org>
+ * ext3grep 0.10.2-4 code.google.com retired, links changed
+
+2012-02-26 Jaroslav Lichtblau <dragonlord at aur.archlinux.org>
+ * ext3grep 0.10.2-2 package signed
+
+2010-07-04 Jaroslav Lichtblau <dragonlord at aur.archlinux.org>
+ * Package moved to [community] from AUR - 65 votes
+ * Version 0.10.2-1
More information about the arch-commits
mailing list