Remove insecure warning if sslfingerprint is given (#319907). Thanks to David Fellows. Don't link libwww's libmd5 (#319283). Thanks to Karl Hakimian and Matthias Andree

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

5 files changed, 183 insertions, 6 deletions

diff --git a/net-mail/fetchmail/ChangeLog b/net-mail/fetchmail/ChangeLog
index 4936c95b5453..1ccd8c86ecde 100644
--- a/net-mail/fetchmail/ChangeLog
+++ b/net-mail/fetchmail/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-mail/fetchmail
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/fetchmail/ChangeLog,v 1.192 2010/05/12 22:32:15 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/fetchmail/ChangeLog,v 1.193 2010/05/18 06:06:51 tove Exp $
+
+*fetchmail-6.3.17-r1 (18 May 2010)
+
+  18 May 2010; Torsten Veller <tove@gentoo.org>
+  +files/MD5_library_pickup.patch, +fetchmail-6.3.17-r1.ebuild,
+  +files/debian-580796.patch:
+  Remove insecure warning if sslfingerprint is given (#319907). Thanks to
+  David Fellows. Fix linking of libwww's libmd5 (#319283). Thanks to Karl
+  Hakimian and Matthias Andree
 
   12 May 2010; Joseph Jezak <josejx@gentoo.org> fetchmail-6.3.17.ebuild:
   Marked ppc stable for bug #318875.
diff --git a/net-mail/fetchmail/Manifest b/net-mail/fetchmail/Manifest
index 949426b5e352..ba43029fafa5 100644
--- a/net-mail/fetchmail/Manifest
+++ b/net-mail/fetchmail/Manifest
@@ -1,7 +1,9 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX MD5_library_pickup.patch 1124 RMD160 0c28938fe56d9e3032c79aeb3a730147470fe37d SHA1 b3fe036bc019bd0782973e76c0c63fbfd1c87f10 SHA256 25a5600dad73042d3e7212a673898ae153466c82a2fa13c10795dd234d2514b3
 AUX conf.d-fetchmail 347 RMD160 5a042695f6849653d32b17a6852025d1d695770a SHA1 9a0956877f5d8ac3e1c7c949a9921c3f1b1e7307 SHA256 8ba3e51b5a51b42daf8cfa2183c938afb04fd6a9cc941e1adb9faa10aff677bf
+AUX debian-580796.patch 529 RMD160 1b6c6f0e113758bf2fe7fa7b44d1959b410a0a08 SHA1 df8a1160cfde71c17a2ef64fa629fbb65910f2b2 SHA256 723c2fc9630a93367ec253331f4db815a13577b805fdd0a848cfc42d6c91a05a
 AUX fetchmail-6.2.5-broken-headers.patch 288 RMD160 1e5237c2cd24223ec4b98b2f67c5780d2026a559 SHA1 006d59dc95138a5db241a0536b10978b05227f26 SHA256 a72666259b30fed72a5c63519bfa0c888d14570c14c227c2418a2100cf08d326
 AUX fetchmail.new 686 RMD160 d686776466385ec205dd704dbab999953cb9ee17 SHA1 660e9c766cbf4629a3e74ecd74ef56b5a1a299ce SHA256 5ef42ca61fcf0e60529e0be9c6bef4b61a9e34e7a82f766f046c8457bc9392b5
 DIST fetchmail-6.3.14.tar.bz2 1621188 RMD160 62001764dead52a66cdec239209493f1503fe397 SHA1 2bc18f121d5b99e22584970c6f8b62bb65430c4c SHA256 8657f786f5af1857ddb3b50203e6cde2efad43f49828973cbb22f6d431208607
@@ -11,13 +13,14 @@ DIST fetchmail-6.3.17.tar.bz2 1642598 RMD160 a908da76b9d729dee7c6457b89a342be677
 EBUILD fetchmail-6.3.14.ebuild 2711 RMD160 90f1c5e7af5ecc2bee7a01ef8952740d92676c3f SHA1 fb1bb2cbeea03791ffed095e20ae58bf512e2cbd SHA256 92c16fe0911201e8480644b7c364afb8b09148038167076c658ac8a8c78a8ce6
 EBUILD fetchmail-6.3.15.ebuild 3158 RMD160 55ef32eda54a5c321a8bcec7fbd22a655ae9b7d6 SHA1 11a5a4f5b01eec30893954f3d5f88769e4dc7fc1 SHA256 356c5735357406a9b17dd771f9c4d933ed96731b15a857ff13aa365220dde061
 EBUILD fetchmail-6.3.16.ebuild 3158 RMD160 f1bc41f8225d7c2b40720041e3eafc5b376e13b0 SHA1 401be6ac8fbfa00e8ba2024632822f8a5bd25f0a SHA256 3d6070dd3f42d9ee85bdfb186f82be3238295bffce5aa61ab51a26fa28387d61
+EBUILD fetchmail-6.3.17-r1.ebuild 2990 RMD160 2d4910f4b73312e95f5d1d2ec96a05d4161f62b6 SHA1 5c3eea332d3e8de8fb072b097ff2d05c423142f0 SHA256 4b924a96de0f933c06d402ec2bb0c5df4119daac54e2993c32df83af989b6e0c
 EBUILD fetchmail-6.3.17.ebuild 2870 RMD160 6f0550eff99ad4f1cf687c23576a5497d2e33223 SHA1 82beec6d4f02a0a1ad840a88553b2895cb2b53bd SHA256 b4898ce61e5994c8c6603c4bb40adcddedee0063c5923b31f9a3960e556f6fe5
-MISC ChangeLog 27958 RMD160 19da6c801164a681a8ddac9b1b359ebf69517eb4 SHA1 fe0c6c5e9433cac9f2a7c545cad8391b2b2b81f4 SHA256 aa74be7e3a4f7a5a768d6c58cd0d073eb28ab03926f06c03aa207dd43fa244fe
+MISC ChangeLog 28314 RMD160 564900ee154de62d6e1fa37ccaf29c1f181cd0e9 SHA1 977194b4e047568a4b80bf680771a55687a7f718 SHA256 38419f22d80598ce617efcdd5e2978023cd71b55dfbe5e68fb6a020c00088e6e
 MISC metadata.xml 337 RMD160 eae9cac549cbc847c52c0bc2f49e95bc9daad1a3 SHA1 fafb54bde1a25c573453bb3e6083d840718badb5 SHA256 d7909df61f65b68b111f92105f40bebaf5f5f7314f49be27ab4d05e43cc996a4
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
+Version: GnuPG v2.0.15 (GNU/Linux)
 
-iEYEARECAAYFAkvrLEgACgkQcsIHjyDViGTZ1wCfT4yxpuCNztNXfJe8+3QaxSxH
-lFEAoNx7R1TQ9jR7eDguCT10a6+ICEi5
-=XemJ
+iEYEARECAAYFAkvyLoEACgkQV3J2n04EauzMRgCfWJ/z8lOPqszMLu0rfqWSJXEf
+6dAAniB+k5BgvcvYAPTb1gPrPNg2wtmp
+=OxMW
 -----END PGP SIGNATURE-----
diff --git a/net-mail/fetchmail/fetchmail-6.3.17-r1.ebuild b/net-mail/fetchmail/fetchmail-6.3.17-r1.ebuild
new file mode 100644
index 000000000000..fb55c0b4ca66
--- /dev/null
+++ b/net-mail/fetchmail/fetchmail-6.3.17-r1.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/fetchmail/fetchmail-6.3.17-r1.ebuild,v 1.1 2010/05/18 06:06:51 tove Exp $
+
+EAPI=2
+
+PYTHON_DEPEND="tk? 2"
+PYTHON_USE_WITH_OPT="tk"
+PYTHON_USE_WITH="tk"
+
+inherit python eutils autotools
+
+DESCRIPTION="the legendary remote-mail retrieval and forwarding utility"
+HOMEPAGE="http://fetchmail.berlios.de"
+SRC_URI="mirror://berlios/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2 public-domain"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="ssl nls kerberos hesiod tk"
+
+RDEPEND="hesiod? ( net-dns/hesiod )
+	ssl? ( >=dev-libs/openssl-0.9.6 )
+	kerberos? ( virtual/krb5 >=dev-libs/openssl-0.9.6 )
+	nls? ( virtual/libintl )
+	elibc_FreeBSD? ( sys-libs/com_err )"
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )"
+
+pkg_setup() {
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 /var/lib/${PN} ${PN}
+	use tk && python_set_active_version 2
+	python_pkg_setup
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/debian-580796.patch \
+		"${FILESDIR}"/MD5_library_pickup.patch
+	eautoreconf
+	# dont compile during src_install
+	: > "${S}"/py-compile
+}
+
+src_configure() {
+	if use tk ; then
+		export PYTHON=$(PYTHON -a )
+	else
+		export PYTHON=:
+	fi
+	econf \
+		--disable-dependency-tracking \
+		--enable-RPA \
+		--enable-NTLM \
+		--enable-SDPS \
+		$(use_enable nls) \
+		$(use_with ssl) \
+		$(use kerberos && echo "--with-ssl" ) \
+		$(use_with kerberos gssapi) \
+		$(use_with kerberos kerberos5) \
+		$(use_with hesiod) \
+		${myconf}
+}
+
+src_install() {
+	# dir for pidfile
+	keepdir /var/run/${PN} || die
+	fowners ${PN}:${PN} /var/run/${PN} || die
+
+	# fetchmail's homedir (holds fetchmail's .fetchids)
+	keepdir /var/lib/${PN} || die
+	fowners ${PN}:${PN} /var/lib/${PN} || die
+	fperms 700 /var/lib/${PN} || die
+
+	emake DESTDIR="${D}" install || die
+
+	dohtml *.html
+
+	dodoc FAQ FEATURES NEWS NOTES README README.NTLM README.SSL* TODO || die
+
+	newinitd "${FILESDIR}"/fetchmail.new fetchmail || die
+	newconfd "${FILESDIR}"/conf.d-fetchmail fetchmail || die
+
+	docinto contrib
+	local f
+	for f in contrib/* ; do
+		[ -f "${f}" ] && dodoc "${f}"
+	done
+}
+
+pkg_postinst() {
+	use tk && python_mod_optimize "$(python_get_sitedir)/fetchmailconf.py"
+
+	ewarn "From the NEWS:"
+	ewarn "Fetchmail now supports a bad-header command line or rcfile option that takes"
+	ewarn "exactly one argument, accept or reject (default).  This specifies how messages"
+	ewarn "with bad headers retrieved from the current server are to be treated."
+	ewarn ""
+	ewarn "Gentoo's previous fetchmail versions (<6.3.16) accepted messages with bad"
+	ewarn "headers. So if you upgrade you must update your configuration files"
+	ewarn "to imitate the old behavior."
+	echo
+
+	elog "Please see /etc/conf.d/fetchmail if you want to adjust"
+	elog "the polling delay used by the fetchmail init script."
+}
+
+pkg_postrm() {
+	use tk && python_mod_cleanup "$(python_get_sitedir)/fetchmailconf.py"
+}
diff --git a/net-mail/fetchmail/files/MD5_library_pickup.patch b/net-mail/fetchmail/files/MD5_library_pickup.patch
new file mode 100644
index 000000000000..575572c68c1e
--- /dev/null
+++ b/net-mail/fetchmail/files/MD5_library_pickup.patch
@@ -0,0 +1,40 @@
+From: Matthias Andree <matthias.andree@gmx.de>
+Date: Mon, 17 May 2010 21:10:16 +0200
+Subject: [PATCH] Fix MD5* library pickup.
+
+Avoid picking up libmd5, which fails if libwww is installed because libmd5
+uses "long" rather than fixed-width types. This fails on non-32-bit machines.
+
+Only probe libmd if md5.h is found.
+
+To fix Gentoo Bug #319283, reported by Karl Hakimian.
+---
+ NEWS         |    4 ++++
+ configure.ac |   12 +++++++++---
+ 2 files changed, 13 insertions(+), 3 deletions(-)
+
+index 2ff315f..943eb3e 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -171,9 +171,15 @@ dnl 		[LIBS="$LIBS -lintl"])
+ 
+ AC_REPLACE_FUNCS([strstr strcasecmp memmove stpcpy strlcpy strlcat])
+ 
+-AC_SEARCH_LIBS(MD5Init, [md5 md], [],
+-	      [AC_LIBSOURCE(md5c.c)
+-               EXTRAOBJ="$EXTRAOBJ md5c.\$(OBJEXT)"])
++have_md5=no
++if test "$ac_cv_header_md5_h" != no ; then
++    AC_SEARCH_LIBS(MD5Init, [md], [have_md5=yes])
++fi
++
++if test "$have_md5" != yes ; then
++    AC_LIBSOURCE(md5c.c)
++    EXTRAOBJ="$EXTRAOBJ md5c.\$(OBJEXT)"
++fi
+ 
+ AC_CHECK_FUNC(getopt_long, [],
+               [AC_LIBSOURCES([getopt.c, getopt1.c])
+-- 
+1.6.1
+
diff --git a/net-mail/fetchmail/files/debian-580796.patch b/net-mail/fetchmail/files/debian-580796.patch
new file mode 100644
index 000000000000..0bd65b1ca026
--- /dev/null
+++ b/net-mail/fetchmail/files/debian-580796.patch
@@ -0,0 +1,15 @@
+diff --git a/socket.c b/socket.c
+index a3adfd8..2ebdfc6 100644
+--- a/socket.c
++++ b/socket.c
+@@ -1009,8 +1009,8 @@ int SSLOpen(int sock, char *mycert, char *mykey, const char *myproto, int certck
+ 		}
+ 	}
+ 
+-	if (!certck && (SSL_get_verify_result(_ssl_context[sock]) != X509_V_OK
+-|| !_verify_ok)) {
++	if (!certck && !fingerprint &&
++		(SSL_get_verify_result(_ssl_context[sock]) != X509_V_OK || !_verify_ok)) {
+ 		report(stderr, GT_("Warning: the connection is insecure, continuing anyways. (Better use --sslcertck!)\n"));
+ 	}
+