rpms/sdcc/F-11 sdcc-2.9.0-r5476-fix-doublefree.diff, NONE, 1.1 sdcc.spec, 1.14, 1.15
konradm
konradm at fedoraproject.org
Tue Jul 21 00:21:13 UTC 2009
Author: konradm
Update of /cvs/pkgs/rpms/sdcc/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17504
Modified Files:
sdcc.spec
Added Files:
sdcc-2.9.0-r5476-fix-doublefree.diff
Log Message:
* Mon Jul 20 2009 Conrad Meyer <konrad at tylerc.org> - 2.9.0-3
- Fix double-free (rhbz# 509278) with patch from upstream.
sdcc-2.9.0-r5476-fix-doublefree.diff:
lkar.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
--- NEW FILE sdcc-2.9.0-r5476-fix-doublefree.diff ---
--- trunk/sdcc/as/link/lkar.c 2009/07/18 08:25:57 5475
+++ trunk/sdcc/as/link/lkar.c 2009/07/18 09:11:36 5476
@@ -454,8 +454,6 @@
{
long moduleOffset = ftell (libfp);
- free (obj_name);
-
/* Opened OK - create a new libraryfile object for it */
if (This == NULL)
{
@@ -484,7 +482,7 @@
add_rel_index (libfp, hdr.ar_size, This);
- fseek (libfp, moduleOffset + hdr.ar_size + (hdr.ar_size & 1), SEEK_SET);
+ fseek (libfp, moduleOffset + hdr.ar_size + (hdr.ar_size & 1), SEEK_SET);;
}
}
Index: sdcc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sdcc/F-11/sdcc.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- sdcc.spec 11 May 2009 23:41:07 -0000 1.14
+++ sdcc.spec 21 Jul 2009 00:20:42 -0000 1.15
@@ -1,6 +1,6 @@
Name: sdcc
Version: 2.9.0
-Release: 1%{?dist}
+Release: 3%{?dist}
Summary: Small Device C Compiler
Group: Applications/Engineering
License: GPLv2+
@@ -9,14 +9,14 @@ Source0: http://downloads.sourcef
Source1: README.fedora
Patch0: sdcc-2.9.0-patch-out-getline.diff
Patch1: sdcc-2.9.0-configure.diff
-#Patch1: sdcc-2.8.0-debugger-makefile.diff
-#Patch2: sdcc-2.8.0-doc-lyx.diff
+Patch2: sdcc-2.9.0-r5476-fix-doublefree.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: autoconf
BuildRequires: bison
BuildRequires: flex
BuildRequires: gc-devel
+BuilDrequires: gputils
BuildRequires: lyx
BuildRequires: latex2html
@@ -55,10 +55,29 @@ Emacs extensions for SDCC.
%setup -q -n sdcc
%patch0 -p1
%patch1 -p1
-#%%patch1 -p0
-#%%patch2 -p1
+%patch2 -p2
find -name '*.[ch]' -exec chmod -x '{}' \;
+# Extract %%__os_install_post into os_install_post~
+cat << \EOF > os_install_post~
+%__os_install_post
+EOF
+
+# Generate customized brp-*scripts
+cat os_install_post~ | while read a x y; do
+case $a in
+# Prevent brp-strip* from trying to handle foreign binaries
+*/brp-strip*)
+ b=$(basename $a)
+ sed -e 's,find $RPM_BUILD_ROOT,find $RPM_BUILD_ROOT%_bindir $RPM_BUILD_ROOT%_libexecdir,' $a > $b
+ chmod a+x $b
+ ;;
+esac
+done
+
+sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
+< os_install_post~ > os_install_post
+
%build
# Rebuild configure scripts (patched configure.in s in patch0).
@@ -116,6 +135,12 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Mon Jul 20 2009 Conrad Meyer <konrad at tylerc.org> - 2.9.0-3
+- Fix double-free (rhbz# 509278) with patch from upstream.
+
+* Wed Jul 1 2009 Conrad Meyer <konrad at tylerc.org> - 2.9.0-2
+- Fix #454205 by BR'ing gputils and re-adding install_post hack.
+
* Thu Apr 30 2009 Conrad Meyer <konrad at tylerc.org> - 2.9.0-1
- Bump to 2.9.0.
More information about the fedora-extras-commits
mailing list