[SVN] r721 - in /trunk/cyrus-imapd-2.2.13/debian: changelog patches/13-master_process_handling.dpatch

debian at incase.de debian at incase.de
Mon Jun 18 14:56:35 UTC 2007 

Author: astronut
Date: Mon Jun 18 16:56:33 2007
New Revision: 721

URL: https://mail.incase.de/viewcvs?rev=3D721&root=3Dcyrus22&view=3Drev
Log:
Fix reload; name release

Modified:
    trunk/cyrus-imapd-2.2.13/debian/changelog
    trunk/cyrus-imapd-2.2.13/debian/patches/13-master_process_handling.dpat=
ch

Modified: trunk/cyrus-imapd-2.2.13/debian/changelog
URL: https://mail.incase.de/viewcvs/trunk/cyrus-imapd-2.2.13/debian/changel=
og?rev=3D721&root=3Dcyrus22&r1=3D720&r2=3D721&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/cyrus-imapd-2.2.13/debian/changelog (original)
+++ trunk/cyrus-imapd-2.2.13/debian/changelog Mon Jun 18 16:56:33 2007
@@ -1,10 +1,17 @@
 cyrus-imapd-2.2 (2.2.13-12) UNRELEASED; urgency=3Dlow
 =

+  * The "This-would-be-a-lot-easier-if-Ross-Boylan-used-courier" Release
+
+  [ Sven Mueller ]
   * Add rules to logcheck.violations.ignore, eliminating "SQUAT failed"
     generic error message as far as logcheck is concerned.
