rpms/afflib/devel afflib-3.3.4-gcc44.patch, 1.2, 1.3 afflib.spec, 1.27, 1.28
Nicolas Chauvet
kwizart at fedoraproject.org
Thu May 21 00:25:37 UTC 2009
Author: kwizart
Update of /cvs/pkgs/rpms/afflib/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28653
Modified Files:
afflib.spec
Added Files:
afflib-3.3.4-gcc44.patch
Log Message:
Re-introduce gcc44 patch
afflib-3.3.4-gcc44.patch:
Index: afflib-3.3.4-gcc44.patch
===================================================================
RCS file: afflib-3.3.4-gcc44.patch
diff -N afflib-3.3.4-gcc44.patch
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ afflib-3.3.4-gcc44.patch 21 May 2009 00:25:36 -0000 1.3
@@ -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 = "</" 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.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- afflib.spec 20 May 2009 23:44:06 -0000 1.27
+++ afflib.spec 21 May 2009 00:25:36 -0000 1.28
@@ -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
More information about the scm-commits
mailing list