diff options
Diffstat (limited to 'mail/fetchmail')
| -rw-r--r-- | mail/fetchmail/Makefile | 5 | ||||
| -rw-r--r-- | mail/fetchmail/PLIST | 3 | ||||
| -rw-r--r-- | mail/fetchmail/distinfo | 10 | ||||
| -rw-r--r-- | mail/fetchmail/patches/patch-Makefile.in | 20 | ||||
| -rw-r--r-- | mail/fetchmail/patches/patch-ntlmsubr.c | 22 |
5 files changed, 29 insertions, 31 deletions
diff --git a/mail/fetchmail/Makefile b/mail/fetchmail/Makefile index 888763d2d63..7f6f5f1ed41 100644 --- a/mail/fetchmail/Makefile +++ b/mail/fetchmail/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.179 2012/10/08 12:19:11 asau Exp $ +# $NetBSD: Makefile,v 1.180 2012/11/03 22:50:22 morr Exp $ # Note to updaters: mail/fetchmailconf reaches over here, make sure it builds. -DISTNAME= fetchmail-6.3.21 -PKGREVISION= 1 +DISTNAME= fetchmail-6.3.22 CATEGORIES= mail MASTER_SITES= http://download.berlios.de/fetchmail/ EXTRACT_SUFX= .tar.bz2 diff --git a/mail/fetchmail/PLIST b/mail/fetchmail/PLIST index 13401f6323d..692e840e804 100644 --- a/mail/fetchmail/PLIST +++ b/mail/fetchmail/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.13 2009/08/10 08:46:30 tron Exp $ +@comment $NetBSD: PLIST,v 1.14 2012/11/03 22:50:22 morr Exp $ bin/fetchmail man/man1/fetchmail.1 share/doc/fetchmail/COPYING @@ -29,6 +29,7 @@ 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/LC_MESSAGES/fetchmail.mo +share/locale/sv/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 diff --git a/mail/fetchmail/distinfo b/mail/fetchmail/distinfo index 7573b5742de..66397eff762 100644 --- a/mail/fetchmail/distinfo +++ b/mail/fetchmail/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.46 2012/08/21 15:49:54 tez Exp $ +$NetBSD: distinfo,v 1.47 2012/11/03 22:50:22 morr Exp $ -SHA1 (fetchmail-6.3.21.tar.bz2) = e32a0d40ec133d651782543ecd7bc9bbee52dff7 -RMD160 (fetchmail-6.3.21.tar.bz2) = 981084b384eb8f6f424af64ceb5922a030271519 -Size (fetchmail-6.3.21.tar.bz2) = 1724445 bytes -SHA1 (patch-ntlmsubr.c) = 0f84d835f0bd49365706290b5bc1f27177ae6c5a +SHA1 (fetchmail-6.3.22.tar.bz2) = f9411a16d4055669e5cfd89bf38acba6a5cce041 +RMD160 (fetchmail-6.3.22.tar.bz2) = b1b4ae20e7fc6d307cf97c697d5e27daddc6bc72 +Size (fetchmail-6.3.22.tar.bz2) = 1724108 bytes +SHA1 (patch-Makefile.in) = 31e89c362185787a2cc7e3bbf144635777c1bab4 diff --git a/mail/fetchmail/patches/patch-Makefile.in b/mail/fetchmail/patches/patch-Makefile.in new file mode 100644 index 00000000000..b1c00d2328c --- /dev/null +++ b/mail/fetchmail/patches/patch-Makefile.in @@ -0,0 +1,20 @@ +$NetBSD: patch-Makefile.in,v 1.1 2012/11/03 22:50:22 morr Exp $ + +Even with disabled python, wrapper around fetchmailconf.py and it's +manpage is installed. + +--- Makefile.in.orig 2012-08-29 21:25:11.000000000 +0000 ++++ Makefile.in +@@ -448,10 +448,10 @@ ACLOCAL_AMFLAGS = -I m4 -I m4-local + AM_YFLAGS = -d + BUILT_SOURCES = rcfile_y.h + dist_noinst_SCRIPTS = specgen.sh +-dist_man1_MANS = fetchmail.man $(pym) ++dist_man1_MANS = fetchmail.man + pys = fetchmailconf.py + pym = fetchmailconf.man +-nodist_bin_SCRIPTS = fetchmailconf ++nodist_bin_SCRIPTS = + python_PYTHON = $(pys) + CLEANFILES = $(nodist_bin_SCRIPTS) + noinst_LIBRARIES = libfm.a $(am__append_2) diff --git a/mail/fetchmail/patches/patch-ntlmsubr.c b/mail/fetchmail/patches/patch-ntlmsubr.c deleted file mode 100644 index 8281fce6c84..00000000000 --- a/mail/fetchmail/patches/patch-ntlmsubr.c +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-ntlmsubr.c,v 1.1 2012/08/21 15:49:54 tez Exp $ - -Fix CVE-2012-3482 -patch from http://gitorious.org/fetchmail/fetchmail/commit/3fbc7cd331602c76f882d1b507cd05c1d824ba8b/diffs - ---- ntlmsubr.c.orig 2012-08-21 15:19:44.585694400 +0000 -+++ ntlmsubr.c -@@ -55,7 +55,13 @@ int ntlm_helper(int sock, struct query * - if ((result = gen_recv(sock, msgbuf, sizeof msgbuf))) - goto cancelfail; - -- (void)from64tobits (&challenge, msgbuf, sizeof(challenge)); -+ if ((result = from64tobits (&challenge, msgbuf, sizeof(challenge))) < 0) { -+ report (stderr, GT_("could not decode BASE64 challenge\n")); -+ /* We do not goto cancelfail; the server has already sent the -+ * tagged reply, so the protocol exchange has ended, no need -+ * for us to send the asterisk. */ -+ return PS_AUTHFAIL; -+ } - - if (outlevel >= O_DEBUG) - dumpSmbNtlmAuthChallenge(stdout, &challenge); |