1 |
commit: 563462332a85910db21a6308523177ff9c80afc8 |
2 |
Author: Sebastian Pipping <sping <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Mar 31 15:33:26 2018 +0000 |
4 |
Commit: Sebastian Pipping <sping <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Mar 31 15:35:01 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=56346233 |
7 |
|
8 |
media-libs/giflib: Fix 5.1.4-r1 segfaults |
9 |
|
10 |
Bug: https://bugs.gentoo.org/651820 |
11 |
Package-Manager: Portage-2.3.26, Repoman-2.3.7 |
12 |
|
13 |
.../files/giflib-5.1.4-reallocarray-export.patch | 23 +++++++++++----------- |
14 |
...flib-5.1.4-r1.ebuild => giflib-5.1.4-r2.ebuild} | 0 |
15 |
2 files changed, 11 insertions(+), 12 deletions(-) |
16 |
|
17 |
diff --git a/media-libs/giflib/files/giflib-5.1.4-reallocarray-export.patch b/media-libs/giflib/files/giflib-5.1.4-reallocarray-export.patch |
18 |
index 08d4f3d3d4e..1c2a433c29c 100644 |
19 |
--- a/media-libs/giflib/files/giflib-5.1.4-reallocarray-export.patch |
20 |
+++ b/media-libs/giflib/files/giflib-5.1.4-reallocarray-export.patch |
21 |
@@ -1,4 +1,4 @@ |
22 |
-From 9805c76d4f76c77aad9f285e81f4090cdf661fac Mon Sep 17 00:00:00 2001 |
23 |
+From dfba2b34d35ddfd47233293f2f28978e8acfc87c Mon Sep 17 00:00:00 2001 |
24 |
From: Sebastian Pipping <sebastian@×××××××.org> |
25 |
Date: Wed, 14 Mar 2018 21:18:14 +0100 |
26 |
Subject: [PATCH] Address clash of export reallocarray with glibc |
27 |
@@ -6,8 +6,8 @@ MIME-Version: 1.0 |
28 |
Content-Type: text/plain; charset=UTF-8 |
29 |
Content-Transfer-Encoding: 8bit |
30 |
|
31 |
-.. by not exporting that internal symbol any more, |
32 |
-and renaming the function in code and where it's used |
33 |
+.. by renaming the exported symbol and the related |
34 |
+function in code and where it's used. |
35 |
|
36 |
Bug: https://bugs.gentoo.org/637438 |
37 |
|
38 |
@@ -21,10 +21,10 @@ Compile error was: |
39 |
extern void *reallocarray (void *__ptr, size_t __nmemb, size_t __size) |
40 |
--- |
41 |
lib/dgif_lib.c | 4 ++-- |
42 |
- lib/gif_lib.h | 3 --- |
43 |
+ lib/gif_lib.h | 2 +- |
44 |
lib/gifalloc.c | 10 +++++----- |
45 |
lib/openbsd-reallocarray.c | 2 +- |
46 |
- 4 files changed, 8 insertions(+), 11 deletions(-) |
47 |
+ 4 files changed, 9 insertions(+), 9 deletions(-) |
48 |
|
49 |
diff --git a/lib/dgif_lib.c b/lib/dgif_lib.c |
50 |
index 66a1d6a..f0e0385 100644 |
51 |
@@ -49,19 +49,18 @@ index 66a1d6a..f0e0385 100644 |
52 |
|
53 |
if (sp->RasterBits == NULL) { |
54 |
diff --git a/lib/gif_lib.h b/lib/gif_lib.h |
55 |
-index 078930c..7914a69 100644 |
56 |
+index 078930c..cefc3bb 100644 |
57 |
--- a/lib/gif_lib.h |
58 |
+++ b/lib/gif_lib.h |
59 |
-@@ -244,9 +244,6 @@ extern ColorMapObject *GifUnionColorMap(const ColorMapObject *ColorIn1, |
60 |
- GifPixelType ColorTransIn2[]); |
61 |
+@@ -245,7 +245,7 @@ extern ColorMapObject *GifUnionColorMap(const ColorMapObject *ColorIn1, |
62 |
extern int GifBitSize(int n); |
63 |
|
64 |
--extern void * |
65 |
+ extern void * |
66 |
-reallocarray(void *optr, size_t nmemb, size_t size); |
67 |
-- |
68 |
++openbsd_reallocarray(void *optr, size_t nmemb, size_t size); |
69 |
+ |
70 |
/****************************************************************************** |
71 |
Support for the in-core structures allocation (slurp mode). |
72 |
- ******************************************************************************/ |
73 |
diff --git a/lib/gifalloc.c b/lib/gifalloc.c |
74 |
index 3b51868..1394cfa 100644 |
75 |
--- a/lib/gifalloc.c |
76 |
@@ -125,5 +124,5 @@ index aa70686..b922b01 100644 |
77 |
if ((nmemb >= MUL_NO_OVERFLOW || size >= MUL_NO_OVERFLOW) && |
78 |
nmemb > 0 && SIZE_MAX / nmemb < size) { |
79 |
-- |
80 |
-2.16.2 |
81 |
+2.17.0.rc2 |
82 |
|
83 |
|
84 |
diff --git a/media-libs/giflib/giflib-5.1.4-r1.ebuild b/media-libs/giflib/giflib-5.1.4-r2.ebuild |
85 |
similarity index 100% |
86 |
rename from media-libs/giflib/giflib-5.1.4-r1.ebuild |
87 |
rename to media-libs/giflib/giflib-5.1.4-r2.ebuild |