[SVN] r495 - in /branches/idled/debian: ./ patches/

debian at incase.de debian at incase.de
Wed Jun 28 21:34:22 UTC 2006 

Author: sven
Date: Wed Jun 28 23:34:20 2006
New Revision: 495

URL: https://mail.incase.de/viewcvs?rev=495&root=cyrus22&view=rev
Log:
Bring idled branch up to scratch (2.2.13-4 upload aka r493)

Added:
    branches/idled/debian/patches/0012-upstream-sasl-2.2.22-comapatibility-fix.dpatch
      - copied unchanged from r493, trunk/cyrus-imapd-2.2.13/debian/patches/0012-upstream-sasl-2.2.22-comapatibility-fix.dpatch
    branches/idled/debian/patches/0013-upstream-allow-report-above-4GB-mboxsize.dpatch
      - copied unchanged from r493, trunk/cyrus-imapd-2.2.13/debian/patches/0013-upstream-allow-report-above-4GB-mboxsize.dpatch
    branches/idled/debian/patches/0014-upstream-fix-locks-during-reconstruction.dpatch
      - copied unchanged from r493, trunk/cyrus-imapd-2.2.13/debian/patches/0014-upstream-fix-locks-during-reconstruction.dpatch
    branches/idled/debian/patches/0015-upstream-fix-logic-error-in-imapoptions.dpatch
      - copied unchanged from r493, trunk/cyrus-imapd-2.2.13/debian/patches/0015-upstream-fix-logic-error-in-imapoptions.dpatch
    branches/idled/debian/patches/0016-upstream-fix-typos.dpatch
      - copied unchanged from r493, trunk/cyrus-imapd-2.2.13/debian/patches/0016-upstream-fix-typos.dpatch
    branches/idled/debian/patches/0090-fix-casts.dpatch
      - copied unchanged from r493, trunk/cyrus-imapd-2.2.13/debian/patches/0090-fix-casts.dpatch
    branches/idled/debian/patches/70-allow-larger-buffers.dpatch
      - copied unchanged from r493, trunk/cyrus-imapd-2.2.13/debian/patches/70-allow-larger-buffers.dpatch
    branches/idled/debian/patches/70-fix_readme_link.dpatch
      - copied unchanged from r493, trunk/cyrus-imapd-2.2.13/debian/patches/70-fix_readme_link.dpatch
    branches/idled/debian/patches/72-faster-isdigit.dpatch
      - copied unchanged from r493, trunk/cyrus-imapd-2.2.13/debian/patches/72-faster-isdigit.dpatch
Modified:
    branches/idled/debian/UPGRADE.Debian
    branches/idled/debian/changelog
    branches/idled/debian/control
    branches/idled/debian/copyright
    branches/idled/debian/cyrus-common-2.2.cyrus2.2.init
    branches/idled/debian/patches/00list

Modified: branches/idled/debian/UPGRADE.Debian
URL: https://mail.incase.de/viewcvs/branches/idled/debian/UPGRADE.Debian?rev=495&root=cyrus22&r1=494&r2=495&view=diff
==============================================================================
--- branches/idled/debian/UPGRADE.Debian (original)
+++ branches/idled/debian/UPGRADE.Debian Wed Jun 28 23:34:20 2006
@@ -7,14 +7,14 @@
 
   http://cyrus-utils.sourceforge.net/faq
 
-Upgrading form cyrus 2.1
+Upgrading from cyrus 2.1
 ========================
 
 If you upgrade from cyrus 2.1, all you need to do is to upgrade the 
 database files from the old database backend to the new one. If you use 
 sieve-scripts, you will also need to use sievec on them. The information
 how to do upgrade your database files is contained in the upgrade
-information from cyrus v1.6 below. In a later version of this package,
+information from cyrus v1.5 below. In a later version of this package,
 we will give more detailed information on upgrades.
 
 Upgrading sieve scripts

Modified: branches/idled/debian/changelog
URL: https://mail.incase.de/viewcvs/branches/idled/debian/changelog?rev=495&root=cyrus22&r1=494&r2=495&view=diff
==============================================================================
--- branches/idled/debian/changelog (original)
+++ branches/idled/debian/changelog Wed Jun 28 23:34:20 2006
@@ -1,45 +1,64 @@
-cyrus-imapd-2.2 (2.2.13-2idled3) stable; urgency=low
-
-  [ Sven Mueller ]
+cyrus-imapd-2.2 (2.2.13-5) sarge-backports; urgency=low
+
+  [ Sven Mueller ]
+  * Backport to sarge of 2.2.13-4
   * Update configurable-idled patch to be less intrusive
     (Emulate old behaviour as good as possible)
