[SCM] packaging of clive-utils branch, master, updated. 2.1.0-37-g5320947

[Damyan Ivanov]

The following commit has been merged in the master branch:
commit 565f66eaae52aec81a9898bfafccdd21603dd461
Author: Damyan Ivanov <dmn at debian.org>
Date:   Tue Feb 24 11:13:01 2009 +0200

    drop patches applied upstream

diff --git a/debian/patches/series b/debian/patches/series
index 85b2350..5a504d5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1 @@
-upstream_use-Crypt::Twofish.patch
-upstream_drop-Crypt-Salt.patch
 fix-pod2man-errors.patch
diff --git a/debian/patches/upstream_drop-Crypt-Salt.patch b/debian/patches/upstream_drop-Crypt-Salt.patch
deleted file mode 100644
index f9d3e94..0000000
--- a/debian/patches/upstream_drop-Crypt-Salt.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-# Based on the following upstream commit
-commit 6b3f600e89a2e1e78ba6a0c3419b0378c9169809
-Author: legatvs <legatvs at gmail.com>
-Date:   Wed Jan 7 21:31:09 2009 +0200
-
-    Removed Crypt::Salt module prereq.
-
---- a/clivepass
-+++ b/clivepass
-@@ -24,7 +24,6 @@ use strict;
- binmode(STDOUT, ":utf8");
- 
- use Crypt::PasswdMD5 qw(unix_md5_crypt);
--use Crypt::Salt qw(salt);
- use Crypt::Twofish;
- use Config::Tiny;
- 
-@@ -68,6 +67,12 @@ sub main {
-     }
- }
- 
-+sub salt {
-+    my $l = shift || 2;
-+    return join '', ('.', '/', 0..9, 'A'..'Z', 'a'..'z')
-+        [ map{rand 64} (1..$l) ];
-+}
-+
- sub create_passwd {
-     if ( -e $PASSWDFILE ) {
-         print "WARN: $PASSWDFILE exists already.\n"
-@@ -236,7 +241,7 @@ Copyright (c) 2008 Toni Gundogdu.
-  * Perl/$perl_v
- Modules:
-  * Crypt::PasswdMD5/$Crypt::PasswdMD5::VERSION\t\t* Crypt::Twofish/$Crypt::Twofish::VERSION
-- * Crypt::Salt/$Crypt::Salt::VERSION\t\t* Config::Tiny/$Config::Tiny::VERSION
-+ * Config::Tiny/$Config::Tiny::VERSION
- Core modules:
-  * Getopt::Long/$Getopt::Long::VERSION\t\t* Encode/$Encode::VERSION
-  * File::Spec/$File::Spec::VERSION\t\t* File::Find/$File::Find::VERSION
diff --git a/debian/patches/upstream_use-Crypt::Twofish.patch b/debian/patches/upstream_use-Crypt::Twofish.patch
deleted file mode 100644
index e06044d..0000000
--- a/debian/patches/upstream_use-Crypt::Twofish.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-# Based on the following upstream commit
-commit fe45d60fbc80baf329b5c10ab29bf8d58f41a63f
-Author: legatvs <legatvs at gmail.com>
-Date:   Wed Jan 7 21:20:49 2009 +0200
-
-    Replaced prereq. module Crypt::Twofish2 with Crypt::Twofish.
-
---- a/clivepass
-+++ b/clivepass
-@@ -25,7 +25,7 @@ binmode(STDOUT, ":utf8");
- 
- use Crypt::PasswdMD5 qw(unix_md5_crypt);
- use Crypt::Salt qw(salt);
--use Crypt::Twofish2;
-+use Crypt::Twofish;
- use Config::Tiny;
- 
- # Core modules:
-@@ -153,7 +153,7 @@ sub new_login {
-     print STDERR "error: passwords did not match\n" and exit
-         unless $pwd eq $again;
- 
--    my $c = Crypt::Twofish2->new($key, Crypt::Twofish2::MODE_CBC);
-+    my $c = Crypt::Twofish->new($key);
- 
-     $passwd->{login}->{$user} =
-         encode_base64( $c->encrypt( pack('a16',$pwd) ) );
-@@ -186,7 +186,7 @@ sub get_login {
-     print STDERR qq/error: no such login with the "$opts{get}" /
-         . "username exists\n" and exit unless $pwd;
- 
--    my $c = Crypt::Twofish2->new($key, Crypt::Twofish2::MODE_CBC);
-+    my $c = Crypt::Twofish->new($key);
-     print "login: " .$opts{get}."=". $c->decrypt(decode_base64($pwd)) ."\n";
- }
- 
-@@ -235,7 +235,7 @@ sub print_version {
- Copyright (c) 2008 Toni Gundogdu.
-  * Perl/$perl_v
- Modules:
-- * Crypt::PasswdMD5/$Crypt::PasswdMD5::VERSION\t\t* Crypt::Twofish2/$Crypt::Twofish2::VERSION
-+ * Crypt::PasswdMD5/$Crypt::PasswdMD5::VERSION\t\t* Crypt::Twofish/$Crypt::Twofish::VERSION
-  * Crypt::Salt/$Crypt::Salt::VERSION\t\t* Config::Tiny/$Config::Tiny::VERSION
- Core modules:
-  * Getopt::Long/$Getopt::Long::VERSION\t\t* Encode/$Encode::VERSION

-- 
packaging of clive-utils