This is an automated email from the git hooks/post-receive script. intrigeri pushed a commit to branch master in repository libgnupg-interface-perl.
commit 2b0e37816f44ac996a4f66b81add55724b9c36e0 Author: intrigeri <intrig...@boum.org> Date: Thu Aug 25 08:20:58 2016 +0000 New patch: use GnuPG 1.x by default. (Closes: #834281) --- .../Use-GnuPG-1.x-by-default.-Closes-834281.patch | 114 +++++++++++++++++++++ debian/patches/series | 1 + 2 files changed, 115 insertions(+) diff --git a/debian/patches/Use-GnuPG-1.x-by-default.-Closes-834281.patch b/debian/patches/Use-GnuPG-1.x-by-default.-Closes-834281.patch new file mode 100644 index 0000000..6fd519f --- /dev/null +++ b/debian/patches/Use-GnuPG-1.x-by-default.-Closes-834281.patch @@ -0,0 +1,114 @@ +From: intrigeri <intrig...@boum.org> +Date: Thu, 25 Aug 2016 08:20:00 +0000 +Subject: Use GnuPG 1.x by default. (Closes: #834281) + +We can drop this patch once upstream supports GnuPG 2.x properly. +--- + Makefile.PL | 12 ++++++------ + lib/GnuPG/Interface.pm | 12 ++++++------ + lib/GnuPG/Signature.pm | 2 +- + t/Interface.t | 2 +- + 4 files changed, 14 insertions(+), 14 deletions(-) + +diff --git a/Makefile.PL b/Makefile.PL +index 38aca27..57d29a5 100644 +--- a/Makefile.PL ++++ b/Makefile.PL +@@ -2,14 +2,14 @@ use strict; + use warnings; + use inc::Module::Install; + +-print "which gpg ... "; +-system("which", "gpg"); +-die "gpg (GnuPG) not found" if ( $? != 0 ); ++print "which gpg1 ... "; ++system("which", "gpg1"); ++die "gpg1 (GnuPG) not found" if ( $? != 0 ); + +-my $output = `gpg --version`; +-die "Can't determine gpg version" ++my $output = `gpg1 --version`; ++die "Can't determine gpg1 version" + unless $output =~ /^gpg \(GnuPG.*?\) (\d+\.\d+)/; +-die "gpg (GnuPG) 1.4 or later is required" unless $1 >= 1.4; ++die "gpg1 (GnuPG) 1.4 or later is required" unless $1 >= 1.4; + + + author 'Frank J. Tobin'; +diff --git a/lib/GnuPG/Interface.pm b/lib/GnuPG/Interface.pm +index f952f3e..5af2530 100644 +--- a/lib/GnuPG/Interface.pm ++++ b/lib/GnuPG/Interface.pm +@@ -50,7 +50,7 @@ sub gnupg_call { shift->call(@_); } + sub BUILD { + my ( $self, $args ) = @_; + +- $self->hash_init( call => 'gpg' ); ++ $self->hash_init( call => 'gpg1' ); + $self->hash_init(%$args); + } + +@@ -959,7 +959,7 @@ initialization of data members. + =item search_keys( % ) + + These methods each correspond directly to or are very similar +-to a GnuPG command described in L<gpg>. Each of these methods ++to a GnuPG command described in L<gpg1>. Each of these methods + takes a hash, which currently must contain a key of B<handles> + which has the value of a GnuPG::Handles object. + Another optional key is B<command_args> which should have the value of an +@@ -967,7 +967,7 @@ array reference; these arguments will be passed to GnuPG as command arguments. + These command arguments are used for such things as determining the keys to + list in the B<export_keys> method. I<Please note that GnuPG command arguments + are not the same as GnuPG options>. To understand what are options and +-what are command arguments please read L<gpg/"COMMANDS"> and L<gpg/"OPTIONS">. ++what are command arguments please read L<gpg1/"COMMANDS"> and L<gpg1/"OPTIONS">. + + Each of these calls returns the PID for the resulting GnuPG process. + One can use this PID in a C<waitpid> call instead of a C<wait> call +@@ -1096,8 +1096,8 @@ keys to list in a key-listing. + + =item call + +-This defines the call made to invoke GnuPG. Defaults to 'gpg'; this +-should be changed if 'gpg' is not in your path, or there is a different ++This defines the call made to invoke GnuPG. Defaults to 'gpg1'; this ++should be changed if 'gpg1' is not in your path, or there is a different + name for the binary on your system. + + =item passphrase +@@ -1347,7 +1347,7 @@ L<GnuPG::Options>, + L<GnuPG::Handles>, + L<GnuPG::PublicKey>, + L<GnuPG::SecretKey>, +-L<gpg>, ++L<gpg1>, + L<perlipc/"Bidirectional Communication with Another Process"> + + =head1 LICENSE +diff --git a/lib/GnuPG/Signature.pm b/lib/GnuPG/Signature.pm +index 5020bb7..1abaca9 100644 +--- a/lib/GnuPG/Signature.pm ++++ b/lib/GnuPG/Signature.pm +@@ -114,7 +114,7 @@ uses at least the following characters: "!" means valid, "-" means not + valid, "?" means unknown (e.g. if the supposed signing key is not + present in the local keyring), and "%" means an error occurred (e.g. a + non-supported algorithm). See the documentation for --check-sigs in +-gpg(1). ++gpg1(1). + + =item algo_num + +diff --git a/t/Interface.t b/t/Interface.t +index 6d97956..a74c0bd 100644 +--- a/t/Interface.t ++++ b/t/Interface.t +@@ -10,7 +10,7 @@ use MyTest; + + use GnuPG::Interface; + +-my $v1 = 'gpg'; ++my $v1 = 'gpg1'; + my $v2 = 'gnupg'; + + my $gnupg = GnuPG::Interface->new( call => $v1 ); diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..7654c86 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +Use-GnuPG-1.x-by-default.-Closes-834281.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/libgnupg-interface-perl.git _______________________________________________ Pkg-perl-cvs-commits mailing list Pkg-perl-cvs-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-perl-cvs-commits