Attachment #130390 for bug #174306




# Created by: Lewis Thompson <purple@lewiz.net>
# Date created:				13 April 2004
# Whom:					Lewis Thompson <purple@lewiz.net>
#
# $FreeBSD$
#

PORTNAME=	nzbget
PORTVERSION=	9.1
CATEGORIES=	news
MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-stable/${PORTVERSION}

MAINTAINER=	toxic@doobie.com
COMMENT=	Binary Usenet newsreader supporting NZB files

LICENSE=	GPLv2
LICENSE_FILE=	${WRKSRC}/COPYING

LIB_DEPENDS=	xml2:${PORTSDIR}/textproc/libxml2 \
		sigc-2:${PORTSDIR}/devel/libsigc++20

GNU_CONFIGURE=	yes

CFLAGS+=	${PTHREAD_CFLAGS}
USE_GMAKE=	yes

PAR_DESC=	Support verifying/repairing with par2 files
OPTIONS_DEFINE=	PAR
OPTIONS_SINGLE=	TLSLIB
OPTIONS_SINGLE_TLSLIB=	GNUTLS OPENSSL
OPTIONS_DEFAULT=	PAR GNUTLS

.include <bsd.port.options.mk>

PLIST_FILES=	bin/nzbget
PORTDOCS=	README
PORTEXAMPLES=	nzbget.conf.example

.include <bsd.port.options.mk>

.if ${PORT_OPTIONS:MPAR}
 CONFIGURE_ARGS+= --enable-parcheck --disable-libpar2-bugfixes-check
 LIB_DEPENDS+=	par2:${PORTSDIR}/archivers/libpar2
.else
 CONFIGURE_ARGS+= --disable-parcheck
LIB_DEPENDS+=	par2:${PORTSDIR}/archivers/libpar2
.endif

.if ${PORT_OPTIONS:MOPENSSL}
 CONFIGURE_ARGS+= --with-tlslib=OpenSSL
.endif

.if ${PORT_OPTIONS:MGNUTLS}
 CONFIGURE_ARGS+=	--with-tlslib=GnuTLS
 LIB_DEPENDS+=	gnutls:${PORTSDIR}/security/gnutls
 LIB_DEPENDS+=	gcrypt:${PORTSDIR}/security/libgcrypt
.endif

post-install:
.if ${PORT_OPTIONS:MDOCS}
	${MKDIR} ${DOCSDIR}
	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
.endif
.if ${PORT_OPTIONS:MEXAMPLES}
	${MKDIR} ${EXAMPLESDIR}
	${INSTALL_DATA} ${WRKSRC}/nzbget.conf.example ${EXAMPLESDIR}
.endif

.include <bsd.port.mk>

Lines 1-2 Link Here

(-)distinfo (-2 / +2 lines)
1	SHA256 (nzbget-0.8.0.tar.gz) = 646939596097fafdeb0b4064b433463419e7d0d9af7fe32f6689d6b95ad77d95	1	SHA256 (nzbget-9.1.tar.gz) = 0cd20e1c78359c720862c19c5fd908dc10d6b54658441b86f9caaa71f66e5633
2	SIZE (nzbget-0.8.0.tar.gz) = 321351	2	SIZE (nzbget-9.1.tar.gz) = 658935




--- 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)

Return to bug 174306

Lines 1-22 Link Here

(-)Makefile (-26 / +25 lines)
1	# New ports collection makefile for: nzbget	1	# Created by: Lewis Thompson <purple@lewiz.net>
2	# Date created: 13 April 2004
3	# Whom: Lewis Thompson <purple@lewiz.net>
4	#
5	# $FreeBSD$	2	# $FreeBSD$
6	#
7		3
8	PORTNAME= nzbget	4	PORTNAME= nzbget
9	PORTVERSION= 0.8.0	5	PORTVERSION= 9.1
10	CATEGORIES= news	6	CATEGORIES= news
11	MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-stable/${PORTVERSION}	7	MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-stable/${PORTVERSION}
12		8
13	MAINTAINER= toxic@doobie.com	9	MAINTAINER= toxic@doobie.com
14	COMMENT= A binary newsreader supporting NZB files	10	COMMENT= Binary Usenet newsreader supporting NZB files
15		11
16	LICENSE= GPLv2	12	LICENSE= GPLv2
17	LICENSE_FILE= ${WRKSRC}/COPYING
18		13
19	LIB_DEPENDS= xml2.5:${PORTSDIR}/textproc/libxml2 \	14	LIB_DEPENDS= xml2:${PORTSDIR}/textproc/libxml2 \
20	sigc-2:${PORTSDIR}/devel/libsigc++20	15	sigc-2:${PORTSDIR}/devel/libsigc++20
21		16
22	GNU_CONFIGURE= yes	17	GNU_CONFIGURE= yes
Lines 27-67 Link Here
27	CFLAGS+= ${PTHREAD_CFLAGS}	22	CFLAGS+= ${PTHREAD_CFLAGS}
28	USE_GMAKE= yes	23	USE_GMAKE= yes
29		24
30	OPTIONS= PARCHECK "Enable autopar/parcheck (Requires libpar2)" On	25	PAR_DESC= Support verifying/repairing with par2 files
31	OPTIONS+= TLSCHECK "Use GNUTLS for SSL" On	26	OPTIONS_DEFINE= PAR
32	OPTIONS+= OSSLCHECK "Use OpenSSL for SSL" Off	27	OPTIONS_SINGLE= TLSLIB
		28	OPTIONS_SINGLE_TLSLIB= GNUTLS OPENSSL
		29	OPTIONS_DEFAULT= PAR GNUTLS
