Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
Please unblock package getmail4
getmail4 (4.32.0-1) unstable; urgency=low
* New upstream release.
- Prevent some nuisance stack traces if getmail cannot connect to the
POP/ IMAP server correctly.
- Restore use_peek IMAP retriever parameter which accidentally got
removed in 4.30.
- Improved backwards compatibility with pre-v.4.22.0 oldmail files,
so IMAP mail is not re-retrieved if you upgrade from a 4.22 or
earlier. This is for Debian system upgrading from squeeze (4.20.0).
-- Osamu Aoki <osamu@debian.org> Thu, 12 Jul 2012 00:37:18 +0900
Package currently in testing is based on 4.30.
unblock getmail4/4.32.0-1
-- System Information:
Debian Release: wheezy/sid
APT prefers unstable
APT policy: (500, 'unstable'), (500, 'testing'), (10, 'experimental')
Architecture: amd64 (x86_64)
Kernel: Linux 3.4-trunk-amd64 (SMP w/8 CPU cores)
Locale: LANG=en_US.utf8, LC_CTYPE=en_US.utf8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Upstream tarball diff 4.30.2 --> 4.32 is attached.
diff -Nru getmail4-4.30.2.orig/docs/CHANGELOG getmail4-4.32.0.orig/docs/CHANGELOG
--- getmail4-4.30.2.orig/docs/CHANGELOG 2012-06-28 09:45:33.000000000 +0900
+++ getmail4-4.32.0.orig/docs/CHANGELOG 2012-07-07 05:00:33.000000000 +0900
@@ -1,3 +1,16 @@
+Version 4.32.0
+6 July 2012
+ -prevent some nuisance stack traces if getmail cannot connect to the POP/
+ IMAP server correctly. Thanks: Daniel Dumke.
+ -restore use_peek IMAP retriever parameter which accidentally got removed
+ in 4.30. Thanks: Andreas Amann.
+
+Version 4.31.0
+5 July 2012
+ -improved backwards compatibility with pre-v.4.22.0 oldmail files, so IMAP
+ mail is not re-retrieved if you upgrade from a 4.22 or earlier to this one;
+ no user action necessary. Thanks: Osamu Aoki, Tim van der Molen.
+
Version 4.30.2
27 June 2012
-fix a nuisance stack trace that would be dumped if a connection failed in
diff -Nru getmail4-4.30.2.orig/getmailcore/__init__.py getmail4-4.32.0.orig/getmailcore/__init__.py
--- getmail4-4.30.2.orig/getmailcore/__init__.py 2012-06-28 09:45:33.000000000 +0900
+++ getmail4-4.32.0.orig/getmailcore/__init__.py 2012-07-07 05:00:33.000000000 +0900
@@ -16,7 +16,7 @@
raise ImportError('getmail version 4 requires Python version 2.3.3'
' or later')
-__version__ = '4.30.2'
+__version__ = '4.32.0'
__all__ = [
'baseclasses',
diff -Nru getmail4-4.30.2.orig/getmailcore/_retrieverbases.py getmail4-4.32.0.orig/getmailcore/_retrieverbases.py
--- getmail4-4.30.2.orig/getmailcore/_retrieverbases.py 2012-06-28 09:45:33.000000000 +0900
+++ getmail4-4.32.0.orig/getmailcore/_retrieverbases.py 2012-07-07 05:00:33.000000000 +0900
@@ -381,6 +381,7 @@
self.__initialized = False
self.gotmsglist = False
self._clear_state()
+ self.conn = None
ConfigurableBase.__init__(self, **args)
def _clear_state(self):
@@ -472,6 +473,13 @@
continue
try:
(msgid, timestamp) = line.split('\0', 1)
+ if msgid.count('/') == 2:
+ # Was pre-4.22.0 file format, which includes the
+ # mailbox name in the msgid, in the format
+ # 'uidvalidity/mailbox/serveruid'.
+ # Strip it out.
+ fields = msgid.split('/')
+ msgid = '/'.join([fields[0], fields[2]])
self.oldmail[msgid] = int(timestamp)
except ValueError:
# malformed
@@ -743,6 +751,8 @@
def abort(self):
self.log.trace()
RetrieverSkeleton.abort(self)
+ if not self.conn:
+ return
try:
self.conn.rset()
self.conn.quit()
@@ -753,7 +763,7 @@
def quit(self):
RetrieverSkeleton.quit(self)
self.log.trace()
- if not getattr(self, 'conn', None):
+ if not self.conn:
return
try:
self.conn.quit()
@@ -1141,11 +1151,19 @@
def _getmsgbyid(self, msgid):
self.log.trace()
- return self._getmsgpartbyid(msgid, '(BODY.PEEK[])')
+ if self.conf.get('use_peek', True):
+ part = '(BODY.PEEK[])'
+ else:
+ part = '(RFC822)'
+ return self._getmsgpartbyid(msgid, part)
def _getheaderbyid(self, msgid):
self.log.trace()
- return self._getmsgpartbyid(msgid, '(BODY.PEEK[header])')
+ if self.conf.get('use_peek', True):
+ part = '(BODY.PEEK[header])'
+ else:
+ part = '(RFC822[header])'
+ return self._getmsgpartbyid(msgid, part)
def initialize(self, options):
self.log.trace()
@@ -1209,6 +1227,8 @@
def abort(self):
self.log.trace()
RetrieverSkeleton.abort(self)
+ if not self.conn:
+ return
try:
self.quit()
except (imaplib.IMAP4.error, socket.error), o:
@@ -1217,7 +1237,7 @@
def quit(self):
self.log.trace()
- if not getattr(self, 'conn', None):
+ if not self.conn:
return
try:
if self.mailbox_selected is not False:
diff -Nru getmail4-4.30.2.orig/getmail.spec getmail4-4.32.0.orig/getmail.spec
--- getmail4-4.30.2.orig/getmail.spec 2012-06-28 09:45:38.000000000 +0900
+++ getmail4-4.32.0.orig/getmail.spec 2012-07-07 05:00:39.000000000 +0900
@@ -2,7 +2,7 @@
Summary: POP3 mail retriever with reliable Maildir delivery
Name: getmail
-Version: 4.30.2
+Version: 4.32.0
Release: 1
License: GPL
Group: Applications/Internet
@@ -52,6 +52,12 @@
%{python_sitelib}/getmailcore/
%changelog
+* Fri Jul 06 2012 Charles Cazabon <charlesc-getmail-rpm@pyropus.ca>
+-update to version 4.32.0
+
+* Thu Jul 05 2012 Charles Cazabon <charlesc-getmail-rpm@pyropus.ca>
+-update to version 4.31.0
+
* Wed Jun 27 2012 Charles Cazabon <charlesc-getmail-rpm@pyropus.ca>
-update to version 4.30.2
diff -Nru getmail4-4.30.2.orig/PKG-INFO getmail4-4.32.0.orig/PKG-INFO
--- getmail4-4.30.2.orig/PKG-INFO 2012-06-28 09:45:41.000000000 +0900
+++ getmail4-4.32.0.orig/PKG-INFO 2012-07-07 05:00:41.000000000 +0900
@@ -1,6 +1,6 @@
Metadata-Version: 1.0
Name: getmail
-Version: 4.30.2
+Version: 4.32.0
Summary: a mail retrieval, sorting, and delivering system
Home-page: http://pyropus.ca/software/getmail/
Author: Charles Cazabon
Attachment:
signature.asc
Description: Digital signature