[libnet-snmp-perl] 14/23: Refreshed and reformatted replace_digest_sha1.patch.

Mon Aug 21 20:44:00 UTC 2017

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

roland pushed a commit to branch master
in repository libnet-snmp-perl.

commit 3bed9fd6861155cee156a06bfe04853a62efe21a
Author: Roland Rosenfeld <roland at debian.org>
Date:   Mon Aug 21 21:30:09 2017 +0200

    Refreshed and reformatted replace_digest_sha1.patch.
---
 debian/changelog                                   |  3 +-
 ...est_sha1.patch => 01_replace_digest_sha1.patch} | 74 ++++++----------------
 debian/patches/series                              |  2 +-
 3 files changed, 24 insertions(+), 55 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 290c93d..52b53c7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,8 +5,9 @@ libnet-snmp-perl (6.0.1-3) UNRELEASED; urgency=medium
   * Adopted by Debian Perl Group.  And added Roland Rosenfeld to Uploaders.
   * Run wrap-and-sort.
   * Remove template header from debian/watch.
+  * Refreshed and reformatted replace_digest_sha1.patch.
 
- -- Roland Rosenfeld <roland at debian.org>  Mon, 21 Aug 2017 20:59:44 +0200
+ -- Roland Rosenfeld <roland at debian.org>  Mon, 21 Aug 2017 21:29:45 +0200
 
 libnet-snmp-perl (6.0.1-2) unstable; urgency=low
 
