From 1fc6e8628c639192e744ece0ff1297c6e891d59c Mon Sep 17 00:00:00 2001
From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
Date: Wed, 23 Jan 2019 20:57:14 +0000
Subject: user/gnu-ghostscript: fix build on aarch64

---
 user/gnu-ghostscript/APKBUILD                 |  4 +-
 user/gnu-ghostscript/do-not-use-sprintf.patch | 65 +++++++++++++++++++++++++++
 2 files changed, 67 insertions(+), 2 deletions(-)

(limited to 'user/gnu-ghostscript')

diff --git a/user/gnu-ghostscript/APKBUILD b/user/gnu-ghostscript/APKBUILD
index 88a1ea38b..14ce2c5f6 100644
--- a/user/gnu-ghostscript/APKBUILD
+++ b/user/gnu-ghostscript/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=gnu-ghostscript
 pkgver=9.14.1
-pkgrel=1
+pkgrel=2
 pkgdesc="PostScript utilities"
 url="https://www.gnu.org/software/ghostscript/"
 arch="all"
@@ -44,4 +44,4 @@ package() {
 }
 
 sha512sums="658f6ae14b29965c7959b9bd1463760d7fb03b35251446fc37101dbe7ee2866c74a0803e22b2f4488be3221d026578be1d6be7b562ff240036134fbf83edabf9  gnu-ghostscript-9.14.1.tar.xz
-2c1d3a487ff7ee65855d3c587747bd8bf0f5a61ef30f4c84e6df237d6680a88ba72f328c7294eee0058eb69f770f3e539f29cb2ea4c55bcac98f22c5bd203020  do-not-use-sprintf.patch"
+1c4d79633ecece9f4de7a672f2888939be7d1e0ba24f3a66500fdfbb37e081e0f323a5efa0d1547fed51206e5a95d3b0659c0ea845d0bc333f281dfb88fcc040  do-not-use-sprintf.patch"
diff --git a/user/gnu-ghostscript/do-not-use-sprintf.patch b/user/gnu-ghostscript/do-not-use-sprintf.patch
index 7bf03cd89..e0e84b4fe 100644
--- a/user/gnu-ghostscript/do-not-use-sprintf.patch
+++ b/user/gnu-ghostscript/do-not-use-sprintf.patch
@@ -18,3 +18,68 @@
          wl(linebuf);
      }
      mergefile(os_prefix, inname, in, config, false);
+--- gnu-ghostscript-9.14.1/cups/gdevcups.c.old	2014-07-02 15:13:25.000000000 +0000
++++ gnu-ghostscript-9.14.1/cups/gdevcups.c	2019-01-23 20:56:04.082290416 +0000
+@@ -1039,7 +1039,7 @@
+ 
+   for (i = 0; i < 16; i ++)
+   {
+-    sprintf(name, "cupsInteger%d", i);
++    snprintf(name, sizeof(name), "cupsInteger%d", i);
+     if ((code = param_write_int(plist, strdup(name),
+                         	(int *)(cups->header.cupsInteger + i))) < 0)
+       return (code);
+@@ -1047,7 +1047,7 @@
+ 
+   for (i = 0; i < 16; i ++)
+   {
+-    sprintf(name, "cupsReal%d", i);
++    snprintf(name, sizeof(name), "cupsReal%d", i);
+     if ((code = param_write_float(plist, strdup(name),
+                         	  cups->header.cupsReal + i)) < 0)
+       return (code);
+@@ -1055,7 +1055,7 @@
+ 
+   for (i = 0; i < 16; i ++)
+   {
+-    sprintf(name, "cupsString%d", i);
++    snprintf(name, sizeof(name), "cupsString%d", i);
+     param_string_from_string(s, cups->header.cupsString[i]);
+     if ((code = param_write_string(plist, strdup(name), &s)) < 0)
+       return (code);
+@@ -3166,19 +3166,19 @@
+ 
+   for (i = 0; i < 16; i ++)
+   {
+-    sprintf(name, "cupsInteger%d", i);
++    snprintf(name, sizeof(name), "cupsInteger%d", i);
+     intoption(cupsInteger[i],strdup(name), unsigned)
+   }
+ 
+   for (i = 0; i < 16; i ++)
+   {
+-    sprintf(name, "cupsReal%d", i);
++    snprintf(name, sizeof(name), "cupsReal%d", i);
+     floatoption(cupsReal[i], strdup(name))
+   }
+ 
+   for (i = 0; i < 16; i ++)
+   {
+-    sprintf(name, "cupsString%d", i);
++    snprintf(name, sizeof(name), "cupsString%d", i);
+     stringoption(cupsString[i], strdup(name))
+   }
+ 
+@@ -4247,10 +4247,10 @@
+     */
+ 
+     if (pdev->HWResolution[0] != pdev->HWResolution[1])
+-      sprintf(resolution, "%.0fx%.0fdpi", pdev->HWResolution[0],
++      snprintf(resolution, sizeof(resolution), "%.0fx%.0fdpi", pdev->HWResolution[0],
+               pdev->HWResolution[1]);
+     else
+-      sprintf(resolution, "%.0fdpi", pdev->HWResolution[0]);
++      snprintf(resolution, sizeof(resolution), "%.0fdpi", pdev->HWResolution[0]);
+ 
+     for (i = 0, profile = cups->PPD->profiles;
+          i < cups->PPD->num_profiles;
-- 
cgit v1.2.3-60-g2f50