rpms/trickle/EL-5 trickle-1.07-CVE-2009-0415.patch, NONE, 1.1 trickle.spec, 1.2, 1.3

[Nicoleau Fabien]

Author: eponyme

Update of /cvs/pkgs/rpms/trickle/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9073

Modified Files:
	trickle.spec 
Added Files:
	trickle-1.07-CVE-2009-0415.patch 
Log Message:
New patch for #484065 (CVE-2009-0415)

trickle-1.07-CVE-2009-0415.patch:

--- NEW FILE trickle-1.07-CVE-2009-0415.patch ---
diff -up trickle-1.07/trickle.c.cve trickle-1.07/trickle.c
--- trickle-1.07/trickle.c.cve	2004-12-13 01:15:51.000000000 +0100
+++ trickle-1.07/trickle.c	2009-02-12 20:21:46.000000000 +0100
@@ -49,7 +49,6 @@ main(int argc, char **argv)
 	char buf[MAXPATHLEN], sockname[MAXPATHLEN], *path, **pathp;
 	struct stat sb;
 	char *trypaths[]  = {
-		LIBNAME,
 		LIBDIR "/" LIBNAME,
 		NULL
 	};


Index: trickle.spec
===================================================================
RCS file: /cvs/pkgs/rpms/trickle/EL-5/trickle.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- trickle.spec	6 Feb 2009 22:44:09 -0000	1.2
+++ trickle.spec	12 Feb 2009 20:26:08 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           trickle
 Version:        1.07 
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Portable lightweight userspace bandwidth shaper
 
 Group:          Applications/System
@@ -14,6 +14,7 @@
 
 Patch0:         %{name}-%{version}-include_netdb.patch
 Patch1:         %{name}-%{version}-libdir.patch
+Patch2:         %{name}-%{version}-CVE-2009-0415.patch
 
 %description
 trickle is a portable lightweight userspace bandwidth shaper.
@@ -31,14 +32,12 @@
 %setup -q
 %patch0 -p1 -b .include_netdb
 %patch1 -p1 -b .libdir
+%patch2 -p1 -b .cve
 touch -r configure aclocal.m4 Makefile.in stamp-h.in
 
 iconv -f ISO88591 -t UTF8 < README > README.UTF8
 mv README.UTF8 README
 
-# For CVE-2009-0415 (https://bugzilla.redhat.com/show_bug.cgi?id=484065)
-sed -i '52d' %{name}.c
-
 %build
 %configure
 # Parallel make is unsafe for this package, so %%{?_smp_mflags} is not used
@@ -72,6 +71,8 @@
 
 
 %changelog
+* Thu Feb 12 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> 1.07-7
+- Replace sed with a patch for #484065 (CVE-2009-0415)
 * Fri Feb  6 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> 1.07-6
 - Add a fix for bug #484065 (CVE-2009-0415)
 * Fri Aug 28 2008 Manuel Wolfshant <wolfy at fedoraproject.org> 1.07-5