rpms/libXfont/F-7 strstr-hates-null.patch, NONE, 1.1 libXfont.spec, 1.32, 1.33 sources, 1.14, 1.15

[Adam Jackson (ajax)]

Author: ajax

Update of /cvs/pkgs/rpms/libXfont/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16606

Modified Files:
	libXfont.spec sources 
Added Files:
	strstr-hates-null.patch 
Log Message:
* Tue Jun 26 2007 Kristian Høgsberg <krh at redhat.com> - 1.2.9-2
- Put in stop-gap patch to fix comparing links with no attributes.


strstr-hates-null.patch:

--- NEW FILE strstr-hates-null.patch ---
diff --git a/autogen.sh b/autogen.sh
diff --git a/configure.ac b/configure.ac
diff --git a/src/dummy.c b/src/dummy.c
diff --git a/src/fontfile/catalogue.c b/src/fontfile/catalogue.c
index 6d364a5..812b050 100644
--- a/src/fontfile/catalogue.c
+++ b/src/fontfile/catalogue.c
@@ -81,8 +81,13 @@ ComparePriority(const void *p1, const void *p2)
 {
     FontDirectoryPtr dir1 = (*(FontPathElementPtr*) p1)->private;
     FontDirectoryPtr dir2 = (*(FontPathElementPtr*) p2)->private;
-    const char *pri1 = strstr(dir1->attributes, PriorityAttribute);
-    const char *pri2 = strstr(dir2->attributes, PriorityAttribute);
+    const char *pri1 = NULL;
+    const char *pri2 = NULL;
+
+    if (dir1->attributes != NULL)
+	pri1 = strstr(dir1->attributes, PriorityAttribute);
+    if (dir2->attributes != NULL)
+	pri2 = strstr(dir2->attributes, PriorityAttribute);
 
     if (pri1 == NULL && pri2 == NULL)
 	return 0;


Index: libXfont.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libXfont/F-7/libXfont.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- libXfont.spec	6 Apr 2007 18:12:57 -0000	1.32
+++ libXfont.spec	29 Jun 2007 14:38:11 -0000	1.33
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libXfont runtime library
 Name: libXfont
-Version: 1.2.8
-Release: 1%{?dist}
+Version: 1.2.9
+Release: 2%{?dist}
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -9,6 +9,7 @@
 
 Source0: ftp://ftp.x.org/pub/individual/lib/%{name}-%{version}.tar.bz2
 #Patch0: libXfont-1.2.3-namespace-pollution.patch
+Patch10: strstr-hates-null.patch
 
 BuildRequires: pkgconfig
 BuildRequires: xorg-x11-util-macros
@@ -40,6 +41,7 @@
 %prep
 %setup -q
 #%patch0 -p1 -b .hidden
+%patch10 -p1 -b .strstr-hates-null
 
 %build
 %configure --disable-static
@@ -91,6 +93,12 @@
 %{_libdir}/pkgconfig/xfont.pc
 
 %changelog
+* Tue Jun 26 2007 Kristian Høgsberg <krh at redhat.com> - 1.2.9-2
+- Put in stop-gap patch to fix comparing links with no attributes.
+
+* Fri Jun 22 2007 Kristian Høgsberg <krh at redhat.com> - 1.2.9-1
+- Pull 1.2.9 down to get the catalogue feature.
+
 * Fri Apr 06 2007 Adam Jackson <ajax at redhat.com> 1.2.8-1
 - libXfont 1.2.8.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libXfont/F-7/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	6 Apr 2007 18:01:44 -0000	1.14
+++ sources	29 Jun 2007 14:38:11 -0000	1.15
@@ -1 +1 @@
-83b8e21f6ee22512a8f72ba51e2d74f6  libXfont-1.2.8.tar.bz2
+e2dc2ff39ddbe15be5113101cf022069  libXfont-1.2.9.tar.bz2