[svn] GnuPG - r4494 - in trunk: . doc keyserver
svn author wk
cvs at cvs.gnupg.org
Fri May 4 11:24:21 CEST 2007
Author: wk
Date: 2007-05-04 11:23:51 +0200 (Fri, 04 May 2007)
New Revision: 4494
Added:
trunk/keyserver/gpg2keys_mailto.in
trunk/keyserver/gpg2keys_test.in
Removed:
trunk/keyserver/gpgkeys_mailto.in
trunk/keyserver/gpgkeys_test.in
Modified:
trunk/ChangeLog
trunk/Makefile.am
trunk/configure.ac
trunk/doc/gpg-agent.texi
trunk/keyserver/ChangeLog
trunk/keyserver/Makefile.am
Log:
Fixed installation of gpg2keys_mailto
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2007-05-04 09:22:18 UTC (rev 4493)
+++ trunk/ChangeLog 2007-05-04 09:23:51 UTC (rev 4494)
@@ -1,3 +1,9 @@
+2007-05-04 Werner Koch <wk at g10code.com>
+
+ * Makefile.am (DISTCHECK_CONFIGURE_FLAGS): Add --enable-mailto
+
+ * configure.ac (AC_CONFIG_FILES): Rename gpgkeys_ to gpg2keys_.
+
2007-03-08 Werner Koch <wk at g10code.com>
Released 2.0.3.
Modified: trunk/Makefile.am
===================================================================
--- trunk/Makefile.am 2007-05-04 09:22:18 UTC (rev 4493)
+++ trunk/Makefile.am 2007-05-04 09:23:51 UTC (rev 4494)
@@ -22,7 +22,7 @@
ACLOCAL_AMFLAGS = -I m4 -I gl/m4
AUTOMAKE_OPTIONS = dist-bzip2
-DISTCHECK_CONFIGURE_FLAGS = --enable-symcryptrun
+DISTCHECK_CONFIGURE_FLAGS = --enable-symcryptrun --enable-mailto
EXTRA_DIST = scripts/config.rpath autogen.sh README.SVN
DISTCLEANFILES = g10defs.h
Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac 2007-05-04 09:22:18 UTC (rev 4493)
+++ trunk/configure.ac 2007-05-04 09:23:51 UTC (rev 4494)
@@ -1321,8 +1321,8 @@
agent/Makefile
scd/Makefile
keyserver/Makefile
-keyserver/gpgkeys_mailto
-keyserver/gpgkeys_test
+keyserver/gpg2keys_mailto
+keyserver/gpg2keys_test
tools/gpg-zip
tools/Makefile
doc/Makefile
Modified: trunk/doc/gpg-agent.texi
===================================================================
--- trunk/doc/gpg-agent.texi 2007-05-04 09:22:18 UTC (rev 4493)
+++ trunk/doc/gpg-agent.texi 2007-05-04 09:23:51 UTC (rev 4494)
@@ -268,7 +268,7 @@
@opindex c
@opindex csh
Format the info output in daemon mode for use with the standard Bourne
-shell respective the C-shell . The default ist to guess it based on the
+shell respective the C-shell . The default is to guess it based on the
environment variable @code{SHELL} which is in almost all cases
sufficient.
Modified: trunk/keyserver/ChangeLog
===================================================================
--- trunk/keyserver/ChangeLog 2007-05-04 09:22:18 UTC (rev 4493)
+++ trunk/keyserver/ChangeLog 2007-05-04 09:23:51 UTC (rev 4494)
@@ -1,3 +1,11 @@
+2007-05-04 Werner Koch <wk at g10code.com>
+
+ * gpgkeys_test.in: Rename to ..
+ * gpg2keys_test.in: .. this.
+ * gpgkeys_mailto.in: Rename to ..
+ * gpg2keys_mailto.in: .. this
+ * Makefile.am: Likewise
+
2007-03-13 David Shaw <dshaw at jabberwocky.com>
From STABLE-BRANCH-1-4
Modified: trunk/keyserver/Makefile.am
===================================================================
--- trunk/keyserver/Makefile.am 2007-05-04 09:22:18 UTC (rev 4493)
+++ trunk/keyserver/Makefile.am 2007-05-04 09:23:51 UTC (rev 4494)
@@ -34,7 +34,7 @@
libexec_PROGRAMS = $(GPGKEYS_LDAP) $(GPGKEYS_HKP) $(GPGKEYS_FINGER) \
$(GPGKEYS_CURL)
libexec_SCRIPTS = $(GPGKEYS_MAILTO)
-noinst_SCRIPTS = gpgkeys_test
+noinst_SCRIPTS = gpg2keys_test
common_libs = ../gl/libgnu.a ../common/libcommon.a ../jnlib/libjnlib.a
other_libs = $(LIBICONV) $(LIBINTL) $(CAPLIBS)
Copied: trunk/keyserver/gpg2keys_mailto.in (from rev 4488, trunk/keyserver/gpgkeys_mailto.in)
===================================================================
--- trunk/keyserver/gpgkeys_mailto.in 2007-04-20 16:59:37 UTC (rev 4488)
+++ trunk/keyserver/gpg2keys_mailto.in 2007-05-04 09:23:51 UTC (rev 4494)
@@ -0,0 +1,225 @@
+#!@PERL@ -w
+
+# gpg2keys_mailto - talk to a email keyserver
+# Copyright (C) 2001, 2002 Free Software Foundation, Inc.
+#
+# This file is part of GnuPG.
+#
+# GnuPG 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.
+#
+# GnuPG is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
+
+use Getopt::Std;
+$Getopt::Std::STANDARD_HELP_VERSION=1;
+$sendmail="@SENDMAIL@ -t";
+
+###
+
+sub VERSION_MESSAGE ()
+{
+ print STDOUT "gpg2keys_mailto (GnuPG) @VERSION@\n";
+}
+
+sub HELP_MESSAGE ()
+{
+ print STDOUT <<EOT
+
+--help Print this help
+--version Print the version
+-o FILE Write output to FILE
+EOT
+}
+
+
+
+getopts('o:');
+
+if(defined($opt_o))
+{
+ open(STDOUT,">$opt_o") || die "Can't open output file $opt_o\n";
+}
+
+if(@ARGV)
+{
+ open(STDIN,$ARGV[0]) || die "Can't open input file $ARGV[0]\n";
+}
+
+($login,$name)=(getpwuid($<))[0,6];
+
+$from="$name <$login>";
+
+while(<STDIN>)
+{
+ last if($_ eq "\n");
+
+ if(/^COMMAND (\S+)/)
+ {
+ $command=$1;
+ }
+
+ if(/^OPAQUE (\S+)/)
+ {
+ $address=$1;
+ }
+
+ if(/^PROGRAM (\S+)/)
+ {
+ $program=$1;
+ }
+
+ if(/^OPTION (\S+)/)
+ {
+ if($1=~/^verbose$/i)
+ {
+ $verbose++;
+ }
+ elsif($1=~/^no-verbose$/i)
+ {
+ $verbose--;
+ }
+ }
+}
+
+$program="(unknown)" if(!defined($program));
+
+if(!defined($address))
+{
+ print STDERR "gpgkeys: no address provided\n";
+ exit(1);
+}
+
+# decode $address
+
+($address,$args)=split(/\?/,$address);
+
+if(defined($args))
+{
+ @pairs = split(/&/, $args);
+ foreach $pair (@pairs)
+ {
+ ($hdr, $val) = split(/=/, $pair);
+ $hdr =~ tr/+/ /;
+ $hdr =~ s/%([a-fA-F0-9][a-fA-F0-9])/pack("C", hex($1))/eg;
+ $val =~ tr/+/ /;
+ $val =~ s/%([a-fA-F0-9][a-fA-F0-9])/pack("C", hex($1))/eg;
+# we only handle "from" right now
+ if($hdr=~/^from$/i)
+ {
+ $from=$val;
+ last;
+ }
+ }
+}
+
+while(<STDIN>)
+{
+ last if($_ eq "\n");
+
+ chomp;
+
+ push(@keys,$_);
+}
+
+# Send response
+
+print "VERSION 1\n";
+print "OPTION OUTOFBAND\n\n";
+
+# Email keyservers get and search the same way
+
+if($command=~/get/i || $command=~/search/i)
+{
+ if($command=~/search/i)
+ {
+ print "COUNT 0\n";
+ }
+
+ foreach $key (@keys)
+ {
+ open(MAIL,"|$sendmail") || die "ERROR: Can't open $sendmail\n";
+ print MAIL "From: $from\n";
+ print MAIL "To: $address\n";
+ if($command=~/get/i)
+ {
+ # mail keyservers don't like long-form keyids
+
+ if(substr($key,0,2) eq "0x")
+ {
+ $key=substr($key,2);
+ }
+
+ if(length($key)>8)
+ {
+ $key=substr($key,-8);
+ }
+
+ print MAIL "Subject: GET 0x$key\n\n";
+ }
+ else
+ {
+ print MAIL "Subject: GET $key\n\n";
+ }
+ print MAIL "GnuPG $program email keyserver request\n";
+ close(MAIL);
+
+ # Tell GnuPG not to expect a key
+ print "KEY $key OUTOFBAND\n";
+
+ if($verbose)
+ {
+ print STDERR "gpgkeys: key $key requested from $address\n";
+ }
+ }
+}
+
+if($command=~/send/i)
+{
+ while(!eof(STDIN))
+ {
+ open(MAIL,"|$sendmail") || die "ERROR: Can't open $sendmail\n";
+ print MAIL "From: $name <$login>\n";
+ print MAIL "To: $address\n";
+ print MAIL "Subject: ADD\n\n";
+
+ while(<STDIN>)
+ {
+ if(/^KEY (\S+) BEGIN$/)
+ {
+ $key=$1;
+ last;
+ }
+ }
+
+ while(<STDIN>)
+ {
+ if(/^KEY \S+ END$/)
+ {
+ last;
+ }
+
+ print MAIL;
+ }
+
+ close(MAIL);
+
+ if($verbose)
+ {
+ print STDERR "gpgkeys: key $key sent to $address\n";
+ }
+ }
+}
+
+
+# Local Variables:
+# mode:perl
+# End:
Copied: trunk/keyserver/gpg2keys_test.in (from rev 4488, trunk/keyserver/gpgkeys_test.in)
===================================================================
--- trunk/keyserver/gpgkeys_test.in 2007-04-20 16:59:37 UTC (rev 4488)
+++ trunk/keyserver/gpg2keys_test.in 2007-05-04 09:23:51 UTC (rev 4494)
@@ -0,0 +1,99 @@
+#!@PERL@
+
+# gpg2keys_test - keyserver code tester
+# Copyright (C) 2001 Free Software Foundation, Inc.
+#
+# This file is part of GnuPG.
+#
+# GnuPG 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.
+#
+# GnuPG is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
+
+use Getopt::Std;
+$Getopt::Std::STANDARD_HELP_VERSION=1;
+
+$|=1;
+
+sub VERSION_MESSAGE ()
+{
+ print STDOUT "gpg2keys_test (GnuPG) @VERSION@\n";
+}
+
+sub HELP_MESSAGE ()
+{
+ print STDOUT <<EOT
+
+--help Print this help
+--version Print the version
+EOT
+}
+
+
+getopts('o:');
+
+print STDERR "gpgkeys_test starting\n";
+
+if(defined($opt_o))
+{
+ print STDERR "Using output file $opt_o\n";
+ open(STDOUT,">$opt_o") || die "Can't open output file $opt_o\n";
+}
+
+if(@ARGV)
+{
+ print STDERR "Using input file $ARGV[0]\n";
+ open(STDIN,$ARGV[0]) || die "Can't open input file $ARGV[0]\n";
+}
+
+# Get the command block
+
+print STDERR "Command block:\n";
+
+while(<STDIN>)
+{
+ last if($_ eq "\n");
+ print STDERR "--command-> $_";
+
+ if(/^COMMAND (\w+)/)
+ {
+ $command=$1;
+ }
+}
+
+# Get the keylist block
+
+print STDERR "Keylist block:\n";
+
+while(<STDIN>)
+{
+ last if($_ eq "\n");
+ print STDERR "--keylist-> $_";
+}
+
+# If it's a SEND, then get the key material
+
+if($command eq "SEND")
+{
+ print STDERR "Key material to send:\n";
+
+ while(<STDIN>)
+ {
+ print STDERR "$_";
+ }
+}
+
+printf STDERR "gpgkeys_test finished\n";
+
+# Local Variables:
+# mode:perl
+# End:
Deleted: trunk/keyserver/gpgkeys_mailto.in
Deleted: trunk/keyserver/gpgkeys_test.in
More information about the Gnupg-commits
mailing list