Release version 982 generated by do-release.sh

diff --git a/citadel/Makefile b/citadel/Makefile
index 87c3101585a7a0b889b2eb3cb090725f6849301d..10cd1a7b57ce2221836ce04dc3caba4d9a53cd2c 100644 (file)
--- a/citadel/Makefile
+++ b/citadel/Makefile
@@ -50,10 +50,10 @@ chkpwd: utils/chkpwd.c utils/auth.c utils/*.h server/*.h
        cc ${CFLAGS} ${LDFLAGS} utils/chkpwd.c utils/auth.c -lcrypt -o chkpwd
 
 ctdldump: utils/ctdldump.c utils/*.h server/*.h
-       cc ${CFLAGS} ${LDFLAGS} utils/ctdldump.c -lcitadel -lz -ldb -o ctdldump
+       cc ${CFLAGS} ${LDFLAGS} utils/ctdldump.c -lcitadel -lz -ldb -lpthread -o ctdldump
 
 ctdlload: utils/ctdlload.c server/makeuserkey.c utils/*.h server/*.h
-       cc ${CFLAGS} ${LDFLAGS} utils/ctdlload.c server/makeuserkey.c -lcitadel -lz -ldb -o ctdlload
+       cc ${CFLAGS} ${LDFLAGS} utils/ctdlload.c server/makeuserkey.c -lcitadel -lz -ldb -lpthread -o ctdlload
 
 config.mk: configure
        ./configure

diff --git a/citadel/server/citadel_defs.h b/citadel/server/citadel_defs.h
index abff7ae84c3ef5b4a2861eeb5a7a5f60a95aaa42..176723b77d04e8dfa1b444790229f4e7fd83a4e0 100644 (file)
--- a/citadel/server/citadel_defs.h
+++ b/citadel/server/citadel_defs.h
@@ -21,7 +21,7 @@
 #include "typesize.h"
 #include "ipcdef.h"
 
-#define REV_LEVEL 981          // This version
+#define REV_LEVEL 982          // This version
 #define REV_MIN                591     // Oldest compatible database
 #define EXPORT_REV_MIN 931     // Oldest compatible export files
 #define LIBCITADEL_MIN 951     // Minimum required version of libcitadel

diff --git a/citadel/server/makeuserkey.c b/citadel/server/makeuserkey.c
index 5729034a504c0ed423951c03b12cae5fc8004f3b..f7f9fd19e06dd7df8233691b3491746c571ab8f1 100644 (file)
--- a/citadel/server/makeuserkey.c
+++ b/citadel/server/makeuserkey.c
@@ -11,6 +11,7 @@
 #include <stdio.h>
 #include <sys/stat.h>
 #include <libcitadel.h>
+#include <string.h>
 #include "config.h"
 #include "user_ops.h"
 

diff --git a/libcitadel/lib/libcitadel.h b/libcitadel/lib/libcitadel.h
index 12c659ae6cdd65dc0b99ae1570f080339a30b0f7..b2241e8acdae13b5120bb8b3350248f33abd8184 100644 (file)
--- a/libcitadel/lib/libcitadel.h
+++ b/libcitadel/lib/libcitadel.h
@@ -19,7 +19,7 @@
 #include <sys/types.h>
 #include <netinet/in.h>
 
-#define LIBCITADEL_VERSION_NUMBER 981
+#define LIBCITADEL_VERSION_NUMBER 982
 
 /*
  * Here's a bunch of stupid magic to make the MIME parser portable.

diff --git a/release_version.txt b/release_version.txt
index 7db0976bda8f5dc82f90e2038d052b5fc7d3d519..acbef433bf14960874c51dc1939e5572d5ccc08f 100644 (file)
--- a/release_version.txt
+++ b/release_version.txt
@@ -1 +1 @@
-981
+982

diff --git a/textclient/textclient.h b/textclient/textclient.h
index 641b3ea512cb487d9e161597a941162392898d0d..b6dc80c81418a64aab29846cebb73e3b4fe0f461 100644 (file)
--- 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 981
+#define CLIENT_VERSION 982
 #define CLIENT_TYPE            0
 
 // commands we can send to the stty_ctdl() routine

diff --git a/webcit/webcit.h b/webcit/webcit.h
index f8ab946464622c35f3b64b128c014144066a27ff..e76dd6ecd7510920f862ed8e3f1361eacf6d3ea2 100644 (file)
--- 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 981             /* This version of WebCit */
+#define CLIENT_VERSION 982             /* 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 */