[Forensics-changes] [SCM] debian-forensics/libewf branch, debian, updated. debian/20080501+debian-3-31-gcc97de3

[Cristian Greco]

The following commit has been merged in the debian branch:
commit 1d7e61e741e6242431b58cc1b0cfcc4c6f28bb08
Author: Cristian Greco <cristian.debian at gmail.com>
Date:   Thu Sep 24 02:23:48 2009 +0200

    03-fix-ldflags.patch: new patch, fix to avoid to link against unneded libraries
    for ewf-tools.

diff --git a/debian/patches/03-fix-ldflags.patch b/debian/patches/03-fix-ldflags.patch
new file mode 100644
index 0000000..999a39e
--- /dev/null
+++ b/debian/patches/03-fix-ldflags.patch
@@ -0,0 +1,99 @@
+Author: Cristian Greco <cristian.debian at gmail.com>
+Description: fix to avoid to link against unneded libraries for ewf-tools.
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -1002,7 +1002,8 @@
+ 	AC_CHECK_LIB(
+ 	 crypto,
+ 	 EVP_md5,
+-	 [],
++	 [AC_SUBST([LIBSSL_LIBADD],["-lcrypto"])
++    AC_DEFINE([HAVE_LIBCRYPTO],[1],[define...])],
+ 	 [ac_libewf_have_libcrypto_evp=no])
+ 	AC_CHECK_LIB(
+ 	 crypto,
+@@ -1061,7 +1062,7 @@
+ 	AC_CHECK_LIB(
+ 	 crypto,
+ 	 MD5_Init,
+-	 [],
++	 [ac_libewf_dummy=yes],
+ 	 [ac_libewf_have_libcrypto_md5=no])
+ 	AC_CHECK_LIB(
+ 	 crypto,
+@@ -1131,7 +1132,8 @@
+ 	  AC_CHECK_LIB(
+ 	  [uuid],
+ 	  [uuid_generate],
+-	  [],
++	  [AC_SUBST([LIBUUID_LIBADD],["-luuid"])
++     AC_DEFINE([HAVE_LIBUUID],[1],[define...])],
+ 	  [ac_libewf_have_guid_support=no])
+ 	 ])
+ 	])
+--- 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@
+ 
+ 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@
+ 
+ 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@
+ 
+ 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@
+ 
+ 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@
+ 
+ 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@
+ 
+ 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@
+ 
+ distclean: clean
+ 	/bin/rm -f Makefile
diff --git a/debian/patches/series b/debian/patches/series
index d88adcb..23fcf6b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 01-debian-directory.patch
 02-fix-acinclude-m4.patch
+03-fix-ldflags.patch
 10-fix-manpages.patch

-- 
debian-forensics/libewf