Bug#863519: unblock blockdiag/1.5.3+dfsg-2

[Kouhei Maeda]

retitile 863519: unblock blockdiag/1.5.3+dfsg-5

Hi, Niels

2017-06-04 0:30 GMT+09:00 Niels Thykier <ni...@thykier.net>:
> I am not confident that the "install -d" variant used in the -4 upload
> is entirely safe from this symlink attack.  Furthermore, it still causes
> issues by:
>
>  * It would (still?) cause issues if multiple versions of blockdiag are
>    built on the same machine concurrently.
>  * It assumes /tmp rather than using $(TMPDIR) if set (minor issue)
>
> A quick fix to both of these would be to place the temporary directory
> in the "debian" directory (instead of /tmp/<hardcoded-folder>).  That
> would solve all of my concerns with the temporary directory used by the
> build.

I changed to use PYBUILD {build_dir} instead of
/tmp/<hardcorded-folder> in the "-5" upload.

Attached is the source debdiff.

Regards,

diff -Nru blockdiag-1.5.3+dfsg/debian/changelog
blockdiag-1.5.3+dfsg/debian/changelog
--- blockdiag-1.5.3+dfsg/debian/changelog    2017-05-31 07:19:40.000000000 +0900
+++ blockdiag-1.5.3+dfsg/debian/changelog    2017-06-04 12:08:49.000000000 +0900
@@ -1,3 +1,21 @@
+blockdiag (1.5.3+dfsg-5) unstable; urgency=medium
+
+  * debian/rules
+    - Fixes to use PYBUILD {build_dir} instead of hardcoded temporary directory
+      on PYBUILD_BEFORE_TEST.
+    - Updates PYBUILD_AFTER_TEST.
+    - Removes overrider_dh_python2 target.
+    - Removes copying test image files to testimages directory
+      on overrider_dh_python3.
+  * debian/patches
+    - Deletes fixes-ghostscript_not_found_test.patch
+    - Updates Fixed-remote-image-resouces.patch.
+  * Removes unnecessary files.
+    - debian/python-blockdiag.links
+    - debian/python3-blockdiag.links
+
+ -- Kouhei Maeda <mkou...@palmtb.net>  Sun, 04 Jun 2017 12:08:49 +0900
+
 blockdiag (1.5.3+dfsg-4) unstable; urgency=medium

   * debian/rules
diff -Nru blockdiag-1.5.3+dfsg/debian/patches/Fixed-remote-image-resouces.patch
blockdiag-1.5.3+dfsg/debian/patches/Fixed-remote-image-resouces.patch
--- blockdiag-1.5.3+dfsg/debian/patches/Fixed-remote-image-resouces.patch
   2017-05-31 07:19:40.000000000 +0900
+++ blockdiag-1.5.3+dfsg/debian/patches/Fixed-remote-image-resouces.patch
   2017-06-04 11:19:43.000000000 +0900
@@ -4,25 +4,25 @@

 Index: 
blockdiag-1.5.3+dfsg/src/blockdiag/tests/diagrams/background_url_image.diag
 ===================================================================
---- 
blockdiag-1.5.3+dfsg.orig/src/blockdiag/tests/diagrams/background_url_image.diag
   2017-06-04 11:06:19.475245999 +0900
-+++ blockdiag-1.5.3+dfsg/src/blockdiag/tests/diagrams/background_url_image.diag
   2017-06-04 11:06:50.142572000 +0900
+--- 
blockdiag-1.5.3+dfsg.orig/src/blockdiag/tests/diagrams/background_url_image.diag
   2017-06-04 11:17:13.518449125 +0900
++++ blockdiag-1.5.3+dfsg/src/blockdiag/tests/diagrams/background_url_image.diag
   2017-06-04 11:19:16.593641793 +0900
 @@ -1,7 +1,8 @@
  {
 -  A [background = "http://python.org/images/python-logo.gif";];
 -  B [background = "http://blockdiag.com/favicon.ico";];
 -  C [background =
"http://upload.wikimedia.org/wikipedia/commons/9/9b/Scalable_Vector_Graphics_Circle2.svg";];
 -  D [background = "http://people.sc.fsu.edu/~jburkardt/data/eps/circle.eps";];
-+  A [background = "/usr/lib/python3.5/idlelib/Icons/python.gif"];
++  A [background = "blockdiag/tests/diagrams/white.gif"];
 +  B [background = "/usr/lib/python3.5/idlelib/Icons/idle.ico"];
-+  C [background = "/usr/lib/python3.5/idlelib/Icons/idle_16.png"];
++  C [background =
"blockdiag/tests/diagrams/debian-logo-256color-palettealpha.png"];
 +  D [background = "circle.eps"];
 +  E [background = "circle.svg"];
    Z;
  }
 Index: blockdiag-1.5.3+dfsg/src/blockdiag/tests/diagrams/node_icon.diag
 ===================================================================
