rpms/libXfont/devel import.log, NONE, 1.1 libXfont-1.3.1-fast-retry.patch, NONE, 1.1 libXfont-1.3.3-no-fontcache.patch, NONE, 1.1 .cvsignore, 1.15, 1.16 libXfont.spec, 1.41, 1.42 sources, 1.16, 1.17 cve-2008-0006.patch, 1.1, NONE

[Adam Jackson]

Author: ajax

Update of /cvs/pkgs/rpms/libXfont/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6038/devel

Modified Files:
	.cvsignore libXfont.spec sources 
Added Files:
	import.log libXfont-1.3.1-fast-retry.patch 
	libXfont-1.3.3-no-fontcache.patch 
Removed Files:
	cve-2008-0006.patch 
Log Message:
libXfont 1.3.3



--- NEW FILE import.log ---
libXfont-1_3_3-1_fc10:HEAD:libXfont-1.3.3-1.fc10.src.rpm:1219949211

libXfont-1.3.1-fast-retry.patch:

--- NEW FILE libXfont-1.3.1-fast-retry.patch ---
diff -up libXfont-1.3.1/src/fc/fsio.c.jx libXfont-1.3.1/src/fc/fsio.c
--- libXfont-1.3.1/src/fc/fsio.c.jx	2007-09-04 20:18:23.000000000 -0400
+++ libXfont-1.3.1/src/fc/fsio.c	2008-04-21 16:13:08.000000000 -0400
@@ -125,8 +125,6 @@ _fs_connect(char *servername, int *err)
     _FontTransSetOption(trans_conn, TRANS_NONBLOCKING, 1);
 
     do {
-	if (i == TRANS_TRY_CONNECT_AGAIN)
-	    sleep(1);
 	i = _FontTransConnect(trans_conn,servername);
     } while ((i == TRANS_TRY_CONNECT_AGAIN) && (retries-- > 0));
 

libXfont-1.3.3-no-fontcache.patch:

--- NEW FILE libXfont-1.3.3-no-fontcache.patch ---
diff -up libXfont-1.3.3/configure.ac.jx libXfont-1.3.3/configure.ac
--- libXfont-1.3.3/configure.ac.jx	2008-07-02 15:29:49.000000000 -0400
+++ libXfont-1.3.3/configure.ac	2008-08-28 14:44:03.000000000 -0400
@@ -180,7 +180,7 @@ fi
 # Font cache extension support?
 #
 
-AC_ARG_ENABLE(fontcache, [ --disable-fontcache ],[XFONT_FONTCACHE=$enableval],[XFONT_FONTCACHE=yes])
+AC_ARG_ENABLE(fontcache, [ --disable-fontcache ],[XFONT_FONTCACHE=$enableval],[XFONT_FONTCACHE=no])
 AM_CONDITIONAL(XFONT_FONTCACHE, [test "x$XFONT_FONTCACHE" = xyes])
 if test "x$XFONT_FONTCACHE" = xyes; then
 	AC_DEFINE(FONTCACHE,1,[Support the font caching extension])


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libXfont/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	24 Sep 2007 18:28:28 -0000	1.15
+++ .cvsignore	28 Aug 2008 18:47:05 -0000	1.16
@@ -1 +1 @@
-libXfont-1.3.1.tar.bz2
+libXfont-1.3.3.tar.bz2


Index: libXfont.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libXfont/devel/libXfont.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- libXfont.spec	12 Feb 2008 15:57:33 -0000	1.41
+++ libXfont.spec	28 Aug 2008 18:47:05 -0000	1.42
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libXfont runtime library
 Name: libXfont
-Version: 1.3.1
-Release: 4%{?dist}
+Version: 1.3.3
+Release: 1%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -9,14 +9,16 @@
 
 Source0: ftp://ftp.x.org/pub/individual/lib/%{name}-%{version}.tar.bz2
 
-Patch0: cve-2008-0006.patch
 Patch1: libXfont-1.3.1-visibility.patch
+Patch2: libXfont-1.3.1-fast-retry.patch
+Patch3: libXfont-1.3.3-no-fontcache.patch
 
 BuildRequires: xorg-x11-util-macros
 BuildRequires: xorg-x11-proto-devel
 BuildRequires: xorg-x11-xtrans-devel >= 1.0.3-3
 BuildRequires: libfontenc-devel
 BuildRequires: freetype-devel
+BuildRequires: autoconf automake libtool
 
 Obsoletes: XFree86-libs, xorg-x11-libs
 
@@ -39,10 +41,12 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .cve-2008-0006
 %patch1 -p1 -b .visibility
+%patch2 -p1 -b .retry
+%patch3 -p1 -b .no-fc
 
 %build
+autoreconf -v --install || exit 1
 %configure --disable-static
 make %{?_smp_mflags}  
 
@@ -92,6 +96,11 @@
 %{_libdir}/pkgconfig/xfont.pc
 
 %changelog
+* Thu Aug 28 2008 Adam Jackson <ajax at redhat.com> 1.3.3-1
+- libXfont 1.3.3.
+- libXfont-1.3.1-fast-retry.patch: Retry font server connections faster.
+  (#443070)
+
 * 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)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libXfont/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources	24 Sep 2007 18:28:28 -0000	1.16
+++ sources	28 Aug 2008 18:47:05 -0000	1.17
@@ -1 +1 @@
-b2f396b62633819bbdd9748383876e21  libXfont-1.3.1.tar.bz2
+4f174b9613f87cf00d731da428a1b194  libXfont-1.3.3.tar.bz2


--- cve-2008-0006.patch DELETED ---