[SCM] Debian packaging of libdigest-sha-perl branch, master, updated. debian/5.71-2-23-g2f89d01

Salvatore Bonaccorso carnil at debian.org
Wed Jan 16 20:04:22 UTC 2013


The following commit has been merged in the master branch:
commit b45f0b060284294d0df8bcbcd8d1a8bfde13dde0
Author: Salvatore Bonaccorso <carnil at debian.org>
Date:   Wed Jan 16 21:02:08 2013 +0100

    Drop 698172-fix-double-free-in-load-subroutine.patch
    
    Patch is part of Digest::SHA 5.81.

diff --git a/debian/patches/698172-fix-double-free-in-load-subroutine.patch b/debian/patches/698172-fix-double-free-in-load-subroutine.patch
deleted file mode 100644
index 25f8b14..0000000
--- a/debian/patches/698172-fix-double-free-in-load-subroutine.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-Description: corrected load subroutine (SHA.pm) to prevent double-free
- Fix double-free when loading Digest::SHA object representing the
- intermediate SHA state from a file.
-Origin: upstream, https://metacpan.org/diff/release/MSHELOR/Digest-SHA-5.80/MSHELOR/Digest-SHA-5.81
-Bug: https://rt.cpan.org/Ticket/Display.html?id=82655
-Bug-Debian: http://bugs.debian.org/698172
-Forwarded: not-needed
-Author: Salvatore Bonaccorso <carnil at debian.org>
-Last-Update: 2013-01-14
-Applied-Upstream: yes, 5.81
-
---- a/lib/Digest/SHA.pm
-+++ b/lib/Digest/SHA.pm
-@@ -50,7 +50,7 @@
- 			return($class);
- 		}
- 		shaclose($$class) if $$class;
--		$$class = shaopen($alg) || return;
-+		return unless $$class = shaopen($alg);
- 		return($class);
- 	}
- 	$alg = 1 unless defined $alg;
-@@ -163,18 +163,21 @@
- 
- sub dump {
- 	my $self = shift;
--	my $file = shift || "";
-+	my $file = shift;
- 
-+	$file = "" unless defined $file;
- 	shadump($file, $$self) || return;
- 	return($self);
- }
- 
- sub load {
- 	my $class = shift;
--	my $file = shift || "";
-+	my $file = shift;
-+
-+	$file = "" unless defined $file;
- 	if (ref($class)) {	# instance method
- 		shaclose($$class) if $$class;
--		$$class = shaload($file) || return;
-+		return unless $$class = shaload($file);
- 		return($class);
- 	}
- 	my $state = shaload($file) || return;
---- a/src/sha.c
-+++ b/src/sha.c
-@@ -272,7 +272,7 @@
- /* shaopen: creates a new digest object */
- SHA *shaopen(int alg)
- {
--	SHA *s;
-+	SHA *s = NULL;
- 
- 	if (alg != SHA1 && alg != SHA224 && alg != SHA256 &&
- 		alg != SHA384    && alg != SHA512 &&
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 04c11bb..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-698172-fix-double-free-in-load-subroutine.patch

-- 
Debian packaging of libdigest-sha-perl



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