Re: [Cvs-test-results] CVS trunk testing results (BSDI BSD/OS)

[Derek R. Price]

Larry Jones wrote:
> As you suspected, it only sees the first signature.

Does the attached patch fix the problem?  I chose to disable testing
with the old GPG completely since GPG is security sensitive and should
require upgrades often enough anyhow that supporting very old versions
does not seem worth much effort.

This patch requires `autoreconf -m' after application.

Regards,

Derek
-- 
Derek R. Price
CVS Solutions Architect
Ximbiot <http://ximbiot.com>
v: +1 248.835.1260
f: +1 248.835.1263
<derek@ximbiot.com>

Index: configure.in
===================================================================
RCS file: /cvsroot/cvs/ccvs/configure.in,v
retrieving revision 1.365
diff -u -p -r1.365 configure.in
--- configure.in        25 Apr 2006 20:02:45 -0000      1.365
+++ configure.in        27 Apr 2006 18:41:58 -0000
@@ -121,18 +121,23 @@ fi
 dnl These are defined by configure so that if the above is ever expanded to
 dnl look for OpenPGP capable programs other than `gpg', the default templates
 dnl can also be detected and substituted here.
+DEFAULT_SIGN_TEMPLATE="$GPG --detach-sign --output - %t %a -- %s"
+AC_SUBST([DEFAULT_SIGN_TEMPLATE])
 AC_DEFINE_UNQUOTED([DEFAULT_SIGN_TEMPLATE],
-                  ["$GPG --detach-sign --output - %t %a -- %s"],
+                  ["$DEFAULT_SIGN_TEMPLATE"],
                   [Define to a command line template that will write an
                    OpenPGP signature for the file `%s' to its standard out.
                    `%t' is substituted at run time with an option which flags
                    files as text files, when necessary, and the empty string,
                    otherwise.  `%a' is substituted with a list of arguments
                    provided by the user.])
-AC_DEFINE([DEFAULT_SIGN_TEXTMODE], ["--textmode"],
-         [Define to the option string that the OpenPGP program used in the
-          DEFAULT_SIGN_TEMPLATE would like to see for text files (substituted
-          at run time in place of `%t' in the DEFAULT_SIGN_TEMPLATE).])
+DEFAULT_SIGN_TEXTMODE=--textmode
+AC_SUBST([DEFAULT_SIGN_TEXTMODE])
+AC_DEFINE_UNQUOTED([DEFAULT_SIGN_TEXTMODE], ["$DEFAULT_SIGN_TEXTMODE"],
+                  [Define to the option string that the OpenPGP program used
+                   in the DEFAULT_SIGN_TEMPLATE would like to see for text
+                   files (substituted at run time in place of `%t' in the
+                   DEFAULT_SIGN_TEMPLATE).])
 DEFAULT_VERIFY_TEMPLATE="$GPG --verify %t %a -- %S %s"
 AC_SUBST([DEFAULT_VERIFY_TEMPLATE])
 AC_DEFINE_UNQUOTED([DEFAULT_VERIFY_TEMPLATE],
Index: src/sanity.config.sh.in
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/sanity.config.sh.in,v
retrieving revision 1.4
diff -u -p -r1.4 sanity.config.sh.in
--- src/sanity.config.sh.in     24 Apr 2006 18:50:27 -0000      1.4
+++ src/sanity.config.sh.in     27 Apr 2006 18:41:58 -0000
@@ -1,3 +1,17 @@
+# Copyright (C) 2006 The Free Software Foundation, Inc.
+#
+# 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, or (at your option)
+# any later version.
+#
+# This program 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.
+
 RSH_DFLT="@RSH_DFLT@"
 GPG="@GPG@"
 DEFAULT_VERIFY_TEMPLATE="@DEFAULT_VERIFY_TEMPLATE@"
+DEFAULT_SIGN_TEMPLATE="@DEFAULT_SIGN_TEMPLATE@"
+DEFAULT_SIGN_TEXTMODE="@DEFAULT_SIGN_TEXTMODE@"
Index: src/sanity.sh
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/sanity.sh,v
retrieving revision 1.1131
diff -u -p -r1.1131 sanity.sh
--- src/sanity.sh       27 Apr 2006 17:37:14 -0000      1.1131
+++ src/sanity.sh       27 Apr 2006 18:42:02 -0000
@@ -1912,6 +1912,40 @@ if $gpg; then
 F1D6D5842814BC3A264BE7068E0C2C7EF133BDE9:6:
 EOF
 
+  echo whatever >$TESTDIR/signme
+  sign_cmd=`echo $DEFAULT_SIGN_TEMPLATE \
+           |sed -e "s/%t/$DEFAULT_SIGN_TEXTMODE/" \
+                -e s/%a// \
+                -e "s#%s#$TESTDIR/signme#"`
+  $sign_cmd >$TESTDIR/signme.sig 2>>$LOGFILE
+  $sign_cmd >>$TESTDIR/signme.sig 2>>$LOGFILE
+
+  vrfy_cmd=`echo $DEFAULT_VERIFY_TEMPLATE \
+           |sed -e "s/%t/$DEFAULT_SIGN_TEXTMODE/" \
+                -e s/%a// \
+                -e "s#%S#$TESTDIR/signme.sig#" \
+                -e "s#%s#$TESTDIR/signme#"`
+  $vrfy_cmd >$TESTDIR/gpgtmp 2>&1
+  cat $TESTDIR/gpgtmp >>$LOGFILE 2>&1
+  if expr "`cat $TESTDIR/gpgtmp`" : \
+"$DOTSTAR Good signature from \"CVS Test Script $DOTSTAR
+$DOTSTAR Good signature from \"CVS Test Script $DOTSTAR" >/dev/null 2>&1
+  then :; else
+    echo "Disabling OpenPGP testing due to inability of \`$GPG' to" >>$LOGFILE
+    echo "recognize concatenated signatures." >>$LOGFILE
+    echo "WARNING: GPG does not recognize concatenated signatures.  This" >&2
+    echo "test suite will run, but OpenPGP commit signatures will not be" >&2
+    echo "tested." >&2
+    rm -r $HOME/.gnupg
+    CVS_SIGN_COMMITS=off; export CVS_SIGN_COMMITS
+    CVS_VERIFY_CHECKOUTS=off; export CVS_VERIFY_CHECKOUTS
+    gpg=false
+  fi
+
+  rm $TESTDIR/signme* $TESTDIR/gpgtmp
+fi
+
+if $gpg; then
   # Some tests check the content of the RCS file and whether there is a
   # signature phrase or not depends on whether they were being generated.
   # The trailing EOL is important.