X-Original-To: alpine-aports@lists.alpinelinux.org Received: from mail.infogroup.kiev.ua (tera.infogroup.kiev.ua [195.144.25.26]) by lists.alpinelinux.org (Postfix) with ESMTP id A08765C43A5 for ; Fri, 24 Feb 2017 11:23:46 +0000 (GMT) Received: from ost.org.ua ([195.144.25.230] helo=alpine.ost.org.ua) by mail.infogroup.kiev.ua with esmtpsa (TLSv1:DHE-RSA-AES256-SHA:256) (Exim 4.80.1) (envelope-from ) id 1chDyT-0006X2-Is for alpine-aports@lists.alpinelinux.org; Fri, 24 Feb 2017 13:23:45 +0200 From: Valery Kartel To: alpine-aports@lists.alpinelinux.org Subject: [alpine-aports] [PATCH v3] main/gd: upgrade to 2.2.4 Date: Fri, 24 Feb 2017 13:23:36 +0200 Message-Id: <20170224112336.30791-1-valery.kartel@gmail.com> X-Mailer: git-send-email 2.11.1 Sender: droid@infogroup.kiev.ua X-Mailinglist: alpine-aports Precedence: list List-Id: Alpine Development List-Unsubscribe: List-Post: List-Help: List-Subscribe: --- v1 -> v2: stay contents of 'gd' as is. libraries moved to libgd perl-based font converter moved to -dev v2 -> v3: add webp and xpm support (need for php-gd) --- main/gd/APKBUILD | 34 +++++++++++++++------------------- 1 file changed, 15 insertions(+), 19 deletions(-) diff --git a/main/gd/APKBUILD b/main/gd/APKBUILD index 978e2ad50c..3f4cf33e13 100644 --- a/main/gd/APKBUILD +++ b/main/gd/APKBUILD @@ -1,21 +1,19 @@ # Contributor: Carlo Landmeter # Maintainer: Carlo Landmeter pkgname=gd -pkgver=2.2.3 -_myver=${pkgver/_rc/RC} -pkgrel=1 +pkgver=2.2.4 +pkgrel=0 +_pkgreal=lib$pkgname pkgdesc="Library for the dynamic creation of images by programmers" url="http://libgd.github.io/" arch="all" license="custom" depends= -makedepends="libpng-dev libjpeg-turbo-dev freetype-dev zlib-dev" -subpackages="$pkgname-dev" -source="https://github.com/libgd/libgd/releases/download/gd-$pkgver/libgd-$pkgver.tar.xz - CVE-2016-7568.patch - " - -builddir="$srcdir"/lib$pkgname-$_myver +makedepends="libpng-dev libjpeg-turbo-dev libwebp-dev libxpm-dev freetype-dev zlib-dev" +subpackages="$pkgname-dev $_pkgreal:libs" +source="https://github.com/$_pkgreal/$_pkgreal/releases/download/$pkgname-$pkgver/$_pkgreal-$pkgver.tar.xz + CVE-2016-7568.patch" +builddir="$srcdir/$_pkgreal-$pkgver" build() { cd "$builddir" @@ -26,10 +24,6 @@ build() { --sysconfdir=/etc \ --mandir=/usr/share/man \ --infodir=/usr/share/info \ - --with-png \ - --with-freetype \ - --with-jpeg \ - --without-xpm \ --without-fontconfig \ --disable-werror \ || return 1 @@ -41,9 +35,11 @@ package() { make DESTDIR="$pkgdir" install || return 1 } -md5sums="14e4134c129b4c166c3a0549a32ef340 libgd-2.2.3.tar.xz -fca9871b791d6ac88af7d6d5ce8c59d1 CVE-2016-7568.patch" -sha256sums="746b6cbd6769a22ff3ba6f5756f3512a769bd4cdf4695dff17f4867f25fa7d3c libgd-2.2.3.tar.xz -0b7b7ddfc5200220763efb47cc6b56a6275fd5af70e85a8c91c667344f664012 CVE-2016-7568.patch" -sha512sums="bdc6d086bc054beda6574ec46baa4cd94048a5f2f357f875ba05983e92d247f1b731434b9e438c6aef09d46fa96f1a7e1f330a25a77ffd2dd78aa8a32d652557 libgd-2.2.3.tar.xz +dev() { + default_dev || return 1 + depends="$pkgname perl" + mv "$pkgdir"/usr/bin/bdftogd "$subpkgdir"/usr/bin +} + +sha512sums="07903f322c4f6ab392508b0f60c38ca133699111ea92995dc6cd9379210d598bcb24a46c19657884d9e252f8663d0ee8c89c600e3a382a5ae598198c190f39b5 libgd-2.2.4.tar.xz 8310d11a2398e8617c9defc4500b9ce3897ac1026002ffa36000f1d1f8df19336005e8c1f6587533f1d787a4a54d7a3a28ad25bddbc966a018aedf4d8704a716 CVE-2016-7568.patch" -- 2.11.1 --- Unsubscribe: alpine-aports+unsubscribe@lists.alpinelinux.org Help: alpine-aports+help@lists.alpinelinux.org ---