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 :
> 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/).  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/ 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/changelog2017-05-31 07:19:40.0 +0900
+++ blockdiag-1.5.3+dfsg/debian/changelog2017-06-04 12:08:49.0 +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   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.0 +0900
+++ blockdiag-1.5.3+dfsg/debian/patches/Fixed-remote-image-resouces.patch
   2017-06-04 11:19:43.0 +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.links2014-09-01
07:58:18.0 +0900
+++ blockdiag-1.5.3+dfsg/debian/python-blockdiag.links1970-01-01
09:00:00.0 +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
--- 

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

[Niels Thykier]

Kouhei Maeda:
> 2017-05-31 5:38 GMT+09:00 Jonathan Wiltshire :
>> On Sun, May 28, 2017 at 08:51:27AM +0900, Kouhei Maeda wrote:
>>> +export PYBUILD_BEFORE_BUILD=cp -a $(CURDIR)/src/blockdiag.egg-info
>>> {build_dir};cp -f $(CURDIR)/debian/circle.* /tmp/
>>
>> Apologies for not spotting it sooner, but there's a symlink vulnerability
>> here (imagine if /tmp/circle.* was a symlink to something important),
>> and I'm not sure that you should hardcode /tmp either ($TMPDIR?).
>>
>> I'm a bit concerned there's more going on here than just the bug fixes.
>> What would the minimum required changes to fix #860689 and #847930 look
>> like?
> 
> Thanks,
> 
> This change is temporarily copied for use in unit test.
> It is coping with PYBUILD_BEFORE_BUILD, but I should use PYBUILD_BEFORE_TEST.
> And, I had deleted the necessary deletion processing of temporary
> files with PYBUILD_AFTER_TEST.
> 
> I will fix these.
> 
> Regards,
> 
> --
> Kouhei Maeda 
>  KeyID 4096R/7E37CE41
> 

Hi Kouhei,

Thanks for working on improving blockdiag in Debian.

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/).  That
would solve all of my concerns with the temporary directory used by the
build.

~Niels

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

[Kouhei Maeda]

retitile 863519: unblock blockdiag/1.5.3+dfsg-4

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

[Kouhei Maeda]

I have fixed and uploaded.
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-29
20:44:19.0 +0900
+++ blockdiag-1.5.3+dfsg/debian/changelog   2017-05-31
07:19:40.0 +0900
@@ -1,3 +1,15 @@
+blockdiag (1.5.3+dfsg-4) unstable; urgency=medium
+
+  * debian/rules
+- Changes to use PYBUILD_BEFORE_TEST instead of PYBUILD_BEFORE_BUILD,
+  for copying temporary files for testing.
+- Appends deleting temporary files for testing on PYBUILD_AFTER_TEST.
+  * debian/patches
+- fixes-ghostscript_not_found_test.patch
+  * Changes temporary files (circle.{eps,svg}) path.
+
+ -- Kouhei Maeda   Wed, 31 May 2017 07:19:40 +0900
+
 blockdiag (1.5.3+dfsg-3) unstable; urgency=medium

   * Reverts the change.
diff -Nru 
blockdiag-1.5.3+dfsg/debian/patches/fixes-ghostscript_not_found_test.patch
blockdiag-1.5.3+dfsg/debian/patches/fixes-ghostscript_not_found_test.patch
--- blockdiag-1.5.3+dfsg/debian/patches/fixes-ghostscript_not_found_test.patch
 2017-05-26 01:16:32.0 +0900
+++ blockdiag-1.5.3+dfsg/debian/patches/fixes-ghostscript_not_found_test.patch
 2017-05-31 07:19:22.0 +0900
@@ -7,12 +7,12 @@
 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-05-26 00:53:25.852523308 +0900
-+++ blockdiag-1.5.3+dfsg/src/blockdiag/tests/diagrams/background_url_image.diag
   2017-05-26 01:16:29.640523308 +0900
 blockdiag-1.5.3+dfsg/src/blockdiag/tests/diagrams/background_url_image.diag
   2017-05-31 07:19:19.781453251 +0900
 @@ -2,5 +2,7 @@
A [background = "/usr/lib/python3.5/idlelib/Icons/python.gif"];
B [background = "/usr/lib/python3.5/idlelib/Icons/idle.ico"];
C [background = "/usr/lib/python3.5/idlelib/Icons/idle_16.png"];
-+  D [background = "/tmp/circle.eps"];
-+  E [background = "/tmp/circle.svg"];
++  D [background = "/tmp/blockdiag/circle.eps"];
++  E [background = "/tmp/blockdiag/circle.svg"];
Z;
  }
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-26 21:58:39.0 +0900
+++ blockdiag-1.5.3+dfsg/debian/rules   2017-05-31 07:19:40.0 +0900
@@ -3,8 +3,10 @@
 # Uncomment this to turn on verbose mode.
 # export DH_VERBOSE=1

