aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJ0WI <J0WI@users.noreply.github.com>2021-11-23 14:18:30 +0100
committerLeo <thinkabit.ukim@gmail.com>2021-11-23 19:23:13 +0000
commite8e6caf78cb4f48b90286a35399956161cd57ecd (patch)
tree7323ae8fd204f1975ab705fa9735e05ebe35f900
parent96f8be599e7c65d4cacef898cc329890a674b90e (diff)
downloadaports-e8e6caf78cb4f48b90286a35399956161cd57ecd.tar.gz
aports-e8e6caf78cb4f48b90286a35399956161cd57ecd.tar.bz2
aports-e8e6caf78cb4f48b90286a35399956161cd57ecd.tar.xz
community/imagemagick: upgrade to 7.1.0.16
Co-Authored-By: Hello71 <alex_y_xu@yahoo.ca>
-rw-r--r--community/imagemagick/APKBUILD15
-rw-r--r--community/imagemagick/disable-avaraging-tests.patch26
2 files changed, 8 insertions, 33 deletions
diff --git a/community/imagemagick/APKBUILD b/community/imagemagick/APKBUILD
index 7ae850f839..052e1d406d 100644
--- a/community/imagemagick/APKBUILD
+++ b/community/imagemagick/APKBUILD
@@ -3,8 +3,8 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=imagemagick
_pkgname=ImageMagick
-pkgver=7.1.0.10
-pkgrel=1
+pkgver=7.1.0.16
+pkgrel=0
_pkgver=${pkgver%.*}-${pkgver##*.}
_abiver=7
pkgdesc="Collection of tools and libraries for many image formats"
@@ -47,12 +47,14 @@ subpackages="
$pkgname-perlmagick:_perlmagick
$pkgname-perlmagick-doc:_perlmagick_doc
"
-source="https://download.imagemagick.org/ImageMagick/download/ImageMagick-$_pkgver.tar.xz
- disable-avaraging-tests.patch
- "
+source="https://download.imagemagick.org/ImageMagick/download/releases/ImageMagick-$_pkgver.tar.xz"
builddir="$srcdir/$_pkgname-$_pkgver"
# secfixes:
+# 7.1.0.10-r0:
+# - CVE-2021-39212
+# 7.1.0.0-r0:
+# - CVE-2021-34183
# 7.0.11.1-r0:
# - CVE-2021-20241
# - CVE-2021-20243
@@ -208,6 +210,5 @@ _perlmagick_doc() {
}
sha512sums="
-72ef704460473af9c8fbd0d49cb264fc23eaaf24ce3e319916e7f23ad715d45f44f4ecebc02b9edba55a584b59c407f0a777fa9add2e49f7c69341bcac169c4b ImageMagick-7.1.0-10.tar.xz
-58afb2da075a6208b6a990ff297b3a827d260687c3355198a8b4d987e1596c0b0cd78aff6f0be0e1896e537fbe44a3d467473183f5f149664ea6e6fb3d3291a9 disable-avaraging-tests.patch
+6894e51ea96b49cd7aafb91d1e05b02f802bccc79121a6b6e65d2122cf97a27cd26bba393edb0b8d4c354ca95c2db0986257fd0d08756067dddb51240a346e2d ImageMagick-7.1.0-16.tar.xz
"
diff --git a/community/imagemagick/disable-avaraging-tests.patch b/community/imagemagick/disable-avaraging-tests.patch
deleted file mode 100644
index 8e715f81e6..0000000000
--- a/community/imagemagick/disable-avaraging-tests.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-The avaraging tests seems to be flaky due to rounding errors. Test fails on
-x86 and s390x
-
-https://github.com/ImageMagick/ImageMagick/issues/1576#issuecomment-494595404
-
-diff --git a/Magick++/tests/tests.tap b/Magick++/tests/tests.tap
-index b5c15ff..bb83980 100755
---- a/Magick++/tests/tests.tap
-+++ b/Magick++/tests/tests.tap
-@@ -8,14 +8,14 @@
- #
- subdir=Magick++/tests
- . ./common.shi
--echo "1..13"
-+echo "1..12"
-
- SRCDIR=${top_srcdir}/${subdir}/
- export SRCDIR
-
- cd ${subdir} || exit 1
-
--for mytest in appendImages attributes averageImages coalesceImages coderInfo color colorHistogram exceptions geometry montageImages morphImages readWriteBlob readWriteImages
-+for mytest in appendImages attributes coalesceImages coderInfo color colorHistogram exceptions geometry montageImages morphImages readWriteBlob readWriteImages
- do
- ./${mytest} && echo "ok" || echo "not ok"
- done