[src/trunk]: src/crypto/external/bsd/netpgp/dist minor changes to the ssh hos...

[agc <agc%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/43256abe3320
branches:  trunk
changeset: 756229:43256abe3320
user:      agc <agc%NetBSD.org@localhost>
date:      Fri Jul 09 05:36:28 2010 +0000

description:
minor changes to the ssh host key test invocations

diffstat:

 crypto/external/bsd/netpgp/dist/TODO                      |   3 +-
 crypto/external/bsd/netpgp/dist/configure                 |  22 +++++++-------
 crypto/external/bsd/netpgp/dist/configure.ac              |   6 ++--
 crypto/external/bsd/netpgp/dist/src/netpgp/Makefile       |   6 ++--
 crypto/external/bsd/netpgp/dist/src/netpgpverify/Makefile |   6 ++--
 crypto/external/bsd/netpgp/dist/tst                       |   6 ++--
 6 files changed, 25 insertions(+), 24 deletions(-)

diffs (189 lines):

diff -r f6cecd37ffa7 -r 43256abe3320 crypto/external/bsd/netpgp/dist/TODO
--- a/crypto/external/bsd/netpgp/dist/TODO      Fri Jul 09 05:35:34 2010 +0000
+++ b/crypto/external/bsd/netpgp/dist/TODO      Fri Jul 09 05:36:28 2010 +0000
@@ -1,5 +1,6 @@
 To Do
 =====
+elgamal enc/decryption?
 agent
 agentctl
 convert to and from ascii armored sigs
@@ -12,7 +13,7 @@
 64-bit offsets
 thresholds
 default compression when signing?
-elgamal enc/decryption?
+json/yaml output
 
 Done
 ====
diff -r f6cecd37ffa7 -r 43256abe3320 crypto/external/bsd/netpgp/dist/configure
--- a/crypto/external/bsd/netpgp/dist/configure Fri Jul 09 05:35:34 2010 +0000
+++ b/crypto/external/bsd/netpgp/dist/configure Fri Jul 09 05:36:28 2010 +0000
@@ -1,7 +1,7 @@
 #! /bin/sh
-# From configure.ac Revision: 1.31 .
+# From configure.ac Revision: 1.32 .
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.63 for netpgp 20100531.
+# Generated by GNU Autoconf 2.63 for netpgp 20100707.
 #
 # Report bugs to <Alistair Crooks <agc%netbsd.org@localhost> c0596823>.
 #
@@ -751,8 +751,8 @@
 # Identity of this package.
 PACKAGE_NAME='netpgp'
 PACKAGE_TARNAME='netpgp'
-PACKAGE_VERSION='20100531'
-PACKAGE_STRING='netpgp 20100531'
+PACKAGE_VERSION='20100707'
+PACKAGE_STRING='netpgp 20100707'
 PACKAGE_BUGREPORT='Alistair Crooks <agc%netbsd.org@localhost> c0596823'
 
 ac_unique_file="src/netpgp/netpgp.c"
@@ -1483,7 +1483,7 @@
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures netpgp 20100531 to adapt to many kinds of systems.
+\`configure' configures netpgp 20100707 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1553,7 +1553,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of netpgp 20100531:";;
+     short | recursive ) echo "Configuration of netpgp 20100707:";;
    esac
   cat <<\_ACEOF
 
@@ -1660,7 +1660,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-netpgp configure 20100531
+netpgp configure 20100707
 generated by GNU Autoconf 2.63
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1674,7 +1674,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by netpgp $as_me 20100531, which was
+It was created by netpgp $as_me 20100707, which was
 generated by GNU Autoconf 2.63.  Invocation command line was
 
   $ $0 $@
@@ -2561,7 +2561,7 @@
 
 # Define the identity of the package.
  PACKAGE='netpgp'
- VERSION='20100531'
+ VERSION='20100707'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -22306,7 +22306,7 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by netpgp $as_me 20100531, which was
+This file was extended by netpgp $as_me 20100707, which was
 generated by GNU Autoconf 2.63.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -22369,7 +22369,7 @@
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_version="\\
-netpgp config.status 20100531
+netpgp config.status 20100707
 configured by $0, generated by GNU Autoconf 2.63,
   with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 
diff -r f6cecd37ffa7 -r 43256abe3320 crypto/external/bsd/netpgp/dist/configure.ac
--- a/crypto/external/bsd/netpgp/dist/configure.ac      Fri Jul 09 05:35:34 2010 +0000
+++ b/crypto/external/bsd/netpgp/dist/configure.ac      Fri Jul 09 05:36:28 2010 +0000
@@ -1,10 +1,10 @@
-# $NetBSD: configure.ac,v 1.32 2010/06/01 05:55:55 agc Exp $
+# $NetBSD: configure.ac,v 1.33 2010/07/09 05:36:28 agc Exp $
 #
 # Process this file with autoconf to produce a configure script.
 
-AC_INIT([netpgp],[20100531],[Alistair Crooks <agc%netbsd.org@localhost> c0596823])
+AC_INIT([netpgp],[20100707],[Alistair Crooks <agc%netbsd.org@localhost> c0596823])
 AC_PREREQ(2.63)
-AC_REVISION([$Revision: 1.32 $])
+AC_REVISION([$Revision: 1.33 $])
 
 AS_SHELL_SANITIZE
 
diff -r f6cecd37ffa7 -r 43256abe3320 crypto/external/bsd/netpgp/dist/src/netpgp/Makefile
--- a/crypto/external/bsd/netpgp/dist/src/netpgp/Makefile       Fri Jul 09 05:35:34 2010 +0000
+++ b/crypto/external/bsd/netpgp/dist/src/netpgp/Makefile       Fri Jul 09 05:36:28 2010 +0000
@@ -117,16 +117,16 @@
 PACKAGE = netpgp
 PACKAGE_BUGREPORT = Alistair Crooks <agc%netbsd.org@localhost> c0596823
 PACKAGE_NAME = netpgp
-PACKAGE_STRING = netpgp 20100531
+PACKAGE_STRING = netpgp 20100707
 PACKAGE_TARNAME = netpgp
-PACKAGE_VERSION = 20100531
+PACKAGE_VERSION = 20100707
 PATH_SEPARATOR = :
 RANLIB = ranlib
 SED = /usr/bin/sed
 SET_MAKE = 
 SHELL = /bin/ksh
 STRIP = strip
-VERSION = 20100531
+VERSION = 20100707
 WARNCFLAGS = -Werror -Wall -Wpointer-arith
 abs_builddir = /usr/src/crypto/external/bsd/netpgp/dist/src/netpgp
 abs_srcdir = /usr/src/crypto/external/bsd/netpgp/dist/src/netpgp
diff -r f6cecd37ffa7 -r 43256abe3320 crypto/external/bsd/netpgp/dist/src/netpgpverify/Makefile
--- a/crypto/external/bsd/netpgp/dist/src/netpgpverify/Makefile Fri Jul 09 05:35:34 2010 +0000
+++ b/crypto/external/bsd/netpgp/dist/src/netpgpverify/Makefile Fri Jul 09 05:36:28 2010 +0000
@@ -118,16 +118,16 @@
 PACKAGE = netpgp
 PACKAGE_BUGREPORT = Alistair Crooks <agc%netbsd.org@localhost> c0596823
 PACKAGE_NAME = netpgp
-PACKAGE_STRING = netpgp 20100531
+PACKAGE_STRING = netpgp 20100707
 PACKAGE_TARNAME = netpgp
-PACKAGE_VERSION = 20100531
+PACKAGE_VERSION = 20100707
 PATH_SEPARATOR = :
 RANLIB = ranlib
 SED = /usr/bin/sed
 SET_MAKE = 
 SHELL = /bin/ksh
 STRIP = strip
-VERSION = 20100531
+VERSION = 20100707
 WARNCFLAGS = -Werror -Wall -Wpointer-arith
 abs_builddir = /usr/src/crypto/external/bsd/netpgp/dist/src/netpgpverify
 abs_srcdir = /usr/src/crypto/external/bsd/netpgp/dist/src/netpgpverify
diff -r f6cecd37ffa7 -r 43256abe3320 crypto/external/bsd/netpgp/dist/tst
--- a/crypto/external/bsd/netpgp/dist/tst       Fri Jul 09 05:35:34 2010 +0000
+++ b/crypto/external/bsd/netpgp/dist/tst       Fri Jul 09 05:36:28 2010 +0000
@@ -124,13 +124,13 @@
 diff g g2 && passed=$(expr $passed + 1)
 echo "22 " $passed >> passed
 echo "======> list ssh host RSA public key"
-/usr/bin/netpgpkeys --ssh-keys --sshkeyfile=/etc/ssh/ssh_host_rsa_key.pub --list-keys && passed=$(expr $passed + 1)
+/usr/bin/netpgpkeys --ssh --sshkeyfile=/etc/ssh/ssh_host_rsa_key.pub --list-keys && passed=$(expr $passed + 1)
 echo "23 " $passed >> passed
 echo "======> sign/verify file with ssh host keys"
 cp configure a
-sudo /usr/bin/netpgp --ssh-keys --sshkeyfile=/etc/ssh/ssh_host_rsa_key.pub --sign a
+sudo /usr/bin/netpgp --ssh --sshkeyfile=/etc/ssh/ssh_host_rsa_key.pub --sign a
 sudo chmod 644 a.gpg
-/usr/bin/netpgp --verify --ssh-keys --sshkeyfile=/etc/ssh/ssh_host_rsa_key.pub a.gpg && passed=$(expr $passed + 1)
+/usr/bin/netpgp --verify --ssh --sshkeyfile=/etc/ssh/ssh_host_rsa_key.pub a.gpg && passed=$(expr $passed + 1)
 echo "24 " $passed >> passed
 echo "======> pipeline and memory encrypt/decrypt"
 /usr/bin/netpgp --encrypt < a | /usr/bin/netpgp --decrypt > a4