[Pkg-citadel-commit] r136 - in citadel/trunk/debian: . patches

[dothebart-guest at alioth.debian.org]

Author: dothebart-guest
Date: 2008-08-26 06:42:15 +0000 (Tue, 26 Aug 2008)
New Revision: 136

Added:
   citadel/trunk/debian/patches/r6535_autopurger_dont_touch_systemfiles.diff
Modified:
   citadel/trunk/debian/changelog
   citadel/trunk/debian/patches/series
Log:


Modified: citadel/trunk/debian/changelog
===================================================================
--- citadel/trunk/debian/changelog	2008-08-26 06:34:07 UTC (rev 135)
+++ citadel/trunk/debian/changelog	2008-08-26 06:42:15 UTC (rev 136)
@@ -2,6 +2,8 @@
 
   [ Wilfried Goesgens ]
   * remove use of tempfiles from migrate_aliases.sh, closes: #496359
+  * [r6535] add upstream prepatch; stop the autopurger from messing with
+    system rooms
 
  -- Michael Meskes <meskes at debian.org>  Mon, 25 Aug 2008 10:51:15 +0200
 

Added: citadel/trunk/debian/patches/r6535_autopurger_dont_touch_systemfiles.diff
===================================================================
--- citadel/trunk/debian/patches/r6535_autopurger_dont_touch_systemfiles.diff	                        (rev 0)
+++ citadel/trunk/debian/patches/r6535_autopurger_dont_touch_systemfiles.diff	2008-08-26 06:42:15 UTC (rev 136)
@@ -0,0 +1,23 @@
+Index: modules/expire/serv_expire.c
+===================================================================
+--- modules/expire/serv_expire.c	(revision 6534)
++++ modules/expire/serv_expire.c	(revision 6535)
+@@ -152,6 +152,10 @@
+ 	if (epbuf.expire_mode == EXPIRE_NEXTLEVEL) return;
+ 	if (epbuf.expire_mode == EXPIRE_MANUAL) return;
+ 
++	/* Don't purge messages containing system configuration, dumbass. */
++	if (!strcasecmp(qrbuf->QRname, SYSCONFIGROOM)) return;
++
++	/* Ok, we got this far ... now let's see what's in the room */
+         cdbfr = cdb_fetch(CDB_MSGLISTS, &qrbuf->QRnumber, sizeof(long));
+ 
+         if (cdbfr != NULL) {
+@@ -290,6 +294,7 @@
+ 		if (qrbuf->QRflags & QR_PERMANENT) return;
+ 		if (qrbuf->QRflags & QR_DIRECTORY) return;
+ 		if (qrbuf->QRflags & QR_NETWORK) return;
++		if (qrbuf->QRflags2 & QR2_SYSTEM) return;
+ 		if (!strcasecmp(qrbuf->QRname, SYSCONFIGROOM)) return;
+ 		if (is_noneditable(qrbuf)) return;
+ 

Modified: citadel/trunk/debian/patches/series
===================================================================
--- citadel/trunk/debian/patches/series	2008-08-26 06:34:07 UTC (rev 135)
+++ citadel/trunk/debian/patches/series	2008-08-26 06:42:15 UTC (rev 136)
@@ -5,3 +5,4 @@
 r6445_precise_masq_check.diff
 r6455_typo_mk_svnversion.diff
 r6529_no_tmp_files_migrate_aliases.sh.diff
+r6535_autopurger_dont_touch_systemfiles.diff