Ubuntu (new upstream) cyrus21-imapd 2.1.18-5.1ubuntu1

Ubuntu Merge-o-Matic mom at ubuntu.com
Mon May 7 17:06:09 UTC 2007 

This e-mail has been sent due to an upload to Ubuntu of a new upstream
version which still contains Ubuntu changes.  It contains the difference
between the Ubuntu version and the equivalent base version in Debian, note
that this difference may include the upstream changes.
-------------- next part --------------
Format: 1.7
Date: Sat, 28 Apr 2007 22:06:39 +0900
Source: cyrus21-imapd
Binary: cyrus21-doc cyrus21-admin cyrus21-murder cyrus21-common cyrus21-imapd cyrus21-clients cyrus21-dev cyrus21-pop3d libcyrus-imap-perl21
Architecture: source
Version: 2.1.18-5.1ubuntu1
Distribution: gutsy
Urgency: low
Maintainer: Ubuntu MOTU Developers <ubuntu-motu at lists.ubuntu.com>
Changed-By: Emmet Hikory <emmet.hikory at gmail.com>
Description: 
 cyrus21-admin - Cyrus mail system (administration tool)
 cyrus21-clients - Cyrus mail system (test clients)
 cyrus21-common - Cyrus mail system (common files)
 cyrus21-dev - Cyrus mail system (developer files)
 cyrus21-doc - Cyrus mail system (documentation files)
 cyrus21-imapd - Cyrus mail system (IMAP support)
 cyrus21-murder - Cyrus mail system (proxies and aggregator)
 cyrus21-pop3d - Cyrus mail system (POP3 support)
 libcyrus-imap-perl21 - Interface to Cyrus imap client imclient library
