[Pkg-citadel-commit] r316 - citadel/trunk/debian/patches
meskes at alioth.debian.org
meskes at alioth.debian.org
Wed Apr 1 10:03:36 UTC 2009
Author: meskes
Date: 2009-04-01 10:03:36 +0000 (Wed, 01 Apr 2009)
New Revision: 316
Modified:
citadel/trunk/debian/patches/743-744.diff
Log:
re-diffed
Modified: citadel/trunk/debian/patches/743-744.diff
===================================================================
--- citadel/trunk/debian/patches/743-744.diff 2009-04-01 09:59:21 UTC (rev 315)
+++ citadel/trunk/debian/patches/743-744.diff 2009-04-01 10:03:36 UTC (rev 316)
@@ -1,6 +1,6 @@
diff -ruN citadel.orig/citadel_dirs.c citadel/citadel_dirs.c
--- citadel.orig/citadel_dirs.c 2009-03-17 04:24:55.000000000 +0100
-+++ citadel/citadel_dirs.c 2009-04-01 11:48:28.000000000 +0200
++++ citadel/citadel_dirs.c 2009-04-01 12:01:25.000000000 +0200
@@ -33,6 +33,7 @@
char ctdl_dspam_dir[PATH_MAX]="dspam";
char ctdl_file_dir[PATH_MAX]="files";
@@ -29,7 +29,7 @@
DBG_PRINT(ctdl_bio_dir);
diff -ruN citadel.orig/citadel_dirs.h citadel/citadel_dirs.h
--- citadel.orig/citadel_dirs.h 2009-03-17 04:24:55.000000000 +0100
-+++ citadel/citadel_dirs.h 2009-04-01 11:48:28.000000000 +0200
++++ citadel/citadel_dirs.h 2009-04-01 12:01:25.000000000 +0200
@@ -14,6 +14,7 @@
extern char ctdl_dspam_dir[PATH_MAX];
extern char ctdl_file_dir[PATH_MAX];
@@ -40,8 +40,15 @@
extern char ctdl_key_dir[PATH_MAX];
diff -ruN citadel.orig/citadel.h citadel/citadel.h
--- citadel.orig/citadel.h 2009-03-17 04:24:55.000000000 +0100
-+++ citadel/citadel.h 2009-04-01 11:48:32.000000000 +0200
-@@ -38,10 +38,10 @@
++++ citadel/citadel.h 2009-04-01 12:03:36.000000000 +0200
+@@ -1,5 +1,5 @@
+ /*
+- * $Id: citadel.h 7220 2009-03-17 03:22:44Z ajc $
++ * $Id: citadel.h 7281 2009-03-30 21:48:20Z ajc $
+ *
+ * Main Citadel header file
+ * See COPYING for copyright information.
+@@ -38,7 +38,7 @@
* usually more strict because you're not really supposed to dump/load and
* upgrade at the same time.
*/
@@ -50,12 +57,9 @@
#define REV_MIN 591 /* Oldest compatible database */
#define EXPORT_REV_MIN 737 /* Oldest compatible export files */
#define LIBCITADEL_MIN 743 /* Minimum required version of libcitadel */
-
- #define SERVER_TYPE 0 /* zero for stock Citadel; other developers please
- obtain SERVER_TYPE codes for your implementations */
diff -ruN citadel.orig/citadel.nsi citadel/citadel.nsi
--- citadel.orig/citadel.nsi 2009-03-17 04:24:55.000000000 +0100
-+++ citadel/citadel.nsi 2009-04-01 11:48:28.000000000 +0200
++++ citadel/citadel.nsi 2009-04-01 12:01:25.000000000 +0200
@@ -4,7 +4,7 @@
!include "${NSISDIR}\Contrib\Modern UI\System.nsh"
@@ -76,7 +80,7 @@
LangString DESC_Citadel ${LANG_ENGLISH} "Citadel client and core libraries (required)"
diff -ruN citadel.orig/config.c citadel/config.c
--- citadel.orig/config.c 2009-03-17 04:24:55.000000000 +0100
-+++ citadel/config.c 2009-04-01 11:48:32.000000000 +0200
++++ citadel/config.c 2009-04-01 12:01:25.000000000 +0200
@@ -63,7 +63,7 @@
int desired_mode = (S_IFREG | S_IRUSR | S_IWUSR) ;
if (st.st_mode != desired_mode) {
@@ -88,7 +92,7 @@
#endif
diff -ruN citadel.orig/configure.ac citadel/configure.ac
--- citadel.orig/configure.ac 2009-03-17 04:24:55.000000000 +0100
-+++ citadel/configure.ac 2009-04-01 11:48:28.000000000 +0200
++++ citadel/configure.ac 2009-04-01 12:01:25.000000000 +0200
@@ -1,7 +1,7 @@
dnl Process this file with autoconf to produce a configure script.
dnl $Id: configure.ac 7220 2009-03-17 03:22:44Z ajc $
@@ -100,7 +104,7 @@
AC_PREFIX_DEFAULT(/usr/local/citadel)
diff -ruN citadel.orig/docs/citadel.html citadel/docs/citadel.html
--- citadel.orig/docs/citadel.html 2008-10-13 15:48:45.000000000 +0200
-+++ citadel/docs/citadel.html 2009-04-01 11:48:28.000000000 +0200
++++ citadel/docs/citadel.html 2009-04-01 12:01:25.000000000 +0200
@@ -9,145 +9,31 @@
<div align="center">
<h1>C I T A D E L</h1>
@@ -274,7 +278,7 @@
<div align="justify">The entire package is open source software. You may
diff -ruN citadel.orig/funambol_newmail_soap.xml citadel/funambol_newmail_soap.xml
--- citadel.orig/funambol_newmail_soap.xml 1970-01-01 01:00:00.000000000 +0100
-+++ citadel/funambol_newmail_soap.xml 2009-04-01 11:48:28.000000000 +0200
++++ citadel/funambol_newmail_soap.xml 2009-04-01 12:01:25.000000000 +0200
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?><soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><soapenv:Body><sendNotificationMessages soapenv:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/">
+<arg0 xsi:type="soapenc:string" xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/">^notifyuser</arg0><arg1 xsi:type="soapenc:string" xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/">
@@ -318,7 +322,7 @@
+<multiRef id="id0" soapenc:root="0" soapenv:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" xsi:type="soapenc:int" xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/">1</multiRef></soapenv:Body></soapenv:Envelope>
diff -ruN citadel.orig/locate_host.c citadel/locate_host.c
--- citadel.orig/locate_host.c 2008-04-11 16:26:49.000000000 +0200
-+++ citadel/locate_host.c 2009-04-01 11:48:32.000000000 +0200
++++ citadel/locate_host.c 2009-04-01 12:01:25.000000000 +0200
@@ -14,9 +14,11 @@
#include <sys/types.h>
#include <sys/socket.h>
@@ -410,7 +414,7 @@
diff -ruN citadel.orig/Makefile.in citadel/Makefile.in
--- citadel.orig/Makefile.in 2009-03-17 04:24:55.000000000 +0100
-+++ citadel/Makefile.in 2009-04-01 11:48:32.000000000 +0200
++++ citadel/Makefile.in 2009-04-01 12:01:25.000000000 +0200
@@ -206,7 +206,7 @@
network/systems; do \
$(srcdir)/mkinstalldirs $(DESTDIR)$(prefix)/$$i; \
@@ -431,7 +435,7 @@
$(INSTALL_DATA) $$i $(DESTDIR)$(HELP_DIR)/$$i; \
diff -ruN citadel.orig/modules/calendar/serv_calendar.c citadel/modules/calendar/serv_calendar.c
--- citadel.orig/modules/calendar/serv_calendar.c 2009-02-20 19:28:25.000000000 +0100
-+++ citadel/modules/calendar/serv_calendar.c 2009-04-01 11:48:32.000000000 +0200
++++ citadel/modules/calendar/serv_calendar.c 2009-04-01 12:01:25.000000000 +0200
@@ -808,51 +808,64 @@
struct icaltimetype t2start,
struct icaltimetype t2end
@@ -523,7 +527,7 @@
* called by ical_conflicts_phase5()
diff -ruN citadel.orig/modules/extnotify/funambol65.c citadel/modules/extnotify/funambol65.c
--- citadel.orig/modules/extnotify/funambol65.c 2008-04-11 16:26:48.000000000 +0200
-+++ citadel/modules/extnotify/funambol65.c 2009-04-01 11:48:32.000000000 +0200
++++ citadel/modules/extnotify/funambol65.c 2009-04-01 12:01:25.000000000 +0200
@@ -16,6 +16,7 @@
#include <sys/socket.h>
#include <time.h>
@@ -602,7 +606,7 @@
// Do substitutions
diff -ruN citadel.orig/modules/sieve/serv_sieve.c citadel/modules/sieve/serv_sieve.c
--- citadel.orig/modules/sieve/serv_sieve.c 2009-02-20 19:28:25.000000000 +0100
-+++ citadel/modules/sieve/serv_sieve.c 2009-04-01 11:48:32.000000000 +0200
++++ citadel/modules/sieve/serv_sieve.c 2009-04-01 12:01:25.000000000 +0200
@@ -518,7 +518,10 @@
CtdlLogPrintf(CTDL_DEBUG, "Performing sieve processing on msg <%ld>\n", msgnum);
@@ -617,7 +621,7 @@
/*
diff -ruN citadel.orig/modules/smtp/serv_smtp.c citadel/modules/smtp/serv_smtp.c
--- citadel.orig/modules/smtp/serv_smtp.c 2009-03-17 04:24:54.000000000 +0100
-+++ citadel/modules/smtp/serv_smtp.c 2009-04-01 11:48:32.000000000 +0200
++++ citadel/modules/smtp/serv_smtp.c 2009-04-01 12:01:25.000000000 +0200
@@ -1696,6 +1696,7 @@
*/
void smtp_do_queue(void) {
@@ -641,7 +645,7 @@
}
diff -ruN citadel.orig/msgbase.c citadel/msgbase.c
--- citadel.orig/msgbase.c 2009-02-20 19:28:25.000000000 +0100
-+++ citadel/msgbase.c 2009-04-01 11:48:28.000000000 +0200
++++ citadel/msgbase.c 2009-04-01 12:01:25.000000000 +0200
@@ -3031,8 +3031,8 @@
/*
* Convenience function for generating small administrative messages.
@@ -655,7 +659,7 @@
struct recptypes *recp = NULL;
diff -ruN citadel.orig/msgbase.h citadel/msgbase.h
--- citadel.orig/msgbase.h 2008-09-12 04:22:17.000000000 +0200
-+++ citadel/msgbase.h 2009-04-01 11:48:28.000000000 +0200
++++ citadel/msgbase.h 2009-04-01 12:01:25.000000000 +0200
@@ -100,7 +100,7 @@
long send_message (struct CtdlMessage *);
void loadtroom (void);
@@ -667,7 +671,7 @@
void cmd_move (char *args);
diff -ruN citadel.orig/network/funambol_newmail_soap.xml citadel/network/funambol_newmail_soap.xml
--- citadel.orig/network/funambol_newmail_soap.xml 2008-01-31 19:53:48.000000000 +0100
-+++ citadel/network/funambol_newmail_soap.xml 2009-04-01 11:48:28.000000000 +0200
++++ citadel/network/funambol_newmail_soap.xml 2009-04-01 12:01:25.000000000 +0200
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><soapenv:Body><sendNotificationMessages soapenv:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/">
-<arg0 xsi:type="soapenc:string" xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/">^notifyuser</arg0><arg1 xsi:type="soapenc:string" xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/">
@@ -711,7 +715,7 @@
-<multiRef id="id0" soapenc:root="0" soapenv:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" xsi:type="soapenc:int" xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/">1</multiRef></soapenv:Body></soapenv:Envelope>
diff -ruN citadel.orig/room_ops.c citadel/room_ops.c
--- citadel.orig/room_ops.c 2008-04-11 16:26:49.000000000 +0200
-+++ citadel/room_ops.c 2009-04-01 11:48:28.000000000 +0200
++++ citadel/room_ops.c 2009-04-01 12:01:25.000000000 +0200
@@ -181,7 +181,7 @@
if ( (userbuf->axlevel >= 6)
|| (userbuf->usernum == roombuf->QRroomaide)
@@ -723,7 +727,7 @@
NEWMSG: /* By the way, we also check for the presence of new messages */
diff -ruN citadel.orig/server_main.c citadel/server_main.c
--- citadel.orig/server_main.c 2008-07-04 05:52:41.000000000 +0200
-+++ citadel/server_main.c 2009-04-01 11:48:28.000000000 +0200
++++ citadel/server_main.c 2009-04-01 12:01:25.000000000 +0200
@@ -310,6 +310,14 @@
start_chkpwd_daemon();
}
@@ -741,7 +745,7 @@
* corresponding group ids
diff -ruN citadel.orig/sysdep.c citadel/sysdep.c
--- citadel.orig/sysdep.c 2009-03-17 04:24:55.000000000 +0100
-+++ citadel/sysdep.c 2009-04-01 11:48:28.000000000 +0200
++++ citadel/sysdep.c 2009-04-01 12:01:25.000000000 +0200
@@ -566,13 +566,17 @@
void buffer_output(void) {
@@ -831,7 +835,7 @@
* Returns nonzero if a conversion took place
diff -ruN citadel.orig/sysdep_decls.h citadel/sysdep_decls.h
--- citadel.orig/sysdep_decls.h 2009-02-20 19:28:25.000000000 +0100
-+++ citadel/sysdep_decls.h 2009-04-01 11:48:28.000000000 +0200
++++ citadel/sysdep_decls.h 2009-04-01 12:01:25.000000000 +0200
@@ -70,6 +70,7 @@
void kill_session (int session_to_kill);
void *sd_context_loop (struct CitContext *con);
More information about the Pkg-citadel-commit
mailing list