[Forensics-changes] [SCM] debian-forensics/afflib branch, debian, updated. debian/3.5.2+dfsg-1-2-g4024d02

Christophe Monniez christophe.monniez at fccu.be
Thu Dec 17 08:50:37 UTC 2009 

The following commit has been merged in the debian branch:
commit 4024d0229e420608b7a7ebb5744b364db57e65b3
Author: Christophe Monniez <christophe.monniez at fccu.be>
Date:   Thu Dec 17 09:49:28 2009 +0100

    Refreshing quilt patches.

diff --git a/debian/patches/01-debian-directory.patch b/debian/patches/01-debian-directory.patch
index c45e910..c1aa2cb 100644
--- a/debian/patches/01-debian-directory.patch
+++ b/debian/patches/01-debian-directory.patch
@@ -3,8 +3,8 @@ Description: Rebuilding upstream tarball without debian directory.
 
 Index: afflib/Makefile.am
 ===================================================================
---- afflib.orig/Makefile.am	2009-10-25 11:15:41.359881152 +0100
-+++ afflib/Makefile.am	2009-10-25 11:37:44.442887454 +0100
+--- afflib.orig/Makefile.am	2009-12-17 09:30:30.393140252 +0100
++++ afflib/Makefile.am	2009-12-17 09:32:04.785175510 +0100
 @@ -100,7 +100,6 @@
  	doc/announce_2.2.txt
  
@@ -15,8 +15,8 @@ Index: afflib/Makefile.am
  	afflib.spec \
 Index: afflib/Makefile.in
 ===================================================================
---- afflib.orig/Makefile.in	2009-10-25 11:15:41.359881152 +0100
-+++ afflib/Makefile.in	2009-10-25 11:37:44.446880564 +0100
+--- afflib.orig/Makefile.in	2009-12-17 09:30:30.413142161 +0100
++++ afflib/Makefile.in	2009-12-17 09:32:04.785175510 +0100
 @@ -38,8 +38,7 @@
  	$(pkginclude_HEADERS) $(srcdir)/Makefile.am \
  	$(srcdir)/Makefile.in $(srcdir)/affconfig.h.in \
@@ -46,11 +46,11 @@ Index: afflib/Makefile.in
  	afflib.spec \
 Index: afflib/configure
 ===================================================================
---- afflib.orig/configure	2009-10-25 11:15:41.375879296 +0100
-+++ afflib/configure	2009-10-25 11:37:44.466878731 +0100
-@@ -11838,10 +11838,6 @@
+--- afflib.orig/configure	2009-12-17 09:30:30.457141555 +0100
++++ afflib/configure	2009-12-17 09:32:18.334139477 +0100
+@@ -11837,10 +11837,6 @@
  # AC_PROG_RANLIB
- ac_config_files="$ac_config_files Makefile lib/Makefile tools/Makefile lzma443/Makefile win32/Makefile tests/Makefile doc/Makefile pyaff/Makefile man/Makefile"
+ ac_config_files="$ac_config_files Makefile lib/Makefile tools/Makefile lzma443/Makefile win32/Makefile tests/Makefile doc/Makefile pyaff/Makefile man/Makefile lib/version.h"
  
 -ac_config_files="$ac_config_files debian/changelog"
 -
@@ -59,10 +59,10 @@ Index: afflib/configure
  ac_config_files="$ac_config_files afflib.spec"
  
  ac_config_headers="$ac_config_headers affconfig.h"
-@@ -23136,8 +23132,6 @@
-     "doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;;
+@@ -23141,8 +23137,6 @@
      "pyaff/Makefile") CONFIG_FILES="$CONFIG_FILES pyaff/Makefile" ;;
      "man/Makefile") CONFIG_FILES="$CONFIG_FILES man/Makefile" ;;
+     "lib/version.h") CONFIG_FILES="$CONFIG_FILES lib/version.h" ;;
 -    "debian/changelog") CONFIG_FILES="$CONFIG_FILES debian/changelog" ;;
 -    "debian/shlibs.local.ex") CONFIG_FILES="$CONFIG_FILES debian/shlibs.local.ex" ;;
      "afflib.spec") CONFIG_FILES="$CONFIG_FILES afflib.spec" ;;
@@ -70,11 +70,11 @@ Index: afflib/configure
      "afflib.pc") CONFIG_FILES="$CONFIG_FILES afflib.pc" ;;
 Index: afflib/configure.ac
 ===================================================================
---- afflib.orig/configure.ac	2009-10-25 11:15:41.379880788 +0100
-+++ afflib/configure.ac	2009-10-25 11:37:44.466878731 +0100
-@@ -34,8 +34,6 @@
+--- afflib.orig/configure.ac	2009-12-17 09:30:30.501190116 +0100
++++ afflib/configure.ac	2009-12-17 09:32:04.805173475 +0100
+@@ -33,8 +33,6 @@
  AC_CONFIG_FILES([Makefile lib/Makefile tools/Makefile lzma443/Makefile win32/Makefile 
- 			  tests/Makefile doc/Makefile pyaff/Makefile man/Makefile])
+ 			  tests/Makefile doc/Makefile pyaff/Makefile man/Makefile lib/version.h])
  dnl Have configure make distribution specific files
 -AC_CONFIG_FILES([debian/changelog])
 -AC_CONFIG_FILES([debian/shlibs.local.ex])
diff --git a/debian/patches/02-win32-files.patch b/debian/patches/02-win32-files.patch
index 2b6063a..c641f39 100644
--- a/debian/patches/02-win32-files.patch
+++ b/debian/patches/02-win32-files.patch
@@ -3,8 +3,8 @@ Description: Rebuilding upstream tarball without win32 files.
 
 Index: afflib/Makefile.am
 ===================================================================
---- afflib.orig/Makefile.am	2009-10-25 11:37:44.442887454 +0100
-+++ afflib/Makefile.am	2009-10-25 11:38:23.783878780 +0100
+--- afflib.orig/Makefile.am	2009-12-17 09:33:53.000000000 +0100
++++ afflib/Makefile.am	2009-12-17 09:35:31.202141233 +0100
 @@ -1,4 +1,4 @@
 -SUBDIRS = lib tools lzma443 win32 tests doc pyaff man
 +SUBDIRS = lib tools lzma443 tests doc pyaff man
@@ -13,8 +13,8 @@ Index: afflib/Makefile.am
  
 Index: afflib/Makefile.in
 ===================================================================
---- afflib.orig/Makefile.in	2009-10-25 11:37:44.446880564 +0100
-+++ afflib/Makefile.in	2009-10-25 11:38:23.787878455 +0100
+--- afflib.orig/Makefile.in	2009-12-17 09:33:53.000000000 +0100
++++ afflib/Makefile.in	2009-12-17 09:35:31.206140994 +0100
 @@ -232,7 +232,7 @@
  target_alias = @target_alias@
  top_builddir = @top_builddir@
@@ -26,18 +26,18 @@ Index: afflib/Makefile.in
  include_HEADERS = 
 Index: afflib/configure
 ===================================================================
---- afflib.orig/configure	2009-10-25 11:37:44.466878731 +0100
-+++ afflib/configure	2009-10-25 11:38:23.807878231 +0100
-@@ -11836,7 +11836,7 @@
+--- afflib.orig/configure	2009-12-17 09:33:53.000000000 +0100
++++ afflib/configure	2009-12-17 09:36:49.638175236 +0100
+@@ -11835,7 +11835,7 @@
  
  # AC_PROG_RANLIB not needed if you are using AC_PROG_LIBTOOL
  # AC_PROG_RANLIB
--ac_config_files="$ac_config_files Makefile lib/Makefile tools/Makefile lzma443/Makefile win32/Makefile tests/Makefile doc/Makefile pyaff/Makefile man/Makefile"
-+ac_config_files="$ac_config_files Makefile lib/Makefile tools/Makefile lzma443/Makefile tests/Makefile doc/Makefile pyaff/Makefile man/Makefile"
+-ac_config_files="$ac_config_files Makefile lib/Makefile tools/Makefile lzma443/Makefile win32/Makefile tests/Makefile doc/Makefile pyaff/Makefile man/Makefile lib/version.h"
++ac_config_files="$ac_config_files Makefile lib/Makefile tools/Makefile lzma443/Makefile tests/Makefile doc/Makefile pyaff/Makefile man/Makefile lib/version.h"
  
  ac_config_files="$ac_config_files afflib.spec"
  
-@@ -23127,7 +23127,6 @@
+@@ -23131,7 +23131,6 @@
      "lib/Makefile") CONFIG_FILES="$CONFIG_FILES lib/Makefile" ;;
      "tools/Makefile") CONFIG_FILES="$CONFIG_FILES tools/Makefile" ;;
      "lzma443/Makefile") CONFIG_FILES="$CONFIG_FILES lzma443/Makefile" ;;
@@ -47,14 +47,14 @@ Index: afflib/configure
      "pyaff/Makefile") CONFIG_FILES="$CONFIG_FILES pyaff/Makefile" ;;
 Index: afflib/configure.ac
 ===================================================================
---- afflib.orig/configure.ac	2009-10-25 11:37:44.466878731 +0100
-+++ afflib/configure.ac	2009-10-25 11:38:23.807878231 +0100
-@@ -31,7 +31,7 @@
+--- afflib.orig/configure.ac	2009-12-17 09:33:53.000000000 +0100
++++ afflib/configure.ac	2009-12-17 09:38:17.198143797 +0100
+@@ -30,7 +30,7 @@
  
  # AC_PROG_RANLIB not needed if you are using AC_PROG_LIBTOOL
  # AC_PROG_RANLIB
 -AC_CONFIG_FILES([Makefile lib/Makefile tools/Makefile lzma443/Makefile win32/Makefile 
 +AC_CONFIG_FILES([Makefile lib/Makefile tools/Makefile lzma443/Makefile
- 			  tests/Makefile doc/Makefile pyaff/Makefile man/Makefile])
+ 			  tests/Makefile doc/Makefile pyaff/Makefile man/Makefile lib/version.h])
  dnl Have configure make distribution specific files
  AC_CONFIG_FILES([afflib.spec])
