Accepting request 288184 from home:pluskalm:branches:graphics
- Cleanup spec file with spec-cleaner - No longer needed patches * gd-2.1.0-CVE-2014-2497.patch * gd-autoconf.patch - Update to 2.1.1 * changelog provided only as commit log (see Changelog) * fix for CVE-2014-2497 OBS-URL: https://build.opensuse.org/request/show/288184 OBS-URL: https://build.opensuse.org/package/show/graphics/gd?expand=0&rev=19
This commit is contained in:
Ismail Dönmez
Git OBS Bridge
parent
bb7b673b1d
commit
8024297b51
@ -1,23 +0,0 @@
|
||||
Description: Patch to fix PHP bug 66901.
|
||||
Author: Andres Mejia <mejiaa@amazon.com>
|
||||
Forwarded: no
|
||||
|
||||
Index: src/gdxpm.c
|
||||
===================================================================
|
||||
--- src/gdxpm.c.orig 2014-04-04 12:56:02.570160501 +0200
|
||||
+++ src/gdxpm.c 2014-04-04 13:01:24.031976322 +0200
|
||||
@@ -62,6 +62,14 @@
|
||||
|
||||
for(i = 0; i < number; i++) {
|
||||
char *c_color = image.colorTable[i].c_color;
|
||||
+ if (!image.colorTable[i].c_color)
|
||||
+ {
|
||||
+ /* unsupported color key or color key not defined */
|
||||
+ gdImageDestroy(im);
|
||||
+ gdFree(colors);
|
||||
+ im = 0;
|
||||
+ goto done;
|
||||
+ }
|
||||
if(strcmp(c_color, "None") == 0) {
|
||||
colors[i] = gdImageGetTransparent(im);
|
||||
if(colors[i] == -1) colors[i] = gdImageColorAllocate(im, 0, 0, 0);
|
||||
@ -1,8 +1,8 @@
|
||||
Index: src/fontwheeltest.c
|
||||
===================================================================
|
||||
--- src/fontwheeltest.c.orig 2013-12-18 11:49:47.041577398 +0100
|
||||
+++ src/fontwheeltest.c 2013-12-18 11:53:52.575496376 +0100
|
||||
@@ -32,6 +32,8 @@
|
||||
--- src/fontwheeltest.c.orig
|
||||
+++ src/fontwheeltest.c
|
||||
@@ -32,6 +32,8 @@ dowheel (gdImagePtr im, int color, char
|
||||
doerr (err, "------------------------------------------");
|
||||
|
||||
for (curang = 0.0; curang < 360.0; curang += angle) {
|
||||
@ -11,7 +11,7 @@ Index: src/fontwheeltest.c
|
||||
curangrads = DEGTORAD(curang);
|
||||
x0 = x + cos (curangrads) * offset;
|
||||
y0 = y - sin (curangrads) * offset;
|
||||
@@ -47,7 +49,15 @@
|
||||
@@ -47,7 +49,15 @@ dowheel (gdImagePtr im, int color, char
|
||||
if (cp)
|
||||
doerr (err, cp);
|
||||
|
||||
|
||||
@ -1,27 +0,0 @@
|
||||
---
|
||||
configure.ac | 5 ++++-
|
||||
1 file changed, 4 insertions(+), 1 deletion(-)
|
||||
|
||||
Index: libgd-2.1.0/configure.ac
|
||||
===================================================================
|
||||
--- libgd-2.1.0.orig/configure.ac
|
||||
+++ libgd-2.1.0/configure.ac
|
||||
@@ -45,7 +45,7 @@ AC_SUBST(GDLIB_AGE)
|
||||
FEATURES="GD_GIF GD_GIFANIM GD_OPENPOLYGON"
|
||||
AC_SUBST(FEATURES)
|
||||
|
||||
-AM_INIT_AUTOMAKE([foreign dist-bzip2 dist-xz -Wall -Werror])
|
||||
+AM_INIT_AUTOMAKE([foreign dist-bzip2 dist-xz -Wall])
|
||||
AC_CONFIG_HEADERS([src/config.h:src/config.hin])
|
||||
|
||||
dnl newer automake wants this, but we still want to work with older
|
||||
@@ -53,6 +53,9 @@ m4_ifndef([AM_PROG_AR],[m4_define([AM_PR
|
||||
AM_PROG_AR
|
||||
|
||||
AC_PROG_CC_STDC
|
||||
+AC_USE_SYSTEM_EXTENSIONS
|
||||
+AC_SYS_LARGEFILE
|
||||
+
|
||||
AM_PROG_CC_C_O
|
||||
AC_PROG_INSTALL
|
||||
AC_PROG_LIBTOOL
|
||||
11
gd.changes
11
gd.changes
@ -1,3 +1,14 @@
|
||||
-------------------------------------------------------------------
|
||||
Sat Feb 28 08:44:08 UTC 2015 - mpluskal@suse.com
|
||||
|
||||
- Cleanup spec file with spec-cleaner
|
||||
- No longer needed patches
|
||||
* gd-2.1.0-CVE-2014-2497.patch
|
||||
* gd-autoconf.patch
|
||||
- Update to 2.1.1
|
||||
* changelog provided only as commit log (see Changelog)
|
||||
* fix for CVE-2014-2497
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Aug 26 05:58:53 UTC 2014 - jengelh@inai.de
|
||||
|
||||
|
||||
9
gd.spec
9
gd.spec
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package gd
|
||||
#
|
||||
# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
# Copyright (c) 2015 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
|
||||
@ -21,7 +21,7 @@
|
||||
%define lname libgd3
|
||||
|
||||
Name: gd
|
||||
Version: 2.1.0
|
||||
Version: 2.1.1
|
||||
Release: 0
|
||||
Summary: A Drawing Library for Programs That Use PNG and JPEG Output
|
||||
License: MIT
|
||||
@ -37,9 +37,6 @@ Patch1: gd-fontpath.patch
|
||||
Patch2: gd-format.patch
|
||||
# could be upstreamed
|
||||
Patch3: gd-aliasing.patch
|
||||
# could be upstreamed?
|
||||
Patch4: gd-autoconf.patch
|
||||
Patch5: gd-2.1.0-CVE-2014-2497.patch
|
||||
BuildRequires: fontconfig-devel
|
||||
BuildRequires: freetype2-devel
|
||||
BuildRequires: libjpeg-devel
|
||||
@ -95,8 +92,6 @@ the formats accepted for inline images by most browsers.
|
||||
%patch1
|
||||
%patch2
|
||||
%patch3
|
||||
%patch4 -p1
|
||||
%patch5
|
||||
|
||||
%build
|
||||
autoreconf -fiv
|
||||
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:fa6665dfe3d898019671293c84d77067a3d2ede50884dbcb6df899d508370e5a
|
||||
size 2004304
|
||||
3
libgd-2.1.1.tar.xz
Normal file
3
libgd-2.1.1.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:9ada1ed45594abc998ebc942cef12b032fbad672e73efc22bc9ff54f5df2b285
|
||||
size 2039132
|
||||
Loading…
x
Reference in New Issue
Block a user