From 9c1c17780aab5e98058ed8c57946ce821eedb06c Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Thu, 20 Mar 2008 22:59:47 +0000 Subject: [PATCH 1/9] Initialize branch F-8 for afflib --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..e9e7ccd --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-8 From 991c2c1b23874b853914e775b4cbef07f100e858 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Sat, 22 Mar 2008 12:27:57 +0000 Subject: [PATCH 2/9] Import for F-8 --- 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 | 161 +++++++++++++++++++++++++++++++++++ sources | 1 + 7 files changed, 265 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/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..492c884 --- /dev/null +++ b/afflib.spec @@ -0,0 +1,161 @@ +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 +- Fix typo +- Disable libewf support for F-8 + +* 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 16f0e267acb7aa3e07eff4d89f22a6ef3ce621ec Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Thu, 3 Apr 2008 15:11:20 +0000 Subject: [PATCH 3/9] Fix typo --- afflib.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/afflib.spec b/afflib.spec index 492c884..a837c6b 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 - Fix typo From 128971f769253ecd7b45a1adbcb8a55410666ca5 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Tue, 15 Apr 2008 12:38:10 +0000 Subject: [PATCH 4/9] - Update to 3.1.6 --- afflib-3.1.3-pkgconfig.patch | 35 ----------------------------------- afflib.pc.in | 10 ---------- afflib.spec | 24 +++++++++--------------- sources | 2 +- 4 files changed, 10 insertions(+), 61 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} diff --git a/afflib.spec b/afflib.spec index a837c6b..57a6cc2 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,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 @@ -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,13 +126,14 @@ 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 * Wed Mar 19 2008 kwizart < kwizart at gmail.com > - 3.1.3-3 - Add missing requires with pkgconfig -- Fix typo -- Disable libewf support for F-8 * Mon Mar 17 2008 kwizart < kwizart at gmail.com > - 3.1.3-2 - Rebuild with newer libewf and enable-libewf=yes 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 66a88ea9bde9dfc12e6435f50b0b81932e7963b3 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Tue, 15 Apr 2008 12:46:17 +0000 Subject: [PATCH 5/9] - backport to F-8 (libewf support disabled by default) --- afflib.spec | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/afflib.spec b/afflib.spec index 57a6cc2..5379e83 100644 --- a/afflib.spec +++ b/afflib.spec @@ -18,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 @@ -77,8 +77,9 @@ autoreconf %configure --enable-shared \ --enable-wide-character-type \ --disable-static \ - --enable-s3=yes \ - --enable-libewf=yes + --enable-s3=yes + +# --enable-libewf=yes # Remove rpath from libtool sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool @@ -128,6 +129,7 @@ rm -rf $RPM_BUILD_ROOT %changelog * Tue Apr 15 2008 kwizart < kwizart at gmail.com > - 3.1.6-1 - Update to 3.1.6 +- backport to F-8 (libewf support disabled by default) * Fri Mar 21 2008 kwizart < kwizart at gmail.com > - 3.1.3-4 - Fix typo From 09b8fb662d84ab45e6e3b3c6c5a9ee7ac41dbb7f Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Wed, 25 Jun 2008 10:01:26 +0000 Subject: [PATCH 6/9] - backport Fix redefinition of typedef AFFILE --- afflib-3.2.1-fix_namespace.patch | 12 ++++++++++++ afflib.spec | 6 +++++- 2 files changed, 17 insertions(+), 1 deletion(-) 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 5379e83..cf4e010 100644 --- a/afflib.spec +++ b/afflib.spec @@ -1,6 +1,6 @@ Name: afflib Version: 3.1.6 -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 @@ -127,6 +128,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed Jun 25 2008 kwizart < kwizart at gmail.com > - 3.1.6-2 +- backport Fix redefinition of typedef AFFILE + * Tue Apr 15 2008 kwizart < kwizart at gmail.com > - 3.1.6-1 - Update to 3.1.6 - backport to F-8 (libewf support disabled by default) From b5ba6e322951c1a5382d5d0738d4d4dbfeed56e9 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Thu, 26 Jun 2008 14:09:20 +0000 Subject: [PATCH 7/9] - bump --- afflib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/afflib.spec b/afflib.spec index cf4e010..3130c20 100644 --- a/afflib.spec +++ b/afflib.spec @@ -1,6 +1,6 @@ Name: afflib Version: 3.1.6 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Library to support the Advanced Forensic Format Group: System Environment/Libraries @@ -128,6 +128,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Thu Jun 26 2008 kwizart < kwizart at gmail.com > - 3.1.6-3 +- bump + * Wed Jun 25 2008 kwizart < kwizart at gmail.com > - 3.1.6-2 - backport Fix redefinition of typedef AFFILE From a5d411f987b58fef5e00dbdba5b3a120292eb8e4 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:25:23 +0000 Subject: [PATCH 8/9] 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 2400f73630b387497316aea46686554a4b98f15d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 09:37:15 +0000 Subject: [PATCH 9/9] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch 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/branch b/branch deleted file mode 100644 index e9e7ccd..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-8