diff options
| -rw-r--r-- | .SRCINFO | 16 | ||||
| -rw-r--r-- | IM7-GS-policy.patch | 10 | ||||
| -rw-r--r-- | PKGBUILD | 46 | ||||
| -rw-r--r-- | imagemagick-underlink.patch | 13 | ||||
| -rw-r--r-- | perlmagick.rpath.patch | 11 |
5 files changed, 30 insertions, 66 deletions
@@ -1,6 +1,6 @@ pkgbase = imagemagick-fftw pkgdesc = An image viewing/manipulation program - pkgver = 7.0.8.45 + pkgver = 7.1.1.10 pkgrel = 1 url = https://www.imagemagick.org/ arch = x86_64 @@ -16,6 +16,7 @@ pkgbase = imagemagick-fftw makedepends = libraw makedepends = opencl-headers makedepends = libwebp + makedepends = libzip makedepends = chrpath makedepends = ocl-icd makedepends = glu @@ -28,16 +29,13 @@ pkgbase = imagemagick-fftw makedepends = liblqr makedepends = libraqm makedepends = libpng + makedepends = djvulibre makedepends = fftw - source = https://www.imagemagick.org/download/releases/ImageMagick-7.0.8-45.tar.xz - source = https://www.imagemagick.org/download/releases/ImageMagick-7.0.8-45.tar.xz.asc + source = https://github.com/ImageMagick/ImageMagick/archive/refs/tags/7.1.1-10.tar.gz source = arch-fonts.diff - source = IM7-GS-policy.patch validpgpkeys = D8272EF51DA223E4D05B466989AB63D48277377A - sha256sums = d892b41a08b24baa058bc59cee2dd329584525446e03a414bc250b93a2f2fc79 - sha256sums = SKIP + sha256sums = 5008d827a78b56d436f532e6b6f7b6d4a69aa59342ce3dae00383f4686718c89 sha256sums = a85b744c61b1b563743ecb7c7adad999d7ed9a8af816650e3ab9321b2b102e73 - sha256sums = f20c09860da65a4259ec9627ceeca7d993949b7460fa199c5ffd874633814cf6 pkgname = imagemagick-fftw depends = libltdl @@ -58,11 +56,12 @@ pkgname = imagemagick-fftw optdepends = ocl-icd: OpenCL support optdepends = openexr: OpenEXR support optdepends = openjpeg2: JPEG2000 support + optdepends = djvulibre: DJVU support optdepends = pango: Text rendering optdepends = imagemagick-doc: manual and API docs provides = libmagick provides = libmagick-fftw - provides = imagemagick=7.0.8.45 + provides = imagemagick=7.1.1.10 conflicts = imagemagick6 conflicts = imagemagick replaces = libmagick-fftw @@ -78,4 +77,3 @@ pkgname = imagemagick-fftw backup = etc/ImageMagick-7/type.xml backup = etc/ImageMagick-7/type-dejavu.xml backup = etc/ImageMagick-7/type-ghostscript.xml - diff --git a/IM7-GS-policy.patch b/IM7-GS-policy.patch deleted file mode 100644 index fb371bdcbe29..000000000000 --- a/IM7-GS-policy.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- 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="@*" /> --> @@ -1,25 +1,24 @@ -# Maintainer: Antonio Rojas <arojas@archlinux.org> +# Maintainer: Isabella Basso do Amaral <isabbasso at riseup dot net> # Contributor: Eric Bélanger <eric@archlinux.org> pkgbase=imagemagick-fftw pkgname=(imagemagick-fftw) -pkgver=7.0.8.45 +pkgver=7.1.1.10 pkgrel=1 -pkgdesc="An image viewing/manipulation program" -url="https://www.imagemagick.org/" +pkgdesc='An image viewing/manipulation program' +url='https://www.imagemagick.org/' arch=(x86_64) license=(custom) -makedepends=(ghostscript openexr libwmf librsvg libxml2 openjpeg2 libraw opencl-headers libwebp - chrpath ocl-icd glu ghostpcl ghostxps libheif jbigkit lcms2 libxext liblqr libraqm libpng 'fftw') +makedepends=(ghostscript openexr libwmf librsvg libxml2 openjpeg2 libraw opencl-headers libwebp libzip + chrpath ocl-icd glu ghostpcl ghostxps libheif jbigkit lcms2 libxext liblqr libraqm libpng djvulibre 'fftw') checkdepends=(gsfonts ttf-dejavu) _relname=ImageMagick-${pkgver%%.*} -_tarname=ImageMagick-${pkgver%.*}-${pkgver##*.} -source=(https://www.imagemagick.org/download/releases/$_tarname.tar.xz{,.asc} - arch-fonts.diff IM7-GS-policy.patch) -sha256sums=('d892b41a08b24baa058bc59cee2dd329584525446e03a414bc250b93a2f2fc79' - 'SKIP' - 'a85b744c61b1b563743ecb7c7adad999d7ed9a8af816650e3ab9321b2b102e73' - 'f20c09860da65a4259ec9627ceeca7d993949b7460fa199c5ffd874633814cf6') +_tarname=${pkgver%.*}-${pkgver##*.} +_dirname=ImageMagick-$_tarname +source=(${pkgname}-${pkgver}.tar.gz::https://github.com/ImageMagick/ImageMagick/archive/refs/tags/$_tarname.tar.gz + arch-fonts.diff) +sha256sums=('5008d827a78b56d436f532e6b6f7b6d4a69aa59342ce3dae00383f4686718c89' + 'a85b744c61b1b563743ecb7c7adad999d7ed9a8af816650e3ab9321b2b102e73') validpgpkeys=(D8272EF51DA223E4D05B466989AB63D48277377A) # Lexie Parsimoniae shopt -s extglob @@ -27,20 +26,18 @@ shopt -s extglob prepare() { mkdir -p docpkg/usr/share - cd $_tarname + cd $_dirname # Fix up typemaps to match our packages, where possible 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() { - cd $_tarname + cd $_dirname ./configure \ --prefix=/usr \ --sysconfdir=/etc \ + --enable-shared \ --with-dejavu-font-dir=/usr/share/fonts/TTF \ --with-gs-font-dir=/usr/share/fonts/gsfonts \ PSDelegate=/usr/bin/gs \ @@ -48,7 +45,8 @@ build() { PCLDelegate=/usr/bin/gpcl6 \ --enable-hdri \ --enable-opencl \ - --with-gslib \ + --without-gslib \ + --with-djvu \ --with-lqr \ --with-modules \ --with-openexr \ @@ -60,7 +58,6 @@ build() { --with-wmf \ --with-xml \ --without-autotrace \ - --without-djvu \ --without-dps \ --with-fftw \ --without-fpx \ @@ -71,9 +68,8 @@ build() { } check() ( - cd $_tarname + cd $_dirname ulimit -n 4096 - sed -e '/validate-formats/d' -i Makefile # these fail due to the security patch make check ) @@ -89,6 +85,7 @@ package_imagemagick-fftw() { 'ocl-icd: OpenCL support' 'openexr: OpenEXR support' 'openjpeg2: JPEG2000 support' + 'djvulibre: DJVU support' 'pango: Text rendering' 'imagemagick-doc: manual and API docs') options=(!emptydirs libtool) @@ -97,7 +94,7 @@ package_imagemagick-fftw() { provides=(libmagick libmagick-fftw imagemagick=$pkgver) replaces=(libmagick-fftw) - cd $_tarname + cd $_dirname make DESTDIR="$pkgdir" install find "$pkgdir/usr/lib/perl5" -name '*.so' -exec chrpath -d {} + @@ -108,5 +105,8 @@ package_imagemagick-fftw() { # Split docs mv "$pkgdir/usr/share/doc" "$srcdir/docpkg/usr/share/" + +# Harden security policy https://bugs.archlinux.org/task/62785 + sed -e '/<\/policymap>/i \ \ <policy domain="delegate" rights="none" pattern="gs" \/>' -i "$pkgdir"/etc/ImageMagick-7/policy.xml } diff --git a/imagemagick-underlink.patch b/imagemagick-underlink.patch deleted file mode 100644 index be732ac34d36..000000000000 --- a/imagemagick-underlink.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/coders/Makefile.am b/coders/Makefile.am -index e39ed031f..689728353 100644 ---- a/coders/Makefile.am -+++ b/coders/Makefile.am -@@ -469,7 +469,7 @@ coders_djvu_la_LIBADD = $(MAGICKCORE_LIBS) $(DJVU_LIBS) $(JPEG_LIBS) $(LZMA - coders_dng_la_SOURCES = coders/dng.c - coders_dng_la_CPPFLAGS = $(MAGICK_CODER_CPPFLAGS) - coders_dng_la_LDFLAGS = $(MODULECOMMONFLAGS) --coders_dng_la_LIBADD = $(MAGICKCORE_LIBS) $(RAW_LIBS) -+coders_dng_la_LIBADD = $(MAGICKCORE_LIBS) $(RAW_R_LIBS) - - # DPS coder module - coders_dps_la_SOURCES = coders/dps.c diff --git a/perlmagick.rpath.patch b/perlmagick.rpath.patch deleted file mode 100644 index a5b1a82e23d2..000000000000 --- a/perlmagick.rpath.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- Makefile.in.orig 2013-02-21 03:26:56.785156600 -0500 -+++ Makefile.in 2013-02-21 03:39:03.102411457 -0500 -@@ -10469,6 +10469,8 @@ - - @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@$(PERLMAKEFILE): perl-sources $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS) $(PERLMAKEMAKER) - @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@ cd $(PERLMAGICK) && @PERL@ Makefile.PL $(PERL_MAKE_OPTIONS) -+@WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@ cd $(PERLMAGICK) && @SED@ -i 's|LD_RUN_PATH|DIE_LD_RUN_PATH_DIE|g' Makefile -+@WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@ cd $(PERLMAGICK) && @SED@ -i 's|LD_RUN_PATH|DIE_LD_RUN_PATH_DIE|g' quantum/Makefile - - @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@install-exec-perl: $(PERLMAKEFILE) - @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@ ( cd $(PERLMAGICK) && $(MAKE) CC='@CC@' && \ |