[SCM] Debian packaging of libcgi-application-extra-plugin-bundle-perl branch, master, updated. 535fb96b240ea19ad46cefef9233d666f6a8f986

gregor herrmann gregoa at debian.org
Sat Aug 13 23:18:27 UTC 2011


The following commit has been merged in the master branch:
commit 98ab8283fc152ddb018800f59e51a4e6e922b67b
Author: gregor herrmann <gregoa at debian.org>
Date:   Sun Aug 14 01:12:37 2011 +0200

    Add patches for 2 modules to use Digest::SHA instead of Digest::SHA1.
    
    Closes: #637733

diff --git a/debian/patches/CGI-Application-Plugin-LinkIntegrity/digest-sha.patch b/debian/patches/CGI-Application-Plugin-LinkIntegrity/digest-sha.patch
new file mode 100644
index 0000000..201679c
--- /dev/null
+++ b/debian/patches/CGI-Application-Plugin-LinkIntegrity/digest-sha.patch
@@ -0,0 +1,59 @@
+Description: use Digest::SHA instead of SHA1
+ cf. http://wiki.debian.org/Teams/DebianPerlGroup/OpenTasks/Transitions/DigestSHA1ToDigestSHA
+Origin: vendor
+Forwarded: no
+Author: gregor herrmann <gregoa at debian.org>
+Last-Update: 2011-08-14
+
+--- a/README
++++ b/README
+@@ -227,7 +227,7 @@
+ 
+     digest_module
+         Which digest module to use to create the checksum. Typically, this
+-        will be either "Digest::MD5" or "Digest::SHA1". However any module
++        will be either "Digest::MD5" or "Digest::SHA". However any module
+         supported by "Digest::HMAC" will work.
+ 
+         The default "digest_module" is "Digest::MD5".
+--- a/lib/CGI/Application/Plugin/LinkIntegrity.pm
++++ b/lib/CGI/Application/Plugin/LinkIntegrity.pm
+@@ -276,7 +276,7 @@
+ =item digest_module
+ 
+ Which digest module to use to create the checksum.  Typically, this will
+-be either C<Digest::MD5> or C<Digest::SHA1>.  However any module
++be either C<Digest::MD5> or C<Digest::SHA>.  However any module
+ supported by C<Digest::HMAC> will work.
+ 
+ The default C<digest_module> is C<Digest::MD5>.
+--- a/t/04-hmac.t
++++ b/t/04-hmac.t
+@@ -165,23 +165,23 @@
+         # Same test but with SHA1 (if available)
+         SKIP: {
+             eval {
+-                require Digest::SHA1;
++                require Digest::SHA;
+             };
+ 
+-            skip 'Digest::SHA1 not installed', 3 if $@;
++            skip 'Digest::SHA not installed', 3 if $@;
+ 
+             $secret = 'even secreter';
+ 
+             $self->link_integrity_config(
+                 'secret'          => $secret,
+-                'digest_module'   => 'Digest::SHA1',
++                'digest_module'   => 'Digest::SHA',
+                 'additional_data' => 'abcde',
+             );
+ 
+             $uri = '/foo/bar/baz?one=foo&two=boom';
+             $link = $self->link($uri);
+ 
+-            $hmac = Digest::HMAC->new($secret, 'Digest::SHA1');
++            $hmac = Digest::HMAC->new($secret, 'Digest::SHA');
+ 
+             $u = URI->new($uri, 'http');
+             $hmac->add($u->scheme     || '');
diff --git a/debian/patches/CGI-Application-Plugin-LinkIntegrity/series b/debian/patches/CGI-Application-Plugin-LinkIntegrity/series
index c9352c4..4a3ab2c 100644
--- a/debian/patches/CGI-Application-Plugin-LinkIntegrity/series
+++ b/debian/patches/CGI-Application-Plugin-LinkIntegrity/series
@@ -1 +1,2 @@
 pod.patch
+digest-sha.patch
diff --git a/debian/patches/CGI-Application-Plugin-ProtectCSRF/digest-sha.patch b/debian/patches/CGI-Application-Plugin-ProtectCSRF/digest-sha.patch
new file mode 100644
index 0000000..e9f0233
--- /dev/null
+++ b/debian/patches/CGI-Application-Plugin-ProtectCSRF/digest-sha.patch
@@ -0,0 +1,71 @@
+Description: use Digest::SHA instead of SHA1
+ cf. http://wiki.debian.org/Teams/DebianPerlGroup/OpenTasks/Transitions/DigestSHA1ToDigestSHA
+Origin: vendor
+Forwarded: no
+Author: gregor herrmann <gregoa at debian.org>
+Last-Update: 2011-08-14
+
+--- a/Build.PL
++++ b/Build.PL
+@@ -11,7 +11,7 @@
+         "Attribute::Handlers"               => 0.78,
+         "CGI::Application"                  => 4.04,
+         "CGI::Application::Plugin::Session" => 1.01,
+-        "Digest::SHA1"                      => 2.07,
++        "Digest::SHA"                       => 0,
+     },
+     add_to_cleanup      => [ 'CGI-Application-Plugin-ProtectCSRF-*' ],
+ );
+--- a/META.yml
++++ b/META.yml
+@@ -9,7 +9,7 @@
+   Attribute::Handlers: 0.78
+   CGI::Application: 4.04
+   CGI::Application::Plugin::Session: 1.01
+-  Digest::SHA1: 2.07
++  Digest::SHA: 0
+ generated_by: Module::Build version 0.2808
+ meta-spec:
+   url: http://module-build.sourceforge.net/META-spec-v1.2.html
+--- a/Makefile.PL
++++ b/Makefile.PL
+@@ -12,7 +12,7 @@
+         "Attribute::Handlers"               => 0.78,
+         "CGI::Application"                  => 4.04,
+         "CGI::Application::Plugin::Session" => 1.01,
+-        "Digest::SHA1"                      => 2.07,
++        "Digest::SHA"                       => 0,
+     },
+     dist                => { COMPRESS => 'gzip -9f', SUFFIX => 'gz', },
+     clean               => { FILES => 'CGI-Application-Plugin-ProtectCSRF-*' },
+--- a/README
++++ b/README
+@@ -157,7 +157,7 @@
+ 
+ SEE ALSO
+     Attribute::Handlers Carp CGI::Application
+-    CGI::Application::Plugin::Session Digest::SHA1 Exporter HTML::TokeParser
++    CGI::Application::Plugin::Session Digest::SHA Exporter HTML::TokeParser
+ 
+ AUTHOR
+     Akira Horimoto <kurt0027 at gmail.com>
+--- a/lib/CGI/Application/Plugin/ProtectCSRF.pm
++++ b/lib/CGI/Application/Plugin/ProtectCSRF.pm
+@@ -40,7 +40,7 @@
+ use base qw(Exporter);
+ use Carp;
+ use HTML::TokeParser;
+-use Digest::SHA1 qw(sha1_hex);
++use Digest::SHA qw(sha1_hex);
+ use Attribute::Handlers;
+ 
+ our(
+@@ -419,7 +419,7 @@
+ 
+ =head1 SEE ALSO
+ 
+-L<Attribute::Handlers> L<Carp> L<CGI::Application> L<CGI::Application::Plugin::Session> L<Digest::SHA1> L<Exporter> L<HTML::TokeParser> 
++L<Attribute::Handlers> L<Carp> L<CGI::Application> L<CGI::Application::Plugin::Session> L<Digest::SHA> L<Exporter> L<HTML::TokeParser>
+ 
+ =head1 AUTHOR
+ 
diff --git a/debian/patches/CGI-Application-Plugin-ProtectCSRF/series b/debian/patches/CGI-Application-Plugin-ProtectCSRF/series
new file mode 100644
index 0000000..ba2b602
--- /dev/null
+++ b/debian/patches/CGI-Application-Plugin-ProtectCSRF/series
@@ -0,0 +1 @@
+digest-sha.patch

-- 
Debian packaging of libcgi-application-extra-plugin-bundle-perl



More information about the Pkg-perl-cvs-commits mailing list