-
- -- Sven Mueller <debian at incase.de>  Mon,  8 May 2006 00:02:42 +0200
-
-cyrus-imapd-2.2 (2.2.13-2idled2) stable; urgency=low
-
-  [ Sven Mueller ]
-  * Use configurable idle patch from Ondřej Surý
+  * Use configurable idle patch from OndÅ~Yej Surý
+
+ -- Sven Mueller <sven at debian.org>  Wed, 28 Jun 2006 23:31:19 +0200
+
+cyrus-imapd-2.2 (2.2.13-4) unstable; urgency=low
+
+  [ Benjamin Seidenberg ]
+  * Switch from dh_movefiles (deprecated) to dh_install
+
+  [ Sven Mueller ]
+  * Integrate 4 upstream CVS updates/fixes:
+    - Upstream fix: only free() the backend struct if we allocated it
+      (don't free cached connections)
+    - remove limit on the size of mailbox files that can be received by UNDUMP
+      (write file directly to disk rather than reading the literal into
+      memory)
+    - better logging to facilitate message tracking (Wes Craig
+      <wes at umich.edu>)
+    - remove redundant check for wildcards in mailbox names (Wes Craig
+      <wes at umich.edu>)
   * Move expiry from ctl_deliver to cyr_expire as suggested by upstreams
     upgrade information.
   * Add upstream patch to fix a small issue with linking and libRSAglue
   * Add upstream patch to compile with MIT krb5 1.4.3 (Philip Guenther
     <guenther at sendmail.com>)
-
- -- Sven Mueller <debian at incase.de>  Fri, 19 May 2006 15:27:16 +0200
-
-cyrus-imapd-2.2 (2.2.13-2idled1) stable; urgency=low
-
-  [ Sven Mueller ]
-  * Sarge Backport of 2.2.13-3
-  * enable idled
-
- -- Sven Mueller <debian at incase.de>  Fri,  5 May 2006 14:23:44 +0200
+  * Add upstream patch to allow reporting of mailbox sizes above 4GB
+  * Add upstream patch to fix a documentation error in imapoptions
+  * Add patch to fix some compiler warnings about casts from pointer to
+    integer of different size
+  * Change the init script to actuall print some information when called with
+    the "status" argument
+  * Add upstream typo fixes of the day. See 0016-upstream-fix-typos for
+    reference to upstream CVS
+
+  [ Benjamin Seidenberg ]
+  * Fix typos in UPGRADE.Debian (Closes: #368675)
+  * Fix link in doc/html/readme.html (Closes: #368676)
+  * Add upstream patch to fix POP locking when reconstructing
+
+ -- Sven Mueller <sven at debian.org>  Wed, 28 Jun 2006 22:21:51 +0200
 
 cyrus-imapd-2.2 (2.2.13-3) unstable; urgency=high
 
   [ Sven Mueller ]
   * [Security] Add upstream patch to disallow user probes
+  * Add upstream patch to fix dump/undump of remote mailboxes (ctl_mboxlist)
+  * Add upstream patch to allow ACL removal for invalid IDs
   * Add upstream patch to properly handle timezones and DST in fetchnews
-  * Add upstream patch to allow ACL removal for invalid IDs
-  * Add upstream patch to fix dump/undump of remote mailboxes (ctl_mboxlist)
-  * Urgency=high for both security fix and patch to dump/undump bug which 
+  * Urgency=high for both security fix and patch to dump/undump bug which
     makes package unusuable in many supported setups
 
   [ Benjamin Seidenberg ]
   * Add build dependency on libkvm-dev for kfreebsd (Closes: #366113)
 
- -- Benjamin Seidenberg <astronut at dlgeek.net>  Fri,  5 May 2006 07:03:45 -0400
+ -- Sven Mueller <debian at incase.de>  Fri,  5 May 2006 18:01:41 +0200
 
 cyrus-imapd-2.2 (2.2.13-2) unstable; urgency=low
 

Modified: branches/idled/debian/control
URL: https://mail.incase.de/viewcvs/branches/idled/debian/control?rev=495&root=cyrus22&r1=494&r2=495&view=diff
==============================================================================
--- branches/idled/debian/control (original)
+++ branches/idled/debian/control Wed Jun 28 23:34:20 2006
@@ -2,7 +2,7 @@
 Section: mail
 Priority: extra
 Maintainer: Debian Cyrus Team <pkg-cyrus-imapd-debian-devel at lists.alioth.debian.org>
-Uploaders: Henrique de Moraes Holschuh <hmh at debian.org>, Sven Mueller <debian at incase.de>, Benjamin Seidenberg <astronut at dlgeek.net>, Ondřej Surý <ondrej at debian.org>
+Uploaders: Henrique de Moraes Holschuh <hmh at debian.org>, Sven Mueller <sven at debian.org>, Benjamin Seidenberg <astronut at dlgeek.net>, Ondřej Surý <ondrej at debian.org>
 Standards-Version: 3.6.2
 Build-Depends: debhelper (>= 4.1.68), tcl8.3-dev, libwrap0-dev, libpam0g-dev, libdb4.2-dev (>= 4.2.52), libssl-dev, libzephyr-dev, libsasl2-dev (>= 2.1.9), comerr-dev, drac-dev (>= 1.11-7), libsnmp9-dev | libsnmp5-dev, perl (>= 5.6.0-16), xutils, flex, bison, autotools-dev, po-debconf, dpatch, transfig, gs, groff, libkvm-dev [kfreebsd-i386], libkvm-dev [kfreebsd-amd64]
 
@@ -39,6 +39,8 @@
  components. The cyrus22-imapd and/or cyrus22-pop3d packages are needed
  to enable IMAP and POP3 support respectively. cyrus22-murder can be
  used to enable IMAP, POP3 and LMTP proxying.
+ .
+  Homepage: http://cyrusimap.web.cmu.edu/
 
 Package: cyrus-doc-2.2
 Architecture: all

Modified: branches/idled/debian/copyright
URL: https://mail.incase.de/viewcvs/branches/idled/debian/copyright?rev=495&root=cyrus22&r1=494&r2=495&view=diff
==============================================================================
--- branches/idled/debian/copyright (original)
+++ branches/idled/debian/copyright Wed Jun 28 23:34:20 2006
@@ -9,6 +9,9 @@
   			     Sven Mueller <debian at incase.de>,
 			     Benjamin Seidenberg <astronut at dlgeek.net>
   and distributed in the same license as the upstream source it applies to.
+
+The debian packages are maintained in a subversion repository at:
+	https://mail.incase.de/svn/cyrus22/
 
 Upstream sources are at: ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/.
 

Modified: branches/idled/debian/cyrus-common-2.2.cyrus2.2.init
URL: https://mail.incase.de/viewcvs/branches/idled/debian/cyrus-common-2.2.cyrus2.2.init?rev=495&root=cyrus22&r1=494&r2=495&view=diff
==============================================================================
--- branches/idled/debian/cyrus-common-2.2.cyrus2.2.init (original)
+++ branches/idled/debian/cyrus-common-2.2.cyrus2.2.init Wed Jun 28 23:34:20 2006
@@ -81,6 +81,11 @@
 }
 
 check_status () {
+	if [ "$1" = "verbose" ]; then
+		PRINTIT=echo
+	else
+		PRINTIT=true 
+	fi
 	if [ ! -f /var/run/${NAME}.pid ]; then
 		# using [c] in the grep avoids catching the grep 
 		# process itself
@@ -90,19 +95,23 @@
 			# do this, reconstruct the PID file here.
 			pidof /usr/sbin/cyrmaster > /dev/null 2>&1 \
 			&& pidof /usr/sbin/cyrmaster > /var/run/${NAME}.pid
+			${PRINTIT} "cyrmaster running with PID `cat /var/run/${NAME}.pid`"
 			return 0
 		fi
 	fi	
 	if [ -s /var/run/${NAME}.pid ] && kill -0 `cat /var/run/${NAME}.pid` > /dev/null 2>&1; then
+		${PRINTIT} "cyrmaster running with PID `cat /var/run/${NAME}.pid`"
 		return 0
 	else
 		# the PID file might simply not match the cyrmaster process.
 		if pidof /usr/sbin/cyrmaster > /dev/null 2>&1 ; then
 			# go ahead and fix it
 			pidof /usr/sbin/cyrmaster > /var/run/${NAME}.pid
+			${PRINTIT} "cyrmaster running with PID `cat /var/run/${NAME}.pid`"
 			return 0
 		else
 			# no process and/or no PID file, return failure
+			${PRINTIT} "cyrmaster not running with"
 			return 1
 		fi
 	fi
@@ -208,7 +217,7 @@
 	exec $0 start
 	;;
   status)
-  	check_status
+  	check_status verbose
 	exit $?
 	;;
   try-restart)

Modified: branches/idled/debian/patches/00list
URL: https://mail.incase.de/viewcvs/branches/idled/debian/patches/00list?rev=495&root=cyrus22&r1=494&r2=495&view=diff
==============================================================================
--- branches/idled/debian/patches/00list (original)
+++ branches/idled/debian/patches/00list Wed Jun 28 23:34:20 2006
@@ -5,6 +5,12 @@
 0005-upstream-fix-ctl_mboxlist-dump-undump.dpatch
 0010-upstream-fix-libRSAglue-linkage.dpatch
 0011-upstream-allow-compile-with-krb5-1.4.3.dpatch
+0012-upstream-sasl-2.2.22-comapatibility-fix.dpatch
+0013-upstream-allow-report-above-4GB-mboxsize.dpatch
+0014-upstream-fix-locks-during-reconstruction.dpatch
+0015-upstream-fix-logic-error-in-imapoptions.dpatch
+0016-upstream-fix-typos.dpatch
+0090-fix-casts.dpatch
 01-fix_Makefile.in.dpatch
 02-add_mkinstalldirs.dpatch
 03-fix_docs.dpatch
@@ -34,4 +40,6 @@
 45-kolab2-annotations.dpatch
 61-64bit-quota.dpatch
 65-sieveshell-enhancements.dpatch
+70-allow-larger-buffers.dpatch
+72-faster-isdigit.dpatch
 99-update-autoconf.dpatch

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