diff --git a/debian/patches/replace_digest_sha1.patch b/debian/patches/01_replace_digest_sha1.patch
similarity index 50%
rename from debian/patches/replace_digest_sha1.patch
rename to debian/patches/01_replace_digest_sha1.patch
index 21ec196..abb6c7b 100644
--- a/debian/patches/replace_digest_sha1.patch
+++ b/debian/patches/01_replace_digest_sha1.patch
@@ -1,34 +1,10 @@
-Description: Upstream changes introduced in version 6.0.1-2
- This patch has been created by dpkg-source during the package build.
- Here's the last changelog entry, hopefully it gives details on why
- those changes were made:
- .
- libnet-snmp-perl (6.0.1-2) unstable; urgency=low
- .
-   * Replace Digest:SHA1 by Digest:SHA (Closes: #636857)
- .
- The person named in the Author field signed this changelog entry.
+Description: Replace Digest:SHA1 by Digest:SHA (Closes: #636857)
 Author: Jochen Friedrich <jochen at scram.de>
 Bug-Debian: http://bugs.debian.org/636857
 
----
-The information above should follow the Patch Tagging Guidelines, please
-checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
-are templates for supplementary fields that you might want to add:
-
-Origin: <vendor|upstream|other>, <url of original patch>
-Bug: <url in upstream bugtracker>
-Bug-Debian: http://bugs.debian.org/<bugnumber>
-Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
-Forwarded: <no|not-needed|url proving that it has been forwarded>
-Reviewed-By: <name and email of someone who approved the patch>
-Last-Update: <YYYY-MM-DD>
-
-Index: libnet-snmp-perl-6.0.1/Build.PL
-===================================================================
---- libnet-snmp-perl-6.0.1.orig/Build.PL	2011-08-24 17:36:51.000000000 +0200
-+++ libnet-snmp-perl-6.0.1/Build.PL	2011-08-24 17:36:55.000000000 +0200
-@@ -37,7 +37,6 @@
+--- a/Build.PL
++++ b/Build.PL
+@@ -37,7 +37,6 @@ Module::Build->new(
     recommends         => {
        Crypt::DES      => '2.03',  # SNMPv3
        Digest::MD5     => '2.11',  # SNMPv3
@@ -36,11 +12,9 @@ Index: libnet-snmp-perl-6.0.1/Build.PL
        Digest::HMAC    => '1.00',  # SNMPv3
        Crypt::Rijndael => '1.02',  # SNMPv3 - AES Cipher Algorithm 
        Socket6         => '0.23',  # UDP/IPv6 or TCP/IPv6 Transport Domain 
-Index: libnet-snmp-perl-6.0.1/Makefile.PL
-===================================================================
---- libnet-snmp-perl-6.0.1.orig/Makefile.PL	2011-08-24 17:36:51.000000000 +0200
-+++ libnet-snmp-perl-6.0.1/Makefile.PL	2011-08-24 17:36:55.000000000 +0200
-@@ -40,7 +40,6 @@
+--- a/Makefile.PL
++++ b/Makefile.PL
+@@ -40,7 +40,6 @@ WriteMakefile(
        Math::BigInt => 0,
        Crypt::DES   => '2.03',  # SNMPv3
        Digest::MD5  => '2.11',  # SNMPv3
@@ -48,11 +22,9 @@ Index: libnet-snmp-perl-6.0.1/Makefile.PL
        Digest::HMAC => '1.00',  # SNMPv3
     },
     dist          => {
-Index: libnet-snmp-perl-6.0.1/META.yml
-===================================================================
---- libnet-snmp-perl-6.0.1.orig/META.yml	2011-08-24 17:36:51.000000000 +0200
-+++ libnet-snmp-perl-6.0.1/META.yml	2011-08-24 17:36:55.000000000 +0200
-@@ -63,7 +63,6 @@
+--- a/META.yml
++++ b/META.yml
+@@ -63,7 +63,6 @@ recommends:
    Crypt::Rijndael: 1.02
    Digest::HMAC: 1.00
    Digest::MD5: 2.11
@@ -60,11 +32,9 @@ Index: libnet-snmp-perl-6.0.1/META.yml
    Socket6: 0.23
  requires:
    Carp: 0
-Index: libnet-snmp-perl-6.0.1/lib/Net/SNMP.pm
-===================================================================
---- libnet-snmp-perl-6.0.1.orig/lib/Net/SNMP.pm	2011-08-24 17:36:51.000000000 +0200
-+++ libnet-snmp-perl-6.0.1/lib/Net/SNMP.pm	2011-08-24 17:36:55.000000000 +0200
-@@ -3550,7 +3550,7 @@
+--- a/lib/Net/SNMP.pm
++++ b/lib/Net/SNMP.pm
+@@ -3550,7 +3550,7 @@ earlier than v5.6.0.
  
  =item *
  
@@ -73,11 +43,9 @@ Index: libnet-snmp-perl-6.0.1/lib/Net/SNMP.pm
  F<Digest::HMAC> are required to support SNMPv3. 
  
  =item *
-Index: libnet-snmp-perl-6.0.1/lib/Net/SNMP/Security/USM.pm
-===================================================================
---- libnet-snmp-perl-6.0.1.orig/lib/Net/SNMP/Security/USM.pm	2011-08-24 17:36:51.000000000 +0200
-+++ libnet-snmp-perl-6.0.1/lib/Net/SNMP/Security/USM.pm	2011-08-24 17:36:55.000000000 +0200
-@@ -25,7 +25,7 @@
+--- a/lib/Net/SNMP/Security/USM.pm
++++ b/lib/Net/SNMP/Security/USM.pm
+@@ -25,7 +25,7 @@ use Net::SNMP::Message qw(
  
  use Crypt::DES();
  use Digest::MD5();
@@ -86,7 +54,7 @@ Index: libnet-snmp-perl-6.0.1/lib/Net/SNMP/Security/USM.pm
  use Digest::HMAC();
  
  ## Version of the Net::SNMP::Security::USM module
-@@ -1146,7 +1146,7 @@
+@@ -1146,7 +1146,7 @@ sub _auth_data_init
     } elsif ($this->{_auth_protocol} eq AUTH_PROTOCOL_HMACSHA) {
  
        $this->{_auth_data} =
@@ -95,7 +63,7 @@ Index: libnet-snmp-perl-6.0.1/lib/Net/SNMP/Security/USM.pm
  
     } else {
  
-@@ -1391,7 +1391,7 @@
+@@ -1391,7 +1391,7 @@ sub _priv_data_init_3desede
     if ($this->{_auth_protocol} eq AUTH_PROTOCOL_HMACMD5) {
        $this->{_priv_data}->{hash} = Digest::MD5->new();
     } elsif ($this->{_auth_protocol} eq AUTH_PROTOCOL_HMACSHA) {
@@ -104,7 +72,7 @@ Index: libnet-snmp-perl-6.0.1/lib/Net/SNMP/Security/USM.pm
     }
  
     return TRUE;
-@@ -1626,7 +1626,7 @@
+@@ -1626,7 +1626,7 @@ sub _auth_key_validate
     my $key_len =
     {
        AUTH_PROTOCOL_HMACMD5,    [ 16, 'HMAC-MD5'  ],
@@ -113,7 +81,7 @@ Index: libnet-snmp-perl-6.0.1/lib/Net/SNMP/Security/USM.pm
     };
  
     if (!exists $key_len->{$this->{_auth_protocol}}) {
-@@ -1681,7 +1681,7 @@
+@@ -1681,7 +1681,7 @@ sub _priv_key_generate
        if ($this->{_auth_protocol} eq AUTH_PROTOCOL_HMACMD5) {
           $hnnn = Digest::MD5->new();
        } elsif ($this->{_auth_protocol} eq AUTH_PROTOCOL_HMACSHA) {
@@ -122,7 +90,7 @@ Index: libnet-snmp-perl-6.0.1/lib/Net/SNMP/Security/USM.pm
        } else {
           return $this->_error(
              'The authProtocol "%s" is unknown', $this->{_auth_protocol}
-@@ -1783,7 +1783,7 @@
+@@ -1783,7 +1783,7 @@ sub _password_localize
     my $digests =
     {
        AUTH_PROTOCOL_HMACMD5,  'Digest::MD5',
diff --git a/debian/patches/series b/debian/patches/series
index 4ef1393..3047528 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1 @@
-replace_digest_sha1.patch
+01_replace_digest_sha1.patch

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

