Attachment #131713 for bug #175851

View | Details | Raw Unified | Return to bug 175851
Collapse All | Expand All




# New ports collection makefile for:	nzbget
# Date created:				13 April 2004
# Whom:					Lewis Thompson <purple@lewiz.net>
#
# $FreeBSD: ports/news/nzbget/Makefile,v 1.21 2012/11/17 06:00:43 svnexp Exp $
#

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


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

USE_RC_SUBR=	nzbget
GNU_CONFIGURE=	yes
CONFIGURE_ENV=	LOCALBASE="${LOCALBASE}"
MAKE_JOBS_UNSAFE=yes

CFLAGS+=	${PTHREAD_CFLAGS}
USE_GMAKE=	yes

OPTIONS_DEFINE=	PARCHECK GNUTLS OPENSSL
OPTIONS_DEFAULT=	PARCHECK GNUTLS
PARCHECK_DESC=	Enable autopar/parcheck

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

.include <bsd.port.pre.mk>

.if ${PORT_OPTIONS:MPARCHECK}
CONFIGURE_ARGS+=	--disable-parcheck
.else
CONFIGURE_ARGS+=	--enable-parcheck
LIB_DEPENDS+=	par2:${PORTSDIR}/archivers/libpar2
.else
CONFIGURE_ARGS+=	--without-parcheck
.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 !defined(NOPORTEXAMPLES)
	${MKDIR} ${EXAMPLESDIR}
	${INSTALL_DATA} ${WRKSRC}/nzbget.conf.example ${EXAMPLESDIR}
.endif

.include <bsd.port.post.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




#!/bin/sh
#
# PROVIDE: nzbget
# KEYWORD: shutdown
#
# Add the following lines to /etc/rc.conf.local or /etc/rc.conf
# to enable this service:
#
# nzbget_enable (bool):	Set to NO by default.
#			Set it to YES to enable it.

. /etc/rc.subr

name="nzbget"
rcvar=nzbget_enable

load_rc_config ${name}

: ${nzbget_enable:="NO"}

start_cmd="${name}_start"
status_cmd="${name}_status"
stop_cmd="${name}_stop"
command=%%PREFIX%%/sbin/nzbgetd

nzbget_start()
{
	echo "Starting ${name}."
	# artificial sleep because it doesnt want to start
	# after a restart without it
	sleep .5
	${command} start
}

nzbget_stop()
{
	echo "Stopping ${name}."
	${command} stop
}

nzbget_status()
{
	${command} status
}

run_rc_command "$1"




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




bin/nzbget
bin/nzbget-postprocess.sh
sbin/nzbgetd
%%DATADIR%%/nzbget.conf
%%DATADIR%%/nzbget-postprocess.conf
%%DATADIR%%/webui/config.js
%%DATADIR%%/webui/downloads.js
%%DATADIR%%/webui/edit.js
%%DATADIR%%/webui/fasttable.js
%%DATADIR%%/webui/history.js
%%DATADIR%%/webui/img/download-anim-green-2x.png
%%DATADIR%%/webui/img/download-anim-orange-2x.png
%%DATADIR%%/webui/img/favicon.ico
%%DATADIR%%/webui/img/icons-2x.png
%%DATADIR%%/webui/img/icons.png
%%DATADIR%%/webui/img/transmit-file.gif
%%DATADIR%%/webui/img/transmit-reload-2x.gif
%%DATADIR%%/webui/img/transmit.gif
%%DATADIR%%/webui/index.html
%%DATADIR%%/webui/index.js
%%DATADIR%%/webui/lib/bootstrap.css
%%DATADIR%%/webui/lib/bootstrap.js
%%DATADIR%%/webui/lib/bootstrap.min.js
%%DATADIR%%/webui/lib/jquery.js
%%DATADIR%%/webui/lib/jquery.min.js
%%DATADIR%%/webui/messages.js
%%DATADIR%%/webui/nzbget-postprocess.conf
%%DATADIR%%/webui/nzbget.conf
%%DATADIR%%/webui/status.js
%%DATADIR%%/webui/style.css
%%DATADIR%%/webui/upload.js
%%DATADIR%%/webui/util.js
%%PORTDOCS%%%%DOCSDIR%%/COPYING
%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
%%PORTDOCS%%@dirrm %%DOCSDIR%%
@dirrm %%DATADIR%%
@dirrm %%DATADIR%%/webui
@dirrm %%DATADIR%%/webui/img
@dirrm %%DATADIR%%/webui/lib

