[starlet] 01/02: Replace plack-jpg.patch with calculate-baybridge.jpg.patch.

[gregor herrmann]

This is an automated email from the git hooks/post-receive script.

gregoa pushed a commit to branch master
in repository starlet.

commit c5a2df53819c610332b539ba5bc3055e4af7260e
Author: gregor herrmann <gregoa at debian.org>
Date:   Thu Jun 25 21:37:36 2015 +0200

    Replace plack-jpg.patch with calculate-baybridge.jpg.patch.
    
    Taken from Starman, written by Plack and Starman upstream.
---
 debian/patches/calculate-baybridge.jpg.patch | 41 ++++++++++++++++++++++++++++
 debian/patches/plack-jpg.patch               | 40 ---------------------------
 debian/patches/series                        |  2 +-
 3 files changed, 42 insertions(+), 41 deletions(-)

diff --git a/debian/patches/calculate-baybridge.jpg.patch b/debian/patches/calculate-baybridge.jpg.patch
new file mode 100644
index 0000000..0547125
--- /dev/null
+++ b/debian/patches/calculate-baybridge.jpg.patch
@@ -0,0 +1,41 @@
+From a45d712d38a9454d3d5a7d12de0dd741f24d8bed Mon Sep 17 00:00:00 2001
+From: Tatsuhiko Miyagawa <miyagawa at bulknews.net>
+Date: Thu, 14 May 2015 14:49:50 -0700
+Subject: [PATCH] calculare size/MD5 because it might change...
+
+Origin: Starman git, https://github.com/miyagawa/Starman/commits/master
+Bug: https://rt.cpan.org/Public/Bug/Display.html?id=105006
+Forwarded: https://rt.cpan.org/Public/Bug/Display.html?id=105006
+Bug-Debian: https://bugs.debian.org/#789669
+Reviewed-by: gregor herrmann <gregoa at debian.org>
+Last-Update: 2015-06-25
+
+---
+ t/chunked_req.t | 9 +++++++--
+ 1 file changed, 7 insertions(+), 2 deletions(-)
+
+--- a/t/08chunked_req.t
++++ b/t/08chunked_req.t
+@@ -12,6 +12,11 @@
+ 
+ my $file = File::ShareDir::dist_dir('Plack') . "/baybridge.jpg";
+ 
++open my $fh, "<", $file or die $!;
++my $md5 = Digest::MD5->new;
++$md5->addfile($fh);
++my $hex = $md5->hexdigest;
++
+ my $app = sub {
+     my $env = shift;
+     my $body;
+@@ -35,8 +40,8 @@
+ 
+     my $res = $cb->($req);
+ 
+-    is $res->header('X-Content-Length'), 79838;
+-    is Digest::MD5::md5_hex($res->content), '983726ae0e4ce5081bef5fb2b7216950';
++    is $res->header('X-Content-Length'), -s $file;
++    is Digest::MD5::md5_hex($res->content), $hex;
+ };
+ 
+ done_testing;
diff --git a/debian/patches/plack-jpg.patch b/debian/patches/plack-jpg.patch
deleted file mode 100644
index fa321ed..0000000
--- a/debian/patches/plack-jpg.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-Description: baybridge.jpg was resized in 1.0035
- check for old and new size/md5sum
-Origin: vendor
-Bug: https://rt.cpan.org/Public/Bug/Display.html?id=105006
-Forwarded: https://rt.cpan.org/Public/Bug/Display.html?id=105006
-Bug-Debian: https://bugs.debian.org/#789669
-Author: gregor herrmann <gregoa at debian.org>
-Last-Update: 2015-06-23
-
---- a/t/08chunked_req.t
-+++ b/t/08chunked_req.t
-@@ -1,5 +1,6 @@
- use strict;
- use Test::TCP;
-+use Plack;
- use Plack::Test;
- use File::ShareDir;
- use HTTP::Request;
-@@ -35,8 +36,19 @@
- 
-     my $res = $cb->($req);
- 
--    is $res->header('X-Content-Length'), 79838;
--    is Digest::MD5::md5_hex($res->content), '983726ae0e4ce5081bef5fb2b7216950';
-+    # baybridge.jpg was resized in 1.0035
-+    my ($imgsize, $imgmd5);
-+    diag ("Testing with baybridge.jpg from Plack $Plack::VERSION");
-+    if ($Plack::VERSION >= 1.0035) {
-+        $imgsize = 14750;
-+        $imgmd5 = '70546a79c7abb9c497ca91730a0686e4';
-+    } else {
-+        $imgsize = 79838;
-+        $imgmd5 = '983726ae0e4ce5081bef5fb2b7216950';
-+    }
-+
-+    is $res->header('X-Content-Length'), $imgsize;
-+    is Digest::MD5::md5_hex($res->content), $imgmd5;
- };
- 
- done_testing;
diff --git a/debian/patches/series b/debian/patches/series
index cdc5c9a..ff842e1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1 @@
-plack-jpg.patch
+calculate-baybridge.jpg.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/starlet.git