[arch-commits] Commit in gd/trunk (PKGBUILD color_c_null_pointer.patch)

[Pierre Schmitz]

    Date: Sunday, February 8, 2015 @ 08:41:39
  Author: pierre
Revision: 231125

upgpkg: gd 2.1.1-1

Modified:
  gd/trunk/PKGBUILD
Deleted:
  gd/trunk/color_c_null_pointer.patch

----------------------------+
 PKGBUILD                   |   24 +++++++++---------------
 color_c_null_pointer.patch |   18 ------------------
 2 files changed, 9 insertions(+), 33 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-02-08 02:50:23 UTC (rev 231124)
+++ PKGBUILD	2015-02-08 07:41:39 UTC (rev 231125)
@@ -1,27 +1,21 @@
 # $Id$
 
 pkgname=gd
-pkgver=2.1.0
-pkgrel=3
+pkgver=2.1.1
+pkgrel=1
 pkgdesc="Library for the dynamic creation of images by programmers"
 arch=('i686' 'x86_64')
 url="http://www.libgd.org/"
 license=('custom')
 depends=('fontconfig' 'libvpx' 'libxpm' 'libtiff')
+makedepends=('git')
 optdepends=('perl: bdftogd script')
-source=("https://bitbucket.org/libgd/gd-libgd/downloads/libgd-${pkgver}.tar.xz"
-        'color_c_null_pointer.patch')
-md5sums=('03588159bf4faab9079849c8d709acc6'
-         '51f5ff073eabbd7809e0ce438d5bb1c2')
+source=("${pkgname}::git+https://github.com/libgd/libgd.git#tag=${pkgname}-${pkgver}")
+md5sums=('SKIP')
 
-prepare() {
-  cd libgd-${pkgver}
-  # CVE-2014-2497
-  patch -p1 -i ${srcdir}/color_c_null_pointer.patch
-}
-
 build() {
-  cd libgd-${pkgver}
+  cd ${pkgname}
+  ./bootstrap.sh
   ./configure \
     --prefix=/usr \
     --disable-rpath \
@@ -31,12 +25,12 @@
 }
 
 check() {
-  cd libgd-${pkgver}
+  cd ${pkgname}
   make check
 }
 
 package() {
-  cd libgd-${pkgver}
+  cd ${pkgname}
   make DESTDIR="${pkgdir}" install
   install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }

Deleted: color_c_null_pointer.patch
===================================================================
--- color_c_null_pointer.patch	2015-02-08 02:50:23 UTC (rev 231124)
+++ color_c_null_pointer.patch	2015-02-08 07:41:39 UTC (rev 231125)
@@ -1,18 +0,0 @@
-diff -up ./src/gdxpm.c.color_c_null_pointer ./src/gdxpm.c
---- ./src/gdxpm.c.color_c_null_pointer	2013-06-25 11:58:23.000000000 +0200
-+++ ./src/gdxpm.c	2014-07-16 16:43:44.000000000 +0200
-@@ -62,6 +62,13 @@ BGD_DECLARE(gdImagePtr) gdImageCreateFro
- 
- 	for(i = 0; i < number; i++) {
- 		char *c_color = image.colorTable[i].c_color;
-+		if (!c_color)
-+		{
-+			/* unsupported color key or color key not defined */
-+			gdImageDestroy(im);
-+			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);
-diff -up ./x.color_c_null_pointer ./x