[Forensics-changes] [SCM] debian-forensics/libewf branch, debian, updated. debian/20100126-1
Cristian Greco
cristian at regolo.cc
Fri Feb 12 18:24:03 UTC 2010
The following commit has been merged in the debian branch:
commit 5a5f1da63b8b67010cf0000d2b95e5c191171e08
Author: Cristian Greco <cristian at regolo.cc>
Date: Fri Feb 12 16:08:13 2010 +0100
Imported Upstream version 20100126
diff --git a/ChangeLog b/ChangeLog
index 41664b5..e2467c1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -202,6 +202,9 @@ Beta after next stable release
* check into resume write error for 32-bit compile
* check make distclean
+20100126
+* worked on solution for Debian 4.0 posix_fadvise break
+
20100119
* re-applied 20091224 fixes
* correction of return value of several ree functions
diff --git a/acinclude.m4 b/acinclude.m4
index 7e9644f..4bbdf84 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -185,6 +185,31 @@ AC_DEFUN([LIBEWF_CHECK_FUNC_CTIME],
[1]) ]) ])
])
+dnl Function to detect if posix_fadvise is available
+AC_DEFUN([LIBEWF_CHECK_FUNC_POSIX_FADVISE],
+ [AC_CHECK_FUNCS(
+ [posix_fadvise],
+ [AC_LANG_PUSH(C)
+ AC_MSG_CHECKING(
+ [if posix_fadvise can be linked])
+ AC_LINK_IFELSE(
+ AC_LANG_PROGRAM(
+ [[#include <fcntl.h>]],
+ [[#if !defined( POSIX_FADV_SEQUENTIAL )
+#define POSIX_FADV_SEQUENTIAL 2
+#endif
+posix_fadvise(0,0,0,POSIX_FADV_SEQUENTIAL)]]),
+ [AC_MSG_RESULT(
+ [yes])
+ AC_DEFINE(
+ [HAVE_POSIX_FADVISE],
+ [1],
+ [Define to 1 if you have the posix_fadvise unction.] )],
+ [AC_MSG_RESULT(
+ [no]) ])
+ AC_LANG_POP(C) ])
+])
+
dnl Function to determine the operating system
AC_DEFUN([LIBEWF_DETERMINE_OPERATING_SYSTEM],
[ac_libewf_target_string="$target";
diff --git a/common/config.h b/common/config.h
index dc3dd1a..910f794 100644
--- a/common/config.h
+++ b/common/config.h
@@ -208,7 +208,7 @@
/* Define to 1 if you have the <openssl/sha.h> header file. */
/* #undef HAVE_OPENSSL_SHA_H */
-/* Define to 1 if you have the `posix_fadvise' function. */
+/* Define to 1 if you have the posix_fadvise unction. */
#define HAVE_POSIX_FADVISE 1
/* Define to 1 whether printf supports the conversion specifier "%jd". */
@@ -423,13 +423,13 @@
#define PACKAGE_NAME "libewf"
/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "libewf 20100119"
+#define PACKAGE_STRING "libewf 20100126"
/* Define to the one symbol short name of this package. */
#define PACKAGE_TARNAME "libewf"
/* Define to the version of this package. */
-#define PACKAGE_VERSION "20100119"
+#define PACKAGE_VERSION "20100126"
/* The size of `off_t', as computed by sizeof. */
#define SIZEOF_OFF_T 8
@@ -453,7 +453,7 @@
/* #undef TM_IN_SYS_TIME */
/* Version number of package */
-#define VERSION "20100119"
+#define VERSION "20100126"
/* Number of bits in a file offset, on hosts where this is settable. */
/* #undef _FILE_OFFSET_BITS */
diff --git a/common/config.h.in b/common/config.h.in
index aea500f..5a485ef 100644
--- a/common/config.h.in
+++ b/common/config.h.in
@@ -207,7 +207,7 @@
/* Define to 1 if you have the <openssl/sha.h> header file. */
#undef HAVE_OPENSSL_SHA_H
-/* Define to 1 if you have the `posix_fadvise' function. */
+/* Define to 1 if you have the posix_fadvise unction. */
#undef HAVE_POSIX_FADVISE
/* Define to 1 whether printf supports the conversion specifier "%jd". */
diff --git a/configure b/configure
index 860363f..6f2a59d 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.63 for libewf 20100119.
+# Generated by GNU Autoconf 2.63 for libewf 20100126.
#
# Report bugs to <forensics at hoffmannbv.nl>.
#
@@ -745,8 +745,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
# Identity of this package.
PACKAGE_NAME='libewf'
PACKAGE_TARNAME='libewf'
-PACKAGE_VERSION='20100119'
-PACKAGE_STRING='libewf 20100119'
+PACKAGE_VERSION='20100126'
+PACKAGE_STRING='libewf 20100126'
PACKAGE_BUGREPORT='forensics at hoffmannbv.nl'
ac_unique_file="include/libewf.h.in"
@@ -1537,7 +1537,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures libewf 20100119 to adapt to many kinds of systems.
+\`configure' configures libewf 20100126 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1607,7 +1607,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of libewf 20100119:";;
+ short | recursive ) echo "Configuration of libewf 20100126:";;
esac
cat <<\_ACEOF
@@ -1721,7 +1721,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-libewf configure 20100119
+libewf configure 20100126
generated by GNU Autoconf 2.63
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1735,7 +1735,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by libewf $as_me 20100119, which was
+It was created by libewf $as_me 20100126, which was
generated by GNU Autoconf 2.63. Invocation command line was
$ $0 $@
@@ -2587,7 +2587,7 @@ fi
# Define the identity of the package.
PACKAGE=libewf
- VERSION=20100119
+ VERSION=20100126
cat >>confdefs.h <<_ACEOF
@@ -26176,7 +26176,7 @@ done
-for ac_func in posix_fadvise
+for ac_func in uname
do
as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
@@ -26277,7 +26277,8 @@ fi
done
-for ac_func in uname
+
+for ac_func in posix_fadvise
do
as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
@@ -26373,11 +26374,82 @@ as_val=`eval 'as_val=${'$as_ac_var'}
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
+ ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+ { $as_echo "$as_me:$LINENO: checking if posix_fadvise can be linked" >&5
+$as_echo_n "checking if posix_fadvise can be linked... " >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <fcntl.h>
+int
+main ()
+{
+#if !defined( POSIX_FADV_SEQUENTIAL )
+#define POSIX_FADV_SEQUENTIAL 2
+#endif
+posix_fadvise(0,0,0,POSIX_FADV_SEQUENTIAL)
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
+ { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_POSIX_FADVISE 1
+_ACEOF
+
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+ ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
fi
done
+
SAVE_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS -Wall -Werror"
ac_ext=c
@@ -38114,7 +38186,7 @@ exec 6>&1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by libewf $as_me 20100119, which was
+This file was extended by libewf $as_me 20100126, which was
generated by GNU Autoconf 2.63. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -38177,7 +38249,7 @@ Report bugs to <bug-autoconf at gnu.org>."
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_version="\\
-libewf config.status 20100119
+libewf config.status 20100126
configured by $0, generated by GNU Autoconf 2.63,
with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff --git a/configure.ac b/configure.ac
index 075c20b..3b266ae 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@ AC_PREREQ( 2.59 )
AC_INIT(
[libewf],
- [20100119],
+ [20100126],
[forensics at hoffmannbv.nl])
AC_CONFIG_SRCDIR(
@@ -10,7 +10,7 @@ AC_CONFIG_SRCDIR(
AM_INIT_AUTOMAKE(
[libewf],
- [20100119])
+ [20100126])
AC_CONFIG_MACRO_DIR([m4])
@@ -564,9 +564,10 @@ AC_CHECK_FUNCS(
[Missing function: fstat],
[1]) ])
-AC_CHECK_FUNCS([posix_fadvise])
AC_CHECK_FUNCS([uname])
+LIBEWF_CHECK_FUNC_POSIX_FADVISE
+
dnl Check for printf conversion specifier support
LIBEWF_CHECK_PRINTF_JD
LIBEWF_CHECK_PRINTF_ZD
diff --git a/ewftools/device_handle.c b/ewftools/device_handle.c
index 04abd1f..165f930 100644
--- a/ewftools/device_handle.c
+++ b/ewftools/device_handle.c
@@ -98,6 +98,13 @@ typedef size_t u64;
#include "io_usb.h"
#include "storage_media_buffer.h"
+/* The definition of POSIX_FADV_SEQUENTIAL seems to be missing from fcntl.h
+ * on some versions of Linux
+ */
+#if defined( HAVE_POSIX_FADVISE ) && !defined( POSIX_FADV_SEQUENTIAL )
+#define POSIX_FADV_SEQUENTIAL 2
+#endif
+
/* Initializes the device handle
* Returns 1 if successful or -1 on error
*/
diff --git a/include/libewf/definitions.h b/include/libewf/definitions.h
index a5cde75..61b1495 100644
--- a/include/libewf/definitions.h
+++ b/include/libewf/definitions.h
@@ -25,11 +25,11 @@
#include <libewf/types.h>
-#define LIBEWF_VERSION 20100119
+#define LIBEWF_VERSION 20100126
/* The libewf version string
*/
-#define LIBEWF_VERSION_STRING "20100119"
+#define LIBEWF_VERSION_STRING "20100126"
/* The libewf file access
* bit 1 set to 1 for read access
diff --git a/libewf.pc b/libewf.pc
index eb15831..e2c449f 100644
--- a/libewf.pc
+++ b/libewf.pc
@@ -5,7 +5,7 @@ includedir=${prefix}/include
Name: libewf
Description: Library to support the Expert Witness Compression Format (EWF)
-Version: 20100119
+Version: 20100126
Libs: -L${libdir} -lewf
Libs.private: -lz
Cflags: -I${includedir}
diff --git a/libewf.spec b/libewf.spec
index d781b36..397683d 100644
--- a/libewf.spec
+++ b/libewf.spec
@@ -1,5 +1,5 @@
Name: libewf
-Version: 20100119
+Version: 20100126
Release: 1
Summary: Library to support the Expert Witness Compression Format
Group: System Environment/Libraries
diff --git a/libewf/libewf_definitions.h b/libewf/libewf_definitions.h
index 7eb245e..7d9a82a 100644
--- a/libewf/libewf_definitions.h
+++ b/libewf/libewf_definitions.h
@@ -37,11 +37,11 @@
#include <libewf/definitions.h>
#else
-#define LIBEWF_VERSION 20100119
+#define LIBEWF_VERSION 20100126
/* The libewf version string
*/
-#define LIBEWF_VERSION_STRING "20100119"
+#define LIBEWF_VERSION_STRING "20100126"
/* The libewf file access
* bit 1 set to 1 for read access
diff --git a/macosx/Introduction.rtf b/macosx/Introduction.rtf
index 9a49515..dc4dcb3 100644
--- a/macosx/Introduction.rtf
+++ b/macosx/Introduction.rtf
@@ -4,4 +4,4 @@
\margl1440\margr1440\vieww9880\viewh13400\viewkind0
\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural\pardirnatural
-\f0\fs24 \cf0 This will install a universal build of libewf 20100119 and the ewftools.}
+\f0\fs24 \cf0 This will install a universal build of libewf 20100126 and the ewftools.}
--
debian-forensics/libewf
More information about the forensics-changes
mailing list