rpms/afflib/devel afflib-3.3.4-WCtype.patch, NONE, 1.1 afflib-3.3.4-gcc44.patch, NONE, 1.1 afflib.spec, 1.24, 1.25 afflib-3.0.1-WCtype.patch, 1.1, NONE

[NicolasChauvet]

Author: kwizart

Update of /cvs/pkgs/rpms/afflib/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25047

Modified Files:
	afflib.spec 
Added Files:
	afflib-3.3.4-WCtype.patch afflib-3.3.4-gcc44.patch 
Removed Files:
	afflib-3.0.1-WCtype.patch 
Log Message:
Fix for gcc44


afflib-3.3.4-WCtype.patch:

--- NEW FILE afflib-3.3.4-WCtype.patch ---
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 <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
 dnl Function to test if a libewf_get_media_size takes value as an argument

afflib-3.3.4-gcc44.patch:

--- NEW FILE afflib-3.3.4-gcc44.patch ---
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 = "</" AF_XML_AFFBOM ">\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);


Index: afflib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/afflib/devel/afflib.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- afflib.spec	24 Feb 2009 00:15:06 -0000	1.24
+++ afflib.spec	2 Mar 2009 12:04:05 -0000	1.25
@@ -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 @@
 %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 @@
 
 # Autoreconf
 autoreconf
-libtoolize
+libtoolize --force
 
 
 %build
@@ -123,6 +123,9 @@
 
 
 %changelog
+* Mon Mar  2 2009 kwizart < kwizart at gmail.com > - 3.3.4-7
+- Fix for gcc44
+
 * Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.3.4-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


--- afflib-3.0.1-WCtype.patch DELETED ---