hi,
here's an update for fetchmail.
any users of fetchmail who could take it for a spin?
cheers,
jasper
--
"Intelligence should guide our actions, but in harmony with the
texture of the situation at hand"
-- Francisco Varela
Index: Makefile
===================================================================
RCS file: /cvs/ports/mail/fetchmail/Makefile,v
retrieving revision 1.115
diff -u -r1.115 Makefile
--- Makefile 2 Feb 2009 11:42:13 -0000 1.115
+++ Makefile 17 Feb 2009 11:09:20 -0000
@@ -2,14 +2,13 @@
COMMENT= mail retrieval utility for POP2, POP3, KPOP, IMAP and more
-DISTNAME= fetchmail-6.3.8
-PKGNAME= ${DISTNAME}p3
+DISTNAME= fetchmail-6.3.9
CATEGORIES= mail
MASTER_SITES= ${MASTER_SITE_BERLIOS:=fetchmail/}
HOMEPAGE= http://fetchmail.berlios.de/
-# GPL
+# GPLv2(+)
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
Index: distinfo
===================================================================
RCS file: /cvs/ports/mail/fetchmail/distinfo,v
retrieving revision 1.23
diff -u -r1.23 distinfo
--- distinfo 13 Apr 2007 13:22:25 -0000 1.23
+++ distinfo 17 Feb 2009 11:09:20 -0000
@@ -1,5 +1,5 @@
-MD5 (fetchmail-6.3.8.tar.bz2) = Zrl1ALCh48CRaztTFPWX9Q==
-RMD160 (fetchmail-6.3.8.tar.bz2) = NANPmun+RLo18KFtMSjUqbAAHfI=
-SHA1 (fetchmail-6.3.8.tar.bz2) = uOjFHtbPU/w5jIIf2ynRZsZxO7A=
-SHA256 (fetchmail-6.3.8.tar.bz2) = VhL5rzZ/ZB4O/QhPRPzxiJZp5xHb2MYPa3lT5JTRsJs=
-SIZE (fetchmail-6.3.8.tar.bz2) = 1323515
+MD5 (fetchmail-6.3.9.tar.bz2) = csIK0rlinxoQlmiwWoTYIw==
+RMD160 (fetchmail-6.3.9.tar.bz2) = X86grpf/ZGM6UOFkJwq2hDUYb7w=
+SHA1 (fetchmail-6.3.9.tar.bz2) = LtcF/+QK/W0IVTXPKvBpFFB9o2o=
+SHA256 (fetchmail-6.3.9.tar.bz2) = Pf07BKpVIzH5H5a99fWv5InDGmAK55c/WBS95VVYE9w=
+SIZE (fetchmail-6.3.9.tar.bz2) = 1538134
Index: patches/patch-Makefile_in
===================================================================
RCS file: /cvs/ports/mail/fetchmail/patches/patch-Makefile_in,v
retrieving revision 1.10
diff -u -r1.10 patch-Makefile_in
--- patches/patch-Makefile_in 13 Apr 2007 13:22:25 -0000 1.10
+++ patches/patch-Makefile_in 17 Feb 2009 11:09:20 -0000
@@ -1,12 +1,12 @@
$OpenBSD: patch-Makefile_in,v 1.10 2007/04/13 13:22:25 bernd Exp $
---- Makefile.in.orig Fri Apr 6 20:41:48 2007
-+++ Makefile.in Sun Apr 8 10:04:06 2007
-@@ -1440,7 +1440,7 @@ info: info-recursive
+--- Makefile.in.orig Sun Nov 16 15:18:48 2008
++++ Makefile.in Tue Feb 17 12:07:42 2009
+@@ -1407,7 +1407,7 @@ info: info-recursive
info-am:
-install-data-am: install-man install-pythonPYTHON
+install-data-am: install-man
- install-exec-am: install-binPROGRAMS install-nodist_binSCRIPTS
+ install-dvi: install-dvi-recursive
Index: patches/patch-configure
===================================================================
RCS file: /cvs/ports/mail/fetchmail/patches/patch-configure,v
retrieving revision 1.12
diff -u -r1.12 patch-configure
--- patches/patch-configure 13 Apr 2007 13:22:25 -0000 1.12
+++ patches/patch-configure 17 Feb 2009 11:09:20 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-configure,v 1.12 2007/04/13 13:22:25 bernd Exp $
---- configure.orig Fri Apr 6 20:41:49 2007
-+++ configure Sun Apr 8 10:04:06 2007
-@@ -8535,7 +8535,7 @@ _ACEOF
+--- configure.orig Tue Feb 17 12:04:57 2009
++++ configure Tue Feb 17 12:07:32 2009
+@@ -8085,7 +8085,7 @@ _ACEOF
@@ -10,16 +10,16 @@
-@@ -13251,7 +13251,7 @@ cat >>confdefs.h <<\_ACEOF
+@@ -12192,7 +12192,7 @@ cat >>confdefs.h <<\_ACEOF
_ACEOF
- CEFLAGS="$CEFLAGS -I/usr/include/kerberosV"
+ CFLAGS="$CFLAGS -I/usr/include/kerberosV"
- LIBS="$LIBS -lasn1 -lkrb5 -lcom_err -lkafs"
+ LIBS="$LIBS -lkrb5"
elif krb5-config 2> /dev/null >/dev/null ; then
krb5_prefix=`krb5-config --prefix krb5`
{ echo "$as_me:$LINENO: result: krb5-config points to kerberosV under
$krb5_prefix" >&5
-@@ -16962,8 +16962,8 @@ pythondir!$pythondir$ac_delim
+@@ -15478,8 +15478,8 @@ pythondir!$pythondir$ac_delim
pkgpythondir!$pkgpythondir$ac_delim
pyexecdir!$pyexecdir$ac_delim
pkgpyexecdir!$pkgpyexecdir$ac_delim
@@ -30,7 +30,7 @@
CC!$CC$ac_delim
CFLAGS!$CFLAGS$ac_delim
LDFLAGS!$LDFLAGS$ac_delim
-@@ -17037,10 +17037,10 @@ GMSGFMT!$GMSGFMT$ac_delim
+@@ -15553,10 +15553,10 @@ GMSGFMT!$GMSGFMT$ac_delim
XGETTEXT!$XGETTEXT$ac_delim
MSGMERGE!$MSGMERGE$ac_delim
INTL_MACOSX_LIBS!$INTL_MACOSX_LIBS$ac_delim
Index: patches/patch-pop3_c
===================================================================
RCS file: patches/patch-pop3_c
diff -N patches/patch-pop3_c
--- patches/patch-pop3_c 2 Feb 2009 11:42:13 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,16 +0,0 @@
-$OpenBSD: patch-pop3_c,v 1.1 2009/02/02 11:42:13 bernd Exp $
-
-Fix stunnel usage with TLS1 encryption.
-https://lists.berlios.de/pipermail/fetchmail-users/2007-December/001396.html
-
---- pop3.c.orig Sun Mar 18 02:13:45 2007
-+++ pop3.c Mon Feb 2 12:37:35 2009
-@@ -449,7 +449,7 @@ static int pop3_getauth(int sock, struct query *ctl, c
- report(stderr, GT_("TLS is mandatory for this session,
but server refused CAPA command.\n"));
- report(stderr, GT_("The CAPA command is however
necessary for TLS.\n"));
- return ok;
-- } else {
-+ } else if (maybe_tls(ctl)) {
- /* defeat opportunistic STLS */
- xfree(ctl->sslproto);
- ctl->sslproto = xstrdup("");
Index: patches/patch-report_c
===================================================================
RCS file: patches/patch-report_c
diff -N patches/patch-report_c
--- patches/patch-report_c 19 Aug 2008 22:41:24 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,61 +0,0 @@
-$OpenBSD: patch-report_c,v 1.1 2008/08/19 22:41:24 jasper Exp $
-
-Fix for http://secunia.com/advisories/30742/
-(Fetchmail Large Header Processing Denial of Service)
-
-Patch was taken from upstream advisory.
-http://www.fetchmail.info/fetchmail-SA-2008-01.txt
-
---- report.c.orig Mon Aug 4 11:50:43 2008
-+++ report.c Mon Aug 4 11:53:49 2008
-@@ -238,12 +238,18 @@ report_build (FILE *errfp, message, va_alist)
- rep_ensuresize();
-
- #if defined(VA_START)
-- VA_START (args, message);
- for ( ; ; )
- {
-+ /*
-+ * args has to be initialized before every call of vsnprintf(),
-+ * because vsnprintf() invokes va_arg macro and thus args is
-+ * undefined after the call.
-+ */
-+ VA_START(args, message);
- n = vsnprintf (partial_message + partial_message_size_used,
partial_message_size - partial_message_size_used,
- message, args);
-
-+ va_end (args);
- if (n >= 0
- && (unsigned)n < partial_message_size - partial_message_size_used)
- {
-@@ -254,7 +260,6 @@ report_build (FILE *errfp, message, va_alist)
- partial_message_size += 2048;
- partial_message = REALLOC (partial_message, partial_message_size);
- }
-- va_end (args);
- #else
- for ( ; ; )
- {
-@@ -304,12 +309,13 @@ report_complete (FILE *errfp, message, va_alist)
- rep_ensuresize();
-
- #if defined(VA_START)
-- VA_START (args, message);
- for ( ; ; )
- {
-+ VA_START (args, message);
- n = vsnprintf (partial_message + partial_message_size_used,
- partial_message_size - partial_message_size_used,
- message, args);
-+ va_end(args);
-
- /* old glibc versions return -1 for truncation */
- if (n >= 0
-@@ -322,7 +328,6 @@ report_complete (FILE *errfp, message, va_alist)
- partial_message_size += 2048;
- partial_message = REALLOC (partial_message, partial_message_size);
- }
-- va_end (args);
- #else
- for ( ; ; )
- {
Index: patches/patch-sink_c
===================================================================
RCS file: patches/patch-sink_c
diff -N patches/patch-sink_c
--- patches/patch-sink_c 31 Aug 2007 14:20:46 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-sink_c,v 1.1 2007/08/31 14:20:46 rui Exp $
---- sink.c.orig Fri Aug 31 14:24:34 2007
-+++ sink.c Fri Aug 31 14:25:15 2007
-@@ -262,7 +262,7 @@ static int send_bouncemail(struct query *ctl, struct m
- const char *md1 = "MAILER-DAEMON", *md2 = "MAILER-DAEMON@";
-
- /* don't bounce in reply to undeliverable bounces */
-- if (!msg->return_path[0] ||
-+ if (!msg || !msg->return_path[0] ||
- strcmp(msg->return_path, "<>") == 0 ||
- strcasecmp(msg->return_path, md1) == 0 ||
- strncasecmp(msg->return_path, md2, strlen(md2)) == 0)
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/mail/fetchmail/pkg/PLIST,v
retrieving revision 1.17
diff -u -r1.17 PLIST
--- pkg/PLIST 2 Feb 2009 11:42:13 -0000 1.17
+++ pkg/PLIST 17 Feb 2009 11:09:20 -0000
@@ -16,16 +16,26 @@
share/doc/fetchmail/todo.html
share/locale/ca/LC_MESSAGES/fetchmail.mo
share/locale/cs/LC_MESSAGES/fetchmail.mo
+share/locale/da/LC_MESSAGES/fetchmail.mo
share/locale/de/LC_MESSAGES/fetchmail.mo
+share/locale/el/LC_MESSAGES/fetchmail.mo
share/locale/en_GB/
share/locale/en_GB/LC_MESSAGES/
share/locale/en_GB/LC_MESSAGES/fetchmail.mo
share/locale/es/LC_MESSAGES/fetchmail.mo
+share/locale/fi/LC_MESSAGES/fetchmail.mo
share/locale/fr/LC_MESSAGES/fetchmail.mo
+share/locale/gl/LC_MESSAGES/fetchmail.mo
+share/locale/id/LC_MESSAGES/fetchmail.mo
share/locale/ja/LC_MESSAGES/fetchmail.mo
+share/locale/nl/LC_MESSAGES/fetchmail.mo
share/locale/pl/LC_MESSAGES/fetchmail.mo
+share/locale/pt_BR/LC_MESSAGES/fetchmail.mo
share/locale/ru/LC_MESSAGES/fetchmail.mo
+share/locale/sk/LC_MESSAGES/fetchmail.mo
share/locale/sq/
share/locale/sq/LC_MESSAGES/
share/locale/sq/LC_MESSAGES/fetchmail.mo
+share/locale/tr/LC_MESSAGES/fetchmail.mo
share/locale/vi/LC_MESSAGES/fetchmail.mo
+share/locale/zh_CN/LC_MESSAGES/fetchmail.mo
