From 3663d9fa72b59d007ad9bf40ab047cf100912632 Mon Sep 17 00:00:00 2001 From: Sven Wegener Date: Mon, 8 Mar 2010 22:35:30 +0000 Subject: [PATCH] Pull in a patch from Debian to fix SNI support. Package-Manager: portage-2.2_rc65/cvs/Linux x86_64 --- net-misc/neon/ChangeLog | 6 +++++- net-misc/neon/Manifest | 19 +++++++++++++++---- net-misc/neon/files/neon-0.29-sni-fix.patch | 18 ++++++++++++++++++ net-misc/neon/neon-0.29.1.ebuild | 8 +++++--- net-misc/neon/neon-0.29.2.ebuild | 6 ++++-- net-misc/neon/neon-0.29.3.ebuild | 6 ++++-- 6 files changed, 51 insertions(+), 12 deletions(-) create mode 100644 net-misc/neon/files/neon-0.29-sni-fix.patch diff --git a/net-misc/neon/ChangeLog b/net-misc/neon/ChangeLog index 7c175c5897f4..09504c03d8aa 100644 --- a/net-misc/neon/ChangeLog +++ b/net-misc/neon/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-misc/neon # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/neon/ChangeLog,v 1.152 2010/03/04 15:23:14 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/neon/ChangeLog,v 1.153 2010/03/08 22:35:30 swegener Exp $ + + 08 Mar 2010; Sven Wegener neon-0.29.1.ebuild, + neon-0.29.2.ebuild, neon-0.29.3.ebuild, +files/neon-0.29-sni-fix.patch: + Pull in a patch from Debian to fix SNI support. 04 Mar 2010; Jeroen Roovers neon-0.29.3.ebuild: Stable for HPPA (bug #305181). diff --git a/net-misc/neon/Manifest b/net-misc/neon/Manifest index 49d4822b20bf..010e0e8747e4 100644 --- a/net-misc/neon/Manifest +++ b/net-misc/neon/Manifest @@ -1,3 +1,7 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + +AUX neon-0.29-sni-fix.patch 699 RMD160 81c61d57d07be0b910b13a73f2047730ec3db5eb SHA1 348fb08254aa1c725156d61c166d491ec6d688d4 SHA256 afa2cebf130515f48ef9cd93fda7baaef4e0351f247ec52cd75d47aedca3dc2d DIST neon-0.28.6.tar.gz 789193 RMD160 6c5ff58c9caf4691d46a8de174af6a701e551b7c SHA1 da7db2e3289cc3dbef7794e8cc3c56978a0d7157 SHA256 06ee8b1aa37a14a956a1158bf6b5a8c3388976d61c1dc3773a3ffe18ac8ecc0e DIST neon-0.29.0.tar.gz 879186 RMD160 338f6ff1589a01dee66cd31a72c45f3a57914ab8 SHA1 8d2e1609b2a3b13a6e68e58c26b1d708302e05ef SHA256 22878e0c6ce3f0092da3d97243b4d0b5756ee3fd4442e7c3f66161ba70e0a5a4 DIST neon-0.29.1.tar.gz 880945 RMD160 1de3e3a49e944acef80d8dac68663eff0560b6bb SHA1 213b88c95d486de2742e979139dc169360d49ad2 SHA256 2b9c10f1f3fd440e0ebcb18de1b7d51c2a8042dc0f542022a2948006d149c8ee @@ -5,8 +9,15 @@ DIST neon-0.29.2.tar.gz 881339 RMD160 7c8999cab454e61b332a13e58f73064c0cff2448 S DIST neon-0.29.3.tar.gz 881627 RMD160 6825afe3e6a0cda1b6702b2a5876e9c2b4f5e935 SHA1 f84152dd08fc7d3bffadea0bc45ea738d3a873c3 SHA256 849004a9f3cbb79706cd29461142868c25aceb44785eb81c78db0390e1372cb4 EBUILD neon-0.28.6.ebuild 2798 RMD160 da6220c1eb2efe2db52cc767995f55dcaba3aa5e SHA1 844a2ebc0a2e045e96b0c3aaa071dc80f4f375ea SHA256 8eab6dfbd010deeb0beb72564b196d09a39c457a436897892aafb8cc4133ad31 EBUILD neon-0.29.0.ebuild 2761 RMD160 0990a84254b7b7f788a276215c8afa5f3ca29a32 SHA1 27e4a76ed9dcbe5bc0d53627b94582c9e2f8e7bc SHA256 fde75b9689ed93c78565923032408819bb19da5504f95a2fc816018683a9591c -EBUILD neon-0.29.1.ebuild 2770 RMD160 c00d1558c40b02c89915fbbb5c79b10a4b0c4f26 SHA1 8bef626120bfda29a6ca4d024e5cd34fdad79964 SHA256 e83043cb455610af278de7e3c15240d9b7765aa79025999acdec36f725272a7d -EBUILD neon-0.29.2.ebuild 2950 RMD160 d8427a179469fc511d1b3513ffae580c41a4de5b SHA1 f117ba564ee9b73047a79b848dccfb1beda80d7c SHA256 ded9610f28a2631221f8a607a554c8dd631c1e193f80e2cd8e15a43bad58d83f -EBUILD neon-0.29.3.ebuild 2945 RMD160 682b65a22c95cfcde5de32f73f98d0a78a690d3d SHA1 0d9e520de5014d4d010cd2af0c4e17b4cb10e8b8 SHA256 018329b608ec1aa120af1317e5aaa7c59b7943bce4be44f56ff2101d63dae499 -MISC ChangeLog 19648 RMD160 0ead8fdb12e78b5aaba3e9b8cc811dba2820d835 SHA1 3275fb7ffaf0237d0e8c8c2ed2cea535e69e231d SHA256 01705cdae6e71a1326b1a7b5da7b32941917ce3535a798a0382934ebc833fc21 +EBUILD neon-0.29.1.ebuild 2824 RMD160 243d7933cf4aa1fc9cc7f0f97ee852b606447434 SHA1 11188cc55eeddeb3b57f36235e1093eeadea80fa SHA256 a0b64df28352e4511e954281bc7e3076b37702662336415e06fc568fd457bc6d +EBUILD neon-0.29.2.ebuild 3007 RMD160 939359ac23e99090f32b4281466411c3b601bacb SHA1 e75f65afc0ae2005b61449c4220bbe54236ecac2 SHA256 bbd5a065e3ca9ddd020597c373f6284c19819b9a501017edc93fb4a28b142a95 +EBUILD neon-0.29.3.ebuild 3004 RMD160 38eed38330bbafc19792cb7a024feaa171f1f307 SHA1 92d073a689d0ee51d216e164e39e5063b99f55b8 SHA256 3bca0fc931d1e231ba35729f1b344b90610eccd5982b868d9ead7735423d805e +MISC ChangeLog 19848 RMD160 d32800b311fd78dc3cfd0fe012ab8ed344a4dd9c SHA1 5a44a736ecc80df5565370e119741bc5cb815ecb SHA256 391410c9baa5e99299735c2f0e5473d126d61b5fa2ceb62ad266aff160e8bdf0 MISC metadata.xml 1214 RMD160 a951a49e8f74d745ca8c156b770ae4bc3a531151 SHA1 c9e0e7d8ba72dfd4136a7a746bfc9aa5a289decd SHA256 f1017fa04c4b8bbf0982a1c71a560b933956db9f67467feac3ef78cec3a6e91c +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.14 (GNU/Linux) + +iEYEARECAAYFAkuVe7oACgkQI1lqEGTUzyTDmwCgo3fIyu63iLPNKKS+hEOe9Zrg +OcIAoNhcCxnYjc89kcUaFS18N++wM8KQ +=cjx9 +-----END PGP SIGNATURE----- diff --git a/net-misc/neon/files/neon-0.29-sni-fix.patch b/net-misc/neon/files/neon-0.29-sni-fix.patch new file mode 100644 index 000000000000..e9fb33ae85cf --- /dev/null +++ b/net-misc/neon/files/neon-0.29-sni-fix.patch @@ -0,0 +1,18 @@ +http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=569639 +http://bugs.debian.org/cgi-bin/bugreport.cgi?msg=15;filename=sni-fix.patch;att=1;bug=569639 + +diff --git a/src/ne_session.c b/src/ne_session.c +index 117c25a..c65848c 100644 +--- a/src/ne_session.c ++++ b/src/ne_session.c +@@ -183,8 +183,9 @@ ne_session *ne_session_create(const char *scheme, + ia = ne_iaddr_parse(hostname, ne_iaddr_ipv6); + + if (ia) { +- sess->flags[NE_SESSFLAG_TLS_SNI] = 1; + ne_iaddr_free(ia); ++ } else { ++ sess->flags[NE_SESSFLAG_TLS_SNI] = 1; + } + NE_DEBUG(NE_DBG_SSL, "ssl: SNI %s by default.\n", + sess->flags[NE_SESSFLAG_TLS_SNI] ? diff --git a/net-misc/neon/neon-0.29.1.ebuild b/net-misc/neon/neon-0.29.1.ebuild index 2e870b8f70b5..70ff1e762753 100644 --- a/net-misc/neon/neon-0.29.1.ebuild +++ b/net-misc/neon/neon-0.29.1.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2009 Gentoo Foundation +# Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/neon/neon-0.29.1.ebuild,v 1.1 2009/12/19 20:31:21 arfrever Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/neon/neon-0.29.1.ebuild,v 1.2 2010/03/08 22:35:30 swegener Exp $ EAPI="2" -inherit autotools libtool versionator +inherit autotools libtool versionator eutils DESCRIPTION="HTTP and WebDAV client library" HOMEPAGE="http://www.webdav.org/neon/" @@ -44,6 +44,8 @@ src_prepare() { done sed -i -e "s/ALL_LINGUAS=.*/ALL_LINGUAS=\"${linguas}\"/g" configure.in + epatch "${FILESDIR}"/neon-0.29-sni-fix.patch + AT_M4DIR="macros" eautoreconf elibtoolize diff --git a/net-misc/neon/neon-0.29.2.ebuild b/net-misc/neon/neon-0.29.2.ebuild index 70f6e9cccc6b..8caf97be7cf8 100644 --- a/net-misc/neon/neon-0.29.2.ebuild +++ b/net-misc/neon/neon-0.29.2.ebuild @@ -1,10 +1,10 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/neon/neon-0.29.2.ebuild,v 1.2 2010/01/07 15:56:39 fauli Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/neon/neon-0.29.2.ebuild,v 1.3 2010/03/08 22:35:30 swegener Exp $ EAPI="2" -inherit autotools libtool versionator +inherit autotools libtool versionator eutils DESCRIPTION="HTTP and WebDAV client library" HOMEPAGE="http://www.webdav.org/neon/" @@ -44,6 +44,8 @@ src_prepare() { done sed -i -e "s/ALL_LINGUAS=.*/ALL_LINGUAS=\"${linguas}\"/g" configure.in + epatch "${FILESDIR}"/neon-0.29-sni-fix.patch + AT_M4DIR="macros" eautoreconf elibtoolize diff --git a/net-misc/neon/neon-0.29.3.ebuild b/net-misc/neon/neon-0.29.3.ebuild index 4ca08cf02712..96b7f8cfde32 100644 --- a/net-misc/neon/neon-0.29.3.ebuild +++ b/net-misc/neon/neon-0.29.3.ebuild @@ -1,10 +1,10 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/neon/neon-0.29.3.ebuild,v 1.4 2010/03/04 15:23:14 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/neon/neon-0.29.3.ebuild,v 1.5 2010/03/08 22:35:30 swegener Exp $ EAPI="2" -inherit autotools libtool versionator +inherit autotools libtool versionator eutils DESCRIPTION="HTTP and WebDAV client library" HOMEPAGE="http://www.webdav.org/neon/" @@ -44,6 +44,8 @@ src_prepare() { done sed -i -e "s/ALL_LINGUAS=.*/ALL_LINGUAS=\"${linguas}\"/g" configure.in + epatch "${FILESDIR}"/neon-0.29-sni-fix.patch + AT_M4DIR="macros" eautoreconf elibtoolize -- 2.26.2