Attachment #196238 for bug #230661

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

Lines 2-8 Link Here

(-)dns/dsc/Makefile (-2 / +4 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= dsc	4	PORTNAME= dsc
5	PORTVERSION= 2.6.1	5	PORTVERSION= 2.7.0
6	CATEGORIES= dns	6	CATEGORIES= dns
7	MASTER_SITES= https://www.dns-oarc.net/files/dsc/ \	7	MASTER_SITES= https://www.dns-oarc.net/files/dsc/ \
8	https://dns.company/files/dsc/	8	https://dns.company/files/dsc/
Lines 19-28 Link Here
19	p5-XML-Simple>=2.24:textproc/p5-XML-Simple \	19	p5-XML-Simple>=2.24:textproc/p5-XML-Simple \
20	dsp>=2.0.0:dns/dsp	20	dsp>=2.0.0:dns/dsp
21		21
22
23	GNU_CONFIGURE= yes	22	GNU_CONFIGURE= yes
		23	CONFIGURE_ARGS+= --with-extra-cflags=-I${PREFIX}/include
24	USES= gmake perl5 shebangfix	24	USES= gmake perl5 shebangfix
25		25
26	SUB_FILES= pkg-message	26	SUB_FILES= pkg-message
27		27
		28	USE_RC_SUBR= dsc
		29
28	.include <bsd.port.mk>	30	.include <bsd.port.mk>

Lines 1-3 Link Here

(-)dns/dsc/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1520903828	1	TIMESTAMP = 1534374842
2	SHA256 (dsc-2.6.1.tar.gz) = e11019dc8cebd971bec420bb28dc97acc851dfd328c5d40bbf6b41df467db285	2	SHA256 (dsc-2.7.0.tar.gz) = eab7f79229a800087d96cb8bac39927558f1d512428d7825d5edb5f7064d2c31
3	SIZE (dsc-2.6.1.tar.gz) = 320065	3	SIZE (dsc-2.7.0.tar.gz) = 325520




#!/bin/sh
#
# $FreeBSD$
#

# PROVIDE: dsc
# REQUIRE: DAEMON
# KEYWORD: shutdown

# Add the following lines to
# /etc/rc.conf.d/dsc /etc/rc.conf.local or /etc/rc.conf
# to enable this service:
#
# dsc_enable (bool):			Set to NO by default.
#		Set it to YES to enable dsc.
# dsc_config (path):			Set to %%PREFIX%%/etc/dsc/dsc.conf
#		by default.
# dsc_pidfile (path):			Set to /var/run/dsc.pid
#		by default (must match pid_file setting in dsc.conf).
# dsc_flags (additional arguments):	Set to -p (don't use promiscuous mode)
#		by default.
#

. /etc/rc.subr

name="dsc"
rcvar=dsc_enable

command=%%PREFIX%%/bin/${name}

load_rc_config $name

: ${dsc_enable="NO"}
: ${dsc_config="%%PREFIX%%/etc/${name}/${name}.conf"}
: ${dsc_pidfile="/var/run/${name}.pid"}
: ${dsc_flags="-p"}

required_files="${dsc_config}"
pidfile="${dsc_pidfile}"
command_args="${dsc_config}"

run_rc_command "$1"




--- cron/upload-prep.pl.orig	2017-08-21 08:14:08 UTC
+++ cron/upload-prep.pl
@@ -1,4 +1,4 @@
-#!/usr/bin/perl

 #
 # Copyright (c) 2016-2017, OARC, Inc.
 # Copyright (c) 2007, The Measurement Factory, Inc.
@@ -54,7 +54,7 @@ exit 0 if Proc::PID::File->running(dir =
 sleep 3;
 
 
-foreach my $conf (</usr/local/dsc/etc/*.conf>) {
+foreach my $conf (</usr/local/etc/dsc/*.conf>) {
 	next unless open (CONF, $conf);
 	my $rundir = undef;
 	while (<CONF>) {

Return to bug 230661

Line 0 Link Here

(-)dns/dsc/files/dsc.in (+42 lines)
	1	#!/bin/sh
	2	#
	3	# $FreeBSD$
	4	#
	5
	6	# PROVIDE: dsc
	7	# REQUIRE: DAEMON
	8	# KEYWORD: shutdown
	9
	10	# Add the following lines to
	11	# /etc/rc.conf.d/dsc /etc/rc.conf.local or /etc/rc.conf
	12	# to enable this service:
	13	#
	14	# dsc_enable (bool): Set to NO by default.
	15	# Set it to YES to enable dsc.
	16	# dsc_config (path): Set to %%PREFIX%%/etc/dsc/dsc.conf
	17	# by default.
	18	# dsc_pidfile (path): Set to /var/run/dsc.pid
	19	# by default (must match pid_file setting in dsc.conf).
	20	# dsc_flags (additional arguments): Set to -p (don't use promiscuous mode)
	21	# by default.
	22	#
	23
	24	. /etc/rc.subr
	25
	26	name="dsc"
	27	rcvar=dsc_enable
	28
	29	command=%%PREFIX%%/bin/${name}
	30
	31	load_rc_config $name
	32
	33	: ${dsc_enable="NO"}
	34	: ${dsc_config="%%PREFIX%%/etc/${name}/${name}.conf"}
	35	: ${dsc_pidfile="/var/run/${name}.pid"}
	36	: ${dsc_flags="-p"}
	37
	38	required_files="${dsc_config}"
	39	pidfile="${dsc_pidfile}"
	40	command_args="${dsc_config}"
	41
	42	run_rc_command "$1"

Lines 1-4 Link Here

(-)dns/dsc/files/patch-cron_upload-prep.pl (-1 / +10 lines)
1	--- cron/upload-prep.pl.orig 2018-03-13 22:05:23 UTC	1	--- cron/upload-prep.pl.orig 2017-08-21 08:14:08 UTC
2	+++ cron/upload-prep.pl	2	+++ cron/upload-prep.pl
3	@@ -1,4 +1,4 @@	3	@@ -1,4 +1,4 @@
4	-#!/usr/bin/perl	4	-#!/usr/bin/perl
Lines 6-8 Link Here
6	#	6	#
7	# Copyright (c) 2016-2017, OARC, Inc.	7	# Copyright (c) 2016-2017, OARC, Inc.
8	# Copyright (c) 2007, The Measurement Factory, Inc.	8	# Copyright (c) 2007, The Measurement Factory, Inc.
		9	@@ -54,7 +54,7 @@ exit 0 if Proc::PID::File->running(dir =
		10	sleep 3;
		11
		12
		13	-foreach my $conf (</usr/local/dsc/etc/*.conf>) {
		14	+foreach my $conf (</usr/local/etc/dsc/*.conf>) {
		15	next unless open (CONF, $conf);
		16	my $rundir = undef;
		17	while (<CONF>) {