diff options
Diffstat (limited to 'mail/fetchmail')
| -rw-r--r-- | mail/fetchmail/Makefile | 3 | ||||
| -rw-r--r-- | mail/fetchmail/distinfo | 4 | ||||
| -rw-r--r-- | mail/fetchmail/files/patch-CVE-2012-3482 | 53 | ||||
| -rw-r--r-- | mail/fetchmail/pkg-plist | 1 |
4 files changed, 4 insertions, 57 deletions
diff --git a/mail/fetchmail/Makefile b/mail/fetchmail/Makefile index 371fbc9b6b47..6b16ac7aaea9 100644 --- a/mail/fetchmail/Makefile +++ b/mail/fetchmail/Makefile @@ -11,8 +11,7 @@ # want fetchmailconf to work, define the X11 option. PORTNAME= fetchmail -PORTVERSION= 6.3.21 -PORTREVISION= 1 +PORTVERSION= 6.3.22 CATEGORIES= mail ipv6 MASTER_SITES= BERLIOS/${PORTNAME}/ \ SF/${PORTNAME}/branch_6.3/ \ diff --git a/mail/fetchmail/distinfo b/mail/fetchmail/distinfo index 866a547fd395..1aff9c4cb426 100644 --- a/mail/fetchmail/distinfo +++ b/mail/fetchmail/distinfo @@ -1,2 +1,2 @@ -SHA256 (fetchmail-6.3.21.tar.xz) = dc1b92666df7bc4d6be3e66654e9894bcaa76527ea99183deabd9e11486e0f82 -SIZE (fetchmail-6.3.21.tar.xz) = 1254704 +SHA256 (fetchmail-6.3.22.tar.xz) = 9ab51a851f79e16258f068e791c39e3e378a99927f70c9635132f4295d70b1a4 +SIZE (fetchmail-6.3.22.tar.xz) = 1260296 diff --git a/mail/fetchmail/files/patch-CVE-2012-3482 b/mail/fetchmail/files/patch-CVE-2012-3482 deleted file mode 100644 index 64e4588effe1..000000000000 --- a/mail/fetchmail/files/patch-CVE-2012-3482 +++ /dev/null @@ -1,53 +0,0 @@ -diff --git a/ntlm.h b/ntlm.h -index 1469633..ad83520 100644 ---- a/ntlm.h -+++ b/ntlm.h -@@ -32,8 +32,8 @@ uint32 msgType; - tSmbStrHeader uDomain; - uint32 flags; - uint8 challengeData[8]; --uint8 reserved[8]; --tSmbStrHeader emptyString; -+uint32 context[2]; -+tSmbStrHeader targetInfo; - uint8 buffer[1024]; - uint32 bufIndex; - }tSmbNtlmAuthChallenge; -diff --git a/ntlmsubr.c b/ntlmsubr.c -index f9d2733..63cbed8 100644 ---- a/ntlmsubr.c -+++ b/ntlmsubr.c -@@ -55,7 +55,32 @@ int ntlm_helper(int sock, struct query *ctl, const char *proto) - if ((result = gen_recv(sock, msgbuf, sizeof msgbuf))) - goto cancelfail; - -- (void)from64tobits (&challenge, msgbuf, sizeof(challenge)); -+ if ((result = from64tobits (&challenge, msgbuf, sizeof(challenge))) < 0 -+ || result < ((void *)&challenge.context - (void *)&challenge)) -+ { -+ 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; -+ } -+ -+ /* validate challenge: -+ * - ident -+ * - message type -+ * - that offset points into buffer -+ * - that offset + length does not wrap -+ * - that offset + length is not bigger than buffer */ -+ if (0 != memcmp("NTLMSSP", challenge.ident, 8) -+ || challenge.msgType != 2 -+ || challenge.uDomain.offset > result -+ || challenge.uDomain.offset + challenge.uDomain.len < challenge.uDomain.offset -+ || challenge.uDomain.offset + challenge.uDomain.len > result) -+ { -+ report (stderr, GT_("NTLM challenge contains invalid data.\n")); -+ result = PS_AUTHFAIL; -+ goto cancelfail; -+ } - - if (outlevel >= O_DEBUG) - dumpSmbNtlmAuthChallenge(stdout, &challenge); diff --git a/mail/fetchmail/pkg-plist b/mail/fetchmail/pkg-plist index 507eb94cb22a..281b2b1f8f7c 100644 --- a/mail/fetchmail/pkg-plist +++ b/mail/fetchmail/pkg-plist @@ -33,6 +33,7 @@ libexec/fetchmailconf.py %%NLS%%share/locale/ru/LC_MESSAGES/fetchmail.mo %%NLS%%share/locale/sk/LC_MESSAGES/fetchmail.mo %%NLS%%share/locale/sq/LC_MESSAGES/fetchmail.mo +%%NLS%%share/locale/sv/LC_MESSAGES/fetchmail.mo %%NLS%%share/locale/tr/LC_MESSAGES/fetchmail.mo %%NLS%%share/locale/vi/LC_MESSAGES/fetchmail.mo %%NLS%%share/locale/zh_CN/LC_MESSAGES/fetchmail.mo |