-  * Fix bug number in README.Debian (151295, not 151925) (Closes: #426334) =

-
- -- Sven Mueller <sven at debian.org>  Mon, 28 May 2007 03:44:37 +0200
+  * Fix bug number in README.Debian (151295, not 151925) (Closes: #426334)
+
+  [ Benjamin E. Seidenberg ]
+  * Remove a redundant part of patches//13-master_process_handling.dpatch
+    which causes a double free. (Closes: #425844, #429164)
+
+ -- Benjamin E. Seidenberg <astronut at thinktop.dlgeek.net>  Mon, 18 Jun 200=
7 15:43:38 +0100
 =

 cyrus-imapd-2.2 (2.2.13-11) unstable; urgency=3Dlow
 =


Modified: trunk/cyrus-imapd-2.2.13/debian/patches/13-master_process_handlin=
g.dpatch
URL: https://mail.incase.de/viewcvs/trunk/cyrus-imapd-2.2.13/debian/patches=
/13-master_process_handling.dpatch?rev=3D721&root=3Dcyrus22&r1=3D720&r2=3D7=
21&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/cyrus-imapd-2.2.13/debian/patches/13-master_process_handling.dpat=
ch (original)
+++ trunk/cyrus-imapd-2.2.13/debian/patches/13-master_process_handling.dpat=
ch Mon Jun 18 16:56:33 2007
@@ -5,9 +5,9 @@
 ## DP: Fixes process (child) handling in master process
 =

 @DPATCH@
-diff -urNad complete.dpatch/master/master.c /tmp/dpep.NKIIR9/complete.dpat=
ch/master/master.c
---- complete.dpatch/master/master.c	2005-11-11 17:03:04.000000000 +0100
-+++ /tmp/dpep.NKIIR9/complete.dpatch/master/master.c	2005-11-11 17:04:39.2=
73704930 +0100
+diff -urNad cyrus-imapd-2.2-2.2.13~/master/master.c cyrus-imapd-2.2-2.2.13=
/master/master.c
+--- cyrus-imapd-2.2-2.2.13~/master/master.c	2007-06-18 09:19:16.000000000 =
-0400
++++ cyrus-imapd-2.2-2.2.13/master/master.c	2007-06-18 09:21:44.000000000 -=
0400
 @@ -162,6 +162,8 @@
  static struct centry *ctable[child_table_size];
  static struct centry *cfreelist;
@@ -84,7 +84,7 @@
  void process_msg(const int si, struct notify_message *msg) =

  {
      struct centry *c;
-@@ -1392,8 +1424,9 @@
+@@ -1391,8 +1423,9 @@
  	snprintf(buf, sizeof(buf),
  		 "cannot find executable for service '%s'", name);
  	=

@@ -96,7 +96,7 @@
      }
  =

      Services[i].maxforkrate =3D maxforkrate;
-@@ -1405,7 +1438,7 @@
+@@ -1404,7 +1437,7 @@
  	Services[i].desired_workers =3D prefork;
  	Services[i].babysit =3D babysit;
  	Services[i].max_workers =3D atoi(max);
@@ -105,7 +105,7 @@
  	    Services[i].max_workers =3D INT_MAX;
  	}
      } else {
-@@ -1413,6 +1446,7 @@
+@@ -1412,6 +1445,7 @@
  	if (prefork > 1) prefork =3D 1;
  	Services[i].desired_workers =3D prefork;
  	Services[i].max_workers =3D 1;
@@ -113,16 +113,16 @@
      }
      free(max);
   =

-@@ -1452,7 +1486,7 @@
-     if (!cmd) {
+@@ -1450,7 +1484,7 @@
+     if (!strcmp(cmd,"")) {
  	char buf[256];
  	snprintf(buf, sizeof(buf),
 -		 "unable to find command or port for event '%s'", name);
 +		 "unable to find command for event '%s'", name);
  =

- 	if (ignore_err) {
+ 	if (rock !=3D NULL) {
  	    syslog(LOG_WARNING, "WARNING: %s -- ignored", buf);
-@@ -1506,7 +1540,7 @@
+@@ -1504,7 +1538,7 @@
  =

      rl.rlim_cur =3D x;
      rl.rlim_max =3D x;
@@ -131,7 +131,7 @@
  	syslog(LOG_ERR, "setrlimit: Unable to set file descriptors limit to %ld:=
 %m", x);
  =

  #ifdef HAVE_GETRLIMIT
-@@ -1521,11 +1555,9 @@
+@@ -1519,11 +1553,9 @@
      }
  =

  =

@@ -146,19 +146,7 @@
  #else
      }
  #endif /* HAVE_GETRLIMIT */
-@@ -1544,7 +1576,10 @@
- =

-     /* disable all services -
-        they will be re-enabled if they appear in config file */
--    for (i =3D 0; i < nservices; i++) Services[i].exec =3D NULL;
-+    for (i =3D 0; i < nservices; i++) {
-+	if (Services[i].exec) free((void*)Services[i].exec);
-+	Services[i].exec =3D NULL;
-+    }
- =

-     /* read services */
-     masterconf_getsection("SERVICES", &add_service, (void*) 1);
-@@ -1559,13 +1594,18 @@
+@@ -1557,13 +1589,18 @@
  		       Services[i].stat[0], Services[i].stat[1]);
  =

  	    /* Only free the service info on the primary */
@@ -178,7 +166,7 @@
  =

  	    /* send SIGHUP to all children */
  	    for (j =3D 0 ; j < child_table_size ; j++ ) {
-@@ -1648,9 +1688,9 @@
+@@ -1646,9 +1683,9 @@
      p =3D getenv("CYRUS_VERBOSE");
      if (p) verbose =3D atoi(p) + 1;
  #ifdef HAVE_NETSNMP
@@ -190,7 +178,7 @@
  #endif
  	switch (opt) {
  	case 'C': /* alt imapd.conf file */
-@@ -1683,8 +1723,15 @@
+@@ -1681,8 +1718,15 @@
  	    /* Janitor frequency */
  	    janitor_frequency =3D atoi(optarg);
  	    if(janitor_frequency < 1)
@@ -207,7 +195,7 @@
  #ifdef HAVE_NETSNMP
  	case 'P': /* snmp AgentXPingInterval */
  	    agentxpinginterval =3D atoi(optarg);
-@@ -2060,13 +2107,19 @@
+@@ -2058,13 +2102,19 @@
  	    int j;
  =

  	    if (FD_ISSET(x, &rfds)) {
@@ -232,9 +220,9 @@
  	    }
  =

  	    if (Services[i].exec &&
-diff -urNad complete.dpatch/master/master.h /tmp/dpep.NKIIR9/complete.dpat=
ch/master/master.h
---- complete.dpatch/master/master.h	2005-11-11 17:03:03.000000000 +0100
-+++ /tmp/dpep.NKIIR9/complete.dpatch/master/master.h	2005-11-11 17:03:04.6=
50994659 +0100
+diff -urNad cyrus-imapd-2.2-2.2.13~/master/master.h cyrus-imapd-2.2-2.2.13=
/master/master.h
+--- cyrus-imapd-2.2-2.2.13~/master/master.h	2004-12-17 11:32:24.000000000 =
-0500
++++ cyrus-imapd-2.2-2.2.13/master/master.h	2007-06-18 09:19:18.000000000 -=
0400
 @@ -43,6 +43,7 @@
  extern struct service *Services;
  extern int allocservices;

More information about the Pkg-Cyrus-imapd-Debian-devel mailing list