Skip to content

Commit 4b34500

Browse files
author
jessekornblum
committed
Release 2.11
git-svn-id: https://svn.code.sf.net/p/ssdeep/code/tags/release-2.11@219 d1b3761f-3242-0410-b1a5-fe525d664610
1 parent d62e12b commit 4b34500

34 files changed

+1421
-526
lines changed

ChangeLog

+9
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,12 @@
1+
2014-09-09: Jesse Kornblum <[email protected]>:
2+
3+
* fuzzy.c: Fixing edge case bug for signature creation.
4+
* fuzzy.h: Prevent copying with constructor.
5+
6+
2014-07-23: Jesse Kornblum <[email protected]>:
7+
8+
* sample.c, README: Fixed -l flag in compile instructions.
9+
110
2014-05-14: Jesse Kornblum <[email protected]>:
211

312
* filedata.h: Added destructor method, constructor copy by reference.

Makefile.in

+14-7
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Makefile.in generated by automake 1.13.4 from Makefile.am.
1+
# Makefile.in generated by automake 1.14.1 from Makefile.am.
22
# @configure_input@
33

44
# Copyright (C) 1994-2013 Free Software Foundation, Inc.
@@ -86,7 +86,7 @@ DIST_COMMON = INSTALL NEWS README AUTHORS ChangeLog \
8686
$(srcdir)/Makefile.in $(srcdir)/Makefile.am \
8787
$(top_srcdir)/configure $(am__configure_deps) \
8888
$(srcdir)/config.h.in depcomp $(include_HEADERS) COPYING TODO \
89-
config.guess config.sub install-sh missing ltmain.sh
89+
compile config.guess config.sub install-sh missing ltmain.sh
9090
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
9191
am__aclocal_m4_deps = $(top_srcdir)/configure.ac
9292
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -424,8 +424,8 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps)
424424
$(am__aclocal_m4_deps):
425425

426426
config.h: stamp-h1
427-
@if test ! -f $@; then rm -f stamp-h1; else :; fi
428-
@if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) stamp-h1; else :; fi
427+
@test -f $@ || rm -f stamp-h1
428+
@test -f $@ || $(MAKE) $(AM_MAKEFLAGS) stamp-h1
429429

430430
stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
431431
@rm -f stamp-h1
@@ -552,14 +552,14 @@ distclean-compile:
552552
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
553553
@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
554554
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
555-
@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $<
555+
@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
556556

557557
.c.obj:
558558
@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
559559
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
560560
@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
561561
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
562-
@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'`
562+
@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
563563

564564
.c.lo:
565565
@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@@ -777,10 +777,16 @@ dist-xz: distdir
777777
$(am__post_remove_distdir)
778778

779779
dist-tarZ: distdir
780+
@echo WARNING: "Support for shar distribution archives is" \
781+
"deprecated." >&2
782+
@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
780783
tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
781784
$(am__post_remove_distdir)
782785

783786
dist-shar: distdir
787+
@echo WARNING: "Support for distribution archives compressed with" \
788+
"legacy program 'compress' is deprecated." >&2
789+
@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
784790
shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
785791
$(am__post_remove_distdir)
786792

@@ -822,9 +828,10 @@ distcheck: dist
822828
&& dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
823829
&& am__cwd=`pwd` \
824830
&& $(am__cd) $(distdir)/_build \
825-
&& ../configure --srcdir=.. --prefix="$$dc_install_base" \
831+
&& ../configure \
826832
$(AM_DISTCHECK_CONFIGURE_FLAGS) \
827833
$(DISTCHECK_CONFIGURE_FLAGS) \
834+
--srcdir=.. --prefix="$$dc_install_base" \
828835
&& $(MAKE) $(AM_MAKEFLAGS) \
829836
&& $(MAKE) $(AM_MAKEFLAGS) dvi \
830837
&& $(MAKE) $(AM_MAKEFLAGS) check \

NEWS

+5-1
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,14 @@
1-
** Version 2.10.1 - 14 May 2014
1+
** Version 2.11 - 11 Sep 2014
22

33
* New Features
44

55
- Added fuzzy_clone function to the API.
66
- Moved to modern Win32 compiler.
77

8+
* Bug Fixes
9+
10+
- Fixed edge case on signature generaion. Behavior now matches v2.9 again.
11+
812

913
** Version 2.10 - 17 Jul 2013
1014

aclocal.m4

+120-20
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# generated automatically by aclocal 1.13.4 -*- Autoconf -*-
1+
# generated automatically by aclocal 1.14.1 -*- Autoconf -*-
22

33
# Copyright (C) 1996-2013 Free Software Foundation, Inc.
44

