r17000 - in /trunk/libmodule-signature-perl: debian/changelog debian/control debian/patches/ debian/patches/keyserver.patch debian/patches/series debian/rules t/0-signature.t
gregoa-guest at users.alioth.debian.org
gregoa-guest at users.alioth.debian.org
Sat Mar 8 23:15:59 UTC 2008
Author: gregoa-guest
Date: Sat Mar 8 23:15:59 2008
New Revision: 17000
URL: http://svn.debian.org/wsvn/?sc=1&rev=17000
Log:
Split the changes regarding the default keyserver (cf. #293080) out to
keyserver.patch; and don't change the keyserver only in the test (which
isn't actually run because it would fail due to the patch -- d'oh) but
also in the module (and it's documentation) itself, which was the
intention of the bug submitter ... Add quilt framework.
Added:
trunk/libmodule-signature-perl/debian/patches/
trunk/libmodule-signature-perl/debian/patches/keyserver.patch
trunk/libmodule-signature-perl/debian/patches/series
Modified:
trunk/libmodule-signature-perl/debian/changelog
trunk/libmodule-signature-perl/debian/control
trunk/libmodule-signature-perl/debian/rules
trunk/libmodule-signature-perl/t/0-signature.t
Modified: trunk/libmodule-signature-perl/debian/changelog
URL: http://svn.debian.org/wsvn/trunk/libmodule-signature-perl/debian/changelog?rev=17000&op=diff
==============================================================================
--- trunk/libmodule-signature-perl/debian/changelog (original)
+++ trunk/libmodule-signature-perl/debian/changelog Sat Mar 8 23:15:59 2008
@@ -12,8 +12,13 @@
* Add debian/compat instead of setting DH_COMPAT in debian/rules.
* debian/copyright: add download URL and copy copyright/license terms
verbatim from README to match reality.
+ * Split the changes regarding the default keyserver (cf. #293080) out to
+ keyserver.patch; and don't change the keyserver only in the test (which
+ isn't actually run because it would fail due to the patch -- d'oh) but
+ also in the module (and it's documentation) itself, which was the
+ intention of the bug submitter ... Add quilt framework.
- -- gregor herrmann <gregor+debian at comodo.priv.at> Sat, 08 Mar 2008 23:59:52 +0100
+ -- gregor herrmann <gregor+debian at comodo.priv.at> Sun, 09 Mar 2008 00:13:10 +0100
libmodule-signature-perl (0.55-1) unstable; urgency=low
Modified: trunk/libmodule-signature-perl/debian/control
URL: http://svn.debian.org/wsvn/trunk/libmodule-signature-perl/debian/control?rev=17000&op=diff
==============================================================================
--- trunk/libmodule-signature-perl/debian/control (original)
+++ trunk/libmodule-signature-perl/debian/control Sat Mar 8 23:15:59 2008
@@ -1,7 +1,7 @@
Source: libmodule-signature-perl
Section: perl
Priority: optional
-Build-Depends: debhelper (>= 5.0)
+Build-Depends: debhelper (>= 5.0), quilt
Build-Depends-Indep: perl (>= 5.8.0-7), libtest-simple-perl, libdigest-sha1-perl, libdigest-sha-perl, libpar-dist-perl, gnupg
Maintainer: Debian Perl Group <pkg-perl-maintainers at lists.alioth.debian.org>
Uploaders: Krzysztof Krzyzaniak (eloy) <eloy at debian.org>, gregor herrmann <gregor+debian at comodo.priv.at>
Added: trunk/libmodule-signature-perl/debian/patches/keyserver.patch
URL: http://svn.debian.org/wsvn/trunk/libmodule-signature-perl/debian/patches/keyserver.patch?rev=17000&op=file
==============================================================================
--- trunk/libmodule-signature-perl/debian/patches/keyserver.patch (added)
+++ trunk/libmodule-signature-perl/debian/patches/keyserver.patch Sat Mar 8 23:15:59 2008
@@ -1,0 +1,31 @@
+--- libmodule-signature-perl.orig/t/0-signature.t
++++ libmodule-signature-perl/t/0-signature.t
+@@ -18,7 +18,7 @@
+ elsif ( -s 'SIGNATURE' == 0 ) {
+ plan skip_all => "SIGNATURE file empty";
+ }
+-elsif (!eval { require Socket; Socket::inet_aton('pgp.mit.edu') }) {
++elsif (!eval { require Socket; Socket::inet_aton('subkeys.pgp.net') }) {
+ plan skip_all => "Cannot connect to the keyserver to check module ".
+ "signature";
+ }
+--- libmodule-signature-perl.orig/lib/Module/Signature.pm
++++ libmodule-signature-perl/lib/Module/Signature.pm
+@@ -29,7 +29,7 @@
+ $SIGNATURE = 'SIGNATURE';
+ $Timeout = $ENV{MODULE_SIGNATURE_TIMEOUT} || 3;
+ $Verbose = $ENV{MODULE_SIGNATURE_VERBOSE} || 0;
+-$KeyServer = $ENV{MODULE_SIGNATURE_KEYSERVER} || 'pgp.mit.edu';
++$KeyServer = $ENV{MODULE_SIGNATURE_KEYSERVER} || 'subkeys.pgp.net';
+ $KeyServerPort = $ENV{MODULE_SIGNATURE_KEYSERVERPORT} || '11371';
+ $Cipher = $ENV{MODULE_SIGNATURE_CIPHER} || 'SHA1';
+ $Preamble = << ".";
+@@ -826,7 +826,7 @@
+ "Next time around, consider install Module::Signature, ",
+ "so you can verify the integrity of this distribution.\n";
+ }
+- elsif (!eval { require Socket; Socket::inet_aton('pgp.mit.edu') }) {
++ elsif (!eval { require Socket; Socket::inet_aton('subkeys.pgp.net') }) {
+ print "ok 1 # skip ",
+ "Cannot connect to the keyserver\n";
+ }
Added: trunk/libmodule-signature-perl/debian/patches/series
URL: http://svn.debian.org/wsvn/trunk/libmodule-signature-perl/debian/patches/series?rev=17000&op=file
==============================================================================
--- trunk/libmodule-signature-perl/debian/patches/series (added)
+++ trunk/libmodule-signature-perl/debian/patches/series Sat Mar 8 23:15:59 2008
@@ -1,0 +1,1 @@
+keyserver.patch
Modified: trunk/libmodule-signature-perl/debian/rules
URL: http://svn.debian.org/wsvn/trunk/libmodule-signature-perl/debian/rules?rev=17000&op=diff
==============================================================================
--- trunk/libmodule-signature-perl/debian/rules (original)
+++ trunk/libmodule-signature-perl/debian/rules Sat Mar 8 23:15:59 2008
@@ -6,6 +6,8 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
+
+include /usr/share/quilt/quilt.make
# If set to a true value then MakeMaker's prompt function will
# always return the default without waiting for user input.
@@ -20,7 +22,7 @@
TMP =$(CURDIR)/debian/$(PACKAGE)
build: build-stamp
-build-stamp:
+build-stamp: $(QUILT_STAMPFN)
dh_testdir
$(PERL) Makefile.PL INSTALLDIRS=vendor
@@ -29,7 +31,7 @@
touch $@
-clean:
+clean: unpatch
dh_testdir
dh_testroot
Modified: trunk/libmodule-signature-perl/t/0-signature.t
URL: http://svn.debian.org/wsvn/trunk/libmodule-signature-perl/t/0-signature.t?rev=17000&op=diff
==============================================================================
--- trunk/libmodule-signature-perl/t/0-signature.t (original)
+++ trunk/libmodule-signature-perl/t/0-signature.t Sat Mar 8 23:15:59 2008
@@ -18,7 +18,7 @@
elsif ( -s 'SIGNATURE' == 0 ) {
plan skip_all => "SIGNATURE file empty";
}
-elsif (!eval { require Socket; Socket::inet_aton('subkeys.pgp.net') }) {
+elsif (!eval { require Socket; Socket::inet_aton('pgp.mit.edu') }) {
plan skip_all => "Cannot connect to the keyserver to check module ".
"signature";
}
More information about the Pkg-perl-cvs-commits
mailing list