From bccb2fb6c51cdc6ceae98f1a3e56c342403c3b08 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Fri, 21 Mar 2008 00:03:08 +0000 Subject: [PATCH 01/95] Initial import --- .cvsignore | 1 + afflib-3.0.1-WCtype.patch | 22 +++++ afflib-3.1.3-gcc43.patch | 12 +++ afflib-3.1.3-ldconfig.patch | 24 ++++++ afflib-3.1.3-pkgconfig.patch | 35 ++++++++ afflib.pc.in | 10 +++ afflib.spec | 159 +++++++++++++++++++++++++++++++++++ sources | 1 + 8 files changed, 264 insertions(+) create mode 100644 afflib-3.0.1-WCtype.patch create mode 100644 afflib-3.1.3-gcc43.patch create mode 100644 afflib-3.1.3-ldconfig.patch create mode 100644 afflib-3.1.3-pkgconfig.patch create mode 100644 afflib.pc.in create mode 100644 afflib.spec diff --git a/.cvsignore b/.cvsignore index e69de29..17fd226 100644 --- a/.cvsignore +++ b/.cvsignore @@ -0,0 +1 @@ +afflib-3.1.3.tar.gz diff --git a/afflib-3.0.1-WCtype.patch b/afflib-3.0.1-WCtype.patch new file mode 100644 index 0000000..a3dfa8d --- /dev/null +++ b/afflib-3.0.1-WCtype.patch @@ -0,0 +1,22 @@ +diff -up afflib-3.0.4/configure.ac.WCtype afflib-3.0.4/configure.ac +--- afflib-3.0.4/configure.ac.WCtype 2007-12-28 15:23:53.000000000 +0100 ++++ afflib-3.0.4/configure.ac 2007-12-28 15:25:59.000000000 +0100 +@@ -115,6 +115,18 @@ AC_CHECK_FUNCS([ftruncate memset mkdir p + # Special features that can be enabled or disabled + AC_ARG_ENABLE([noopt], AC_HELP_STRING([--enable-noopt],[Drop -O C flags])) + ++AS_IF([test "x$ac_afflib_enable_wide_character_type" != xno ], ++ [AC_DEFINE([HAVE_WIDE_CHARACTER_TYPE],[1],[Defines if wide character type should be used]) ++ AC_CHECK_FUNCS([btowc fgetws mbsinit mbsrtowcs swprintf wmain wmemchr wmemcmp wmemcpy wmemrchr wctob wcschr wcscmp wcscpy wcsdup wcslen wcsncmp wcsncpy wcsrchr wcsrtombs wcstol wcstoul]) ++ AC_CHECK_HEADERS([wchar.h], ++ [AC_DEFINE([HAVE_WCHAR_H],[1],[Define to 1 if you have the header file.]) ++ AC_SUBST([HAVE_WCHAR_H],[1])], ++ [AC_SUBST([HAVE_WCHAR_H],[0])]) ++ ++ AC_SUBST([HAVE_WIDE_CHARACTER_TYPE],[1])], ++ [AC_SUBST([HAVE_WIDE_CHARACTER_TYPE],[0]) ++ AC_SUBST([HAVE_WCHAR_H],[0])]) ++ + ################################################################ + ## LIBEWF support + AC_ARG_ENABLE([libewf], diff --git a/afflib-3.1.3-gcc43.patch b/afflib-3.1.3-gcc43.patch new file mode 100644 index 0000000..4f9f8e1 --- /dev/null +++ b/afflib-3.1.3-gcc43.patch @@ -0,0 +1,12 @@ +diff -up afflib-3.1.3/lib/s3_glue.h.gcc43 afflib-3.1.3/lib/s3_glue.h +--- afflib-3.1.3/lib/s3_glue.h.gcc43 2008-03-12 18:58:28.000000000 +0100 ++++ afflib-3.1.3/lib/s3_glue.h 2008-03-12 18:59:25.000000000 +0100 +@@ -17,6 +17,8 @@ + #include + #include + #include ++#include // memcpy, strcmp, strlen ++#include // sort + + #define S3_DEFAULT_BUCKET "S3_DEFAULT_BUCKET" + #define S3_DEBUG "S3_DEBUG" diff --git a/afflib-3.1.3-ldconfig.patch b/afflib-3.1.3-ldconfig.patch new file mode 100644 index 0000000..dae49d2 --- /dev/null +++ b/afflib-3.1.3-ldconfig.patch @@ -0,0 +1,24 @@ +diff -up afflib-3.1.3/lib/Makefile.am.ldconfig afflib-3.1.3/lib/Makefile.am +--- afflib-3.1.3/lib/Makefile.am.ldconfig 2008-03-18 02:37:29.000000000 +0100 ++++ afflib-3.1.3/lib/Makefile.am 2008-03-18 02:37:56.000000000 +0100 +@@ -10,20 +10,6 @@ s3_LDADD = libafflib.la + + TESTS = aftest + +-install-exec-hook: +- @if [ -r /etc/ld.so.conf ] ; then \ +- echo "*************************************************" ;\ +- echo "*** Checking shared library config for $(libdir) " ;\ +- if grep ^$(libdir) /etc/ld.so.conf >/dev/null ; \ +- then echo $(libdir) already installed ; \ +- else echo installing $(libdir) in /etc/ld.so.conf ; \ +- echo $(libdir) >> /etc/ld.so.conf ; \ +- PATH=$(PATH):/sbin; \ +- ldconfig; \ +- fi ; \ +- echo "*************************************************" ;\ +- fi +- + EXTRA_DIST = + + INCLUDES = \ diff --git a/afflib-3.1.3-pkgconfig.patch b/afflib-3.1.3-pkgconfig.patch new file mode 100644 index 0000000..edb79c1 --- /dev/null +++ b/afflib-3.1.3-pkgconfig.patch @@ -0,0 +1,35 @@ +diff -up afflib-3.1.3/Makefile.am.pkgconfig afflib-3.1.3/Makefile.am +--- afflib-3.1.3/Makefile.am.pkgconfig 2008-03-03 07:53:49.000000000 +0100 ++++ afflib-3.1.3/Makefile.am 2008-03-17 23:51:38.000000000 +0100 +@@ -1,5 +1,9 @@ + SUBDIRS = lib tools lzma443 win32 tests doc + ++pkgconfigdir = $(libdir)/pkgconfig ++ ++pkgconfig_DATA = afflib.pc ++ + include_HEADERS = + pkginclude_HEADERS = lib/afflib.h lib/afflib_i.h lib/afflib_sha256.h lib/aftimer.h lib/utils.h + +@@ -48,7 +52,8 @@ DOCS = BUGLIST.txt README_Linux.txt READ + + EXTRA_DIST = $(DOCS) \ + afflib.spec.in \ +- afflib.spec ++ afflib.spec \ ++ afflib.pc.in + misc/expat-2.0.1.tar.gz + + validate: tools/afcompare tests/encrypted.aff lib/aftest +diff -up afflib-3.1.3/configure.ac.pkgconfig afflib-3.1.3/configure.ac +--- afflib-3.1.3/configure.ac.pkgconfig 2008-03-17 23:53:05.000000000 +0100 ++++ afflib-3.1.3/configure.ac 2008-03-17 23:53:40.000000000 +0100 +@@ -239,5 +239,7 @@ AC_MSG_NOTICE([LIBS: ${LIBS}]) + AC_MSG_NOTICE([LDFLAGS: ${LDFLAGS}]) + AC_MSG_NOTICE([*****************************************]) + AC_MSG_NOTICE([]) +-AC_OUTPUT ++AC_OUTPUT( ++afflib.pc ++) + diff --git a/afflib.pc.in b/afflib.pc.in new file mode 100644 index 0000000..d8000fd --- /dev/null +++ b/afflib.pc.in @@ -0,0 +1,10 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +libdir=@libdir@ +includedir=@includedir@/afflib + +Name: afflib +Description: Library to support the Advanced Forensic Format +Version: @VERSION@ +Libs: -L${libdir} -lafflib -lstdc++ +Cflags: -I${includedir} diff --git a/afflib.spec b/afflib.spec new file mode 100644 index 0000000..a4ec475 --- /dev/null +++ b/afflib.spec @@ -0,0 +1,159 @@ +Name: afflib +Version: 3.1.3 +Release: 3%{?dist} +Summary: Library to support the Advanced Forensic Format + +Group: System Environment/Libraries +License: BSD with advertising +URL: http://www.afflib.org +Source0: http://www.afflib.org/downloads/afflib-%{version}.tar.gz +Source1: afflib.pc.in +Patch0: afflib-3.0.1-WCtype.patch +Patch1: afflib-3.1.3-gcc43.patch +Patch2: afflib-3.1.3-pkgconfig.patch +Patch3: afflib-3.1.3-ldconfig.patch +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +BuildRequires: libtool + +BuildRequires: curl-devel +BuildRequires: expat-devel +# GPLv2 FOSS incompatible with BSD with advertising +##BuildRequires: fuse-devel +BuildRequires: libewf-devel >= 20080305 +# Afflib uses lzma-SDK 443 +#BuildRequires: lzma-devel +BuildRequires: ncurses-devel +BuildRequires: libtermcap-devel +BuildRequires: openssl-devel +# GPLv2 FOSS incompatible with BSD with advertising +##BuildRequires: readline-devel +#BuildRequires: libedit-devel - good replacement for readline - not supported for now +BuildRequires: zlib-devel + + +%description +AFF® is an open and extensible file format designed to store disk images and +associated metadata. +afflib is library for support of the Advanced Forensic Format (AFF). + + +%package -n afftools +Summary: Utilities for %{name} +Group: Applications/System +Requires: %{name} = %{version}-%{release} +Requires: ewftools + +%description -n afftools +The %{name}-utils package contains utilities for using %{name}. + +%package devel +Summary: Development files for %{name} +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} +Requires: openssl-devel +Requires: pkg-config + +%description devel +The %{name}-devel package contains libraries and header files for +developing applications that use %{name}. + + +%prep +%setup -q +%patch0 -p1 -b .WCtype +%patch1 -p1 -b .gcc43 +%patch2 -p1 -b .pkgconfig +%patch3 -p1 -b .ldconfig +# prevent internal lzma to be built - testing +#rm -rf lzma443 + +#fix spurious permissions with lzma443 +find lzma443 -type f -exec chmod 0644 {} ';' +chmod 0644 lib/base64.cpp + +# install pkg-config +install -pm 0644 %{SOURCE1} . +aclocal +autoheader +autoconf +automake + + +%build +%configure --enable-shared \ + --enable-wide-character-type \ + --disable-static \ + --enable-s3=yes \ + --enable-libewf=yes + +# Remove rpath from libtool +sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool +sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool + +# clean unused-direct-shlib-dependencies +sed -i -e 's! -shared ! -Wl,--as-needed\0!g' libtool + +make %{?_smp_mflags} + + +%install +rm -rf $RPM_BUILD_ROOT +make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" +find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' + + + +%clean +rm -rf $RPM_BUILD_ROOT + + +%post -p /sbin/ldconfig + +%postun -p /sbin/ldconfig + + +%files +%defattr(-,root,root,-) +%doc AUTHORS BUGLIST.txt ChangeLog COPYING NEWS README +%doc doc/announce_2.2.txt +%{_libdir}/*.so.* + +%files -n afftools +%defattr(-,root,root,-) +%{_bindir}/af* +%{_bindir}/s3 + +%files devel +%defattr(-,root,root,-) +%doc doc/crypto_design.txt doc/crypto_doc.txt +%{_includedir}/afflib/ +%{_libdir}/*.so +%{_libdir}/pkgconfig/afflib.pc + + +%changelog +* Wed Mar 19 2008 kwizart < kwizart at gmail.com > - 3.1.3-3 +- Add missing requires with pkgconfig + +* Mon Mar 17 2008 kwizart < kwizart at gmail.com > - 3.1.3-2 +- Rebuild with newer libewf and enable-libewf=yes +- Add pkg-config support in afflib-devel. +- Add a patch to remove ldconfig call when building the package. +- Add libtermcap-devel + +* Wed Mar 12 2008 kwizart < kwizart at gmail.com > - 3.1.3-1 +- Update to 3.1.3 +- Disable libewf support in afflib for now. +- Disable rpath +- Fix for gcc43 and s3 + +* Fri Nov 30 2007 kwizart < kwizart at gmail.com > - 3.0.4-1 +- Update to 3.0.4 + +* Sun Nov 18 2007 kwizart < kwizart at gmail.com > - 3.0.1-1 +- Update to 3.0.1 + +* Fri Nov 2 2007 kwizart < kwizart at gmail.com > - 2.4.0-1 +- Initial package for Fedora + diff --git a/sources b/sources index e69de29..bc26ab7 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +606a80d5b4d9d052c2f34b9947677634 afflib-3.1.3.tar.gz From a01d24f5bea7d0a5087dc33080be40c6743af5a3 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Fri, 21 Mar 2008 11:07:03 +0000 Subject: [PATCH 02/95] Fix typo with pkgconfig --- afflib.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/afflib.spec b/afflib.spec index a4ec475..96d1883 100644 --- a/afflib.spec +++ b/afflib.spec @@ -1,6 +1,6 @@ Name: afflib Version: 3.1.3 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Library to support the Advanced Forensic Format Group: System Environment/Libraries @@ -52,7 +52,7 @@ Summary: Development files for %{name} Group: Development/Libraries Requires: %{name} = %{version}-%{release} Requires: openssl-devel -Requires: pkg-config +Requires: pkgconfig %description devel The %{name}-devel package contains libraries and header files for @@ -133,6 +133,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri Mar 21 2008 kwizart < kwizart at gmail.com > - 3.1.3-4 +- Fix typo + * Wed Mar 19 2008 kwizart < kwizart at gmail.com > - 3.1.3-3 - Add missing requires with pkgconfig From e795536e616fb17fb8a0bc252d6f8546a7072393 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Tue, 15 Apr 2008 11:48:45 +0000 Subject: [PATCH 03/95] Remove Obsoleted files --- afflib-3.1.3-pkgconfig.patch | 35 ----------------------------------- afflib.pc.in | 10 ---------- 2 files changed, 45 deletions(-) delete mode 100644 afflib-3.1.3-pkgconfig.patch delete mode 100644 afflib.pc.in diff --git a/afflib-3.1.3-pkgconfig.patch b/afflib-3.1.3-pkgconfig.patch deleted file mode 100644 index edb79c1..0000000 --- a/afflib-3.1.3-pkgconfig.patch +++ /dev/null @@ -1,35 +0,0 @@ -diff -up afflib-3.1.3/Makefile.am.pkgconfig afflib-3.1.3/Makefile.am ---- afflib-3.1.3/Makefile.am.pkgconfig 2008-03-03 07:53:49.000000000 +0100 -+++ afflib-3.1.3/Makefile.am 2008-03-17 23:51:38.000000000 +0100 -@@ -1,5 +1,9 @@ - SUBDIRS = lib tools lzma443 win32 tests doc - -+pkgconfigdir = $(libdir)/pkgconfig -+ -+pkgconfig_DATA = afflib.pc -+ - include_HEADERS = - pkginclude_HEADERS = lib/afflib.h lib/afflib_i.h lib/afflib_sha256.h lib/aftimer.h lib/utils.h - -@@ -48,7 +52,8 @@ DOCS = BUGLIST.txt README_Linux.txt READ - - EXTRA_DIST = $(DOCS) \ - afflib.spec.in \ -- afflib.spec -+ afflib.spec \ -+ afflib.pc.in - misc/expat-2.0.1.tar.gz - - validate: tools/afcompare tests/encrypted.aff lib/aftest -diff -up afflib-3.1.3/configure.ac.pkgconfig afflib-3.1.3/configure.ac ---- afflib-3.1.3/configure.ac.pkgconfig 2008-03-17 23:53:05.000000000 +0100 -+++ afflib-3.1.3/configure.ac 2008-03-17 23:53:40.000000000 +0100 -@@ -239,5 +239,7 @@ AC_MSG_NOTICE([LIBS: ${LIBS}]) - AC_MSG_NOTICE([LDFLAGS: ${LDFLAGS}]) - AC_MSG_NOTICE([*****************************************]) - AC_MSG_NOTICE([]) --AC_OUTPUT -+AC_OUTPUT( -+afflib.pc -+) - diff --git a/afflib.pc.in b/afflib.pc.in deleted file mode 100644 index d8000fd..0000000 --- a/afflib.pc.in +++ /dev/null @@ -1,10 +0,0 @@ -prefix=@prefix@ -exec_prefix=@exec_prefix@ -libdir=@libdir@ -includedir=@includedir@/afflib - -Name: afflib -Description: Library to support the Advanced Forensic Format -Version: @VERSION@ -Libs: -L${libdir} -lafflib -lstdc++ -Cflags: -I${includedir} From 362ae85fcdf4ce40a6fddbfba4a3b49b1323233c Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Tue, 15 Apr 2008 12:23:00 +0000 Subject: [PATCH 04/95] - Update to 3.1.6 --- afflib.spec | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/afflib.spec b/afflib.spec index 96d1883..4f8e94e 100644 --- a/afflib.spec +++ b/afflib.spec @@ -1,16 +1,14 @@ Name: afflib -Version: 3.1.3 -Release: 4%{?dist} +Version: 3.1.6 +Release: 1%{?dist} Summary: Library to support the Advanced Forensic Format Group: System Environment/Libraries License: BSD with advertising URL: http://www.afflib.org Source0: http://www.afflib.org/downloads/afflib-%{version}.tar.gz -Source1: afflib.pc.in Patch0: afflib-3.0.1-WCtype.patch Patch1: afflib-3.1.3-gcc43.patch -Patch2: afflib-3.1.3-pkgconfig.patch Patch3: afflib-3.1.3-ldconfig.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -20,7 +18,7 @@ BuildRequires: curl-devel BuildRequires: expat-devel # GPLv2 FOSS incompatible with BSD with advertising ##BuildRequires: fuse-devel -BuildRequires: libewf-devel >= 20080305 +#BuildRequires: libewf-devel >= 20080305 # Afflib uses lzma-SDK 443 #BuildRequires: lzma-devel BuildRequires: ncurses-devel @@ -63,7 +61,6 @@ developing applications that use %{name}. %setup -q %patch0 -p1 -b .WCtype %patch1 -p1 -b .gcc43 -%patch2 -p1 -b .pkgconfig %patch3 -p1 -b .ldconfig # prevent internal lzma to be built - testing #rm -rf lzma443 @@ -72,12 +69,8 @@ developing applications that use %{name}. find lzma443 -type f -exec chmod 0644 {} ';' chmod 0644 lib/base64.cpp -# install pkg-config -install -pm 0644 %{SOURCE1} . -aclocal -autoheader -autoconf -automake +# Autoreconf +autoreconf %build @@ -133,6 +126,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Apr 15 2008 kwizart < kwizart at gmail.com > - 3.1.6-1 +- Update to 3.1.6 + * Fri Mar 21 2008 kwizart < kwizart at gmail.com > - 3.1.3-4 - Fix typo From cee7033f429831cd8d2ec77b725858b8f23c25a8 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Tue, 15 Apr 2008 12:25:19 +0000 Subject: [PATCH 05/95] Fix typo --- afflib.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/afflib.spec b/afflib.spec index 4f8e94e..57a6cc2 100644 --- a/afflib.spec +++ b/afflib.spec @@ -18,8 +18,8 @@ BuildRequires: curl-devel BuildRequires: expat-devel # GPLv2 FOSS incompatible with BSD with advertising ##BuildRequires: fuse-devel -#BuildRequires: libewf-devel >= 20080305 -# Afflib uses lzma-SDK 443 +BuildRequires: libewf-devel >= 20080305 +# Afflib uses lzma-SDK 443 #BuildRequires: lzma-devel BuildRequires: ncurses-devel BuildRequires: libtermcap-devel From 49e2a2b1d5b06dd55bcdd61947dda7e14f782de6 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Tue, 15 Apr 2008 12:28:01 +0000 Subject: [PATCH 06/95] Update sources --- .cvsignore | 2 +- sources | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.cvsignore b/.cvsignore index 17fd226..e4f59f4 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -afflib-3.1.3.tar.gz +afflib-3.1.6.tar.gz diff --git a/sources b/sources index bc26ab7..1779ad1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -606a80d5b4d9d052c2f34b9947677634 afflib-3.1.3.tar.gz +5e0250f9104ad64af0d0f9a5a41c65c7 afflib-3.1.6.tar.gz From bbdcc0035ef654cd4e06ed72b47974932874b451 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Wed, 21 May 2008 08:55:58 +0000 Subject: [PATCH 07/95] - Update to 3.2.0 --- .cvsignore | 2 +- afflib.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index e4f59f4..1f5e203 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -afflib-3.1.6.tar.gz +afflib-3.2.0.tar.gz diff --git a/afflib.spec b/afflib.spec index 57a6cc2..13e4a93 100644 --- a/afflib.spec +++ b/afflib.spec @@ -1,5 +1,5 @@ Name: afflib -Version: 3.1.6 +Version: 3.2.0 Release: 1%{?dist} Summary: Library to support the Advanced Forensic Format @@ -126,6 +126,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed May 21 2008 kwizart < kwizart at gmail.com > - 3.2.0-1 +- Update to 3.2.0 + * Tue Apr 15 2008 kwizart < kwizart at gmail.com > - 3.1.6-1 - Update to 3.1.6 diff --git a/sources b/sources index 1779ad1..1b15db0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5e0250f9104ad64af0d0f9a5a41c65c7 afflib-3.1.6.tar.gz +ecca00d58a87260037de60de02076807 afflib-3.2.0.tar.gz From ec985307eba494739f8352047c7b65ec39945f04 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Sat, 7 Jun 2008 12:02:06 +0000 Subject: [PATCH 08/95] Version 3.2.1: Cleanup release of 3.2.0; important new features: - Detects truncated files and does not allow them to be opened. - affix now fixes truncated files - afcrypto will only encrypt AFF and AFD file types. - AFFLIB will no longer open a .afd directory containing no AFF files. --- .cvsignore | 2 +- afflib.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index 1f5e203..7d68c2e 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -afflib-3.2.0.tar.gz +afflib-3.2.1.tar.gz diff --git a/afflib.spec b/afflib.spec index 13e4a93..be202b0 100644 --- a/afflib.spec +++ b/afflib.spec @@ -1,5 +1,5 @@ Name: afflib -Version: 3.2.0 +Version: 3.2.1 Release: 1%{?dist} Summary: Library to support the Advanced Forensic Format @@ -126,6 +126,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sat Jun 7 2008 kwizart < kwizart at gmail.com > - 3.2.1-1 +- Update to 3.2.1 + * Wed May 21 2008 kwizart < kwizart at gmail.com > - 3.2.0-1 - Update to 3.2.0 diff --git a/sources b/sources index 1b15db0..40bea98 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ecca00d58a87260037de60de02076807 afflib-3.2.0.tar.gz +ac43df78c10b48d713f7eb169fa6633d afflib-3.2.1.tar.gz From 95494b5605c95e9e869171cd5508fb0f338d63ca Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Wed, 25 Jun 2008 09:12:16 +0000 Subject: [PATCH 09/95] - Fix redefinition of typedef AFFILE --- afflib-3.2.1-fix_namespace.patch | 12 ++++++++++++ afflib.spec | 11 ++++++++--- 2 files changed, 20 insertions(+), 3 deletions(-) create mode 100644 afflib-3.2.1-fix_namespace.patch diff --git a/afflib-3.2.1-fix_namespace.patch b/afflib-3.2.1-fix_namespace.patch new file mode 100644 index 0000000..9af1354 --- /dev/null +++ b/afflib-3.2.1-fix_namespace.patch @@ -0,0 +1,12 @@ +diff -up afflib-3.2.1/lib/afflib_i.h.fix_namespace afflib-3.2.1/lib/afflib_i.h +--- afflib-3.2.1/lib/afflib_i.h.fix_namespace 2008-06-25 11:01:34.000000000 +0200 ++++ afflib-3.2.1/lib/afflib_i.h 2008-06-25 11:01:51.000000000 +0200 +@@ -340,7 +340,7 @@ typedef struct _AFFILE { + void *vnodeprivate; // private storage for the vnode + void (*error_reporter)(const char *fmt, ...); + struct af_crypto *crypto; +-} AFFILE; ++}; + + + diff --git a/afflib.spec b/afflib.spec index be202b0..2462333 100644 --- a/afflib.spec +++ b/afflib.spec @@ -1,6 +1,6 @@ Name: afflib Version: 3.2.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Library to support the Advanced Forensic Format Group: System Environment/Libraries @@ -10,6 +10,7 @@ Source0: http://www.afflib.org/downloads/afflib-%{version}.tar.gz Patch0: afflib-3.0.1-WCtype.patch Patch1: afflib-3.1.3-gcc43.patch Patch3: afflib-3.1.3-ldconfig.patch +Patch4: afflib-3.2.1-fix_namespace.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libtool @@ -18,8 +19,8 @@ BuildRequires: curl-devel BuildRequires: expat-devel # GPLv2 FOSS incompatible with BSD with advertising ##BuildRequires: fuse-devel -BuildRequires: libewf-devel >= 20080305 -# Afflib uses lzma-SDK 443 +#BuildRequires: libewf-devel >= 20080305 +# Afflib uses lzma-SDK 443 #BuildRequires: lzma-devel BuildRequires: ncurses-devel BuildRequires: libtermcap-devel @@ -62,6 +63,7 @@ developing applications that use %{name}. %patch0 -p1 -b .WCtype %patch1 -p1 -b .gcc43 %patch3 -p1 -b .ldconfig +%patch4 -p1 -b .fix_namespace # prevent internal lzma to be built - testing #rm -rf lzma443 @@ -126,6 +128,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed Jun 25 2008 kwizart < kwizart at gmail.com > - 3.2.1-2 +- Fix redefinition of typedef AFFILE + * Sat Jun 7 2008 kwizart < kwizart at gmail.com > - 3.2.1-1 - Update to 3.2.1 From d6fad417c55d4b1d01ce2e5fb81488d3a8f8fec1 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Wed, 25 Jun 2008 09:18:30 +0000 Subject: [PATCH 10/95] Fix typo --- afflib.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/afflib.spec b/afflib.spec index 2462333..72433bc 100644 --- a/afflib.spec +++ b/afflib.spec @@ -19,8 +19,8 @@ BuildRequires: curl-devel BuildRequires: expat-devel # GPLv2 FOSS incompatible with BSD with advertising ##BuildRequires: fuse-devel -#BuildRequires: libewf-devel >= 20080305 -# Afflib uses lzma-SDK 443 +BuildRequires: libewf-devel >= 20080305 +# Afflib uses lzma-SDK 443 #BuildRequires: lzma-devel BuildRequires: ncurses-devel BuildRequires: libtermcap-devel From 5f73a03368cf9b1b25d6414d4fddb3fbc900fa47 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Thu, 26 Jun 2008 18:31:20 +0000 Subject: [PATCH 11/95] Disable s3 --- afflib.spec | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/afflib.spec b/afflib.spec index 72433bc..35dc6e9 100644 --- a/afflib.spec +++ b/afflib.spec @@ -1,6 +1,6 @@ Name: afflib Version: 3.2.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Library to support the Advanced Forensic Format Group: System Environment/Libraries @@ -79,7 +79,6 @@ autoreconf %configure --enable-shared \ --enable-wide-character-type \ --disable-static \ - --enable-s3=yes \ --enable-libewf=yes # Remove rpath from libtool @@ -117,7 +116,6 @@ rm -rf $RPM_BUILD_ROOT %files -n afftools %defattr(-,root,root,-) %{_bindir}/af* -%{_bindir}/s3 %files devel %defattr(-,root,root,-) @@ -128,6 +126,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Thu Jun 26 2008 kwizart < kwizart at gmail.com > - 3.2.1-3 +- Disable s3 + * Wed Jun 25 2008 kwizart < kwizart at gmail.com > - 3.2.1-2 - Fix redefinition of typedef AFFILE From e50bcea372f39b431815fda494f0635975247512 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Thu, 26 Jun 2008 18:46:06 +0000 Subject: [PATCH 12/95] - Explicitely disable s3 --- afflib.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/afflib.spec b/afflib.spec index 35dc6e9..b0c4979 100644 --- a/afflib.spec +++ b/afflib.spec @@ -1,6 +1,6 @@ Name: afflib Version: 3.2.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Library to support the Advanced Forensic Format Group: System Environment/Libraries @@ -79,6 +79,7 @@ autoreconf %configure --enable-shared \ --enable-wide-character-type \ --disable-static \ + --enable-s3=no \ --enable-libewf=yes # Remove rpath from libtool @@ -126,6 +127,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Thu Jun 26 2008 kwizart < kwizart at gmail.com > - 3.2.1-4 +- Explicitely disable s3 + * Thu Jun 26 2008 kwizart < kwizart at gmail.com > - 3.2.1-3 - Disable s3 From 6988b0f440c8ab0cc6802349de9ab7006bcd6336 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Fri, 4 Jul 2008 23:00:13 +0000 Subject: [PATCH 13/95] - Update to 3.2.3 --- .cvsignore | 2 +- afflib-3.1.3-ldconfig.patch | 24 ------------------------ afflib-3.2.1-fix_namespace.patch | 12 ------------ afflib-3.2.3-nos3.patch | 32 ++++++++++++++++++++++++++++++++ afflib.spec | 15 ++++++++------- sources | 2 +- 6 files changed, 42 insertions(+), 45 deletions(-) delete mode 100644 afflib-3.1.3-ldconfig.patch delete mode 100644 afflib-3.2.1-fix_namespace.patch create mode 100644 afflib-3.2.3-nos3.patch diff --git a/.cvsignore b/.cvsignore index 7d68c2e..785a27b 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -afflib-3.2.1.tar.gz +afflib-3.2.3.tar.gz diff --git a/afflib-3.1.3-ldconfig.patch b/afflib-3.1.3-ldconfig.patch deleted file mode 100644 index dae49d2..0000000 --- a/afflib-3.1.3-ldconfig.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -up afflib-3.1.3/lib/Makefile.am.ldconfig afflib-3.1.3/lib/Makefile.am ---- afflib-3.1.3/lib/Makefile.am.ldconfig 2008-03-18 02:37:29.000000000 +0100 -+++ afflib-3.1.3/lib/Makefile.am 2008-03-18 02:37:56.000000000 +0100 -@@ -10,20 +10,6 @@ s3_LDADD = libafflib.la - - TESTS = aftest - --install-exec-hook: -- @if [ -r /etc/ld.so.conf ] ; then \ -- echo "*************************************************" ;\ -- echo "*** Checking shared library config for $(libdir) " ;\ -- if grep ^$(libdir) /etc/ld.so.conf >/dev/null ; \ -- then echo $(libdir) already installed ; \ -- else echo installing $(libdir) in /etc/ld.so.conf ; \ -- echo $(libdir) >> /etc/ld.so.conf ; \ -- PATH=$(PATH):/sbin; \ -- ldconfig; \ -- fi ; \ -- echo "*************************************************" ;\ -- fi -- - EXTRA_DIST = - - INCLUDES = \ diff --git a/afflib-3.2.1-fix_namespace.patch b/afflib-3.2.1-fix_namespace.patch deleted file mode 100644 index 9af1354..0000000 --- a/afflib-3.2.1-fix_namespace.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up afflib-3.2.1/lib/afflib_i.h.fix_namespace afflib-3.2.1/lib/afflib_i.h ---- afflib-3.2.1/lib/afflib_i.h.fix_namespace 2008-06-25 11:01:34.000000000 +0200 -+++ afflib-3.2.1/lib/afflib_i.h 2008-06-25 11:01:51.000000000 +0200 -@@ -340,7 +340,7 @@ typedef struct _AFFILE { - void *vnodeprivate; // private storage for the vnode - void (*error_reporter)(const char *fmt, ...); - struct af_crypto *crypto; --} AFFILE; -+}; - - - diff --git a/afflib-3.2.3-nos3.patch b/afflib-3.2.3-nos3.patch new file mode 100644 index 0000000..8b16755 --- /dev/null +++ b/afflib-3.2.3-nos3.patch @@ -0,0 +1,32 @@ +diff -up afflib-3.2.3/lib/Makefile.am.nos3 afflib-3.2.3/lib/Makefile.am +--- afflib-3.2.3/lib/Makefile.am.nos3 2008-06-28 10:00:34.000000000 +0200 ++++ afflib-3.2.3/lib/Makefile.am 2008-07-05 00:48:43.000000000 +0200 +@@ -1,13 +1,16 @@ +-bin_PROGRAMS = aftest s3 ++bin_PROGRAMS = aftest + + aftest_SOURCES = aftest.cpp + aftest_LDADD = libafflib.la + #aftest_LDFLAGS = -static + aftest_LDFLAGS = $(PTHREAD_CFLAGS) + ++if MAYBE_S3 ++bin_PROGRAMS += s3 + s3_SOURCES = s3.cpp + s3_LDADD = libafflib.la + #s3_LDFLAGS = -static ++endif + + TESTS = aftest + +diff -up afflib-3.2.3/configure.ac.nos3 afflib-3.2.3/configure.ac +--- afflib-3.2.3/configure.ac.nos3 2008-07-05 00:38:23.000000000 +0200 ++++ afflib-3.2.3/configure.ac 2008-07-05 00:48:31.000000000 +0200 +@@ -256,6 +256,7 @@ if test "x${enable_s3}" = "xyes" ; then + S3_BIN='s3$(EXEEXT)' + fi + AC_SUBST(S3_BIN) ++AM_CONDITIONAL([MAYBE_S3], [test "x${enable_s3}" = "xyes"]) + + + ## diff --git a/afflib.spec b/afflib.spec index b0c4979..9497d34 100644 --- a/afflib.spec +++ b/afflib.spec @@ -1,6 +1,6 @@ Name: afflib -Version: 3.2.1 -Release: 4%{?dist} +Version: 3.2.3 +Release: 1%{?dist} Summary: Library to support the Advanced Forensic Format Group: System Environment/Libraries @@ -9,8 +9,7 @@ URL: http://www.afflib.org Source0: http://www.afflib.org/downloads/afflib-%{version}.tar.gz Patch0: afflib-3.0.1-WCtype.patch Patch1: afflib-3.1.3-gcc43.patch -Patch3: afflib-3.1.3-ldconfig.patch -Patch4: afflib-3.2.1-fix_namespace.patch +Patch2: afflib-3.2.3-nos3.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libtool @@ -62,8 +61,7 @@ developing applications that use %{name}. %setup -q %patch0 -p1 -b .WCtype %patch1 -p1 -b .gcc43 -%patch3 -p1 -b .ldconfig -%patch4 -p1 -b .fix_namespace +%patch2 -p1 -b .nos3 # prevent internal lzma to be built - testing #rm -rf lzma443 @@ -79,7 +77,7 @@ autoreconf %configure --enable-shared \ --enable-wide-character-type \ --disable-static \ - --enable-s3=no \ + --disable-s3 \ --enable-libewf=yes # Remove rpath from libtool @@ -127,6 +125,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri Jul 4 2008 kwizart < kwizart at gmail.com > - 3.2.3-1 +- Update to 3.2.3 + * Thu Jun 26 2008 kwizart < kwizart at gmail.com > - 3.2.1-4 - Explicitely disable s3 diff --git a/sources b/sources index 40bea98..c4fad64 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ac43df78c10b48d713f7eb169fa6633d afflib-3.2.1.tar.gz +cb3b5a181adeee5047ded626e5903859 afflib-3.2.3.tar.gz From 8cc4b5a8f2309ed4353d93c84e0798728eb6fde1 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Thu, 24 Jul 2008 07:17:55 +0000 Subject: [PATCH 14/95] - Update to 3.2.5 --- .cvsignore | 2 +- afflib.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index 785a27b..0d7c8bb 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -afflib-3.2.3.tar.gz +afflib-3.2.5.tar.gz diff --git a/afflib.spec b/afflib.spec index 9497d34..13e1a3f 100644 --- a/afflib.spec +++ b/afflib.spec @@ -1,5 +1,5 @@ Name: afflib -Version: 3.2.3 +Version: 3.2.5 Release: 1%{?dist} Summary: Library to support the Advanced Forensic Format @@ -125,6 +125,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Thu Jul 24 2008 kwizart < kwizart at gmail.com > - 3.2.5-1 +- Update to 3.2.5 + * Fri Jul 4 2008 kwizart < kwizart at gmail.com > - 3.2.3-1 - Update to 3.2.3 diff --git a/sources b/sources index c4fad64..30c8bff 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -cb3b5a181adeee5047ded626e5903859 afflib-3.2.3.tar.gz +e6012eb6d276ce3ba59e40e7216d6939 afflib-3.2.5.tar.gz From f693213a65d3832f0df8baccc075300518fd4b22 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Thu, 24 Jul 2008 07:36:14 +0000 Subject: [PATCH 15/95] - Remove nos3 patch --- afflib-3.2.3-nos3.patch | 32 -------------------------------- afflib.spec | 7 ++++--- 2 files changed, 4 insertions(+), 35 deletions(-) delete mode 100644 afflib-3.2.3-nos3.patch diff --git a/afflib-3.2.3-nos3.patch b/afflib-3.2.3-nos3.patch deleted file mode 100644 index 8b16755..0000000 --- a/afflib-3.2.3-nos3.patch +++ /dev/null @@ -1,32 +0,0 @@ -diff -up afflib-3.2.3/lib/Makefile.am.nos3 afflib-3.2.3/lib/Makefile.am ---- afflib-3.2.3/lib/Makefile.am.nos3 2008-06-28 10:00:34.000000000 +0200 -+++ afflib-3.2.3/lib/Makefile.am 2008-07-05 00:48:43.000000000 +0200 -@@ -1,13 +1,16 @@ --bin_PROGRAMS = aftest s3 -+bin_PROGRAMS = aftest - - aftest_SOURCES = aftest.cpp - aftest_LDADD = libafflib.la - #aftest_LDFLAGS = -static - aftest_LDFLAGS = $(PTHREAD_CFLAGS) - -+if MAYBE_S3 -+bin_PROGRAMS += s3 - s3_SOURCES = s3.cpp - s3_LDADD = libafflib.la - #s3_LDFLAGS = -static -+endif - - TESTS = aftest - -diff -up afflib-3.2.3/configure.ac.nos3 afflib-3.2.3/configure.ac ---- afflib-3.2.3/configure.ac.nos3 2008-07-05 00:38:23.000000000 +0200 -+++ afflib-3.2.3/configure.ac 2008-07-05 00:48:31.000000000 +0200 -@@ -256,6 +256,7 @@ if test "x${enable_s3}" = "xyes" ; then - S3_BIN='s3$(EXEEXT)' - fi - AC_SUBST(S3_BIN) -+AM_CONDITIONAL([MAYBE_S3], [test "x${enable_s3}" = "xyes"]) - - - ## diff --git a/afflib.spec b/afflib.spec index 13e1a3f..9a15e8c 100644 --- a/afflib.spec +++ b/afflib.spec @@ -1,6 +1,6 @@ Name: afflib Version: 3.2.5 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Library to support the Advanced Forensic Format Group: System Environment/Libraries @@ -9,7 +9,6 @@ URL: http://www.afflib.org Source0: http://www.afflib.org/downloads/afflib-%{version}.tar.gz Patch0: afflib-3.0.1-WCtype.patch Patch1: afflib-3.1.3-gcc43.patch -Patch2: afflib-3.2.3-nos3.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libtool @@ -61,7 +60,6 @@ developing applications that use %{name}. %setup -q %patch0 -p1 -b .WCtype %patch1 -p1 -b .gcc43 -%patch2 -p1 -b .nos3 # prevent internal lzma to be built - testing #rm -rf lzma443 @@ -125,6 +123,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Thu Jul 24 2008 kwizart < kwizart at gmail.com > - 3.2.5-2 +- Remove nos3 patch + * Thu Jul 24 2008 kwizart < kwizart at gmail.com > - 3.2.5-1 - Update to 3.2.5 From 5b30c23d53806f60b914368e30bed04e223eb02a Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Tue, 29 Jul 2008 11:42:56 +0000 Subject: [PATCH 16/95] - Patch with fuzz 2 --- afflib.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/afflib.spec b/afflib.spec index 9a15e8c..11c69ca 100644 --- a/afflib.spec +++ b/afflib.spec @@ -1,6 +1,8 @@ +%define _default_patch_fuzz 2 + Name: afflib Version: 3.2.5 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Library to support the Advanced Forensic Format Group: System Environment/Libraries @@ -123,6 +125,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Jul 29 2008 kwizart < kwizart at gmail.com > - 3.2.5-3 +- Patch with fuzz 2 + * Thu Jul 24 2008 kwizart < kwizart at gmail.com > - 3.2.5-2 - Remove nos3 patch From d65aa2dc16d5cc8235f094815c026f70389df2b8 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Mon, 1 Sep 2008 08:25:31 +0000 Subject: [PATCH 17/95] Update to 3.3.1 --- .cvsignore | 2 +- afflib.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index 0d7c8bb..ae4de56 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -afflib-3.2.5.tar.gz +afflib-3.3.1.tar.gz diff --git a/afflib.spec b/afflib.spec index 11c69ca..32a0ecc 100644 --- a/afflib.spec +++ b/afflib.spec @@ -1,8 +1,8 @@ %define _default_patch_fuzz 2 Name: afflib -Version: 3.2.5 -Release: 3%{?dist} +Version: 3.3.1 +Release: 1%{?dist} Summary: Library to support the Advanced Forensic Format Group: System Environment/Libraries @@ -125,6 +125,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Sep 1 2008 kwizart < kwizart at gmail.com > - 3.3.1-1 +- Update to 3.3.1 + * Tue Jul 29 2008 kwizart < kwizart at gmail.com > - 3.2.5-3 - Patch with fuzz 2 diff --git a/sources b/sources index 30c8bff..a975c88 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e6012eb6d276ce3ba59e40e7216d6939 afflib-3.2.5.tar.gz +f2b5150af6d8f52bb0a5c702e975741d afflib-3.3.1.tar.gz From 6f67a947cfd084ae8dd7223d4322f99699cd6159 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Thu, 4 Sep 2008 16:00:31 +0000 Subject: [PATCH 18/95] - Update to 3.3.2 - Remove Requires for ewftools from afftools - Qemu image support is disabled (experimental) --- .cvsignore | 2 +- afflib.spec | 14 ++++++++++---- sources | 2 +- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/.cvsignore b/.cvsignore index ae4de56..3fa64c9 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -afflib-3.3.1.tar.gz +afflib-3.3.2.tar.gz diff --git a/afflib.spec b/afflib.spec index 32a0ecc..6146183 100644 --- a/afflib.spec +++ b/afflib.spec @@ -1,7 +1,7 @@ %define _default_patch_fuzz 2 Name: afflib -Version: 3.3.1 +Version: 3.3.2 Release: 1%{?dist} Summary: Library to support the Advanced Forensic Format @@ -41,7 +41,6 @@ afflib is library for support of the Advanced Forensic Format (AFF). Summary: Utilities for %{name} Group: Applications/System Requires: %{name} = %{version}-%{release} -Requires: ewftools %description -n afftools The %{name}-utils package contains utilities for using %{name}. @@ -69,6 +68,8 @@ developing applications that use %{name}. find lzma443 -type f -exec chmod 0644 {} ';' chmod 0644 lib/base64.cpp +sed -i -e 's/-static/-lrt/' lib/Makefile.am lib/Makefile.in + # Autoreconf autoreconf @@ -77,8 +78,8 @@ autoreconf %configure --enable-shared \ --enable-wide-character-type \ --disable-static \ - --disable-s3 \ - --enable-libewf=yes + --enable-libewf=yes \ + --enable-qemu=no # Remove rpath from libtool sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool @@ -125,6 +126,11 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Thu Sep 4 2008 kwizart < kwizart at gmail.com > - 3.3.2-1 +- Update to 3.3.2 +- Remove Requires for ewftools from afftools +- Qemu image support is disabled (experimental) + * Mon Sep 1 2008 kwizart < kwizart at gmail.com > - 3.3.1-1 - Update to 3.3.1 diff --git a/sources b/sources index a975c88..590ae24 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f2b5150af6d8f52bb0a5c702e975741d afflib-3.3.1.tar.gz +cc96dc62d380fcc3c6679d2404c61306 afflib-3.3.2.tar.gz From 50a9f38b144d7c7496167bd2037115362df829f1 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Thu, 4 Sep 2008 16:40:43 +0000 Subject: [PATCH 19/95] Update gcc43 patch --- afflib-3.1.3-gcc43.patch => afflib-3.3.2-gcc43.patch | 11 +++++++++++ afflib.spec | 7 +++++-- 2 files changed, 16 insertions(+), 2 deletions(-) rename afflib-3.1.3-gcc43.patch => afflib-3.3.2-gcc43.patch (59%) diff --git a/afflib-3.1.3-gcc43.patch b/afflib-3.3.2-gcc43.patch similarity index 59% rename from afflib-3.1.3-gcc43.patch rename to afflib-3.3.2-gcc43.patch index 4f9f8e1..e5e4816 100644 --- a/afflib-3.1.3-gcc43.patch +++ b/afflib-3.3.2-gcc43.patch @@ -10,3 +10,14 @@ diff -up afflib-3.1.3/lib/s3_glue.h.gcc43 afflib-3.1.3/lib/s3_glue.h #define S3_DEFAULT_BUCKET "S3_DEFAULT_BUCKET" #define S3_DEBUG "S3_DEBUG" +diff -up afflib-3.3.2/lib/utils.h.gcc43 afflib-3.3.2/lib/utils.h +--- afflib-3.3.2/lib/utils.h.gcc43 2008-09-04 18:36:08.000000000 +0200 ++++ afflib-3.3.2/lib/utils.h 2008-09-04 18:37:24.000000000 +0200 +@@ -11,6 +11,7 @@ + #include + #include + #include ++#include + #include + #include + diff --git a/afflib.spec b/afflib.spec index 6146183..98f31ba 100644 --- a/afflib.spec +++ b/afflib.spec @@ -2,7 +2,7 @@ Name: afflib Version: 3.3.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Library to support the Advanced Forensic Format Group: System Environment/Libraries @@ -10,7 +10,7 @@ License: BSD with advertising URL: http://www.afflib.org Source0: http://www.afflib.org/downloads/afflib-%{version}.tar.gz Patch0: afflib-3.0.1-WCtype.patch -Patch1: afflib-3.1.3-gcc43.patch +Patch1: afflib-3.3.2-gcc43.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libtool @@ -126,6 +126,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Thu Sep 4 2008 kwizart < kwizart at gmail.com > - 3.3.2-2 +- Update gcc43 patch + * Thu Sep 4 2008 kwizart < kwizart at gmail.com > - 3.3.2-1 - Update to 3.3.2 - Remove Requires for ewftools from afftools From 28f24f1bbb399c4a382a6dab53dbdb7b4971da08 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Mon, 15 Sep 2008 10:32:45 +0000 Subject: [PATCH 20/95] Update to 3.3.3 --- .cvsignore | 2 +- afflib.spec | 13 ++++++------- sources | 2 +- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/.cvsignore b/.cvsignore index 3fa64c9..b960c84 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -afflib-3.3.2.tar.gz +afflib-3.3.3.tar.gz diff --git a/afflib.spec b/afflib.spec index 98f31ba..4ec507b 100644 --- a/afflib.spec +++ b/afflib.spec @@ -1,8 +1,8 @@ %define _default_patch_fuzz 2 Name: afflib -Version: 3.3.2 -Release: 2%{?dist} +Version: 3.3.3 +Release: 1%{?dist} Summary: Library to support the Advanced Forensic Format Group: System Environment/Libraries @@ -10,7 +10,6 @@ License: BSD with advertising URL: http://www.afflib.org Source0: http://www.afflib.org/downloads/afflib-%{version}.tar.gz Patch0: afflib-3.0.1-WCtype.patch -Patch1: afflib-3.3.2-gcc43.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libtool @@ -60,7 +59,6 @@ developing applications that use %{name}. %prep %setup -q %patch0 -p1 -b .WCtype -%patch1 -p1 -b .gcc43 # prevent internal lzma to be built - testing #rm -rf lzma443 @@ -68,8 +66,6 @@ developing applications that use %{name}. find lzma443 -type f -exec chmod 0644 {} ';' chmod 0644 lib/base64.cpp -sed -i -e 's/-static/-lrt/' lib/Makefile.am lib/Makefile.in - # Autoreconf autoreconf @@ -126,13 +122,16 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Sep 15 2008 kwizart < kwizart at gmail.com > - 3.3.3-1 +- Update to 3.3.3 + * Thu Sep 4 2008 kwizart < kwizart at gmail.com > - 3.3.2-2 - Update gcc43 patch * Thu Sep 4 2008 kwizart < kwizart at gmail.com > - 3.3.2-1 - Update to 3.3.2 - Remove Requires for ewftools from afftools -- Qemu image support is disabled (experimental) +- Qemu image support is disabled * Mon Sep 1 2008 kwizart < kwizart at gmail.com > - 3.3.1-1 - Update to 3.3.1 diff --git a/sources b/sources index 590ae24..51a3799 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -cc96dc62d380fcc3c6679d2404c61306 afflib-3.3.2.tar.gz +cac3d4e45ba46ffe29756e40f4ba0a38 afflib-3.3.3.tar.gz From 18b5f248ca527acb4f21a8b11d579aea26104040 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Mon, 15 Sep 2008 10:36:31 +0000 Subject: [PATCH 21/95] Clean --- afflib-3.3.2-gcc43.patch | 23 ----------------------- 1 file changed, 23 deletions(-) delete mode 100644 afflib-3.3.2-gcc43.patch diff --git a/afflib-3.3.2-gcc43.patch b/afflib-3.3.2-gcc43.patch deleted file mode 100644 index e5e4816..0000000 --- a/afflib-3.3.2-gcc43.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff -up afflib-3.1.3/lib/s3_glue.h.gcc43 afflib-3.1.3/lib/s3_glue.h ---- afflib-3.1.3/lib/s3_glue.h.gcc43 2008-03-12 18:58:28.000000000 +0100 -+++ afflib-3.1.3/lib/s3_glue.h 2008-03-12 18:59:25.000000000 +0100 -@@ -17,6 +17,8 @@ - #include - #include - #include -+#include // memcpy, strcmp, strlen -+#include // sort - - #define S3_DEFAULT_BUCKET "S3_DEFAULT_BUCKET" - #define S3_DEBUG "S3_DEBUG" -diff -up afflib-3.3.2/lib/utils.h.gcc43 afflib-3.3.2/lib/utils.h ---- afflib-3.3.2/lib/utils.h.gcc43 2008-09-04 18:36:08.000000000 +0200 -+++ afflib-3.3.2/lib/utils.h 2008-09-04 18:37:24.000000000 +0200 -@@ -11,6 +11,7 @@ - #include - #include - #include -+#include - #include - #include - From 358c2b3e729eb7ec2ec5420cb2c28adcf8a9b635 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Mon, 15 Sep 2008 10:42:36 +0000 Subject: [PATCH 22/95] Want to play this ? --- afflib.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/afflib.spec b/afflib.spec index 4ec507b..c72d633 100644 --- a/afflib.spec +++ b/afflib.spec @@ -2,7 +2,7 @@ Name: afflib Version: 3.3.3 -Release: 1%{?dist} +Release: 3%{?dist} Summary: Library to support the Advanced Forensic Format Group: System Environment/Libraries @@ -122,7 +122,7 @@ rm -rf $RPM_BUILD_ROOT %changelog -* Mon Sep 15 2008 kwizart < kwizart at gmail.com > - 3.3.3-1 +* Mon Sep 15 2008 kwizart < kwizart at gmail.com > - 3.3.3-3 - Update to 3.3.3 * Thu Sep 4 2008 kwizart < kwizart at gmail.com > - 3.3.2-2 From b1a7f57ba170455b5c52c7cf8d55a89b362b67d9 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Fri, 3 Oct 2008 07:00:52 +0000 Subject: [PATCH 23/95] - Update to 3.3.4 --- .cvsignore | 2 +- afflib.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index b960c84..8721893 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -afflib-3.3.3.tar.gz +afflib-3.3.4.tar.gz diff --git a/afflib.spec b/afflib.spec index c72d633..c9ee59a 100644 --- a/afflib.spec +++ b/afflib.spec @@ -1,7 +1,7 @@ %define _default_patch_fuzz 2 Name: afflib -Version: 3.3.3 +Version: 3.3.4 Release: 3%{?dist} Summary: Library to support the Advanced Forensic Format @@ -122,6 +122,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri Oct 3 2008 kwizart < kwizart at gmail.com > - 3.3.4-1 +- Update to 3.3.4 + * Mon Sep 15 2008 kwizart < kwizart at gmail.com > - 3.3.3-3 - Update to 3.3.3 diff --git a/sources b/sources index 51a3799..d8140b0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -cac3d4e45ba46ffe29756e40f4ba0a38 afflib-3.3.3.tar.gz +588dd75051d03f666a17ed49d08c1552 afflib-3.3.4.tar.gz From 01200fcf81bb189b20f24d530df91947e96b3b4a Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Fri, 3 Oct 2008 09:11:41 +0000 Subject: [PATCH 24/95] - Fix release mismatch --- afflib.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/afflib.spec b/afflib.spec index c9ee59a..49e6295 100644 --- a/afflib.spec +++ b/afflib.spec @@ -2,7 +2,7 @@ Name: afflib Version: 3.3.4 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Library to support the Advanced Forensic Format Group: System Environment/Libraries @@ -122,7 +122,10 @@ rm -rf $RPM_BUILD_ROOT %changelog -* Fri Oct 3 2008 kwizart < kwizart at gmail.com > - 3.3.4-1 +* Fri Oct 3 2008 kwizart < kwizart at gmail.com > - 3.3.4-4 +- Fix release mismatch + +* Fri Oct 3 2008 kwizart < kwizart at gmail.com > - 3.3.4-3 - Update to 3.3.4 * Mon Sep 15 2008 kwizart < kwizart at gmail.com > - 3.3.3-3 From 793fcc6f7eb3cd1ab40ae3a20317f219eaf134cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Mr=C3=A1z?= Date: Thu, 15 Jan 2009 11:31:29 +0000 Subject: [PATCH 25/95] - rebuild with new openssl --- afflib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/afflib.spec b/afflib.spec index 49e6295..72de8f3 100644 --- a/afflib.spec +++ b/afflib.spec @@ -2,7 +2,7 @@ Name: afflib Version: 3.3.4 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Library to support the Advanced Forensic Format Group: System Environment/Libraries @@ -122,6 +122,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Thu Jan 15 2009 Tomas Mraz - 3.3.4-5 +- rebuild with new openssl + * Fri Oct 3 2008 kwizart < kwizart at gmail.com > - 3.3.4-4 - Fix release mismatch From a361344860ddb7e48ab2d231cdcb27826890edef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Mr=C3=A1z?= Date: Thu, 15 Jan 2009 12:19:26 +0000 Subject: [PATCH 26/95] - rebuild with new openssl - call libtoolize to refresh libtool --- afflib.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/afflib.spec b/afflib.spec index 72de8f3..17c6868 100644 --- a/afflib.spec +++ b/afflib.spec @@ -68,6 +68,7 @@ chmod 0644 lib/base64.cpp # Autoreconf autoreconf +libtoolize %build @@ -124,6 +125,7 @@ rm -rf $RPM_BUILD_ROOT %changelog * Thu Jan 15 2009 Tomas Mraz - 3.3.4-5 - rebuild with new openssl +- call libtoolize to refresh libtool * Fri Oct 3 2008 kwizart < kwizart at gmail.com > - 3.3.4-4 - Fix release mismatch From 4d2db8ceb2bcfc37c7afc63f1ca57442b48e8e16 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Tue, 24 Feb 2009 00:15:06 +0000 Subject: [PATCH 27/95] - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild --- afflib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/afflib.spec b/afflib.spec index 17c6868..3baeab9 100644 --- a/afflib.spec +++ b/afflib.spec @@ -2,7 +2,7 @@ Name: afflib Version: 3.3.4 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Library to support the Advanced Forensic Format Group: System Environment/Libraries @@ -123,6 +123,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Feb 23 2009 Fedora Release Engineering - 3.3.4-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + * Thu Jan 15 2009 Tomas Mraz - 3.3.4-5 - rebuild with new openssl - call libtoolize to refresh libtool From 0ae0daeefedfefb67e4dd53511e3b0bb53bed812 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Mon, 2 Mar 2009 12:04:05 +0000 Subject: [PATCH 28/95] Fix for gcc44 --- ...-WCtype.patch => afflib-3.3.4-WCtype.patch | 14 ++++++------ afflib-3.3.4-gcc44.patch | 22 +++++++++++++++++++ afflib.spec | 13 ++++++----- 3 files changed, 37 insertions(+), 12 deletions(-) rename afflib-3.0.1-WCtype.patch => afflib-3.3.4-WCtype.patch (64%) create mode 100644 afflib-3.3.4-gcc44.patch diff --git a/afflib-3.0.1-WCtype.patch b/afflib-3.3.4-WCtype.patch similarity index 64% rename from afflib-3.0.1-WCtype.patch rename to afflib-3.3.4-WCtype.patch index a3dfa8d..bf3e757 100644 --- a/afflib-3.0.1-WCtype.patch +++ b/afflib-3.3.4-WCtype.patch @@ -1,9 +1,9 @@ -diff -up afflib-3.0.4/configure.ac.WCtype afflib-3.0.4/configure.ac ---- afflib-3.0.4/configure.ac.WCtype 2007-12-28 15:23:53.000000000 +0100 -+++ afflib-3.0.4/configure.ac 2007-12-28 15:25:59.000000000 +0100 -@@ -115,6 +115,18 @@ AC_CHECK_FUNCS([ftruncate memset mkdir p - # Special features that can be enabled or disabled - AC_ARG_ENABLE([noopt], AC_HELP_STRING([--enable-noopt],[Drop -O C flags])) +diff -up afflib-3.3.4/configure.ac.WCtype afflib-3.3.4/configure.ac +--- afflib-3.3.4/configure.ac.WCtype 2008-09-29 21:45:05.000000000 +0200 ++++ afflib-3.3.4/configure.ac 2009-03-02 11:58:36.000000000 +0100 +@@ -101,6 +101,18 @@ AC_LANG_POP([C++]) + + +AS_IF([test "x$ac_afflib_enable_wide_character_type" != xno ], + [AC_DEFINE([HAVE_WIDE_CHARACTER_TYPE],[1],[Defines if wide character type should be used]) @@ -19,4 +19,4 @@ diff -up afflib-3.0.4/configure.ac.WCtype afflib-3.0.4/configure.ac + ################################################################ ## LIBEWF support - AC_ARG_ENABLE([libewf], + dnl Function to test if a libewf_get_media_size takes value as an argument diff --git a/afflib-3.3.4-gcc44.patch b/afflib-3.3.4-gcc44.patch new file mode 100644 index 0000000..b3ea15c --- /dev/null +++ b/afflib-3.3.4-gcc44.patch @@ -0,0 +1,22 @@ +diff -up afflib-3.3.4/tools/afverify.cpp.gcc44 afflib-3.3.4/tools/afverify.cpp +--- afflib-3.3.4/tools/afverify.cpp.gcc44 2008-07-21 06:25:29.000000000 +0200 ++++ afflib-3.3.4/tools/afverify.cpp 2009-03-02 12:48:59.000000000 +0100 +@@ -240,12 +240,16 @@ string get_xml_field(const char *buf,con + int verify_bom_signature(AFFILE *af,const char *buf) + { + const char *cce = "\n"; +- char *chain_end = strstr(buf,cce); ++ char *buf_tmp; ++ char *cce_tmp; ++ strcpy(buf_tmp, buf); ++ strcpy(cce_tmp, cce); ++ char *chain_end = strstr(buf_tmp,cce_tmp); + if(!chain_end){ + warn("end of chain XML can't be found\n"); + return -1; // can't find it + } +- char *sig_start = chain_end + strlen(cce); ++ char *sig_start = chain_end + strlen(cce_tmp); + + BIO *seg = BIO_new_mem_buf((void *)buf,strlen(buf)); + BIO_seek(seg,0); diff --git a/afflib.spec b/afflib.spec index 3baeab9..858619e 100644 --- a/afflib.spec +++ b/afflib.spec @@ -1,15 +1,14 @@ -%define _default_patch_fuzz 2 - Name: afflib Version: 3.3.4 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Library to support the Advanced Forensic Format Group: System Environment/Libraries License: BSD with advertising URL: http://www.afflib.org Source0: http://www.afflib.org/downloads/afflib-%{version}.tar.gz -Patch0: afflib-3.0.1-WCtype.patch +Patch0: afflib-3.3.4-WCtype.patch +Patch1: afflib-3.3.4-gcc44.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libtool @@ -59,6 +58,7 @@ developing applications that use %{name}. %prep %setup -q %patch0 -p1 -b .WCtype +%patch1 -p1 -b .gcc44 # prevent internal lzma to be built - testing #rm -rf lzma443 @@ -68,7 +68,7 @@ chmod 0644 lib/base64.cpp # Autoreconf autoreconf -libtoolize +libtoolize --force %build @@ -123,6 +123,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Mar 2 2009 kwizart < kwizart at gmail.com > - 3.3.4-7 +- Fix for gcc44 + * Mon Feb 23 2009 Fedora Release Engineering - 3.3.4-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From 0020a10d39d6459b30a310fe5c2d3f4cb5596646 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Tue, 12 May 2009 11:33:09 +0000 Subject: [PATCH 29/95] -Update to 3.3.5 --- .cvsignore | 2 +- afflib-3.3.4-gcc44.patch | 22 ---------------------- afflib.spec | 15 +++++++++------ sources | 2 +- 4 files changed, 11 insertions(+), 30 deletions(-) delete mode 100644 afflib-3.3.4-gcc44.patch diff --git a/.cvsignore b/.cvsignore index 8721893..ad7c803 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -afflib-3.3.4.tar.gz +afflib-3.3.5.tar.gz diff --git a/afflib-3.3.4-gcc44.patch b/afflib-3.3.4-gcc44.patch deleted file mode 100644 index b3ea15c..0000000 --- a/afflib-3.3.4-gcc44.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff -up afflib-3.3.4/tools/afverify.cpp.gcc44 afflib-3.3.4/tools/afverify.cpp ---- afflib-3.3.4/tools/afverify.cpp.gcc44 2008-07-21 06:25:29.000000000 +0200 -+++ afflib-3.3.4/tools/afverify.cpp 2009-03-02 12:48:59.000000000 +0100 -@@ -240,12 +240,16 @@ string get_xml_field(const char *buf,con - int verify_bom_signature(AFFILE *af,const char *buf) - { - const char *cce = "\n"; -- char *chain_end = strstr(buf,cce); -+ char *buf_tmp; -+ char *cce_tmp; -+ strcpy(buf_tmp, buf); -+ strcpy(cce_tmp, cce); -+ char *chain_end = strstr(buf_tmp,cce_tmp); - if(!chain_end){ - warn("end of chain XML can't be found\n"); - return -1; // can't find it - } -- char *sig_start = chain_end + strlen(cce); -+ char *sig_start = chain_end + strlen(cce_tmp); - - BIO *seg = BIO_new_mem_buf((void *)buf,strlen(buf)); - BIO_seek(seg,0); diff --git a/afflib.spec b/afflib.spec index 858619e..9924863 100644 --- a/afflib.spec +++ b/afflib.spec @@ -1,6 +1,6 @@ Name: afflib -Version: 3.3.4 -Release: 7%{?dist} +Version: 3.3.5 +Release: 1%{?dist} Summary: Library to support the Advanced Forensic Format Group: System Environment/Libraries @@ -8,7 +8,6 @@ License: BSD with advertising URL: http://www.afflib.org Source0: http://www.afflib.org/downloads/afflib-%{version}.tar.gz Patch0: afflib-3.3.4-WCtype.patch -Patch1: afflib-3.3.4-gcc44.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libtool @@ -58,16 +57,16 @@ developing applications that use %{name}. %prep %setup -q %patch0 -p1 -b .WCtype -%patch1 -p1 -b .gcc44 # prevent internal lzma to be built - testing #rm -rf lzma443 #fix spurious permissions with lzma443 find lzma443 -type f -exec chmod 0644 {} ';' -chmod 0644 lib/base64.cpp +chmod 0644 lib/base64.{h,cpp} # Autoreconf -autoreconf +mkdir -p m4 +autoreconf -vif libtoolize --force @@ -113,6 +112,7 @@ rm -rf $RPM_BUILD_ROOT %files -n afftools %defattr(-,root,root,-) %{_bindir}/af* +%{_mandir}/man1/afcat.1.* %files devel %defattr(-,root,root,-) @@ -123,6 +123,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue May 12 2009 kwizart < kwizart at gmail.com > - 3.3.5-1 +- Update to 3.3.5 + * Mon Mar 2 2009 kwizart < kwizart at gmail.com > - 3.3.4-7 - Fix for gcc44 diff --git a/sources b/sources index d8140b0..c7688f1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -588dd75051d03f666a17ed49d08c1552 afflib-3.3.4.tar.gz +917909c5de9cc941752ef086d6093de7 afflib-3.3.5.tar.gz From ecc254798d8d6a85840b3eb2b7f2b14896444db2 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Wed, 20 May 2009 23:44:06 +0000 Subject: [PATCH 30/95] Update to 3.3.6 --- .cvsignore | 2 +- afflib.spec | 14 +++++--------- sources | 2 +- 3 files changed, 7 insertions(+), 11 deletions(-) diff --git a/.cvsignore b/.cvsignore index ad7c803..cd1ebb6 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -afflib-3.3.5.tar.gz +afflib-3.3.6.tar.gz diff --git a/afflib.spec b/afflib.spec index 9924863..fa28109 100644 --- a/afflib.spec +++ b/afflib.spec @@ -1,5 +1,5 @@ Name: afflib -Version: 3.3.5 +Version: 3.3.6 Release: 1%{?dist} Summary: Library to support the Advanced Forensic Format @@ -7,7 +7,6 @@ Group: System Environment/Libraries License: BSD with advertising URL: http://www.afflib.org Source0: http://www.afflib.org/downloads/afflib-%{version}.tar.gz -Patch0: afflib-3.3.4-WCtype.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libtool @@ -56,7 +55,6 @@ developing applications that use %{name}. %prep %setup -q -%patch0 -p1 -b .WCtype # prevent internal lzma to be built - testing #rm -rf lzma443 @@ -64,15 +62,9 @@ developing applications that use %{name}. find lzma443 -type f -exec chmod 0644 {} ';' chmod 0644 lib/base64.{h,cpp} -# Autoreconf -mkdir -p m4 -autoreconf -vif -libtoolize --force - %build %configure --enable-shared \ - --enable-wide-character-type \ --disable-static \ --enable-libewf=yes \ --enable-qemu=no @@ -123,8 +115,12 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Thu May 21 2009 kwizart < kwizart at gmail.com > - 3.3.6-1 +- Update to 3.3.6 + * Tue May 12 2009 kwizart < kwizart at gmail.com > - 3.3.5-1 - Update to 3.3.5 +- Remove afflib-3.3.4-WCtype.patch * Mon Mar 2 2009 kwizart < kwizart at gmail.com > - 3.3.4-7 - Fix for gcc44 diff --git a/sources b/sources index c7688f1..c9bf2f4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -917909c5de9cc941752ef086d6093de7 afflib-3.3.5.tar.gz +546cb2f0c6bde7868b3ad77bd56791d7 afflib-3.3.6.tar.gz From c8fd518173cfd0bd5112beb3bf8db25e15fb6183 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Wed, 20 May 2009 23:47:19 +0000 Subject: [PATCH 31/95] Remove deprecated patch --- afflib-3.3.4-WCtype.patch | 22 ---------------------- 1 file changed, 22 deletions(-) delete mode 100644 afflib-3.3.4-WCtype.patch diff --git a/afflib-3.3.4-WCtype.patch b/afflib-3.3.4-WCtype.patch deleted file mode 100644 index bf3e757..0000000 --- a/afflib-3.3.4-WCtype.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff -up afflib-3.3.4/configure.ac.WCtype afflib-3.3.4/configure.ac ---- afflib-3.3.4/configure.ac.WCtype 2008-09-29 21:45:05.000000000 +0200 -+++ afflib-3.3.4/configure.ac 2009-03-02 11:58:36.000000000 +0100 -@@ -101,6 +101,18 @@ AC_LANG_POP([C++]) - - - -+AS_IF([test "x$ac_afflib_enable_wide_character_type" != xno ], -+ [AC_DEFINE([HAVE_WIDE_CHARACTER_TYPE],[1],[Defines if wide character type should be used]) -+ AC_CHECK_FUNCS([btowc fgetws mbsinit mbsrtowcs swprintf wmain wmemchr wmemcmp wmemcpy wmemrchr wctob wcschr wcscmp wcscpy wcsdup wcslen wcsncmp wcsncpy wcsrchr wcsrtombs wcstol wcstoul]) -+ AC_CHECK_HEADERS([wchar.h], -+ [AC_DEFINE([HAVE_WCHAR_H],[1],[Define to 1 if you have the header file.]) -+ AC_SUBST([HAVE_WCHAR_H],[1])], -+ [AC_SUBST([HAVE_WCHAR_H],[0])]) -+ -+ AC_SUBST([HAVE_WIDE_CHARACTER_TYPE],[1])], -+ [AC_SUBST([HAVE_WIDE_CHARACTER_TYPE],[0]) -+ AC_SUBST([HAVE_WCHAR_H],[0])]) -+ - ################################################################ - ## LIBEWF support - dnl Function to test if a libewf_get_media_size takes value as an argument From c172e271f13d95e719d453754e2ee68c40c20f4c Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Thu, 21 May 2009 00:25:36 +0000 Subject: [PATCH 32/95] Re-introduce gcc44 patch --- afflib-3.3.4-gcc44.patch | 22 ++++++++++++++++++++++ afflib.spec | 9 +++++++-- 2 files changed, 29 insertions(+), 2 deletions(-) create mode 100644 afflib-3.3.4-gcc44.patch diff --git a/afflib-3.3.4-gcc44.patch b/afflib-3.3.4-gcc44.patch new file mode 100644 index 0000000..b3ea15c --- /dev/null +++ b/afflib-3.3.4-gcc44.patch @@ -0,0 +1,22 @@ +diff -up afflib-3.3.4/tools/afverify.cpp.gcc44 afflib-3.3.4/tools/afverify.cpp +--- afflib-3.3.4/tools/afverify.cpp.gcc44 2008-07-21 06:25:29.000000000 +0200 ++++ afflib-3.3.4/tools/afverify.cpp 2009-03-02 12:48:59.000000000 +0100 +@@ -240,12 +240,16 @@ string get_xml_field(const char *buf,con + int verify_bom_signature(AFFILE *af,const char *buf) + { + const char *cce = "\n"; +- char *chain_end = strstr(buf,cce); ++ char *buf_tmp; ++ char *cce_tmp; ++ strcpy(buf_tmp, buf); ++ strcpy(cce_tmp, cce); ++ char *chain_end = strstr(buf_tmp,cce_tmp); + if(!chain_end){ + warn("end of chain XML can't be found\n"); + return -1; // can't find it + } +- char *sig_start = chain_end + strlen(cce); ++ char *sig_start = chain_end + strlen(cce_tmp); + + BIO *seg = BIO_new_mem_buf((void *)buf,strlen(buf)); + BIO_seek(seg,0); diff --git a/afflib.spec b/afflib.spec index fa28109..6795599 100644 --- a/afflib.spec +++ b/afflib.spec @@ -1,12 +1,13 @@ Name: afflib Version: 3.3.6 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Library to support the Advanced Forensic Format Group: System Environment/Libraries License: BSD with advertising URL: http://www.afflib.org Source0: http://www.afflib.org/downloads/afflib-%{version}.tar.gz +Patch0: afflib-3.3.4-gcc44.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libtool @@ -21,6 +22,7 @@ BuildRequires: libewf-devel >= 20080305 BuildRequires: ncurses-devel BuildRequires: libtermcap-devel BuildRequires: openssl-devel +BuildRequires: python-devel # GPLv2 FOSS incompatible with BSD with advertising ##BuildRequires: readline-devel #BuildRequires: libedit-devel - good replacement for readline - not supported for now @@ -55,6 +57,7 @@ developing applications that use %{name}. %prep %setup -q +%patch0 -p1 -b .gcc44 # prevent internal lzma to be built - testing #rm -rf lzma443 @@ -115,8 +118,10 @@ rm -rf $RPM_BUILD_ROOT %changelog -* Thu May 21 2009 kwizart < kwizart at gmail.com > - 3.3.6-1 +* Thu May 21 2009 kwizart < kwizart at gmail.com > - 3.3.6-2 - Update to 3.3.6 +- Add BR python-devel +- Re-introduce gcc44 patch * Tue May 12 2009 kwizart < kwizart at gmail.com > - 3.3.5-1 - Update to 3.3.5 From ee0bfe77fee4471c1fb5f4736d5d134108da7f5c Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Fri, 24 Jul 2009 16:37:23 +0000 Subject: [PATCH 33/95] - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild --- afflib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/afflib.spec b/afflib.spec index 6795599..201af27 100644 --- a/afflib.spec +++ b/afflib.spec @@ -1,6 +1,6 @@ Name: afflib Version: 3.3.6 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Library to support the Advanced Forensic Format Group: System Environment/Libraries @@ -118,6 +118,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri Jul 24 2009 Fedora Release Engineering - 3.3.6-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + * Thu May 21 2009 kwizart < kwizart at gmail.com > - 3.3.6-2 - Update to 3.3.6 - Add BR python-devel From e1150c03a5e233fa04c370f1a0df317a7fe6c323 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Mr=C3=A1z?= Date: Fri, 21 Aug 2009 12:19:34 +0000 Subject: [PATCH 34/95] - rebuilt with new openssl --- afflib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/afflib.spec b/afflib.spec index 201af27..e349c41 100644 --- a/afflib.spec +++ b/afflib.spec @@ -1,6 +1,6 @@ Name: afflib Version: 3.3.6 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Library to support the Advanced Forensic Format Group: System Environment/Libraries @@ -118,6 +118,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri Aug 21 2009 Tomas Mraz - 3.3.6-4 +- rebuilt with new openssl + * Fri Jul 24 2009 Fedora Release Engineering - 3.3.6-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild From 53c8036cc2de29ac2f82365dac407ac27e607d38 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Wed, 2 Sep 2009 08:34:39 +0000 Subject: [PATCH 35/95] Update to 3.3.7 --- .cvsignore | 2 +- afflib.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/.cvsignore b/.cvsignore index cd1ebb6..022939d 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -afflib-3.3.6.tar.gz +afflib-3.3.7.tar.gz diff --git a/afflib.spec b/afflib.spec index e349c41..7591d03 100644 --- a/afflib.spec +++ b/afflib.spec @@ -1,6 +1,6 @@ Name: afflib -Version: 3.3.6 -Release: 4%{?dist} +Version: 3.3.7 +Release: 1%{?dist} Summary: Library to support the Advanced Forensic Format Group: System Environment/Libraries @@ -18,7 +18,7 @@ BuildRequires: expat-devel ##BuildRequires: fuse-devel BuildRequires: libewf-devel >= 20080305 # Afflib uses lzma-SDK 443 -#BuildRequires: lzma-devel +BuildRequires: lzma-devel BuildRequires: ncurses-devel BuildRequires: libtermcap-devel BuildRequires: openssl-devel @@ -118,6 +118,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed Sep 2 2009 kwizart < kwizart at gmail.com > - 3.3.7-1 +- Update to 3.3.7 + * Fri Aug 21 2009 Tomas Mraz - 3.3.6-4 - rebuilt with new openssl diff --git a/sources b/sources index c9bf2f4..c20e977 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -546cb2f0c6bde7868b3ad77bd56791d7 afflib-3.3.6.tar.gz +198433e717073d69976ee0b3b9399ab4 afflib-3.3.7.tar.gz From f440dbb9ff1e520bcda8eddd277514b2405b9602 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Thu, 24 Sep 2009 20:52:50 +0000 Subject: [PATCH 36/95] Remove old patch --- afflib-3.3.4-gcc44.patch | 22 ---------------------- 1 file changed, 22 deletions(-) delete mode 100644 afflib-3.3.4-gcc44.patch diff --git a/afflib-3.3.4-gcc44.patch b/afflib-3.3.4-gcc44.patch deleted file mode 100644 index b3ea15c..0000000 --- a/afflib-3.3.4-gcc44.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff -up afflib-3.3.4/tools/afverify.cpp.gcc44 afflib-3.3.4/tools/afverify.cpp ---- afflib-3.3.4/tools/afverify.cpp.gcc44 2008-07-21 06:25:29.000000000 +0200 -+++ afflib-3.3.4/tools/afverify.cpp 2009-03-02 12:48:59.000000000 +0100 -@@ -240,12 +240,16 @@ string get_xml_field(const char *buf,con - int verify_bom_signature(AFFILE *af,const char *buf) - { - const char *cce = "\n"; -- char *chain_end = strstr(buf,cce); -+ char *buf_tmp; -+ char *cce_tmp; -+ strcpy(buf_tmp, buf); -+ strcpy(cce_tmp, cce); -+ char *chain_end = strstr(buf_tmp,cce_tmp); - if(!chain_end){ - warn("end of chain XML can't be found\n"); - return -1; // can't find it - } -- char *sig_start = chain_end + strlen(cce); -+ char *sig_start = chain_end + strlen(cce_tmp); - - BIO *seg = BIO_new_mem_buf((void *)buf,strlen(buf)); - BIO_seek(seg,0); From 3f579f6a5713bd2263a6807c8b411fcc5a956580 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Thu, 24 Sep 2009 20:54:35 +0000 Subject: [PATCH 37/95] - Update to 3.4.1 - Update gcc43 (new case) - Enable python binding. - Avoid version-info on the python module. --- .cvsignore | 2 +- afflib-3.4.1-gcc43.patch | 11 +++++++++++ afflib-3.4.1-pyver.patch | 22 ++++++++++++++++++++++ afflib.spec | 21 +++++++++++++++++---- import.log | 1 + sources | 2 +- 6 files changed, 53 insertions(+), 6 deletions(-) create mode 100644 afflib-3.4.1-gcc43.patch create mode 100644 afflib-3.4.1-pyver.patch create mode 100644 import.log diff --git a/.cvsignore b/.cvsignore index 022939d..68be221 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -afflib-3.3.7.tar.gz +afflib-3.4.1.tar.gz diff --git a/afflib-3.4.1-gcc43.patch b/afflib-3.4.1-gcc43.patch new file mode 100644 index 0000000..551f49d --- /dev/null +++ b/afflib-3.4.1-gcc43.patch @@ -0,0 +1,11 @@ +diff -up afflib-3.4.1/tools/hashextent.h.gcc43 afflib-3.4.1/tools/hashextent.h +--- afflib-3.4.1/tools/hashextent.h.gcc43 2009-09-21 21:52:51.000000000 +0200 ++++ afflib-3.4.1/tools/hashextent.h 2009-09-24 22:39:22.534808641 +0200 +@@ -14,6 +14,7 @@ + #include + #include + #include ++#include + + + using std::string; diff --git a/afflib-3.4.1-pyver.patch b/afflib-3.4.1-pyver.patch new file mode 100644 index 0000000..d5d0033 --- /dev/null +++ b/afflib-3.4.1-pyver.patch @@ -0,0 +1,22 @@ +diff -up afflib-3.4.1/pyaff/Makefile.am.pyver afflib-3.4.1/pyaff/Makefile.am +--- afflib-3.4.1/pyaff/Makefile.am.pyver 2009-09-24 22:42:06.534805852 +0200 ++++ afflib-3.4.1/pyaff/Makefile.am 2009-09-24 22:45:13.306557135 +0200 +@@ -9,5 +9,5 @@ pyexec_LTLIBRARIES = pyaff.la + pyaff_la_SOURCES = pyaff.c + pyaff_la_LIBADD = ../lib/libafflib.la + pyaff_la_CPPFLAGS = $(PYTHON_CPPFLAGS) +-pyaff_la_LDFLAGS = -module $(PYTHON_LDFLAGS) ++pyaff_la_LDFLAGS = -module -avoid-version $(PYTHON_LDFLAGS) + endif +diff -up afflib-3.4.1/pyaff/Makefile.in.pyver afflib-3.4.1/pyaff/Makefile.in +--- afflib-3.4.1/pyaff/Makefile.in.pyver 2009-09-24 08:08:53.000000000 +0200 ++++ afflib-3.4.1/pyaff/Makefile.in 2009-09-24 22:45:15.322807098 +0200 +@@ -226,7 +226,7 @@ EXTRA_DIST = PKG-INFO README pyaff.c set + @HAVE_PYTHON_TRUE@pyaff_la_SOURCES = pyaff.c + @HAVE_PYTHON_TRUE@pyaff_la_LIBADD = ../lib/libafflib.la + @HAVE_PYTHON_TRUE@pyaff_la_CPPFLAGS = $(PYTHON_CPPFLAGS) +-@HAVE_PYTHON_TRUE@pyaff_la_LDFLAGS = -module $(PYTHON_LDFLAGS) ++@HAVE_PYTHON_TRUE@pyaff_la_LDFLAGS = -module -avoid-version $(PYTHON_LDFLAGS) + all: all-am + + .SUFFIXES: diff --git a/afflib.spec b/afflib.spec index 7591d03..411dc76 100644 --- a/afflib.spec +++ b/afflib.spec @@ -1,5 +1,7 @@ +%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} + Name: afflib -Version: 3.3.7 +Version: 3.4.1 Release: 1%{?dist} Summary: Library to support the Advanced Forensic Format @@ -7,7 +9,8 @@ Group: System Environment/Libraries License: BSD with advertising URL: http://www.afflib.org Source0: http://www.afflib.org/downloads/afflib-%{version}.tar.gz -Patch0: afflib-3.3.4-gcc44.patch +Patch0: afflib-3.4.1-gcc43.patch +Patch1: afflib-3.4.1-pyver.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libtool @@ -57,7 +60,8 @@ developing applications that use %{name}. %prep %setup -q -%patch0 -p1 -b .gcc44 +%patch0 -p1 -b .gcc43 +%patch1 -p1 -b .pyver # prevent internal lzma to be built - testing #rm -rf lzma443 @@ -70,6 +74,7 @@ chmod 0644 lib/base64.{h,cpp} %configure --enable-shared \ --disable-static \ --enable-libewf=yes \ + --enable-python=yes \ --enable-qemu=no # Remove rpath from libtool @@ -107,6 +112,7 @@ rm -rf $RPM_BUILD_ROOT %files -n afftools %defattr(-,root,root,-) %{_bindir}/af* +%{python_sitearch}/pyaff.so %{_mandir}/man1/afcat.1.* %files devel @@ -118,8 +124,15 @@ rm -rf $RPM_BUILD_ROOT %changelog -* Wed Sep 2 2009 kwizart < kwizart at gmail.com > - 3.3.7-1 +* Thu Sep 24 2009 kwizart < kwizart at gmail.com > - 3.4.1-1 +- Update to 3.4.1 +- Update gcc43 (new case) +- Enable python binding. +- Avoid version-info on the python module. + +* Wed Sep 2 2009 kwizart < kwizart at gmail.com > - 3.3.7-2 - Update to 3.3.7 +- Update gcc44 patch * Fri Aug 21 2009 Tomas Mraz - 3.3.6-4 - rebuilt with new openssl diff --git a/import.log b/import.log new file mode 100644 index 0000000..cc7876a --- /dev/null +++ b/import.log @@ -0,0 +1 @@ +afflib-3_4_1-1_fc11:HEAD:afflib-3.4.1-1.fc11.src.rpm:1253825572 diff --git a/sources b/sources index c20e977..f0f9a55 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -198433e717073d69976ee0b3b9399ab4 afflib-3.3.7.tar.gz +eb3a44f893cd268f32c91b8eb673ecc7 afflib-3.4.1.tar.gz From 978a52588fb21ba9ef966c495338b775a5e6f2d6 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Tue, 27 Oct 2009 22:47:10 +0000 Subject: [PATCH 38/95] - Update to 3.5.2 - Remove upstreamed patch --- .cvsignore | 2 +- afflib-3.4.1-gcc43.patch | 11 ----------- afflib.spec | 8 +++++--- sources | 2 +- 4 files changed, 7 insertions(+), 16 deletions(-) delete mode 100644 afflib-3.4.1-gcc43.patch diff --git a/.cvsignore b/.cvsignore index 68be221..6bc9134 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -afflib-3.4.1.tar.gz +afflib-3.5.2.tar.gz diff --git a/afflib-3.4.1-gcc43.patch b/afflib-3.4.1-gcc43.patch deleted file mode 100644 index 551f49d..0000000 --- a/afflib-3.4.1-gcc43.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -up afflib-3.4.1/tools/hashextent.h.gcc43 afflib-3.4.1/tools/hashextent.h ---- afflib-3.4.1/tools/hashextent.h.gcc43 2009-09-21 21:52:51.000000000 +0200 -+++ afflib-3.4.1/tools/hashextent.h 2009-09-24 22:39:22.534808641 +0200 -@@ -14,6 +14,7 @@ - #include - #include - #include -+#include - - - using std::string; diff --git a/afflib.spec b/afflib.spec index 411dc76..75a4dcb 100644 --- a/afflib.spec +++ b/afflib.spec @@ -1,7 +1,7 @@ %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} Name: afflib -Version: 3.4.1 +Version: 3.5.2 Release: 1%{?dist} Summary: Library to support the Advanced Forensic Format @@ -9,7 +9,6 @@ Group: System Environment/Libraries License: BSD with advertising URL: http://www.afflib.org Source0: http://www.afflib.org/downloads/afflib-%{version}.tar.gz -Patch0: afflib-3.4.1-gcc43.patch Patch1: afflib-3.4.1-pyver.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -60,7 +59,6 @@ developing applications that use %{name}. %prep %setup -q -%patch0 -p1 -b .gcc43 %patch1 -p1 -b .pyver # prevent internal lzma to be built - testing #rm -rf lzma443 @@ -124,6 +122,10 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Oct 27 2009 kwizart < kwizart at gmail.com > - 3.5.2-1 +- Update to 3.5.2 +- Remove upstreamed patch + * Thu Sep 24 2009 kwizart < kwizart at gmail.com > - 3.4.1-1 - Update to 3.4.1 - Update gcc43 (new case) diff --git a/sources b/sources index f0f9a55..6f96b32 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -eb3a44f893cd268f32c91b8eb673ecc7 afflib-3.4.1.tar.gz +0ce8f3dbacc31da1c3faf5bc3e77c535 afflib-3.5.2.tar.gz From ecd815a2af65246c2ea7fdd627796217b739b870 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 25 Nov 2009 22:38:37 +0000 Subject: [PATCH 39/95] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index df512e7..ae76bc3 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: afflib -# $Id$ +# $Id: Makefile,v 1.1 2008/03/20 22:59:37 kevin Exp $ NAME := afflib SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From 3273d4c2f3a89bdf82e6820f2a56e5157d3a75dc Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Fri, 27 Nov 2009 14:29:09 +0000 Subject: [PATCH 40/95] Update to 3.5.3 --- .cvsignore | 2 +- afflib.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index 6bc9134..af5362b 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -afflib-3.5.2.tar.gz +afflib-3.5.3.tar.gz diff --git a/afflib.spec b/afflib.spec index 75a4dcb..e8f5b6f 100644 --- a/afflib.spec +++ b/afflib.spec @@ -1,7 +1,7 @@ %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} Name: afflib -Version: 3.5.2 +Version: 3.5.3 Release: 1%{?dist} Summary: Library to support the Advanced Forensic Format @@ -122,6 +122,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri Nov 27 2009 Nicolas Chauvet - 3.5.3-1 +- Update to 3.5.3 + * Tue Oct 27 2009 kwizart < kwizart at gmail.com > - 3.5.2-1 - Update to 3.5.2 - Remove upstreamed patch diff --git a/sources b/sources index 6f96b32..08c6049 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -0ce8f3dbacc31da1c3faf5bc3e77c535 afflib-3.5.2.tar.gz +43b0c9df59560a49df3ecb54b54412ff afflib-3.5.3.tar.gz From 9579daa9a14184c1ac9bce3d757d01a961f32774 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Tue, 19 Jan 2010 22:07:24 +0000 Subject: [PATCH 41/95] -Update to 3.5.7 --- .cvsignore | 2 +- afflib.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index af5362b..cd69df3 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -afflib-3.5.3.tar.gz +afflib-3.5.7.tar.gz diff --git a/afflib.spec b/afflib.spec index e8f5b6f..5cfe6cd 100644 --- a/afflib.spec +++ b/afflib.spec @@ -1,7 +1,7 @@ %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} Name: afflib -Version: 3.5.3 +Version: 3.5.7 Release: 1%{?dist} Summary: Library to support the Advanced Forensic Format @@ -122,6 +122,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Jan 19 2010 Nicolas Chauvet - 3.5.7-1 +- Update to 3.5.7 + * Fri Nov 27 2009 Nicolas Chauvet - 3.5.3-1 - Update to 3.5.3 diff --git a/sources b/sources index 08c6049..bd5bb5d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -43b0c9df59560a49df3ecb54b54412ff afflib-3.5.3.tar.gz +efd1dacf1acf1ba450104635be93316c afflib-3.5.7.tar.gz From 4aa071ee533eda1132899a1a9dcca45ef57e8ed3 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Sun, 18 Apr 2010 20:30:40 +0000 Subject: [PATCH 42/95] Update to 3.5.10 --- .cvsignore | 2 +- afflib-3.4.1-pyver.patch | 22 ---------------------- afflib.spec | 8 +++++--- sources | 2 +- 4 files changed, 7 insertions(+), 27 deletions(-) delete mode 100644 afflib-3.4.1-pyver.patch diff --git a/.cvsignore b/.cvsignore index cd69df3..1aeb734 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -afflib-3.5.7.tar.gz +afflib-3.5.10.tar.gz diff --git a/afflib-3.4.1-pyver.patch b/afflib-3.4.1-pyver.patch deleted file mode 100644 index d5d0033..0000000 --- a/afflib-3.4.1-pyver.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff -up afflib-3.4.1/pyaff/Makefile.am.pyver afflib-3.4.1/pyaff/Makefile.am ---- afflib-3.4.1/pyaff/Makefile.am.pyver 2009-09-24 22:42:06.534805852 +0200 -+++ afflib-3.4.1/pyaff/Makefile.am 2009-09-24 22:45:13.306557135 +0200 -@@ -9,5 +9,5 @@ pyexec_LTLIBRARIES = pyaff.la - pyaff_la_SOURCES = pyaff.c - pyaff_la_LIBADD = ../lib/libafflib.la - pyaff_la_CPPFLAGS = $(PYTHON_CPPFLAGS) --pyaff_la_LDFLAGS = -module $(PYTHON_LDFLAGS) -+pyaff_la_LDFLAGS = -module -avoid-version $(PYTHON_LDFLAGS) - endif -diff -up afflib-3.4.1/pyaff/Makefile.in.pyver afflib-3.4.1/pyaff/Makefile.in ---- afflib-3.4.1/pyaff/Makefile.in.pyver 2009-09-24 08:08:53.000000000 +0200 -+++ afflib-3.4.1/pyaff/Makefile.in 2009-09-24 22:45:15.322807098 +0200 -@@ -226,7 +226,7 @@ EXTRA_DIST = PKG-INFO README pyaff.c set - @HAVE_PYTHON_TRUE@pyaff_la_SOURCES = pyaff.c - @HAVE_PYTHON_TRUE@pyaff_la_LIBADD = ../lib/libafflib.la - @HAVE_PYTHON_TRUE@pyaff_la_CPPFLAGS = $(PYTHON_CPPFLAGS) --@HAVE_PYTHON_TRUE@pyaff_la_LDFLAGS = -module $(PYTHON_LDFLAGS) -+@HAVE_PYTHON_TRUE@pyaff_la_LDFLAGS = -module -avoid-version $(PYTHON_LDFLAGS) - all: all-am - - .SUFFIXES: diff --git a/afflib.spec b/afflib.spec index 5cfe6cd..f6becdd 100644 --- a/afflib.spec +++ b/afflib.spec @@ -1,7 +1,7 @@ %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} Name: afflib -Version: 3.5.7 +Version: 3.5.10 Release: 1%{?dist} Summary: Library to support the Advanced Forensic Format @@ -9,7 +9,6 @@ Group: System Environment/Libraries License: BSD with advertising URL: http://www.afflib.org Source0: http://www.afflib.org/downloads/afflib-%{version}.tar.gz -Patch1: afflib-3.4.1-pyver.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libtool @@ -59,7 +58,6 @@ developing applications that use %{name}. %prep %setup -q -%patch1 -p1 -b .pyver # prevent internal lzma to be built - testing #rm -rf lzma443 @@ -122,6 +120,10 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sun Apr 18 2010 Nicolas Chauvet - 3.5.10-1 +- Update to 3.5.10 +- Remove upstreamed patch + * Tue Jan 19 2010 Nicolas Chauvet - 3.5.7-1 - Update to 3.5.7 diff --git a/sources b/sources index bd5bb5d..d60d4c8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -efd1dacf1acf1ba450104635be93316c afflib-3.5.7.tar.gz +ae13d7eb04f9620ee92c9a697bd285f9 afflib-3.5.10.tar.gz From 0d208fd93e22fee77b3124c538b5b9332fb987b1 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Wed, 14 Jul 2010 15:11:04 +0000 Subject: [PATCH 43/95] Update to 3.5.2 --- .cvsignore | 2 +- afflib.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index 1aeb734..34a5575 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -afflib-3.5.10.tar.gz +afflib-3.5.12.tar.gz diff --git a/afflib.spec b/afflib.spec index f6becdd..6c21072 100644 --- a/afflib.spec +++ b/afflib.spec @@ -1,7 +1,7 @@ %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} Name: afflib -Version: 3.5.10 +Version: 3.5.12 Release: 1%{?dist} Summary: Library to support the Advanced Forensic Format @@ -120,6 +120,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed Jul 14 2010 Nicolas Chauvet - 3.5.12-1 +- Update to 3.4.12 + * Sun Apr 18 2010 Nicolas Chauvet - 3.5.10-1 - Update to 3.5.10 - Remove upstreamed patch diff --git a/sources b/sources index d60d4c8..b4b7006 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ae13d7eb04f9620ee92c9a697bd285f9 afflib-3.5.10.tar.gz +6eb21ae845c69691abe2e800b411b174 afflib-3.5.12.tar.gz From 43aafc3bc86c8cbe181d2e9581885cd742067f2a Mon Sep 17 00:00:00 2001 From: dmalcolm Date: Thu, 22 Jul 2010 00:33:40 +0000 Subject: [PATCH 44/95] - Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild --- afflib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/afflib.spec b/afflib.spec index 6c21072..e9d2d45 100644 --- a/afflib.spec +++ b/afflib.spec @@ -2,7 +2,7 @@ Name: afflib Version: 3.5.12 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Library to support the Advanced Forensic Format Group: System Environment/Libraries @@ -120,6 +120,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed Jul 21 2010 David Malcolm - 3.5.12-2 +- Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild + * Wed Jul 14 2010 Nicolas Chauvet - 3.5.12-1 - Update to 3.4.12 From 82fba8a581bb7fbc1d002025154a199bb6a8a7c3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 09:37:22 +0000 Subject: [PATCH 45/95] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- import.log | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 import.log diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index ae76bc3..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: afflib -# $Id: Makefile,v 1.1 2008/03/20 22:59:37 kevin Exp $ -NAME := afflib -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/import.log b/import.log deleted file mode 100644 index cc7876a..0000000 --- a/import.log +++ /dev/null @@ -1 +0,0 @@ -afflib-3_4_1-1_fc11:HEAD:afflib-3.4.1-1.fc11.src.rpm:1253825572 From 73f6633ef04351af4e15bbea5bb762e927d3c032 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Thu, 16 Dec 2010 17:49:42 +0100 Subject: [PATCH 46/95] Update to 3.6.4 --- .gitignore | 1 + afflib.spec | 14 ++++++++------ sources | 2 +- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 34a5575..fc6892f 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ afflib-3.5.12.tar.gz +/afflib-3.6.4.tar.gz diff --git a/afflib.spec b/afflib.spec index e9d2d45..834c229 100644 --- a/afflib.spec +++ b/afflib.spec @@ -1,8 +1,8 @@ %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} Name: afflib -Version: 3.5.12 -Release: 2%{?dist} +Version: 3.6.4 +Release: 1%{?dist} Summary: Library to support the Advanced Forensic Format Group: System Environment/Libraries @@ -17,7 +17,6 @@ BuildRequires: curl-devel BuildRequires: expat-devel # GPLv2 FOSS incompatible with BSD with advertising ##BuildRequires: fuse-devel -BuildRequires: libewf-devel >= 20080305 # Afflib uses lzma-SDK 443 BuildRequires: lzma-devel BuildRequires: ncurses-devel @@ -69,7 +68,6 @@ chmod 0644 lib/base64.{h,cpp} %build %configure --enable-shared \ --disable-static \ - --enable-libewf=yes \ --enable-python=yes \ --enable-qemu=no @@ -107,9 +105,9 @@ rm -rf $RPM_BUILD_ROOT %files -n afftools %defattr(-,root,root,-) -%{_bindir}/af* +%{_bindir}/aff* %{python_sitearch}/pyaff.so -%{_mandir}/man1/afcat.1.* +%{_mandir}/man1/affcat.1.* %files devel %defattr(-,root,root,-) @@ -120,6 +118,10 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Thu Dec 16 2010 Nicolas Chauvet - 3.6.4-1 +- Update to 3.6.4 +- Disable libewf support - http://afflib.org/archives/75 + * Wed Jul 21 2010 David Malcolm - 3.5.12-2 - Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild diff --git a/sources b/sources index b4b7006..0b83851 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -6eb21ae845c69691abe2e800b411b174 afflib-3.5.12.tar.gz +bc03dcd98b8a1d04169b6261ce304458 afflib-3.6.4.tar.gz From 0fb8d6a435c8a3bf6546cc3367df7312f6232df5 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Mon, 7 Feb 2011 18:33:07 -0600 Subject: [PATCH 47/95] - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild --- afflib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/afflib.spec b/afflib.spec index 834c229..e5e33e5 100644 --- a/afflib.spec +++ b/afflib.spec @@ -2,7 +2,7 @@ Name: afflib Version: 3.6.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Library to support the Advanced Forensic Format Group: System Environment/Libraries @@ -118,6 +118,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Feb 07 2011 Fedora Release Engineering - 3.6.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + * Thu Dec 16 2010 Nicolas Chauvet - 3.6.4-1 - Update to 3.6.4 - Disable libewf support - http://afflib.org/archives/75 From cd444ec7319387e52c9a919f9dd44529a2758cd5 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Sun, 13 Feb 2011 18:13:42 +0100 Subject: [PATCH 48/95] Update to 3.6.6 --- .gitignore | 1 + afflib.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index fc6892f..afb6ab9 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ afflib-3.5.12.tar.gz /afflib-3.6.4.tar.gz +/afflib-3.6.6.tar.gz diff --git a/afflib.spec b/afflib.spec index e5e33e5..dd3172b 100644 --- a/afflib.spec +++ b/afflib.spec @@ -1,8 +1,8 @@ %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} Name: afflib -Version: 3.6.4 -Release: 2%{?dist} +Version: 3.6.6 +Release: 1%{?dist} Summary: Library to support the Advanced Forensic Format Group: System Environment/Libraries @@ -118,6 +118,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sun Feb 13 2011 Nicolas Chauvet - 3.6.6-1 +- Update to 3.6.6 + * Mon Feb 07 2011 Fedora Release Engineering - 3.6.4-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild diff --git a/sources b/sources index 0b83851..96c04c5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -bc03dcd98b8a1d04169b6261ce304458 afflib-3.6.4.tar.gz +b7ff4d2945882018eb1536cad182ad01 afflib-3.6.6.tar.gz From e783cb7f9d68492973c94445ac3309d16a60bee0 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Sat, 26 Mar 2011 23:13:37 +0100 Subject: [PATCH 49/95] Update to 3.6.8 --- .gitignore | 1 + afflib.spec | 3 +++ sources | 2 +- 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index afb6ab9..f0a975c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ afflib-3.5.12.tar.gz /afflib-3.6.4.tar.gz /afflib-3.6.6.tar.gz +/afflib-3.6.8.tar.gz diff --git a/afflib.spec b/afflib.spec index dd3172b..910564f 100644 --- a/afflib.spec +++ b/afflib.spec @@ -118,6 +118,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sat Mar 26 2011 Nicolas Chauvet - 3.6.6-1 +- Update to 3.6.8 + * Sun Feb 13 2011 Nicolas Chauvet - 3.6.6-1 - Update to 3.6.6 diff --git a/sources b/sources index 96c04c5..10a468d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b7ff4d2945882018eb1536cad182ad01 afflib-3.6.6.tar.gz +c170ea4e3bcd3c0e286b4d5d904bc367 afflib-3.6.8.tar.gz From 44ec3660f3abe78c8cea26a066e473a4d138a05a Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Sat, 26 Mar 2011 23:14:59 +0100 Subject: [PATCH 50/95] Fix version --- afflib.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/afflib.spec b/afflib.spec index 910564f..4ab0676 100644 --- a/afflib.spec +++ b/afflib.spec @@ -1,7 +1,7 @@ %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} Name: afflib -Version: 3.6.6 +Version: 3.6.8 Release: 1%{?dist} Summary: Library to support the Advanced Forensic Format @@ -118,7 +118,7 @@ rm -rf $RPM_BUILD_ROOT %changelog -* Sat Mar 26 2011 Nicolas Chauvet - 3.6.6-1 +* Sat Mar 26 2011 Nicolas Chauvet - 3.6.8-1 - Update to 3.6.8 * Sun Feb 13 2011 Nicolas Chauvet - 3.6.6-1 From 9e8fd202c74f9eb1f204d58ff4fd34a60f348ed0 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Fri, 27 May 2011 16:25:21 +0200 Subject: [PATCH 51/95] Update to 3.6.12 --- afflib.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/afflib.spec b/afflib.spec index 4ab0676..20d6cc8 100644 --- a/afflib.spec +++ b/afflib.spec @@ -1,7 +1,7 @@ %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} Name: afflib -Version: 3.6.8 +Version: 3.6.12 Release: 1%{?dist} Summary: Library to support the Advanced Forensic Format @@ -118,6 +118,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri May 27 2011 Nicolas Chauvet - 3.6.12-1 +- Update to 3.6.12 + * Sat Mar 26 2011 Nicolas Chauvet - 3.6.8-1 - Update to 3.6.8 diff --git a/sources b/sources index 10a468d..7837166 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c170ea4e3bcd3c0e286b4d5d904bc367 afflib-3.6.8.tar.gz +8d0026e71ecb86089ced39204a103828 afflib-3.6.12.tar.gz From c232c28f97ac7c86a810a26fe198d6dcdc2dacc8 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Thu, 8 Sep 2011 23:03:13 +0200 Subject: [PATCH 52/95] Enable S3 --- afflib.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/afflib.spec b/afflib.spec index 20d6cc8..536dd1c 100644 --- a/afflib.spec +++ b/afflib.spec @@ -2,7 +2,7 @@ Name: afflib Version: 3.6.12 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Library to support the Advanced Forensic Format Group: System Environment/Libraries @@ -69,7 +69,7 @@ chmod 0644 lib/base64.{h,cpp} %configure --enable-shared \ --disable-static \ --enable-python=yes \ - --enable-qemu=no + --enable-s3=yes # Remove rpath from libtool sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool @@ -118,6 +118,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Thu Sep 08 2011 Nicolas Chauvet - 3.6.12-2 +- Enable S3 + * Fri May 27 2011 Nicolas Chauvet - 3.6.12-1 - Update to 3.6.12 From 0904598a9b0b1d0e02fff619520586d9c7abec17 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Thu, 12 Jan 2012 15:01:01 +0100 Subject: [PATCH 53/95] Update to 2.6.15 --- .gitignore | 1 + afflib.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index f0a975c..a38d005 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ afflib-3.5.12.tar.gz /afflib-3.6.4.tar.gz /afflib-3.6.6.tar.gz /afflib-3.6.8.tar.gz +/afflib-3.6.15.tar.gz diff --git a/afflib.spec b/afflib.spec index 536dd1c..b5eaa34 100644 --- a/afflib.spec +++ b/afflib.spec @@ -1,8 +1,8 @@ %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} Name: afflib -Version: 3.6.12 -Release: 2%{?dist} +Version: 3.6.15 +Release: 1%{?dist} Summary: Library to support the Advanced Forensic Format Group: System Environment/Libraries @@ -118,6 +118,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Thu Jan 12 2012 Nicolas Chauvet - 3.6.15-1 +- Update to 3.6.15 + * Thu Sep 08 2011 Nicolas Chauvet - 3.6.12-2 - Enable S3 diff --git a/sources b/sources index 7837166..f5134ba 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8d0026e71ecb86089ced39204a103828 afflib-3.6.12.tar.gz +ca04f2d1bda64e0cedaf4af7a9bf4298 afflib-3.6.15.tar.gz From 6fbfcf64a2a28ae867be5133364f64b0b9b3dd06 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 12 Jan 2012 15:04:03 -0600 Subject: [PATCH 54/95] - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild --- afflib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/afflib.spec b/afflib.spec index b5eaa34..9dbfa7a 100644 --- a/afflib.spec +++ b/afflib.spec @@ -2,7 +2,7 @@ Name: afflib Version: 3.6.15 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Library to support the Advanced Forensic Format Group: System Environment/Libraries @@ -118,6 +118,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Thu Jan 12 2012 Fedora Release Engineering - 3.6.15-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + * Thu Jan 12 2012 Nicolas Chauvet - 3.6.15-1 - Update to 3.6.15 From 4d4f2d5daade1e3645a324a71d25fdc00810c0c4 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 18 Jul 2012 10:39:36 -0500 Subject: [PATCH 55/95] - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild --- afflib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/afflib.spec b/afflib.spec index 9dbfa7a..e3dcf67 100644 --- a/afflib.spec +++ b/afflib.spec @@ -2,7 +2,7 @@ Name: afflib Version: 3.6.15 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Library to support the Advanced Forensic Format Group: System Environment/Libraries @@ -118,6 +118,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed Jul 18 2012 Fedora Release Engineering - 3.6.15-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + * Thu Jan 12 2012 Fedora Release Engineering - 3.6.15-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild From 07d9ccf6dd882626a3ae97e7307b015fa71f0120 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Sat, 8 Sep 2012 22:12:54 +0200 Subject: [PATCH 56/95] Update to 3.7.1 --- afflib.spec | 9 ++++++--- sources | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/afflib.spec b/afflib.spec index e3dcf67..4ff30b1 100644 --- a/afflib.spec +++ b/afflib.spec @@ -1,14 +1,14 @@ %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} Name: afflib -Version: 3.6.15 -Release: 3%{?dist} +Version: 3.7.1 +Release: 1%{?dist} Summary: Library to support the Advanced Forensic Format Group: System Environment/Libraries License: BSD with advertising URL: http://www.afflib.org -Source0: http://www.afflib.org/downloads/afflib-%{version}.tar.gz +Source0: https://github.com/downloads/simsong/AFFLIBv3/afflib-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libtool @@ -118,6 +118,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sat Sep 08 2012 Nicolas Chauvet - 3.7.1-1 +- Update to 3.7.1 + * Wed Jul 18 2012 Fedora Release Engineering - 3.6.15-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild diff --git a/sources b/sources index f5134ba..d8d22cf 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ca04f2d1bda64e0cedaf4af7a9bf4298 afflib-3.6.15.tar.gz +c6751d461aaf6acf9d15303cde539e44 afflib-3.7.1.tar.gz From df3d1639a235a8d91428eb5d37c6eef110c502a1 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Sat, 8 Sep 2012 22:34:41 +0200 Subject: [PATCH 57/95] git .ignore From 1feb60817042838357e49db85804d044bc67b3f4 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Sat, 8 Sep 2012 22:35:21 +0200 Subject: [PATCH 58/95] Update .gitignore From 7a7c9334d65c65748f6fded3401b564d521620e5 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 13 Feb 2013 10:21:28 -0600 Subject: [PATCH 59/95] - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild --- afflib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/afflib.spec b/afflib.spec index 4ff30b1..101b1a6 100644 --- a/afflib.spec +++ b/afflib.spec @@ -2,7 +2,7 @@ Name: afflib Version: 3.7.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Library to support the Advanced Forensic Format Group: System Environment/Libraries @@ -118,6 +118,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed Feb 13 2013 Fedora Release Engineering - 3.7.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + * Sat Sep 08 2012 Nicolas Chauvet - 3.7.1-1 - Update to 3.7.1 From 5a32a3bcf001ea68b7b78ea73cb76ee7b4744c2f Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 2 Aug 2013 19:22:50 -0500 Subject: [PATCH 60/95] - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild --- afflib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/afflib.spec b/afflib.spec index 101b1a6..65bcf4c 100644 --- a/afflib.spec +++ b/afflib.spec @@ -2,7 +2,7 @@ Name: afflib Version: 3.7.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Library to support the Advanced Forensic Format Group: System Environment/Libraries @@ -118,6 +118,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sat Aug 03 2013 Fedora Release Engineering - 3.7.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + * Wed Feb 13 2013 Fedora Release Engineering - 3.7.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild From 7b3e216dcf1952a2a5b58f3fb17ee7f1b19417f8 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Wed, 12 Feb 2014 00:37:58 +0100 Subject: [PATCH 61/95] Update to 3.7.3 --- .gitignore | 1 + afflib.spec | 11 +++++++---- sources | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index a38d005..dbd49c5 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ afflib-3.5.12.tar.gz /afflib-3.6.6.tar.gz /afflib-3.6.8.tar.gz /afflib-3.6.15.tar.gz +/v3.7.3.tar.gz diff --git a/afflib.spec b/afflib.spec index 65bcf4c..1e7987e 100644 --- a/afflib.spec +++ b/afflib.spec @@ -1,14 +1,14 @@ %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} Name: afflib -Version: 3.7.1 -Release: 3%{?dist} +Version: 3.7.3 +Release: 1%{?dist} Summary: Library to support the Advanced Forensic Format Group: System Environment/Libraries License: BSD with advertising URL: http://www.afflib.org -Source0: https://github.com/downloads/simsong/AFFLIBv3/afflib-%{version}.tar.gz +Source0: https://github.com/simsong/AFFLIBv3/archive/v%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libtool @@ -56,7 +56,7 @@ developing applications that use %{name}. %prep -%setup -q +%setup -q -n AFFLIBv3-%{version} # prevent internal lzma to be built - testing #rm -rf lzma443 @@ -118,6 +118,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed Feb 12 2014 Nicolas Chauvet - 3.7.3-1 +- Update to 3.7.3 + * Sat Aug 03 2013 Fedora Release Engineering - 3.7.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild diff --git a/sources b/sources index d8d22cf..b2866e7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c6751d461aaf6acf9d15303cde539e44 afflib-3.7.1.tar.gz +d674558aa6752faf52433a09390c3661 v3.7.3.tar.gz From ab4e8a322eea8acd6f1f16d8fec59ad6fd0ba3e8 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Wed, 12 Feb 2014 00:47:34 +0100 Subject: [PATCH 62/95] ./bootstrap --- afflib.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/afflib.spec b/afflib.spec index 1e7987e..6ac90f6 100644 --- a/afflib.spec +++ b/afflib.spec @@ -64,6 +64,7 @@ developing applications that use %{name}. find lzma443 -type f -exec chmod 0644 {} ';' chmod 0644 lib/base64.{h,cpp} +./bootstrap %build %configure --enable-shared \ From 131dbcbfa4f7c35c17caa1781c9a4dc38ad8735f Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Wed, 12 Feb 2014 21:39:46 +0100 Subject: [PATCH 63/95] Fixup --- afflib.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/afflib.spec b/afflib.spec index 6ac90f6..58f8c06 100644 --- a/afflib.spec +++ b/afflib.spec @@ -64,7 +64,7 @@ developing applications that use %{name}. find lzma443 -type f -exec chmod 0644 {} ';' chmod 0644 lib/base64.{h,cpp} -./bootstrap +./bootstrap.sh %build %configure --enable-shared \ From 4803c53bf310075654e8ca19c9d21557053c45a0 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 6 Jun 2014 19:14:44 -0500 Subject: [PATCH 64/95] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild --- afflib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/afflib.spec b/afflib.spec index 58f8c06..105edb6 100644 --- a/afflib.spec +++ b/afflib.spec @@ -2,7 +2,7 @@ Name: afflib Version: 3.7.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Library to support the Advanced Forensic Format Group: System Environment/Libraries @@ -119,6 +119,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sat Jun 07 2014 Fedora Release Engineering - 3.7.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + * Wed Feb 12 2014 Nicolas Chauvet - 3.7.3-1 - Update to 3.7.3 From 6715d1157b24b05d971a08cbc395125fbf683b97 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Fri, 15 Aug 2014 20:05:45 +0000 Subject: [PATCH 65/95] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild --- afflib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/afflib.spec b/afflib.spec index 105edb6..3187ef4 100644 --- a/afflib.spec +++ b/afflib.spec @@ -2,7 +2,7 @@ Name: afflib Version: 3.7.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Library to support the Advanced Forensic Format Group: System Environment/Libraries @@ -119,6 +119,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri Aug 15 2014 Fedora Release Engineering - 3.7.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + * Sat Jun 07 2014 Fedora Release Engineering - 3.7.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild From 646ec212deee184416f7ab3153b7e1a722fd753c Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Sun, 4 Jan 2015 16:51:27 +0100 Subject: [PATCH 66/95] Update to 3.7.4 --- .gitignore | 1 + afflib.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index dbd49c5..7df54f3 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ afflib-3.5.12.tar.gz /afflib-3.6.8.tar.gz /afflib-3.6.15.tar.gz /v3.7.3.tar.gz +/v3.7.4.tar.gz diff --git a/afflib.spec b/afflib.spec index 3187ef4..c43c649 100644 --- a/afflib.spec +++ b/afflib.spec @@ -1,13 +1,13 @@ %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} Name: afflib -Version: 3.7.3 -Release: 3%{?dist} +Version: 3.7.4 +Release: 1%{?dist} Summary: Library to support the Advanced Forensic Format Group: System Environment/Libraries License: BSD with advertising -URL: http://www.afflib.org +URL: https://github.com/simsong/AFFLIBv3 Source0: https://github.com/simsong/AFFLIBv3/archive/v%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -119,6 +119,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sun Jan 04 2015 Nicolas Chauvet - 3.7.4-1 +- Update to 3.7.4 + * Fri Aug 15 2014 Fedora Release Engineering - 3.7.3-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild diff --git a/sources b/sources index b2866e7..a736b56 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d674558aa6752faf52433a09390c3661 v3.7.3.tar.gz +a81470590cfc2f22a3168f89ebe27ea6 v3.7.4.tar.gz From 89d077e9fae0d544f79d44ca0d05a0924e2ecc51 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Sun, 4 Jan 2015 17:17:59 +0100 Subject: [PATCH 67/95] cleanup spec file --- afflib.spec | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/afflib.spec b/afflib.spec index c43c649..a9daf20 100644 --- a/afflib.spec +++ b/afflib.spec @@ -9,7 +9,6 @@ Group: System Environment/Libraries License: BSD with advertising URL: https://github.com/simsong/AFFLIBv3 Source0: https://github.com/simsong/AFFLIBv3/archive/v%{version}.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libtool @@ -83,35 +82,27 @@ make %{?_smp_mflags} %install -rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' -%clean -rm -rf $RPM_BUILD_ROOT - - %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files -%defattr(-,root,root,-) %doc AUTHORS BUGLIST.txt ChangeLog COPYING NEWS README %doc doc/announce_2.2.txt %{_libdir}/*.so.* %files -n afftools -%defattr(-,root,root,-) %{_bindir}/aff* %{python_sitearch}/pyaff.so %{_mandir}/man1/affcat.1.* %files devel -%defattr(-,root,root,-) %doc doc/crypto_design.txt doc/crypto_doc.txt %{_includedir}/afflib/ %{_libdir}/*.so @@ -121,6 +112,7 @@ rm -rf $RPM_BUILD_ROOT %changelog * Sun Jan 04 2015 Nicolas Chauvet - 3.7.4-1 - Update to 3.7.4 +- cleanup spec file * Fri Aug 15 2014 Fedora Release Engineering - 3.7.3-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild From 7db8a96a6b87bbaacd06feb193130eb917efea68 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Sat, 2 May 2015 12:28:01 +0200 Subject: [PATCH 68/95] Rebuilt for GCC 5 C++11 ABI change --- afflib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/afflib.spec b/afflib.spec index a9daf20..51a26c5 100644 --- a/afflib.spec +++ b/afflib.spec @@ -2,7 +2,7 @@ Name: afflib Version: 3.7.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Library to support the Advanced Forensic Format Group: System Environment/Libraries @@ -110,6 +110,9 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' %changelog +* Sat May 02 2015 Kalev Lember - 3.7.4-2 +- Rebuilt for GCC 5 C++11 ABI change + * Sun Jan 04 2015 Nicolas Chauvet - 3.7.4-1 - Update to 3.7.4 - cleanup spec file From 7e21fa4ccad7857c3f1078d5540fc3e28fa75693 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Tue, 16 Jun 2015 23:40:30 +0000 Subject: [PATCH 69/95] - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild --- afflib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/afflib.spec b/afflib.spec index 51a26c5..9c19ff3 100644 --- a/afflib.spec +++ b/afflib.spec @@ -2,7 +2,7 @@ Name: afflib Version: 3.7.4 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Library to support the Advanced Forensic Format Group: System Environment/Libraries @@ -110,6 +110,9 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' %changelog +* Tue Jun 16 2015 Fedora Release Engineering - 3.7.4-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + * Sat May 02 2015 Kalev Lember - 3.7.4-2 - Rebuilt for GCC 5 C++11 ABI change From 8126a994e812932170fc9d250d5b849331c231c4 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 3 Feb 2016 16:01:33 +0000 Subject: [PATCH 70/95] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- afflib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/afflib.spec b/afflib.spec index 9c19ff3..72cee83 100644 --- a/afflib.spec +++ b/afflib.spec @@ -2,7 +2,7 @@ Name: afflib Version: 3.7.4 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Library to support the Advanced Forensic Format Group: System Environment/Libraries @@ -110,6 +110,9 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' %changelog +* Wed Feb 03 2016 Fedora Release Engineering - 3.7.4-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Tue Jun 16 2015 Fedora Release Engineering - 3.7.4-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild From fdd9d4be31cdef535e75ade09b89e6a48115db93 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 19 Jul 2016 06:30:09 +0000 Subject: [PATCH 71/95] - https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages --- afflib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/afflib.spec b/afflib.spec index 72cee83..368fa50 100644 --- a/afflib.spec +++ b/afflib.spec @@ -2,7 +2,7 @@ Name: afflib Version: 3.7.4 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Library to support the Advanced Forensic Format Group: System Environment/Libraries @@ -110,6 +110,9 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' %changelog +* Tue Jul 19 2016 Fedora Release Engineering - 3.7.4-5 +- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages + * Wed Feb 03 2016 Fedora Release Engineering - 3.7.4-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild From ea017820056cd121d9e9b1c6c48c18edd7e7beaa Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 10 Feb 2017 05:47:55 +0000 Subject: [PATCH 72/95] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- afflib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/afflib.spec b/afflib.spec index 368fa50..c307827 100644 --- a/afflib.spec +++ b/afflib.spec @@ -2,7 +2,7 @@ Name: afflib Version: 3.7.4 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Library to support the Advanced Forensic Format Group: System Environment/Libraries @@ -110,6 +110,9 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' %changelog +* Fri Feb 10 2017 Fedora Release Engineering - 3.7.4-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Tue Jul 19 2016 Fedora Release Engineering - 3.7.4-5 - https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages From edb3ad4ea8cf78dd1591faedc99731e23861551f Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Fri, 3 Mar 2017 11:59:19 +0100 Subject: [PATCH 73/95] Update to 3.7.15 --- .gitignore | 1 + 0001-Use-DESTDIR-for-packaging.patch | 24 +++++++++++++++++++++ afflib.spec | 31 ++++++++++++++-------------- sources | 2 +- 4 files changed, 42 insertions(+), 16 deletions(-) create mode 100644 0001-Use-DESTDIR-for-packaging.patch diff --git a/.gitignore b/.gitignore index 7df54f3..45806c9 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ afflib-3.5.12.tar.gz /afflib-3.6.15.tar.gz /v3.7.3.tar.gz /v3.7.4.tar.gz +/afflib-3.7.15.tar.gz diff --git a/0001-Use-DESTDIR-for-packaging.patch b/0001-Use-DESTDIR-for-packaging.patch new file mode 100644 index 0000000..3435f60 --- /dev/null +++ b/0001-Use-DESTDIR-for-packaging.patch @@ -0,0 +1,24 @@ +From 22a8229ad18248d85d11f85414ba6d1b740e62e8 Mon Sep 17 00:00:00 2001 +From: Nicolas Chauvet +Date: Fri, 3 Mar 2017 11:39:11 +0100 +Subject: [PATCH] Use DESTDIR for packaging + +--- + pyaff/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/pyaff/Makefile.am b/pyaff/Makefile.am +index 468b0f7..4fa390b 100644 +--- a/pyaff/Makefile.am ++++ b/pyaff/Makefile.am +@@ -11,6 +11,6 @@ install-exec-local: + cd $(srcdir) && $(PYTHON) setup.py \ + build --build-base $(abs_builddir)/build \ + egg_info --egg-base $(abs_builddir) \ +- install --prefix $(prefix) --single-version-externally-managed --record=$(abs_builddir)/installed.txt \ ++ install --prefix $(DESTDIR)$(prefix) --single-version-externally-managed --record=$(abs_builddir)/installed.txt \ + bdist_egg --dist-dir $(abs_builddir)/dist + endif +-- +2.7.4 + diff --git a/afflib.spec b/afflib.spec index c307827..59a890f 100644 --- a/afflib.spec +++ b/afflib.spec @@ -1,14 +1,12 @@ -%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} - Name: afflib -Version: 3.7.4 -Release: 6%{?dist} +Version: 3.7.15 +Release: 1%{?dist} Summary: Library to support the Advanced Forensic Format -Group: System Environment/Libraries License: BSD with advertising -URL: https://github.com/simsong/AFFLIBv3 -Source0: https://github.com/simsong/AFFLIBv3/archive/v%{version}.tar.gz +URL: https://github.com/sshock/AFFLIBv3 +Source0: https://github.com/sshock/AFFLIBv3/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz +Patch0: 0001-Use-DESTDIR-for-packaging.patch BuildRequires: libtool @@ -36,16 +34,14 @@ afflib is library for support of the Advanced Forensic Format (AFF). %package -n afftools Summary: Utilities for %{name} -Group: Applications/System -Requires: %{name} = %{version}-%{release} +Requires: %{name}%{?_isa} = %{version}-%{release} %description -n afftools The %{name}-utils package contains utilities for using %{name}. %package devel Summary: Development files for %{name} -Group: Development/Libraries -Requires: %{name} = %{version}-%{release} +Requires: %{name}%{?_isa} = %{version}-%{release} Requires: openssl-devel Requires: pkgconfig @@ -58,6 +54,7 @@ developing applications that use %{name}. %setup -q -n AFFLIBv3-%{version} # prevent internal lzma to be built - testing #rm -rf lzma443 +%patch0 -p1 -b .destdir #fix spurious permissions with lzma443 find lzma443 -type f -exec chmod 0644 {} ';' @@ -93,14 +90,15 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' %files -%doc AUTHORS BUGLIST.txt ChangeLog COPYING NEWS README -%doc doc/announce_2.2.txt +%doc AUTHORS BUGLIST.txt ChangeLog NEWS README +%doc doc/announce_2.2.txt +%license COPYING %{_libdir}/*.so.* %files -n afftools %{_bindir}/aff* -%{python_sitearch}/pyaff.so -%{_mandir}/man1/affcat.1.* +%{python_sitearch}/* +%{_mandir}/man1/aff*.1.* %files devel %doc doc/crypto_design.txt doc/crypto_doc.txt @@ -110,6 +108,9 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' %changelog +* Fri Mar 03 2017 Nicolas Chauvet - 3.7.15-1 +- Update to 3.7.15 + * Fri Feb 10 2017 Fedora Release Engineering - 3.7.4-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild diff --git a/sources b/sources index a736b56..5729690 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a81470590cfc2f22a3168f89ebe27ea6 v3.7.4.tar.gz +SHA512 (afflib-3.7.15.tar.gz) = 48fb3932a7889251df2b9777665ac0ae48aa19ae06180b2aa3820e12c23506d9742ae483ff538fcd5dcc60e6d540813fd59131e5f0ad98a829e6fcd55f87ce31 From 193ebd0f663fded54797fa2e5b0e5325d89eca34 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 15 May 2017 19:54:30 +0000 Subject: [PATCH 74/95] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_27_Mass_Rebuild --- afflib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/afflib.spec b/afflib.spec index 59a890f..740519f 100644 --- a/afflib.spec +++ b/afflib.spec @@ -1,6 +1,6 @@ Name: afflib Version: 3.7.15 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Library to support the Advanced Forensic Format License: BSD with advertising @@ -108,6 +108,9 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' %changelog +* Mon May 15 2017 Fedora Release Engineering - 3.7.15-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_27_Mass_Rebuild + * Fri Mar 03 2017 Nicolas Chauvet - 3.7.15-1 - Update to 3.7.15 From b3774e9adff3731b9862736339fbd0771a5f7bab Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 26 Jul 2017 02:39:10 +0000 Subject: [PATCH 75/95] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- afflib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/afflib.spec b/afflib.spec index 740519f..9a62bf5 100644 --- a/afflib.spec +++ b/afflib.spec @@ -1,6 +1,6 @@ Name: afflib Version: 3.7.15 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Library to support the Advanced Forensic Format License: BSD with advertising @@ -108,6 +108,9 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' %changelog +* Wed Jul 26 2017 Fedora Release Engineering - 3.7.15-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Mon May 15 2017 Fedora Release Engineering - 3.7.15-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_27_Mass_Rebuild From 4e19e3723bc9ace3dae97e915034cf5dd34eb2ac Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 2 Aug 2017 17:25:47 +0000 Subject: [PATCH 76/95] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild --- afflib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/afflib.spec b/afflib.spec index 9a62bf5..50b666a 100644 --- a/afflib.spec +++ b/afflib.spec @@ -1,6 +1,6 @@ Name: afflib Version: 3.7.15 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Library to support the Advanced Forensic Format License: BSD with advertising @@ -108,6 +108,9 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' %changelog +* Wed Aug 02 2017 Fedora Release Engineering - 3.7.15-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + * Wed Jul 26 2017 Fedora Release Engineering - 3.7.15-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild From da9520471cecc63fdd2ae60e84a9d720857b9be2 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Mon, 8 Jan 2018 23:51:47 +0100 Subject: [PATCH 77/95] Update to 3.7.16 --- .gitignore | 1 + afflib.spec | 9 +++++---- sources | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 45806c9..e933098 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ afflib-3.5.12.tar.gz /v3.7.3.tar.gz /v3.7.4.tar.gz /afflib-3.7.15.tar.gz +/afflib-3.7.16.tar.gz diff --git a/afflib.spec b/afflib.spec index 50b666a..62ded23 100644 --- a/afflib.spec +++ b/afflib.spec @@ -1,12 +1,11 @@ Name: afflib -Version: 3.7.15 -Release: 4%{?dist} +Version: 3.7.16 +Release: 1%{?dist} Summary: Library to support the Advanced Forensic Format License: BSD with advertising URL: https://github.com/sshock/AFFLIBv3 Source0: https://github.com/sshock/AFFLIBv3/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz -Patch0: 0001-Use-DESTDIR-for-packaging.patch BuildRequires: libtool @@ -54,7 +53,6 @@ developing applications that use %{name}. %setup -q -n AFFLIBv3-%{version} # prevent internal lzma to be built - testing #rm -rf lzma443 -%patch0 -p1 -b .destdir #fix spurious permissions with lzma443 find lzma443 -type f -exec chmod 0644 {} ';' @@ -108,6 +106,9 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' %changelog +* Mon Jan 08 2018 Nicolas Chauvet - 3.7.16-1 +- Update to 3.7.16 + * Wed Aug 02 2017 Fedora Release Engineering - 3.7.15-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild diff --git a/sources b/sources index 5729690..d8f0933 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (afflib-3.7.15.tar.gz) = 48fb3932a7889251df2b9777665ac0ae48aa19ae06180b2aa3820e12c23506d9742ae483ff538fcd5dcc60e6d540813fd59131e5f0ad98a829e6fcd55f87ce31 +SHA512 (afflib-3.7.16.tar.gz) = 19eb77d25f939e0bc941cc4106809e23a89f3f07fd0ddb8dfb03b2ddfa24e22c544deb011a5e4247a955529289de0e7ffc4b196c943f8cc352525fcc2b05a279 From a4e178c901561aef47c3aa36775352b4189e8485 Mon Sep 17 00:00:00 2001 From: Iryna Shcherbina Date: Tue, 6 Feb 2018 19:57:40 +0100 Subject: [PATCH 78/95] Update Python 2 dependency declarations to new packaging standards --- afflib.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/afflib.spec b/afflib.spec index 62ded23..ef3df38 100644 --- a/afflib.spec +++ b/afflib.spec @@ -1,6 +1,6 @@ Name: afflib Version: 3.7.16 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Library to support the Advanced Forensic Format License: BSD with advertising @@ -18,7 +18,7 @@ BuildRequires: lzma-devel BuildRequires: ncurses-devel BuildRequires: libtermcap-devel BuildRequires: openssl-devel -BuildRequires: python-devel +BuildRequires: python2-devel # GPLv2 FOSS incompatible with BSD with advertising ##BuildRequires: readline-devel #BuildRequires: libedit-devel - good replacement for readline - not supported for now @@ -106,6 +106,10 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' %changelog +* Tue Feb 06 2018 Iryna Shcherbina - 3.7.16-2 +- Update Python 2 dependency declarations to new packaging standards + (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3) + * Mon Jan 08 2018 Nicolas Chauvet - 3.7.16-1 - Update to 3.7.16 From 6b56c2f578be44f04223e6b36b1601778a63ed10 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 7 Feb 2018 01:58:04 +0000 Subject: [PATCH 79/95] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- afflib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/afflib.spec b/afflib.spec index ef3df38..2103b3e 100644 --- a/afflib.spec +++ b/afflib.spec @@ -1,6 +1,6 @@ Name: afflib Version: 3.7.16 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Library to support the Advanced Forensic Format License: BSD with advertising @@ -106,6 +106,9 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' %changelog +* Wed Feb 07 2018 Fedora Release Engineering - 3.7.16-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Tue Feb 06 2018 Iryna Shcherbina - 3.7.16-2 - Update Python 2 dependency declarations to new packaging standards (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3) From a57f90d302a450bbbd8c43684b67fe168bc3f7e6 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Mon, 12 Mar 2018 17:33:00 +0100 Subject: [PATCH 80/95] Update for security issue --- Sanity-check-size-passed-to-malloc.patch | 33 ++++++++++++++++++++++++ afflib.spec | 23 ++++++++++------- 2 files changed, 46 insertions(+), 10 deletions(-) create mode 100644 Sanity-check-size-passed-to-malloc.patch diff --git a/Sanity-check-size-passed-to-malloc.patch b/Sanity-check-size-passed-to-malloc.patch new file mode 100644 index 0000000..dddbfde --- /dev/null +++ b/Sanity-check-size-passed-to-malloc.patch @@ -0,0 +1,33 @@ +From 435a2ca802358a3debb6d164d2c33049131df81c Mon Sep 17 00:00:00 2001 +From: Phillip Hellewell +Date: Sat, 10 Mar 2018 18:05:39 -0700 +Subject: [PATCH 3/4] Sanity check size passed to malloc... + +Add sanity check before calling malloc in af_get_page() function to +avoid undefined behavior (e.g., seg fault) when dealing with a corrupt +AFF image with an invalid pagesize. + +Issue found by Luis Rocha (luiscrocha@gmail.com). +--- + lib/afflib_pages.cpp | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/lib/afflib_pages.cpp b/lib/afflib_pages.cpp +index 2569c2a..f8cf775 100644 +--- a/lib/afflib_pages.cpp ++++ b/lib/afflib_pages.cpp +@@ -219,6 +219,11 @@ int af_get_page(AFFILE *af,int64_t pagenum,unsigned char *data,size_t *bytes) + return -3; // read error + } + ++ /* Sanity check to avoid undefined behaviour when calling malloc below with pagesize from a corrupt AFF image. */ ++ if(af->image_pagesize <= 0 || af->image_pagesize > 16*1024*1024) ++ return -1; ++ ++ + /* Now uncompress directly into the buffer provided by the caller, unless the caller didn't + * provide a buffer. If that happens, allocate our own... + */ +-- +2.13.6 + diff --git a/afflib.spec b/afflib.spec index 2103b3e..3be3f66 100644 --- a/afflib.spec +++ b/afflib.spec @@ -1,11 +1,13 @@ Name: afflib Version: 3.7.16 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Library to support the Advanced Forensic Format License: BSD with advertising URL: https://github.com/sshock/AFFLIBv3 -Source0: https://github.com/sshock/AFFLIBv3/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz +Source0: %{url}/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz +# Upstream backport +Patch0: Sanity-check-size-passed-to-malloc.patch BuildRequires: libtool @@ -50,7 +52,7 @@ developing applications that use %{name}. %prep -%setup -q -n AFFLIBv3-%{version} +%autosetup -p1 -n AFFLIBv3-%{version} # prevent internal lzma to be built - testing #rm -rf lzma443 @@ -73,18 +75,15 @@ sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool # clean unused-direct-shlib-dependencies sed -i -e 's! -shared ! -Wl,--as-needed\0!g' libtool -make %{?_smp_mflags} +%make_build %install -make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" -find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' +%make_install +find %{buildroot} -name '*.la' -exec rm -f {} ';' - -%post -p /sbin/ldconfig - -%postun -p /sbin/ldconfig +%ldconfig_scriptlets %files @@ -106,6 +105,10 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' %changelog +* Mon Mar 12 2018 Nicolas Chauvet - 3.7.16-4 +- Security issue - rhbz#1554423 +- Spec file update + * Wed Feb 07 2018 Fedora Release Engineering - 3.7.16-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From b0f72baa562b38551dc876085716a488793a9232 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 12 Jul 2018 20:02:48 +0000 Subject: [PATCH 81/95] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- afflib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/afflib.spec b/afflib.spec index 3be3f66..d2fa00c 100644 --- a/afflib.spec +++ b/afflib.spec @@ -1,6 +1,6 @@ Name: afflib Version: 3.7.16 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Library to support the Advanced Forensic Format License: BSD with advertising @@ -105,6 +105,9 @@ find %{buildroot} -name '*.la' -exec rm -f {} ';' %changelog +* Thu Jul 12 2018 Fedora Release Engineering - 3.7.16-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Mon Mar 12 2018 Nicolas Chauvet - 3.7.16-4 - Security issue - rhbz#1554423 - Spec file update From 6ac192e52e9d0133026d42f3be715937bdd315e7 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Tue, 17 Jul 2018 12:50:01 +0200 Subject: [PATCH 82/95] Add missing cc --- afflib.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/afflib.spec b/afflib.spec index d2fa00c..8b3a459 100644 --- a/afflib.spec +++ b/afflib.spec @@ -1,6 +1,6 @@ Name: afflib Version: 3.7.16 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Library to support the Advanced Forensic Format License: BSD with advertising @@ -9,6 +9,7 @@ Source0: %{url}/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz # Upstream backport Patch0: Sanity-check-size-passed-to-malloc.patch +BuildRequires: gcc BuildRequires: libtool BuildRequires: curl-devel @@ -105,6 +106,9 @@ find %{buildroot} -name '*.la' -exec rm -f {} ';' %changelog +* Tue Jul 17 2018 Nicolas Chauvet - 3.7.16-6 +- Add missng cc + * Thu Jul 12 2018 Fedora Release Engineering - 3.7.16-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From ef5cc79b6f4ec48b1a1b8d54d70550895bb0c8f4 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Tue, 17 Jul 2018 12:59:18 +0200 Subject: [PATCH 83/95] fixup --- afflib.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/afflib.spec b/afflib.spec index 8b3a459..ec19309 100644 --- a/afflib.spec +++ b/afflib.spec @@ -9,7 +9,7 @@ Source0: %{url}/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz # Upstream backport Patch0: Sanity-check-size-passed-to-malloc.patch -BuildRequires: gcc +BuildRequires: gcc-c++ BuildRequires: libtool BuildRequires: curl-devel From b5b29e5f61684c67acfd3750ca1a232226c80564 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Tue, 17 Jul 2018 16:42:09 +0200 Subject: [PATCH 84/95] Update Python macros to new packaging standards --- afflib.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/afflib.spec b/afflib.spec index ec19309..4077ba6 100644 --- a/afflib.spec +++ b/afflib.spec @@ -1,6 +1,6 @@ Name: afflib Version: 3.7.16 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Library to support the Advanced Forensic Format License: BSD with advertising @@ -95,7 +95,7 @@ find %{buildroot} -name '*.la' -exec rm -f {} ';' %files -n afftools %{_bindir}/aff* -%{python_sitearch}/* +%{python2_sitearch}/* %{_mandir}/man1/aff*.1.* %files devel @@ -106,6 +106,10 @@ find %{buildroot} -name '*.la' -exec rm -f {} ';' %changelog +* Tue Jul 17 2018 Miro Hrončok - 3.7.16-7 +- Update Python macros to new packaging standards + (See https://fedoraproject.org/wiki/Changes/Move_usr_bin_python_into_separate_package) + * Tue Jul 17 2018 Nicolas Chauvet - 3.7.16-6 - Add missng cc From 84b8dd169434b69e5900aec3a61780c1fa5504d8 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Mon, 7 Jan 2019 09:11:29 +0100 Subject: [PATCH 85/95] Drop lzma-devel unused --- afflib.spec | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/afflib.spec b/afflib.spec index 4077ba6..7e19ce2 100644 --- a/afflib.spec +++ b/afflib.spec @@ -16,8 +16,6 @@ BuildRequires: curl-devel BuildRequires: expat-devel # GPLv2 FOSS incompatible with BSD with advertising ##BuildRequires: fuse-devel -# Afflib uses lzma-SDK 443 -BuildRequires: lzma-devel BuildRequires: ncurses-devel BuildRequires: libtermcap-devel BuildRequires: openssl-devel @@ -27,6 +25,9 @@ BuildRequires: python2-devel #BuildRequires: libedit-devel - good replacement for readline - not supported for now BuildRequires: zlib-devel +# Afflib format uses lzma-SDK 443 +Provides: bundled(lzma) = 443 + %description AFF® is an open and extensible file format designed to store disk images and From fe4c3efcb374d76ab3932f83a7e35ce8131a388d Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Mon, 7 Jan 2019 09:12:02 +0100 Subject: [PATCH 86/95] Update changelog --- afflib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/afflib.spec b/afflib.spec index 7e19ce2..22b6c29 100644 --- a/afflib.spec +++ b/afflib.spec @@ -1,6 +1,6 @@ Name: afflib Version: 3.7.16 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Library to support the Advanced Forensic Format License: BSD with advertising @@ -107,6 +107,9 @@ find %{buildroot} -name '*.la' -exec rm -f {} ';' %changelog +* Mon Jan 07 2019 Nicolas Chauvet - 3.7.16-8 +- Drop unused lzma-devel + * Tue Jul 17 2018 Miro Hrončok - 3.7.16-7 - Update Python macros to new packaging standards (See https://fedoraproject.org/wiki/Changes/Move_usr_bin_python_into_separate_package) From 7d51002b72ba001f7248245b263e5c9f791904f5 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 31 Jan 2019 13:03:29 +0000 Subject: [PATCH 87/95] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- afflib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/afflib.spec b/afflib.spec index 22b6c29..fd419f5 100644 --- a/afflib.spec +++ b/afflib.spec @@ -1,6 +1,6 @@ Name: afflib Version: 3.7.16 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Library to support the Advanced Forensic Format License: BSD with advertising @@ -107,6 +107,9 @@ find %{buildroot} -name '*.la' -exec rm -f {} ';' %changelog +* Thu Jan 31 2019 Fedora Release Engineering - 3.7.16-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Mon Jan 07 2019 Nicolas Chauvet - 3.7.16-8 - Drop unused lzma-devel From 3a89e403309bde2ae47a6d48414660369576547e Mon Sep 17 00:00:00 2001 From: rpmbuild Date: Mon, 11 Mar 2019 10:47:50 +0000 Subject: [PATCH 88/95] bump to bugfix release 3.7.18 --- .gitignore | 1 + afflib.spec | 20 ++++++++++++++++---- sources | 2 +- 3 files changed, 18 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index e933098..153ce7b 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ afflib-3.5.12.tar.gz /v3.7.4.tar.gz /afflib-3.7.15.tar.gz /afflib-3.7.16.tar.gz +/afflib-3.7.18.tar.gz diff --git a/afflib.spec b/afflib.spec index fd419f5..05b1aed 100644 --- a/afflib.spec +++ b/afflib.spec @@ -1,13 +1,11 @@ Name: afflib -Version: 3.7.16 -Release: 9%{?dist} +Version: 3.7.18 +Release: 1%{?dist} Summary: Library to support the Advanced Forensic Format License: BSD with advertising URL: https://github.com/sshock/AFFLIBv3 Source0: %{url}/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz -# Upstream backport -Patch0: Sanity-check-size-passed-to-malloc.patch BuildRequires: gcc-c++ BuildRequires: libtool @@ -107,6 +105,20 @@ find %{buildroot} -name '*.la' -exec rm -f {} ';' %changelog +* Mon Mar 11 2019 Michal Ambroz - 3.7.18-1 +- bump to 3.7.18 which contains: +- Remove upstream patch Sanity-check-size-passed-to-malloc.patch +- Fix affverify failing due to context being freed too soon +- Fix pyaff build issue with newer Python (3.7) and cython (0.29) +- from version 3.7.17 +- fix #34: option typo (25 minutes ago) +- minor fixes to configure.ac (3 months ago) +- Fix issue #32, an off-by-one buffer overflow (6 months ago) +- whitespace (6 months ago) +- Sanity check size passed to malloc... (6 months ago) +- Fix incrementing in vnode_split_raw.cpp for comment consistnecy (12 months ago) +- Update Win32 readmes to fix issue #26. (1 year, 2 months ago) + * Thu Jan 31 2019 Fedora Release Engineering - 3.7.16-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild diff --git a/sources b/sources index d8f0933..cc44a32 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (afflib-3.7.16.tar.gz) = 19eb77d25f939e0bc941cc4106809e23a89f3f07fd0ddb8dfb03b2ddfa24e22c544deb011a5e4247a955529289de0e7ffc4b196c943f8cc352525fcc2b05a279 +SHA512 (afflib-3.7.18.tar.gz) = 47ab74c86bbaedc2494558962f99463066e267f7a3f583902a53e1f488085a309b0d871093c67439033272c3ebf03d213649886930b9812013e66782ea84df85 From a6349c06e993577a104b65ddd21fbd5b2efca001 Mon Sep 17 00:00:00 2001 From: rpmbuild Date: Mon, 1 Apr 2019 23:40:06 +0000 Subject: [PATCH 89/95] split python2/3 subpackages, fix python dependencies for EPEL --- afflib.spec | 98 +++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 96 insertions(+), 2 deletions(-) diff --git a/afflib.spec b/afflib.spec index 05b1aed..8c0a7a1 100644 --- a/afflib.spec +++ b/afflib.spec @@ -1,8 +1,14 @@ Name: afflib Version: 3.7.18 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Library to support the Advanced Forensic Format +# Build also the python2 package +%global with_python2 1 +# Build also the python3 package +%global with_python3 1 + + License: BSD with advertising URL: https://github.com/sshock/AFFLIBv3 Source0: %{url}/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz @@ -23,10 +29,26 @@ BuildRequires: python2-devel #BuildRequires: libedit-devel - good replacement for readline - not supported for now BuildRequires: zlib-devel +%if 0%{?with_python2} +BuildRequires: python2 +BuildRequires: python2-devel +BuildRequires: python2-setuptools +%endif # if with_python2 + + +%if 0%{?with_python3} +BuildRequires: python%{python3_pkgversion} +BuildRequires: python%{python3_pkgversion}-devel +BuildRequires: python%{python3_pkgversion}-setuptools +%endif # if with_python3 + + + # Afflib format uses lzma-SDK 443 Provides: bundled(lzma) = 443 + %description AFF® is an open and extensible file format designed to store disk images and associated metadata. @@ -50,6 +72,37 @@ Requires: pkgconfig The %{name}-devel package contains libraries and header files for developing applications that use %{name}. +#==================================================================== +%if 0%{?with_python2} +%package -n python2-pyaff +Summary: Python2 binding for the AFFLIB +Group: Development/Libraries +%{?python_provide:%python_provide python2-pyaff} + +%description -n python2-pyaff +Python2 bindings for AFFLIB. +These bindings currently support a read-only file-like interface to AFFLIB and +basic metadata accessor functions. The binding is not currently complete. +%endif # with_python2 + + + +%if 0%{?with_python3} +%package -n python%{python3_pkgversion}-pyaff +Summary: Python3 binding for the AFFLIB +Group: Development/Libraries +%{?python_provide:%python_provide python%{python3_pkgversion}-%{srcname}} + + + +%description -n python%{python3_pkgversion}-pyaff +Python3 bindings for AFFLIB. +These bindings currently support a read-only file-like interface to AFFLIB and +basic metadata accessor functions. The binding is not currently complete. +%endif # with_python3 + + + %prep %autosetup -p1 -n AFFLIBv3-%{version} @@ -65,7 +118,7 @@ chmod 0644 lib/base64.{h,cpp} %build %configure --enable-shared \ --disable-static \ - --enable-python=yes \ + --enable-python=no \ --enable-s3=yes # Remove rpath from libtool @@ -76,12 +129,30 @@ sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool sed -i -e 's! -shared ! -Wl,--as-needed\0!g' libtool %make_build +cd pyaff +%global py_setup_args build_ext --include-dirs %{_builddir}/AFFLIBv3-%{version}/include --library-dirs %{_builddir}/AFFLIBv3-%{version}/lib/.libs +%if 0%{?with_python2} +%py2_build +%endif # with_python2 + +%if 0%{?with_python3} +%py3_build +%endif # with_python3 %install %make_install find %{buildroot} -name '*.la' -exec rm -f {} ';' +cd pyaff +%if 0%{?with_python2} +%py2_install +%endif # with_python2 + +%if 0%{?with_python3} +%py3_install +%endif # with_python3 + %ldconfig_scriptlets @@ -103,8 +174,30 @@ find %{buildroot} -name '*.la' -exec rm -f {} ';' %{_libdir}/*.so %{_libdir}/pkgconfig/afflib.pc +%if 0%{?with_python2} +%files -n python2-pyaff +%license COPYING +%doc pyaff/README +%{python2_sitearch}/PyAFF* +%{python2_sitearch}/pyaff* +%endif # with_python2 + + +%if 0%{?with_python3} +%files -n python%{python3_pkgversion}-pyaff +%license COPYING +%doc pyaff/README +%{python3_sitearch}/PyAFF* +%{python3_sitearch}/pyaff* +%endif # with_python3 + + %changelog +* Mon Apr 01 2019 Michal Ambroz - 3.7.18-2 +- separate python2-pyaff / python3-pyaff packages +- fix python dependencies for EPEL build + * Mon Mar 11 2019 Michal Ambroz - 3.7.18-1 - bump to 3.7.18 which contains: - Remove upstream patch Sanity-check-size-passed-to-malloc.patch @@ -118,6 +211,7 @@ find %{buildroot} -name '*.la' -exec rm -f {} ';' - Sanity check size passed to malloc... (6 months ago) - Fix incrementing in vnode_split_raw.cpp for comment consistnecy (12 months ago) - Update Win32 readmes to fix issue #26. (1 year, 2 months ago) +- build python3 package * Thu Jan 31 2019 Fedora Release Engineering - 3.7.16-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From ca127d8f4afa12b2dbb0c0cb07fd328bd008da48 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Thu, 11 Apr 2019 21:37:49 +0200 Subject: [PATCH 90/95] remove python2-pyaff from Fedora --- afflib.spec | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/afflib.spec b/afflib.spec index 8c0a7a1..e65cd21 100644 --- a/afflib.spec +++ b/afflib.spec @@ -1,10 +1,10 @@ Name: afflib Version: 3.7.18 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Library to support the Advanced Forensic Format # Build also the python2 package -%global with_python2 1 +%global with_python2 0 # Build also the python3 package %global with_python3 1 @@ -165,7 +165,6 @@ cd pyaff %files -n afftools %{_bindir}/aff* -%{python2_sitearch}/* %{_mandir}/man1/aff*.1.* %files devel @@ -194,6 +193,9 @@ cd pyaff %changelog +* Thu Apr 11 2019 Miro Hrončok - 3.7.18-3 +- remove python2-pyaff from Fedora + * Mon Apr 01 2019 Michal Ambroz - 3.7.18-2 - separate python2-pyaff / python3-pyaff packages - fix python dependencies for EPEL build From 0ca60a9ec83015c14adc51574ad86a10006c4ffc Mon Sep 17 00:00:00 2001 From: Charalampos Stratakis Date: Sat, 1 Jun 2019 13:36:45 +0200 Subject: [PATCH 91/95] Recythonize the sources --- afflib.spec | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/afflib.spec b/afflib.spec index e65cd21..f8b977a 100644 --- a/afflib.spec +++ b/afflib.spec @@ -1,6 +1,6 @@ Name: afflib Version: 3.7.18 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Library to support the Advanced Forensic Format # Build also the python2 package @@ -23,7 +23,6 @@ BuildRequires: expat-devel BuildRequires: ncurses-devel BuildRequires: libtermcap-devel BuildRequires: openssl-devel -BuildRequires: python2-devel # GPLv2 FOSS incompatible with BSD with advertising ##BuildRequires: readline-devel #BuildRequires: libedit-devel - good replacement for readline - not supported for now @@ -33,6 +32,7 @@ BuildRequires: zlib-devel BuildRequires: python2 BuildRequires: python2-devel BuildRequires: python2-setuptools +BuildRequires: python2-Cython %endif # if with_python2 @@ -40,6 +40,7 @@ BuildRequires: python2-setuptools BuildRequires: python%{python3_pkgversion} BuildRequires: python%{python3_pkgversion}-devel BuildRequires: python%{python3_pkgversion}-setuptools +BuildRequires: python%{python3_pkgversion}-Cython %endif # if with_python3 @@ -128,6 +129,9 @@ sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool # clean unused-direct-shlib-dependencies sed -i -e 's! -shared ! -Wl,--as-needed\0!g' libtool +# Remove the cythonized files in order to regenerate them during build. +rm $(grep -rl '/\* Generated by Cython') + %make_build cd pyaff %global py_setup_args build_ext --include-dirs %{_builddir}/AFFLIBv3-%{version}/include --library-dirs %{_builddir}/AFFLIBv3-%{version}/lib/.libs @@ -193,6 +197,9 @@ cd pyaff %changelog +* Sat Jun 01 2019 Charalampos Stratakis - 3.7.18-4 +- Recythonize the sources + * Thu Apr 11 2019 Miro Hrončok - 3.7.18-3 - remove python2-pyaff from Fedora From 207bec0f172fc1366eb597d1fd303afbf3a899ad Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 24 Jul 2019 17:38:13 +0000 Subject: [PATCH 92/95] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- afflib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/afflib.spec b/afflib.spec index f8b977a..762ac98 100644 --- a/afflib.spec +++ b/afflib.spec @@ -1,6 +1,6 @@ Name: afflib Version: 3.7.18 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Library to support the Advanced Forensic Format # Build also the python2 package @@ -197,6 +197,9 @@ cd pyaff %changelog +* Wed Jul 24 2019 Fedora Release Engineering - 3.7.18-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Sat Jun 01 2019 Charalampos Stratakis - 3.7.18-4 - Recythonize the sources From 7e35ab5faacf6c3726433d129faa678ffc77792d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Mon, 19 Aug 2019 10:00:56 +0200 Subject: [PATCH 93/95] Rebuilt for Python 3.8 --- afflib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/afflib.spec b/afflib.spec index 762ac98..dc95e8c 100644 --- a/afflib.spec +++ b/afflib.spec @@ -1,6 +1,6 @@ Name: afflib Version: 3.7.18 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Library to support the Advanced Forensic Format # Build also the python2 package @@ -197,6 +197,9 @@ cd pyaff %changelog +* Mon Aug 19 2019 Miro Hrončok - 3.7.18-6 +- Rebuilt for Python 3.8 + * Wed Jul 24 2019 Fedora Release Engineering - 3.7.18-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From 28fe086624de39ded55ff6c1355159f356f08a97 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jan 2020 11:17:41 +0000 Subject: [PATCH 94/95] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- afflib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/afflib.spec b/afflib.spec index dc95e8c..81e9525 100644 --- a/afflib.spec +++ b/afflib.spec @@ -1,6 +1,6 @@ Name: afflib Version: 3.7.18 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Library to support the Advanced Forensic Format # Build also the python2 package @@ -197,6 +197,9 @@ cd pyaff %changelog +* Tue Jan 28 2020 Fedora Release Engineering - 3.7.18-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Mon Aug 19 2019 Miro Hrončok - 3.7.18-6 - Rebuilt for Python 3.8 From 40cb6000a491914e907d7cd5ede00c017fa58239 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Thu, 6 Feb 2020 17:07:26 +0100 Subject: [PATCH 95/95] Fix build --- afflib.spec | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/afflib.spec b/afflib.spec index 81e9525..eab3fb1 100644 --- a/afflib.spec +++ b/afflib.spec @@ -1,6 +1,6 @@ Name: afflib Version: 3.7.18 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Library to support the Advanced Forensic Format # Build also the python2 package @@ -21,7 +21,6 @@ BuildRequires: expat-devel # GPLv2 FOSS incompatible with BSD with advertising ##BuildRequires: fuse-devel BuildRequires: ncurses-devel -BuildRequires: libtermcap-devel BuildRequires: openssl-devel # GPLv2 FOSS incompatible with BSD with advertising ##BuildRequires: readline-devel @@ -197,6 +196,9 @@ cd pyaff %changelog +* Thu Feb 06 2020 Nicolas Chauvet - 3.7.18-8 +- Drop libtermcap-devel merged with ncurses-devel + * Tue Jan 28 2020 Fedora Release Engineering - 3.7.18-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild