Attachment 112650 Details for Bug 154085 – a.diff

[patch] a.diff

a.diff (text/plain), 3.76 KB, created by swell.k on 2011-01-17 15:10:08 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: swell.k

Created: 2011-01-17 15:10:08 UTC

Size: 3.76 KB

patch

obsolete

>Index: mail/offlineimap/Makefile
>===================================================================
>RCS file: /a/.cvsup/ports/mail/offlineimap/Makefile,v
>retrieving revision 1.32
>diff -u -p -r1.32 Makefile
>--- mail/offlineimap/Makefile	8 Aug 2010 21:31:40 -0000	1.32
>+++ mail/offlineimap/Makefile	17 Jan 2011 15:03:43 -0000
>@@ -6,27 +6,33 @@
> #
> 
> PORTNAME=	offlineimap
>-DISTVERSION=	6.2.0.2
>-DISTVERSIONSUFFIX=-0-g6b1cb5e
>+DISTVERSION=	6.3.2-rc1
> CATEGORIES=	mail python
> MASTER_SITES=	http://download.github.com/ \
> 		${MASTER_SITE_LOCAL}
> MASTER_SITE_SUBDIR=	sergei
>-DISTNAME=	jgoerzen-${PORTNAME}-debian-${DISTVERSION}${DISTVERSIONSUFFIX}
>+DISTNAME=	nicolas33-${PORTNAME}-v${DISTVERSION}-0-g229bcca
> 
> MAINTAINER=	sergei@FreeBSD.org
> COMMENT=	Powerful IMAP/Maildir synchronization and reader support
> 
>-WRKSRC=		${WRKDIR}/jgoerzen-${PORTNAME}-0f1a667
>+WRKSRC=		${WRKDIR}/nicolas33-${PORTNAME}-2764cd9
> SUB_FILES=	pkg-message
> 
> USE_PYTHON=	yes
> USE_PYDISTUTILS=	yes
>-PYDISTUTILS_PKGVERSION=${PORTVERSION:R}
>+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}
>Index: mail/offlineimap/distinfo
>===================================================================
>RCS file: /a/.cvsup/ports/mail/offlineimap/distinfo,v
>retrieving revision 1.20
>diff -u -p -r1.20 distinfo
>--- mail/offlineimap/distinfo	8 Aug 2010 21:31:40 -0000	1.20
>+++ mail/offlineimap/distinfo	17 Jan 2011 12:12:20 -0000
>@@ -1,3 +1,2 @@
>-MD5 (jgoerzen-offlineimap-debian-6.2.0.2-0-g6b1cb5e.tar.gz) = e1a01b6b1c1a70a1afaefb0a20634bc1
>-SHA256 (jgoerzen-offlineimap-debian-6.2.0.2-0-g6b1cb5e.tar.gz) = 04b5757db2447164c43424f68b774c1e6ef6883c9b776ce48dd3109815569b85
>-SIZE (jgoerzen-offlineimap-debian-6.2.0.2-0-g6b1cb5e.tar.gz) = 103955
>+SHA256 (nicolas33-offlineimap-v6.3.2-rc1-0-g229bcca.tar.gz) = 0c5a4646d25cd84c33eabd8b60cf73fa5b3a3a2c1d7ec505c459564ffcf6d447
>+SIZE (nicolas33-offlineimap-v6.3.2-rc1-0-g229bcca.tar.gz) = 97447
>Index: mail/offlineimap/pkg-descr
>===================================================================
>RCS file: /a/.cvsup/ports/mail/offlineimap/pkg-descr,v
>retrieving revision 1.2
>diff -u -p -r1.2 pkg-descr
>--- mail/offlineimap/pkg-descr	27 Jul 2008 19:12:24 -0000	1.2
>+++ mail/offlineimap/pkg-descr	17 Jan 2011 12:06:14 -0000
>@@ -7,4 +7,4 @@ on your work computer as well.  OfflineI
> to use a mail reader that does not have IMAP support, has poor IMAP
> support, or does not provide disconnected operation.
> 
>-WWW:	http://software.complete.org/software/projects/show/offlineimap
>+WWW:	https://github.com/nicolas33/offlineimap
>Index: mail/offlineimap/files/patch-offlineimap-imaplibutil.py
>===================================================================
>RCS file: mail/offlineimap/files/patch-offlineimap-imaplibutil.py
>diff -N mail/offlineimap/files/patch-offlineimap-imaplibutil.py
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ mail/offlineimap/files/patch-offlineimap-imaplibutil.py	17 Jan 2011 14:20:17 -0000
>@@ -0,0 +1,14 @@
>+--- 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]

Actions: View | Diff

Attachments on bug 154085: 112650