diff options
| -rw-r--r-- | mail/fetchmail/Makefile | 13 | ||||
| -rw-r--r-- | mail/fetchmail/distinfo | 9 | ||||
| -rw-r--r-- | mail/fetchmail/patches/patch-aa | 20 | ||||
| -rw-r--r-- | mail/fetchmailconf/Makefile | 4 |
4 files changed, 10 insertions, 36 deletions
diff --git a/mail/fetchmail/Makefile b/mail/fetchmail/Makefile index 0edd37d998e..d5959d2c63f 100644 --- a/mail/fetchmail/Makefile +++ b/mail/fetchmail/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.175 2011/04/22 13:44:03 obache Exp $ +# $NetBSD: Makefile,v 1.176 2011/06/09 11:52:33 obache Exp $ # Note to updaters: mail/fetchmailconf reaches over here, make sure it builds. -DISTNAME= fetchmail-6.3.17 -PKGREVISION= 3 +DISTNAME= fetchmail-6.3.20 CATEGORIES= mail MASTER_SITES= http://download.berlios.de/fetchmail/ EXTRACT_SUFX= .tar.bz2 @@ -30,17 +29,13 @@ CFLAGS.Darwin+= -DBIND_8_COMPAT -DHAVE_RESOLV_H .include "options.mk" +TEST_TARGET= check + DOCDIR= ${PREFIX}/share/doc/fetchmail RCD_SCRIPTS= fetchmail .include "../../devel/gettext-lib/buildlink3.mk" -post-extract: - @${RM} -f ${WRKSRC}/intl/libintl.h -.if ${OPSYS} == "NetBSD" - @${RM} -f ${WRKSRC}/md5.h -.endif - .if defined(REPLACE_KERBEROS_LIBS) pre-configure: cd ${WRKSRC} && \ diff --git a/mail/fetchmail/distinfo b/mail/fetchmail/distinfo index 35fbe8c1abb..e644cf5ead7 100644 --- a/mail/fetchmail/distinfo +++ b/mail/fetchmail/distinfo @@ -1,6 +1,5 @@ -$NetBSD: distinfo,v 1.43 2010/05/09 11:45:28 tron Exp $ +$NetBSD: distinfo,v 1.44 2011/06/09 11:52:33 obache Exp $ -SHA1 (fetchmail-6.3.17.tar.bz2) = d9ffc9a43f08f9ee9394a959834606eb41141d47 -RMD160 (fetchmail-6.3.17.tar.bz2) = a908da76b9d729dee7c6457b89a342be677bd690 -Size (fetchmail-6.3.17.tar.bz2) = 1642598 bytes -SHA1 (patch-aa) = 9885a4f063b428d68c7bff06c1402571f0e21c82 +SHA1 (fetchmail-6.3.20.tar.bz2) = 797b5b0050763ad111c244aba606b2fcb4dfdaad +RMD160 (fetchmail-6.3.20.tar.bz2) = 1262100c4a74a84e9dd969e4ab4902771752dbe5 +Size (fetchmail-6.3.20.tar.bz2) = 1723623 bytes diff --git a/mail/fetchmail/patches/patch-aa b/mail/fetchmail/patches/patch-aa deleted file mode 100644 index c8ff87430d9..00000000000 --- a/mail/fetchmail/patches/patch-aa +++ /dev/null @@ -1,20 +0,0 @@ -$NetBSD: patch-aa,v 1.8 2010/05/09 11:45:28 tron Exp $ - -Don't complain about insecure connection if a SSL fingerprint is provided. -Patch taken from here: - -http://www.mail-archive.com/debian-bugs-dist@lists.debian.org/msg780308.html - ---- socket.c.orig 2010-04-30 00:29:05.000000000 +0100 -+++ socket.c 2010-05-09 12:40:58.000000000 +0100 -@@ -1009,8 +1009,8 @@ - } - } - -- if (!certck && (SSL_get_verify_result(_ssl_context[sock]) != X509_V_OK --|| !_verify_ok)) { -+ if (!certck && !fingerprint && -+ (SSL_get_verify_result(_ssl_context[sock]) != X509_V_OK || !_verify_ok)) { - report(stderr, GT_("Warning: the connection is insecure, continuing anyways. (Better use --sslcertck!)\n")); - } - diff --git a/mail/fetchmailconf/Makefile b/mail/fetchmailconf/Makefile index 13e327ab56f..50800915bbd 100644 --- a/mail/fetchmailconf/Makefile +++ b/mail/fetchmailconf/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.79 2010/05/09 11:54:21 tron Exp $ +# $NetBSD: Makefile,v 1.80 2011/06/09 11:52:33 obache Exp $ -DISTNAME= fetchmail-6.3.17 +DISTNAME= fetchmail-6.3.20 PKGNAME= ${DISTNAME:S/fetchmail/fetchmailconf/} CATEGORIES= mail MASTER_SITES= http://download.berlios.de/fetchmail/ |