[Cvs-cvs] ccvs/src ChangeLog parseinfo.c 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/13 14:23:43

Modified files:
        src            : ChangeLog parseinfo.c sanity.sh 

Log message:
        * parseinfo.c (parse_config): Avoid a core dump.
        * sanity.sh (openpgp): Add a few tests for commit signature
        verification.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/src/ChangeLog.diff?only_with_tag=signed-commits3&tr1=1.3328.2.29&tr2=1.3328.2.30&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/src/parseinfo.c.diff?only_with_tag=signed-commits3&tr1=1.85.2.1&tr2=1.85.2.2&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.10&tr2=1.1105.2.11&r1=text&r2=text

Patches:
Index: ccvs/src/ChangeLog
diff -u ccvs/src/ChangeLog:1.3328.2.29 ccvs/src/ChangeLog:1.3328.2.30
--- ccvs/src/ChangeLog:1.3328.2.29      Fri Jan 13 05:08:12 2006
+++ ccvs/src/ChangeLog  Fri Jan 13 14:23:43 2006
@@ -1,3 +1,9 @@
+2006-01-13  Derek Price  <address@hidden>
+
+       * parseinfo.c (parse_config): Avoid a core dump.
+       * sanity.sh (openpgp): Add a few tests for commit signature
+       verification.
+
 2006-01-12  Derek Price  <address@hidden>
 
        * gpg.c (read_signature): Rename to...
Index: ccvs/src/parseinfo.c
diff -u ccvs/src/parseinfo.c:1.85.2.1 ccvs/src/parseinfo.c:1.85.2.2
--- ccvs/src/parseinfo.c:1.85.2.1       Thu Jan 12 18:42:31 2006
+++ ccvs/src/parseinfo.c        Fri Jan 13 14:23:43 2006
@@ -550,9 +550,11 @@
 
        /* The first '=' separates keyword from value.  */
        p = strchr (line, '=');
-       if (!p
-           /* The following keys have optional arguments.  */
-           && strcmp (line, "VerifyCommits"))
+       if (p)
+           *p++ = '\0';
+       else if (
+                /* The following keys have optional arguments.  */
+                strcmp (line, "VerifyCommits"))
        {
            if (!parse_error (infopath, ln))
                error (0, 0,
@@ -561,7 +563,6 @@
            continue;
        }
 
-       *p++ = '\0';
 
        if (strcmp (line, "RCSBIN") == 0)
        {
Index: ccvs/src/sanity.sh
diff -u ccvs/src/sanity.sh:1.1105.2.10 ccvs/src/sanity.sh:1.1105.2.11
--- ccvs/src/sanity.sh:1.1105.2.10      Thu Jan 12 20:02:40 2006
+++ ccvs/src/sanity.sh  Fri Jan 13 14:23:43 2006
@@ -32733,12 +32733,23 @@
          dotest openpgp-init-1 "$testcvs -q co -l ."
          mkdir openpgp
          dotest openpgp-init-2 "$testcvs -Q add openpgp"
+
+         cd ..
+         dotest openpgp-init-3 "$testcvs -Q co CVSROOT"
+         cd CVSROOT
+         echo VerifyCommits >>config
+         dotest openpgp-init-4 \
+"$testcvs -Q ci -m'Turn on commit verification.'"
+
          cd ..
-         dotest openpgp-init-3 "$testcvs -q co openpgp"
+         dotest openpgp-init-5 "$testcvs -q co openpgp"
          cd openpgp
          echo some content >file1
-         dotest openpgp-init-4 "$testcvs -Q add file1"
-         dotest openpgp-init-5 "$testcvs -Q ci -m newfile file1"
+         dotest openpgp-init-6 "$testcvs -Q add file1"
+
+         dotest openpgp-0 "$testcvs -Q ci -m newfile file1" \
+"$DOTSTAR Good signature from \"CVS Test Script $DOTSTAR"
+
          dotest openpgp-1 "$testcvs verify file1" \
 "$DOTSTAR Good signature from \"CVS Test Script $DOTSTAR"
          dotest openpgp-2 "$testcvs verify -p file1 >tmp"
@@ -32748,7 +32759,8 @@
            dotest openpgp-3 "cmp tmp CVS/Base/.#file1.1.1.sig"
          fi
 
-         dotest openpgp-4 "$testcvs sign file1"
+         dotest openpgp-4 "$testcvs sign file1" \
+"$DOTSTAR Good signature from \"CVS Test Script $DOTSTAR"
          dotest openpgp-5 "$testcvs verify file1" \
 "$DOTSTAR Good signature from \"CVS Test Script $DOTSTAR
 $DOTSTAR Good signature from \"CVS Test Script $DOTSTAR"
@@ -32759,6 +32771,7 @@
 
          dokeep
          cd ../..
+         restore_adm
          rm -rf openpgp
          modify_repo rm -rf $CVSROOT_DIRNAME/openpgp
          ;;