Date: Mon, 13 Jan 2014 03:19:12 +0900 From: KATO Tsuguru <tkato432@yahoo.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/185714: dns/ddclient: Update to version 3.8.2 Message-ID: <20140113031912.fc7c06fd8f844e3a64e5f35a@yahoo.com> Resent-Message-ID: <201401121840.s0CIe9XA049529@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 185714
>Category: ports
>Synopsis: dns/ddclient: Update to version 3.8.2
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Sun Jan 12 18:40:09 UTC 2014
>Closed-Date:
>Last-Modified:
>Originator: KATO Tsuguru
>Release: FreeBSD 8.4-RELEASE-p4 i386
>Organization:
>Environment:
>Description:
- Update to version 3.8.2
Remove file:
pkg-plist
>How-To-Repeat:
>Fix:
diff -urN /usr/ports/dns/ddclient/Makefile dns/ddclient/Makefile
--- /usr/ports/dns/ddclient/Makefile 2014-01-08 15:45:47.000000000 +0900
+++ dns/ddclient/Makefile 2014-01-13 00:00:00.000000000 +0900
@@ -2,8 +2,7 @@
# $FreeBSD: head/dns/ddclient/Makefile 339067 2014-01-08 02:08:19Z linimon $
PORTNAME= ddclient
-PORTVERSION= 3.8.1
-PORTREVISION= 1
+PORTVERSION= 3.8.2
CATEGORIES= dns
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
@@ -12,51 +11,50 @@
LICENSE= GPLv2
+NO_BUILD= yes
+
USE_BZIP2= yes
USES= perl5
USE_PERL5= run
-NO_BUILD= yes
+
USE_RC_SUBR= ${PORTNAME}
+SUB_FILES= pkg-message ddclient_force
+
OPTIONS_DEFINE= SSL
OPTIONS_DEFAULT=SSL
-NO_STAGE= yes
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MSSL}
-RUN_DEPENDS+= p5-IO-Socket-SSL>=0:${PORTSDIR}/security/p5-IO-Socket-SSL
-.endif
-
-SUB_FILES= pkg-message ddclient_force
-PKGMESSAGE= ${WRKDIR}/pkg-message
+SSL_RUN_DEPENDS=ca_root_nss>0:${PORTSDIR}/security/ca_root_nss \
+ p5-IO-Socket-SSL>0:${PORTSDIR}/security/p5-IO-Socket-SSL
-PORTDOCS= COPYING COPYRIGHT Changelog README README.cisco README.ssl \
+PORTDOCS= COPYRIGHT Changelog README.cisco README.ssl README.md \
sample-etc_cron.d_ddclient sample-etc_dhclient-exit-hooks \
sample-etc_dhcpc_dhcpcd-eth0.exe sample-etc_ppp_ip-up.local
+PLIST_FILES= etc/ddclient.conf.sample etc/periodic/daily/ddclient_force \
+ sbin/ddclient
+PLIST_DIRSTRY= etc/periodic/daily etc/periodic
+
+.include <bsd.port.options.mk>
post-patch:
- @${GREP} -lr '/usr' ${WRKSRC} | ${XARGS} ${REINPLACE_CMD} -e 's|/usr|${PREFIX}|g'
- @${REINPLACE_CMD} \
- -e 's|/tmp|/var/tmp|' \
- -e 's|/var/cache/ddclient|/var/tmp|' \
- -e '/PATH/s|/etc:/usr/local/lib:||' \
- -e 's|/usr.*perl|${PERL}|g' \
- -e 's|/usr/local|${LOCALBASE}|g' \
- -e 's|/etc/ddclient|${PREFIX}/etc|' \
- ${WRKSRC}/ddclient
+ @${GREP} -lR '/usr' ${WRKSRC} | ${XARGS} ${REINPLACE_CMD} -e \
+ 's|/usr|${PREFIX}|g'
+ @${REINPLACE_CMD} -e \
+ 's|%%PERL%%|${PERL}| ; \
+ s|%%ETCDIR%%|${ETCDIR}| ; \
+ s|%%LOCALBASE%%|${LOCALBASE}|' ${WRKSRC}/ddclient
do-install:
- @${INSTALL_DATA} ${WRKSRC}/sample-etc_ddclient.conf ${PREFIX}/etc/ddclient.conf.sample
- @${INSTALL_SCRIPT} ${WRKSRC}/ddclient ${PREFIX}/sbin/
-.if ${PORT_OPTIONS:MDOCS}
- @${INSTALL} -d ${DOCSDIR}
- @${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${DOCSDIR}/
-.endif
-
-post-install:
- ${MKDIR} ${PREFIX}/etc/periodic/daily
- ${INSTALL_SCRIPT} ${WRKDIR}/ddclient_force ${PREFIX}/etc/periodic/daily/ddclient_force
- @${CAT} ${PKGMESSAGE}
+ (cd ${WRKSRC} && ${INSTALL_DATA} sample-etc_ddclient.conf \
+ ${STAGEDIR}${PREFIX}/etc/ddclient.conf.sample)
+ (cd ${WRKSRC} && ${INSTALL_SCRIPT} ddclient \
+ ${STAGEDIR}${PREFIX}/sbin)
+ @${MKDIR} ${STAGEDIR}${PREFIX}/etc/periodic/daily
+ (cd ${WRKDIR} && ${INSTALL_SCRIPT} ddclient_force \
+ ${STAGEDIR}${PREFIX}/etc/periodic/daily/ddclient_force)
+ @${MKDIR} ${STAGEDIR}${DOCSDIR}
+.for i in ${PORTDOCS}
+ (cd ${WRKSRC} && ${INSTALL_DATA} ${i} ${STAGEDIR}${DOCSDIR})
+.endfor
.include <bsd.port.mk>
diff -urN /usr/ports/dns/ddclient/distinfo dns/ddclient/distinfo
--- /usr/ports/dns/ddclient/distinfo 2013-11-06 21:56:45.000000000 +0900
+++ dns/ddclient/distinfo 2014-01-13 00:00:00.000000000 +0900
@@ -1,2 +1,2 @@
-SHA256 (ddclient-3.8.1.tar.bz2) = 77a82668a53fdbed1e05ad6febe6dbefb093e3922afb20b993d4ad9ee868258f
-SIZE (ddclient-3.8.1.tar.bz2) = 43711
+SHA256 (ddclient-3.8.2.tar.bz2) = f343d2297b97b769949d4d6c3f603a8c52433acf2104245538808a2ea003ed5e
+SIZE (ddclient-3.8.2.tar.bz2) = 41996
diff -urN /usr/ports/dns/ddclient/files/patch-ddclient dns/ddclient/files/patch-ddclient
--- /usr/ports/dns/ddclient/files/patch-ddclient 2013-11-06 21:56:45.000000000 +0900
+++ dns/ddclient/files/patch-ddclient 2014-01-13 00:00:00.000000000 +0900
@@ -1,19 +1,43 @@
--- ./ddclient.orig 2011-07-25 19:41:39.000000000 -0700
+++ ./ddclient 2011-07-25 19:41:48.000000000 -0700
-@@ -1,4 +1,3 @@
+@@ -1,5 +1,4 @@
-#!/usr/bin/perl -w
- #!/usr/local/bin/perl -w
+-#!/usr/local/bin/perl -w
++#!%%PERL%% -w
######################################################################
- # $Id: ddclient 130 2011-07-11 21:02:07Z wimpunk $
+ # $Id: ddclient 157 2013-12-26 09:02:05Z wimpunk $
+ #
@@ -19,6 +18,7 @@
use Getopt::Long;
use Sys::Hostname;
use IO::Socket;
+use POSIX 'setsid';
- my ($VERSION) = q$Revision: 130 $ =~ /(\d+)/;
+ my ($VERSION) = q$Revision: 157 $ =~ /(\d+)/;
-@@ -668,6 +668,9 @@
+@@ -29,9 +29,9 @@
+ $program =~ s/d$//;
+ my $now = time;
+ my $hostname = hostname();
+-my $etc = ($program =~ /test/i) ? './' : '/etc/ddclient/';
+-my $cachedir = ($program =~ /test/i) ? './' : '/var/cache/ddclient/';
+-my $savedir = ($program =~ /test/i) ? 'URL/' : '/tmp/';
++my $etc = ($program =~ /test/i) ? './' : '%%ETCDIR%%/';
++my $cachedir = ($program =~ /test/i) ? './' : '/var/tmp/';
++my $savedir = ($program =~ /test/i) ? 'URL/' : '/var/tmp/';
+ my $msgs = '';
+ my $last_msgs = '';
+
+@@ -39,7 +39,7 @@
+ local $file = '';
+ local $lineno = '';
+
+-$ENV{'PATH'} = (exists($ENV{PATH}) ? "$ENV{PATH}:" : "") . "/sbin:/usr/sbin:/bin:/usr/bin:/etc:/usr/lib:";
++$ENV{'PATH'} = (exists($ENV{PATH}) ? "$ENV{PATH}:" : "") . "/sbin:/usr/sbin:/bin:";
+
+ sub T_ANY {'any'};
+ sub T_STRING {'string'};
+@@ -678,6 +678,9 @@
;
} elsif (opt('daemon')) {
$SIG{'CHLD'} = 'IGNORE';
@@ -23,7 +47,7 @@
my $pid = fork;
if ($pid < 0) {
print STDERR "${program}: can not fork ($!)\n";
-@@ -675,10 +678,9 @@
+@@ -685,10 +688,9 @@
} elsif ($pid) {
exit 0;
}
@@ -36,7 +60,7 @@
}
# write out the pid file if we're daemon'ized
-@@ -1463,17 +1465,17 @@
+@@ -1478,17 +1480,17 @@
## execute the command.
local *FD;
if (! open(FD, $cmd)) {
@@ -58,3 +82,11 @@
} else {
$ok = 1;
+@@ -1878,6 +1880,7 @@
+ $sd = IO::Socket::SSL->new(
+ PeerAddr => $peer,
+ PeerPort => $port,
++ SSL_ca_file => '%%LOCALBASE%%/share/certs/ca-root-nss.crt',
+ Proto => 'tcp',
+ MultiHomed => 1,
+ Timeout => opt('timeout'),
diff -urN /usr/ports/dns/ddclient/pkg-plist dns/ddclient/pkg-plist
--- /usr/ports/dns/ddclient/pkg-plist 2013-11-06 21:56:45.000000000 +0900
+++ dns/ddclient/pkg-plist 1970-01-01 09:00:00.000000000 +0900
@@ -1,6 +0,0 @@
-@comment $FreeBSD: head/dns/ddclient/pkg-plist 300896 2012-07-14 13:54:48Z beat $
-etc/ddclient.conf.sample
-etc/periodic/daily/ddclient_force
-sbin/ddclient
-@dirrmtry etc/periodic/daily
-@dirrmtry etc/periodic
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20140113031912.fc7c06fd8f844e3a64e5f35a>