diff options
| author | wiz <wiz> | 2015-08-12 22:20:00 +0000 |
|---|---|---|
| committer | wiz <wiz> | 2015-08-12 22:20:00 +0000 |
| commit | c94c531df647d724e52f53a11dbee385dce2de30 (patch) | |
| tree | 8a95a4329ea845aa3faf02d7a291f5831cd024c9 /print | |
| parent | 7b2aea147e17d36d0a0d5ef65149d5d58fa71e97 (diff) | |
| download | pkgsrc-c94c531df647d724e52f53a11dbee385dce2de30.tar.gz | |
Use memmove instead of memcpy in one place.
It seems the arguments sometimes overlap, and _FORTIFY_SOURCE=2 causes it
to dump core in this case.
Bump PKGREVISION.
Diffstat (limited to 'print')
| -rw-r--r-- | print/ghostscript-gpl/Makefile | 4 | ||||
| -rw-r--r-- | print/ghostscript-gpl/distinfo | 4 | ||||
| -rw-r--r-- | print/ghostscript-gpl/patches/patch-ai | 20 |
3 files changed, 21 insertions, 7 deletions
diff --git a/print/ghostscript-gpl/Makefile b/print/ghostscript-gpl/Makefile index 70a1c51e185..30c6e44e1c6 100644 --- a/print/ghostscript-gpl/Makefile +++ b/print/ghostscript-gpl/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.17 2015/06/12 10:50:57 wiz Exp $ +# $NetBSD: Makefile,v 1.18 2015/08/12 22:20:00 wiz Exp $ DISTNAME= ghostscript-${GS_VERSION} PKGNAME= ${DISTNAME:S/ghostscript/ghostscript-gpl/} -PKGREVISION= 5 +PKGREVISION= 6 CATEGORIES= print MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=ghostscript/} MASTER_SITES+= http://ghostscript.com/releases/ diff --git a/print/ghostscript-gpl/distinfo b/print/ghostscript-gpl/distinfo index 1e43f006c7e..37e455a4fae 100644 --- a/print/ghostscript-gpl/distinfo +++ b/print/ghostscript-gpl/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.10 2015/08/11 18:16:50 wiz Exp $ +$NetBSD: distinfo,v 1.11 2015/08/12 22:20:00 wiz Exp $ SHA1 (ghostscript-9.06.tar.bz2) = 4c1c2b4cddd16d86b21f36ad4fc15f6100162238 RMD160 (ghostscript-9.06.tar.bz2) = 11ef74cf783ec5f7cde0ceaaf2823a1f62fb4d1d @@ -11,7 +11,7 @@ SHA1 (patch-CVE-2014-8158) = 71387f152a205caaef0fcc518dbb0fbb7b78e531 SHA1 (patch-CVE-2014-9029) = 9636c7d6909fc0dec7ad2102b59fb14d599bac6a SHA1 (patch-af) = 79af4d253001f879f1b5d3ef93584ae7300361de SHA1 (patch-ah) = 73a05ee51845ca70e1b18c50dee98d6799a46d52 -SHA1 (patch-ai) = 8a3de7e097d3d893a0de4ea2936acf192f770c65 +SHA1 (patch-ai) = 3962a3acac1d4537dbbe3fc3b205aba87387d485 SHA1 (patch-aj) = 620d921210b5c0efec0a84e33bc416e4ab4bd11c SHA1 (patch-al) = e5a5be44f997a450afef15e172acc771b4818ac9 SHA1 (patch-an) = 22ed9965aec5d540adb31334d8dd9e05eab8e0c2 diff --git a/print/ghostscript-gpl/patches/patch-ai b/print/ghostscript-gpl/patches/patch-ai index 0e335ee85ce..f6cd486ffd4 100644 --- a/print/ghostscript-gpl/patches/patch-ai +++ b/print/ghostscript-gpl/patches/patch-ai @@ -1,12 +1,26 @@ -$NetBSD: patch-ai,v 1.2 2014/04/26 13:51:40 wiz Exp $ +$NetBSD: patch-ai,v 1.3 2015/08/12 22:20:00 wiz Exp $ +chunk 1: +fix build with _FORTIFY_SOURCE=2; it seems the arguments sometimes +overlap. + +chunk 2: replace BSD/Linux specific "qd" printf format specifier by "lld", should fix build problem on Solaris reported by Joern Clausen per PR pkg/40664 ---- base/mkromfs.c.orig 2009-02-13 12:20:54.000000000 +0100 +--- base/mkromfs.c.orig 2012-08-08 08:01:36.000000000 +0000 +++ base/mkromfs.c -@@ -1033,7 +1033,7 @@ +@@ -1836,7 +1836,7 @@ ws(const byte *str, int len) + if (len >= LINE_SIZE) + exit(1); + +- memcpy(linebuf, str, len); ++ memmove(linebuf, str, len); + flush_line_buf(len); + } + +@@ -2178,7 +2178,7 @@ main(int argc, char *argv[]) #endif fprintf(out,"\n#include \"stdint_.h\"\n"); fprintf(out,"\n#include \"time_.h\"\n\n"); |