[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#991534: unblock: therion/5.5.7ds1-2



Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock

Please unblock package therion

RC bug https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=991064 fixed

diff -Nru therion-5.5.7ds1/debian/changelog therion-5.5.7ds1/debian/changelog
--- therion-5.5.7ds1/debian/changelog	2021-02-06 16:24:25.000000000 +0000
+++ therion-5.5.7ds1/debian/changelog	2021-07-27 00:27:47.000000000 +0100
@@ -1,3 +1,10 @@
+therion (5.5.7ds1-2) unstable; urgency=medium
+
+    * Allow build with new secure imagemagik (Closes: #991064)
+      Thanks to Dennis Filder for the patch
+
+ -- Wookey <wookey@debian.org>  Mon, 26 Jul 2021 23:27:47 +0000
+
 therion (5.5.7ds1-1) unstable; urgency=medium
 
   * New upstream release, including below bugfixes
diff -Nru therion-5.5.7ds1/debian/rules therion-5.5.7ds1/debian/rules
--- therion-5.5.7ds1/debian/rules	2021-01-04 02:47:31.000000000 +0000
+++ therion-5.5.7ds1/debian/rules	2021-07-27 00:27:06.000000000 +0100
@@ -2,6 +2,9 @@
 
 export DEB_BUILD_MAINT_OPTIONS=hardening=+bindnow future=+lfs
 export DH_VERBOSE=1
+
+POLFILE = "/etc/$(shell convert -version|sed -n '/^Version: /s@Version: ImageMagick \([[:digit:]]\+\)\..*@ImageMagick-\1@p')/policy.xml"
+
 %:
 	dh $@
 
@@ -11,7 +14,10 @@
 	# We need therion itself to build the samples
 	$(MAKE) therion
 	# create HTML documentation for samples
-	faketime "$(dpkg-parsechangelog -S Date)" $(MAKE) samples
+	mkdir -p debian/tmp/ImageMagick
+	sed -e '/<policy domain="coder" rights="none" pattern="PDF" .>/s@"none"@"read|write"@' "$(POLFILE)" > debian/tmp/ImageMagick/policy.xml
+	faketime "$(dpkg-parsechangelog -S Date)" $(MAKE) XDG_CONFIG_HOME="$(shell pwd)/debian/tmp" samples
+	rm -Rf debian/tmp/ImageMagick
 endif
 	$(MAKE) thbook
 
Binary files /tmp/Y2PQbhQpnB/therion-5.5.7ds1/samples/survex/cave.3d and /tmp/9YK3y5DEz8/therion-5.5.7ds1/samples/survex/cave.3d differ
Binary files /tmp/Y2PQbhQpnB/therion-5.5.7ds1/samples/survex/create/create.3d and /tmp/9YK3y5DEz8/therion-5.5.7ds1/samples/survex/create/create.3d differ
Binary files /tmp/Y2PQbhQpnB/therion-5.5.7ds1/samples/survex/ignore/ignore.3d and /tmp/9YK3y5DEz8/therion-5.5.7ds1/samples/survex/ignore/ignore.3d differ
Binary files /tmp/Y2PQbhQpnB/therion-5.5.7ds1/samples/survex/use/use.3d and /tmp/9YK3y5DEz8/therion-5.5.7ds1/samples/survex/use/use.3d differ

(the build-time generated sample .3d files have an embedded timestamp
and they differ by 4 bytes (at least on my local build) despite my
best efforts to make them match using faketime. Bad for
reproducability but otherwise of no significance)

unblock therion/5.5.7ds1-2

-- System Information:
Debian Release: 10.10
  APT prefers stable-updates
  APT policy: (500, 'stable-updates'), (500, 'stable-debug'), (500, 'stable')
Architecture: amd64 (x86_64)

Kernel: Linux 4.19.0-17-amd64 (SMP w/8 CPU cores)
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8), LANGUAGE=en_GB:en (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled


Reply to: