[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#708631: pu: package cyrus-imapd-2.4/2.4.16-4+deb7u1



Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: pu

Hi,

this update fixes some obsolete links in the READMEs and fixes a grave
bug when upgrading cyrus database which use Berkeley DB as backend (no
data is lost, but cyrus-imapd cannot be started).

$ diffstat cyrus-imapd-2.4_2.4.16-4+deb7u1.debdiff
 README.Debian    |   11 +++++------
 UPGRADE.Debian   |    4 ++--
 changelog        |    9 +++++++++
 cyrus-upgrade-db |    3 +--
 gbp.conf         |    4 ++--
 5 files changed, 19 insertions(+), 12 deletions(-)

Ondrej

-- System Information:
Debian Release: 7.0
  APT prefers stable
  APT policy: (500, 'stable'), (300, 'unstable')
Architecture: amd64 (x86_64)

Kernel: Linux 3.2.0-4-amd64 (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -Nru cyrus-imapd-2.4-2.4.16/debian/changelog cyrus-imapd-2.4-2.4.16/debian/changelog
--- cyrus-imapd-2.4-2.4.16/debian/changelog	2013-03-13 11:47:43.000000000 +0100
+++ cyrus-imapd-2.4-2.4.16/debian/changelog	2013-05-17 13:38:57.000000000 +0200
@@ -1,3 +1,12 @@
+cyrus-imapd-2.4 (2.4.16-4+deb7u1) unstable; urgency=high
+
+  * Fix links in the README.Debian and UPGRADE.Debian (courtesy of Gijs
+    Hillenius)
+  * When piping data to while loop the subshell is created and variables
+    are lost (Closes: #706862)
+
+ -- Ondřej Surý <ondrej@debian.org>  Wed, 15 May 2013 08:54:27 +0200
+
 cyrus-imapd-2.4 (2.4.16-4) unstable; urgency=low
 
   * Update normalize patch to correctly set the normalize option in the
diff -Nru cyrus-imapd-2.4-2.4.16/debian/cyrus-upgrade-db cyrus-imapd-2.4-2.4.16/debian/cyrus-upgrade-db
--- cyrus-imapd-2.4-2.4.16/debian/cyrus-upgrade-db	2013-03-13 11:47:43.000000000 +0100
+++ cyrus-imapd-2.4-2.4.16/debian/cyrus-upgrade-db	2013-05-17 13:38:57.000000000 +0200
@@ -97,7 +97,6 @@
     fi
 
     BERKELEY_DB_FOUND=
-    cat $OLD_LIST | \
     while read -r OLD_DBKEY OLD_DBVALUE ; do
 	NEW_DBVALUE=$(LC_ALL=C gawk "/^${OLD_DBKEY}[[:blank:]]/ { print \$2 }" $NEW_LIST)
 
@@ -180,7 +179,7 @@
 		upgradedb $DBFILE $OLD_DBVALUE $NEW_DBVALUE
 	    fi
 	fi
-    done
+    done < $OLD_LIST
     # Create Berkeley DB checkpoint and remove old logs
     if [ -n "${DO_UPGRADE_BDB}" -a -d $CONFIG_DIR/db ]; then
 	if [ -n "${BERKELEY_DB_FOUND}" ]; then
diff -Nru cyrus-imapd-2.4-2.4.16/debian/gbp.conf cyrus-imapd-2.4-2.4.16/debian/gbp.conf
--- cyrus-imapd-2.4-2.4.16/debian/gbp.conf	2013-03-13 11:47:43.000000000 +0100
+++ cyrus-imapd-2.4-2.4.16/debian/gbp.conf	2013-05-17 13:38:57.000000000 +0200
@@ -1,7 +1,7 @@
 [DEFAULT]
-debian-branch = debian-sid
+debian-branch = master-wheezy
 debian-tag = debian/%(version)s
-upstream-branch = upstream-sid
+upstream-branch = upstream-wheezy
 upstream-tag = upstream/%(version)s
 pristine-tar = True
 
diff -Nru cyrus-imapd-2.4-2.4.16/debian/README.Debian cyrus-imapd-2.4-2.4.16/debian/README.Debian
--- cyrus-imapd-2.4-2.4.16/debian/README.Debian	2013-03-13 11:47:43.000000000 +0100
+++ cyrus-imapd-2.4-2.4.16/debian/README.Debian	2013-05-17 13:38:57.000000000 +0200
@@ -15,12 +15,11 @@
 email through LMTP, IMAP and POP3 *only*.  No direct file access to the email
 store is supposed to take place.
 
-For more information, please consult http://asg.web.cmu.edu/cyrus/imapd/ and
-http://asg.web.cmu.edu/twiki/bin/view/Cyrus/WebHome (Cyrus WiKi).  There is
-also Cyrus-HOWTO (Cyrus-IMAP.txt) available as part of the LDP HOWTO
-collection.  Upgrade hints are in UPGRADE.Debian.gz  Outdated documentation
-will cause you much grief, so beware of that when hunting anywhere else than
-the Cyrus mailinglist for information.
+For more information, please consult http://cyrusimap.org/.
+There is also Cyrus-HOWTO (Cyrus-IMAP.txt) available as part of the
+LDP HOWTO collection.  Upgrade hints are in UPGRADE.Debian.gz Outdated
+documentation will cause you much grief, so beware of that when
+hunting anywhere else than the Cyrus mailinglist for information.
 
 Backports of the latest packages for Debian Stable are available from
 http://www.backports.org
diff -Nru cyrus-imapd-2.4-2.4.16/debian/UPGRADE.Debian cyrus-imapd-2.4-2.4.16/debian/UPGRADE.Debian
--- cyrus-imapd-2.4-2.4.16/debian/UPGRADE.Debian	2013-03-13 11:47:43.000000000 +0100
+++ cyrus-imapd-2.4-2.4.16/debian/UPGRADE.Debian	2013-05-17 13:38:57.000000000 +0200
@@ -1,7 +1,7 @@
 For more information, see README.Debian[.gz] in /usr/share/doc/cyrus-common-2.4/
-and the web page below, part of the cyrus-utils project at SourceForge:
+and the web page below, part of the Cyrus project at http://cyrusimap.org/
 
-  http://cyrus-utils.sourceforge.net/faq
+  http://cyrusimap.org/mediawiki/index.php/FAQ
 
 Upgrading from 2.2.x to 2.4
 ===========================

Reply to: