[Forensics-changes] [SCM] debian-forensics/afflib branch, debian, updated. debian/3.3.6+dfsg-3-6-gb71130e

Christophe Monniez christophe.monniez at fccu.be
Wed Oct 7 05:30:26 UTC 2009


The following commit has been merged in the debian branch:
commit b71130ed496d48da72243d248db28ed8aa288023
Author: Christophe Monniez <christophe.monniez at fccu.be>
Date:   Wed Oct 7 07:33:38 2009 +0200

    Adding the forgotten patch (Thanks to Mikap).

diff --git a/debian/patches/03-bashism.patch b/debian/patches/03-bashism.patch
new file mode 100644
index 0000000..5b81fa4
--- /dev/null
+++ b/debian/patches/03-bashism.patch
@@ -0,0 +1,44 @@
+Index: afflib/tools/test_afsegment.sh
+===================================================================
+--- afflib.orig/tools/test_afsegment.sh	2009-10-06 16:03:33.206734197 +0200
++++ afflib/tools/test_afsegment.sh	2009-10-06 17:44:17.366698760 +0200
+@@ -4,7 +4,7 @@
+ echo === Putting a new metadata segment into 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
+   echo afsegment worked!
+ else
+   echo afsegment does not work properly
+Index: afflib/tools/test_passphrase.sh
+===================================================================
+--- afflib.orig/tools/test_passphrase.sh	2009-10-06 16:03:33.242698523 +0200
++++ afflib/tools/test_passphrase.sh	2009-10-06 17:44:17.366698760 +0200
+@@ -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-06 17:44:26.230698439 +0200
++++ afflib/tools/test_crypto.sh	2009-10-06 17:45:29.487665159 +0200
+@@ -2,11 +2,11 @@
+ # 
+ # test to make sure we haven't broken encryption...
+ 
+-if [ x${srcdir} == "x" ] ; 
++if test "x${srcdir}" = "x"  ; 
+   then 
+      TDIR="../tests/"
+   else 
+-     TDIR=$srcdir/../tests/
++     TDIR="$srcdir"/../tests/
+ fi
+ 
+ if ! ./afcompare $TDIR/encrypted.iso file://:password@/$TDIR/encrypted.aff ; then exit 1 ; fi

-- 
debian-forensics/afflib



More information about the forensics-changes mailing list