33		30
		31	.include <bsd.port.options.mk>
		32
34	PLIST_FILES= bin/nzbget	33	PLIST_FILES= bin/nzbget
35	PORTDOCS= README	34	PORTDOCS= README
36	PORTEXAMPLES= nzbget.conf.example	35	PORTEXAMPLES= nzbget.conf.example
37		36
38	.include <bsd.port.pre.mk>	37	.include <bsd.port.options.mk>
39		38
40	.if defined (WITHOUT_PARCHECK)	39	.if ${PORT_OPTIONS:MPAR}
41	CONFIGURE_ARGS+= --disable-parcheck	40	CONFIGURE_ARGS+= --enable-parcheck --disable-libpar2-bugfixes-check
		41	LIB_DEPENDS+= par2:${PORTSDIR}/archivers/libpar2
42	.else	42	.else
43	CONFIGURE_ARGS+= --enable-parcheck	43	CONFIGURE_ARGS+= --disable-parcheck
44	LIB_DEPENDS+= par2:${PORTSDIR}/archivers/libpar2
45	.endif	44	.endif
46		45
47	.if defined (WITH_OSSLCHECK)	46	.if ${PORT_OPTIONS:MOPENSSL}
48	CONFIGURE_ARGS+= --with-tlslib=OpenSSL	47	CONFIGURE_ARGS+= --with-tlslib=OpenSSL
49	.endif	48	.endif
50		49
51	.if defined (WITH_TLSCHECK)	50	.if ${PORT_OPTIONS:MGNUTLS}
52	CONFIGURE_ARGS+= --with-tlslib=GnuTLS	51	CONFIGURE_ARGS+= --with-tlslib=GnuTLS
53	LIB_DEPENDS+= gnutls:${PORTSDIR}/security/gnutls	52	LIB_DEPENDS+= gnutls:${PORTSDIR}/security/gnutls
54	LIB_DEPENDS+= gcrypt:${PORTSDIR}/security/libgcrypt	53	LIB_DEPENDS+= gcrypt:${PORTSDIR}/security/libgcrypt
55	.endif	54	.endif
56		55
57	post-install:	56	post-install:
58	.if !defined(NOPORTDOCS)	57	.if ${PORT_OPTIONS:MDOCS}
59	${MKDIR} ${DOCSDIR}	58	${MKDIR} ${DOCSDIR}
60	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}	59	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
61	.endif	60	.endif
62	.if !defined(NOPORTEXAMPLES)	61	.if ${PORT_OPTIONS:MEXAMPLES}
63	${MKDIR} ${EXAMPLESDIR}	62	${MKDIR} ${EXAMPLESDIR}
64	${INSTALL_DATA} ${WRKSRC}/nzbget.conf.example ${EXAMPLESDIR}	63	${INSTALL_DATA} ${WRKSRC}/nzbget.conf.example ${EXAMPLESDIR}
65	.endif	64	.endif
66		65
67	.include <bsd.port.post.mk>	66	.include <bsd.port.mk>

Lines 1-32 Link Here

(-)files/patch-TLS.cpp (-32 lines)
1	--- TLS.cpp.orig 2011-06-14 23:47:22.000000000 +0200
2	+++ TLS.cpp 2012-08-31 09:27:41.000000000 +0200
3	@@ -908,7 +908,7 @@
4	char *buf;
5	int bufsize;
6	/* needed to get the DNS subjectAltNames: */
7	- STACK *subj_alt_names;
8	+ STACK_OF(GENERAL_NAME) *subj_alt_names;
9	int subj_alt_names_count;
10	GENERAL_NAME *subj_alt_name;
11	/* did we find a name matching hostname? */
12	@@ -960,7 +960,7 @@
13	/* Try the DNS subjectAltNames. */
14	match_found = 0;
15	if ((subj_alt_names =
16	- (STACK*)X509_get_ext_d2i(x509cert, NID_subject_alt_name, NULL, NULL)))
17	+ (STACK_OF(GENERAL_NAME) *)X509_get_ext_d2i(x509cert, NID_subject_alt_name, NULL, NULL)))
18	{
19	subj_alt_names_count = sk_GENERAL_NAME_num(subj_alt_names);
20	for (i = 0; i < subj_alt_names_count; i++)
21	@@ -1105,7 +1105,11 @@
22
23	#ifdef HAVE_OPENSSL
24
25	+ #if OPENSSL_VERSION_NUMBER >= 0x10000000L
26	+ const SSL_METHOD *ssl_method = NULL;
27	+ #else
28	SSL_METHOD *ssl_method = NULL;
29	+ #endif
30
31	ssl_method = force_sslv3 ? SSLv3_client_method() : SSLv23_client_method();
32	if (!ssl_method)