Attachment #112650 for bug #154085

View | Details | Raw Unified | Return to bug 154085
Collapse All | Expand All




#

PORTNAME=	offlineimap
DISTVERSION=	6.3.2-rc1
DISTVERSIONSUFFIX=-0-g6b1cb5e
CATEGORIES=	mail python
MASTER_SITES=	http://download.github.com/ \
		${MASTER_SITE_LOCAL}
MASTER_SITE_SUBDIR=	sergei
DISTNAME=	nicolas33-${PORTNAME}-v${DISTVERSION}-0-g229bcca

MAINTAINER=	sergei@FreeBSD.org
COMMENT=	Powerful IMAP/Maildir synchronization and reader support

WRKSRC=		${WRKDIR}/nicolas33-${PORTNAME}-2764cd9
SUB_FILES=	pkg-message

USE_PYTHON=	yes
USE_PYDISTUTILS=	yes
PYDISTUTILS_PKGVERSION=6.3.1

DOCS=		COPYING COPYRIGHT FAQ.html UPGRADING
EXAMPLES=	offlineimap.conf offlineimap.conf.minimal

pre-fetch:
	# get github download ticket
	if [ '${FORCE_FETCH}' = ${DISTFILES} -o ! -f ${_DISTDIR}/${DISTFILES} ]; then \
		${FETCH_BINARY} -s >/dev/null \
			http://github.com/nicolas33/${PORTNAME}/tarball/v${DISTVERSION}; \
	fi

post-install:
.if !defined(NOPORTDOCS)
	@${MKDIR} ${DOCSDIR}

Lines 1-3 Link Here

(-)mail/offlineimap/distinfo (-3 / +2 lines)
1	MD5 (jgoerzen-offlineimap-debian-6.2.0.2-0-g6b1cb5e.tar.gz) = e1a01b6b1c1a70a1afaefb0a20634bc1	1	SHA256 (nicolas33-offlineimap-v6.3.2-rc1-0-g229bcca.tar.gz) = 0c5a4646d25cd84c33eabd8b60cf73fa5b3a3a2c1d7ec505c459564ffcf6d447
2	SHA256 (jgoerzen-offlineimap-debian-6.2.0.2-0-g6b1cb5e.tar.gz) = 04b5757db2447164c43424f68b774c1e6ef6883c9b776ce48dd3109815569b85	2	SIZE (nicolas33-offlineimap-v6.3.2-rc1-0-g229bcca.tar.gz) = 97447
3	SIZE (jgoerzen-offlineimap-debian-6.2.0.2-0-g6b1cb5e.tar.gz) = 103955

Lines 7-10 on your work computer as well. OfflineI Link Here

(-)mail/offlineimap/pkg-descr (-1 / +1 lines)
7	to use a mail reader that does not have IMAP support, has poor IMAP	7	to use a mail reader that does not have IMAP support, has poor IMAP
8	support, or does not provide disconnected operation.	8	support, or does not provide disconnected operation.
9		9
10	WWW: http://software.complete.org/software/projects/show/offlineimap	10	WWW: https://github.com/nicolas33/offlineimap




--- offlineimap/imaplibutil.py~
+++ offlineimap/imaplibutil.py
@@ -153,7 +153,10 @@ class WrappedIMAP4_SSL(IMAP4_SSL):
         Returns error message if any problems are found and None on success.
         '''
         if not cert:
-            return ('no certificate received')
+            if type(cert) is dict:
+                return
+            else:
+                return ('no certificate received')
         dnsname = hostname.lower()
         for s in cert.get('subject', []):
             key, value = s[0]

Return to bug 154085

Lines 6-32 Link Here

(-)mail/offlineimap/Makefile (-5 / +11 lines)
6	#	6	#
7		7
8	PORTNAME= offlineimap	8	PORTNAME= offlineimap
9	DISTVERSION= 6.2.0.2	9	DISTVERSION= 6.3.2-rc1
10	DISTVERSIONSUFFIX=-0-g6b1cb5e
11	CATEGORIES= mail python	10	CATEGORIES= mail python
12	MASTER_SITES= http://download.github.com/ \	11	MASTER_SITES= http://download.github.com/ \
13	${MASTER_SITE_LOCAL}	12	${MASTER_SITE_LOCAL}
14	MASTER_SITE_SUBDIR= sergei	13	MASTER_SITE_SUBDIR= sergei
15	DISTNAME= jgoerzen-${PORTNAME}-debian-${DISTVERSION}${DISTVERSIONSUFFIX}	14	DISTNAME= nicolas33-${PORTNAME}-v${DISTVERSION}-0-g229bcca
16		15
17	MAINTAINER= sergei@FreeBSD.org	16	MAINTAINER= sergei@FreeBSD.org
18	COMMENT= Powerful IMAP/Maildir synchronization and reader support	17	COMMENT= Powerful IMAP/Maildir synchronization and reader support
19		18
20	WRKSRC= ${WRKDIR}/jgoerzen-${PORTNAME}-0f1a667	19	WRKSRC= ${WRKDIR}/nicolas33-${PORTNAME}-2764cd9
21	SUB_FILES= pkg-message	20	SUB_FILES= pkg-message
22		21
23	USE_PYTHON= yes	22	USE_PYTHON= yes
24	USE_PYDISTUTILS= yes	23	USE_PYDISTUTILS= yes
25	PYDISTUTILS_PKGVERSION=${PORTVERSION:R}	24	PYDISTUTILS_PKGVERSION=6.3.1
26		25
27	DOCS= COPYING COPYRIGHT FAQ.html UPGRADING	26	DOCS= COPYING COPYRIGHT FAQ.html UPGRADING
28	EXAMPLES= offlineimap.conf offlineimap.conf.minimal	27	EXAMPLES= offlineimap.conf offlineimap.conf.minimal
29		28
		29	pre-fetch:
		30	# get github download ticket
		31	if [ '${FORCE_FETCH}' = ${DISTFILES} -o ! -f ${_DISTDIR}/${DISTFILES} ]; then \
		32	${FETCH_BINARY} -s >/dev/null \
		33	http://github.com/nicolas33/${PORTNAME}/tarball/v${DISTVERSION}; \
		34	fi
		35
30	post-install:	36	post-install:
31	.if !defined(NOPORTDOCS)	37	.if !defined(NOPORTDOCS)
32	@${MKDIR} ${DOCSDIR}	38	@${MKDIR} ${DOCSDIR}

Added Link Here

(-)mail/offlineimap/files/patch-offlineimap-imaplibutil.py (+14 lines)
1	--- offlineimap/imaplibutil.py~
2	+++ offlineimap/imaplibutil.py
3	@@ -153,7 +153,10 @@ class WrappedIMAP4_SSL(IMAP4_SSL):
4	Returns error message if any problems are found and None on success.
5	'''
6	if not cert:
7	- return ('no certificate received')
8	+ if type(cert) is dict:
9	+ return
10	+ else:
11	+ return ('no certificate received')
12	dnsname = hostname.lower()
13	for s in cert.get('subject', []):
14	key, value = s[0]