New Upstream Snapshot - ext4magic

Ready changes

Summary

Merged new upstream version: 0.3.2+git20140919.3.99a5796 (was: 0.3.2+git20140919.2.99a5796).

Resulting package

Built on 2023-01-21T20:12 (took 15m27s)

The resulting binary packages can be installed (if you have the apt repository enabled) by running one of:

apt install -t fresh-snapshots ext4magic-dbgsymapt install -t fresh-snapshots ext4magic

Lintian Result

Diff

diff --git a/configure b/configure
index f8155ca..6a02229 100755
--- a/configure
+++ b/configure
@@ -1391,10 +1391,10 @@ Optional Features:
   --enable-fast-install[=PKGS]
                           optimize for fast installation [default=yes]
   --disable-libtool-lock  avoid locking (might break parallel builds)
-  --enable-debug            Turn on debugging
-  --enable-debug-magic            Turn on debugging magic-scan-engine
-  --enable-file-attr            enable restore of file attribute
-  --enable-expert-mode            enable advanced options for expert mode
+  --enable-debug          Turn on debugging
+  --enable-debug-magic    Turn on debugging magic-scan-engine
+  --enable-file-attr      enable restore of file attribute
+  --enable-expert-mode    enable advanced options for expert mode
 
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
@@ -11592,22 +11592,22 @@ as_fn_error $? "library libmagic.so >= 5.04 not found, install package \"file-5.
 
 # Check whether --enable-debug was given.
 if test "${enable_debug+set}" = set; then :
-  enableval=$enable_debug; if test "$GCC" = "yes"; then CPPFLAGS="$CPPFLAGS -DDEBUG"; fi
+  enableval=$enable_debug; if test x$enableval == xyes && test "$GCC" = "yes"; then CPPFLAGS="$CPPFLAGS -DDEBUG"; fi
 fi
 
 # Check whether --enable-debug-magic was given.
 if test "${enable_debug_magic+set}" = set; then :
-  enableval=$enable_debug_magic; if test "$GCC" = "yes"; then CPPFLAGS="$CPPFLAGS -DDEBUG_MAGIC_SCAN"; fi
+  enableval=$enable_debug_magic; if test x$enableval == xyes && test "$GCC" = "yes"; then CPPFLAGS="$CPPFLAGS -DDEBUG_MAGIC_SCAN"; fi
 fi
 
 # Check whether --enable-file-attr was given.
 if test "${enable_file_attr+set}" = set; then :
-  enableval=$enable_file_attr; if test "$GCC" = "yes"; then CPPFLAGS="$CPPFLAGS -DFILE_ATTR"; fi
+  enableval=$enable_file_attr; if test x$enableval == xyes && test "$GCC" = "yes"; then CPPFLAGS="$CPPFLAGS -DFILE_ATTR"; fi
 fi
 
 # Check whether --enable-expert-mode was given.
 if test "${enable_expert_mode+set}" = set; then :
-  enableval=$enable_expert_mode; if test "$GCC" = "yes"; then CPPFLAGS="$CPPFLAGS -DEXPERT_MODE"; fi
+  enableval=$enable_expert_mode; if test x$enableval == xyes && test "$GCC" = "yes"; then CPPFLAGS="$CPPFLAGS -DEXPERT_MODE"; fi
 fi
 
 
