svn commit: r303829 - in head/news/nzbget: . files

[Pawel Pekala]

Author: pawel
Date: Fri Sep  7 21:11:32 2012
New Revision: 303829
URL: http://svn.freebsd.org/changeset/ports/303829

Log:
  - Fix build with OpenSSL >= 1.0 [1]
  - Mark MAKE_JOBS_UNSAFE:
  
  ===>  Building for nzbget-0.8.0
  /usr/bin/make  all-am
  make: illegal option -- -
  usage: make [-BPSXeiknpqrstv] [-C directory] [-D variable]
          [-d flags] [-E variable] [-f makefile] [-I directory]
          [-j max_jobs] [-m directory] [-V variable]
          [variable=value] [target ...]
  
  PR:		ports/171196 [1]
  Submitted by:	freebsd at nagilum.org [1]
  Approved by:	maintainer

Added:
  head/news/nzbget/files/
  head/news/nzbget/files/patch-TLS.cpp   (contents, props changed)
Modified:
  head/news/nzbget/Makefile

Modified: head/news/nzbget/Makefile
==============================================================================
--- head/news/nzbget/Makefile	Fri Sep  7 21:00:54 2012	(r303828)
+++ head/news/nzbget/Makefile	Fri Sep  7 21:11:32 2012	(r303829)
@@ -21,6 +21,7 @@ LIB_DEPENDS=	xml2.5:${PORTSDIR}/textproc
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	LOCALBASE="${LOCALBASE}"
+MAKE_JOBS_UNSAFE=yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	${PTHREAD_LIBS}
 CFLAGS+=	${PTHREAD_CFLAGS}

Added: head/news/nzbget/files/patch-TLS.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/news/nzbget/files/patch-TLS.cpp	Fri Sep  7 21:11:32 2012	(r303829)
@@ -0,0 +1,32 @@
+--- TLS.cpp.orig	2011-06-14 23:47:22.000000000 +0200
++++ TLS.cpp	2012-08-31 09:27:41.000000000 +0200
+@@ -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++) 
+@@ -1105,7 +1105,11 @@
+ 
+ #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)