Hello community, here is the log from the commit of package libsigscan for openSUSE:Factory checked in at 2015-08-14 14:46:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libsigscan (Old) and /work/SRC/openSUSE:Factory/.libsigscan.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libsigscan" Changes: -------- --- /work/SRC/openSUSE:Factory/libsigscan/libsigscan.changes 2015-03-28 18:38:39.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libsigscan.new/libsigscan.changes 2015-08-14 14:46:55.000000000 +0200 @@ -1,0 +2,10 @@ +Wed Jul 1 22:05:45 UTC 2015 - greg.freem...@gmail.com + +- update to v20150627 + * required by plaso v1.3 + * worked on Python bindings + * fixes in sigscan.conf +- update url field to point to github +- for the python sub-package add a Requires libsigscan + +------------------------------------------------------------------- Old: ---- libsigscan-experimental-20150125.tar.gz New: ---- libsigscan-experimental-20150627.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libsigscan.spec ++++++ --- /var/tmp/diff_new_pack.mQOBMn/_old 2015-08-14 14:46:56.000000000 +0200 +++ /var/tmp/diff_new_pack.mQOBMn/_new 2015-08-14 14:46:56.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package libsigscan # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,15 +18,13 @@ Name: libsigscan %define lname libsigscan1 -%define timestamp 20150125 +%define timestamp 20150627 Version: 0~%timestamp Release: 0 Summary: Library for binary signature scanning License: LGPL-3.0+ Group: Productivity/File utilities -Url: http://code.google.com/p/libpff/ - -#DL-URL: https://googledrive.com/host/0B3fBvzttpiiScU9qcG5ScEZKZE0/libpff-experimental-20130722.tar.gz +Url: https://github.com/libyal/libsigscan/wiki Source: https://github.com/libyal/libsigscan/releases/download/%timestamp/libsigscan-experimental-%timestamp.tar.gz BuildRequires: pkg-config BuildRequires: python-devel @@ -66,7 +64,6 @@ %package devel Summary: Development files for libigscan -License: LGPL-3.0+ Group: Development/Libraries/C and C++ Requires: %lname = %version @@ -78,10 +75,10 @@ %package -n python-%name Summary: Python bindings for libsigscan -License: LGPL-3.0+ Group: Development/Libraries/Python +Requires: %{lname} = %{version} Requires: python -Provides: pysigscan = %version +Provides: pysigscan = %{version} %description -n python-%name Python bindings for libsigscan. ++++++ libsigscan-experimental-20150125.tar.gz -> libsigscan-experimental-20150627.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsigscan-20150125/ChangeLog new/libsigscan-20150627/ChangeLog --- old/libsigscan-20150125/ChangeLog 2015-01-25 15:22:33.000000000 +0100 +++ new/libsigscan-20150627/ChangeLog 2015-06-27 10:36:52.000000000 +0200 @@ -35,6 +35,13 @@ * sigscan - add test +20150617 +* worked on Python bindings + +20150204 +* fixes in sigscan.conf +* added sigscan.conf to dpkf/rules file + 20150125 * changes for deployment diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsigscan-20150125/common/config.h new/libsigscan-20150627/common/config.h --- old/libsigscan-20150125/common/config.h 2015-02-04 18:00:51.000000000 +0100 +++ new/libsigscan-20150627/common/config.h 2015-06-27 10:51:12.000000000 +0200 @@ -504,7 +504,7 @@ #define PACKAGE_NAME "libsigscan" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "libsigscan 20150125" +#define PACKAGE_STRING "libsigscan 20150627" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "libsigscan" @@ -513,7 +513,7 @@ #define PACKAGE_URL "" /* Define to the version of this package. */ -#define PACKAGE_VERSION "20150125" +#define PACKAGE_VERSION "20150627" /* The size of `off_t', as computed by sizeof. */ #define SIZEOF_OFF_T 8 @@ -531,7 +531,7 @@ /* #undef STRERROR_R_CHAR_P */ /* Version number of package */ -#define VERSION "20150125" +#define VERSION "20150627" /* Enable large inode numbers on Mac OS X 10.5. */ #ifndef _DARWIN_USE_64_BIT_INODE diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsigscan-20150125/configure new/libsigscan-20150627/configure --- old/libsigscan-20150125/configure 2015-02-04 18:00:34.000000000 +0100 +++ new/libsigscan-20150627/configure 2015-06-27 10:51:00.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for libsigscan 20150125. +# Generated by GNU Autoconf 2.69 for libsigscan 20150627. # # Report bugs to <joachim.m...@gmail.com>. # @@ -590,8 +590,8 @@ # Identity of this package. PACKAGE_NAME='libsigscan' PACKAGE_TARNAME='libsigscan' -PACKAGE_VERSION='20150125' -PACKAGE_STRING='libsigscan 20150125' +PACKAGE_VERSION='20150627' +PACKAGE_STRING='libsigscan 20150627' PACKAGE_BUGREPORT='joachim.m...@gmail.com' PACKAGE_URL='' @@ -1553,7 +1553,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 libsigscan 20150125 to adapt to many kinds of systems. +\`configure' configures libsigscan 20150627 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1623,7 +1623,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of libsigscan 20150125:";; + short | recursive ) echo "Configuration of libsigscan 20150627:";; esac cat <<\_ACEOF @@ -1841,7 +1841,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -libsigscan configure 20150125 +libsigscan configure 20150627 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2493,7 +2493,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by libsigscan $as_me 20150125, which was +It was created by libsigscan $as_me 20150627, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3321,7 +3321,7 @@ # Define the identity of the package. PACKAGE='libsigscan' - VERSION='20150125' + VERSION='20150627' cat >>confdefs.h <<_ACEOF @@ -36601,7 +36601,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by libsigscan $as_me 20150125, which was +This file was extended by libsigscan $as_me 20150627, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -36667,7 +36667,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -libsigscan config.status 20150125 +libsigscan config.status 20150627 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsigscan-20150125/configure.ac new/libsigscan-20150627/configure.ac --- old/libsigscan-20150125/configure.ac 2015-01-25 15:21:18.000000000 +0100 +++ new/libsigscan-20150627/configure.ac 2015-06-27 10:36:36.000000000 +0200 @@ -2,7 +2,7 @@ AC_INIT( [libsigscan], - [20150125], + [20150627], [joachim.m...@gmail.com]) AC_CONFIG_SRCDIR( diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsigscan-20150125/dpkg/changelog new/libsigscan-20150627/dpkg/changelog --- old/libsigscan-20150125/dpkg/changelog 2015-02-04 18:00:51.000000000 +0100 +++ new/libsigscan-20150627/dpkg/changelog 2015-06-27 10:51:12.000000000 +0200 @@ -1,5 +1,5 @@ -libsigscan (20150125-1) unstable; urgency=low +libsigscan (20150627-1) unstable; urgency=low * Auto-generated - -- Joachim Metz <joachim.m...@gmail.com> Wed, 04 Feb 2015 18:00:50 +0100 + -- Joachim Metz <joachim.m...@gmail.com> Sat, 27 Jun 2015 10:51:11 +0200 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsigscan-20150125/dpkg/copyright new/libsigscan-20150627/dpkg/copyright --- old/libsigscan-20150125/dpkg/copyright 2015-02-04 18:00:51.000000000 +0100 +++ new/libsigscan-20150627/dpkg/copyright 2015-06-27 10:51:12.000000000 +0200 @@ -1,6 +1,6 @@ This work was packaged for Debian by: - Joachim Metz <joachim.m...@gmail.com> on Wed, 04 Feb 2015 18:00:50 +0100 + Joachim Metz <joachim.m...@gmail.com> on Sat, 27 Jun 2015 10:51:11 +0200 It was downloaded from https://github.com/libyal/libsigscan/ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsigscan-20150125/dpkg/rules new/libsigscan-20150627/dpkg/rules --- old/libsigscan-20150125/dpkg/rules 2014-12-29 07:14:28.000000000 +0100 +++ new/libsigscan-20150627/dpkg/rules 2015-02-04 19:05:40.000000000 +0100 @@ -31,6 +31,7 @@ dh_install "debian/tmp/usr/share/man/man3/*" -p libsigscan-dev # Create the libsigscan-tools package. dh_install "debian/tmp/usr/bin/*" -p libsigscan-tools + dh_install "debian/tmp/etc/sigscan.conf" -p libsigscan-tools dh_install "debian/tmp/usr/share/man/man1/*" -p libsigscan-tools # Create the libsigscan-python package. dh_install -X"*_d.so" "debian/tmp/usr/lib/python*/*" -p libsigscan-python diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsigscan-20150125/etc/sigscan.conf new/libsigscan-20150627/etc/sigscan.conf --- old/libsigscan-20150125/etc/sigscan.conf 2015-01-15 18:00:42.000000000 +0100 +++ new/libsigscan-20150627/etc/sigscan.conf 2015-02-04 18:58:16.000000000 +0100 @@ -20,8 +20,8 @@ qcow 0 QFI\xfb rar 0 Rar!\x1a\x07\x00 regf 0 regf -tar 257 ustar\0x00 -tar_old 257 ustar\x20\x20\0x00 +tar 257 ustar\x00 +tar_old 257 ustar\x20\x20\x00 vhdi_header 0 conectix vhdi_footer -512 conectix wtcdb_cache 0 CMMM diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsigscan-20150125/include/libsigscan/definitions.h new/libsigscan-20150627/include/libsigscan/definitions.h --- old/libsigscan-20150125/include/libsigscan/definitions.h 2015-02-04 18:00:51.000000000 +0100 +++ new/libsigscan-20150627/include/libsigscan/definitions.h 2015-06-27 10:51:12.000000000 +0200 @@ -24,11 +24,11 @@ #include <libsigscan/types.h> -#define LIBSIGSCAN_VERSION 20150125 +#define LIBSIGSCAN_VERSION 20150627 /* The version string */ -#define LIBSIGSCAN_VERSION_STRING "20150125" +#define LIBSIGSCAN_VERSION_STRING "20150627" /* The access flags definitions * bit 1 set to 1 for read access diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsigscan-20150125/include/libsigscan.h new/libsigscan-20150627/include/libsigscan.h --- old/libsigscan-20150125/include/libsigscan.h 2015-02-04 18:00:51.000000000 +0100 +++ new/libsigscan-20150627/include/libsigscan.h 2015-06-27 10:51:12.000000000 +0200 @@ -186,6 +186,15 @@ libsigscan_scanner_t *scanner, libsigscan_error_t **error ); +/* Sets the scan buffer size + * Returns 1 if successful or -1 on error + */ +LIBSIGSCAN_EXTERN \ +int libsigscan_scanner_set_scan_buffer_size( + libsigscan_scanner_t *scanner, + size_t scan_buffer_size, + libsigscan_error_t **error ); + /* Adds a signature * Returns 1 if successful, 0 if signature already exists or -1 on error */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsigscan-20150125/include/libsigscan.h.in new/libsigscan-20150627/include/libsigscan.h.in --- old/libsigscan-20150125/include/libsigscan.h.in 2015-01-03 10:35:27.000000000 +0100 +++ new/libsigscan-20150627/include/libsigscan.h.in 2015-06-27 10:39:53.000000000 +0200 @@ -186,6 +186,15 @@ libsigscan_scanner_t *scanner, libsigscan_error_t **error ); +/* Sets the scan buffer size + * Returns 1 if successful or -1 on error + */ +LIBSIGSCAN_EXTERN \ +int libsigscan_scanner_set_scan_buffer_size( + libsigscan_scanner_t *scanner, + size_t scan_buffer_size, + libsigscan_error_t **error ); + /* Adds a signature * Returns 1 if successful, 0 if signature already exists or -1 on error */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsigscan-20150125/libcerror/libcerror_definitions.h new/libsigscan-20150627/libcerror/libcerror_definitions.h --- old/libsigscan-20150125/libcerror/libcerror_definitions.h 2015-01-04 12:04:36.000000000 +0100 +++ new/libsigscan-20150627/libcerror/libcerror_definitions.h 2015-06-27 10:38:05.000000000 +0200 @@ -35,11 +35,11 @@ */ #else -#define LIBCERROR_VERSION 20150101 +#define LIBCERROR_VERSION 20150407 /* The libcstring version string */ -#define LIBCERROR_VERSION_STRING "20150101" +#define LIBCERROR_VERSION_STRING "20150407" /* The error domains */ @@ -238,6 +238,17 @@ LIBCERROR_MEMORY_ERROR_SET_FAILED = 3 }; +/* The output error codes + */ +enum LIBCERROR_OUTPUT_ERROR +{ + LIBCERROR_OUTPUT_ERROR_GENERIC = 0, + + /* There is insuficient space to write the output + */ + LIBCERROR_OUTPUT_ERROR_INSUFFICIENT_SPACE = 1 +}; + /* The runtime error codes * to signify errors regarding runtime processing */ @@ -306,17 +317,6 @@ LIBCERROR_RUNTIME_ERROR_ABORT_REQUESTED = 15 }; -/* The output error codes - */ -enum LIBCERROR_OUTPUT_ERROR -{ - LIBCERROR_OUTPUT_ERROR_GENERIC = 0, - - /* There is insuficient space to write the output - */ - LIBCERROR_OUTPUT_ERROR_INSUFFICIENT_SPACE = 1 -}; - #endif /* !defined( HAVE_LOCAL_LIBCERROR ) */ #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsigscan-20150125/libcerror/libcerror_error.c new/libsigscan-20150627/libcerror/libcerror_error.c --- old/libsigscan-20150125/libcerror/libcerror_error.c 2015-01-04 12:04:36.000000000 +0100 +++ new/libsigscan-20150627/libcerror/libcerror_error.c 2015-06-27 10:38:05.000000000 +0200 @@ -410,12 +410,8 @@ size_t size ) { libcerror_internal_error_t *internal_error = NULL; - size_t string_index = 0; - int message_index = 0; - -#if defined( LIBCSTRING_HAVE_WIDE_SYSTEM_CHARACTER ) size_t print_count = 0; -#endif + int message_index = 0; if( error == NULL ) { @@ -447,8 +443,8 @@ #if defined( _MSC_VER ) if( wcstombs_s( &print_count, - &( string[ string_index ] ), - size - string_index, + string, + size, internal_error->messages[ message_index ], _TRUNCATE ) != 0 ) { @@ -456,45 +452,45 @@ } #else print_count = wcstombs( - &( string[ string_index ] ), + string, internal_error->messages[ message_index ], - size - string_index ); + size ); if( print_count == (size_t) -1 ) { return( -1 ); } -#endif - string_index += print_count; +#endif /* defined( _MSC_VER ) */ - if( string_index >= size ) + if( print_count >= size ) { return( -1 ); } #else - if( ( string_index + internal_error->sizes[ message_index ] ) > size ) + if( internal_error->sizes[ message_index ] > size ) { return( -1 ); } if( libcstring_narrow_string_copy( - &( string[ string_index ] ), + string, internal_error->messages[ message_index ], internal_error->sizes[ message_index ] ) == NULL ) { - string[ string_index ] = (libcstring_system_character_t) 0; + string[ 0 ] = (libcstring_system_character_t) 0; return( -1 ); } - string_index += internal_error->sizes[ message_index ]; + print_count = internal_error->sizes[ message_index ]; + + string[ print_count ] = (libcstring_system_character_t) 0; - string[ string_index ] = (libcstring_system_character_t) 0; #endif /* defined( LIBCSTRING_HAVE_WIDE_SYSTEM_CHARACTER ) */ } - if( string_index > (size_t) INT_MAX ) + if( print_count > (size_t) INT_MAX ) { return( -1 ); } - return( (int) string_index ); + return( (int) print_count ); } /* Prints a backtrace of the error to the stream @@ -645,6 +641,8 @@ #endif /* defined( LIBCSTRING_HAVE_WIDE_SYSTEM_CHARACTER ) */ } } + string_index += 1; + if( string_index > (size_t) INT_MAX ) { return( -1 ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsigscan-20150125/libcerror/libcerror_system.c new/libsigscan-20150627/libcerror/libcerror_system.c --- old/libsigscan-20150125/libcerror/libcerror_system.c 2015-01-04 12:04:37.000000000 +0100 +++ new/libsigscan-20150627/libcerror/libcerror_system.c 2015-06-27 10:38:05.000000000 +0200 @@ -59,7 +59,7 @@ #define SUBLANG_DEFAULT 1 #endif -#if defined( WINAPI ) && ( WINVER <= 0x0500 ) && !defined( USE_CRT_FUNCTIONS ) +#if defined( WINAPI ) && ( WINVER <= 0x0500 ) /* Cross Windows safe version of FormatMessageA * Returns TRUE if successful or FALSE on error @@ -169,7 +169,7 @@ #endif -#if defined( WINAPI ) && ( WINVER >= 0x0501 ) && !defined( USE_CRT_FUNCTIONS ) +#if defined( WINAPI ) && ( WINVER >= 0x0501 ) /* Retrieves a descriptive string of the error number * This function uses the WINAPI functions for Windows XP or later @@ -251,49 +251,6 @@ return( (int) print_count ); } -#elif defined( WINAPI ) && defined( USE_CRT_FUNCTIONS ) && defined( _MSC_VER ) - -/* Retrieves a descriptive string of the error number - * This function uses the Visual Studio C runtime library functions - * Returns the string_length if successful or -1 on error - */ -int libcerror_system_copy_string_from_error_number( - libcstring_system_character_t *string, - size_t string_size, - uint32_t error_number ) -{ - size_t string_length = 0; - - if( string == NULL ) - { - return( -1 ); - } - if( string_size > (size_t) INT_MAX ) - { - return( -1 ); - } -#if defined( LIBCSTRING_HAVE_WIDE_SYSTEM_CHARACTER ) - if( _wcserror_s( - string, - string_size, - (int) error_number ) != 0 ) -#else - if( strerror_s( - string, - string_size, - (int) error_number ) != 0 ) -#endif - { - return( -1 ); - } - string[ string_size - 1 ] = 0; - - string_length = libcstring_system_string_length( - string ); - - return( (int) string_length ); -} - #elif defined( HAVE_STRERROR_R ) /* Retrieves a descriptive string of the error number diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsigscan-20150125/libcerror/libcerror_system.h new/libsigscan-20150627/libcerror/libcerror_system.h --- old/libsigscan-20150125/libcerror/libcerror_system.h 2015-01-04 12:04:37.000000000 +0100 +++ new/libsigscan-20150627/libcerror/libcerror_system.h 2015-06-27 10:38:05.000000000 +0200 @@ -35,7 +35,7 @@ extern "C" { #endif -#if defined( WINAPI ) && ( WINVER <= 0x0500 ) && !defined( USE_CRT_FUNCTIONS ) +#if defined( WINAPI ) && ( WINVER <= 0x0500 ) DWORD libcerror_FormatMessageA( DWORD flags, LPCVOID source, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsigscan-20150125/libcnotify/libcnotify_print.c new/libsigscan-20150627/libcnotify/libcnotify_print.c --- old/libsigscan-20150125/libcnotify/libcnotify_print.c 2015-01-04 12:04:37.000000000 +0100 +++ new/libsigscan-20150627/libcnotify/libcnotify_print.c 2015-06-27 10:38:06.000000000 +0200 @@ -134,8 +134,9 @@ while( data_iterator < data_size ) { if( ( ( print_data_flags & LIBCNOTIFY_PRINT_DATA_FLAG_GROUP_DATA ) != 0 ) + && ( data_size >= 32 ) && ( data_iterator >= 16 ) - && ( ( data_iterator + 32 ) <= data_size ) ) + && ( data_iterator <= ( data_size - 32 ) ) ) { if( ( memory_compare( &( data[ data_iterator - 16 ] ), diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsigscan-20150125/libcsystem/libcsystem_string.c new/libsigscan-20150627/libcsystem/libcsystem_string.c --- old/libsigscan-20150125/libcsystem/libcsystem_string.c 2015-01-04 12:04:38.000000000 +0100 +++ new/libsigscan-20150627/libcsystem/libcsystem_string.c 2015-06-27 10:38:07.000000000 +0200 @@ -124,7 +124,7 @@ return( 1 ); } -/* Copies a string of a decimal value to a 16-bit value +/* Copies a string of a decimal value to a 64-bit value * Returns 1 if successful or -1 on error */ int libcsystem_string_decimal_copy_to_64_bit( diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsigscan-20150125/libcthreads/libcthreads_definitions.h new/libsigscan-20150627/libcthreads/libcthreads_definitions.h --- old/libsigscan-20150125/libcthreads/libcthreads_definitions.h 2015-01-04 12:04:37.000000000 +0100 +++ new/libsigscan-20150627/libcthreads/libcthreads_definitions.h 2015-06-27 10:38:05.000000000 +0200 @@ -35,11 +35,11 @@ */ #else -#define LIBCTHREADS_VERSION 20150104 +#define LIBCTHREADS_VERSION 20150406 /* The libcthreads version string */ -#define LIBCTHREADS_VERSION_STRING "20150104" +#define LIBCTHREADS_VERSION_STRING "20150406" #endif /* !defined( HAVE_LOCAL_LIBCTHREADS ) */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsigscan-20150125/libcthreads/libcthreads_repeating_thread.c new/libsigscan-20150627/libcthreads/libcthreads_repeating_thread.c --- old/libsigscan-20150125/libcthreads/libcthreads_repeating_thread.c 2015-01-04 12:04:37.000000000 +0100 +++ new/libsigscan-20150627/libcthreads/libcthreads_repeating_thread.c 2015-06-27 10:38:05.000000000 +0200 @@ -43,6 +43,7 @@ #if !defined( HAVE_LOCAL_LIBCTHREADS ) || defined( HAVE_MULTI_THREAD_SUPPORT ) #if defined( WINAPI ) + /* Start function helper function for WINAPI * Returns 0 if successful or 1 on error */ @@ -50,7 +51,7 @@ void *arguments ) { libcthreads_internal_repeating_thread_t *internal_repeating_thread = NULL; - DWORD result = 1; + DWORD result = 0; int start_function_result = 0; if( arguments != NULL ) @@ -60,7 +61,7 @@ if( ( internal_repeating_thread != NULL ) && ( internal_repeating_thread->start_function != NULL ) ) { - result = 0; + internal_repeating_thread->start_function_result = 1; do { @@ -86,12 +87,17 @@ internal_repeating_thread->start_function_arguments ); if( ( start_function_result != 1 ) - && ( result == 0 ) ) + && ( internal_repeating_thread->start_function_result == 1 ) ) { - start_function_result = 0; + internal_repeating_thread->start_function_result = start_function_result; } } while( internal_repeating_thread->status != LIBCTHREADS_STATUS_EXIT ); + + if( internal_repeating_thread->start_function_result != 1 ) + { + result = 1; + } } } ExitThread( @@ -99,6 +105,7 @@ } #elif defined( HAVE_PTHREAD_H ) + /* Start function helper function for pthread * Returns a pointer to the start function result if successful or NULL on error */ @@ -156,7 +163,7 @@ result ); } -#endif +#endif /* defined( WINAPI ) else defined( HAVE_PTHREAD_H ) */ /* Creates a repeating thread * Make sure the value repeating_thread is referencing, is set to NULL diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsigscan-20150125/libcthreads/libcthreads_repeating_thread.h new/libsigscan-20150627/libcthreads/libcthreads_repeating_thread.h --- old/libsigscan-20150125/libcthreads/libcthreads_repeating_thread.h 2015-01-04 12:04:37.000000000 +0100 +++ new/libsigscan-20150627/libcthreads/libcthreads_repeating_thread.h 2015-06-27 10:38:05.000000000 +0200 @@ -56,10 +56,6 @@ /* The thread */ pthread_t thread; - - /* The start functions return value - */ - int start_function_result; #else #error Missing thread type #endif @@ -73,6 +69,10 @@ */ void *start_function_arguments; + /* The start functions return value + */ + int start_function_result; + /* The condition mutex */ libcthreads_mutex_t *condition_mutex; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsigscan-20150125/libsigscan/libsigscan.rc new/libsigscan-20150627/libsigscan/libsigscan.rc --- old/libsigscan-20150125/libsigscan/libsigscan.rc 2015-02-04 18:00:51.000000000 +0100 +++ new/libsigscan-20150627/libsigscan/libsigscan.rc 2015-06-27 10:51:12.000000000 +0200 @@ -22,12 +22,12 @@ BLOCK "040904E4" BEGIN VALUE "FileDescription", "Library for binary signature scanning\0" - VALUE "FileVersion", "20150125" "\0" + VALUE "FileVersion", "20150627" "\0" VALUE "InternalName", "libsigscan.dll\0" VALUE "LegalCopyright", "(C) 2014-2015, Joachim Metz <joachim.m...@gmail.com>\0" VALUE "OriginalFilename", "libsigscan.dll\0" VALUE "ProductName", "libsigscan\0" - VALUE "ProductVersion", "20150125" "\0" + VALUE "ProductVersion", "20150627" "\0" VALUE "Comments", "For more information visit https://github.com/libyal/libsigscan/\0"; END END diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsigscan-20150125/libsigscan/libsigscan_definitions.h new/libsigscan-20150627/libsigscan/libsigscan_definitions.h --- old/libsigscan-20150125/libsigscan/libsigscan_definitions.h 2015-02-04 18:00:51.000000000 +0100 +++ new/libsigscan-20150627/libsigscan/libsigscan_definitions.h 2015-06-27 10:51:12.000000000 +0200 @@ -37,11 +37,11 @@ * for local use of libsigscan */ #else -#define LIBSIGSCAN_VERSION 20150125 +#define LIBSIGSCAN_VERSION 20150627 /* The version string */ -#define LIBSIGSCAN_VERSION_STRING "20150125" +#define LIBSIGSCAN_VERSION_STRING "20150627" /* The access flags definitions * bit 1 set to 1 for read access diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsigscan-20150125/libsigscan.spec new/libsigscan-20150627/libsigscan.spec --- old/libsigscan-20150125/libsigscan.spec 2015-02-04 18:00:51.000000000 +0100 +++ new/libsigscan-20150627/libsigscan.spec 2015-06-27 10:51:12.000000000 +0200 @@ -1,5 +1,5 @@ Name: libsigscan -Version: 20150125 +Version: 20150627 Release: 1 Summary: Library for binary signature scanning Group: System Environment/Libraries @@ -87,6 +87,6 @@ %{_libdir}/python*/site-packages/*.so %changelog -* Wed Feb 4 2015 Joachim Metz <joachim.m...@gmail.com> 20150125-1 +* Sat Jun 27 2015 Joachim Metz <joachim.m...@gmail.com> 20150627-1 - Auto-generated diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsigscan-20150125/libuna/libuna_inline.h new/libsigscan-20150627/libuna/libuna_inline.h --- old/libsigscan-20150125/libuna/libuna_inline.h 2015-01-04 12:04:37.000000000 +0100 +++ new/libsigscan-20150627/libuna/libuna_inline.h 2015-06-27 10:38:06.000000000 +0200 @@ -27,7 +27,7 @@ #if defined( _MSC_VER ) #define LIBUNA_INLINE _inline -#elif defined( __BORLANDC__ ) || defined( __clang__ ) +#elif defined( __BORLANDC__ ) || defined( __clang__ ) || ( defined( __GNUC__ ) && __GNUC__ >= 5 ) #define LIBUNA_INLINE /* inline */ #else diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsigscan-20150125/manuals/libsigscan.3 new/libsigscan-20150627/manuals/libsigscan.3 --- old/libsigscan-20150125/manuals/libsigscan.3 2015-01-06 08:11:25.000000000 +0100 +++ new/libsigscan-20150627/manuals/libsigscan.3 2015-06-27 10:39:56.000000000 +0200 @@ -1,4 +1,4 @@ -.Dd January 4, 2015 +.Dd June 27, 2015 .Dt libsigscan 3 .Os libsigscan .Sh NAME @@ -49,6 +49,8 @@ .Ft int .Fn libsigscan_scanner_signal_abort "libsigscan_scanner_t *scanner, libsigscan_error_t **error" .Ft int +.Fn libsigscan_scanner_set_scan_buffer_size "libsigscan_scanner_t *scanner, size_t scan_buffer_size, libsigscan_error_t **error" +.Ft int .Fn libsigscan_scanner_add_signature "libsigscan_scanner_t *scanner, const char *identifier, size_t identifier_length, off64_t pattern_offset, const uint8_t *pattern, size_t pattern_size, uint32_t signature_flags, libsigscan_error_t **error" .Ft int .Fn libsigscan_scanner_scan_start "libsigscan_scanner_t *scanner, libsigscan_scan_state_t *scan_state, libsigscan_error_t **error" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsigscan-20150125/pysigscan/pysigscan_scan_state.c new/libsigscan-20150627/pysigscan/pysigscan_scan_state.c --- old/libsigscan-20150125/pysigscan/pysigscan_scan_state.c 2015-01-03 09:51:06.000000000 +0100 +++ new/libsigscan-20150627/pysigscan/pysigscan_scan_state.c 2015-06-27 10:41:16.000000000 +0200 @@ -38,7 +38,7 @@ PyMethodDef pysigscan_scan_state_object_methods[] = { { "set_data_size", - (PyCFunction) pysigscan_scanner_set_data_size, + (PyCFunction) pysigscan_scan_state_set_data_size, METH_VARARGS | METH_KEYWORDS, "set_data_size(data_size) -> None\n" "\n" @@ -333,13 +333,13 @@ /* Sets the size of the data * Returns a Python object if successful or NULL on error */ -PyObject *pysigscan_scanner_set_data_size( +PyObject *pysigscan_scan_state_set_data_size( pysigscan_scan_state_t *pysigscan_scan_state, PyObject *arguments, PyObject *keywords ) { libcerror_error_t *error = NULL; - static char *function = "pysigscan_scanner_set_data_size"; + static char *function = "pysigscan_scan_state_set_data_size"; static char *keyword_list[] = { "data_size", NULL }; size64_t data_size = 0; int result = 0; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsigscan-20150125/pysigscan/pysigscan_scan_state.h new/libsigscan-20150627/pysigscan/pysigscan_scan_state.h --- old/libsigscan-20150125/pysigscan/pysigscan_scan_state.h 2015-01-03 09:35:55.000000000 +0100 +++ new/libsigscan-20150627/pysigscan/pysigscan_scan_state.h 2015-06-27 10:40:59.000000000 +0200 @@ -58,7 +58,7 @@ void pysigscan_scan_state_free( pysigscan_scan_state_t *pysigscan_scan_state ); -PyObject *pysigscan_scanner_set_data_size( +PyObject *pysigscan_scan_state_set_data_size( pysigscan_scan_state_t *pysigscan_scan_state, PyObject *arguments, PyObject *keywords ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsigscan-20150125/pysigscan/pysigscan_scanner.c new/libsigscan-20150627/pysigscan/pysigscan_scanner.c --- old/libsigscan-20150125/pysigscan/pysigscan_scanner.c 2015-01-03 12:35:17.000000000 +0100 +++ new/libsigscan-20150627/pysigscan/pysigscan_scanner.c 2015-06-27 10:48:21.000000000 +0200 @@ -54,6 +54,13 @@ "\n" "Signals the scanner to abort the current activity." }, + { "set_scan_buffer_size", + (PyCFunction) pysigscan_scanner_set_scan_buffer_size, + METH_VARARGS | METH_KEYWORDS, + "set_scan_buffer_size(buffer_size) -> None\n" + "\n" + "Set the size of the scan buffer." }, + /* Functions to access signatures */ { "add_signature", @@ -397,6 +404,57 @@ function ); libcerror_error_free( + &error ); + + return( NULL ); + } + Py_IncRef( + Py_None ); + + return( Py_None ); +} + +/* Sets the size of the scan buffer + * Returns a Python object if successful or NULL on error + */ +PyObject *pysigscan_scanner_set_scan_buffer_size( + pysigscan_scanner_t *pysigscan_scanner, + PyObject *arguments, + PyObject *keywords ) +{ + libcerror_error_t *error = NULL; + static char *function = "pysigscan_scanner_set_scan_buffer_size"; + static char *keyword_list[] = { "buffer_size", NULL }; + Py_ssize_t buffer_size = 0; + int result = 0; + + if( PyArg_ParseTupleAndKeywords( + arguments, + keywords, + "n", + keyword_list, + &buffer_size ) == 0 ) + { + return( NULL ); + } + Py_BEGIN_ALLOW_THREADS + + result = libsigscan_scanner_set_scan_buffer_size( + pysigscan_scanner->scanner, + (size_t) buffer_size, + &error ); + + Py_END_ALLOW_THREADS + + if( result != 1 ) + { + pysigscan_error_raise( + error, + PyExc_IOError, + "%s: unable to set scan buffer size.", + function ); + + libcerror_error_free( &error ); return( NULL ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsigscan-20150125/pysigscan/pysigscan_scanner.h new/libsigscan-20150627/pysigscan/pysigscan_scanner.h --- old/libsigscan-20150125/pysigscan/pysigscan_scanner.h 2015-01-03 12:29:58.000000000 +0100 +++ new/libsigscan-20150627/pysigscan/pysigscan_scanner.h 2015-06-27 10:48:24.000000000 +0200 @@ -61,6 +61,11 @@ pysigscan_scanner_t *pysigscan_scanner, PyObject *arguments ); +PyObject *pysigscan_scanner_set_scan_buffer_size( + pysigscan_scanner_t *pysigscan_scanner, + PyObject *arguments, + PyObject *keywords ); + PyObject *pysigscan_scanner_add_signature( pysigscan_scanner_t *pysigscan_scanner, PyObject *arguments, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsigscan-20150125/pysigscan/setup.py new/libsigscan-20150627/pysigscan/setup.py --- old/libsigscan-20150125/pysigscan/setup.py 2015-02-04 18:00:51.000000000 +0100 +++ new/libsigscan-20150627/pysigscan/setup.py 2015-06-27 10:51:12.000000000 +0200 @@ -26,10 +26,10 @@ LIBRARY_NAME = "libsigscan" -LIBRARY_VERSION = "20150125" +LIBRARY_VERSION = "20150627" MODULE_NAME = "py%s" % (LIBRARY_NAME[3:]) # bdist_msi does not support the library version, neither a date as a version. -MODULE_VERSION = "20150125.1" +MODULE_VERSION = "20150627.1" PROJECT_URL = "https://github.com/libyal/%s/"; % (LIBRARY_NAME) DIRECTORY_NAMES = [ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsigscan-20150125/sigscantools/scan_handle.c new/libsigscan-20150627/sigscantools/scan_handle.c --- old/libsigscan-20150125/sigscantools/scan_handle.c 2015-01-12 17:39:24.000000000 +0100 +++ new/libsigscan-20150627/sigscantools/scan_handle.c 2015-02-04 18:56:50.000000000 +0100 @@ -334,10 +334,10 @@ size_t *pattern_size, libcerror_error_t **error ) { - static char *function = "scan_handle_copy_string_to_pattern"; - size_t pattern_index = 0; - size_t string_index = 0; - uint8_t byte_value = 0; + static char *function = "scan_handle_copy_string_to_pattern"; + size_t pattern_index = 0; + size_t string_index = 0; + uint8_t byte_value = 0; if( string == NULL ) {
