Fix for gcc44

This commit is contained in:
Nicolas Chauvet 2009-03-02 12:46:37 +00:00
commit 9fb24e376c
2 changed files with 27 additions and 1 deletions

21
aimage-3.2.0-gcc44.patch Normal file
View file

@ -0,0 +1,21 @@
diff -up aimage-3.2.0/src/aimage_os.cpp.gcc44 aimage-3.2.0/src/aimage_os.cpp
--- aimage-3.2.0/src/aimage_os.cpp.gcc44 2009-03-02 13:36:09.000000000 +0100
+++ aimage-3.2.0/src/aimage_os.cpp 2009-03-02 13:41:32.000000000 +0100
@@ -33,11 +33,15 @@ void checkline(const char *name,const ch
{
while(buf[0] && isspace(buf[0])) buf++; // advance buf to end of spaces
- char *pos = strstr(buf,name);
+ char *buf_tmp;
+ char *name_tmp;
+ strcpy(buf_tmp, buf);
+ strcpy(name_tmp, name);
+ char *pos = strstr(buf_tmp,name_tmp);
if(pos==0) return;
/* The string was found */
- char *cc = pos + strlen(name); // skip past to the end of the string
+ char *cc = pos + strlen(name_tmp); // skip past to the end of the string
while(*cc && isspace(*cc)) cc++; // scan to end of spaces
char *dd = index(cc,'\n'); // can we find a \n?
if(dd) *dd = '\000'; // yes; clear it

View file

@ -1,12 +1,13 @@
Name: aimage
Version: 3.2.0
Release: 3%{?dist}
Release: 4%{?dist}
Summary: Advanced Disk Imager
Group: Applications/System
License: BSD with advertising
URL: http://www.afflib.org
Source0: http://www.afflib.org/downloads/aimage-%{version}.tar.gz
Patch0: aimage-3.2.0-gcc44.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: afflib-devel
@ -19,6 +20,7 @@ Advanced Disk Imager.
%prep
%setup -q
%patch0 -p1 -b .gcc44
%build
@ -42,6 +44,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
* Mon Mar 2 2009 kwizart < kwizart at gmail.com > - 3.2.0-4
- Fix for gcc44
* Mon Feb 23 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.2.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild