Fix building with OpenSSL >= 1.0.0 wrt #326995 by Diego E. Pettenò.

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

4 files changed, 47 insertions, 14 deletions

diff --git a/net-nntp/nzbget/ChangeLog b/net-nntp/nzbget/ChangeLog
index e61b3ac0ca9c..481e9a696c54 100644
--- a/net-nntp/nzbget/ChangeLog
+++ b/net-nntp/nzbget/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-nntp/nzbget
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-nntp/nzbget/ChangeLog,v 1.30 2010/05/09 08:43:43 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nntp/nzbget/ChangeLog,v 1.31 2010/07/12 07:49:09 ssuominen Exp $
+
+  12 Jul 2010; Samuli Suominen <ssuominen@gentoo.org> nzbget-0.7.0.ebuild,
+  +files/nzbget-0.7.0-openssl-1.patch:
+  Fix building with OpenSSL >= 1.0.0 wrt #326995 by Diego E. Pettenò.
 
 *nzbget-0.7.0 (09 May 2010)
 
diff --git a/net-nntp/nzbget/Manifest b/net-nntp/nzbget/Manifest
index 3039aa96af64..1d1f22567ce4 100644
--- a/net-nntp/nzbget/Manifest
+++ b/net-nntp/nzbget/Manifest
@@ -1,18 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX nzbget-0.7.0-openssl-1.patch 1075 RMD160 8e5b84a8e04e4328bf66949e43877ebe298b32f8 SHA1 64bb86fb38cfa71057fea4daf65b52d4d9909052 SHA256 82558aa85bdd078fec12e33fddd23df38b43a3f4f1a9270619aeac8943c48ceb
 AUX nzbget.confd 337 RMD160 7f88d0274d99d880194d18b5bf4c130e450c2084 SHA1 1a0a7a54654b15853d2ba5277a9d0ce919892bff SHA256 a2a305dc1ef482d82041c5261dba235f6faae229d894785f528d87c9c0e452b8
 AUX nzbget.initd 876 RMD160 3edadcf591f5843740c483746cc4ed573f7bf75b SHA1 4258ef47ee7d27d80a354baa77579648063c59fd SHA256 bb81a944ec8a3503d8cc1c3430a29d6f4c5b3be19c89e8220e7444d0b2156447
 DIST nzbget-0.6.0.tar.gz 296298 RMD160 7dacc0a24efb66019de99fd6b143c97a559883ba SHA1 c01b455e221c6075f7543de7d953966a527a6b6e SHA256 b0bc8740db7ed9ea269b29e9a936cb2c4dd61a911b80b623fe18729b94de3030
 DIST nzbget-0.7.0.tar.gz 316059 RMD160 b8ff4d454a51f5d1a5b4246437adad57c918500c SHA1 e47cfcc37adbb756f4b449914cbfc6dcaaeebaec SHA256 b798bbcc9f6816b4e19a95f74df067440f7ad49e1c16a3f33f99bddf7916771e
 EBUILD nzbget-0.6.0.ebuild 2536 RMD160 34b2f75e69ef054d00125da774f7c81ef5a48582 SHA1 55d83296eca169d6878e0f54a4bbab5a61600c8a SHA256 c7421577d1e27ad9891318c3600a921982b8276f64812f8b4ff35680b89d93a9
