Hello community,

here is the log from the commit of package ext3grep for openSUSE:Factory 
checked in at 2012-09-17 16:55:59
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/ext3grep (Old)
 and      /work/SRC/openSUSE:Factory/.ext3grep.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "ext3grep", Maintainer is ""

Changes:
--------
New Changes file:

--- /dev/null   2012-08-23 02:41:28.555381587 +0200
+++ /work/SRC/openSUSE:Factory/.ext3grep.new/ext3grep.changes   2012-09-17 
16:56:00.000000000 +0200
@@ -0,0 +1,29 @@
+-------------------------------------------------------------------
+Wed Sep  5 17:57:07 UTC 2012 - [email protected]
+
+- Add SLES support to specfile
+
+-------------------------------------------------------------------
+Tue Aug 14 00:26:55 UTC 2012 - [email protected]
+
+- Build fixes for e2fsprogs v1.42
+    See http://code.google.com/p/ext3grep/issues/detail?id=34&sort=-id
+
+-------------------------------------------------------------------
+Mon Apr 11 11:32:16 UTC 2011 - [email protected]
+
+- use spec-cleaner 
+
+-------------------------------------------------------------------
+Mon Apr 19 12:58:25 UTC 2010 - [email protected]
+
+- update to ext3grep-0.10.2
+  - Added support for --restore-inode=<ino>@<journal-sequence-number>
+
+-------------------------------------------------------------------
+Thu Aug 27 10:26:17 UTC 2009 - [email protected]
+
+- prepare package for contrib (base on package from
+  home:bitshuffler)
+
+

New:
----
  Readme.SuSE
  e2fsprogs-1.42.patch
  ext3grep-0.10.2.tar.bz2
  ext3grep.changes
  ext3grep.spec

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ ext3grep.spec ++++++
#
# spec file for package
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
# upon. The license for this file, and modifications and additions to the
# file, is the same license as for the pristine package itself (unless the
# license for the pristine package is not an Open Source License, in which
# case the license is the MIT License). An "Open Source License" is a
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.

# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
Name:           ext3grep
Version:        0.10.2
Release:        1.0
License:        GPL-2.0
Summary:        A tool to possibly recover deleted content on ext3 file systems
Url:            http://code.google.com/p/ext3grep/
Group:          Productivity/File utilities
Source:         %{name}-%{version}.tar.bz2
Source1:        Readme.SuSE
Patch1:         e2fsprogs-1.42.patch
BuildRequires:  gcc-c++
BuildRequires:  libext2fs-devel
BuildRoot:      %{_tmppath}/%{name}-%{version}-build

%description
A tool to investigate an ext3 file system for deleted content and possibly 
recover it.

Also see http://www.xs4all.nl/~carlo17/howto/undelete_ext3.html

%prep
%setup -q
%patch1 -p1
cp %{SOURCE1} .

%build
%configure
make %{?_smp_mflags}

%check
make check

%install
make install DESTDIR="%buildroot"

%files
%defattr(-,root,root)
%doc NEWS README Readme.SuSE
%{_bindir}/ext3grep

%changelog
++++++ Readme.SuSE ++++++
1. Calculate when the files were deleted - e.g. to restore files that were 
deleted on 27th May 2008 on sda9:

$ perl -e 'use POSIX; print strftime("%s", 0, 0, 0, 26, 5, 2008-1900); print 
"\n"'

2. Run ext3grep:

$ ext3grep /dev/sda9 --restore-all --after=1214431200
++++++ e2fsprogs-1.42.patch ++++++
Index: ext3grep-0.10.2/src/ext3.h
===================================================================
--- ext3grep-0.10.2.orig/src/ext3.h
+++ ext3grep-0.10.2/src/ext3.h
@@ -24,6 +24,18 @@
 #ifndef EXT3_H
 #define EXT3_H
 
+// 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)
 // We can use these headers and then everything named ext2 or ext3.
 #include <ext2fs/ext2_fs.h>                    // Definitions of ext2, ext3 
and ext4.
@@ -110,6 +122,12 @@ struct Inode : protected ext3_inode {
     __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; }
+#ifndef i_reserved2
+    //i_reserved2 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; }
 
     void set_reserved2(__u32 val) { i_reserved2 = val; }
-- 
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to