From owner-svn-ports-head@FreeBSD.ORG Fri Sep 7 21:11:33 2012 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7C681106564A; Fri, 7 Sep 2012 21:11:33 +0000 (UTC) (envelope-from pawel@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 4D8318FC1E; Fri, 7 Sep 2012 21:11:33 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q87LBXlK064018; Fri, 7 Sep 2012 21:11:33 GMT (envelope-from pawel@svn.freebsd.org) Received: (from pawel@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q87LBX9U064015; Fri, 7 Sep 2012 21:11:33 GMT (envelope-from pawel@svn.freebsd.org) Message-Id: <201209072111.q87LBX9U064015@svn.freebsd.org> From: Pawel Pekala Date: Fri, 7 Sep 2012 21:11:33 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r303829 - in head/news/nzbget: . files X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 07 Sep 2012 21:11:33 -0000 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@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)