-EBUILD nzbget-0.7.0.ebuild 2668 RMD160 908730ad57fac10fd9c9b0145510d77c3cac91cc SHA1 ac93646f61fcb5a346926798b68c26bf536672da SHA256 66d2dfbf16084b975adadb61027b8280389c120d2554b2fd4d73bf6d45560ade
-MISC ChangeLog 5196 RMD160 f91ae27d02bebd6407075e41c115dd5ce3921c82 SHA1 04a20bcfc9ceb3c4252d325d5da6931b308b9372 SHA256 a0369a8e0d6663803eb3daac4bae9589cb0b0296bc40e57a5a49ee43f7ff475f
+EBUILD nzbget-0.7.0.ebuild 2713 RMD160 4c4ed32d6ecb5af90876fe0b53dc44455fb04950 SHA1 8379af254047e57fd994693028ecc2e9b063aa99 SHA256 f355c707ef5bff6fb3c9ff803c0b1258a41d8cb06a1e2c051ac76fcd40a179e7
+MISC ChangeLog 5383 RMD160 e9d37b7f3953f017923f47447b6ede87f103185a SHA1 662ec35499dc24dd800accb9dc00ae39f1f003a0 SHA256 33dd9ac79b7dcf08d907d635c99dfc17ea258a3f48dd30928ca74990d55b672b
 MISC metadata.xml 444 RMD160 1f914f344681864676fc164642c0c955d080cadc SHA1 3d352cd32e117e5d78c0cbb2d3e3e5bd1f83154e SHA256 0febeca73acdd2f57fb3005d174da3741db5e70e528471ebe8816936962f9b5e
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
-
-iEYEARECAAYFAkvmdcUACgkQI1lqEGTUzyT68ACfdWLECL94QTPiLjUDv1eP4MNS
-Jx8AnA2mAI5pjY4+TqE8hYv6vd5ncDX1
-=u9jd
------END PGP SIGNATURE-----
diff --git a/net-nntp/nzbget/files/nzbget-0.7.0-openssl-1.patch b/net-nntp/nzbget/files/nzbget-0.7.0-openssl-1.patch
new file mode 100644
index 000000000000..d57c2647e087
--- /dev/null
+++ b/net-nntp/nzbget/files/nzbget-0.7.0-openssl-1.patch
@@ -0,0 +1,36 @@
+http://bugs.gentoo.org/326995
+
+--- TLS.cpp
++++ TLS.cpp
+@@ -908,7 +908,7 @@
+     char *buf;
+     int bufsize;
+     /* needed to get the DNS subjectAltNames: */
+-    STACK *subj_alt_names;
++    STACK_OF(GENERAL_NAME) *subj_alt_names;
+     int subj_alt_names_count;
+     GENERAL_NAME *subj_alt_name;
+     /* did we find a name matching hostname? */
+@@ -960,7 +960,7 @@
+     /* Try the DNS subjectAltNames. */
+     match_found = 0;
+     if ((subj_alt_names =
+-		(STACK*)X509_get_ext_d2i(x509cert, NID_subject_alt_name, NULL, NULL)))
++		(STACK_OF(GENERAL_NAME) *)X509_get_ext_d2i(x509cert, NID_subject_alt_name, NULL, NULL)))
+     {
+ 	subj_alt_names_count = sk_GENERAL_NAME_num(subj_alt_names);
+ 	for (i = 0; i < subj_alt_names_count; i++) 
+@@ -1104,8 +1104,12 @@
+ #endif /* HAVE_LIBGNUTLS */
+ 
+ #ifdef HAVE_OPENSSL
+-    
++
++    #if OPENSSL_VERSION_NUMBER >= 0x10000000L
++    const SSL_METHOD *ssl_method = NULL;
++    #else
+     SSL_METHOD *ssl_method = NULL;
++    #endif
+     
+     ssl_method = force_sslv3 ? SSLv3_client_method() : SSLv23_client_method();
+     if (!ssl_method)
diff --git a/net-nntp/nzbget/nzbget-0.7.0.ebuild b/net-nntp/nzbget/nzbget-0.7.0.ebuild
index 0ac7b6feb496..997319fc05ff 100644
--- a/net-nntp/nzbget/nzbget-0.7.0.ebuild
+++ b/net-nntp/nzbget/nzbget-0.7.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nntp/nzbget/nzbget-0.7.0.ebuild,v 1.1 2010/05/09 08:43:43 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nntp/nzbget/nzbget-0.7.0.ebuild,v 1.2 2010/07/12 07:49:09 ssuominen Exp $
 
 EAPI="2"
 
@@ -44,6 +44,8 @@ src_prepare() {
 		-e 's:^LogFile=.*:LogFile=/var/log/nzbget/nzbget.log:' \
 		"${S}"/nzbget.conf.example >"${S}"/nzbgetd.conf.example \
 		|| die "sed nzbgetd.conf.example failed"
+
+	epatch "${FILESDIR}"/${P}-openssl-1.patch
 }
 
 src_configure() {