[Forensics-changes] [SCM] debian-forensics/libewf branch, debian, updated. debian/20080501+debian-3-31-gcc97de3
Cristian Greco
cristian.debian at gmail.com
Wed Sep 30 23:06:42 UTC 2009
The following commit has been merged in the debian branch:
commit e99cd5f1617ca0338df7e62d5f28e2fbe1a79f4a
Author: Cristian Greco <cristian.debian at gmail.com>
Date: Thu Oct 1 00:18:17 2009 +0200
debian/patches: refresh autotools patch against new version.
diff --git a/debian/patches/01-debian-directory.patch b/debian/patches/01-debian-directory.patch
index 147c8b1..0b1b4bb 100644
--- a/debian/patches/01-debian-directory.patch
+++ b/debian/patches/01-debian-directory.patch
@@ -3,7 +3,7 @@ Description: Rebuild upstream-tarball without debian-directory.
--- a/Makefile.am
+++ b/Makefile.am
-@@ -54,7 +54,6 @@
+@@ -59,7 +59,6 @@
libewf.spec.in
EXTRA_DIST = \
@@ -11,7 +11,7 @@ Description: Rebuild upstream-tarball without debian-directory.
$(REDHAT_FILES) \
libewf.pc \
libewf.pc.in
-@@ -83,8 +82,6 @@
+@@ -89,8 +88,6 @@
/bin/rm -f config.log
/bin/rm -f libewf.pc
/bin/rm -f libewf.spec
@@ -22,7 +22,7 @@ Description: Rebuild upstream-tarball without debian-directory.
|| case "$(MFLAGS)" in *k*) fail=yes;; *) exit 1;; esac; \
--- a/configure.ac
+++ b/configure.ac
-@@ -1448,8 +1448,6 @@
+@@ -1641,8 +1641,6 @@
AC_CONFIG_FILES([libewf/libewf_definitions.h])
dnl Have configure make distribution specific files
AC_CONFIG_FILES([common/types.h])
diff --git a/debian/patches/03-fix-ldflags.patch b/debian/patches/03-fix-ldflags.patch
index 999a39e..6496526 100644
--- a/debian/patches/03-fix-ldflags.patch
+++ b/debian/patches/03-fix-ldflags.patch
@@ -3,7 +3,7 @@ Description: fix to avoid to link against unneded libraries for ewf-tools.
--- a/configure.ac
+++ b/configure.ac
-@@ -1002,7 +1002,8 @@
+@@ -1165,7 +1165,8 @@
AC_CHECK_LIB(
crypto,
EVP_md5,
@@ -13,7 +13,7 @@ Description: fix to avoid to link against unneded libraries for ewf-tools.
[ac_libewf_have_libcrypto_evp=no])
AC_CHECK_LIB(
crypto,
-@@ -1061,7 +1062,7 @@
+@@ -1224,7 +1225,7 @@
AC_CHECK_LIB(
crypto,
MD5_Init,
@@ -22,7 +22,7 @@ Description: fix to avoid to link against unneded libraries for ewf-tools.
[ac_libewf_have_libcrypto_md5=no])
AC_CHECK_LIB(
crypto,
-@@ -1131,7 +1132,8 @@
+@@ -1294,7 +1295,8 @@
AC_CHECK_LIB(
[uuid],
[uuid_generate],
@@ -34,66 +34,80 @@ Description: fix to avoid to link against unneded libraries for ewf-tools.
])
--- a/ewftools/Makefile.am
+++ b/ewftools/Makefile.am
-@@ -33,7 +33,7 @@
- storage_media_buffer.c storage_media_buffer.h \
- system_string.c system_string.h
-
--ewfacquire_LDADD = ../liberror/liberror.la ../libewf/libewf.la @MEMWATCH_LIBADD@
-+ewfacquire_LDADD = ../liberror/liberror.la ../libewf/libewf.la @MEMWATCH_LIBADD@ @LIBSSL_LIBADD@ @LIBUUID_LIBADD@
+@@ -38,7 +38,9 @@
+ ../liberror/liberror.la \
+ ../libewf/libewf.la \
+ ../libsystem/libsystem.la \
+- @MEMWATCH_LIBADD@
++ @MEMWATCH_LIBADD@ \
++ @LIBSSL_LIBADD@ \
++ @LIBUUID_LIBADD@
ewfacquirestream_SOURCES = \
byte_size_string.c byte_size_string.h \
-@@ -59,7 +59,7 @@
- storage_media_buffer.c storage_media_buffer.h \
- system_string.c system_string.h
-
--ewfacquirestream_LDADD = ../liberror/liberror.la ../libewf/libewf.la @MEMWATCH_LIBADD@
-+ewfacquirestream_LDADD = ../liberror/liberror.la ../libewf/libewf.la @MEMWATCH_LIBADD@ @LIBSSL_LIBADD@ @LIBUUID_LIBADD@
+@@ -60,7 +62,9 @@
+ ../liberror/liberror.la \
+ ../libewf/libewf.la \
+ ../libsystem/libsystem.la \
+- @MEMWATCH_LIBADD@
++ @MEMWATCH_LIBADD@ \
++ @LIBSSL_LIBADD@ \
++ @LIBUUID_LIBADD@
ewfalter_SOURCES = \
alteration_handle.c alteration_handle.h \
-@@ -77,7 +77,7 @@
- storage_media_buffer.c storage_media_buffer.h \
- system_string.c system_string.h
-
--ewfalter_LDADD = ../liberror/liberror.la ../libewf/libewf.la @MEMWATCH_LIBADD@
-+ewfalter_LDADD = ../liberror/liberror.la ../libewf/libewf.la @MEMWATCH_LIBADD@ @LIBSSL_LIBADD@ @LIBUUID_LIBADD@
+@@ -75,7 +79,9 @@
+ ../liberror/liberror.la \
+ ../libewf/libewf.la \
+ ../libsystem/libsystem.la \
+- @MEMWATCH_LIBADD@
++ @MEMWATCH_LIBADD@ \
++ @LIBSSL_LIBADD@ \
++ @LIBUUID_LIBADD@
ewfdebug_SOURCES = \
byte_size_string.c byte_size_string.h \
-@@ -91,7 +91,7 @@
- notify.c notify.h \
- system_string.c system_string.h
-
--ewfdebug_LDADD = ../liberror/liberror.la ../libewf/libewf.la @MEMWATCH_LIBADD@
-+ewfdebug_LDADD = ../liberror/liberror.la ../libewf/libewf.la @MEMWATCH_LIBADD@ @LIBSSL_LIBADD@ @LIBUUID_LIBADD@
+@@ -87,7 +93,9 @@
+ ../liberror/liberror.la \
+ ../libewf/libewf.la \
+ ../libsystem/libsystem.la \
+- @MEMWATCH_LIBADD@
++ @MEMWATCH_LIBADD@ \
++ @LIBSSL_LIBADD@ \
++ @LIBUUID_LIBADD@
ewfexport_SOURCES = \
byte_size_string.c byte_size_string.h \
-@@ -117,7 +117,7 @@
- storage_media_buffer.c storage_media_buffer.h \
- system_string.c system_string.h
-
--ewfexport_LDADD = ../liberror/liberror.la ../libewf/libewf.la @MEMWATCH_LIBADD@
-+ewfexport_LDADD = ../liberror/liberror.la ../libewf/libewf.la @MEMWATCH_LIBADD@ @LIBSSL_LIBADD@ @LIBUUID_LIBADD@
+@@ -109,7 +117,9 @@
+ ../liberror/liberror.la \
+ ../libewf/libewf.la \
+ ../libsystem/libsystem.la \
+- @MEMWATCH_LIBADD@
++ @MEMWATCH_LIBADD@ \
++ @LIBSSL_LIBADD@ \
++ @LIBUUID_LIBADD@
ewfinfo_SOURCES = \
byte_size_string.c byte_size_string.h \
-@@ -135,7 +135,7 @@
- notify.c notify.h \
- system_string.c system_string.h
-
--ewfinfo_LDADD = ../liberror/liberror.la ../libewf/libewf.la @MEMWATCH_LIBADD@
-+ewfinfo_LDADD = ../liberror/liberror.la ../libewf/libewf.la @MEMWATCH_LIBADD@ @LIBSSL_LIBADD@ @LIBUUID_LIBADD@
+@@ -124,7 +134,9 @@
+ ../liberror/liberror.la \
+ ../libewf/libewf.la \
+ ../libsystem/libsystem.la \
+- @MEMWATCH_LIBADD@
++ @MEMWATCH_LIBADD@ \
++ @LIBSSL_LIBADD@ \
++ @LIBUUID_LIBADD@
ewfverify_SOURCES = \
byte_size_string.c byte_size_string.h \
-@@ -160,7 +160,7 @@
- system_string.c system_string.h \
- verification_handle.c verification_handle.h
-
--ewfverify_LDADD = ../liberror/liberror.la ../libewf/libewf.la @MEMWATCH_LIBADD@
-+ewfverify_LDADD = ../liberror/liberror.la ../libewf/libewf.la @MEMWATCH_LIBADD@ @LIBSSL_LIBADD@ @LIBUUID_LIBADD@
+@@ -144,7 +156,9 @@
+ ../liberror/liberror.la \
+ ../libewf/libewf.la \
+ ../libsystem/libsystem.la \
+- @MEMWATCH_LIBADD@
++ @MEMWATCH_LIBADD@ \
++ @LIBSSL_LIBADD@ \
++ @LIBUUID_LIBADD@
distclean: clean
/bin/rm -f Makefile
diff --git a/debian/patches/10-fix-manpages.patch b/debian/patches/10-fix-manpages.patch
index 47e9827..12f603d 100644
--- a/debian/patches/10-fix-manpages.patch
+++ b/debian/patches/10-fix-manpages.patch
@@ -3,7 +3,7 @@ Description: fix some manpages warnings.
--- a/manuals/ewfacquirestream.1
+++ b/manuals/ewfacquirestream.1
-@@ -109,7 +109,7 @@
+@@ -112,7 +112,7 @@
None
.Sh EXAMPLES
.Bd -literal
@@ -25,7 +25,7 @@ Description: fix some manpages warnings.
Acquiry information
--- a/manuals/libewf.3
+++ b/manuals/libewf.3
-@@ -640,7 +640,7 @@
+@@ -664,7 +664,7 @@
.Fn libewf_set_notify_values
function can be used to direct the warning, verbose and debug output from the library.
.Sh RETURN VALUES
--
debian-forensics/libewf
More information about the forensics-changes
mailing list