[SCM] packaging of clive-utils branch, master, updated. 2.1.0-9-g6db690a
Damyan Ivanov
dmn at debian.org
Thu Jan 8 09:00:32 UTC 2009
The following commit has been merged in the master branch:
commit 6db690aba2898a57722a6ca087c076ba5859567e
Author: Damyan Ivanov <dmn at debian.org>
Date: Thu Jan 8 06:57:37 2009 +0200
remove dependency on Crypt::Salt and Crypt::Twofish2
the later is replaced with Crypt::Twofish
both patches stolen from upstream git repository
add quilt into the build process; add README.source
diff --git a/debian/README.source b/debian/README.source
new file mode 100644
index 0000000..c03fe38
--- /dev/null
+++ b/debian/README.source
@@ -0,0 +1,4 @@
+clive-utils uses quilt for applying patches to upstream sources during build.
+
+See /usr/share/doc/quilt/README.source for instructions how to woth with quilt
+patches.
diff --git a/debian/changelog b/debian/changelog
index c9e3325..ccef059 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-clive-utils (2.0.0-1) UNRELEASED; urgency=low
+clive-utils (2.1.0-1) UNRELEASED; urgency=low
* Initial release. Split off clive, following upstream split.
diff --git a/debian/control b/debian/control
index 7c9b6bd..149e3ae 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: utils
Priority: optional
Maintainer: Debian Perl Group <pkg-perl-maintainers at lists.alioth.debian.org>
Uploaders: Damyan Ivanov <dmn at debian.org>
-Build-Depends: debhelper (>= 7)
+Build-Depends: debhelper (>= 7), quilt
Build-Depends-Indep:
libconfig-tiny-perl (>= 2.12),
libwww-curl-perl (>= 4.05),
@@ -12,8 +12,7 @@ Build-Depends-Indep:
liburi-perl (>= 1.37),
libhtml-parser-perl (>= 2.37),
libcrypt-passwdmd5-perl (>= 1.3),
- libcrypt-salt-perl,
- libcrypt-twofish2-perl (>= 1.01)
+ libcrypt-twofish-perl (>= 2.12)
Standards-Version: 3.8.0
Homepage: http://code.google.com/p/clive-utils/
@@ -28,8 +27,7 @@ Depends: ${perl:Depends}, ${misc:Depends},
liburi-perl (>= 1.37),
libhtml-parser-perl (>= 2.37),
libcrypt-passwdmd5-perl (>= 1.3),
- libcrypt-salt-perl,
- libcrypt-twofish2-perl (>= 1.01)
+ libcrypt-twofish-perl (>= 2.12)
Description: additional utilities for clive
Contains the following utilities to be used together with clive.
.
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..e9f1baf
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+upstream_drop-Crypt-Salt.patch
+upstream_use-Crypt::Twofish.patch
diff --git a/debian/patches/upstream_drop-Crypt-Salt.patch b/debian/patches/upstream_drop-Crypt-Salt.patch
new file mode 100644
index 0000000..e692662
--- /dev/null
+++ b/debian/patches/upstream_drop-Crypt-Salt.patch
@@ -0,0 +1,65 @@
+commit 6b3f600e89a2e1e78ba6a0c3419b0378c9169809
+Author: legatvs <legatvs at gmail.com>
+Date: Wed Jan 7 21:31:09 2009 +0200
+
+ Removed Crypt::Salt module prereq.
+
+diff --git a/CHANGES b/CHANGES
+index 4b35813..be7226a 100644
+--- a/CHANGES
++++ b/CHANGES
+@@ -18,6 +18,7 @@ Version 2.1.1-dev
+ - Be more verbose
+ - Cleaned up code
+ - clivepass
++ * Removed Crypt::Salt module prereq.
+ * Replaced prereq. module Crypt::Twofish2 with Crypt::Twofish
+
+
+diff --git a/INSTALL b/INSTALL
+index f3e1fa7..27ef0f8 100644
+--- a/INSTALL
++++ b/INSTALL
+@@ -39,7 +39,7 @@ clivepass
+ ---------
+
+ * Crypt::PasswdMD5/1.3 * Crypt::Twofish/2.12
+-* Crypt::Salt/0.01 * Config::Tiny/2.12
++* Config::Tiny/2.12
+
+
+ Installation
+diff --git a/clivepass b/clivepass
+index 5319e60..f6fad9c 100755
+--- 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,2009 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
new file mode 100644
index 0000000..1c9a161
--- /dev/null
+++ b/debian/patches/upstream_use-Crypt::Twofish.patch
@@ -0,0 +1,72 @@
+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.
+
+diff --git a/CHANGES b/CHANGES
+index 03caa36..4b35813 100644
+--- a/CHANGES
++++ b/CHANGES
+@@ -17,6 +17,8 @@ Version 2.1.1-dev
+ * Tweaked genman script
+ - Be more verbose
+ - Cleaned up code
++ - clivepass
++ * Replaced prereq. module Crypt::Twofish2 with Crypt::Twofish
+
+
+ Version 2.1.0
+diff --git a/INSTALL b/INSTALL
+index 05390dd..f3e1fa7 100644
+--- a/INSTALL
++++ b/INSTALL
+@@ -38,7 +38,7 @@ clivescan
+ clivepass
+ ---------
+
+-* Crypt::PasswdMD5/1.3 * Crypt::Twofish2/1.01
++* Crypt::PasswdMD5/1.3 * Crypt::Twofish/2.12
+ * Crypt::Salt/0.01 * Config::Tiny/2.12
+
+
+diff --git a/clivepass b/clivepass
+index 536b376..5319e60 100755
+--- 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,2009 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
diff --git a/debian/rules b/debian/rules
index c737fe2..d35afc9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,6 +1,8 @@
#!/usr/bin/make -f
-build:
+include /usr/share/quilt/quilt.make
+
+build: $(QUILT_STAMPFN)
perl genman
dh $@
for f in feed scan pass; do perl -c clive$f; done
@@ -10,7 +12,7 @@ binary-indep: build
binary-arch:
-clean:
+clean: unpatch
dh $@
dh_clean clivefeed.1 clivescan.1 clivepass.1
--
packaging of clive-utils
More information about the Pkg-perl-cvs-commits
mailing list