diff --git a/configure.ac b/configure.ac
index 98bf660..17080d9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -35,13 +35,13 @@ AC_MSG_ERROR([library libmagic.so >= 5.04 not found, install package "file-5.04"
 
 
 
-AC_ARG_ENABLE(debug,[  --enable-debug            Turn on debugging ],
-         [if test "$GCC" = "yes"; then CPPFLAGS="$CPPFLAGS -DDEBUG"; fi])
-AC_ARG_ENABLE(debug-magic,[  --enable-debug-magic            Turn on debugging magic-scan-engine ],
-         [if test "$GCC" = "yes"; then CPPFLAGS="$CPPFLAGS -DDEBUG_MAGIC_SCAN"; fi])
-AC_ARG_ENABLE(file-attr,[  --enable-file-attr            enable restore of file attribute ],
-         [if test "$GCC" = "yes"; then CPPFLAGS="$CPPFLAGS -DFILE_ATTR"; fi])
-AC_ARG_ENABLE(expert-mode,[  --enable-expert-mode            enable advanced options for expert mode ],
-         [if test "$GCC" = "yes"; then CPPFLAGS="$CPPFLAGS -DEXPERT_MODE"; fi])
+AC_ARG_ENABLE(debug,[  --enable-debug          Turn on debugging ],
+         [if test x$enableval == xyes && test "$GCC" = "yes"; then CPPFLAGS="$CPPFLAGS -DDEBUG"; fi])
+AC_ARG_ENABLE(debug-magic,[  --enable-debug-magic    Turn on debugging magic-scan-engine ],
+         [if test x$enableval == xyes && test "$GCC" = "yes"; then CPPFLAGS="$CPPFLAGS -DDEBUG_MAGIC_SCAN"; fi])
+AC_ARG_ENABLE(file-attr,[  --enable-file-attr      enable restore of file attribute ],
+         [if test x$enableval == xyes && test "$GCC" = "yes"; then CPPFLAGS="$CPPFLAGS -DFILE_ATTR"; fi])
+AC_ARG_ENABLE(expert-mode,[  --enable-expert-mode    enable advanced options for expert mode ],
+         [if test x$enableval == xyes && test "$GCC" = "yes"; then CPPFLAGS="$CPPFLAGS -DEXPERT_MODE"; fi])
 
 AC_OUTPUT(Makefile src/Makefile)
diff --git a/debian/changelog b/debian/changelog
index 6441015..b296e39 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+ext4magic (0.3.2+git20140919.3.99a5796-1) UNRELEASED; urgency=low
+
+  * New upstream snapshot.
+  * New upstream snapshot.
+  * New upstream snapshot.
+
+ -- Debian Janitor <janitor@jelmer.uk>  Sat, 21 Jan 2023 20:01:13 -0000
+
 ext4magic (0.3.2-14) unstable; urgency=medium
 
   [ Debian Janitor ]
diff --git a/debian/patches/fix-FTBFS-with-glibc-2.28.patch b/debian/patches/fix-FTBFS-with-glibc-2.28.patch
index 9786cdf..c1f5553 100644
--- a/debian/patches/fix-FTBFS-with-glibc-2.28.patch
+++ b/debian/patches/fix-FTBFS-with-glibc-2.28.patch
@@ -3,10 +3,10 @@ Author: Joao Eriberto Mota Filho <eriberto@debian.org>
 Bug: https://sourceforge.net/p/ext4magic/tickets/4/
 Bug-Debian: https://bugs.debian.org/916064
 Last-Update: 2018-12-10
-Index: ext4magic/src/recover.c
+Index: ext4magic.git/src/recover.c
 ===================================================================
---- ext4magic.orig/src/recover.c
-+++ ext4magic/src/recover.c
+--- ext4magic.git.orig/src/recover.c
++++ ext4magic.git/src/recover.c
 @@ -20,10 +20,11 @@
  #include <stdio.h>
  #include <unistd.h>
diff --git a/debian/patches/fix-i_dir_acl-rename.patch b/debian/patches/fix-i_dir_acl-rename.patch
index 0a96b6a..dcab025 100644
--- a/debian/patches/fix-i_dir_acl-rename.patch
+++ b/debian/patches/fix-i_dir_acl-rename.patch
@@ -1,10 +1,10 @@
 Description: Fix FTBFS with new e2fsprogs.
 Author: Hilko Bengen <bengen@debian.org>
 Last-Update: 2018-04-13
-Index: ext4magic/src/inode.c
+Index: ext4magic.git/src/inode.c
 ===================================================================
---- ext4magic.orig/src/inode.c
-+++ ext4magic/src/inode.c
+--- ext4magic.git.orig/src/inode.c
++++ ext4magic.git/src/inode.c
 @@ -406,14 +406,14 @@ void dump_inode(FILE *out, const char *p
          fprintf(out,
                          "%sFile ACL: %d    Directory ACL: %d Translator: %d\n",
diff --git a/debian/patches/fix-recover-examine.patch b/debian/patches/fix-recover-examine.patch
index 4aa31c2..23003ae 100644
--- a/debian/patches/fix-recover-examine.patch
+++ b/debian/patches/fix-recover-examine.patch
@@ -2,10 +2,10 @@ Description: temporary work around to fix an issue which makes impossible to
              recover or examine Ext4 filesystems. (see #802089)
 Author: Roberto Maar <robi6@users.sf.net>
 Last-Update: 2015-10-18
-Index: ext4magic-0.3.2/src/block.c
+Index: ext4magic.git/src/block.c
 ===================================================================
---- ext4magic-0.3.2.orig/src/block.c
-+++ ext4magic-0.3.2/src/block.c
+--- ext4magic.git.orig/src/block.c
++++ ext4magic.git/src/block.c
 @@ -130,7 +130,8 @@ int read_block64 ( ext2_filsys fs, blk64
  
  
@@ -37,10 +37,10 @@ Index: ext4magic-0.3.2/src/block.c
  		if (ctx.errcode)
  			goto abort_exit;
  
-Index: ext4magic-0.3.2/src/inode.c
+Index: ext4magic.git/src/inode.c
 ===================================================================
---- ext4magic-0.3.2.orig/src/inode.c
-+++ ext4magic-0.3.2/src/inode.c
+--- ext4magic.git.orig/src/inode.c
++++ ext4magic.git/src/inode.c
 @@ -112,8 +112,10 @@ static void local_dump_extents(FILE *f,
          unsigned int            printed = 0;
          errcode_t               errcode;
diff --git a/debian/patches/fix-spelling-manpage.patch b/debian/patches/fix-spelling-manpage.patch
index 653d2bb..5f3c3a1 100644
--- a/debian/patches/fix-spelling-manpage.patch
+++ b/debian/patches/fix-spelling-manpage.patch
@@ -1,10 +1,10 @@
 Description: fix some spelling errors in manpages.
 Author: Giovani Augusto Ferreira <giovani@riseup.net>
 Last-Update: 2016-09-24
-Index: ext4magic/src/ext4magic.8
+Index: ext4magic.git/src/ext4magic.8
 ===================================================================
---- ext4magic.orig/src/ext4magic.8
-+++ ext4magic/src/ext4magic.8
+--- ext4magic.git.orig/src/ext4magic.8
++++ ext4magic.git/src/ext4magic.8
 @@ -18,13 +18,13 @@ filesystem Journal. ext4magic can extrac
  Journal, and can restore files in entire directory trees, provided that
  the information in the Journal are sufficient. This tool can recover
diff --git a/debian/patches/fix-spelling.patch b/debian/patches/fix-spelling.patch
index 7d5bf1f..e6f98ba 100644
--- a/debian/patches/fix-spelling.patch
+++ b/debian/patches/fix-spelling.patch
@@ -2,10 +2,10 @@ Description: fix some spelling errors in screen messages
 Author: Joao Eriberto Mota Filho <eriberto@debian.org>
 Forwarded: https://sourceforge.net/p/ext4magic/tickets/11/
 Last-Update: 2018-12-10
-Index: ext4magic/src/ext4magic.c
+Index: ext4magic.git/src/ext4magic.c
 ===================================================================
---- ext4magic.orig/src/ext4magic.c
-+++ ext4magic/src/ext4magic.c
+--- ext4magic.git.orig/src/ext4magic.c
++++ ext4magic.git/src/ext4magic.c
 @@ -323,7 +323,7 @@ errout:
  
  //subfunction for main

More details

Full run details