rpms/timidity++/devel TiMidity++-2.13.2-dynlibroot.patch, 1.1, 1.2 timidity++.spec, 1.24, 1.25

[Jindrich Novy (jnovy)]

Author: jnovy

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

Modified Files:
	TiMidity++-2.13.2-dynlibroot.patch timidity++.spec 
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


TiMidity++-2.13.2-dynlibroot.patch:

Index: TiMidity++-2.13.2-dynlibroot.patch
===================================================================
RCS file: /cvs/extras/rpms/timidity++/devel/TiMidity++-2.13.2-dynlibroot.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TiMidity++-2.13.2-dynlibroot.patch	21 Feb 2008 11:35:04 -0000	1.1
+++ TiMidity++-2.13.2-dynlibroot.patch	21 Feb 2008 11:56:36 -0000	1.2
@@ -1,11 +1,49 @@
---- 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 @@
+diff -up TiMidity++-2.13.2/timidity/timidity.c.dynlibroot TiMidity++-2.13.2/timidity/timidity.c
+--- TiMidity++-2.13.2/timidity/timidity.c.dynlibroot	2008-02-21 12:41:09.000000000 +0100
++++ TiMidity++-2.13.2/timidity/timidity.c	2008-02-21 12:49:55.000000000 +0100
+@@ -554,7 +554,7 @@ MAIN_INTERFACE struct URL_module *url_mo
+ #ifndef SHARED_LIB_PATH
+ #define SHARED_LIB_PATH PKGLIBDIR
+ #endif /* SHARED_LIB_PATH */
+-static char *dynamic_lib_root = SHARED_LIB_PATH;
++static char *dynamic_lib_root = NULL;
+ #endif /* IA_DYNAMIC */
+ 
+ #ifndef MAXPATHLEN
+@@ -2970,8 +2970,7 @@ static inline int parse_opt_d(const char
  {
  	/* dynamic lib root */
  #ifdef IA_DYNAMIC
 -	if (dynamic_lib_root)
 -		free(dynamic_lib_root);
++	free(dynamic_lib_root);
  	dynamic_lib_root = safe_strdup(arg);
  	return 0;
  #else
+@@ -3893,6 +3892,8 @@ static inline int parse_opt_h(const char
+ 				cmp->id_character, cmp->id_name);
+ #endif	/* IA_DYNAMIC */
+ #ifdef IA_DYNAMIC
++	if (!dynamic_lib_root)
++		dynamic_lib_root = safe_strdup(SHARED_LIB_PATH);
+ 	fprintf(fp, "Supported dynamic load interfaces (%s):" NLS,
+ 			dynamic_lib_root);
+ 	memset(mark, 0, sizeof(mark));
+@@ -3997,6 +3998,8 @@ static inline char *dynamic_interface_in
+ 	int fd, n;
+ 	char *nl;
+ 	
++	if (!dynamic_lib_root)
++		dynamic_lib_root = safe_strdup(SHARED_LIB_PATH);
+ 	sprintf(libinfo, "%s" PATH_STRING "interface_%c.txt",
+ 			dynamic_lib_root, id);
+ 	if ((fd = open(libinfo, 0)) < 0)
+@@ -4021,6 +4024,8 @@ char *dynamic_interface_module(int id)
+ 	static char shared_library[MAXPATHLEN];
+ 	int fd;
+ 	
++	if (!dynamic_lib_root)
++		dynamic_lib_root = safe_strdup(SHARED_LIB_PATH);
+ 	sprintf(shared_library, "%s" PATH_STRING "interface_%c%s",
+ 			dynamic_lib_root, id, SHARED_LIB_EXT);
+ 	if ((fd = open(shared_library, 0)) < 0)


Index: timidity++.spec
===================================================================
RCS file: /cvs/extras/rpms/timidity++/devel/timidity++.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- timidity++.spec	21 Feb 2008 11:35:04 -0000	1.24
+++ timidity++.spec	21 Feb 2008 11:56:36 -0000	1.25
@@ -149,7 +149,7 @@
 %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
+  thanks to Andrew Bartlett
 
 * 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)