[libXfont] libXfont 1.4.8 (rhbz#1100441)

[Hans de Goede]

commit b5437ca717db5a5d27c91802843ca29cea2b290e
Author: Hans de Goede <hdegoede at redhat.com>
Date:   Wed Jul 9 15:15:33 2014 +0200

    libXfont 1.4.8 (rhbz#1100441)
    
    - Fixes: CVE-2014-0209, CVE-2014-0210, CVE-2014-0211 (rhbz#1097397)

 .gitignore                            |    1 +
 libXfont-1.4.7-fontproto-compat.patch |   13 +++++++++++++
 libXfont.spec                         |   30 ++++++++++++++----------------
 sources                               |    2 +-
 4 files changed, 29 insertions(+), 17 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 52261fc..d7dd5a4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@ libXfont-1.4.2.tar.bz2
 /libXfont-1.4.5.tar.bz2
 /libXfont-1.4.6.tar.bz2
 /libXfont-1.4.7.tar.bz2
+/libXfont-1.4.8.tar.bz2
diff --git a/libXfont-1.4.7-fontproto-compat.patch b/libXfont-1.4.7-fontproto-compat.patch
index 0196b72..e172844 100644
--- a/libXfont-1.4.7-fontproto-compat.patch
+++ b/libXfont-1.4.7-fontproto-compat.patch
@@ -19,3 +19,16 @@ diff -up libXfont-1.4.7/src/util/patcache.c.jx libXfont-1.4.7/src/util/patcache.
  		       int patlen)
  {
      int				hash;
+diff -up libXfont-1.4.8/config.h.in~ libXfont-1.4.8/config.h.in
+diff -up libXfont-1.4.8/configure.ac~ libXfont-1.4.8/configure.ac
+--- libXfont-1.4.8/configure.ac~	2014-05-16 04:38:27.000000000 +0200
++++ libXfont-1.4.8/configure.ac	2014-07-09 14:57:17.174821385 +0200
+@@ -180,7 +180,7 @@ fi
+ AC_CHECK_LIB(m, hypot, [MATH_LIBS=-lm
+ AC_SUBST(MATH_LIBS)], AC_MSG_ERROR([*** libm is required]))
+ 
+-PKG_CHECK_MODULES(XFONT, [xproto xtrans fontsproto < 2.1.3 fontenc])
++PKG_CHECK_MODULES(XFONT, [xproto xtrans fontsproto >= 2.1.3 fontenc])
+ 
+ # Transport selection macro from xtrans.m4
+ XTRANS_CONNECTION_FLAGS
diff --git a/libXfont.spec b/libXfont.spec
index 7fad280..b4f651b 100644
--- a/libXfont.spec
+++ b/libXfont.spec
@@ -1,14 +1,15 @@
 Summary: X.Org X11 libXfont runtime library
 Name: libXfont
-Version: 1.4.7
-Release: 2%{?dist}
+Version: 1.4.8
+Release: 1%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://www.x.org
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0: http://www.x.org/pub/individual/lib/%{name}-%{version}.tar.bz2
+%if 0%{?fedora} >= 20
 Patch0: libXfont-1.4.7-fontproto-compat.patch
+%endif
 
 BuildRequires: autoconf automake libtool
 BuildRequires: pkgconfig(fontsproto)
@@ -23,15 +24,17 @@ X.Org X11 libXfont runtime library
 %package devel
 Summary: X.Org X11 libXfont development package
 Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
-Requires: libfontenc-devel
+Requires: %{name}%{?_isa} = %{version}-%{release}
+Requires: libfontenc-devel%{?_isa}
 
 %description devel
 X.Org X11 libXfont development package
 
 %prep
 %setup -q
+%if 0%{?fedora} >= 20
 %patch0 -p1
+%endif
 
 %build
 autoreconf -v --install --force
@@ -40,29 +43,20 @@ export CFLAGS="$RPM_OPT_FLAGS -Os"
 make %{?_smp_mflags}  
 
 %install
-rm -rf $RPM_BUILD_ROOT
-
-make install DESTDIR=$RPM_BUILD_ROOT
+%make_install
 
 # We intentionally don't ship *.la files
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %post -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
 
 %files
-%defattr(-,root,root,-)
-# FIXME:  Missing README/INSTALL - should file bug upstream.
-#%doc AUTHORS COPYING README INSTALL ChangeLog NEWS
-%doc AUTHORS COPYING ChangeLog
+%doc AUTHORS COPYING README ChangeLog
 %{_libdir}/libXfont.so.1
 %{_libdir}/libXfont.so.1.4.1
 
 %files devel
-%defattr(-,root,root,-)
 %{_includedir}/X11/fonts/bdfint.h
 %{_includedir}/X11/fonts/bitmap.h
 %{_includedir}/X11/fonts/bufio.h
@@ -82,6 +76,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/xfont.pc
 
 %changelog
+* Wed Jul  9 2014 Hans de Goede <hdegoede at redhat.com> - 1.4.8-1
+- libXfont 1.4.8 (rhbz#1100441)
+- Fixes: CVE-2014-0209, CVE-2014-0210, CVE-2014-0211 (rhbz#1097397)
+
 * Mon Jun 09 2014 Adam Jackson <ajax at redhat.com> 1.4.7-2
 - Fix FTBFS against new fontproto
 
diff --git a/sources b/sources
index 5248c04..33af63f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b21ee5739d5d2e5028b302fbf9fe630b  libXfont-1.4.7.tar.bz2
+a7cbc4128c244d9c54fdf21cd517ac8c  libXfont-1.4.8.tar.bz2