Hello community, here is the log from the commit of package md5deep for openSUSE:Factory checked in at 2012-10-27 07:43:24 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/md5deep (Old) and /work/SRC/openSUSE:Factory/.md5deep.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "md5deep", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/md5deep/md5deep.changes 2012-06-12 21:58:45.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.md5deep.new/md5deep.changes 2012-10-27 07:43:26.000000000 +0200 @@ -1,0 +2,9 @@ +Fri Oct 26 16:57:27 UTC 2012 - [email protected] + +- updated to version 4.3 +* Bug Fixes + + Fixed check for endian-ness, affecting hash generation on + big-endian platforms. + +------------------------------------------------------------------- Old: ---- md5deep-4.2.tar.gz New: ---- md5deep-4.3.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ md5deep.spec ++++++ --- /var/tmp/diff_new_pack.520fZz/_old 2012-10-27 07:43:30.000000000 +0200 +++ /var/tmp/diff_new_pack.520fZz/_new 2012-10-27 07:43:30.000000000 +0200 @@ -17,7 +17,7 @@ Name: md5deep -Version: 4.2 +Version: 4.3 Release: 0 Summary: Compute MD5, SHA-1, SHA-256, Tiger or Whirlpool message digests License: SUSE-Public-Domain and GPL-2.0+ ++++++ md5deep-4.2.tar.gz -> md5deep-4.3.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/md5deep-4.2/ChangeLog new/md5deep-4.3/ChangeLog --- old/md5deep-4.2/ChangeLog 2012-06-11 16:00:47.000000000 +0200 +++ new/md5deep-4.3/ChangeLog 2012-10-24 03:32:21.000000000 +0200 @@ -1,3 +1,24 @@ +2012-10-22 Jesse Kornblum <[email protected]>: + + * configure.ac: Uncommented check for big endian systems. + +2012-10-12 Jesse Kornblum <[email protected]>: + + * src/threadpool.cpp: Renamed ERR function to avoid conflicts on SunOS and derivates. + +2012-09-12 Jesse Kornblum <[email protected]>: + + * man/md5deep.1, hashdeep.1: Typos + +2012-07-05 Jesse Kornblum <[email protected]>: + + * man/md5deep.1: Clarified quiet mode, -q. + * configure.ac: Version bump to 4.3 + +2012-06-29 Simson Garfinkel <[email protected]> + + * src/md5.c (MD5Final): updated md5.c code to remove compiler warning dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing]" + 2012-06-09 Jesse Kornblum <[email protected]>: * src/tiger.h tiger.c: Replaced with newer code from libgcrypt. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/md5deep-4.2/NEWS new/md5deep-4.3/NEWS --- old/md5deep-4.2/NEWS 2012-06-11 16:00:47.000000000 +0200 +++ new/md5deep-4.3/NEWS 2012-10-24 03:32:21.000000000 +0200 @@ -1,3 +1,14 @@ +** Changes in version 4.3 (24 Oct 2012) + +* Bug Fixes + + Fixed check for endian-ness, affecting hash generation on + big-endian platforms. + + Fixed minor bugs related to OpenSolaris. + + + ** Changes in version 4.2 (11 Jun 2012) * Bug Fixes diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/md5deep-4.2/config.h.in new/md5deep-4.3/config.h.in --- old/md5deep-4.2/config.h.in 2012-06-11 16:01:13.000000000 +0200 +++ new/md5deep-4.3/config.h.in 2012-10-24 03:32:46.000000000 +0200 @@ -1,5 +1,8 @@ /* config.h.in. Generated from configure.ac by autoheader. */ +/* Define if building universal (internal helper macro) */ +#undef AC_APPLE_UNIVERSAL_BUILD + /* Define to 1 if the `closedir' function returns void instead of `int'. */ #undef CLOSEDIR_VOID @@ -269,6 +272,18 @@ /* Version number of package */ #undef VERSION +/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most + significant byte first (like Motorola and SPARC, unlike Intel). */ +#if defined AC_APPLE_UNIVERSAL_BUILD +# if defined __BIG_ENDIAN__ +# define WORDS_BIGENDIAN 1 +# endif +#else +# ifndef WORDS_BIGENDIAN +# undef WORDS_BIGENDIAN +# endif +#endif + /* Number of bits in a file offset, on hosts where this is settable. */ #undef _FILE_OFFSET_BITS diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/md5deep-4.2/configure new/md5deep-4.3/configure --- old/md5deep-4.2/configure 2012-06-11 16:00:48.000000000 +0200 +++ new/md5deep-4.3/configure 2012-10-24 03:32:23.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for MD5DEEP 4.2. +# Generated by GNU Autoconf 2.68 for MD5DEEP 4.3. # # Report bugs to <[email protected]>. # @@ -560,8 +560,8 @@ # Identity of this package. PACKAGE_NAME='MD5DEEP' PACKAGE_TARNAME='md5deep' -PACKAGE_VERSION='4.2' -PACKAGE_STRING='MD5DEEP 4.2' +PACKAGE_VERSION='4.3' +PACKAGE_STRING='MD5DEEP 4.3' PACKAGE_BUGREPORT='[email protected]' PACKAGE_URL='' @@ -1264,7 +1264,7 @@ # 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 MD5DEEP 4.2 to adapt to many kinds of systems. +\`configure' configures MD5DEEP 4.3 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1334,7 +1334,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of MD5DEEP 4.2:";; + short | recursive ) echo "Configuration of MD5DEEP 4.3:";; esac cat <<\_ACEOF @@ -1429,7 +1429,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -MD5DEEP configure 4.2 +MD5DEEP configure 4.3 generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. @@ -1947,7 +1947,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by MD5DEEP $as_me 4.2, which was +It was created by MD5DEEP $as_me 4.3, which was generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -2764,7 +2764,7 @@ # Define the identity of the package. PACKAGE='md5deep' - VERSION='4.2' + VERSION='4.3' cat >>confdefs.h <<_ACEOF @@ -5294,8 +5294,231 @@ done -# Don't think we need this anymore. -# AC_C_BIGENDIAN +# There are still users on big-endian operating systems out there! + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5 +$as_echo_n "checking whether byte ordering is bigendian... " >&6; } +if ${ac_cv_c_bigendian+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_cv_c_bigendian=unknown + # See if we're dealing with a universal compiler. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#ifndef __APPLE_CC__ + not a universal capable compiler + #endif + typedef int dummy; + +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + + # Check for potential -arch flags. It is not universal unless + # there are at least two -arch flags with different values. + ac_arch= + ac_prev= + for ac_word in $CC $CFLAGS $CPPFLAGS $LDFLAGS; do + if test -n "$ac_prev"; then + case $ac_word in + i?86 | x86_64 | ppc | ppc64) + if test -z "$ac_arch" || test "$ac_arch" = "$ac_word"; then + ac_arch=$ac_word + else + ac_cv_c_bigendian=universal + break + fi + ;; + esac + ac_prev= + elif test "x$ac_word" = "x-arch"; then + ac_prev=arch + fi + done +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + if test $ac_cv_c_bigendian = unknown; then + # See if sys/param.h defines the BYTE_ORDER macro. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include <sys/types.h> + #include <sys/param.h> + +int +main () +{ +#if ! (defined BYTE_ORDER && defined BIG_ENDIAN \ + && defined LITTLE_ENDIAN && BYTE_ORDER && BIG_ENDIAN \ + && LITTLE_ENDIAN) + bogus endian macros + #endif + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + # It does; now see whether it defined to BIG_ENDIAN or not. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include <sys/types.h> + #include <sys/param.h> + +int +main () +{ +#if BYTE_ORDER != BIG_ENDIAN + not big endian + #endif + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_c_bigendian=yes +else + ac_cv_c_bigendian=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + fi + if test $ac_cv_c_bigendian = unknown; then + # See if <limits.h> defines _LITTLE_ENDIAN or _BIG_ENDIAN (e.g., Solaris). + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include <limits.h> + +int +main () +{ +#if ! (defined _LITTLE_ENDIAN || defined _BIG_ENDIAN) + bogus endian macros + #endif + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + # It does; now see whether it defined to _BIG_ENDIAN or not. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include <limits.h> + +int +main () +{ +#ifndef _BIG_ENDIAN + not big endian + #endif + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_c_bigendian=yes +else + ac_cv_c_bigendian=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + fi + if test $ac_cv_c_bigendian = unknown; then + # Compile a test program. + if test "$cross_compiling" = yes; then : + # Try to guess by grepping values from an object file. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +short int ascii_mm[] = + { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 }; + short int ascii_ii[] = + { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 }; + int use_ascii (int i) { + return ascii_mm[i] + ascii_ii[i]; + } + short int ebcdic_ii[] = + { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 }; + short int ebcdic_mm[] = + { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 }; + int use_ebcdic (int i) { + return ebcdic_mm[i] + ebcdic_ii[i]; + } + extern int foo; + +int +main () +{ +return use_ascii (foo) == use_ebcdic (foo); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + if grep BIGenDianSyS conftest.$ac_objext >/dev/null; then + ac_cv_c_bigendian=yes + fi + if grep LiTTleEnDian conftest.$ac_objext >/dev/null ; then + if test "$ac_cv_c_bigendian" = unknown; then + ac_cv_c_bigendian=no + else + # finding both strings is unlikely to happen, but who knows? + ac_cv_c_bigendian=unknown + fi + fi +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$ac_includes_default +int +main () +{ + + /* Are we little or big endian? From Harbison&Steele. */ + union + { + long int l; + char c[sizeof (long int)]; + } u; + u.l = 1; + return u.c[sizeof (long int) - 1] == 1; + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_run "$LINENO"; then : + ac_cv_c_bigendian=no +else + ac_cv_c_bigendian=yes +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext +fi + + fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_bigendian" >&5 +$as_echo "$ac_cv_c_bigendian" >&6; } + case $ac_cv_c_bigendian in #( + yes) + $as_echo "#define WORDS_BIGENDIAN 1" >>confdefs.h +;; #( + no) + ;; #( + universal) + +$as_echo "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h + + ;; #( + *) + as_fn_error $? "unknown endianness + presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;; + esac + # Checks for typedefs, structures, and compiler characteristics. { $as_echo "$as_me:${as_lineno-$LINENO}: checking for an ANSI C-conforming const" >&5 @@ -6848,6 +7071,7 @@ Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi + : "${CONFIG_STATUS=./config.status}" ac_write_fail=0 ac_clean_files_save=$ac_clean_files @@ -7256,7 +7480,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by MD5DEEP $as_me 4.2, which was +This file was extended by MD5DEEP $as_me 4.3, which was generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -7322,7 +7546,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -MD5DEEP config.status 4.2 +MD5DEEP config.status 4.3 configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/md5deep-4.2/configure.ac new/md5deep-4.3/configure.ac --- old/md5deep-4.2/configure.ac 2012-06-11 16:00:41.000000000 +0200 +++ new/md5deep-4.3/configure.ac 2012-10-24 03:29:15.000000000 +0200 @@ -3,7 +3,7 @@ # AC_PREREQ(2.57) -AC_INIT([MD5DEEP],[4.2],[[email protected]]) +AC_INIT([MD5DEEP],[4.3],[[email protected]]) AC_CONFIG_FILES([Makefile src/Makefile man/Makefile tests/Makefile tests/testfiles/Makefile ]) AM_INIT_AUTOMAKE AC_CONFIG_HEADERS([config.h]) @@ -174,8 +174,8 @@ AC_CHECK_HEADERS([sys/cdefs.h sys/resource.h pwd.h sys/utsname.h]) AC_CHECK_FUNCS([localtime_r getuid gethostname getwpuid getrusage]) -# Don't think we need this anymore. -# AC_C_BIGENDIAN +# There are still users on big-endian operating systems out there! +AC_C_BIGENDIAN # Checks for typedefs, structures, and compiler characteristics. AC_C_CONST diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/md5deep-4.2/man/hashdeep.1 new/md5deep-4.3/man/hashdeep.1 --- old/md5deep-4.2/man/hashdeep.1 2012-06-11 16:00:41.000000000 +0200 +++ new/md5deep-4.3/man/hashdeep.1 2012-10-24 03:29:15.000000000 +0200 @@ -1,4 +1,4 @@ -.TH HASHDEEP "1" "v4.2 \- 11 Jun 2012" "AFOSI" "United States Air Force" +.TH HASHDEEP "1" "v4.3 \- 24 Oct 2012" "AFOSI" "United States Air Force" .SH NAME hashdeep \- Compute, compare, or audit multiple message digests @@ -275,7 +275,7 @@ .SH REPORTING BUGS We take all bug reports \fIvery\fR seriously. Any bug that jeopardizes the -forensic integrity of this program could have serious consequenses on +forensic integrity of this program could have serious consequences on people's lives. When submitting a bug report, please include a description of the problem, how you found it, and your contact information. .PP diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/md5deep-4.2/man/md5deep.1 new/md5deep-4.3/man/md5deep.1 --- old/md5deep-4.2/man/md5deep.1 2012-06-11 16:00:41.000000000 +0200 +++ new/md5deep-4.3/man/md5deep.1 2012-10-24 03:29:15.000000000 +0200 @@ -1,4 +1,4 @@ -.TH MD5DEEP "1" "v4.2 \- 11 Jun 2012" "AFOSI" "United States Air Force" +.TH MD5DEEP "1" "v4.3 \- 24 Oct 2012" "AFOSI" "United States Air Force" .SH NAME md5deep \- Compute and compare MD5 message digests @@ -157,7 +157,8 @@ .TP \fB\-q\fR -Quiet mode. File names are omitted from the output. +Quiet mode. File names are omitted from the output. Each hash is still +followed by two spaces before the newline. .TP \fB\-Z\fR @@ -325,7 +326,7 @@ .SH REPORTING BUGS We take all bug reports \fIvery\fR seriously. Any bug that jeopardizes the -forensic integrity of this program could have serious consequenses on +forensic integrity of this program could have serious consequences on people's lives. When submitting a bug report, please include a description of the problem, how you found it, and your contact information. .PP diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/md5deep-4.2/man/sha1deep.1 new/md5deep-4.3/man/sha1deep.1 --- old/md5deep-4.2/man/sha1deep.1 2012-06-11 16:00:41.000000000 +0200 +++ new/md5deep-4.3/man/sha1deep.1 2012-10-24 03:29:15.000000000 +0200 @@ -1,4 +1,4 @@ -.TH MD5DEEP "1" "v4.2 \- 11 Jun 2012" "AFOSI" "United States Air Force" +.TH MD5DEEP "1" "v4.3 \- 24 Oct 2012" "AFOSI" "United States Air Force" .SH NAME md5deep \- Compute and compare MD5 message digests @@ -157,7 +157,8 @@ .TP \fB\-q\fR -Quiet mode. File names are omitted from the output. +Quiet mode. File names are omitted from the output. Each hash is still +followed by two spaces before the newline. .TP \fB\-Z\fR @@ -325,7 +326,7 @@ .SH REPORTING BUGS We take all bug reports \fIvery\fR seriously. Any bug that jeopardizes the -forensic integrity of this program could have serious consequenses on +forensic integrity of this program could have serious consequences on people's lives. When submitting a bug report, please include a description of the problem, how you found it, and your contact information. .PP diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/md5deep-4.2/man/sha256deep.1 new/md5deep-4.3/man/sha256deep.1 --- old/md5deep-4.2/man/sha256deep.1 2012-06-11 16:00:41.000000000 +0200 +++ new/md5deep-4.3/man/sha256deep.1 2012-10-24 03:29:15.000000000 +0200 @@ -1,4 +1,4 @@ -.TH MD5DEEP "1" "v4.2 \- 11 Jun 2012" "AFOSI" "United States Air Force" +.TH MD5DEEP "1" "v4.3 \- 24 Oct 2012" "AFOSI" "United States Air Force" .SH NAME md5deep \- Compute and compare MD5 message digests @@ -157,7 +157,8 @@ .TP \fB\-q\fR -Quiet mode. File names are omitted from the output. +Quiet mode. File names are omitted from the output. Each hash is still +followed by two spaces before the newline. .TP \fB\-Z\fR @@ -325,7 +326,7 @@ .SH REPORTING BUGS We take all bug reports \fIvery\fR seriously. Any bug that jeopardizes the -forensic integrity of this program could have serious consequenses on +forensic integrity of this program could have serious consequences on people's lives. When submitting a bug report, please include a description of the problem, how you found it, and your contact information. .PP diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/md5deep-4.2/man/tigerdeep.1 new/md5deep-4.3/man/tigerdeep.1 --- old/md5deep-4.2/man/tigerdeep.1 2012-06-11 16:00:41.000000000 +0200 +++ new/md5deep-4.3/man/tigerdeep.1 2012-10-24 03:29:15.000000000 +0200 @@ -1,4 +1,4 @@ -.TH MD5DEEP "1" "v4.2 \- 11 Jun 2012" "AFOSI" "United States Air Force" +.TH MD5DEEP "1" "v4.3 \- 24 Oct 2012" "AFOSI" "United States Air Force" .SH NAME md5deep \- Compute and compare MD5 message digests @@ -157,7 +157,8 @@ .TP \fB\-q\fR -Quiet mode. File names are omitted from the output. +Quiet mode. File names are omitted from the output. Each hash is still +followed by two spaces before the newline. .TP \fB\-Z\fR @@ -325,7 +326,7 @@ .SH REPORTING BUGS We take all bug reports \fIvery\fR seriously. Any bug that jeopardizes the -forensic integrity of this program could have serious consequenses on +forensic integrity of this program could have serious consequences on people's lives. When submitting a bug report, please include a description of the problem, how you found it, and your contact information. .PP diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/md5deep-4.2/man/whirlpooldeep.1 new/md5deep-4.3/man/whirlpooldeep.1 --- old/md5deep-4.2/man/whirlpooldeep.1 2012-06-11 16:00:41.000000000 +0200 +++ new/md5deep-4.3/man/whirlpooldeep.1 2012-10-24 03:29:15.000000000 +0200 @@ -1,4 +1,4 @@ -.TH MD5DEEP "1" "v4.2 \- 11 Jun 2012" "AFOSI" "United States Air Force" +.TH MD5DEEP "1" "v4.3 \- 24 Oct 2012" "AFOSI" "United States Air Force" .SH NAME md5deep \- Compute and compare MD5 message digests @@ -157,7 +157,8 @@ .TP \fB\-q\fR -Quiet mode. File names are omitted from the output. +Quiet mode. File names are omitted from the output. Each hash is still +followed by two spaces before the newline. .TP \fB\-Z\fR @@ -325,7 +326,7 @@ .SH REPORTING BUGS We take all bug reports \fIvery\fR seriously. Any bug that jeopardizes the -forensic integrity of this program could have serious consequenses on +forensic integrity of this program could have serious consequences on people's lives. When submitting a bug report, please include a description of the problem, how you found it, and your contact information. .PP diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/md5deep-4.2/src/files.cpp new/md5deep-4.3/src/files.cpp --- old/md5deep-4.2/src/files.cpp 2012-01-29 21:09:30.000000000 +0100 +++ new/md5deep-4.3/src/files.cpp 2012-10-24 03:29:15.000000000 +0200 @@ -11,7 +11,7 @@ * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * - * $Id: files.cpp 571 2011-12-29 09:46:10Z xchatty $ + * $Id: files.cpp 651 2012-10-23 20:39:56Z jessekornblum $ * * files.cpp was originally just part of the md5deep-family programs, not hashdeep. * It reads hash database files and incorporates them into the in-memory database. @@ -91,7 +91,7 @@ #define HASH_STRING_LENGTH (hashes[opt_md5deep_mode_algorithm].bit_length/4) /**************************************************************** - *** SUpport + *** Support Functions ****************************************************************/ // Find the index of the next comma in the string str starting at index start. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/md5deep-4.2/src/helpers.cpp new/md5deep-4.3/src/helpers.cpp --- old/md5deep-4.2/src/helpers.cpp 2012-01-29 21:09:30.000000000 +0100 +++ new/md5deep-4.3/src/helpers.cpp 2012-10-24 03:29:15.000000000 +0200 @@ -10,24 +10,27 @@ // WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. // -// $Id: helpers.cpp 601 2012-01-24 17:45:03Z xchatty $ +// $Id: helpers.cpp 646 2012-07-05 14:22:43Z jessekornblum $ #include "main.h" // Remove the newlines, if any. Works on both DOS and *nix newlines void chop_line(char *s) { - while(true){ - size_t pos = strlen(s); - if(pos>0){ - if(s[pos-1]=='\r' || s[pos-1]=='\n'){ - s[pos-1]='\000'; - continue; - } - return; - } - if(pos==0) break; + while(true) + { + size_t pos = strlen(s); + if (pos>0) + { + if (s[pos-1]=='\r' || s[pos-1]=='\n') + { + s[pos-1]='\000'; + continue; + } + return; } + if(pos==0) break; + } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/md5deep-4.2/src/md5.c new/md5deep-4.3/src/md5.c --- old/md5deep-4.2/src/md5.c 2012-01-29 21:09:30.000000000 +0100 +++ new/md5deep-4.3/src/md5.c 2012-10-24 03:29:15.000000000 +0200 @@ -143,8 +143,19 @@ byteReverse(ctx->in, 14); /* Append length in bits and transform */ - ((uint32_t *) ctx->in)[14] = ctx->bits[0]; - ((uint32_t *) ctx->in)[15] = ctx->bits[1]; + + // the two lines below generated this error: + // "md5.c:147:5: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing]" + + //((uint32_t *) ctx->in)[14] = ctx->bits[0]; + //((uint32_t *) ctx->in)[15] = ctx->bits[1]; + + // We will manually expand the cast into two statements to make + // the compiler happy... + + uint32_t *ctxin = (uint32_t *)ctx->in; + ctxin[14] = ctx->bits[0]; + ctxin[15] = ctx->bits[1]; MD5Transform(ctx->buf, (uint32_t *) ctx->in); byteReverse((unsigned char *) ctx->buf, 4); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/md5deep-4.2/src/threadpool.cpp new/md5deep-4.3/src/threadpool.cpp --- old/md5deep-4.2/src/threadpool.cpp 2012-06-05 12:27:55.000000000 +0200 +++ new/md5deep-4.3/src/threadpool.cpp 2012-10-24 03:29:15.000000000 +0200 @@ -2,7 +2,7 @@ *** THREADING SUPPORT ****************************************************************/ -// $Id: threadpool.cpp 623 2012-02-26 13:56:12Z xchatty $ +// $Id: threadpool.cpp 649 2012-10-15 12:08:22Z jessekornblum $ #include "main.h" @@ -83,11 +83,15 @@ } /* - * ERR prints an error message, gets it out and then quits. + * ERR_QUIT prints an error message, gets it out and then quits. + * It used to be 'ERR', but this created a conflict on some SunOS + * and SunOS derivatives. See + * http://dtrace.org/blogs/rm/2011/03/14/a-trip-down-into-sysregset-h/ + * for an example. On such systems 'ERR' is defined as '13'. */ -void ERR(int val,const char *msg) __attribute__ ((__noreturn__)); -void ERR(int val,const char *msg) +void ERR_QUIT(int val,const char *msg) __attribute__ ((__noreturn__)); +void ERR_QUIT(int val,const char *msg) { std::cerr << msg << "\n"; std::cerr.flush(); @@ -131,8 +135,8 @@ { numworkers = numworkers_; freethreads = numworkers; - if(pthread_cond_init(&TOMAIN,NULL)) ERR(1,"pthread_cond_init #1 failed"); - if(pthread_cond_init(&TOWORKER,NULL)) ERR(1,"pthread_cond_init #2 failed"); + if(pthread_cond_init(&TOMAIN,NULL)) ERR_QUIT(1,"pthread_cond_init #1 failed"); + if(pthread_cond_init(&TOWORKER,NULL)) ERR_QUIT(1,"pthread_cond_init #2 failed"); // lock while I create the threads M.lock(); @@ -188,7 +192,7 @@ while(freethreads==0){ // wait until a thread is free (doesn't matter which) if(pthread_cond_wait(&TOMAIN,&M.mutex)){ - ERR(1,"threadpool::schedule_work pthread_cond_wait failed"); + ERR_QUIT(1,"threadpool::schedule_work pthread_cond_wait failed"); } } work_queue.push(fdht); -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
