rpms/timidity++/devel TiMidity++-2.13.2-dynlibroot.patch, NONE, 1.1 timidity++.spec, 1.23, 1.24

[Jindrich Novy (jnovy)]

Author: jnovy

Update of /cvs/extras/rpms/timidity++/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31384

Modified Files:
	timidity++.spec 
Added Files:
	TiMidity++-2.13.2-dynlibroot.patch 
Log Message:
* Thu Feb 21 2008 Jindrich Novy <jnovy at redhat.com> 2.13.2-10
- don't free a constant string if -d is specified (#433756),
  thanks to Andrew Bartlett for the patch


TiMidity++-2.13.2-dynlibroot.patch:

--- NEW FILE TiMidity++-2.13.2-dynlibroot.patch ---
--- TiMidity++-2.13.2/timidity/timidity.c~	2004-10-02 20:46:17.000000000 +1000
+++ TiMidity++-2.13.2/timidity/timidity.c	2008-02-21 20:54:41.000000000 +1100
@@ -2932,8 +2932,6 @@
 {
 	/* dynamic lib root */
 #ifdef IA_DYNAMIC
-	if (dynamic_lib_root)
-		free(dynamic_lib_root);
 	dynamic_lib_root = safe_strdup(arg);
 	return 0;
 #else


Index: timidity++.spec
===================================================================
RCS file: /cvs/extras/rpms/timidity++/devel/timidity++.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- timidity++.spec	20 Feb 2008 21:26:06 -0000	1.23
+++ timidity++.spec	21 Feb 2008 11:35:04 -0000	1.24
@@ -1,7 +1,7 @@
 Summary: A software wavetable MIDI synthesizer
 Name: timidity++
 Version: 2.13.2
-Release: 9%{?dist}
+Release: 10%{?dist}
 Group: Applications/Multimedia
 Source: http://downloads.sourceforge.net/timidity/TiMidity++-%{version}.tar.bz2
 Source1: http://archive.cs.umbc.edu/pub/midia/instruments.tar.bz2
@@ -24,6 +24,7 @@
 Patch13: TiMidity++-2.13.2-flac.patch
 # end Debian patches
 Patch14: TiMidity++-2.13.2-ipv6.patch
+Patch15: TiMidity++-2.13.2-dynlibroot.patch
 
 License: GPLv2 and MIT and BSD
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -69,6 +70,7 @@
 %patch12 -p1
 %patch13 -p1
 %patch14 -p1
+%patch15 -p1
 
 # Ensure that we are actually using %%_sysconfdir
 sed -i -e 's|/etc/timidity\.cfg|%{_sysconfdir}/timidity.cfg|' \
@@ -145,6 +147,10 @@
 
 
 %changelog
+* Thu Feb 21 2008 Jindrich Novy <jnovy at redhat.com> 2.13.2-10
+- don't free a constant string if -d is specified (#433756),
+  thanks to Andrew Bartlett for the patch
+
 * Wed Feb 20 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 2.13.2-9
 - Add IPv6 support, patch by Milan Zazrivec (bz 198467)