---- blockdiag-1.5.3+dfsg.orig/src/blockdiag/tests/diagrams/node_icon.diag
   2017-06-04 11:06:19.475245999 +0900
-+++ blockdiag-1.5.3+dfsg/src/blockdiag/tests/diagrams/node_icon.diag
  2017-06-04 11:06:19.471244000 +0900
+--- blockdiag-1.5.3+dfsg.orig/src/blockdiag/tests/diagrams/node_icon.diag
   2017-06-04 11:17:13.518449125 +0900
++++ blockdiag-1.5.3+dfsg/src/blockdiag/tests/diagrams/node_icon.diag
  2017-06-04 11:17:13.514449125 +0900
 @@ -2,5 +2,5 @@
    A -> B;

diff -Nru blockdiag-1.5.3+dfsg/debian/python-blockdiag.links
blockdiag-1.5.3+dfsg/debian/python-blockdiag.links
--- blockdiag-1.5.3+dfsg/debian/python-blockdiag.links    2014-09-01
07:58:18.000000000 +0900
+++ blockdiag-1.5.3+dfsg/debian/python-blockdiag.links    1970-01-01
09:00:00.000000000 +0900
@@ -1,2 +0,0 @@
-usr/share/doc/python-blockdiag/testimages/debian-logo-256color-palettealpha.png
usr/lib/python2.7/dist-packages/blockdiag/tests/diagrams/debian-logo-256color-palettealpha.png
-usr/share/doc/python-blockdiag/testimages/white.gif
usr/lib/python2.7/dist-packages/blockdiag/tests/diagrams/white.gif
diff -Nru blockdiag-1.5.3+dfsg/debian/python3-blockdiag.links
blockdiag-1.5.3+dfsg/debian/python3-blockdiag.links
--- blockdiag-1.5.3+dfsg/debian/python3-blockdiag.links    2014-09-01
07:58:56.000000000 +0900
+++ blockdiag-1.5.3+dfsg/debian/python3-blockdiag.links    1970-01-01
09:00:00.000000000 +0900
@@ -1,2 +0,0 @@
-usr/share/doc/python3-blockdiag/testimages/debian-logo-256color-palettealpha.png
usr/lib/python3/dist-packages/blockdiag/tests/diagrams/debian-logo-256color-palettealpha.png
-usr/share/doc/python3-blockdiag/testimages/white.gif
usr/lib/python3/dist-packages/blockdiag/tests/diagrams/white.gif
diff -Nru blockdiag-1.5.3+dfsg/debian/rules blockdiag-1.5.3+dfsg/debian/rules
--- blockdiag-1.5.3+dfsg/debian/rules    2017-05-31 07:19:40.000000000 +0900
+++ blockdiag-1.5.3+dfsg/debian/rules    2017-06-04 12:04:56.000000000 +0900
@@ -5,20 +5,14 @@

 export PYBUILD_NAME=blockdiag
 export PYBUILD_BEFORE_TEST=cp -a $(CURDIR)/src/blockdiag.egg-info
$(CURDIR)/debian/circle.* {build_dir}
+export PYBUILD_AFTER_TEST=rm -rf {build_dir}/circle.*

 %:
     dh $@ --with python2,python3 --buildsystem=pybuild

-override_dh_python2:
-    dh_python2
-    install -d
$(CURDIR)/debian/python-blockdiag/usr/share/doc/python-blockdiag/testimages
-    mv -f 
$(CURDIR)/debian/python-blockdiag/usr/lib/python2.7/dist-packages/blockdiag/tests/diagrams/debian-logo-256color-palettealpha.png
$(CURDIR)/debian/python-blockdiag/usr/lib/python2.7/dist-packages/blockdiag/tests/diagrams/white.gif
$(CURDIR)/debian/python-blockdiag/usr/share/doc/python-blockdiag/testimages/
-
 override_dh_python3:
     dh_python3 --shebang=/usr/bin/python3
     mv -f $(CURDIR)/debian/python3-blockdiag/usr/bin/blockdiag
$(CURDIR)/debian/python3-blockdiag/usr/bin/blockdiag3
-    install -d
$(CURDIR)/debian/python3-blockdiag/usr/share/doc/python3-blockdiag/testimages
-    mv -f 
$(CURDIR)/debian/python3-blockdiag/usr/lib/python3/dist-packages/blockdiag/tests/diagrams/debian-logo-256color-palettealpha.png
$(CURDIR)/debian/python3-blockdiag/usr/lib/python3/dist-packages/blockdiag/tests/diagrams/white.gif
$(CURDIR)/debian/python3-blockdiag/usr/share/doc/python3-blockdiag/testimages/

 convert_manpage_blockdiag3:
     sed 's/^blockdiag \\/blockdiag3 \\/' $(CURDIR)/blockdiag.1 >
$(CURDIR)/debian/blockdiag3.1


--
Kouhei Maeda <mkouhei at {palmtb.net,debian.or.jp}>
 KeyID 4096R/7E37CE41