+export TMPDIR_TESTING=/tmp/blockdiag
 export PYBUILD_NAME=blockdiag
-export PYBUILD_BEFORE_BUILD=cp -a $(CURDIR)/src/blockdiag.egg-info
{build_dir};cp -f $(CURDIR)/debian/circle.* /tmp/
+export PYBUILD_BEFORE_TEST=cp -a $(CURDIR)/src/blockdiag.egg-info
{build_dir};install -d $(TMPDIR_TESTING); cp -f
$(CURDIR)/debian/circle.* $(TMPDIR_TESTING)/
+export PYBUILD_AFTER_TEST=rm -rf $(TMPDIR_TESTING)

 %:
dh $@ --with python2,python3 --buildsystem=pybuild
--
Kouhei Maeda 
 KeyID 4096R/7E37CE41


2017-05-31 7:10 GMT+09:00 Kouhei Maeda :
> 2017-05-31 5:38 GMT+09:00 Jonathan Wiltshire :
>> On Sun, May 28, 2017 at 08:51:27AM +0900, Kouhei Maeda wrote:
>>> +export PYBUILD_BEFORE_BUILD=cp -a $(CURDIR)/src/blockdiag.egg-info
>>> {build_dir};cp -f $(CURDIR)/debian/circle.* /tmp/
>>
>> Apologies for not spotting it sooner, but there's a symlink vulnerability
>> here (imagine if /tmp/circle.* was a symlink to something important),
>> and I'm not sure that you should hardcode /tmp either ($TMPDIR?).
>>
>> I'm a bit concerned there's more going on here than just the bug fixes.
>> What would the minimum required changes to fix #860689 and #847930 look
>> like?
>
> Thanks,
>
> This change is temporarily copied for use in unit test.
> It is coping with PYBUILD_BEFORE_BUILD, but I should use PYBUILD_BEFORE_TEST.
> And, I had deleted the necessary deletion processing of temporary
> files with PYBUILD_AFTER_TEST.
>
> I will fix these.
>
> Regards,
>
> --
> Kouhei Maeda 
>  KeyID 4096R/7E37CE41

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

[Kouhei Maeda]

2017-05-31 5:38 GMT+09:00 Jonathan Wiltshire :
> On Sun, May 28, 2017 at 08:51:27AM +0900, Kouhei Maeda wrote:
>> +export PYBUILD_BEFORE_BUILD=cp -a $(CURDIR)/src/blockdiag.egg-info
>> {build_dir};cp -f $(CURDIR)/debian/circle.* /tmp/
>
> Apologies for not spotting it sooner, but there's a symlink vulnerability
> here (imagine if /tmp/circle.* was a symlink to something important),
> and I'm not sure that you should hardcode /tmp either ($TMPDIR?).
>
> I'm a bit concerned there's more going on here than just the bug fixes.
> What would the minimum required changes to fix #860689 and #847930 look
> like?

Thanks,

This change is temporarily copied for use in unit test.
It is coping with PYBUILD_BEFORE_BUILD, but I should use PYBUILD_BEFORE_TEST.
And, I had deleted the necessary deletion processing of temporary
files with PYBUILD_AFTER_TEST.

I will fix these.

Regards,

--
Kouhei Maeda 
 KeyID 4096R/7E37CE41

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

[Jonathan Wiltshire]

Control: tag -1 moreinfo

On Sun, May 28, 2017 at 08:51:27AM +0900, Kouhei Maeda wrote:
> +export PYBUILD_BEFORE_BUILD=cp -a $(CURDIR)/src/blockdiag.egg-info
> {build_dir};cp -f $(CURDIR)/debian/circle.* /tmp/

Apologies for not spotting it sooner, but there's a symlink vulnerability
here (imagine if /tmp/circle.* was a symlink to something important),
and I'm not sure that you should hardcode /tmp either ($TMPDIR?).

I'm a bit concerned there's more going on here than just the bug fixes.
What would the minimum required changes to fix #860689 and #847930 look
like?

-- 
Jonathan Wiltshire  j...@debian.org
Debian Developer http://people.debian.org/~jmw

4096R: 0xD3524C51 / 0A55 B7C5 1223 3942 86EC  74C3 5394 479D D352 4C51

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

[Kouhei Maeda]

retitile 863519: unblock blockdiag/1.5.3+dfsg-3

Hi,

2017-05-29 22:02 GMT+09:00 Jonathan Wiltshire :
> On 2017-05-29 05:26, Kouhei Maeda wrote:
>>
>> Hi,
>>
>> 2017-05-28 21:50 GMT+09:00 Jonathan Wiltshire :
>>>
>>> On Sun, May 28, 2017 at 08:51:27AM +0900, Kouhei Maeda wrote:

 +  * Bumps version debian/compat to 9.
 +- Fixes package-uses-deprecated-debhelper-compat-version.
