[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Cvs-cvs] ccvs/src ChangeLog cvs.h main.c sanity.sh [signed-commits3]
From: |
Derek Robert Price |
Subject: |
[Cvs-cvs] ccvs/src ChangeLog cvs.h main.c sanity.sh [signed-commits3] |
Date: |
Sat, 14 Jan 2006 21:43:30 +0000 |
CVSROOT: /cvsroot/cvs
Module name: ccvs
Branch: signed-commits3
Changes by: Derek Robert Price <address@hidden> 06/01/14 21:43:29
Modified files:
src : ChangeLog cvs.h main.c sanity.sh
Log message:
* cvs.h [CVS_VERIFY_CHECKOUTS_ENV, CVS_SIGN_COMMITS_ENV]: New macros.
* main.c (main): Process $CVS_VERIFY_CHECKOUTS & $CVS_SIGN_COMMITS.
* sanity.sh: Turn off GPG in remote mode eith base files disabled.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/src/ChangeLog.diff?only_with_tag=signed-commits3&tr1=1.3328.2.32&tr2=1.3328.2.33&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/src/cvs.h.diff?only_with_tag=signed-commits3&tr1=1.345.4.6&tr2=1.345.4.7&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/src/main.c.diff?only_with_tag=signed-commits3&tr1=1.262.6.8&tr2=1.262.6.9&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.12&tr2=1.1105.2.13&r1=text&r2=text
Patches:
Index: ccvs/src/ChangeLog
diff -u ccvs/src/ChangeLog:1.3328.2.32 ccvs/src/ChangeLog:1.3328.2.33
--- ccvs/src/ChangeLog:1.3328.2.32 Fri Jan 13 16:29:08 2006
+++ ccvs/src/ChangeLog Sat Jan 14 21:43:28 2006
@@ -1,3 +1,9 @@
+2006-01-14 Derek Price <address@hidden>
+
+ * cvs.h [CVS_VERIFY_CHECKOUTS_ENV, CVS_SIGN_COMMITS_ENV]: New macros.
+ * main.c (main): Process $CVS_VERIFY_CHECKOUTS & $CVS_SIGN_COMMITS.
+ * sanity.sh: Turn off GPG in remote mode eith base files disabled.
+
2006-01-13 Derek Price <address@hidden>
* client.c (update_entries): Don't require signatures for `cvs export'.
Index: ccvs/src/cvs.h
diff -u ccvs/src/cvs.h:1.345.4.6 ccvs/src/cvs.h:1.345.4.7
--- ccvs/src/cvs.h:1.345.4.6 Fri Jan 13 05:08:12 2006
+++ ccvs/src/cvs.h Sat Jan 14 21:43:29 2006
@@ -245,7 +245,16 @@
#define CVSREAD_ENV "CVSREAD" /* make files read-only */
#define CVSREAD_DFLT 0 /* writable files by default */
-#define CVSREADONLYFS_ENV "CVSREADONLYFS" /* repository is read-only */
+ /* repository is read-only */
+#define CVSREADONLYFS_ENV "CVSREADONLYFS"
+
+ /* verify checkouts */
+#define CVS_VERIFY_CHECKOUTS_ENV \
+ "CVS_VERIFY_CHECKOUTS"
+
+ /* sign commits */
+#define CVS_SIGN_COMMITS_ENV \
+ "CVS_SIGN_COMMITS"
#define TMPDIR_ENV "TMPDIR" /* Temporary directory */
#define CVS_PID_ENV "CVS_PID" /* pid of running cvs */
Index: ccvs/src/main.c
diff -u ccvs/src/main.c:1.262.6.8 ccvs/src/main.c:1.262.6.9
--- ccvs/src/main.c:1.262.6.8 Fri Jan 13 05:08:12 2006
+++ ccvs/src/main.c Sat Jan 14 21:43:29 2006
@@ -609,6 +609,38 @@
readonlyfs = 1;
logoff = 1;
}
+ if ((cp = getenv (CVS_VERIFY_CHECKOUTS_ENV)))
+ {
+ if (!strcasecmp (cp, "off")
+ || !strcasecmp (cp, "never")
+ || !strcasecmp (cp, "false"))
+ set_verify_checkouts (VERIFY_OFF);
+ else if (!strcasecmp (cp, "warn"))
+ set_verify_checkouts (VERIFY_WARN);
+ else if (!strcasecmp (cp, "always")
+ || !strcasecmp (cp, "fatal")
+ || !strcasecmp (cp, "on")
+ || !strcasecmp (cp, "true"))
+ set_verify_checkouts (VERIFY_FATAL);
+ else
+ error (1, 0,
+ "Unrecognized content (`%s') in $%s",
+ cp, CVS_VERIFY_CHECKOUTS_ENV);
+ }
+ if ((cp = getenv (CVS_SIGN_COMMITS_ENV)))
+ {
+ if (!strcasecmp (cp, "auto")
+ || !strcasecmp (cp, "server"))
+ set_sign_commits (SIGN_DEFAULT);
+ else if (!strcasecmp (cp, "on"))
+ set_sign_commits (SIGN_ALWAYS);
+ else if (!strcasecmp (cp, "off"))
+ set_sign_commits (SIGN_NEVER);
+ else
+ error (0, 0,
+ "Unrecognized content (`%s') in $%s ignored",
+ cp, CVS_SIGN_COMMITS_ENV);
+ }
/* Set this to 0 to force getopt initialization. getopt() sets
this to 1 internally. */
Index: ccvs/src/sanity.sh
diff -u ccvs/src/sanity.sh:1.1105.2.12 ccvs/src/sanity.sh:1.1105.2.13
--- ccvs/src/sanity.sh:1.1105.2.12 Fri Jan 13 16:14:03 2006
+++ ccvs/src/sanity.sh Sat Jan 14 21:43:29 2006
@@ -432,9 +432,21 @@
if $bases; then
unset CVSNOBASES
+ # Accept the default GPG mode.
+ unset CVS_VERIFY_CHECKOUTS
+ unset CVS_SIGN_COMMITS
else
# Force the client to not report base support to the server.
export CVSNOBASES=:
+ if $remote; then
+ # CVS doesn't support OpenPGP signatures without Base-* requests in
+ # client/server mode. Stop the client from trying.
+ export CVS_VERIFY_CHECKOUTS=off
+ export CVS_SIGN_COMMITS=off
+ # This fools this script into believing configure couldn't find a working
+ # gpg.
+ GPG=gpg
+ fi
fi
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Cvs-cvs] ccvs/src ChangeLog cvs.h main.c sanity.sh [signed-commits3],
Derek Robert Price <=