From 5370178bb66db58d71f73dda939c5f7bff4e678d Mon Sep 17 00:00:00 2001 From: Art Cancro Date: Fri, 11 Sep 2009 16:17:52 +0000 Subject: [PATCH] * Set the version numbers of everything to 7.66. --- citadel/citadel.h | 4 +- citadel/citadel.nsi | 154 ---------------------------------- citadel/configure.ac | 2 +- libcitadel/configure.in | 2 +- libcitadel/lib/libcitadel.h | 2 +- libcitadel/tests/token_test.c | 3 +- webcit/configure.ac | 2 +- webcit/webcit.h | 6 +- 8 files changed, 11 insertions(+), 164 deletions(-) delete mode 100644 citadel/citadel.nsi diff --git a/citadel/citadel.h b/citadel/citadel.h index 891a49c86..d86990937 100644 --- a/citadel/citadel.h +++ b/citadel/citadel.h @@ -38,10 +38,10 @@ extern "C" { * usually more strict because you're not really supposed to dump/load and * upgrade at the same time. */ -#define REV_LEVEL 763 /* This version */ +#define REV_LEVEL 766 /* This version */ #define REV_MIN 591 /* Oldest compatible database */ #define EXPORT_REV_MIN 760 /* Oldest compatible export files */ -#define LIBCITADEL_MIN 763 /* Minimum required version of libcitadel */ +#define LIBCITADEL_MIN 766 /* Minimum required version of libcitadel */ #define SERVER_TYPE 0 /* zero for stock Citadel; other developers please obtain SERVER_TYPE codes for your implementations */ diff --git a/citadel/citadel.nsi b/citadel/citadel.nsi deleted file mode 100644 index 5bd24a553..000000000 --- a/citadel/citadel.nsi +++ /dev/null @@ -1,154 +0,0 @@ -; $Id$ -; NOTE: this .NSI script is designed for NSIS v2.0b0+ -; Get NSIS at http://www.nullsoft.com/ - -!include "${NSISDIR}\Contrib\Modern UI\System.nsh" -!define MUI_PRODUCT "Citadel" -!define MUI_VERSION "7.63" -!define MUI_WELCOMEPAGE -!define MUI_LICENSEPAGE -!define MUI_COMPONENTSPAGE -!define MUI_COMPONENTSPAGE_SMALLDESC -!define MUI_DIRECTORYPAGE -!define MUI_FINISHPAGE -!define MUI_UNINSTALLER -!define MUI_UNCONFIRMPAGE -!insertmacro MUI_LANGUAGE "English" -;!define MUI_UI "${NSISDIR}\Contrib\UIs\modern3.exe" -;!define MUI_ICON "${NSISDIR}\Contrib\Icons\modern-install.ico" -;!define MUI_UNICON "${NSISDIR}\Contrib\Icons\modern-uninstall.ico" - -OutFile "citadel-7.63.exe" -BGGradient off - -LangString DESC_Citadel ${LANG_ENGLISH} "Citadel client and core libraries (required)" -LangString DESC_CitadelServer ${LANG_ENGLISH} "Citadel server" -LangString DESC_CitadelUtils ${LANG_ENGLISH} "Citadel utilities" - -SetCompress auto -SetDatablockOptimize on -BrandingText "Citadel " -CRCCheck force -AutoCloseWindow true -ShowInstDetails hide -ShowUninstDetails hide -SetDateSave on - -LicenseData "C:\cygwin\home\error\copying.txt" - -InstallDir "$PROGRAMFILES\Citadel" -InstallDirRegKey HKEY_LOCAL_MACHINE "SOFTWARE\Citadel\Citadel\CurrentVersion" "InstallDir" -DirShow show - -Section "Citadel Client and core libraries (required)" Citadel ; (default section) -SetShellVarContext all -SetOutPath "$INSTDIR" -File C:\cygwin\home\error\cvs\citadel\citadel.exe -File C:\cygwin\home\error\citadel.rc -File C:\cygwin\bin\libW11.dll -File C:\cygwin\bin\cygwin1.dll -File C:\cygwin\bin\cygcrypto-0.9.7.dll -File C:\cygwin\bin\cygncurses7.dll -File C:\cygwin\bin\cygssl-0.9.7.dll -File C:\cygwin\bin\rxvt.exe -Delete "$DESKTOP\Citadel.lnk" -WriteUninstaller "$INSTDIR\uninst.exe" -CreateShortCut "$DESKTOP\Citadel.lnk" \ - "$INSTDIR\rxvt.exe" "-fg white -bg black -sl 1000 -sr -fn 8x16 -e ./citadel.exe" \ - "telnet.exe" "0" -CreateDirectory "$SMPROGRAMS\Citadel" -CreateShortcut "$SMPROGRAMS\Citadel\Citadel.lnk" \ - "$INSTDIR\rxvt.exe" "-fg white -bg black -sl 1000 -sr -fn 8x16 -e ./citadel.exe" \ - "telnet.exe" "0" -WriteRegStr HKEY_LOCAL_MACHINE "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\Citadel" "DisplayName" "Citadel (remove only)" -WriteRegStr HKEY_LOCAL_MACHINE "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\Citadel" "UninstallString" '"$INSTDIR\uninst.exe"' -WriteRegStr HKEY_LOCAL_MACHINE "SOFTWARE\Citadel\Citadel\CurrentVersion" "InstallDir" "$INSTDIR" -SectionEnd ; end of default section - -Section "Citadel Server" CitadelServer -SetOutPath "$INSTDIR" -File C:\cygwin\home\error\cvs\citadel\citserver.exe -File C:\cygwin\bin\cygz.dll -File C:\cygwin\home\error\cvs\citadel\base64.exe -File C:\cygwin\home\error\cvs\citadel\setup.exe -File C:\cygwin\home\error\cvs\citadel\sendcommand.exe -File C:\cygwin\home\error\cvs\citadel\docs\citadel.html -File /oname=README.TXT C:\cygwin\home\error\cvs\citadel\docs\windows-readme.txt -SetOverwrite off -File /r C:\cygwin\home\error\cvs\citadel\help -File /r C:\cygwin\home\error\cvs\citadel\messages -SetOverwrite on -CreateShortcut "$SMPROGRAMS\Citadel\Server Setup Utility.lnk" \ - "$INSTDIR\rxvt.exe" "-fg white -bg black -sl 1000 -sr -fn 8x16 -e ./setup.exe" \ - "shell32.dll" "65" -CreateShortcut "$SMPROGRAMS\Citadel\README.lnk" \ - "$INSTDIR\README.TXT" -CreateShortcut "$SMPROGRAMS\Citadel\Citadel Documentation.lnk" \ - "$INSTDIR\citadel.html" -WriteRegStr HKEY_LOCAL_MACHINE "SOFTWARE\Microsoft\Windows\CurrentVersion\RunServices" "Citadel" "$INSTDIR\citserver.exe -x9 -tcitadel-debug.txt" -SectionEnd - -Section "Citadel Utilities" CitadelUtils -SetOutPath $INSTDIR -File C:\cygwin\home\error\cvs\citadel\aidepost.exe -File C:\cygwin\home\error\cvs\citadel\citmail.exe -File C:\cygwin\home\error\cvs\citadel\migratenet.exe -File C:\cygwin\home\error\cvs\citadel\msgform.exe -File C:\cygwin\home\error\cvs\citadel\userlist.exe -File C:\cygwin\home\error\cvs\citadel\whobbs.exe -SectionEnd -!insertmacro MUI_SECTIONS_FINISHHEADER - -!insertmacro MUI_FUNCTIONS_DESCRIPTION_BEGIN - !insertmacro MUI_DESCRIPTION_TEXT ${Citadel} $(DESC_Citadel) - !insertmacro MUI_DESCRIPTION_TEXT ${CitadelServer} $(DESC_CitadelServer) - !insertmacro MUI_DESCRIPTION_TEXT ${CitadelUtils} $(DESC_CitadelUtils) -!insertmacro MUI_FUNCTIONS_DESCRIPTION_END - -; begin uninstall settings/section - -Section Uninstall -SetShellVarContext all -SetDetailsView hide -SetAutoClose false -Delete "$INSTDIR\uninst.exe" -Delete /rebootok "$INSTDIR\citadel.exe" -Delete /rebootok "$INSTDIR\libW11.dll" -Delete /rebootok "$INSTDIR\cygwin1.dll" -Delete /rebootok "$INSTDIR\cygcrypto-0.9.7.dll" -Delete /rebootok "$INSTDIR\cygncurses7.dll" -Delete /rebootok "$INSTDIR\cygssl-0.9.7.dll" -Delete /rebootok "$INSTDIR\rxvt.exe" -Delete /rebootok "$INSTDIR\citserver.exe" -Delete /rebootok "$INSTDIR\base64.exe" -Delete /rebootok "$INSTDIR\setup.exe" -Delete /rebootok "$INSTDIR\aidepost.exe" -Delete /rebootok "$INSTDIR\citmail.exe" -Delete /rebootok "$INSTDIR\migratenet.exe" -Delete /rebootok "$INSTDIR\msgform.exe" -Delete /rebootok "$INSTDIR\sendcommand.exe" -Delete /rebootok "$INSTDIR\userlist.exe" -Delete /rebootok "$INSTDIR\whobbs.exe" - -RMDir /r "$INSTDIR\help" -RMDir /r "$INSTDIR\messages" -RMDir /r "$INSTDIR\bitbucket" -RMDir "$INSTDIR" - -Delete "$SMPROGRAMS\Citadel\README.lnk" -Delete "$SMPROGRAMS\Citadel\Citadel Documentation.lnk" -Delete "$SMPROGRAMS\Citadel\Server Setup Utility.lnk" -Delete "$SMPROGRAMS\Citadel\Citadel.lnk" -RMDir "$SMPROGRAMS\Citadel" -Delete "$DESKTOP\Citadel.lnk" -DeleteRegValue HKEY_LOCAL_MACHINE "SOFTWARE\Microsoft\Windows\CurrentVersion\RunServices" "Citadel" -DeleteRegKey HKEY_LOCAL_MACHINE "SOFTWARE\Citadel\Citadel" -DeleteRegKey HKEY_LOCAL_MACHINE "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\Citadel" -DeleteRegValue HKEY_LOCAL_MACHINE "SOFTWARE\Citadel\Citadel\CurrentVersion" "InstallDir" -DeleteRegKey /ifempty HKEY_LOCAL_MACHINE "SOFTWARE\Citadel\Citadel\CurrentVersion" -DeleteRegKey /ifempty HKEY_LOCAL_MACHINE "SOFTWARE\Citadel\Citadel" -DeleteRegKey /ifempty HKEY_LOCAL_MACHINE "SOFTWARE\Citadel" -!insertmacro MUI_UNFINISHHEADER -SectionEnd ; end of uninstall section - -; eof diff --git a/citadel/configure.ac b/citadel/configure.ac index d49a2668a..1b8643023 100644 --- a/citadel/configure.ac +++ b/citadel/configure.ac @@ -1,7 +1,7 @@ dnl Process this file with autoconf to produce a configure script. dnl $Id$ AC_PREREQ(2.52) -AC_INIT([Citadel], [7.63], [http://www.citadel.org/]) +AC_INIT([Citadel], [7.66], [http://www.citadel.org/]) AC_REVISION([$Revision: 5108 $]) AC_CONFIG_SRCDIR([citserver.c]) AC_CONFIG_HEADER(sysdep.h) diff --git a/libcitadel/configure.in b/libcitadel/configure.in index 90b057e2c..6973ace20 100755 --- a/libcitadel/configure.in +++ b/libcitadel/configure.in @@ -5,7 +5,7 @@ dnl dnl Ensure that libcitadel is configured with autoconf 2.52 or newer AC_PREREQ(2.52) -AC_INIT(libcitadel, 7.63, https://uncensored.citadel.org) +AC_INIT(libcitadel, 7.66, https://uncensored.citadel.org) AC_CONFIG_SRCDIR(Makefile.in) AC_CONFIG_AUX_DIR(conftools) diff --git a/libcitadel/lib/libcitadel.h b/libcitadel/lib/libcitadel.h index 32fa9759d..aca897882 100644 --- a/libcitadel/lib/libcitadel.h +++ b/libcitadel/lib/libcitadel.h @@ -15,7 +15,7 @@ #include #include #include -#define LIBCITADEL_VERSION_NUMBER 763 +#define LIBCITADEL_VERSION_NUMBER 766 /* * Here's a bunch of stupid magic to make the MIME parser portable. diff --git a/libcitadel/tests/token_test.c b/libcitadel/tests/token_test.c index b1a401e45..53b9f2da6 100644 --- a/libcitadel/tests/token_test.c +++ b/libcitadel/tests/token_test.c @@ -13,7 +13,8 @@ int main(int argc, char **argv) { const char *pvset; int i = 0; - char *teststring = "40:24524,24662,24673,27869:27935,28393,28426,31247:31258,31731,31749,31761,31778,31782,31801:31803,31813,31904,31915,33708,33935,34619,34672,34720:34723,34766,34835,37594,38854,39235,39942,40030,40142,40520,40815,40907,41201,41578,41781,41954,42292,43110,43565,43801,43998,44180,44241,44295,44401,44561,44635,44798,44861,44946,45022,45137:45148,45166,45179,45707,47114,47141:47157,47194,47314,47349,47386,47489,47496,47534:47543,54460,54601,54637:54652"; + // char *teststring = "40:24524,24662,24673,27869:27935,28393,28426,31247:31258,31731,31749,31761,31778,31782,31801:31803,31813,31904,31915,33708,33935,34619,34672,34720:34723,34766,34835,37594,38854,39235,39942,40030,40142,40520,40815,40907,41201,41578,41781,41954,42292,43110,43565,43801,43998,44180,44241,44295,44401,44561,44635,44798,44861,44946,45022,45137:45148,45166,45179,45707,47114,47141:47157,47194,47314,47349,47386,47489,47496,47534:47543,54460,54601,54637:54652"; + char *teststring = "one,two,three"; setstr = NewStrBuf(); vset = NewStrBufPlain(teststring, -1); diff --git a/webcit/configure.ac b/webcit/configure.ac index 4cf3d0e0d..288d49734 100644 --- a/webcit/configure.ac +++ b/webcit/configure.ac @@ -1,6 +1,6 @@ dnl Process this file with autoconf to produce a configure script. dnl $Id$ -AC_INIT([WebCit], [7.65], [http://www.citadel.org/]) +AC_INIT([WebCit], [7.66], [http://www.citadel.org/]) AC_SUBST(PROG_SUBDIRS) diff --git a/webcit/webcit.h b/webcit/webcit.h index 47dcaac38..f370c9298 100644 --- a/webcit/webcit.h +++ b/webcit/webcit.h @@ -111,9 +111,9 @@ #define PORT_NUM 2000 /* port number to listen on */ #define DEVELOPER_ID 0 #define CLIENT_ID 4 -#define CLIENT_VERSION 764 /* This version of WebCit */ -#define MINIMUM_CIT_VERSION 761 /* min required Citadel ver */ -#define LIBCITADEL_MIN 763 /* min required libcitadel ver */ +#define CLIENT_VERSION 766 /* This version of WebCit */ +#define MINIMUM_CIT_VERSION 766 /* min required Citadel ver */ +#define LIBCITADEL_MIN 766 /* min required libcitadel ver */ #define DEFAULT_HOST "localhost" /* Default Citadel server */ #define DEFAULT_PORT "504" #define TARGET "webcit01" /* Target for inline URL's */ -- 2.30.2