projects
/
citadel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
103cac2
)
Version number set to 8.10 across the whole code base
author
Art Cancro
<ajc@uncensored.citadel.org>
Fri, 20 Jan 2012 17:24:21 +0000
(12:24 -0500)
committer
Art Cancro
<ajc@uncensored.citadel.org>
Fri, 20 Jan 2012 17:24:21 +0000
(12:24 -0500)
citadel/citadel.h
patch
|
blob
|
history
citadel/configure.ac
patch
|
blob
|
history
libcitadel/configure.in
patch
|
blob
|
history
webcit/configure.ac
patch
|
blob
|
history
webcit/webcit.h
patch
|
blob
|
history
diff --git
a/citadel/citadel.h
b/citadel/citadel.h
index dbef91b2909ef40a171c710aad25d94746274d21..23fcc1dba04f7f8c9a8fa2f5aced8b6a22a1eccf 100644
(file)
--- a/
citadel/citadel.h
+++ b/
citadel/citadel.h
@@
-1,21
+1,15
@@
/*
* Main Citadel header file
*
/*
* Main Citadel header file
*
- * Copyright (c) 1987-201
1
by the citadel.org team
+ * Copyright (c) 1987-201
2
by the citadel.org team
*
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
+ * This program is open source software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
/* system customizations are in sysconfig.h */
*/
/* system customizations are in sysconfig.h */
@@
-51,10
+45,10
@@
extern "C" {
* usually more strict because you're not really supposed to dump/load and
* upgrade at the same time.
*/
* usually more strict because you're not really supposed to dump/load and
* upgrade at the same time.
*/
-#define REV_LEVEL 8
03
/* This version */
+#define REV_LEVEL 8
10
/* This version */
#define REV_MIN 591 /* Oldest compatible database */
#define EXPORT_REV_MIN 760 /* Oldest compatible export files */
#define REV_MIN 591 /* Oldest compatible database */
#define EXPORT_REV_MIN 760 /* Oldest compatible export files */
-#define LIBCITADEL_MIN 8
02
/* Minimum required version of libcitadel */
+#define LIBCITADEL_MIN 8
10
/* Minimum required version of libcitadel */
#define SERVER_TYPE 0 /* zero for stock Citadel; other developers please
obtain SERVER_TYPE codes for your implementations */
#define SERVER_TYPE 0 /* zero for stock Citadel; other developers please
obtain SERVER_TYPE codes for your implementations */
@@
-83,11
+77,6
@@
extern "C" {
*/
typedef struct ExpirePolicy ExpirePolicy;
struct ExpirePolicy {
*/
typedef struct ExpirePolicy ExpirePolicy;
struct ExpirePolicy {
-/*
-#include "datadefinitions.h"
-#include "dtds/expirepolicy-defs.h"
-#include "undef_data.h"
-*/
int expire_mode;
int expire_value;
};
int expire_mode;
int expire_value;
};
@@
-105,11
+94,6
@@
struct ExpirePolicy {
*/
typedef struct march march;
struct march {
*/
typedef struct march march;
struct march {
-/*
-#include "datadefinitions.h"
-#include "dtds/march-defs.h"
-#include "undef_data.h"
-*/
struct march *next;
char march_name[ROOMNAMELEN];
unsigned int march_flags;
struct march *next;
char march_name[ROOMNAMELEN];
unsigned int march_flags;
@@
-135,11
+119,6
@@
struct march {
*/
typedef struct ctdluser ctdluser;
struct ctdluser { /* User record */
*/
typedef struct ctdluser ctdluser;
struct ctdluser { /* User record */
-/*
-#include "datadefinitions.h"
-#include "dtds/user-defs.h"
-#include "undef_data.h"
-*/
int version; /* Cit vers. which created this rec */
uid_t uid; /* Associate with a unix account? */
char password[32]; /* password */
int version; /* Cit vers. which created this rec */
uid_t uid; /* Associate with a unix account? */
char password[32]; /* password */
@@
-165,11
+144,6
@@
struct ctdluser { /* User record */
*/
typedef struct ctdlroom ctdlroom;
struct ctdlroom {
*/
typedef struct ctdlroom ctdlroom;
struct ctdlroom {
-/*
-#include "datadefinitions.h"
-#include "dtds/room-defs.h"
-#include "undef_data.h"
-*/
char QRname[ROOMNAMELEN]; /* Name of room */
char QRpasswd[10]; /* Only valid if it's a private rm */
long QRroomaide; /* User number of room aide */
char QRname[ROOMNAMELEN]; /* Name of room */
char QRpasswd[10]; /* Only valid if it's a private rm */
long QRroomaide; /* User number of room aide */
@@
-212,11
+186,6
@@
struct ctdlroom {
*/
typedef struct floor floor;
struct floor {
*/
typedef struct floor floor;
struct floor {
-/*
-#include "datadefinitions.h"
-#include "dtds/floor-defs.h"
-#include "undef_data.h"
-*/
unsigned short f_flags; /* flags */
char f_name[256]; /* name of floor */
int f_ref_count; /* reference count */
unsigned short f_flags; /* flags */
char f_name[256]; /* name of floor */
int f_ref_count; /* reference count */
diff --git
a/citadel/configure.ac
b/citadel/configure.ac
index a4140b822558275a7f1e07891ad9f689a60771ac..eb09f1aa9bc89d460c87d20cb18abfc0aec8d911 100644
(file)
--- a/
citadel/configure.ac
+++ b/
citadel/configure.ac
@@
-1,6
+1,6
@@
dnl Process this file with autoconf to produce a configure script.
AC_PREREQ(2.52)
dnl Process this file with autoconf to produce a configure script.
AC_PREREQ(2.52)
-AC_INIT([Citadel], [8.
03
], [http://www.citadel.org/])
+AC_INIT([Citadel], [8.
10
], [http://www.citadel.org/])
AC_REVISION([$Revision: 5108 $])
AC_CONFIG_SRCDIR([citserver.c])
AC_CONFIG_HEADER(sysdep.h)
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 71328a0df9027814691e9107c0be81b5fac6f85c..3a6e803b295e51c262cfe356c793c43afa22624a 100755
(executable)
--- 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)
dnl Ensure that libcitadel is configured with autoconf 2.52 or newer
AC_PREREQ(2.52)
-AC_INIT(libcitadel, 8.
02
, http://uncensored.citadel.org)
+AC_INIT(libcitadel, 8.
10
, http://uncensored.citadel.org)
AC_CONFIG_SRCDIR(Makefile.in)
AC_CONFIG_AUX_DIR(conftools)
AC_CONFIG_SRCDIR(Makefile.in)
AC_CONFIG_AUX_DIR(conftools)
@@
-23,8
+23,8
@@
dnl If the API changes incompatibly set LIBAGE back to 0
dnl
LIBCURRENT=2
dnl
LIBCURRENT=2
-LIBREVISION=
1
-LIBAGE=
0
+LIBREVISION=
2
+LIBAGE=
1
sinclude(conftools/libtool.m4)
sinclude(conftools/ac_c_bigendian_cross.m4)
sinclude(conftools/libtool.m4)
sinclude(conftools/ac_c_bigendian_cross.m4)
diff --git
a/webcit/configure.ac
b/webcit/configure.ac
index ba0d46d31d1a404be8e95ab624f9dd70f2677a97..6f3a7bc775ebfd4a6901e17da0984ff2a96a86c4 100644
(file)
--- 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$
dnl Process this file with autoconf to produce a configure script.
dnl $Id$
-AC_INIT([WebCit], [8.
03
], [http://www.citadel.org/])
+AC_INIT([WebCit], [8.
10
], [http://www.citadel.org/])
AC_SUBST(PROG_SUBDIRS)
AC_SUBST(PROG_SUBDIRS)
diff --git
a/webcit/webcit.h
b/webcit/webcit.h
index 5f6cd89b5e7e0cbf8412eca989e56fae5911d8eb..6611a927517cd3a22615c5c3af0af99297d3dce1 100644
(file)
--- a/
webcit/webcit.h
+++ b/
webcit/webcit.h
@@
-128,12
+128,12
@@
extern char *ssl_cipher_list;
#define PORT_NUM 2000 /* port number to listen on */
#define DEVELOPER_ID 0
#define CLIENT_ID 4
#define PORT_NUM 2000 /* port number to listen on */
#define DEVELOPER_ID 0
#define CLIENT_ID 4
-#define CLIENT_VERSION 8
02
/* This version of WebCit */
-#define MINIMUM_CIT_VERSION 8
02 /* min required Citadel
ver */
-#define LIBCITADEL_MIN 8
02 /* min required libcitadel ver
*/
+#define CLIENT_VERSION 8
10
/* This version of WebCit */
+#define MINIMUM_CIT_VERSION 8
10 /* Minimum required version of Citadel ser
ver */
+#define LIBCITADEL_MIN 8
10 /* Minimum required version of libcitadel
*/
#define DEFAULT_HOST "localhost" /* Default Citadel server */
#define DEFAULT_PORT "504"
#define DEFAULT_HOST "localhost" /* Default Citadel server */
#define DEFAULT_PORT "504"
-#define TARGET "webcit01" /*
T
arget for inline URL's */
+#define TARGET "webcit01" /*
Window t
arget for inline URL's */
#define HOUSEKEEPING 15 /* Housekeeping frequency */
#define MAX_WORKER_THREADS 250
#define LISTEN_QUEUE_LENGTH 100 /* listen() backlog queue */
#define HOUSEKEEPING 15 /* Housekeeping frequency */
#define MAX_WORKER_THREADS 250
#define LISTEN_QUEUE_LENGTH 100 /* listen() backlog queue */
@@
-265,11
+265,12
@@
extern char *ssl_cipher_list;
#define EXPIRE_MANUAL 1 /* Don't expire messages at all */
#define EXPIRE_NUMMSGS 2 /* Keep only latest n messages */
#define EXPIRE_AGE 3 /* Expire messages after n days */
#define EXPIRE_MANUAL 1 /* Don't expire messages at all */
#define EXPIRE_NUMMSGS 2 /* Keep only latest n messages */
#define EXPIRE_AGE 3 /* Expire messages after n days */
+
typedef struct __ExpirePolicy {
int loaded; /* has this been loaded from the server? */
int expire_mode;
int expire_value;
typedef struct __ExpirePolicy {
int loaded; /* has this been loaded from the server? */
int expire_mode;
int expire_value;
-}ExpirePolicy;
+}
ExpirePolicy;
void LoadExpirePolicy(GPEXWhichPolicy which);
void SaveExpirePolicyFromHTTP(GPEXWhichPolicy which);
void LoadExpirePolicy(GPEXWhichPolicy which);
void SaveExpirePolicyFromHTTP(GPEXWhichPolicy which);
@@
-566,7
+567,7
@@
struct wcsession {
StrBuf *ConvertBuf1;
StrBuf *ConvertBuf2;
StrBuf *ConvertBuf1;
StrBuf *ConvertBuf2;
-/* cache stuff for templates. TODO: find a smart
r
er way */
+/* cache stuff for templates. TODO: find a smarter way */
HashList *ServCfg; /* cache our server config for editing */
HashList *InetCfg; /* Our inet server config for editing */
ExpirePolicy Policy[maxpolicy];
HashList *ServCfg; /* cache our server config for editing */
HashList *InetCfg; /* Our inet server config for editing */
ExpirePolicy Policy[maxpolicy];
@@
-738,13
+739,10
@@
void output_html(const char *, int, int, StrBuf *, StrBuf *);
ssize_t write(int fd, const void *buf, size_t count);
void cal_process_attachment(wc_mime_attachment *Mime);
ssize_t write(int fd, const void *buf, size_t count);
void cal_process_attachment(wc_mime_attachment *Mime);
-void generate_uuid(char *);
-
void address_book_popup(void);
void begin_ajax_response(void);
void end_ajax_response(void);
void address_book_popup(void);
void begin_ajax_response(void);
void end_ajax_response(void);
-
extern char *months[];
extern char *days[];
long locate_user_vcard_in_this_room(message_summary **VCMsg,
extern char *months[];
extern char *days[];
long locate_user_vcard_in_this_room(message_summary **VCMsg,
@@
-759,7
+757,6
@@
void tabbed_dialog(int num_tabs, char *tabnames[]);
void begin_tab(int tabnum, int num_tabs);
void end_tab(int tabnum, int num_tabs);
void begin_tab(int tabnum, int num_tabs);
void end_tab(int tabnum, int num_tabs);
-
int get_time_format_cached (void);
void display_wiki_pagelist(void);
HashList *GetRoomListHashLKRA(StrBuf *Target, WCTemplputParams *TP);
int get_time_format_cached (void);
void display_wiki_pagelist(void);
HashList *GetRoomListHashLKRA(StrBuf *Target, WCTemplputParams *TP);