From 4bb66aded2d538dc75dc8060cdb8175e45a0b4b9 Mon Sep 17 00:00:00 2001 From: thomas Date: Thu, 23 Aug 2018 17:31:57 +0200 Subject: [PATCH 1/3] imagemagick: be0 conversion Their naming scheme needs a little kick, thus the p to '-' substitution (6.9.10p10 -> 6.9.10-10) --- imagemagick-6.9.4_p4-0.bee => imagemagick.be0 | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) rename imagemagick-6.9.4_p4-0.bee => imagemagick.be0 (50%) diff --git a/imagemagick-6.9.4_p4-0.bee b/imagemagick.be0 similarity index 50% rename from imagemagick-6.9.4_p4-0.bee rename to imagemagick.be0 index b274a3ed2..491c853d1 100755 --- a/imagemagick-6.9.4_p4-0.bee +++ b/imagemagick.be0 @@ -1,6 +1,9 @@ #!/bin/env beesh -SRCURL[0]="ftp://ftp.imagemagick.org/pub/ImageMagick/releases/ImageMagick-6.9.4-4.tar.xz" +# BEE_VERSION imagemagick-6.9.10p10-0 + +XPKGVERSION=$(echo ${PKGVERSION} | sed -e 's/p/-/') +SRCURL[0]="https://github.com/ImageMagick/ImageMagick6/archive/${XPKGVERSION}.tar.gz imagemagick-${XPKGVERSION}.tar.gz" PATCHURL[0]="" @@ -17,7 +20,7 @@ mee_patch() { } mee_configure() { - bee_configure + bee_configure } mee_build() { From a7f7da912c6778071ed7abacc46967c146ea77a5 Mon Sep 17 00:00:00 2001 From: thomas Date: Thu, 23 Aug 2018 17:33:59 +0200 Subject: [PATCH 2/3] imagemagick: little cleanup --- imagemagick.be0 | 7 ------- 1 file changed, 7 deletions(-) diff --git a/imagemagick.be0 b/imagemagick.be0 index 491c853d1..0345396f2 100755 --- a/imagemagick.be0 +++ b/imagemagick.be0 @@ -7,12 +7,6 @@ SRCURL[0]="https://github.com/ImageMagick/ImageMagick6/archive/${XPKGVERSION}.ta PATCHURL[0]="" -PGRP=( uncategorized ) - - - -# BEE_CONFIGURE=compat - EXCLUDE="^/usr/share/doc" mee_patch() { @@ -29,5 +23,4 @@ mee_build() { mee_install() { bee_install - } From cb12eb0b3cdc8529b5f3c733af10ec2d3bee482a Mon Sep 17 00:00:00 2001 From: thomas Date: Thu, 23 Aug 2018 18:26:58 +0200 Subject: [PATCH 3/3] imagemagick: Prevent GhostScript processing See: https://www.theregister.co.uk/2018/08/23/imagemagick_ghostscript/ --- imagemagick.be0 | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/imagemagick.be0 b/imagemagick.be0 index 0345396f2..24e5bea7d 100755 --- a/imagemagick.be0 +++ b/imagemagick.be0 @@ -24,3 +24,19 @@ mee_build() { mee_install() { bee_install } + +mee_install_post() { + local tgt=${D}/etc/ImageMagick-6/policy.xml + cp -p -v ${tgt} ${tgt}.raw + xmllint --format ${tgt}.raw > ${tgt} + rm ${tgt}.raw + sed -i -e "/<\/policymap>/ d" ${tgt} + cat <<-XML >> ${tgt} + + + + + + + XML +}