Interoperability with newer versions of 'cvs'.

diff --git a/gettext-tools/misc/ChangeLog b/gettext-tools/misc/ChangeLog
index 194199def55662ef5096ea992288738e25ffcfd2..b76c2875a65aa41d0ebd261034109a94085f1538 100644 (file)
--- a/gettext-tools/misc/ChangeLog
+++ b/gettext-tools/misc/ChangeLog
@@ -1,3 +1,10 @@
+2010-05-26  Bruno Haible  <bruno@clisp.org>
+
+       Interoperability with newer versions of 'cvs'.
+       * autopoint.in: Unset some more environment variables. Set
+       CVS_SIGN_COMMITS to empty.
+       * convert-archive.in: Likewise.
+
 2010-05-16  Bruno Haible  <bruno@clisp.org>
 
        convert-archive: Don't publicize the builder's name and email.

diff --git a/gettext-tools/misc/autopoint.in b/gettext-tools/misc/autopoint.in
index 195fc04765cc63086841e40bca0a17b0d5ded430..e048d20e401683afce03476bd5293009c91f151e 100644 (file)
--- a/gettext-tools/misc/autopoint.in
+++ b/gettext-tools/misc/autopoint.in
@@ -461,14 +461,23 @@ case "@ARCHIVE_FORMAT@" in
     unset CVS_CLIENT_LOG
     unset CVS_CLIENT_PORT
     unset CVS_IGNORE_REMOTE_ROOT
+    unset CVS_LOCAL_BRANCH_NUM
+    unset CVS_NOBASES
     unset CVS_PASSFILE
     unset CVS_PASSWORD
+    unset CVS_PROXY_PORT
     unset CVS_RCMD_PORT
     unset CVS_RSH
     unset CVS_SERVER
     unset CVS_SERVER_SLEEP
+    CVS_SIGN_COMMITS=
+    export CVS_SIGN_COMMITS
+    unset CVS_SSH
+    unset CVS_VERIFY_CHECKOUTS
+    unset CVS_VERIFY_TEMPLATE
     unset CVSIGNORE
     unset CVSREAD
+    unset CVSREADONLYFS
     unset CVSUMASK
     unset CVSWRAPPERS
 

diff --git a/gettext-tools/misc/convert-archive.in b/gettext-tools/misc/convert-archive.in
index 9b00607c41f00fd048c657c2e080eaf324aaebed..03877bdaf1ee60e362e08d9f6c376b5c5169d036 100644 (file)
--- a/gettext-tools/misc/convert-archive.in
+++ b/gettext-tools/misc/convert-archive.in
@@ -122,14 +122,23 @@ case "$from" in
     unset CVS_CLIENT_LOG
     unset CVS_CLIENT_PORT
     unset CVS_IGNORE_REMOTE_ROOT
+    unset CVS_LOCAL_BRANCH_NUM
+    unset CVS_NOBASES
     unset CVS_PASSFILE
     unset CVS_PASSWORD
+    unset CVS_PROXY_PORT
     unset CVS_RCMD_PORT
     unset CVS_RSH
     unset CVS_SERVER
     unset CVS_SERVER_SLEEP
+    CVS_SIGN_COMMITS=
+    export CVS_SIGN_COMMITS
+    unset CVS_SSH
+    unset CVS_VERIFY_CHECKOUTS
+    unset CVS_VERIFY_TEMPLATE
     unset CVSIGNORE
     unset CVSREAD
+    unset CVSREADONLYFS
     unset CVSUMASK
     unset CVSWRAPPERS