[libauthen-htpasswd-perl] 02/03: Replace dependancy on Digest::SHA1 with Digest::SHA. Replace SHA1 with SHA-1 in comments.
Christopher Hoskin
christopher.hoskin at gmail.com
Thu Feb 5 20:28:44 UTC 2015
This is an automated email from the git hooks/post-receive script.
grinorcole-guest pushed a commit to branch master
in repository libauthen-htpasswd-perl.
commit f1ff5d900b674a82c99c51a3a7921864aa7592a0
Author: Christopher Hoskin <christopher.hoskin at gmail.com>
Date: Thu Feb 5 20:25:38 2015 +0000
Replace dependancy on Digest::SHA1 with Digest::SHA. Replace SHA1 with SHA-1 in comments.
---
.gitignore | 1 +
debian/changelog | 5 --
debian/control | 4 +-
debian/patches/digest_sha1_to_sha.patch | 82 +++++++++++++++++++++++++++++++++
debian/patches/series | 1 +
5 files changed, 85 insertions(+), 8 deletions(-)
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..224e7f0
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+.pc/
diff --git a/debian/changelog b/debian/changelog
index 3ce756e..6491bfe 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,6 @@
libauthen-htpasswd-perl (0.171-1) UNRELEASED; urgency=low
TODO:
- - d/control: (cosmetic) I'd remove the commented out libdigest-sha1-perl
- - I suppose that Digest::SHA{,1} is really needed; libdigest-sha1-perl was
- removed from Debian since Digest::SHA is in perl core --> add patch to
- s/Digest::SHA1/Digest::SHA/g everywhere.
- (tip for patches and quilt: http://pkg-perl.alioth.debian.org/howto/quilt.html )
* Initial Release. Closes: #775789
diff --git a/debian/control b/debian/control
index 3311fee..861498b 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,6 @@ Uploaders: Christopher Hoskin <christopher.hoskin at gmail.com>
Build-Depends: debhelper (>= 9)
Build-Depends-Indep: libclass-accessor-perl,
libcrypt-passwdmd5-perl,
-# libdigest-sha1-perl,
libio-lockedfile-perl,
perl
Standards-Version: 3.9.6
@@ -20,13 +19,12 @@ Architecture: all
Depends: ${misc:Depends}, ${perl:Depends},
libclass-accessor-perl,
libcrypt-passwdmd5-perl,
-# libdigest-sha1-perl,
libio-lockedfile-perl
Description: Perl module to read and modify Apache .htpasswd files
Authen::Htpasswd provides a convenient, object-oriented interface to
Apache-style .htpasswd files.
.
- It supports passwords encrypted via MD5, SHA1, and crypt, as well as plain
+ It supports passwords encrypted via MD5, SHA-1, and crypt, as well as plain
(cleartext) passwords.
.
Additional fields after username and password, if present, are accessible via
diff --git a/debian/patches/digest_sha1_to_sha.patch b/debian/patches/digest_sha1_to_sha.patch
new file mode 100644
index 0000000..efe6479
--- /dev/null
+++ b/debian/patches/digest_sha1_to_sha.patch
@@ -0,0 +1,82 @@
+Description: Replace dependancy on Digest::SHA1 with Digest::SHA. Replace SHA1
+ with SHA-1 in comments.
+Author: Christopher Hoskin <christopher.hoskin at gmail.com>
+Forwarded: https://rt.cpan.org/Public/Bug/Display.html?id=101955
+Last-Update: 2015-02-05
+---
+
+--- a/META.json
++++ b/META.json
+@@ -35,7 +35,7 @@
+ "Class::Accessor::Fast" : 0,
+ "Crypt::PasswdMD5" : 0,
+ "Digest" : 0,
+- "Digest::SHA1" : 0,
++ "Digest::SHA" : 0,
+ "IO::LockedFile" : 0,
+ "Scalar::Util" : 0
+ }
+--- a/META.yml
++++ b/META.yml
+@@ -21,7 +21,7 @@
+ Class::Accessor::Fast: 0
+ Crypt::PasswdMD5: 0
+ Digest: 0
+- Digest::SHA1: 0
++ Digest::SHA: 0
+ IO::LockedFile: 0
+ Scalar::Util: 0
+ version: 0.171
+--- a/Makefile.PL
++++ b/Makefile.PL
+@@ -14,7 +14,7 @@
+ 'Class::Accessor::Fast' => 0,
+ 'IO::LockedFile' => 0,
+ 'Digest' => 0,
+- 'Digest::SHA1' => 0,
++ 'Digest::SHA' => 0,
+ 'Crypt::PasswdMD5' => 0,
+ 'Scalar::Util' => 0,
+ },
+--- a/README
++++ b/README
+@@ -26,8 +26,8 @@
+ DESCRIPTION
+ This module provides a convenient, object-oriented interface to
+ Apache-style .htpasswd files. It supports passwords encrypted via MD5,
+- SHA1, and crypt, as well as plain (cleartext) passwords. It requires
+- Crypt::PasswdMD5 for MD5 and Digest::SHA1 for SHA1. Additional fields
++ SHA-1, and crypt, as well as plain (cleartext) passwords. It requires
++ Crypt::PasswdMD5 for MD5 and Digest::SHA for SHA-1. Additional fields
+ after username and password, if present, are accessible via the
+ "extra_info" array.
+
+--- a/lib/Authen/Htpasswd.pm
++++ b/lib/Authen/Htpasswd.pm
+@@ -48,7 +48,7 @@
+ This module provides a convenient, object-oriented interface to Apache-style
+ F<.htpasswd> files.
+
+-It supports passwords encrypted via MD5, SHA1, and crypt, as well as plain
++It supports passwords encrypted via MD5, SHA-1, and crypt, as well as plain
+ (cleartext) passwords.
+
+ Additional fields after username and password, if present, are accessible via
+--- a/t/04core.t
++++ b/t/04core.t
+@@ -28,7 +28,7 @@
+ }
+
+ SKIP: {
+- skip "Digest::SHA1 is required for md5 passwords", 2 unless grep { $_ eq 'sha1' } @{$file->check_hashes};
++ skip "Digest::SHA is required for SHA-1 passwords", 2 unless grep { $_ eq 'sha1' } @{$file->check_hashes};
+ ok( $file->check_user_password(qw/ fred fribble /), 'sha1 password verified' );
+ ok( !$file->check_user_password(qw/ fred frobble /), 'incorrect sha1 password rejected' );
+ }
+@@ -39,4 +39,4 @@
+ my @users = $file->all_users;
+ is( scalar @users, 4, 'returned correct number of users' );
+ is( $users[0]->username, 'bob', 'first user has right name' );
+-is( $users[-1]->username, 'joe', 'last user has right name' );
+\ No newline at end of file
++is( $users[-1]->username, 'joe', 'last user has right name' );
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..5f71163
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+digest_sha1_to_sha.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/libauthen-htpasswd-perl.git
More information about the Pkg-perl-cvs-commits
mailing list