From 7b32bbf795450e82a280429a2b3c3ecd85b2d1be Mon Sep 17 00:00:00 2001
From: Art Cancro <ajc@citadel.org>
Date: Sat, 8 Jan 2022 16:32:09 -0500
Subject: [PATCH] Release version 945 generated by do-release.sh

---
 citadel/citadel.h           |  2 +-
 do-release.sh               | 12 ++++++++++++
 libcitadel/lib/libcitadel.h |  2 +-
 release_version.txt         |  2 +-
 textclient/textclient.h     |  2 +-
 webcit/webcit.h             |  2 +-
 6 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/citadel/citadel.h b/citadel/citadel.h
index f5b6f043b..f57d9fbd0 100644
--- a/citadel/citadel.h
+++ b/citadel/citadel.h
@@ -32,7 +32,7 @@ extern "C" {
  */
 #define CITADEL	PACKAGE_STRING
 
-#define REV_LEVEL 944		// This version
+#define REV_LEVEL 945		// This version
 #define REV_MIN		591		// Oldest compatible database
 #define EXPORT_REV_MIN	931		// Oldest compatible export files
 #define LIBCITADEL_MIN	931		// Minimum required version of libcitadel
diff --git a/do-release.sh b/do-release.sh
index bf4824918..a1c608891 100755
--- a/do-release.sh
+++ b/do-release.sh
@@ -13,6 +13,7 @@ echo -e '\033[0m'
 libcitadel_version=`grep LIBCITADEL_VERSION_NUMBER  libcitadel/lib/libcitadel.h | sed s/"[^0-9.]"/""/g`
 citserver_version=`grep REV_LEVEL citadel/citadel.h | sed s/"[^0-9.]"/""/g`
 webcit_version=`grep CLIENT_VERSION webcit/webcit.h | sed s/"[^0-9.]"/""/g`
+textclient_version=`grep CLIENT_VERSION textclient/textclient.h | sed s/"[^0-9.]"/""/g`
 
 NEW_VERSION=${libcitadel_version}
 if [ ${citserver_version} -gt ${NEW_VERSION} ] ; then
@@ -21,11 +22,15 @@ fi
 if [ ${webcit_version} -gt ${NEW_VERSION} ] ; then
 	NEW_VERSION=${webcit_version}
 fi
+if [ ${textclient_version} -gt ${NEW_VERSION} ] ; then
+	NEW_VERSION=${textclient_version}
+fi
 NEW_VERSION=`expr ${NEW_VERSION} + 1`
 
 echo -e '\033[33m\033[1mlibcitadel \033[32m was version     \033[33m'$libcitadel_version'\033[0m'
 echo -e '\033[33m\033[1mcitserver  \033[32m was version     \033[33m'$citserver_version'\033[0m'
 echo -e '\033[33m\033[1mwebcit     \033[32m was version     \033[33m'$webcit_version'\033[0m'
+echo -e '\033[33m\033[1mtextclient \033[32m was version     \033[33m'$textclient_version'\033[0m'
 echo -e '\033[33m\033[1mnew release\033[32m will be version \033[33m'$NEW_VERSION'\033[0m'
 
 echo -e ''
@@ -47,13 +52,20 @@ sed \
 	-i s/\#define.\*CLIENT_VERSION.\*${webcit_version}/\#define\ CLIENT_VERSION\ ${NEW_VERSION}/g \
 	webcit/webcit.h
 
+# Edit textclient.h to make it the new version
+sed \
+	-i s/\#define.\*CLIENT_VERSION.\*${textclient_version}/\#define\ CLIENT_VERSION\ ${NEW_VERSION}/g \
+	textclient/textclient.h
+
 libcitadel_version=`grep LIBCITADEL_VERSION_NUMBER  libcitadel/lib/libcitadel.h | sed s/"[^0-9.]"/""/g`
 citserver_version=`grep REV_LEVEL citadel/citadel.h | sed s/"[^0-9.]"/""/g`
 webcit_version=`grep CLIENT_VERSION webcit/webcit.h | sed s/"[^0-9.]"/""/g`
+textclient_version=`grep CLIENT_VERSION textclient/textclient.h | sed s/"[^0-9.]"/""/g`
 
 echo -e '\033[33m\033[1mlibcitadel \033[32m is now version  \033[33m'$libcitadel_version'\033[0m'
 echo -e '\033[33m\033[1mcitserver  \033[32m is now version  \033[33m'$citserver_version'\033[0m'
 echo -e '\033[33m\033[1mwebcit     \033[32m is now version  \033[33m'$webcit_version'\033[0m'
+echo -e '\033[33m\033[1mtextclient \033[32m is now version  \033[33m'$textclient_version'\033[0m'
 
 echo $NEW_VERSION >release_version.txt
 git add release_version.txt
diff --git a/libcitadel/lib/libcitadel.h b/libcitadel/lib/libcitadel.h
index 90ff1b7fc..63facaded 100644
--- a/libcitadel/lib/libcitadel.h
+++ b/libcitadel/lib/libcitadel.h
@@ -26,7 +26,7 @@
 #include <sys/types.h>
 #include <netinet/in.h>
 
-#define LIBCITADEL_VERSION_NUMBER 944
+#define LIBCITADEL_VERSION_NUMBER 945
 
 /*
  * Here's a bunch of stupid magic to make the MIME parser portable.
diff --git a/release_version.txt b/release_version.txt
index 175df711d..2ebd3a0c9 100644
--- a/release_version.txt
+++ b/release_version.txt
@@ -1 +1 @@
-944
+945
diff --git a/textclient/textclient.h b/textclient/textclient.h
index a99df8685..b6ae98084 100644
--- a/textclient/textclient.h
+++ b/textclient/textclient.h
@@ -11,7 +11,7 @@
 #define	UDS			"_UDS_"
 #define DEFAULT_HOST		"localhost"
 #define DEFAULT_PORT		"504"
-#define CLIENT_VERSION          926
+#define CLIENT_VERSION 945
 #define CLIENT_TYPE		0
 
 // commands we can send to the stty_ctdl() routine
diff --git a/webcit/webcit.h b/webcit/webcit.h
index d8ce9a295..24de99352 100644
--- a/webcit/webcit.h
+++ b/webcit/webcit.h
@@ -127,7 +127,7 @@ extern char *ssl_cipher_list;
 #define PORT_NUM		80			/* port number to listen on */
 #define DEVELOPER_ID		0
 #define CLIENT_ID		4
-#define CLIENT_VERSION 944		/* This version of WebCit */
+#define CLIENT_VERSION 945		/* This version of WebCit */
 #define MINIMUM_CIT_VERSION	931			/* Minimum required version of Citadel server */
 #define	LIBCITADEL_MIN		931			/* Minimum required version of libcitadel */
 #define DEFAULT_CTDLDIR		"/usr/local/citadel"	/* Default Citadel server directory */
-- 
2.30.2