[Pkg-citadel-commit] r118 - in citadel/trunk/debian: . patches
dothebart-guest at alioth.debian.org
dothebart-guest at alioth.debian.org
Sat Aug 2 21:53:00 UTC 2008
Author: dothebart-guest
Date: 2008-08-02 21:52:59 +0000 (Sat, 02 Aug 2008)
New Revision: 118
Added:
citadel/trunk/debian/patches/r6412_pw_set_not.diff
citadel/trunk/debian/patches/r6415_dbversion_init_suspress_check.diff
citadel/trunk/debian/patches/r6424_typo_migrate_aliases.diff
citadel/trunk/debian/patches/r6432_r6435_fix_timeout_artv.diff
citadel/trunk/debian/patches/r6445_precise_masq_check.diff
citadel/trunk/debian/patches/r6455_typo_mk_svnversion.diff
Modified:
citadel/trunk/debian/changelog
citadel/trunk/debian/citadel-server.postinst
citadel/trunk/debian/patches/series
Log:
* [r64126] add upstream prepatch to citadel-client; display set/unset
instead of passwords to aide
* [r6415] add upstream prepatch; ommit BDB Versioncheck on first install
* [r6424] add upstream prepatch; fix typo in shellscript
* [r6432;r6435] add upstream prepatch; Don't timeout in ARTV Sessions
* [r6455] add upstream prepatch; fix typo in shellscript
Modified: citadel/trunk/debian/changelog
===================================================================
--- citadel/trunk/debian/changelog 2008-08-02 20:35:11 UTC (rev 117)
+++ citadel/trunk/debian/changelog 2008-08-02 21:52:59 UTC (rev 118)
@@ -2,6 +2,12 @@
[ Wilfried Goesgens ]
* Added missing LDAP shema to citadel-doc, closes: #493443.
+ * [r64126] add upstream prepatch to citadel-client; display set/unset
+ instead of passwords to aide
+ * [r6415] add upstream prepatch; ommit BDB Versioncheck on first install
+ * [r6424] add upstream prepatch; fix typo in shellscript
+ * [r6432;r6435] add upstream prepatch; Don't timeout in ARTV Sessions
+ * [r6455] add upstream prepatch; fix typo in shellscript
[ Michael Meskes ]
* Updated Finish translation, closes: #492611.
Modified: citadel/trunk/debian/citadel-server.postinst
===================================================================
--- citadel/trunk/debian/citadel-server.postinst 2008-08-02 20:35:11 UTC (rev 117)
+++ citadel/trunk/debian/citadel-server.postinst 2008-08-02 21:52:59 UTC (rev 118)
@@ -42,6 +42,7 @@
# we're in a fresh install, so we send the welcome message.
if test -z "$2"; then
+ export SUPPRESS_DBVERSION_CHECK=yes
/usr/lib/citadel-server/migrate_aliases.sh /etc/citadel/mail.aliases
i=0;
while test ! -S /var/run/citadel/lmtp.socket -a "$i" -lt "10"; do
Added: citadel/trunk/debian/patches/r6412_pw_set_not.diff
===================================================================
--- citadel/trunk/debian/patches/r6412_pw_set_not.diff (rev 0)
+++ citadel/trunk/debian/patches/r6412_pw_set_not.diff 2008-08-02 21:52:59 UTC (rev 118)
@@ -0,0 +1,13 @@
+Index: routines2.c
+===================================================================
+--- routines2.c (revision 6411)
++++ routines2.c (revision 6412)
+@@ -431,7 +431,7 @@
+ if (a == 1)
+ scr_printf("User #%s - %s ", buf, cmd);
+ if (a == 2)
+- scr_printf("PW: %s\n", buf);
++ scr_printf("PW: %s\n", (IsEmptyStr(buf) ? "<NOT SET>" : "<SET>") );
+ if (a == 3)
+ scr_printf("%s\n", buf);
+ if (a == 4)
Added: citadel/trunk/debian/patches/r6415_dbversion_init_suspress_check.diff
===================================================================
--- citadel/trunk/debian/patches/r6415_dbversion_init_suspress_check.diff (rev 0)
+++ citadel/trunk/debian/patches/r6415_dbversion_init_suspress_check.diff 2008-08-02 21:52:59 UTC (rev 118)
@@ -0,0 +1,14 @@
+Index: database_sleepycat.c
+===================================================================
+--- database_sleepycat.c (revision 6414)
++++ database_sleepycat.c (revision 6415)
+@@ -283,7 +283,8 @@
+ CtdlLogPrintf(CTDL_DEBUG, "Calculated dbversion: %d\n", current_dbversion);
+ CtdlLogPrintf(CTDL_DEBUG, " Previous dbversion: %d\n", CitControl.MMdbversion);
+
+- if (CitControl.MMdbversion > current_dbversion) {
++ if ( (getenv("SUPPRESS_DBVERSION_CHECK") == NULL)
++ && (CitControl.MMdbversion > current_dbversion) ) {
+ CtdlLogPrintf(CTDL_EMERG, "You are attempting to run the Citadel server using a version\n"
+ "of Berkeley DB that is older than that which last created or\n"
+ "updated the database. Because this would probably cause data\n"
Added: citadel/trunk/debian/patches/r6424_typo_migrate_aliases.diff
===================================================================
--- citadel/trunk/debian/patches/r6424_typo_migrate_aliases.diff (rev 0)
+++ citadel/trunk/debian/patches/r6424_typo_migrate_aliases.diff 2008-08-02 21:52:59 UTC (rev 118)
@@ -0,0 +1,13 @@
+Index: migrate_aliases.sh
+===================================================================
+--- migrate_aliases.sh (revision 6423)
++++ migrate_aliases.sh (revision 6424)
+@@ -20,7 +20,7 @@
+ ALIAS=`head -n $i /tmp/aliases |tail -n 1`
+ ORG=`echo $ALIAS|sed "s;,.*;;"`
+ if grep "$ORG" "$CITALIAS"; then
+- echo "Ignoring Alias $ORG as its alreday there"
++ echo "Ignoring Alias $ORG as its already there"
+ else
+ echo "$ALIAS" >>$CITALIAS
+ fi
Added: citadel/trunk/debian/patches/r6432_r6435_fix_timeout_artv.diff
===================================================================
--- citadel/trunk/debian/patches/r6432_r6435_fix_timeout_artv.diff (rev 0)
+++ citadel/trunk/debian/patches/r6432_r6435_fix_timeout_artv.diff 2008-08-02 21:52:59 UTC (rev 118)
@@ -0,0 +1,84 @@
+Index: modules/vandelay/serv_vandelay.c
+===================================================================
+--- modules/vandelay/serv_vandelay.c (revision 6431)
++++ modules/vandelay/serv_vandelay.c (revision 6435)
+@@ -480,7 +480,7 @@
+
+ Ctx = CC;
+ cprintf("%d Exporting all Citadel databases.\n", LISTING_FOLLOWS);
+-
++ Ctx->dont_term = 1;
+ cprintf("version\n%d\n", REV_LEVEL);
+
+ /* export the config file (this is done using x-macros) */
+@@ -512,6 +512,7 @@
+ if (Ctx->kill_me != 1)
+ artv_export_messages();
+ client_write("000\n", 4);
++ Ctx->dont_term = 0;
+ }
+
+ void artv_do_dump(void) {
+@@ -840,6 +841,8 @@
+ plain[0] = 0;
+ plain_size = SIZ;
+
++ CC->dont_term = 1;
++
+ cprintf("%d sock it to me\n", SEND_LISTING);
+ abuf[0] = '\0';
+ unbuffer_output();
+@@ -891,6 +894,7 @@
+ while (client_getln(buf, sizeof buf) >= 0 && strcmp(buf, "000")) ;;
+ rebuild_euid_index();
+ rebuild_usersbynumber();
++ CC->dont_term = 0;
+ }
+
+
+Index: housekeeping.c
+===================================================================
+--- housekeeping.c (revision 6431)
++++ housekeeping.c (revision 6435)
+@@ -57,6 +57,7 @@
+ time_t now;
+ int session_to_kill;
+ int killed = 0;
++ int longrunners = 0;
+
+ now = time(NULL);
+ session_to_kill = 0;
+@@ -65,13 +66,19 @@
+ if ( (ccptr!=CC)
+ && (config.c_sleeping > 0)
+ && (now - (ccptr->lastcmd) > config.c_sleeping) ) {
+- ccptr->kill_me = 1;
+- ++killed;
++ if (!ccptr->dont_term) {
++ ccptr->kill_me = 1;
++ ++killed;
++ }
++ else
++ longrunners ++;
+ }
+ }
+ end_critical_section(S_SESSION_TABLE);
+ if (killed > 0)
+ CtdlLogPrintf(CTDL_INFO, "Terminated %d idle sessions\n", killed);
++ if (longrunners > 0)
++ CtdlLogPrintf(CTDL_INFO, "Didn't terminate %d protected idle sessions;\n", killed);
+ }
+
+
+Index: server.h
+===================================================================
+--- server.h (revision 6431)
++++ server.h (revision 6435)
+@@ -62,6 +62,7 @@
+ int kill_me; /* Set to nonzero to flag for termination */
+ int client_socket;
+ int cs_pid; /* session ID */
++ int dont_term; /* for special activities like artv so we don't get killed */
+ time_t lastcmd; /* time of last command executed */
+ time_t lastidle; /* For computing idle time */
+
Added: citadel/trunk/debian/patches/r6445_precise_masq_check.diff
===================================================================
--- citadel/trunk/debian/patches/r6445_precise_masq_check.diff (rev 0)
+++ citadel/trunk/debian/patches/r6445_precise_masq_check.diff 2008-08-02 21:52:59 UTC (rev 118)
@@ -0,0 +1,18 @@
+Index: internet_addressing.c
+===================================================================
+--- internet_addressing.c (revision 6444)
++++ internet_addressing.c (revision 6445)
+@@ -326,11 +326,11 @@
+ return(hostalias_localhost);
+
+ if ( (!strcasecmp(type, "directory"))
+- && (!strcasecmp(&fqdn[strlen(fqdn)-strlen(host)], host)))
++ && (!strcasecmp(fqdn, host)))
+ return(hostalias_directory);
+
+ if ( (!strcasecmp(type, "masqdomain"))
+- && (!strcasecmp(&fqdn[strlen(fqdn)-strlen(host)], host)))
++ && (!strcasecmp(fqdn, host)))
+ return(hostalias_masq);
+
+ }
Added: citadel/trunk/debian/patches/r6455_typo_mk_svnversion.diff
===================================================================
--- citadel/trunk/debian/patches/r6455_typo_mk_svnversion.diff (rev 0)
+++ citadel/trunk/debian/patches/r6455_typo_mk_svnversion.diff 2008-08-02 21:52:59 UTC (rev 118)
@@ -0,0 +1,13 @@
+Index: mk_svn_revision.sh
+===================================================================
+--- mk_svn_revision.sh (revision 6454)
++++ mk_svn_revision.sh (revision 6455)
+@@ -23,7 +23,7 @@
+ fi
+ fi
+
+-if test $CAN_BUILD_SVN_REVISION == "yes" ; then
++if test "$CAN_BUILD_SVN_REVISION" == "yes" ; then
+
+ cat <<EOF > $C_FILE
+ /*
Modified: citadel/trunk/debian/patches/series
===================================================================
--- citadel/trunk/debian/patches/series 2008-08-02 20:35:11 UTC (rev 117)
+++ citadel/trunk/debian/patches/series 2008-08-02 21:52:59 UTC (rev 118)
@@ -1 +1,7 @@
-
+r6412_pw_set_not.diff
+r6415_dbversion_init_suspress_check.diff
+r6424_typo_migrate_aliases.diff
+r6432_r6435_fix_timeout_artv.diff
+r6445_precise_masq_check.diff
+r6455_typo_mk_svnversion.diff
+series
More information about the Pkg-citadel-commit
mailing list