dist-git conversion

#2781)

Makefile

@@ -1,21 +0,0 @@
-# Makefile for source rpm: afflib
-# $Id$
-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
-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)

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 <wchar.h> 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],

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 <string>
+ #include <map>
+ #include <vector>
++#include <cstring>                          // memcpy, strcmp, strlen
++#include <algorithm>                        // sort
+ 
+ #define S3_DEFAULT_BUCKET "S3_DEFAULT_BUCKET"
+ #define S3_DEBUG   "S3_DEBUG"

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 =  \

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;
++};
+ 
+ 
+ 

afflib.spec

@@ -0,0 +1,167 @@
+Name:           afflib
+Version:        3.1.6
+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
+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
+
+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:       pkgconfig
+
+%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
+%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
+
+# Autoreconf
+autoreconf
+
+
+%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
+* 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
+
+* 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
+
+* 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
+

sources

@@ -0,0 +1 @@
+5e0250f9104ad64af0d0f9a5a41c65c7  afflib-3.1.6.tar.gz