summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2010-07-12 07:49:10 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2010-07-12 07:49:10 +0000
commitf3daceeb08219e6665f134a0362f097d965c27b6 (patch)
tree588ba17ead0a6e90cbfdd8639a81c7447ff616a6 /net-nntp/nzbget/files
parentVersion bump dev-vcs/hg-git to 0.2.3. (diff)
downloadgentoo-2-f3daceeb08219e6665f134a0362f097d965c27b6.tar.gz
gentoo-2-f3daceeb08219e6665f134a0362f097d965c27b6.tar.bz2
gentoo-2-f3daceeb08219e6665f134a0362f097d965c27b6.zip
Fix building with OpenSSL >= 1.0.0 wrt #326995 by Diego E. Pettenò.
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'net-nntp/nzbget/files')
-rw-r--r--net-nntp/nzbget/files/nzbget-0.7.0-openssl-1.patch36
1 files changed, 36 insertions, 0 deletions
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)