rpms/libXfont/devel libXfont-1.3.1-visibility.patch, NONE, 1.1 libXfont.spec, 1.40, 1.41

[Adam Jackson (ajax)]

Author: ajax

Update of /cvs/pkgs/rpms/libXfont/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25070

Modified Files:
	libXfont.spec 
Added Files:
	libXfont-1.3.1-visibility.patch 
Log Message:
* Tue Feb 12 2008 Adam Jackson <ajax at redhat.com> 1.3.1-4
- libXfont-1.3.1-visibility.patch: Prevent a symbol collision with
  ghostscript.  (#216124)


libXfont-1.3.1-visibility.patch:

--- NEW FILE libXfont-1.3.1-visibility.patch ---
diff -up libXfont-1.3.1/src/Type1/token.h.jx libXfont-1.3.1/src/Type1/token.h
--- libXfont-1.3.1/src/Type1/token.h.jx	2007-09-04 20:18:23.000000000 -0400
+++ libXfont-1.3.1/src/Type1/token.h	2008-02-12 10:52:46.000000000 -0500
@@ -58,7 +58,7 @@
 #define TOKEN_IMMED_NAME    (16)
  
 /* Token routines */
-extern void scan_token( psobj *inputP );
+extern void scan_token( psobj *inputP ) __attribute__((visibility("hidden")));
  
 /*
  * -------------------------------------------------------------------------


Index: libXfont.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libXfont/devel/libXfont.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- libXfont.spec	18 Jan 2008 03:13:56 -0000	1.40
+++ libXfont.spec	12 Feb 2008 15:57:33 -0000	1.41
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libXfont runtime library
 Name: libXfont
 Version: 1.3.1
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -10,6 +10,7 @@
 Source0: ftp://ftp.x.org/pub/individual/lib/%{name}-%{version}.tar.bz2
 
 Patch0: cve-2008-0006.patch
+Patch1: libXfont-1.3.1-visibility.patch
 
 BuildRequires: xorg-x11-util-macros
 BuildRequires: xorg-x11-proto-devel
@@ -39,6 +40,7 @@
 %prep
 %setup -q
 %patch0 -p1 -b .cve-2008-0006
+%patch1 -p1 -b .visibility
 
 %build
 %configure --disable-static
@@ -90,6 +92,10 @@
 %{_libdir}/pkgconfig/xfont.pc
 
 %changelog
+* Tue Feb 12 2008 Adam Jackson <ajax at redhat.com> 1.3.1-4
+- libXfont-1.3.1-visibility.patch: Prevent a symbol collision with
+  ghostscript.  (#216124)
+
 * Fri Jan 18 2008 Dave Airlie <airlied at redhat.com> 1.3.1-3
 - cve-2008-0006.patch: XFS Integer Overflow Vulnerability