Hello community,

here is the log from the commit of package mkfontscale for openSUSE:Factory 
checked in at 2018-03-12 12:05:04
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/mkfontscale (Old)
 and      /work/SRC/openSUSE:Factory/.mkfontscale.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "mkfontscale"

Mon Mar 12 12:05:04 2018 rev:9 rq:583886 version:1.1.3

Changes:
--------
--- /work/SRC/openSUSE:Factory/mkfontscale/mkfontscale.changes  2015-03-05 
15:28:30.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.mkfontscale.new/mkfontscale.changes     
2018-03-12 12:05:05.941696154 +0100
@@ -1,0 +2,11 @@
+Wed Mar  7 11:52:26 UTC 2018 - sndir...@suse.com
+
+- Update to version 1.1.3:
+  * autogen.sh: use quoted string variables
+  * mkfontscale: Avoid a buffer underrun
+  * autogen: add default patch prefix
+  * autogen.sh: use exec instead of waiting for configure to finish
+  * fix handling of Type1 fonts without /FamilyName and/or /FullName
+- supersedes 
u_mkfontscale-fix-handling-of-Type1-fonts-without-FamilyName-and-o.patch
+
+-------------------------------------------------------------------

Old:
----
  mkfontscale-1.1.2.tar.bz2
  u_mkfontscale-fix-handling-of-Type1-fonts-without-FamilyName-and-o.patch

New:
----
  mkfontscale-1.1.3.tar.bz2

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ mkfontscale.spec ++++++
--- /var/tmp/diff_new_pack.9khW8j/_old  2018-03-12 12:05:07.261648847 +0100
+++ /var/tmp/diff_new_pack.9khW8j/_new  2018-03-12 12:05:07.265648703 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package mkfontscale
 #
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 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
@@ -17,14 +17,13 @@
 
 
 Name:           mkfontscale
-Version:        1.1.2
+Version:        1.1.3
 Release:        0
 Summary:        Utility to create index of scalable font files for X
 License:        MIT
 Group:          System/X11/Utilities
 Url:            http://xorg.freedesktop.org/
 Source0:        
http://xorg.freedesktop.org/releases/individual/app/%{name}-%{version}.tar.bz2
-Patch0:         
u_mkfontscale-fix-handling-of-Type1-fonts-without-FamilyName-and-o.patch
 BuildRequires:  pkg-config
 BuildRequires:  zlib-devel
 BuildRequires:  pkgconfig(fontenc)
@@ -41,7 +40,6 @@
 
 %prep
 %setup -q
-%patch0 -p1
 
 %build
 %configure