>>>
>>>
>>> This isn't OK, please remove it.
>>
>>
>> This means that reverting debian/compat version, and increments debian
>> version?
>>
>> Regards,
>> --
>> Kouhei Maeda 
>>  KeyID 4096R/7E37CE41
>
>
> Yes please.

Fixed above.
Please unblock blockdiag/1.5.3+dfsg-3.

Attached is the source debdiff.

Regards,

dpkg-source: warning: extracting unsigned source package
(/home/kohei/devel/debpkg/blockdiag/blockdiag_1.5.3+dfsg-2.dsc)
dpkg-source: warning: extracting unsigned source package
(/home/kohei/devel/debpkg/blockdiag/blockdiag_1.5.3+dfsg-3.dsc)
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-26
22:06:40.0 +0900
+++ blockdiag-1.5.3+dfsg/debian/changelog   2017-05-29
20:44:19.0 +0900
@@ -1,3 +1,11 @@
+blockdiag (1.5.3+dfsg-3) unstable; urgency=medium
+
+  * Reverts the change.
+- Bumps version debian/compat to 9.
+  * Fixes package-uses-deprecated-debhelper-compat-version.
+
+ -- Kouhei Maeda   Mon, 29 May 2017 20:44:19 +0900
+
 blockdiag (1.5.3+dfsg-2) unstable; urgency=medium

   * Fixes build kills unrelated python processes. Closes: #847930
diff -Nru blockdiag-1.5.3+dfsg/debian/compat blockdiag-1.5.3+dfsg/debian/compat
--- blockdiag-1.5.3+dfsg/debian/compat  2017-05-26 00:57:08.0 +0900
+++ blockdiag-1.5.3+dfsg/debian/compat  2017-05-29 12:24:55.0 +0900
@@ -1 +1 @@
-9
+7



--
Kouhei Maeda 
 KeyID 4096R/7E37CE41

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

[Jonathan Wiltshire]

On 2017-05-29 05:26, Kouhei Maeda wrote:

Hi,

2017-05-28 21:50 GMT+09:00 Jonathan Wiltshire :

On Sun, May 28, 2017 at 08:51:27AM +0900, Kouhei Maeda wrote:

+  * Bumps version debian/compat to 9.
+- Fixes package-uses-deprecated-debhelper-compat-version.


This isn't OK, please remove it.


This means that reverting debian/compat version, and increments debian 
version?


Regards,
--
Kouhei Maeda 
 KeyID 4096R/7E37CE41


Yes please.

Thanks,

--
Jonathan Wiltshire  j...@debian.org
Debian Developer http://people.debian.org/~jmw

4096R: 0xD3524C51 / 0A55 B7C5 1223 3942 86EC  74C3 5394 479D D352 4C51

 i have six years of solaris sysadmin experience, from
8->10. i am well qualified to say it is made from bonghits
layered on top of bonghits

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

[Kouhei Maeda]

Hi,

2017-05-28 21:50 GMT+09:00 Jonathan Wiltshire :
> On Sun, May 28, 2017 at 08:51:27AM +0900, Kouhei Maeda wrote:
>> +  * Bumps version debian/compat to 9.
>> +- Fixes package-uses-deprecated-debhelper-compat-version.
>
> This isn't OK, please remove it.

This means that reverting debian/compat version, and increments debian version?

Regards,
--
Kouhei Maeda 
 KeyID 4096R/7E37CE41

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

[Jonathan Wiltshire]

Control: tag -1 moreinfo

Hi,

On Sun, May 28, 2017 at 08:51:27AM +0900, Kouhei Maeda wrote:
> +  * Bumps version debian/compat to 9.
> +- Fixes package-uses-deprecated-debhelper-compat-version.

This isn't OK, please remove it.

Thanks,

-- 
Jonathan Wiltshire  j...@debian.org
Debian Developer http://people.debian.org/~jmw

4096R: 0xD3524C51 / 0A55 B7C5 1223 3942 86EC  74C3 5394 479D D352 4C51

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

[Kouhei Maeda]

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


Dear release team,
Please unblock blockdiag/1.5.3+dfsg-2.

