commit a46b76ec3cd170a200fe936fdce0b462430e8e70
Author: Jakub Bogusz <[email protected]>
Date: Sat May 17 09:41:45 2014 +0200
- updated to 1.4.8 (fixes CVE-2014-0209 CVE-2014-0210 CVE-2014-0211)
- added fontsproto patch (adjust for fontsproto >= 2.1.3)
xorg-lib-libXfont-fontsproto.patch | 31 +++++++++++++++++++++++++++++++
xorg-lib-libXfont.spec | 10 ++++++----
2 files changed, 37 insertions(+), 4 deletions(-)
---
diff --git a/xorg-lib-libXfont.spec b/xorg-lib-libXfont.spec
index 7bd6411..824a8c0 100644
--- a/xorg-lib-libXfont.spec
+++ b/xorg-lib-libXfont.spec
@@ -1,12 +1,13 @@
Summary: X font library used by the X server
Summary(pl.UTF-8): Używana przez X serwer biblioteka fontów X
Name: xorg-lib-libXfont
-Version: 1.4.7
+Version: 1.4.8
Release: 1
License: MIT
Group: X11/Libraries
Source0:
http://xorg.freedesktop.org/releases/individual/lib/libXfont-%{version}.tar.bz2
-# Source0-md5: b21ee5739d5d2e5028b302fbf9fe630b
+# Source0-md5: a7cbc4128c244d9c54fdf21cd517ac8c
+Patch0: %{name}-fontsproto.patch
URL: http://xorg.freedesktop.org/
BuildRequires: autoconf >= 2.60
BuildRequires: automake
@@ -18,7 +19,7 @@ BuildRequires: pkgconfig >= 1:0.19
BuildRequires: xmlto >= 0.0.22
BuildRequires: xorg-lib-libfontenc-devel
BuildRequires: xorg-lib-xtrans-devel
-BuildRequires: xorg-proto-fontsproto-devel
+BuildRequires: xorg-proto-fontsproto-devel >= 2.1.3
BuildRequires: xorg-proto-xproto-devel
BuildRequires: xorg-sgml-doctools >= 1.7
BuildRequires: xorg-util-util-macros >= 1.10
@@ -53,7 +54,7 @@ Requires: bzip2-devel
Requires: freetype-devel >= 2
Requires: xorg-lib-libfontenc-devel
Requires: xorg-lib-xtrans-devel
-Requires: xorg-proto-fontsproto-devel
+Requires: xorg-proto-fontsproto-devel >= 2.1.3
Requires: xorg-proto-xproto-devel
Requires: zlib-devel
Obsoletes: libXfont-devel
@@ -89,6 +90,7 @@ Pakiet zawiera statyczną bibliotekę libXfont.
%prep
%setup -q -n libXfont-%{version}
+%patch0 -p1
%build
%{__libtoolize}
diff --git a/xorg-lib-libXfont-fontsproto.patch
b/xorg-lib-libXfont-fontsproto.patch
new file mode 100644
index 0000000..a4e3d99
--- /dev/null
+++ b/xorg-lib-libXfont-fontsproto.patch
@@ -0,0 +1,31 @@
+--- libXfont-1.4.8/configure.ac.orig 2014-05-16 04:38:27.000000000 +0200
++++ libXfont-1.4.8/configure.ac 2014-05-17 09:10:06.899291794 +0200
+@@ -180,7 +180,7 @@
+ 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
+--- libXfont-1.4.8/src/util/patcache.c.orig 2014-05-16 04:38:27.000000000
+0200
++++ libXfont-1.4.8/src/util/patcache.c 2014-05-17 09:18:50.082614223 +0200
+@@ -128,7 +128,7 @@
+ /* add entry */
+ void
+ CacheFontPattern (FontPatternCachePtr cache,
+- char *pattern,
++ const char *pattern,
+ int patlen,
+ FontPtr pFont)
+ {
+@@ -174,7 +174,7 @@
+ /* find matching entry */
+ FontPtr
+ FindCachedFontPattern (FontPatternCachePtr cache,
+- char *pattern,
++ const char *pattern,
+ int patlen)
+ {
+ int hash;
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/xorg-lib-libXfont.git/commitdiff/a46b76ec3cd170a200fe936fdce0b462430e8e70
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
