From 6f120f8e0358c81f3be6829e14b7c22d0316b0da Mon Sep 17 00:00:00 2001
From: Simon Barner <barner@FreeBSD.org>
Date: Sat, 6 Jan 2007 14:38:42 +0000
Subject: - Update to 6.3.6 - Fixes two security issues, one of which is a
 longstanding password disclosure bug. - Several robustness fixes and other
 improvements

Release notes:	https://developer.berlios.de/project/shownotes.php?group_id=1824&release_id=11977
Security:	http://www.vuxml.org/freebsd/5238ac45-9d8c-11db-858b-0060084a00e5.html
Security:	http://www.vuxml.org/freebsd/37e30313-9d8c-11db-858b-0060084a00e5.html
Reported by:	Matthias Andree (upstream author)
---
 mail/fetchmail/Makefile  | 10 +++-------
 mail/fetchmail/distinfo  |  9 +++------
 mail/fetchmail/pkg-plist |  1 +
 3 files changed, 7 insertions(+), 13 deletions(-)

(limited to 'mail')

diff --git a/mail/fetchmail/Makefile b/mail/fetchmail/Makefile
index 67cd6839dea9..7c22fd920394 100644
--- a/mail/fetchmail/Makefile
+++ b/mail/fetchmail/Makefile
@@ -10,17 +10,12 @@
 # want fetchmailconf to work, define WITH_X11
 
 PORTNAME=	fetchmail
-PORTVERSION=	6.3.5
+PORTVERSION=	6.3.6
 CATEGORIES=	mail ipv6
 MASTER_SITES=	${MASTER_SITE_BERLIOS}/%SUBDIR%/ \
 		http://home.pages.de/~mandree/%SUBDIR%/ \
 		http://home.leo.org/~barner/freebsd/distfiles/
 MASTER_SITE_SUBDIR=	fetchmail
-DISTNAME=	${PORTNAME}-${PORTVERSION}
-
-PATCH_SITES=	${MASTER_SITE_BERLIOS}/fetchmail/ \
-		http://home.leo.org/~barner/freebsd/distfiles/
-PATCHFILES=	fm635-daemon-logfile.patch
 
 MAINTAINER=	barner@FreeBSD.org
 COMMENT=	Batch mail retrieval utility for IMAP/POP3/ETRN/ODMR
@@ -36,7 +31,8 @@ GNU_CONFIGURE=	yes
 USE_OPENSSL=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS=	--enable-opie --enable-RPA --enable-SDPS \
-		--with-hesiod=no --enable-fallback=no
+		--with-hesiod=no --enable-fallback=no \
+		--mandir=${PREFIX}/man
 # bsd.openssl.mk will add the LDFLAGS to CONFIGURE_ENV:
 LDFLAGS=	-L${LOCALBASE}/lib
 CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/mail/fetchmail/distinfo b/mail/fetchmail/distinfo
index 298208f5fb46..4ace0e302af9 100644
--- a/mail/fetchmail/distinfo
+++ b/mail/fetchmail/distinfo
@@ -1,6 +1,3 @@
-MD5 (fetchmail-6.3.5.tar.bz2) = e8dc5cd8e80677bb60e397d6171d12ec
-SHA256 (fetchmail-6.3.5.tar.bz2) = 0af641629fc1b7ee2561eccd5ecd0efea20fea935656d155886061c530114f2b
-SIZE (fetchmail-6.3.5.tar.bz2) = 1237821
-MD5 (fm635-daemon-logfile.patch) = 4b37403e91d2732902f33fa15ab43a68
-SHA256 (fm635-daemon-logfile.patch) = ff9048ae9f75be12ee67b6a37fa0b5fdd05287fd741191cfddac304c293dfd08
-SIZE (fm635-daemon-logfile.patch) = 581
+MD5 (fetchmail-6.3.6.tar.bz2) = 4fab7ca100ca36e41a2e8dbf5b32a3cf
+SHA256 (fetchmail-6.3.6.tar.bz2) = 3c81e7776617b78f18d9cd8b5e5f62944e70f1d7bd47a840fd8d44bcded784ff
+SIZE (fetchmail-6.3.6.tar.bz2) = 1307730
diff --git a/mail/fetchmail/pkg-plist b/mail/fetchmail/pkg-plist
index 1aee5820a164..962f1f91db66 100644
--- a/mail/fetchmail/pkg-plist
+++ b/mail/fetchmail/pkg-plist
@@ -17,6 +17,7 @@ libexec/fetchmailconf.py
 %%NLS%%share/locale/ca/LC_MESSAGES/fetchmail.mo
 %%NLS%%share/locale/cs/LC_MESSAGES/fetchmail.mo
 %%NLS%%share/locale/de/LC_MESSAGES/fetchmail.mo
+%%NLS%%share/locale/en_GB/LC_MESSAGES/fetchmail.mo
 %%NLS%%share/locale/es/LC_MESSAGES/fetchmail.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/fetchmail.mo
 %%NLS%%share/locale/ja/LC_MESSAGES/fetchmail.mo
-- 
cgit v1.2.3