Attachment 117122 Details for Bug 159199 – file.diff

[patch] file.diff

file.diff (text/plain), 4.92 KB, created by Robert Farmer on 2011-07-26 04:20:06 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Robert Farmer

Created: 2011-07-26 04:20:06 UTC

Size: 4.92 KB

patch

obsolete

>Index: Makefile
>===================================================================
>RCS file: /home/ncvs/ports/dns/ddclient/Makefile,v
>retrieving revision 1.27
>diff -u -r1.27 Makefile
>--- Makefile	13 Mar 2011 14:53:21 -0000	1.27
>+++ Makefile	26 Jul 2011 02:33:50 -0000
>@@ -6,8 +6,7 @@
> #
> 
> PORTNAME=	ddclient
>-PORTVERSION=	3.8.0
>-PORTREVISION=	2
>+PORTVERSION=	3.8.1
> CATEGORIES=	dns
> MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
> 
>Index: distinfo
>===================================================================
>RCS file: /home/ncvs/ports/dns/ddclient/distinfo,v
>retrieving revision 1.18
>diff -u -r1.18 distinfo
>--- distinfo	10 Mar 2011 00:10:24 -0000	1.18
>+++ distinfo	26 Jul 2011 02:35:14 -0000
>@@ -1,2 +1,2 @@
>-SHA256 (ddclient-3.8.0.tar.bz2) = 910dc49bd4b2920fad6c4afce03805de5a4cffd0db5f3d902c5417353420aef4
>-SIZE (ddclient-3.8.0.tar.bz2) = 41701
>+SHA256 (ddclient-3.8.1.tar.bz2) = 77a82668a53fdbed1e05ad6febe6dbefb093e3922afb20b993d4ad9ee868258f
>+SIZE (ddclient-3.8.1.tar.bz2) = 43711
>Index: files/patch-ddclient
>===================================================================
>RCS file: /home/ncvs/ports/dns/ddclient/files/patch-ddclient,v
>retrieving revision 1.3
>diff -u -r1.3 patch-ddclient
>--- files/patch-ddclient	17 Aug 2010 19:22:56 -0000	1.3
>+++ files/patch-ddclient	26 Jul 2011 02:41:54 -0000
>@@ -1,21 +1,21 @@
>---- ./ddclient.orig	2009-01-27 20:14:02.000000000 +0100
>-+++ ./ddclient	2010-08-17 20:13:00.000000000 +0200
>+--- ./ddclient.orig	2011-07-25 19:41:39.000000000 -0700
>++++ ./ddclient	2011-07-25 19:41:48.000000000 -0700
> @@ -1,4 +1,3 @@
> -#!/usr/bin/perl -w
>  #!/usr/local/bin/perl -w
>  ######################################################################
>- # $Id: ddclient 106 2008-12-04 18:05:23Z wimpunk $
>+ # $Id: ddclient 130 2011-07-11 21:02:07Z wimpunk $
> @@ -19,6 +18,7 @@
>  use Getopt::Long;
>  use Sys::Hostname;
>  use IO::Socket;
> +use POSIX 'setsid';
>  
>- my $version  = "3.8.0";
>- my $programd  = $0; 
>-@@ -625,6 +625,9 @@
>- $SIG{'KILL'}   = sub { $caught_kill = 1; };
>- if (opt('daemon') && !opt('force')) {
>+ my ($VERSION) = q$Revision: 130 $ =~ /(\d+)/;
>+ 
>+@@ -668,6 +668,9 @@
>+     ;
>+ } elsif (opt('daemon')) {
>      $SIG{'CHLD'}   = 'IGNORE';
> +    chdir '/';
> +    open(STDIN,  "</dev/null");
>@@ -23,35 +23,34 @@
>      my $pid = fork;
>      if ($pid < 0) {
>  	print STDERR "${program}: can not fork ($!)\n";
>-@@ -632,11 +635,10 @@
>+@@ -675,10 +678,9 @@
>      } elsif ($pid) {
>  	exit 0;
>      }
> +    setsid;
>      $SIG{'CHLD'}   = 'DEFAULT';
>-     $opt{'syslog'} = 1;
> -    open(STDOUT, ">/dev/null");
> -    open(STDERR, ">/dev/null");
> -    open(STDIN,  "</dev/null");
> +    open(STDERR, "&STDOUT");
>- 
>-     write_pid();
>  }
>-@@ -1404,17 +1406,17 @@
>+ 
>+ # write out the pid file if we're daemon'ized
>+@@ -1463,17 +1465,17 @@
>      ## execute the command.
>      local *FD;
>      if (! open(FD, $cmd)) {
> -	printf STDERR "$program: cannot execute command %s.\n", $cmd;
>-+    warning("$program: cannot execute command %s.\n", $cmd);
>++	warning("$program: cannot execute command %s.\n", $cmd);
>  
>      } elsif ($stdin && (! print FD "$stdin\n")) {
> -	printf STDERR "$program: failed writting to %s.\n", $cmd;
>-+    warning("$program: failed writing to %s.\n", $cmd);
>++	warning("$program: failed writing to %s.\n", $cmd);
>  	close(FD);
>  
>      } elsif (! close(FD)) {
> -	printf STDERR "$program: failed closing %s.($@)\n", $cmd;
>-+    warning("$program: failed closing %s.($@)\n", $cmd);
>++	warning("$program: failed closing %s.($@)\n", $cmd);
>  
>      } elsif (opt('exec') && $?) {
> -	printf STDERR "$program: failed %s. ($@)\n", $cmd;
>Index: files/patch-ticket2
>===================================================================
>RCS file: files/patch-ticket2
>diff -N files/patch-ticket2
>--- files/patch-ticket2	13 Mar 2011 14:53:21 -0000	1.1
>+++ /dev/null	1 Jan 1970 00:00:00 -0000
>@@ -1,21 +0,0 @@
>---- ddclient.orig	2011-03-11 00:00:19.394750047 -0800
>-+++ ddclient	2011-03-11 00:04:28.967751644 -0800
>-@@ -2094,10 +2094,14 @@
>-     } elsif (defined($sub) && &$sub($host)) {
>- 	$update = 1;
>- 
>--    } elsif (($cache{$host}{'static'} ne $config{$host}{'static'}) ||
>--	     ($cache{$host}{'wildcard'} ne $config{$host}{'wildcard'}) ||
>--	     ($cache{$host}{'mx'} ne $config{$host}{'mx'}) ||
>--	     ($cache{$host}{'backupmx'} ne $config{$host}{'backupmx'})) {
>-+    } elsif ((defined($cache{$host}{'static'}) && defined($config{$host}{'static'}) &&
>-+	     ($cache{$host}{'static'} ne $config{$host}{'static'})) ||
>-+	     (defined($cache{$host}{'wildcard'}) && defined($config{$host}{'wildcard'}) &&
>-+	     ($cache{$host}{'wildcard'} ne $config{$host}{'wildcard'})) ||
>-+	     (defined($cache{$host}{'mx'}) && defined($config{$host}{'mx'}) &&
>-+	     ($cache{$host}{'mx'} ne $config{$host}{'mx'})) ||
>-+	     (defined($cache{$host}{'backupmx'}) && defined($config{$host}{'backupmx'}) &&
>-+	     ($cache{$host}{'backupmx'} ne $config{$host}{'backupmx'})) ) {
>- 	info("updating %s because host settings have been changed.", $host);
>- 	$update = 1;
>-

Actions: View | Diff

Attachments on bug 159199: 117122