aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSergey Lukin <sergej.lukin@gmail.com>2016-12-12 09:34:47 +0000
committerLeonardo Arena <rnalrd@alpinelinux.org>2016-12-26 14:47:53 +0000
commitf3be8e3c023e1ac815e945f2ba82fff4a23a864b (patch)
tree5f15dbc09ffc6e71f59bdf46ea753a05573d7f96
parenta3b99586de0a409186c869dc5612f94aedbc9021 (diff)
downloadaports-f3be8e3c023e1ac815e945f2ba82fff4a23a864b.tar.gz
aports-f3be8e3c023e1ac815e945f2ba82fff4a23a864b.tar.bz2
aports-f3be8e3c023e1ac815e945f2ba82fff4a23a864b.tar.xz
main/imagemagick: security upgrade to 6.9.6.8 - fixes #5750, #6103, #6326
-rw-r--r--main/imagemagick/APKBUILD35
1 files changed, 27 insertions, 8 deletions
diff --git a/main/imagemagick/APKBUILD b/main/imagemagick/APKBUILD
index 6782d55c32..70dbcd9219 100644
--- a/main/imagemagick/APKBUILD
+++ b/main/imagemagick/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Carlo Landmeter <clandmeter@gmail.com>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=imagemagick
-pkgver=6.9.3.10
+pkgver=6.9.6.8
_abiver=6
_pkgver=${pkgver%.*}-${pkgver##*.}
pkgrel=0
@@ -16,9 +16,28 @@ makedepends="zlib-dev libpng-dev libjpeg-turbo-dev freetype-dev fontconfig-dev
subpackages="$pkgname-doc $pkgname-dev $pkgname-c++:_cxx"
source="ftp://ftp.imagemagick.org/pub/ImageMagick/releases/ImageMagick-$_pkgver.tar.xz"
-_builddir="$srcdir/ImageMagick-${_pkgver}"
+builddir="$srcdir/ImageMagick-${_pkgver}"
+
+# secfixes:
+# 6.9.6.8-r0:
+# - CVE-2016-4562
+# - CVE-2016-4563
+# - CVE-2016-4564
+# - CVE-2016-5010
+# - CVE-2016-5118
+# - CVE-2016-5687
+# - CVE-2016-5688
+# - CVE-2016-5689
+# - CVE-2016-5690
+# - CVE-2016-5691
+# - CVE-2016-5841
+# - CVE-2016-5842
+# - CVE-2016-6491
+# - CVE-2016-7799
+# - CVE-2016-7906
+
prepare() {
- cd "$_builddir"
+ cd "$builddir"
for i in $source; do
case $i in
*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
@@ -27,7 +46,7 @@ prepare() {
}
build() {
- cd "$_builddir"
+ cd "$builddir"
# fix doc dir, Gentoo bug 91911
sed -i -e \
's:DOCUMENTATION_PATH="${DATA_DIR}/doc/${DOCUMENTATION_RELATIVE_PATH}":DOCUMENTATION_PATH="/usr/share/doc/imagemagick":g' \
@@ -53,7 +72,7 @@ build() {
}
package() {
- cd "$_builddir"
+ cd "$builddir"
make -j1 DESTDIR="$pkgdir" install || return 1
if ! [ -e "$pkgdir"/usr/lib/libMagickCore-$_abiver.Q16.so ]; then
error "Has ABI verision changed? (current is $_abiver)"
@@ -72,6 +91,6 @@ _cxx() {
mv "$pkgdir"/usr/lib/libMagick++*.so.* "$subpkgdir"/usr/lib/
}
-md5sums="04f7793916dfe99c4ee0b4e453392119 ImageMagick-6.9.3-10.tar.xz"
-sha256sums="e33f021c879f31703f9e620f578ccf7d221a34941589da4bbe967b16a814336a ImageMagick-6.9.3-10.tar.xz"
-sha512sums="d448c1ffa2327d2690c783edc3089d3450f5f8acaa517dfec167d78834e23ea8d231acda8a5f2c05d98110effaa5647f4b5cdcc4fc464a8ea8703603908c8708 ImageMagick-6.9.3-10.tar.xz"
+md5sums="c3691635779f9658506d5e8da0f6b5c5 ImageMagick-6.9.6-8.tar.xz"
+sha256sums="39bb2b18183454bd5e0ec6b975e648d08064e44f3ac1b945c9005706e9af3f5d ImageMagick-6.9.6-8.tar.xz"
+sha512sums="d3307b0a167f33538b202aec24122a550be18ac7423352088005695cb43661c04fd76d0e4c1fb101a77f552f852ece5b898daf12df27d43a387da1c73cbdc342 ImageMagick-6.9.6-8.tar.xz"