From: Bruno Haible <bruno@clisp.org>
Date: Wed, 26 May 2010 21:20:23 +0000 (+0200)
Subject: Interoperability with newer versions of 'cvs'.
X-Git-Tag: v0.18.1~18
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=72e56e45d54bc705a604a4657dbdf1c6d2f83ba1;p=thirdparty%2Fgettext.git

Interoperability with newer versions of 'cvs'.
---

diff --git a/gettext-tools/misc/ChangeLog b/gettext-tools/misc/ChangeLog
index 194199def..b76c2875a 100644
--- 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 195fc0476..e048d20e4 100644
--- 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 9b00607c4..03877bdaf 100644
--- 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