++++++ mkfontscale-1.1.2.tar.bz2 -> mkfontscale-1.1.3.tar.bz2 ++++++
++++ 3324 lines of diff (skipped)
++++    retrying with extended exclude list
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude 
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 
old/mkfontscale-1.1.2/ChangeLog new/mkfontscale-1.1.3/ChangeLog
--- old/mkfontscale-1.1.2/ChangeLog     2015-01-17 08:41:09.000000000 +0100
+++ new/mkfontscale-1.1.3/ChangeLog     2018-03-07 08:00:35.000000000 +0100
@@ -1,3 +1,84 @@
+commit 4b1d7d3af1c1bc1586b2e9a780aea0dee7df5a14
+Author: Alan Coopersmith <alan.coopersm...@oracle.com>
+Date:   Tue Mar 6 22:57:01 2018 -0800
+
+    mkfontscale 1.1.3
+    
+    Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com>
+
+commit 27295c6c9b40b5cee0d1f45dfdc742a12613cb58
+Author: Mihail Konev <k....@ya.ru>
+Date:   Thu Jan 26 14:00:20 2017 +1000
+
+    autogen: add default patch prefix
+    
+    Signed-off-by: Mihail Konev <k....@ya.ru>
+
+commit 3258ad61892298d07236a857e1668171de5e8880
+Author: Emil Velikov <emil.l.veli...@gmail.com>
+Date:   Mon Mar 9 12:00:52 2015 +0000
+
+    autogen.sh: use quoted string variables
+    
+    Place quotes around the $srcdir, $ORIGDIR and $0 variables to prevent
+    fall-outs, when they contain space.
+    
+    Signed-off-by: Emil Velikov <emil.l.veli...@gmail.com>
+    Reviewed-by: Peter Hutterer <peter.hutte...@who-t.net>
+    Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
+
+commit e8e4bdca31c006e2600ba25ef753fe77b20d6aca
+Author: Peter Hutterer <peter.hutte...@who-t.net>
+Date:   Tue Jan 24 10:32:07 2017 +1000
+
+    autogen.sh: use exec instead of waiting for configure to finish
+    
+    Syncs the invocation of configure with the one from the server.
+    
+    Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
+    Reviewed-by: Emil Velikov <emil.veli...@collabora.com>
+
+commit 07b761b0862bcea65b83052b9d960c4459af0466
+Author: Jeremy Huddleston Sequoia <jerem...@apple.com>
+Date:   Sun Sep 18 16:25:22 2016 -0700
+
+    mkfontscale: Avoid a buffer underrun
+    
+    https://bugs.freedesktop.org/show_bug.cgi?id=96905
+    
+    =================================================================
+    ==3068==ERROR: AddressSanitizer: heap-buffer-overflow on address 
0x60300000de6f at pc 0x000109df79d1 bp 0x7fff55e37d90 sp 0x7fff55e37550
+    READ of size 1 at 0x60300000de6f thread T0
+        #0 0x109df79d0 in wrap_strcmp 
(libclang_rt.asan_osx_dynamic.dylib+0xe9d0)
+        #1 0x109dc8ef7 in fontFileOpen (mkfontscale+0x100001ef7)
+        #2 0x109dc8e0b in bitmapIdentify (mkfontscale+0x100001e0b)
+        #3 0x109dcc874 in doDirectory (mkfontscale+0x100005874)
+        #4 0x109dcbc78 in main (mkfontscale+0x100004c78)
+        #5 0x7fff9083f5ac in start (libdyld.dylib+0x35ac)
+        #6 0x3  (<unknown module>)
+    
+    0x60300000de6f is located 1 bytes to the left of 20-byte region 
[0x60300000de70,0x60300000de84)
+    allocated by thread T0 here:
+        #0 0x109e34570 in wrap_malloc 
(libclang_rt.asan_osx_dynamic.dylib+0x4b570)
+        #1 0x109dca92a in dsprintf (mkfontscale+0x10000392a)
+        #2 0x109dcc788 in doDirectory (mkfontscale+0x100005788)
+        #3 0x109dcbc78 in main (mkfontscale+0x100004c78)
+        #4 0x7fff9083f5ac in start (libdyld.dylib+0x35ac)
+        #5 0x3  (<unknown module>)
+    
+    Signed-off-by: Jeremy Huddleston Sequoia <jerem...@apple.com>
+
+commit ecb248d8865df376a97a795c2e4f58a3bf64c3f1
+Author: Stefan Dirsch <sndir...@suse.de>
+Date:   Thu Apr 21 16:52:15 2016 +0200
+
+    fix handling of Type1 fonts without /FamilyName and/or /FullName
+    
+    https://bugzilla.opensuse.org/show_bug.cgi?id=918466
+    
+    Signed-off-by: Stefan Dirsch <sndir...@suse.de>
+    Reviewed-by: Adam Jackson <a...@redhat.com>
+
 commit 87d628f8eec170ec13bb9feefb1ce05aed07d1d6
 Author: Alan Coopersmith <alan.coopersm...@oracle.com>
 Date:   Fri Jan 16 23:40:40 2015 -0800
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude 
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 
old/mkfontscale-1.1.2/configure.ac new/mkfontscale-1.1.3/configure.ac
--- old/mkfontscale-1.1.2/configure.ac  2015-01-17 08:40:45.000000000 +0100
+++ new/mkfontscale-1.1.3/configure.ac  2018-03-07 08:00:24.000000000 +0100
@@ -22,7 +22,7 @@
 
 # Initialize Autoconf
 AC_PREREQ([2.60])
-AC_INIT([mkfontscale], [1.1.2],
+AC_INIT([mkfontscale], [1.1.3],
         [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
         [mkfontscale])
 AC_CONFIG_SRCDIR([Makefile.am])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude 
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 
old/mkfontscale-1.1.2/ident.c new/mkfontscale-1.1.3/ident.c
--- old/mkfontscale-1.1.2/ident.c       2015-01-17 08:40:45.000000000 +0100
+++ new/mkfontscale-1.1.3/ident.c       2018-03-07 08:00:24.000000000 +0100
@@ -83,7 +83,7 @@
 fontFileOpen(fontFile *ff, const char *filename) {
     int n = strlen(filename);
 
-    if (strcmp(filename + n - 4, ".bz2") == 0) {
+    if (n > 4 && strcmp(filename + n - 4, ".bz2") == 0) {
        ff->type = bz2FontFile;
        ff->f.bz2 = BZ2_bzopen(filename, "rb");
        ff->pos = 0;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude 
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 
old/mkfontscale-1.1.2/mkfontscale.c new/mkfontscale-1.1.3/mkfontscale.c
--- old/mkfontscale-1.1.2/mkfontscale.c 2015-01-17 08:40:45.000000000 +0100
+++ new/mkfontscale-1.1.3/mkfontscale.c 2018-03-07 08:00:24.000000000 +0100
@@ -579,11 +579,14 @@
     }
 
     if(t1info) {
-        if(!family)
+        if(!family && t1info->family_name)
             family = strdup(t1info->family_name);
-        if(!family)
+        if(!family && t1info->full_name)
             family = strdup(t1info->full_name);
-        if(!full_name)
+        /* Hershey fonts miss /FamilyName */
+        if(!family && face->family_name)
+            family = strdup(face->family_name);
+        if(!full_name && t1info->full_name)
             full_name = strdup(t1info->full_name);
         if(!foundry)
             foundry = notice_foundry(t1info->notice);


Reply via email to