@@ -1326,7 +1326,7 @@ ia64-*-hpux*)
13261326
rm -rf conftest*
13271327
;;
13281328
1329-
x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \
1329+
x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
13301330
s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
13311331
# Find out which ABI we are using.
13321332
echo 'int i;' > conftest.$ac_ext
@@ -1340,10 +1340,7 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
13401340
x86_64-*linux*)
13411341
LD="${LD-ld} -m elf_i386"
13421342
;;
1343-
powerpc64le-*linux*)
1344-
LD="${LD-ld} -m elf32lppclinux"
1345-
;;
1346-
powerpc64-*linux*)
1343+
ppc64-*linux*|powerpc64-*linux*)
13471344
LD="${LD-ld} -m elf32ppclinux"
13481345
;;
13491346
s390x-*linux*)
@@ -1362,10 +1359,7 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
13621359
x86_64-*linux*)
13631360
LD="${LD-ld} -m elf_x86_64"
13641361
;;
1365-
powerpcle-*linux*)
1366-
LD="${LD-ld} -m elf64lppc"
1367-
;;
1368-
powerpc-*linux*)
1362+
ppc*-*linux*|powerpc*-*linux*)
13691363
LD="${LD-ld} -m elf64ppc"
13701364
;;
13711365
s390*-*linux*|s390*-*tpf*)
@@ -2689,14 +2683,10 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu)
26892683
# before this can be enabled.
26902684
hardcode_into_libs=yes
26912685
2692-
# Add ABI-specific directories to the system library path.
2693-
sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
2694-
26952686
# Append ld.so.conf contents to the search path
26962687
if test -f /etc/ld.so.conf; then
26972688
lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
2698-
sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
2699-
2689+
sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
27002690
fi
27012691
27022692
# We used to test for /lib/ld.so.1 and disable shared libraries on
@@ -8629,10 +8619,10 @@ m4_ifndef([_LT_PROG_CXX], [AC_DEFUN([_LT_PROG_CXX])])
86298619
# generated from the m4 files accompanying Automake X.Y.
86308620
# (This private macro should not be called outside this file.)
86318621
AC_DEFUN([AM_AUTOMAKE_VERSION],
8632-
[am__api_version='1.13'
8622+
[am__api_version='1.14'
86338623
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
86348624
dnl require some minimum version. Point them to the right macro.
8635-
m4_if([$1], [1.13.4], [],
8625+
m4_if([$1], [1.14.1], [],
86368626
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
86378627
])
86388628
@@ -8648,7 +8638,7 @@ m4_define([_AM_AUTOCONF_VERSION], [])
86488638
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
86498639
# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
86508640
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
8651-
[AM_AUTOMAKE_VERSION([1.13.4])dnl
8641+
[AM_AUTOMAKE_VERSION([1.14.1])dnl
86528642
m4_ifndef([AC_AUTOCONF_VERSION],
86538643
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
86548644
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
@@ -9015,6 +9005,12 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
90159005
# This macro actually does too much. Some checks are only needed if
90169006
# your package does certain things. But this isn't really a big deal.
90179007
9008+
dnl Redefine AC_PROG_CC to automatically invoke _AM_PROG_CC_C_O.
9009+
m4_define([AC_PROG_CC],
9010+
m4_defn([AC_PROG_CC])
9011+
[_AM_PROG_CC_C_O
9012+
])
9013+
90189014
# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
90199015
# AM_INIT_AUTOMAKE([OPTIONS])
90209016
# -----------------------------------------------
@@ -9123,15 +9119,55 @@ dnl macro is hooked onto _AC_COMPILER_EXEEXT early, see below.
91239119
AC_CONFIG_COMMANDS_PRE(dnl
91249120
[m4_provide_if([_AM_COMPILER_EXEEXT],
91259121
[AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl
9126-
])
9122+
9123+
# POSIX will say in a future version that running "rm -f" with no argument
9124+
# is OK; and we want to be able to make that assumption in our Makefile
9125+
# recipes. So use an aggressive probe to check that the usage we want is
9126+
# actually supported "in the wild" to an acceptable degree.
9127+
# See automake bug#10828.
9128+
# To make any issue more visible, cause the running configure to be aborted
9129+
# by default if the 'rm' program in use doesn't match our expectations; the
9130+
# user can still override this though.
9131+
if rm -f && rm -fr && rm -rf; then : OK; else
9132+
cat >&2 <<'END'
9133+
Oops!
9134+
9135+
Your 'rm' program seems unable to run without file operands specified
9136+
on the command line, even when the '-f' option is present. This is contrary
9137+
to the behaviour of most rm programs out there, and not conforming with
9138+
the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542>
9139+
9140+
Please tell [email protected] about your system, including the value
9141+
of your $PATH and any error possibly output before this message. This
9142+
can help us improve future automake versions.
9143+
9144+
END
9145+
if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then
9146+
echo 'Configuration will proceed anyway, since you have set the' >&2
9147+
echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2
9148+
echo >&2
9149+
else
9150+
cat >&2 <<'END'
9151+
Aborting the configuration process, to ensure you take notice of the issue.
9152+
9153+
You can download and install GNU coreutils to get an 'rm' implementation
9154+
that behaves properly: <http://www.gnu.org/software/coreutils/>.
9155+
9156+
If you want to complete the configuration process using your problematic
9157+
'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
9158+
to "yes", and re-run configure.
9159+
9160+
END
9161+
AC_MSG_ERROR([Your 'rm' program is bad, sorry.])
9162+
fi
9163+
fi])
91279164
91289165
dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not
91299166
dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further
91309167
dnl mangled by Autoconf and run in a shell conditional statement.
91319168
m4_define([_AC_COMPILER_EXEEXT],
91329169
m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])])
91339170
9134-
91359171
# When config.status generates a header, we must update the stamp-h file.
91369172
# This file resides in the same directory as the config header
91379173
# that is generated. The stamp files are numbered to have different names.
@@ -9342,6 +9378,70 @@ AC_DEFUN([_AM_SET_OPTIONS],
93429378
AC_DEFUN([_AM_IF_OPTION],
93439379
[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
93449380
9381+
# Copyright (C) 1999-2013 Free Software Foundation, Inc.
9382+
#
9383+
# This file is free software; the Free Software Foundation
9384+
# gives unlimited permission to copy and/or distribute it,
9385+
# with or without modifications, as long as this notice is preserved.
9386+
9387+
# _AM_PROG_CC_C_O
9388+
# ---------------
9389+
# Like AC_PROG_CC_C_O, but changed for automake. We rewrite AC_PROG_CC
9390+
# to automatically call this.
9391+
AC_DEFUN([_AM_PROG_CC_C_O],
9392+
[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
9393+
AC_REQUIRE_AUX_FILE([compile])dnl
9394+
AC_LANG_PUSH([C])dnl
9395+
AC_CACHE_CHECK(
9396+
[whether $CC understands -c and -o together],
9397+
[am_cv_prog_cc_c_o],
9398+
[AC_LANG_CONFTEST([AC_LANG_PROGRAM([])])
9399+
# Make sure it works both with $CC and with simple cc.
9400+
# Following AC_PROG_CC_C_O, we do the test twice because some
9401+
# compilers refuse to overwrite an existing .o file with -o,
9402+
# though they will create one.
9403+
am_cv_prog_cc_c_o=yes
9404+
for am_i in 1 2; do
9405+
if AM_RUN_LOG([$CC -c conftest.$ac_ext -o conftest2.$ac_objext]) \
9406+
&& test -f conftest2.$ac_objext; then
9407+
: OK
9408+
else
9409+
am_cv_prog_cc_c_o=no
9410+
break
9411+
fi
9412+
done
9413+
rm -f core conftest*
9414+
unset am_i])
9415+
if test "$am_cv_prog_cc_c_o" != yes; then
9416+
# Losing compiler, so override with the script.
9417+
# FIXME: It is wrong to rewrite CC.
9418+
# But if we don't then we get into trouble of one sort or another.
9419+
# A longer-term fix would be to have automake use am__CC in this case,
9420+
# and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
9421+
CC="$am_aux_dir/compile $CC"
9422+
fi
9423+
AC_LANG_POP([C])])
9424+
9425+
# For backward compatibility.
9426+
AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])])
9427+
9428+
# Copyright (C) 2001-2013 Free Software Foundation, Inc.
9429+
#
9430+
# This file is free software; the Free Software Foundation
9431+
# gives unlimited permission to copy and/or distribute it,
9432+
# with or without modifications, as long as this notice is preserved.
9433+
9434+
# AM_RUN_LOG(COMMAND)
9435+
# -------------------
9436+
# Run COMMAND, save the exit status in ac_status, and log it.
9437+
# (This has been adapted from Autoconf's _AC_RUN_LOG macro.)
9438+
AC_DEFUN([AM_RUN_LOG],
9439+
[{ echo "$as_me:$LINENO: $1" >&AS_MESSAGE_LOG_FD
9440+
($1) >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD
9441+
ac_status=$?
9442+
echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
9443+
(exit $ac_status); }])
9444+
93459445
# Check to make sure that the build environment is sane. -*- Autoconf -*-
93469446
93479447
# Copyright (C) 1996-2013 Free Software Foundation, Inc.

0 commit comments

Comments
 (0)