Return to bug 175851

Lines 1-12 Link Here

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

Line 0 Link Here

(-)./files/nzbget.in (+46 lines)
	1	#!/bin/sh
	2	#
	3	# PROVIDE: nzbget
	4	# KEYWORD: shutdown
	5	#
	6	# Add the following lines to /etc/rc.conf.local or /etc/rc.conf
	7	# to enable this service:
	8	#
	9	# nzbget_enable (bool): Set to NO by default.
	10	# Set it to YES to enable it.
	11
	12	. /etc/rc.subr
	13
	14	name="nzbget"
	15	rcvar=nzbget_enable
	16
	17	load_rc_config ${name}
	18
	19	: ${nzbget_enable:="NO"}
	20
	21	start_cmd="${name}_start"
	22	status_cmd="${name}_status"
	23	stop_cmd="${name}_stop"
	24	command=%%PREFIX%%/sbin/nzbgetd
	25
	26	nzbget_start()
	27	{
	28	echo "Starting ${name}."
	29	# artificial sleep because it doesnt want to start
	30	# after a restart without it
	31	sleep .5
	32	${command} start
	33	}
	34
	35	nzbget_stop()
	36	{
	37	echo "Stopping ${name}."
	38	${command} stop
	39	}
	40
	41	nzbget_status()
	42	{
	43	${command} status
	44	}
	45
	46	run_rc_command "$1"

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)

Line 0 Link Here

(-)./pkg-plist (+39 lines)
	1	bin/nzbget
	2	bin/nzbget-postprocess.sh
	3	sbin/nzbgetd
	4	%%DATADIR%%/nzbget.conf
	5	%%DATADIR%%/nzbget-postprocess.conf
	6	%%DATADIR%%/webui/config.js
	7	%%DATADIR%%/webui/downloads.js
	8	%%DATADIR%%/webui/edit.js
	9	%%DATADIR%%/webui/fasttable.js
	10	%%DATADIR%%/webui/history.js
	11	%%DATADIR%%/webui/img/download-anim-green-2x.png
	12	%%DATADIR%%/webui/img/download-anim-orange-2x.png
	13	%%DATADIR%%/webui/img/favicon.ico
	14	%%DATADIR%%/webui/img/icons-2x.png
	15	%%DATADIR%%/webui/img/icons.png
	16	%%DATADIR%%/webui/img/transmit-file.gif
	17	%%DATADIR%%/webui/img/transmit-reload-2x.gif
	18	%%DATADIR%%/webui/img/transmit.gif
	19	%%DATADIR%%/webui/index.html
	20	%%DATADIR%%/webui/index.js
	21	%%DATADIR%%/webui/lib/bootstrap.css
	22	%%DATADIR%%/webui/lib/bootstrap.js
	23	%%DATADIR%%/webui/lib/bootstrap.min.js
	24	%%DATADIR%%/webui/lib/jquery.js
	25	%%DATADIR%%/webui/lib/jquery.min.js
	26	%%DATADIR%%/webui/messages.js
	27	%%DATADIR%%/webui/nzbget-postprocess.conf
	28	%%DATADIR%%/webui/nzbget.conf
	29	%%DATADIR%%/webui/status.js
	30	%%DATADIR%%/webui/style.css
	31	%%DATADIR%%/webui/upload.js
	32	%%DATADIR%%/webui/util.js
	33	%%PORTDOCS%%%%DOCSDIR%%/COPYING
	34	%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
	35	%%PORTDOCS%%@dirrm %%DOCSDIR%%
	36	@dirrm %%DATADIR%%
	37	@dirrm %%DATADIR%%/webui
	38	@dirrm %%DATADIR%%/webui/img
	39	@dirrm %%DATADIR%%/webui/lib