<pre style='margin:0'>
Marius Schamschula (Schamschula) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/f2847022ee119f4383b131e962aa329194ca3237">https://github.com/macports/macports-ports/commit/f2847022ee119f4383b131e962aa329194ca3237</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit f2847022ee119f4383b131e962aa329194ca3237
</span>Author: Marius Schamschula <mps@macports.org>
AuthorDate: Thu Mar 7 19:00:46 2019 -0600
<span style='display:block; white-space:pre;color:#404040;'> mkfontscale: update to 1.2.0
</span>---
x11/mkfontscale/Portfile | 14 +++----
...g-of-Type1-fonts-without-FamilyName-and-o.patch | 39 ------------------
.../0002-mkfontscale-Avoid-a-buffer-underrun.patch | 48 ----------------------
3 files changed, 5 insertions(+), 96 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/mkfontscale/Portfile b/x11/mkfontscale/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index b47c148..bcdaabe 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/mkfontscale/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/mkfontscale/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,8 +3,8 @@
</span> PortSystem 1.0
name mkfontscale
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 1.1.2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 1.2.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span> categories x11
license X11
platforms darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -15,9 +15,9 @@ long_description Create an index of scalable font files for X
</span> homepage https://www.x.org/
master_sites xorg:individual/app/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums sha1 da32fe297732355eea71d4a94ed003be93d1eae7 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 1bd35226ca763828ece4fed4120a398745132363 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 8c6d5228af885477b9aec60ca6f172578e7d2de42234357af62fb00439453f20
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 16a79e6ccf352e1a126cb45ae0af989c608eded2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 282b77be9f130d43d308287f87ed551ace2c64fee4447b5c4389870dea10c4be \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 150646
</span>
use_bzip2 yes
use_parallel_build yes
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -31,10 +31,6 @@ depends_lib port:xorg-libfontenc \
</span> port:bzip2 \
port:zlib
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patch.pre_args -p1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append 0001-fix-handling-of-Type1-fonts-without-FamilyName-and-o.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 0002-mkfontscale-Avoid-a-buffer-underrun.patch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> livecheck.type regex
livecheck.url http://xorg.freedesktop.org/archive/individual/app/?C=M&O=D
livecheck.regex ${name}-(\\d+(?:\\.\\d+)*)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/mkfontscale/files/0001-fix-handling-of-Type1-fonts-without-FamilyName-and-o.patch b/x11/mkfontscale/files/0001-fix-handling-of-Type1-fonts-without-FamilyName-and-o.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 08853db..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/mkfontscale/files/0001-fix-handling-of-Type1-fonts-without-FamilyName-and-o.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,39 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From ecb248d8865df376a97a795c2e4f58a3bf64c3f1 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: Stefan Dirsch <sndirsch@suse.de>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Thu, 21 Apr 2016 16:52:15 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH 1/2] fix handling of Type1 fonts without /FamilyName and/or
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /FullName
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://bugzilla.opensuse.org/show_bug.cgi?id=918466
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Signed-off-by: Stefan Dirsch <sndirsch@suse.de>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Reviewed-by: Adam Jackson <ajax@redhat.com>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- mkfontscale.c | 9 ++++++---
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1 file changed, 6 insertions(+), 3 deletions(-)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/mkfontscale.c b/mkfontscale.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index da93e0c..e9b9488 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/mkfontscale.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/mkfontscale.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -579,11 +579,14 @@ makeXLFD(char *filename, FT_Face face, int isBitmap)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(t1info) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if(!family)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if(!family && t1info->family_name)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- family = strdup(t1info->family_name);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if(!family)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if(!family && t1info->full_name)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- family = strdup(t1info->full_name);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if(!full_name)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ /* Hershey fonts miss /FamilyName */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if(!family && face->family_name)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ family = strdup(face->family_name);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if(!full_name && t1info->full_name)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- full_name = strdup(t1info->full_name);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(!foundry)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foundry = notice_foundry(t1info->notice);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-2.10.0 (Apple Git-77)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/mkfontscale/files/0002-mkfontscale-Avoid-a-buffer-underrun.patch b/x11/mkfontscale/files/0002-mkfontscale-Avoid-a-buffer-underrun.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 84c1f6b..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/mkfontscale/files/0002-mkfontscale-Avoid-a-buffer-underrun.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,48 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 07b761b0862bcea65b83052b9d960c4459af0466 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Sun, 18 Sep 2016 16:25:22 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH 2/2] mkfontscale: Avoid a buffer underrun
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://bugs.freedesktop.org/show_bug.cgi?id=96905
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-=================================================================
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-==3068==ERROR: AddressSanitizer: heap-buffer-overflow on address 0x60300000de6f at pc 0x000109df79d1 bp 0x7fff55e37d90 sp 0x7fff55e37550
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-READ of size 1 at 0x60300000de6f thread T0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #0 0x109df79d0 in wrap_strcmp (libclang_rt.asan_osx_dynamic.dylib+0xe9d0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #1 0x109dc8ef7 in fontFileOpen (mkfontscale+0x100001ef7)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #2 0x109dc8e0b in bitmapIdentify (mkfontscale+0x100001e0b)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #3 0x109dcc874 in doDirectory (mkfontscale+0x100005874)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #4 0x109dcbc78 in main (mkfontscale+0x100004c78)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #5 0x7fff9083f5ac in start (libdyld.dylib+0x35ac)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #6 0x3 (<unknown module>)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-0x60300000de6f is located 1 bytes to the left of 20-byte region [0x60300000de70,0x60300000de84)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-allocated by thread T0 here:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #0 0x109e34570 in wrap_malloc (libclang_rt.asan_osx_dynamic.dylib+0x4b570)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #1 0x109dca92a in dsprintf (mkfontscale+0x10000392a)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #2 0x109dcc788 in doDirectory (mkfontscale+0x100005788)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #3 0x109dcbc78 in main (mkfontscale+0x100004c78)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #4 0x7fff9083f5ac in start (libdyld.dylib+0x35ac)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #5 0x3 (<unknown module>)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ident.c | 2 +-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1 file changed, 1 insertion(+), 1 deletion(-)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/ident.c b/ident.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 22d3648..f7fe9e1 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/ident.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/ident.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -83,7 +83,7 @@ static inline void *
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fontFileOpen(fontFile *ff, const char *filename) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int n = strlen(filename);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (strcmp(filename + n - 4, ".bz2") == 0) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (n > 4 && strcmp(filename + n - 4, ".bz2") == 0) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ff->type = bz2FontFile;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ff->f.bz2 = BZ2_bzopen(filename, "rb");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ff->pos = 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-2.10.0 (Apple Git-77)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span></pre><pre style='margin:0'>
</pre>