summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorRodrigo Bezerra2018-11-13 09:06:37 -0300
committerRodrigo Bezerra2018-11-13 09:06:37 -0300
commitd398e8771d5d8674689fe9298778558c24ff4275 (patch)
tree9b36d97108e267866420ab36dd3c84e7a799bfa5
parentaa5f1a8376bf65a396ebc4675efa92c728df0416 (diff)
downloadaur-d398e8771d5d8674689fe9298778558c24ff4275.tar.gz
Update to version 7.0.8.14
-rw-r--r--.SRCINFO10
-rw-r--r--IM7-GS-policy.patch10
-rw-r--r--PKGBUILD14
3 files changed, 25 insertions, 9 deletions
diff --git a/.SRCINFO b/.SRCINFO
index bd363bbd48fa..5a0e6b2cb32b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = lib32-imagemagick
pkgdesc = An image viewing/manipulation program (32-bit)
- pkgver = 7.0.8.12
+ pkgver = 7.0.8.14
pkgrel = 1
url = https://www.imagemagick.org/
arch = x86_64
@@ -24,13 +24,15 @@ pkgbase = lib32-imagemagick
depends = lib32-openexr
depends = lib32-openjpeg2
depends = imagemagick
- source = https://www.imagemagick.org/download/releases/ImageMagick-7.0.8-12.tar.xz
- source = https://www.imagemagick.org/download/releases/ImageMagick-7.0.8-12.tar.xz.asc
+ source = https://www.imagemagick.org/download/releases/ImageMagick-7.0.8-14.tar.xz
+ source = https://www.imagemagick.org/download/releases/ImageMagick-7.0.8-14.tar.xz.asc
source = arch-fonts.diff
+ source = IM7-GS-policy.patch
validpgpkeys = D8272EF51DA223E4D05B466989AB63D48277377A
- sha256sums = 48df5877fe85603940310fe5c811a89af416882b60379918a95dcd4de6582b55
+ sha256sums = 70c3d8c800cfd0282c0e0d9930b83f472f9593a882adc77532aa82c0d7ca0bb1
sha256sums = SKIP
sha256sums = a85b744c61b1b563743ecb7c7adad999d7ed9a8af816650e3ab9321b2b102e73
+ sha256sums = f20c09860da65a4259ec9627ceeca7d993949b7460fa199c5ffd874633814cf6
pkgname = lib32-imagemagick
diff --git a/IM7-GS-policy.patch b/IM7-GS-policy.patch
new file mode 100644
index 000000000000..fb371bdcbe29
--- /dev/null
+++ b/IM7-GS-policy.patch
@@ -0,0 +1,10 @@
+--- ImageMagick-7.0.8-13/config/policy.xml.orig 2018-10-22 15:13:51.713995553 +0000
++++ ImageMagick-7.0.8-13/config/policy.xml 2018-10-22 15:14:22.650737457 +0000
+@@ -68,6 +68,7 @@
+ <!-- <policy domain="resource" name="throttle" value="0"/> -->
+ <!-- <policy domain="resource" name="time" value="3600"/> -->
+ <!-- <policy domain="coder" rights="none" pattern="MVG" /> -->
++ <policy domain="coder" rights="none" pattern="{PS,PS2,PS3,EPS,PDF,XPS}" />
+ <!-- <policy domain="module" rights="none" pattern="{PS,PDF,XPS}" /> -->
+ <!-- <policy domain="delegate" rights="none" pattern="HTTPS" /> -->
+ <!-- <policy domain="path" rights="none" pattern="@*" /> -->
diff --git a/PKGBUILD b/PKGBUILD
index 40c55922571d..c3b151440f57 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
_basename=imagemagick
pkgname=lib32-imagemagick
-pkgver=7.0.8.12
+pkgver=7.0.8.14
pkgrel=1
pkgdesc="An image viewing/manipulation program (32-bit)"
url="https://www.imagemagick.org/"
@@ -16,10 +16,11 @@ checkdepends=(ttf-dejavu)
_relname=ImageMagick-${pkgver%%.*}
_tarname=ImageMagick-${pkgver%.*}-${pkgver##*.}
source=(https://www.imagemagick.org/download/releases/$_tarname.tar.xz{,.asc}
- arch-fonts.diff)
-sha256sums=('48df5877fe85603940310fe5c811a89af416882b60379918a95dcd4de6582b55'
+ arch-fonts.diff IM7-GS-policy.patch)
+sha256sums=('70c3d8c800cfd0282c0e0d9930b83f472f9593a882adc77532aa82c0d7ca0bb1'
'SKIP'
- 'a85b744c61b1b563743ecb7c7adad999d7ed9a8af816650e3ab9321b2b102e73')
+ 'a85b744c61b1b563743ecb7c7adad999d7ed9a8af816650e3ab9321b2b102e73'
+ 'f20c09860da65a4259ec9627ceeca7d993949b7460fa199c5ffd874633814cf6')
validpgpkeys=(D8272EF51DA223E4D05B466989AB63D48277377A) # Lexie Parsimoniae
shopt -s extglob
@@ -28,7 +29,10 @@ prepare() {
cd $_tarname
# Fix up typemaps to match our packages, where possible
- patch -Np1 -i ../arch-fonts.diff
+ patch -p1 -i ../arch-fonts.diff
+
+ # Work around ghostscript security issues https://bugs.archlinux.org/task/59778
+ patch -p1 -i ../IM7-GS-policy.patch
}
build() {