SECURITY update to 6.3.12, fixes CVE-2009-2666 (bad handling of nulls

in SSL domain names).  ok jasper@
This commit is contained in:
sthen 2009-10-11 20:52:17 +00:00
parent d7cc315b7b
commit 4ab60c1904
6 changed files with 31 additions and 63 deletions

View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.116 2009/02/17 12:08:44 jasper Exp $
# $OpenBSD: Makefile,v 1.117 2009/10/11 20:52:17 sthen Exp $
COMMENT= mail retrieval utility for POP2, POP3, KPOP, IMAP and more
DISTNAME= fetchmail-6.3.9
DISTNAME= fetchmail-6.3.12
CATEGORIES= mail
MASTER_SITES= ${MASTER_SITE_BERLIOS:=fetchmail/}
@ -19,8 +19,11 @@ MODULES= devel/gettext
SEPARATE_BUILD= concurrent
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS= --enable-inet6 --with-ssl \
--with-kerberos5 --enable-NTLM
CFLAGS= -I${LOCALBASE}/include
CONFIGURE_ENV= PYTHON=:
CONFIGURE_ARGS= --with-ssl \
--with-kerberos5 \
--enable-NTLM
EXTRACT_SUFX= .tar.bz2

View File

@ -1,5 +1,5 @@
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
MD5 (fetchmail-6.3.12.tar.bz2) = 90htIw7GoocGUPO3z1ZxrA==
RMD160 (fetchmail-6.3.12.tar.bz2) = PM1L0wIEY7RE0bDHDL5341g/MxY=
SHA1 (fetchmail-6.3.12.tar.bz2) = dUqnUsTZkm1iFZfu/L0xNklr0V8=
SHA256 (fetchmail-6.3.12.tar.bz2) = Yxobw7PdWUvgsdwVZmCFbQOpc6qlG+vmYsIr+jAuBmU=
SIZE (fetchmail-6.3.12.tar.bz2) = 1612224

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-Makefile_in,v 1.11 2009/02/17 12:08:44 jasper Exp $
--- 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
$OpenBSD: patch-Makefile_in,v 1.12 2009/10/11 20:52:17 sthen Exp $
--- Makefile.in.orig Mon Oct 5 21:32:47 2009
+++ Makefile.in Sun Oct 11 20:17:30 2009
@@ -1424,7 +1424,7 @@ info: info-recursive
info-am:

View File

@ -1,16 +1,16 @@
$OpenBSD: patch-configure,v 1.13 2009/02/17 12:08:44 jasper Exp $
--- configure.orig Tue Feb 17 12:04:57 2009
+++ configure Tue Feb 17 12:07:32 2009
@@ -8085,7 +8085,7 @@ _ACEOF
$OpenBSD: patch-configure,v 1.14 2009/10/11 20:52:17 sthen Exp $
--- configure.orig Sun Oct 11 20:56:53 2009
+++ configure Sun Oct 11 22:37:47 2009
@@ -8275,7 +8275,7 @@ $as_echo "$ac_try_echo") >&5
test "$cross_compiling" = yes ||
$as_test_x conftest$ac_exeext
}; then
- LIBINTL="$LIBINTL $LIBICONV"
+ LIBINTL="$LTLIBINTL $LTLIBICONV"
LTLIBINTL="$LTLIBINTL $LTLIBICONV"
gt_cv_func_gnugettext2_libintl=yes
- INTLLIBS="$LIBINTL"
+ INTLLIBS="$LTLIBINTL"
@@ -12192,7 +12192,7 @@ cat >>confdefs.h <<\_ACEOF
@@ -12561,7 +12561,7 @@ cat >>confdefs.h <<\_ACEOF
_ACEOF
CFLAGS="$CFLAGS -I/usr/include/kerberosV"
@ -18,28 +18,4 @@ $OpenBSD: patch-configure,v 1.13 2009/02/17 12:08:44 jasper Exp $
+ 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
@@ -15478,8 +15478,8 @@ pythondir!$pythondir$ac_delim
pkgpythondir!$pkgpythondir$ac_delim
pyexecdir!$pyexecdir$ac_delim
pkgpyexecdir!$pkgpyexecdir$ac_delim
-HAVE_PYTHON_TRUE!$HAVE_PYTHON_TRUE$ac_delim
-HAVE_PYTHON_FALSE!$HAVE_PYTHON_FALSE$ac_delim
+HAVE_PYTHON_TRUE!#$ac_delim
+HAVE_PYTHON_FALSE!#$ac_delim
CC!$CC$ac_delim
CFLAGS!$CFLAGS$ac_delim
LDFLAGS!$LDFLAGS$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
-LIBICONV!$LIBICONV$ac_delim
+LIBICONV!$LTLIBICONV$ac_delim
LTLIBICONV!$LTLIBICONV$ac_delim
INTLLIBS!$INTLLIBS$ac_delim
-LIBINTL!$LIBINTL$ac_delim
+LIBINTL!$LTLIBINTL$ac_delim
LTLIBINTL!$LTLIBINTL$ac_delim
POSUB!$POSUB$ac_delim
LIBOBJS!$LIBOBJS$ac_delim
{ $as_echo "$as_me:$LINENO: result: krb5-config points to kerberosV under $krb5_prefix" >&5

View File

@ -1,12 +0,0 @@
$OpenBSD: patch-driver_c,v 1.3 2008/10/30 15:33:59 bernd Exp $
--- driver.c.orig Sun Feb 18 18:56:10 2007
+++ driver.c Mon Sep 8 16:00:53 2008
@@ -246,7 +246,7 @@ const char *canonical; /* server name */
if (retval) {
#ifdef HEIMDAL
if (err_ret && err_ret->e_text) {
- report(stderr, GT_("krb5_sendauth: %s [server says '%*s'] \n"),
+ report(stderr, GT_("krb5_sendauth: %s [server says '%s'] \n"),
error_message(retval),
err_ret->e_text);
#else

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.18 2009/02/17 12:08:44 jasper Exp $
@comment $OpenBSD: PLIST,v 1.19 2009/10/11 20:52:17 sthen Exp $
@bin bin/fetchmail
bin/fetchmailconf
libexec/fetchmailconf.bin
@ -27,6 +27,7 @@ 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/it/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