[Cvs-cvs] ccvs/src ChangeLog sanity.sh [signed-commits3]

[Derek Robert Price]

CVSROOT:        /cvsroot/cvs
Module name:    ccvs
Branch:         signed-commits3
Changes by:     Derek Robert Price <address@hidden>     06/01/18 15:59:06

Modified files:
        src            : ChangeLog sanity.sh 

Log message:
        * sanity.sh: Create $HOME/.gnupg to work around a problem with at least
        GnuPG 1.2.6 on an AMD64 running a Linux 2.6.9.
        (import-101): Expect signed imports.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/src/ChangeLog.diff?only_with_tag=signed-commits3&tr1=1.3328.2.36&tr2=1.3328.2.37&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/src/sanity.sh.diff?only_with_tag=signed-commits3&tr1=1.1105.2.15&tr2=1.1105.2.16&r1=text&r2=text

Patches:
Index: ccvs/src/ChangeLog
diff -u ccvs/src/ChangeLog:1.3328.2.36 ccvs/src/ChangeLog:1.3328.2.37
--- ccvs/src/ChangeLog:1.3328.2.36      Wed Jan 18 06:18:47 2006
+++ ccvs/src/ChangeLog  Wed Jan 18 15:59:05 2006
@@ -1,5 +1,9 @@
 2006-01-18  Derek Price  <address@hidden>
 
+       * sanity.sh: Create $HOME/.gnupg to work around a problem with at least
+       GnuPG 1.2.6 on an AMD64 running a Linux 2.6.9.
+       (import-101): Expect signed imports.
+
        * client.c (update_entries): Improve error messages.
        (client_write_sigfile): Cache signature when needed.  Update all
        callers.
Index: ccvs/src/sanity.sh
diff -u ccvs/src/sanity.sh:1.1105.2.15 ccvs/src/sanity.sh:1.1105.2.16
--- ccvs/src/sanity.sh:1.1105.2.15      Wed Jan 18 06:18:48 2006
+++ ccvs/src/sanity.sh  Wed Jan 18 15:59:05 2006
@@ -1746,11 +1746,18 @@
 mkdir home
 HOME=$TESTDIR/home; export HOME
 
-# If $GPG is set, create a key for /uu
+# If $GPG is set, create a key for these tests.
 OPENPGP_PHRASE=
 log_keyid=
 if test x"$GPG" != xgpg; then
+  # This works around a problem in at least a GnuPG 1.2.6 on an AMD64 running
+  # a Linux 2.6.9.
+  mkdir $HOME/.gnupg; chmod 0700 $HOME/.gnupg
+
+  # Output some status info to the log and create the key files.
   $GPG --list-keys >>$LOGFILE 2>&1
+
+  # Import the test keys.
   $GPG --import - <<EOF >>$LOGFILE 2>&1
 -----BEGIN PGP PUBLIC KEY BLOCK-----
 Version: GnuPG v1.4.2 (GNU/Linux)
@@ -9279,7 +9286,7 @@
 ----------------------------
 revision 1\.1\.1\.1
 date: ${ISO8601DATE};  author: ${username};  state: Exp;  lines: ${PLUS}0 -0;  
commitid: ${commitid};
-first-import
+${log_keyid}first-import
 ============================================================================="
 
                # update into the vendor branch.