diff --git a/debian/patches/03-bashism.patch b/debian/patches/03-bashism.patch
index 0512ec8..8c30749 100644
--- a/debian/patches/03-bashism.patch
+++ b/debian/patches/03-bashism.patch
@@ -1,38 +1,25 @@
 Index: afflib/tools/test_afsegment.sh
 ===================================================================
---- afflib.orig/tools/test_afsegment.sh	2009-10-25 21:23:02.531878876 +0100
-+++ afflib/tools/test_afsegment.sh	2009-10-25 21:23:22.399879368 +0100
-@@ -7,7 +7,7 @@
- /bin/rm -f blank.aff
- ./afcopy /dev/null blank.aff
- ./afsegment -ssegname=testseg1 blank.aff
--if [ x"testseg1" = x`./afsegment -p segname blank.aff` ] ; then 
-+if test x"testseg1" = x"$(./afsegment -p segname blank.aff )" ; then
+--- afflib.orig/tools/test_afsegment.sh	2009-12-17 09:18:54.000000000 +0100
++++ afflib/tools/test_afsegment.sh	2009-12-17 09:44:01.441349105 +0100
+@@ -9,7 +9,7 @@
+ /bin/rm -f $W/blank.aff
+ ./afcopy /dev/null $W/blank.aff
+ ./afsegment -ssegname=testseg1 $W/blank.aff
+-if [ x"testseg1" = x`./afsegment -p segname $W/blank.aff` ] ; then 
++if test x"testseg1" = x"$(./afsegment -p segname $W/blank.aff )" ; then
    echo afsegment worked!
  else
    echo afsegment does not work properly
-Index: afflib/tools/test_passphrase.sh
-===================================================================
---- afflib.orig/tools/test_passphrase.sh	2009-10-25 21:23:02.535926812 +0100
-+++ afflib/tools/test_passphrase.sh	2009-10-25 21:23:22.403911729 +0100
-@@ -33,7 +33,7 @@
- echo "doc" >> words
- echo "passphrase" >> words
- echo "foobar" >> words
--if [ "`./afcrypto -k -f words blanke.aff|grep correct|grep passphrase`"x == x ] ; then
-+if test "$(./afcrypto -k -f words blanke.aff|grep correct|grep passphrase)"x = x ; then
-   echo afcrypto did not find the right passphrase
-   exit 1
- else 
 Index: afflib/tools/test_crypto.sh
 ===================================================================
---- afflib.orig/tools/test_crypto.sh	2009-10-25 21:23:02.531878876 +0100
-+++ afflib/tools/test_crypto.sh	2009-10-25 21:25:09.164289835 +0100
-@@ -4,11 +4,11 @@
+--- afflib.orig/tools/test_crypto.sh	2009-12-17 09:18:54.000000000 +0100
++++ afflib/tools/test_crypto.sh	2009-12-17 09:47:14.073358931 +0100
+@@ -6,11 +6,11 @@
  
  unset AFFLIB_PASSPHRASE
  
--if [ x${srcdir} == "x" ] ; 
+-if [ x${srcdir} = "x" ] ; 
 +if test "x${srcdir}" = "x"  ;
    then 
       TDIR="../tests/"
@@ -41,16 +28,16 @@ Index: afflib/tools/test_crypto.sh
 +     TDIR="$srcdir"/../tests/
  fi
  
- if ! ./afcompare $TDIR/encrypted.iso file://:password@/$TDIR/encrypted.aff ; then exit 1 ; fi
+ if [ ! -r $TDIR/encrypted.aff ]; then
 Index: afflib/tools/test_make_random_iso.sh
 ===================================================================
---- afflib.orig/tools/test_make_random_iso.sh	2009-10-25 21:24:09.211886620 +0100
-+++ afflib/tools/test_make_random_iso.sh	2009-10-25 21:24:42.745546208 +0100
+--- afflib.orig/tools/test_make_random_iso.sh	2009-12-17 09:18:54.000000000 +0100
++++ afflib/tools/test_make_random_iso.sh	2009-12-17 09:48:11.765181230 +0100
 @@ -5,7 +5,7 @@
  
  unset AFFLIB_PASSPHRASE
  
--if [ x"" == x$1 ] ; 
+-if [ x"" = x$1 ] ; 
 +if test "x" = "x$1" ;
    then echo usage: $0 filename
    exit 1

-- 
debian-forensics/afflib

More information about the forensics-changes mailing list