Closes: 335412 409701
Changes: 
 cyrus21-imapd (2.1.18-5.1ubuntu1) gutsy; urgency=low
 .
   * Merge from debian unstable.  Remaining Ubuntu changes:
     - sieve/*.lex.c rebuild during build (CVE-2006-0459)
     - use snakeoil certificate by default
 .
 cyrus21-imapd (2.1.18-5.1) unstable; urgency=low
 .
   * Non-maintainer upload, with maintainer's agreement, to fix pending l10n issues.
   * Debconf translations:
     - Swedish finally added. Closes: #335412
     - Portuguese added. Closes: #409701
Files: 
 add551315f2f3ec1f11683256f7bcf4b 1128 mail extra cyrus21-imapd_2.1.18-5.1ubuntu1.dsc
 51ea0a34e97512bf94c3a70971e10c71 264121 mail extra cyrus21-imapd_2.1.18-5.1ubuntu1.diff.gz
Original-Maintainer: Henrique de Moraes Holschuh <hmh at debian.org>
-------------- next part --------------
diff -pruN 2.1.18-5.1/debian/changelog 2.1.18-5.1ubuntu1/debian/changelog
--- 2.1.18-5.1/debian/changelog	2007-05-07 17:48:23.000000000 +0100
+++ 2.1.18-5.1ubuntu1/debian/changelog	2007-05-07 16:45:47.000000000 +0100
@@ -1,3 +1,11 @@
+cyrus21-imapd (2.1.18-5.1ubuntu1) gutsy; urgency=low
+
+  * Merge from debian unstable.  Remaining Ubuntu changes:
+    - sieve/*.lex.c rebuild during build (CVE-2006-0459)
+    - use snakeoil certificate by default
+
+ -- Emmet Hikory <emmet.hikory at gmail.com>  Sat, 28 Apr 2007 22:06:39 +0900
+
 cyrus21-imapd (2.1.18-5.1) unstable; urgency=low
 
   * Non-maintainer upload, with maintainer's agreement, to fix pending l10n issues.
@@ -7,6 +15,14 @@ cyrus21-imapd (2.1.18-5.1) unstable; urg
 
  -- Christian Perrier <bubulle at debian.org>  Tue, 13 Feb 2007 07:23:03 +0100
 
+cyrus21-imapd (2.1.18-5ubuntu1) feisty; urgency=low
+
+  * Merge from debian unstable.  Remaining Ubuntu changes:
+    - sieve/*.lex.c rebuild during build (CVE-2006-0459)
+    - use snakeoil certificate by default
+
+ -- Emmet Hikory <emmet.hikory at gmail.com>  Thu, 18 Jan 2007 23:06:39 +0900
+
 cyrus21-imapd (2.1.18-5) unstable; urgency=high
 
   * High urgency upload with simple fixes for Etch
@@ -44,6 +60,12 @@ cyrus21-imapd (2.1.18-4) unstable; urgen
 
  -- Henrique de Moraes Holschuh <hmh at debian.org>  Mon, 18 Sep 2006 21:54:28 -0300
 
+cyrus21-imapd (2.1.18-3ubuntu1) edgy; urgency=low
+
+  * Merge from debian unstable.
+
+ -- Ongoing Merge Process <mom at ubuntu.com>  Wed, 28 Jun 2006 21:13:02 +0100
+
 cyrus21-imapd (2.1.18-3) unstable; urgency=high
 
   * UPGRADE.Debian: warn of dangerous problem in cyrus-imapd from sarge,
@@ -52,6 +74,22 @@ cyrus21-imapd (2.1.18-3) unstable; urgen
 
  -- Henrique de Moraes Holschuh <hmh at debian.org>  Thu, 19 Jan 2006 10:49:38 -0200
 
+cyrus21-imapd (2.1.18-2ubuntu2) dapper; urgency=low
+
+  * debian/rules: Remove sieve/addr-lex.c and sieve/sieve-lex.c after
+    configure to force regeneration during build. Fixes a buffer overflow in
+    pregenerated lex scanner which is fixed in current flex. (CVE-2006-0459)
+
+ -- Martin Pitt <martin.pitt at ubuntu.com>  Thu,  2 Mar 2006 15:26:35 +0100
+
+cyrus21-imapd (2.1.18-2ubuntu1) dapper; urgency=low
+
+  * Switch default config to use ssl-cert-snakeoil certificates only for the
+    global entry. Maintain the other examples to keep more clear how it works.
+  * Add Depends on ssl-cert.
+
+ -- Fabio M. Di Nitto <fabbione at ubuntu.com>  Sat, 04 Feb 2006 13:32:25 +0100
+
 cyrus21-imapd (2.1.18-2) unstable; urgency=low
 
   * Add -a option to lmtpd proxy (murder cluster), patch from Luke Kenneth
diff -pruN 2.1.18-5.1/debian/control 2.1.18-5.1ubuntu1/debian/control
--- 2.1.18-5.1/debian/control	2007-05-07 17:48:23.000000000 +0100
+++ 2.1.18-5.1ubuntu1/debian/control	2007-05-07 16:45:47.000000000 +0100
@@ -1,7 +1,8 @@
 Source: cyrus21-imapd
 Section: mail
 Priority: extra
-Maintainer: Henrique de Moraes Holschuh <hmh at debian.org>
+Maintainer: Ubuntu MOTU Developers <ubuntu-motu at lists.ubuntu.com>
+XSBC-Original-Maintainer: Henrique de Moraes Holschuh <hmh at debian.org>
 Standards-Version: 3.7.2
 Build-Depends: debhelper (>= 4.1.68), tcl8.3-dev, libwrap0-dev, libpam0g-dev, libdb3-dev (>= 3.2.9-15), libssl-dev, libzephyr-dev, libsasl2-dev (>= 2.1.9), comerr-dev, drac-dev (>= 1.11-7), libsnmp9-dev, perl (>= 5.6.0-16), xutils, flex, bison, autotools-dev, po-debconf
 Build-Depends-Indep: transfig, gs, groff
@@ -9,7 +10,7 @@ Build-Conflicts: autoconf2.13
 
 Package: cyrus21-common
 Architecture: any
-Depends: postfix | mail-transport-agent, adduser (>= 3.34), dpkg (>> 1.9.0), netbase (>= 4.07), gawk, ${shlibs:Depends}, ${perl:Depends}, ${misc:Depends}
+Depends: postfix | mail-transport-agent, adduser (>= 3.34), dpkg (>> 1.9.0), netbase (>= 4.07), gawk, ${shlibs:Depends}, ${perl:Depends}, ${misc:Depends}, ssl-cert (>= 1.0-11ubuntu1)
 Recommends: cyrus21-imapd | cyrus21-pop3d | cyrus21-murder
 Suggests: cyrus21-clients, cyrus21-admin, cyrus21-doc, sasl2-bin, apt-listchanges (>= 2.35)
 Conflicts: suidmanager (<< 0.50), cyrus-common, cyrus22-common
diff -pruN 2.1.18-5.1/debian/imapd.conf 2.1.18-5.1ubuntu1/debian/imapd.conf
--- 2.1.18-5.1/debian/imapd.conf	2007-05-07 17:48:23.000000000 +0100
+++ 2.1.18-5.1ubuntu1/debian/imapd.conf	2007-05-07 16:45:47.000000000 +0100
@@ -178,10 +178,10 @@ sasl_auto_transition: no
 
 # File containing the global certificate used for ALL services (imap, pop3,
 # lmtp, sieve)
-#tls_cert_file: /etc/ssl/certs/cyrus-global.pem
+#tls_cert_file: /etc/ssl/certs/ssl-cert-snakeoil.pem
 
 # File containing the private key belonging to the global server certificate.
-#tls_key_file: /etc/ssl/private-cyrus/cyrus-global.key
+#tls_key_file: /etc/ssl/private/ssl-cert-snakeoil.key
 
 # File containing the certificate used for imap. If not specified, the global
 # certificate is used.  A value of "disabled" will disable SSL/TLS for imap.
diff -pruN 2.1.18-5.1/debian/rules 2.1.18-5.1ubuntu1/debian/rules
--- 2.1.18-5.1/debian/rules	2007-05-07 17:48:23.000000000 +0100
+++ 2.1.18-5.1ubuntu1/debian/rules	2007-05-07 16:45:47.000000000 +0100
@@ -104,6 +104,9 @@ configure-stamp:
 	 --with-syslogfacility=MAIL \
 	 --with-seen-db=skiplist --with-mboxlist-db=skiplist \
 	 --with-ucdsnmp=/usr
+	
+	# force regeneration during build
+	rm -f sieve/addr-lex.c sieve/sieve-lex.c
 
 	touch configure-stamp

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