r30174 - in /trunk/libgnupg-perl: GnuPG.pm GnuPG/Tie.pm debian/ debian/changelog debian/control debian/copyright debian/dirs debian/docs debian/rules
gregoa at users.alioth.debian.org
gregoa at users.alioth.debian.org
Tue Jan 27 15:41:46 UTC 2009
Author: gregoa
Date: Tue Jan 27 15:41:43 2009
New Revision: 30174
URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=30174
Log:
[svn-inject] Applying Debian modifications to trunk
Added:
trunk/libgnupg-perl/debian/
trunk/libgnupg-perl/debian/changelog
trunk/libgnupg-perl/debian/control
trunk/libgnupg-perl/debian/copyright
trunk/libgnupg-perl/debian/dirs
trunk/libgnupg-perl/debian/docs
trunk/libgnupg-perl/debian/rules (with props)
Modified:
trunk/libgnupg-perl/GnuPG.pm
trunk/libgnupg-perl/GnuPG/Tie.pm
Modified: trunk/libgnupg-perl/GnuPG.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libgnupg-perl/GnuPG.pm?rev=30174&op=diff
==============================================================================
--- trunk/libgnupg-perl/GnuPG.pm (original)
+++ trunk/libgnupg-perl/GnuPG.pm Tue Jan 27 15:41:43 2009
@@ -264,7 +264,7 @@
# some ends must be closed in the child.
#
# Besides this is just plain good hygiene
- my $max_fd = POSIX::sysconf( POSIX::_SC_OPEN_MAX ) || 256;
+ my $max_fd = POSIX::sysconf( &POSIX::_SC_OPEN_MAX ) || 256;
foreach my $f ( 3 .. $max_fd ) {
next if $f == fileno $self->{status_fd};
POSIX::close( $f );
@@ -611,12 +611,30 @@
( $cmd, $arg ) = $self->read_from_status()
if ( $cmd =~ /RSA_OR_IDEA/ );
+ # Ignore automatic key imports
+ ( $cmd, $arg ) = $self->read_from_status()
+ if ( $cmd =~ /IMPORTED/ );
+
+ ( $cmd, $arg ) = $self->read_from_status()
+ if ( $cmd =~ /IMPORT_OK/ );
+
+ ( $cmd, $arg ) = $self->read_from_status()
+ if ( $cmd =~ /IMPORT_RES/ );
+
$self->abort_gnupg( "invalid signature from ", $arg =~ /[^ ](.+)/, "\n" )
if ( $cmd =~ /BADSIG/);
- $self->abort_gnupg( "error verifying signature from ",
- $arg =~ /([^ ])/, "\n" )
- if ( $cmd =~ /ERRSIG/);
+ if ( $cmd =~ /ERRSIG/)
+ {
+ my ($keyid, $key_algo, $digest_algo, $sig_class, $timestamp, $rc)
+ = split ' ', $arg;
+ if ($rc == 9)
+ {
+ ($cmd, $arg) = $self->read_from_status();
+ $self->abort_gnupg( "no public key $keyid" );
+ }
+ $self->abort_gnupg( "error verifying signature from $keyid" )
+ }
$self->abort_gnupg ( "protocol error: expected SIG_ID" )
unless $cmd =~ /SIG_ID/;
@@ -628,6 +646,12 @@
my ( $keyid, $name ) = split /\s+/, $arg, 2;
( $cmd, $arg ) = $self->read_from_status;
+ my $policy_url = undef;
+ if ( $cmd =~ /POLICY_URL/ ) {
+ $policy_url = $arg;
+ ( $cmd, $arg ) = $self->read_from_status;
+ }
+
$self->abort_gnupg ( "protocol error: expected VALIDSIG" )
unless $cmd =~ /VALIDSIG/;
my ( $fingerprint ) = split /\s+/, $arg, 2;
@@ -644,6 +668,7 @@
user => $name,
fingerprint => $fingerprint,
trust => $trust,
+ policy_url => $policy_url,
};
}
@@ -727,19 +752,27 @@
sub decrypt_postread($) {
my $self = shift;
+ my @cmds;
# gnupg 1.0.2 adds this status message
my ( $cmd, $arg ) = $self->read_from_status;
-
- ( $cmd, $arg ) = $self->read_from_status()
- if $cmd =~ /BEGIN_DECRYPTION/;
+ push @cmds, $cmd;
+
+ if ($cmd =~ /BEGIN_DECRYPTION/) {
+ ( $cmd, $arg ) = $self->read_from_status();
+ push @cmds, $cmd;
+ };
my $sig = undef;
- if ( $cmd =~ /SIG_ID/ ) {
- $sig = $self->check_sig( $cmd, $arg );
- ( $cmd, $arg ) = $self->read_from_status;
- }
-
- $self->abort_gnupg( "protocol error: expected DECRYPTION_OKAY got $cmd: \n" )
+ while (defined $cmd && !($cmd =~ /DECRYPTION_OKAY/)) {
+ if ( $cmd =~ /SIG_ID/ ) {
+ $sig = $self->check_sig( $cmd, $arg );
+ }
+ ( $cmd, $arg ) = $self->read_from_status();
+ push @cmds, $cmd if defined $cmd;
+ };
+
+ my $cmds = join ', ', @cmds;
+ $self->abort_gnupg( "protocol error: expected DECRYPTION_OKAY but never got it (all I saw was: $cmds): \n" )
unless $cmd =~ /DECRYPTION_OKAY/;
return $sig ? $sig : 1;
Modified: trunk/libgnupg-perl/GnuPG/Tie.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libgnupg-perl/GnuPG/Tie.pm?rev=30174&op=diff
==============================================================================
--- trunk/libgnupg-perl/GnuPG/Tie.pm (original)
+++ trunk/libgnupg-perl/GnuPG/Tie.pm Tue Jan 27 15:41:43 2009
@@ -336,7 +336,7 @@
use GnuPG::Tie::Decrypt;
tie *CIPHER, 'GnuPG::Tie::Encrypt', armor => 1, recipient => 'User';
- print CIPHER <<EOF
+ print CIPHER <<EOF;
This is a secret
EOF
local $/ = undef;
@@ -350,7 +350,7 @@
# $plaintext should now contains 'This is a secret'
close PLAINTEXT;
- untie *PLAINTEXT
+ untie *PLAINTEXT;
=head1 DESCRIPTION
Added: trunk/libgnupg-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libgnupg-perl/debian/changelog?rev=30174&op=file
==============================================================================
--- trunk/libgnupg-perl/debian/changelog (added)
+++ trunk/libgnupg-perl/debian/changelog Tue Jan 27 15:41:43 2009
@@ -1,0 +1,108 @@
+libgnupg-perl (0.9-9) unstable; urgency=low
+
+ * Make/sh prefers "! [ -d foo ]" over "![ -d foo ]". It didn't really
+ matter because there was a "|| rmdir foo" after that and the directory
+ existed, but it prints ugly warnings that I missed before.
+
+ -- Peter Palfrader <weasel at debian.org> Sun, 18 Jun 2006 01:32:22 +0200
+
+libgnupg-perl (0.9-8) unstable; urgency=low
+
+ * Move debhelper from Build-Depends-Indep to Build-Depends.
+ * Apply patch by Andrew Suffield to handle key retrival by GnuPG caused by
+ 'keyserver-options auto-key-retrieve' (closes: #269627). Thanks.
+ * Apply patch by Andrew Suffield to properly propagte that reason
+ for verification errors when the key is not around (closes: #310792).
+ Thanks once more.
+ * Instead of defining INSTALLBIN, INSTALLSCRIPT, etc just say
+ INSTALLDIRS=vendor in debian/rules, and set PREFIX for the install.
+ * Also use make install and not make pure_install.
+ * Remove code to remove .packlist files from the install target.
+ * Remove lots of comments (and unused, commented out lines) from
+ debian/rules.
+ * Remove usr/sbin from debian/dirs (debhelper). We don't put anything
+ there.
+ * Remove empty usr/lib/perl5 and usr/lib after make install.
+ * Update Standards-Version to 3.7.2 from 3.6.1 (without additional changes).
+
+ -- Peter Palfrader <weasel at debian.org> Sat, 17 Jun 2006 20:43:37 +0200
+
+libgnupg-perl (0.9-7) unstable; urgency=low
+
+ * GnuPG::Perl looks to be quite unmaintained upstream, so I recomment
+ people use other modules, like GnuPG::Interface maybe, however
+ apply Adrian's patch for his POLICY_URL problem. GnuPG.pm would
+ complain about protocol violations when a signature had more
+ information (like a POLICY_URL) than it expected (Closes: #316065).
+ * Change from debhelper compat level 2 to 4, and change build depends
+ accordingly.
+
+ -- Peter Palfrader <weasel at debian.org> Sun, 10 Jul 2005 11:53:08 +0200
+
+libgnupg-perl (0.9-6) unstable; urgency=low
+
+ * GnuPG 1.2.5 introduced a few more status lines when decrypting/verifying
+ files. GnuPG.pm would not handle that properly. We now eat all the
+ status lines in decrypt_postread() (closes: #298556).
+
+ -- Peter Palfrader <weasel at debian.org> Tue, 8 Mar 2005 20:55:41 +0100
+
+libgnupg-perl (0.9-5) unstable; urgency=low
+
+ * Change section to perl to fix override disparity.
+
+ -- Peter Palfrader <weasel at debian.org> Sun, 25 Apr 2004 16:46:09 +0200
+
+libgnupg-perl (0.9-4) unstable; urgency=low
+
+ * Install non binary perl into usr/share rather than usr/lib.
+ * Slight changes to debian/copyright: replace "author(s)" with
+ "author", refer to GPL-2 rather than GPL.
+ * Update standards version to 3.6.1.
+ * Fix build dependency on debhelper: it needs to be versioned (>=2).
+ * Don't end short desciprtion with a dot.
+
+ -- Peter Palfrader <weasel at debian.org> Sun, 25 Apr 2004 15:27:54 +0200
+
+libgnupg-perl (0.9-3) unstable; urgency=low
+
+ * New Standards-Version: 3.5.7
+ - Have no /usr/doc link anymore (actually building against the new
+ debhelper does fix this - I'll not depend on it tho to make
+ building it on older releases easier)
+ - Change Build-Depends to Build-Depends-Indep
+
+ -- Peter Palfrader <weasel at debian.org> Mon, 11 Nov 2002 13:37:14 +0100
+
+libgnupg-perl (0.9-2) unstable; urgency=low
+
+ * Moved from non-US to main (Section: interpreters).
+
+ -- Peter Palfrader <weasel at debian.org> Mon, 17 Jun 2002 20:25:34 +0200
+
+libgnupg-perl (0.9-1) unstable; urgency=low
+
+ * New upstream version (closes: #99647);
+ * Upped Standards-Version to 3.5.4.
+ * Applied patch to make it work under strict subs:
+ @@ -267 +267 @@
+ - my $max_fd = POSIX::sysconf( POSIX::_SC_OPEN_MAX ) || 256;
+ + my $max_fd = POSIX::sysconf( &POSIX::_SC_OPEN_MAX ) || 256;
+ Thanks to Radu Muschevici <radu at stusta.mhn.de> (closes: #117689).
+ * Also remove empty stuff from usr/lib/perl.
+
+ -- Peter Palfrader <weasel at debian.org> Wed, 7 Nov 2001 17:23:00 +0100
+
+libgnupg-perl (0.7-2) unstable; urgency=low
+
+ * Fixed example in GnuPG::Tie manpage (closes: #90703).
+ * Upped Standards-Version to 3.5.2.
+ * Removed dependency on perl5. perl-base is essential and sufficent.
+
+ -- Peter Palfrader <weasel at debian.org> Sun, 25 Mar 2001 21:07:14 +0200
+
+libgnupg-perl (0.7-1) unstable; urgency=low
+
+ * Initial Release (closes: #76184).
+
+ -- Peter Palfrader <weasel at debian.org> Thu, 4 Jan 2001 02:21:44 +0100
Added: trunk/libgnupg-perl/debian/control
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libgnupg-perl/debian/control?rev=30174&op=file
==============================================================================
--- trunk/libgnupg-perl/debian/control (added)
+++ trunk/libgnupg-perl/debian/control Tue Jan 27 15:41:43 2009
@@ -1,0 +1,29 @@
+Source: libgnupg-perl
+Section: perl
+Priority: optional
+Maintainer: Peter Palfrader <weasel at debian.org>
+Build-Depends: debhelper (>= 4)
+Standards-Version: 3.7.2
+
+Package: libgnupg-perl
+Architecture: all
+Depends: gnupg
+Description: Perl module interface to GnuPG using GnuPG's coprocess interface
+ GnuPG is a perl module that interface with the Gnu Privacy Guard using
+ the coprocess hooks provided by gpg. The communication mechanism uses
+ is shared memory and a status file descriptor.
+ .
+ The module tries it best to map the rather interactive interface
+ of gpg to a more programmatic API.
+ .
+ Also the modules now offers a tied file handle interface to encryption
+ and decryption making a lot more easy to use.
+ .
+ This module doesn't yet provides an interface to the key manipulation
+ facilities of gpg.
+ .
+ It doesn't also provides the memory protection offered by gpg when
+ manipulating user passphrase.
+ .
+ There are also several options (like cipher selections) that aren't
+ available from the perl API.
Added: trunk/libgnupg-perl/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libgnupg-perl/debian/copyright?rev=30174&op=file
==============================================================================
--- trunk/libgnupg-perl/debian/copyright (added)
+++ trunk/libgnupg-perl/debian/copyright Tue Jan 27 15:41:43 2009
@@ -1,0 +1,19 @@
+This package was debianized by Peter Palfrader <ppalfrad at cosy.sbg.ac.at> on
+Fri, 3 Nov 2000 14:33:54 +0100.
+
+It was downloaded from http://www.cpan.org/modules/by-module/GnuPG/
+
+Upstream Author: Francis J. Lacoste <francis.lacoste at iNsu.COM>
+
+Copyright:
+
+Copyright (c) 1999, 2000 iNsu Innovations Inc.
+All rights reserved.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+On Debian systems the entire text of version 2 of the GPL can be
+found in /usr/share/common-licenses/GPL-2.
Added: trunk/libgnupg-perl/debian/dirs
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libgnupg-perl/debian/dirs?rev=30174&op=file
==============================================================================
--- trunk/libgnupg-perl/debian/dirs (added)
+++ trunk/libgnupg-perl/debian/dirs Tue Jan 27 15:41:43 2009
@@ -1,0 +1,1 @@
+usr/bin
Added: trunk/libgnupg-perl/debian/docs
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libgnupg-perl/debian/docs?rev=30174&op=file
==============================================================================
--- trunk/libgnupg-perl/debian/docs (added)
+++ trunk/libgnupg-perl/debian/docs Tue Jan 27 15:41:43 2009
@@ -1,0 +1,2 @@
+NEWS
+README
Added: trunk/libgnupg-perl/debian/rules
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libgnupg-perl/debian/rules?rev=30174&op=file
==============================================================================
--- trunk/libgnupg-perl/debian/rules (added)
+++ trunk/libgnupg-perl/debian/rules Tue Jan 27 15:41:43 2009
@@ -1,0 +1,56 @@
+#!/usr/bin/make -f
+
+#export DH_VERBOSE=1
+export DH_COMPAT=4
+
+ifndef PERL
+ PERL = /usr/bin/perl
+endif
+
+configure: configure-stamp
+configure-stamp:
+ dh_testdir
+ $(PERL) Makefile.PL INSTALLDIRS=vendor
+ touch configure-stamp
+
+build: configure-stamp build-stamp
+build-stamp:
+ dh_testdir
+ $(MAKE)
+ touch build-stamp
+
+clean:
+ dh_testdir
+ dh_testroot
+ rm -f build-stamp configure-stamp
+ if [ -e Makefile ]; then $(MAKE) -i distclean; fi
+ dh_clean
+
+install: build
+ dh_testdir
+ dh_testroot
+ dh_clean -k
+ dh_installdirs
+
+ $(MAKE) install PREFIX=$(CURDIR)/debian/libgnupg-perl/usr
+ ! [ -d $(CURDIR)/debian/libgnupg-perl/usr/lib/perl5 ] || rmdir $(CURDIR)/debian/libgnupg-perl/usr/lib/perl5
+ ! [ -d $(CURDIR)/debian/libgnupg-perl/usr/lib ] || rmdir $(CURDIR)/debian/libgnupg-perl/usr/lib
+
+binary-indep: build install
+ dh_testdir
+ dh_testroot
+ dh_installdocs
+ dh_installchangelogs ChangeLog
+ dh_strip
+ dh_compress
+ dh_fixperms
+ dh_installdeb
+ dh_perl
+ dh_shlibdeps
+ dh_gencontrol
+ dh_md5sums
+ dh_builddeb
+
+binary-arch: build install
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install
Propchange: trunk/libgnupg-perl/debian/rules
------------------------------------------------------------------------------
svn:executable = *
More information about the Pkg-perl-cvs-commits
mailing list