[Cvs-cvs] ccvs/src ChangeLog rcs.c sanity.sh

[Mark D. Baushke]

CVSROOT:        /cvsroot/cvs
Module name:    ccvs
Changes by:     Mark D. Baushke <mdb>   06/06/17 09:57:53

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

Log message:
        * rcs.c (RCS_add_openpgp_signature): Fix signatures on deltas that
        do not have any other_delta records.
        * sanity.sh (openpgp): Test that it works.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/ChangeLog?cvsroot=cvs&r1=1.3450&r2=1.3451
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/rcs.c?cvsroot=cvs&r1=1.371&r2=1.372
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/sanity.sh?cvsroot=cvs&r1=1.1155&r2=1.1156

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/ChangeLog,v
retrieving revision 1.3450
retrieving revision 1.3451
diff -u -b -r1.3450 -r1.3451
--- ChangeLog   16 Jun 2006 07:42:08 -0000      1.3450
+++ ChangeLog   17 Jun 2006 09:57:53 -0000      1.3451
@@ -1,3 +1,9 @@
+2006-06-17  Mark D. Baushke  <address@hidden>
+
+       * rcs.c (RCS_add_openpgp_signature): Fix signatures on deltas that
+       do not have any other_delta records.
+       * sanity.sh (openpgp): Test that it works.
+       
 2006-06-16  Mark D. Baushke  <address@hidden>
 
        * sanity.sh (expr_set_DASHDASH): Fix for non-POSIX expr

Index: rcs.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/rcs.c,v
retrieving revision 1.371
retrieving revision 1.372
diff -u -b -r1.371 -r1.372
--- rcs.c       31 May 2006 16:03:02 -0000      1.371
+++ rcs.c       17 Jun 2006 09:57:53 -0000      1.372
@@ -4879,6 +4879,9 @@
     n = findnode (vers->other_delta, "openpgp-signatures");
     if (!n)
     {
+       if (vers->other_delta == NULL)
+           vers->other_delta = getlist ();
+
        n = getnode();
        n->type = RCSSTRING;
        n->key = xstrdup ("openpgp-signatures");

Index: sanity.sh
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/sanity.sh,v
retrieving revision 1.1155
retrieving revision 1.1156
diff -u -b -r1.1155 -r1.1156
--- sanity.sh   16 Jun 2006 07:42:08 -0000      1.1155
+++ sanity.sh   17 Jun 2006 09:57:53 -0000      1.1156
@@ -33444,6 +33444,40 @@
          dotest_fail openpgp-7 "$testcvs verify file1" \
 "$SPROG verify: No signature available for \`file1'"
 
+         # Sign a really old style revision before commitid existed
+         cat >hello,v <<EOF
+head     1.1;
+access   ;
+symbols  ;
+locks    ; strict;
+comment  @# @;
+
+
+1.1
+date     2006.06.17.09.17.54;  author mdb;  state Exp;
+branches;
+next     ;
+
+desc
+@@
+
+
+
+1.1
+log
address@hidden checkin@
+text
address@hidden World.
+@
+EOF
+         chmod a=r hello,v
+         modify_repo cp hello,v $CVSROOT_DIRNAME/openpgp/hello,v
+         dotest openpgp-7 "CVS_VERIFY_CHECKOUTS=no $testcvs -Q update hello"
+         dotest openpgp-8 "$testcvs sign hello" \
+"$DOTSTAR Signature made $DOTSTAR using DSA key ID F133BDE9
+$DOTSTAR Good signature from .CVS Test Script .This secret key is public and 
used for testing signed commits with CVS\.. <address@hidden>."
+
+
          dokeep
          cd ../..
          restore_adm