From owner-svn-ports-all@freebsd.org Fri Feb 10 12:44:20 2017 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id A1B82CD64F5 for ; Fri, 10 Feb 2017 12:44:20 +0000 (UTC) (envelope-from sunpoet@sunpoet.net) Received: from mail-oi0-x241.google.com (mail-oi0-x241.google.com [IPv6:2607:f8b0:4003:c06::241]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 6C76A139D for ; Fri, 10 Feb 2017 12:44:20 +0000 (UTC) (envelope-from sunpoet@sunpoet.net) Received: by mail-oi0-x241.google.com with SMTP id w144so2465792oiw.1 for ; Fri, 10 Feb 2017 04:44:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sunpoet-net.20150623.gappssmtp.com; s=20150623; h=mime-version:sender:in-reply-to:references:from:date:message-id :subject:to:cc; bh=H0aP3L5cTg47K+6pvPokEiPkbp5P3KTWyjNXLBVu64c=; b=aRy4p2ENPScC/utk3XN5ShvxL2z9WAI3/m6WcBifVHGbveSXIteq8rsCGBDj7mq9SR dTtI/HCbmpBBnKB1KWkL+BPUYZJceOKgntqhd79yt7y2aGiTI6q6OpGKFemo6R90PQpN Stdw0kwoRof8VO7K/2oByqTgMbyT1tw/YSMnCSKQEMfdPchIQQ35fi8Keyu0ARRRpmCe WI7VbIgaurEjBy+yrSSzJCsN0MVvrMahoJkyF2WHdyeROBPd35vs1s3dfAY0IFe9vrrP v74WD9fi/cD4M9egQUwJXhHetDIVk2lGyrvVaOdpzp2D8xMdkNXFjLNjFoQBT3cvbsmj 1n6A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:sender:in-reply-to:references:from :date:message-id:subject:to:cc; bh=H0aP3L5cTg47K+6pvPokEiPkbp5P3KTWyjNXLBVu64c=; b=aqVgYGK1BANZABevhTGJWIZVUXTeew+sPE5feOWAlu5n02xRboDzZ5QK+Cu0blhr5S MRZNUZADout11OSEG9RZhMqy5p/NCBXZFY+ZHpWZ5GuGWURg72S9n3qUZ1bbXyTha2kx 1Tv0SaeCwyUhnqXgTE3iqfNwYTuqAkvFV1zY5cd+p9mM4VVgDZcpDwut4HhN3AKqQC38 mNrW39j4ZEsTWXI8qlDt1HazcP3yk/HrF3hilYtM673G+aa5FYS44EkqcC/CyIe4vCh0 VklchYmbRyuQhdzL7PanAprZj7dgvTHWgEisD4m0v2Zy9Q22E8xaT8eMF6KfwtdQxmY9 2I9w== X-Gm-Message-State: AMke39knXBzaw3upts7orxvHNieNoy1yD+jx7H/kAYfMvr8xJyc411PGZAL8yU05vEGKzloyW/AIDtBLqHwNAA== X-Received: by 10.202.185.135 with SMTP id j129mr4558298oif.66.1486730659668; Fri, 10 Feb 2017 04:44:19 -0800 (PST) MIME-Version: 1.0 Sender: sunpoet@sunpoet.net Received: by 10.157.12.134 with HTTP; Fri, 10 Feb 2017 04:43:38 -0800 (PST) In-Reply-To: <201702100913.v1A9Dfp2069028@repo.freebsd.org> References: <201702100913.v1A9Dfp2069028@repo.freebsd.org> From: Sunpoet Po-Chuan Hsieh Date: Fri, 10 Feb 2017 20:43:38 +0800 X-Google-Sender-Auth: Vxx55yzh9Yv4dqD2Yp1Nefo4vKg Message-ID: Subject: Re: svn commit: r433788 - in head/dns/ddclient: . files To: Kirill Ponomarew Cc: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Content-Type: text/plain; charset=UTF-8 X-Content-Filtered-By: Mailman/MimeDel 2.1.23 X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 10 Feb 2017 12:44:20 -0000 On Fri, Feb 10, 2017 at 5:13 PM, Kirill Ponomarew wrote: > Author: krion > Date: Fri Feb 10 09:13:41 2017 > New Revision: 433788 > URL: https://svnweb.freebsd.org/changeset/ports/433788 > > Log: > Fix stale dependencies. > > PR: 216526 > Submitted by: bhtooefr@gmail.com > Approved by: mat (mentor) > Differential Revision: https://reviews.freebsd.org/D9488 > > Modified: > head/dns/ddclient/Makefile > head/dns/ddclient/files/patch-ddclient > > Modified: head/dns/ddclient/Makefile > ============================================================ > ================== > --- head/dns/ddclient/Makefile Fri Feb 10 09:01:27 2017 (r433787) > +++ head/dns/ddclient/Makefile Fri Feb 10 09:13:41 2017 (r433788) > @@ -3,6 +3,7 @@ > > PORTNAME= ddclient > PORTVERSION= 3.8.3 > +PORTREVISION= 1 > CATEGORIES= dns > MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION} > > @@ -18,7 +19,7 @@ USE_PERL5= run > > USE_RC_SUBR= ${PORTNAME} > > -RUN_DEPENDS= p5-JSON-Any>=0:converters/p5-JSON-Any > +RUN_DEPENDS= p5-JSON-PP>=0:converters/p5-JSON-PP > Please remove RUN_DEPENDS as JSON::PP is a Perl core module. % corelist JSON::PP Data for 2017-01-20 JSON::PP was first released with perl v5.13.9 > > SUB_FILES= pkg-message ddclient_force > > @@ -31,7 +32,7 @@ SSL_RUN_DEPENDS=ca_root_nss>0:security/c > 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 > \ > +PLIST_FILES= "@sample etc/ddclient.conf.sample" > etc/periodic/daily/ddclient_force \ > sbin/ddclient > > post-patch: > > Modified: head/dns/ddclient/files/patch-ddclient > ============================================================ > ================== > --- head/dns/ddclient/files/patch-ddclient Fri Feb 10 09:01:27 2017 > (r433787) > +++ head/dns/ddclient/files/patch-ddclient Fri Feb 10 09:13:41 2017 > (r433788) > @@ -1,14 +1,14 @@ > ---- ./ddclient.orig 2011-07-25 19:41:39.000000000 -0700 > -+++ ./ddclient 2011-07-25 19:41:48.000000000 -0700 > -@@ -19,6 +18,7 @@ > +--- ddclient.orig 2015-05-30 21:37:38.000000000 +1200 > ++++ ddclient 2017-02-08 11:00:23.812579000 +1300 > +@@ -25,6 +25,7 @@ > use Getopt::Long; > use Sys::Hostname; > use IO::Socket; > +use POSIX 'setsid'; > > - my ($VERSION) = q$Revision: 157 $ =~ /(\d+)/; > + # my ($VERSION) = q$Revision: 184 $ =~ /(\d+)/; > > -@@ -29,9 +29,9 @@ > +@@ -35,9 +36,9 @@ > $program =~ s/d$//; > my $now = time; > my $hostname = hostname(); > @@ -21,7 +21,7 @@ > my $msgs = ''; > my $last_msgs = ''; > > -@@ -39,7 +39,7 @@ > +@@ -45,7 +46,7 @@ > local $file = ''; > local $lineno = ''; > > @@ -30,7 +30,7 @@ > > sub T_ANY {'any'}; > sub T_STRING {'string'}; > -@@ -678,6 +678,9 @@ > +@@ -743,6 +744,9 @@ > ; > } elsif (opt('daemon')) { > $SIG{'CHLD'} = 'IGNORE'; > @@ -40,7 +40,7 @@ > my $pid = fork; > if ($pid < 0) { > print STDERR "${program}: can not fork ($!)\n"; > -@@ -685,10 +688,9 @@ > +@@ -750,10 +754,9 @@ > } elsif ($pid) { > exit 0; > } > @@ -53,7 +53,7 @@ > } > > # write out the pid file if we're daemon'ized > -@@ -1478,17 +1480,17 @@ > +@@ -1544,17 +1547,17 @@ > ## execute the command. > local *FD; > if (! open(FD, $cmd)) { > @@ -75,7 +75,24 @@ > > } else { > $ok = 1; > -@@ -1878,6 +1880,7 @@ > +@@ -1878,13 +1881,13 @@ > + ## load_json_support > + ###################################################################### > + sub load_json_support { > +- my $json_loaded = eval {require JSON::Any}; > ++ my $json_loaded = eval {require JSON::PP}; > + unless ($json_loaded) { > + fatal(<<"EOM"); > +-Error loading the Perl module JSON::Any needed for cloudflare update. > ++Error loading the Perl module JSON::PP needed for cloudflare update. > + EOM > + } > +- import JSON::Any; > ++ import JSON::PP (qw/decode_json/); > + } > + ###################################################################### > + ## geturl > +@@ -1957,6 +1960,7 @@ > $sd = IO::Socket::SSL->new( > PeerAddr => $peer, > PeerPort => $port, > @@ -83,3 +100,29 @@ > Proto => 'tcp', > MultiHomed => 1, > Timeout => opt('timeout'), > +@@ -4096,9 +4100,9 @@ > + > + # Strip header > + $reply =~ s/^.*?\n\n//s; > +- my $response = JSON::Any->jsonToObj($reply); > +- if ($response->{result} eq 'error') { > +- failed ("%s", $response->{msg}); > ++ my $response = eval {decode_json($reply)}; > ++ if (!defined $response || !defined > $response->{result}) { > ++ failed ("invalid json or result."); > + next; > + } > + > +@@ -4128,9 +4132,9 @@ > + > + # Strip header > + $reply =~ s/^.*?\n\n//s; > +- $response = JSON::Any->jsonToObj($reply); > +- if ($response->{result} eq 'error') { > +- failed ("%s", $response->{msg}); > ++ $response = eval {decode_json($reply)}; > ++ if (!defined $response || !defined > $response->{result}) { > ++ failed ("invalid json or result."); > + } else { > + success ("%s -- Updated Successfully to > %s", $domain, $ip); > + > _______________________________________________ > svn-ports-all@freebsd.org mailing list > https://lists.freebsd.org/mailman/listinfo/svn-ports-all > To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"