This would fixes #860689, #847930 in stretch and sid,
which are some test failures on FTBFS.

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/changelog2017-01-23 07:13:59.0 +0900
+++ blockdiag-1.5.3+dfsg/debian/changelog2017-05-26 22:06:40.0 +0900
@@ -1,3 +1,31 @@
+blockdiag (1.5.3+dfsg-2) unstable; urgency=medium
+
+  * Fixes build kills unrelated python processes. Closes: #847930
+- debian/rules
+  * Removes PYBUILD_AFTER_BUILD,PYBUILD_{BEFORE,AFTER}_TEST options.
+- debian/patches
+  * Adds use-vlgothic-package-on-fullpath.patch,
+moves fontpath related modification
+from Fixed-remote-image-resouces.patch
+  * Updates Fixed-remote-image-resouces.patch.
+- debian/control
+  * Removes procps from Build-Depends.
+  * Fixes some test failures
+- debian/patches
+  #* Removes 848748-exception-ignored-in-Image-del.patch unnecessary.
+  * Adds skip-test_app_cleans_up_images.patch.
+  * Adds fixes-test_node_attribute.patch.
+  * Adds fixes_test_fontmap_duplicated_fontentry1.patch.
+  * Fixes Missing Build-Depends on libmagickcore extra lib. Closes: #860689
+- debian/control
+  * Appends libmagickcore-6.q16-3-extra to Build-Depends.
+  * Bumps version debian/compat to 9.
+- Fixes package-uses-deprecated-debhelper-compat-version.
+  * debian/control
+- Appends python-configparser to Build-Depends.
+
+ -- Kouhei Maeda   Fri, 26 May 2017 22:06:40 +0900
+
 blockdiag (1.5.3+dfsg-1.1) unstable; urgency=medium

   * Non-maintainer upload.
diff -Nru blockdiag-1.5.3+dfsg/debian/compat blockdiag-1.5.3+dfsg/debian/compat
--- blockdiag-1.5.3+dfsg/debian/compat2011-05-09 11:31:44.0 +0900
+++ blockdiag-1.5.3+dfsg/debian/compat2017-05-26 00:57:08.0 +0900
@@ -1 +1 @@
-7
+9
diff -Nru blockdiag-1.5.3+dfsg/debian/control
blockdiag-1.5.3+dfsg/debian/control
--- blockdiag-1.5.3+dfsg/debian/control2016-10-11 10:15:43.0 +0900
+++ blockdiag-1.5.3+dfsg/debian/control2017-05-26 22:06:27.0 +0900
@@ -6,6 +6,7 @@
dh-python,
python-all,
python-setuptools,
+   python-configparser,
python-unittest2,
pep8 (>= 1.3),
python-nose,
@@ -17,7 +18,7 @@
python-reportlab,
python-mock,
python-wand,
-   python-pep8,
+   python-pep8,
python3-all,
python3-setuptools,
python3-pep8 (>= 1.3),
@@ -29,7 +30,7 @@
python3-reportlab,
python3-mock,
python3-wand,
-   procps,
+   libmagickcore-6.q16-3-extra,
fonts-vlgothic | fonts-japanese-gothic
 Standards-Version: 3.9.8
 X-Python-Version: 2.7
diff -Nru 
blockdiag-1.5.3+dfsg/debian/patches/848748-exception-ignored-in-Image-del.patch
blockdiag-1.5.3+dfsg/debian/patches/848748-exception-ignored-in-Image-del.patch
--- 
blockdiag-1.5.3+dfsg/debian/patches/848748-exception-ignored-in-Image-del.patch
   2017-01-23 07:13:59.0 +0900
+++ 
blockdiag-1.5.3+dfsg/debian/patches/848748-exception-ignored-in-Image-del.patch
   2017-05-26 01:18:57.0 +0900
@@ -18,9 +18,11 @@
 Bug-Debian: https://bugs.debian.org/848748
 Forwarded: no

 blockdiag-1.5.3+dfsg.orig/src/blockdiag/tests/utils.py
-+++ blockdiag-1.5.3+dfsg/src/blockdiag/tests/utils.py
-@@ -64,7 +64,14 @@ def capture_stderr(func):
+Index: blockdiag-1.5.3+dfsg/src/blockdiag/tests/utils.py
+===
+--- blockdiag-1.5.3+dfsg.orig/src/blockdiag/tests/utils.py
2017-05-25 23:32:58.0 +0900
 blockdiag-1.5.3+dfsg/src/blockdiag/tests/utils.py2017-05-26
01:18:55.308523308 +0900
+@@ -64,7 +64,14 @@

  func(*args, **kwargs)

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
   2016-10-11 10:01:17.0 +0900
+++ blockdiag-1.5.3+dfsg/debian/patches/Fixed-remote-image-resouces.patch
   2017-05-25 23:30:39.0 +0900
@@ -1,66 +1,30 @@
-Description: Fixed remote image resouce for testing data.
+Description: Changes remote image resource to local files from base packages.
 Author: Kouhei Maeda 
-Last-Update: 2014-08-30
+Last-Update: 2017-05-25

 Index: 
blockdiag-1.5.3+dfsg/src/blockdiag/tests/diagrams/background_url_image.diag
 ===