- Update to release 1.5.2
Maintenance branch release, primarily for bdftopcf's benefit as it's the only thing that really needs the Xfont1 API. (xfs uses it too, I believe, but could be ported to Xfont2). If someone wanted to step up and merge Xfont1 into bdtopcf directly, that'd be great. - supersedes U_bdfReadCharacters-Allow-negative-DWIDTH-values.patch OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/libXfont?expand=0&rev=26
This commit is contained in:
parent
b6ae7d6b26
commit
5d89c8d562
@ -1,37 +0,0 @@
|
||||
From: Benjamin Tissoires <benjamin.tissoires@gmail.com>
|
||||
Date: Mon Jul 13 14:43:06 2015 -0400
|
||||
Subject: [PATCH]bdfReadCharacters: Allow negative DWIDTH values
|
||||
Patch-mainline: Upstream
|
||||
Git-commit: 1a73d6828dfa03924f2d68644fb5b99afd9c78e2
|
||||
Git-repo: git://anongit.freedesktop.org/git/xorg/lib/libXfont
|
||||
References: boo#958383
|
||||
Signed-off-by: Egbert Eich <eich@suse.com>
|
||||
|
||||
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 <benjamin.tissoires@gmail.com>
|
||||
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
|
||||
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
|
||||
---
|
||||
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;
|
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:b70898527c73f9758f551bbab612af611b8a0962202829568d94f3edf4d86098
|
||||
size 502903
|
3
libXfont-1.5.2.tar.bz2
Normal file
3
libXfont-1.5.2.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:02945ea68da447102f3e6c2b896c1d2061fd115de99404facc2aca3ad7010d71
|
||||
size 530367
|
@ -1,3 +1,13 @@
|
||||
-------------------------------------------------------------------
|
||||
Thu Sep 22 13:07:50 UTC 2016 - sndirsch@suse.com
|
||||
|
||||
- Update to release 1.5.2
|
||||
Maintenance branch release, primarily for bdftopcf's benefit as it's
|
||||
the only thing that really needs the Xfont1 API. (xfs uses it too, I
|
||||
believe, but could be ported to Xfont2). If someone wanted to step up
|
||||
and merge Xfont1 into bdtopcf directly, that'd be great.
|
||||
- supersedes U_bdfReadCharacters-Allow-negative-DWIDTH-values.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Dec 8 15:57:08 UTC 2015 - eich@suse.com
|
||||
|
||||
|
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package libXfont
|
||||
#
|
||||
# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
|
||||
# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
@ -18,7 +18,7 @@
|
||||
|
||||
Name: libXfont
|
||||
%define lname libXfont1
|
||||
Version: 1.5.1
|
||||
Version: 1.5.2
|
||||
Release: 0
|
||||
Summary: X font handling library for server and utilities
|
||||
License: MIT
|
||||
@ -29,7 +29,6 @@ Url: http://xorg.freedesktop.org/
|
||||
#Git-Web: http://cgit.freedesktop.org/xorg/lib/libXfont/
|
||||
Source: %{name}-%{version}.tar.bz2
|
||||
Source1: baselibs.conf
|
||||
Patch0: U_bdfReadCharacters-Allow-negative-DWIDTH-values.patch
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
#git#BuildRequires: autoconf >= 2.60, automake, libtool
|
||||
BuildRequires: pkgconfig
|
||||
@ -83,7 +82,6 @@ in %lname.
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
%patch0 -p1
|
||||
|
||||
%build
|
||||
%configure --disable-static
|
||||
|
Loading…
Reference in New Issue
Block a user