diff --git a/.gitignore b/.gitignore index 4140c05..a7675cc 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/libXfont-1.5.1.tar.bz2 +SOURCES/libXfont-1.5.2.tar.bz2 diff --git a/.libXfont.metadata b/.libXfont.metadata index 3bae679..0454afb 100644 --- a/.libXfont.metadata +++ b/.libXfont.metadata @@ -1 +1 @@ -e63a354de5dc2d8cba08d50add1519471412a618 SOURCES/libXfont-1.5.1.tar.bz2 +a9470774f271622c1b425826d1c8836ed96e4a96 SOURCES/libXfont-1.5.2.tar.bz2 diff --git a/SOURCES/bdfReadCharacters-Allow-negative-DWIDTH-values.patch b/SOURCES/bdfReadCharacters-Allow-negative-DWIDTH-values.patch deleted file mode 100644 index 4ab25f3..0000000 --- a/SOURCES/bdfReadCharacters-Allow-negative-DWIDTH-values.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 1a73d6828dfa03924f2d68644fb5b99afd9c78e2 Mon Sep 17 00:00:00 2001 -From: Benjamin Tissoires -Date: Mon, 13 Jul 2015 14:43:06 -0400 -Subject: [PATCH] bdfReadCharacters: Allow negative DWIDTH values -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -The fix for CVE-2015-1804 prevent DWIDTH to be negative. -However, the spec states that "DWIDTH [...] is a vector indicating the -position of the next glyph’s origin relative to the origin of this glyph." - -So negative values are correct. - -Found by trying to compile XTS. - -Signed-off-by: Benjamin Tissoires -Reviewed-by: Peter Hutterer -Signed-off-by: Alan Coopersmith ---- - src/bitmap/bdfread.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/bitmap/bdfread.c b/src/bitmap/bdfread.c -index a0ace8f..eccd7b7 100644 ---- a/src/bitmap/bdfread.c -+++ b/src/bitmap/bdfread.c -@@ -426,7 +426,7 @@ bdfReadCharacters(FontFilePtr file, FontPtr pFont, bdfFileState *pState, - goto BAILOUT; - } - /* xCharInfo metrics are stored as INT16 */ -- if ((wx < 0) || (wx > INT16_MAX)) { -+ if ((wx < INT16_MIN) || (wx > INT16_MAX)) { - bdfError("character '%s' has out of range width, %d\n", - charName, wx); - goto BAILOUT; --- -2.1.0 - diff --git a/SPECS/libXfont.spec b/SPECS/libXfont.spec index 01ca9a0..30978a8 100644 --- a/SPECS/libXfont.spec +++ b/SPECS/libXfont.spec @@ -1,15 +1,13 @@ Summary: X.Org X11 libXfont runtime library Name: libXfont -Version: 1.5.1 -Release: 2%{?dist} +Version: 1.5.2 +Release: 1%{?dist} License: MIT Group: System Environment/Libraries URL: http://www.x.org Source0: http://www.x.org/pub/individual/lib/%{name}-%{version}.tar.bz2 -Patch0: bdfReadCharacters-Allow-negative-DWIDTH-values.patch - BuildRequires: autoconf automake libtool BuildRequires: pkgconfig(fontsproto) BuildRequires: xorg-x11-util-macros @@ -32,8 +30,6 @@ X.Org X11 libXfont development package %prep %setup -q -%patch0 -p1 - %build autoreconf -v --install --force export CFLAGS="$RPM_OPT_FLAGS -Os" @@ -74,6 +70,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la %{_libdir}/pkgconfig/xfont.pc %changelog +* Mon Jan 23 2017 Benjamin Tissoires 1.5.2-1 +- libXfont 1.5.2 + * Tue Jul 28 2015 Benjamin Tissoires 1.5.1-2 - Add bdfReadCharacters patch to fix XTS compilation problems (rhbz#1241939)