Attachment 47697 Details for Bug 73059 – ddclient.patch

[patch] ddclient.patch

ddclient.patch (text/plain), 8.35 KB, created by Radek Kozlowski on 2004-10-24 04:30:23 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Radek Kozlowski

Created: 2004-10-24 04:30:23 UTC

Size: 8.35 KB

patch

obsolete

>diff -ruN ddclient.orig/Makefile ddclient/Makefile
>--- ddclient.orig/Makefile	Sun Oct 24 03:30:42 2004
>+++ ddclient/Makefile	Sun Oct 24 04:58:03 2004
>@@ -6,16 +6,20 @@
> #
> 
> PORTNAME=	ddclient
>-PORTVERSION=	3.6.3
>+PORTVERSION=	3.6.4
> CATEGORIES=	dns
>-MASTER_SITES=	http://members.rogers.com/ddclient/pub/
>+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
>+MASTER_SITE_SUBDIR=	ddclient
>+DISTNAME=	${PORTNAME}
> 
>-MAINTAINER=	ports@FreeBSD.org
>+MAINTAINER=	radek@raadradd.com
> COMMENT=	Update dynamic DNS entries
> 
> USE_PERL5=	yes
> NO_BUILD=	yes
> 
>+USE_RC_SUBR=    yes
>+
> do-install:
> 	@${PERL} -pi -e 's|%%PREFIX%%|${PREFIX}|g; s|%%PERL%%|${PERL}|g' ${WRKSRC}/ddclient
> 	@${INSTALL_SCRIPT} ${WRKSRC}/ddclient ${PREFIX}/sbin
>@@ -27,8 +31,9 @@
> 	@${PERL} -pe 's|%%PREFIX%%|${PREFIX}|g' < ${WRKSRC}/$i > ${WRKDIR}/$i
> 	@${INSTALL_DATA} ${WRKDIR}/$i ${PREFIX}/share/ddclient
> .endfor
>-	@${PERL} -pe 's|%%PREFIX%%|${PREFIX}|g' < ${FILESDIR}/ddclient.sh.sample > ${WRKDIR}/ddclient.sh.sample
>-	@${INSTALL_SCRIPT} ${WRKDIR}/ddclient.sh.sample ${PREFIX}/etc/rc.d
>+	@${PERL} -pe 's|%%PREFIX%%|${PREFIX}|g; s|%%RC_SUBR%%|${RC_SUBR}|g' \
>+		< ${FILESDIR}/ddclient.sh > ${WRKDIR}/ddclient.sh
>+	@${INSTALL_SCRIPT} ${WRKDIR}/ddclient.sh ${PREFIX}/etc/rc.d/
> 
> 	@${PERL} -pe 's|/usr/local|${PREFIX}|g' < ${PKGMESSAGE}
> 
>diff -ruN ddclient.orig/distinfo ddclient/distinfo
>--- ddclient.orig/distinfo	Sun Oct 24 03:30:42 2004
>+++ ddclient/distinfo	Sun Oct 24 03:41:56 2004
>@@ -1,2 +1,2 @@
>-MD5 (ddclient-3.6.3.tar.gz) = dfa5ff6967cb854de804d4e7b9633fdc
>-SIZE (ddclient-3.6.3.tar.gz) = 34497
>+MD5 (ddclient.tar.gz) = e4c9753dc61f3622b166cf914b12acd3
>+SIZE (ddclient.tar.gz) = 35633
>diff -ruN ddclient.orig/files/ddclient.sh ddclient/files/ddclient.sh
>--- ddclient.orig/files/ddclient.sh	Thu Jan  1 01:00:00 1970
>+++ ddclient/files/ddclient.sh	Sun Oct 24 04:39:36 2004
>@@ -0,0 +1,27 @@
>+#!/bin/sh
>+#
>+# $FreeBSD$
>+#
>+
>+# PROVIDE: ddclient
>+# REQUIRE: LOGIN
>+# KEYWORD: FreeBSD shutdown
>+
>+#
>+# Add the following lines to /etc/rc.conf to enable ddclient:
>+#
>+#ddclient_enable="YES"
>+#
>+ddclient_enable=${ddclient_enable-"NO"}
>+ddclient_flags=${ddclient_flags-"-daemon 300"}
>+
>+. %%RC_SUBR%%
>+
>+name="ddclient"
>+rcvar=`set_rcvar`
>+command="%%PREFIX%%/sbin/${name}"
>+required_files="%%PREFIX%%/etc/${name}.conf"
>+
>+load_rc_config ${name}
>+
>+run_rc_command "$1"
>diff -ruN ddclient.orig/files/ddclient.sh.sample ddclient/files/ddclient.sh.sample
>--- ddclient.orig/files/ddclient.sh.sample	Sun Oct 24 03:30:42 2004
>+++ ddclient/files/ddclient.sh.sample	Thu Jan  1 01:00:00 1970
>@@ -1,19 +0,0 @@
>-#!/bin/sh
>-
>-case "$1" in
>-	start)
>-		if [ -x %%PREFIX%%/sbin/ddclient ]; then
>-			%%PREFIX%%/sbin/ddclient -daemon 300 && echo -n ' ddclient'
>-		fi
>-		;;
>-	stop)
>-		/bin/kill `cat /var/run/ddclient.pid`
>-		echo -n ' ddclient'
>-		;;
>-	*)
>-		echo ""
>-		echo "Usage: `basename $0` { start | stop }"
>-		echo ""
>-		exit 64
>-		;;
>-esac
>diff -ruN ddclient.orig/files/patch-aa ddclient/files/patch-aa
>--- ddclient.orig/files/patch-aa	Sun Oct 24 03:30:42 2004
>+++ ddclient/files/patch-aa	Sun Oct 24 03:55:14 2004
>@@ -1,29 +1,29 @@
>---- ddclient.orig	Sat Aug 25 17:17:28 2001
>-+++ ddclient	Sun Aug 26 19:52:01 2001
>+--- ddclient.orig	Sun Oct 24 03:45:24 2004
>++++ ddclient	Sun Oct 24 03:47:57 2004
> @@ -1,5 +1,4 @@
> -#!/usr/bin/perl -w
> -#!/usr/local/bin/perl -w
> +#!%%PERL%% -w
>  ######################################################################
>- # $Header: /home/paul/src/ddclient/RCS/ddclient,v 3.5 2001/08/25 14:22:00 root Exp $
>+ # $Header: /cvsroot/ddclient/ddclient/ddclient,v 1.5 2004/10/17 21:31:31 wimpunk Exp $
>  #
>-@@ -20,8 +19,8 @@
>+@@ -21,8 +20,8 @@
>  $program  =~ s/d$//;
>  my $now       = time;
>  my $hostname  = hostname();
>--my $etc       = ($program =~ /test/i) ? './'   : '/etc/';
>+-my $etc       = ($program =~ /test/i) ? './'   : '/etc/ddclient/';
> -my $savedir   = ($program =~ /test/i) ? 'URL/' : '/tmp/';
> +my $etc       = '%%PREFIX%%/etc/';
> +my $savedir   = (exists($ENV{TMPDIR}) ? "$ENV{TMPDIR}/" : "/var/tmp/");
>  my $msgs      = '';
>  my $last_msgs = '';
>  
>-@@ -29,7 +28,7 @@
>+@@ -30,7 +29,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:/usr/bin";
>++$ENV{'PATH'} = (exists($ENV{PATH}) ? "$ENV{PATH}:" : "") . "/sbin:/usr/sbin:/bin:/usr/bin:";
>  
>  sub T_ANY	{'any'};
>  sub T_STRING	{'string'};
>diff -ruN ddclient.orig/files/patch-ab ddclient/files/patch-ab
>--- ddclient.orig/files/patch-ab	Sun Oct 24 03:30:42 2004
>+++ ddclient/files/patch-ab	Sun Oct 24 03:57:32 2004
>@@ -1,5 +1,5 @@
>---- sample-etc_cron.d_ddclient.orig	Sun Jun 15 03:39:16 2003
>-+++ sample-etc_cron.d_ddclient	Thu Aug  7 14:31:15 2003
>+--- sample-etc_cron.d_ddclient.orig	Sun Oct 24 03:48:56 2004
>++++ sample-etc_cron.d_ddclient	Sun Oct 24 03:49:48 2004
> @@ -10,8 +10,8 @@
>  ######################################################################
>  ## force an update twice a month (only if you are not using daemon-mode)
>@@ -11,11 +11,11 @@
>  ##
> -##0 * * * *	root    /usr/sbin/ddclient -daemon=0 -syslog -quiet retry
> +##0 * * * *	root    %%PREFIX%%/sbin/ddclient -daemon=0 -syslog -quiet retry
>---- sample-etc_dhclient-exit-hooks.orig	Sun Jun 15 03:39:16 2003
>-+++ sample-etc_dhclient-exit-hooks	Thu Aug  7 14:38:38 2003
>+--- sample-etc_dhclient-exit-hooks.orig	Sun Oct 24 03:51:37 2004
>++++ sample-etc_dhclient-exit-hooks	Sun Oct 24 03:52:20 2004
> @@ -2,10 +2,10 @@
>  ######################################################################
>- ## $Header: /home/paul/src/ddclient/RCS/sample-etc_dhclient-exit-hooks,v 1.1 2002/11/03 20:20:16 root Exp $
>+ ## $Header: /cvsroot/ddclient/ddclient/sample-etc_dhclient-exit-hooks,v 1.1.1.1 2004/08/13 22:29:17 wimpunk Exp $
>  ######################################################################
> -# The /etc/dhclient-enter-hooks script is run by the ISC DHCP client's standard
> +# The /etc/dhclient-exit-hooks script is run by the ISC DHCP client's standard
>@@ -26,19 +26,19 @@
>  case "$new_ip_address" in
>  10.*)   	;;
>  172.1[6-9].* | 172.2[0-9].* | 172.3[0-1].*)	;;
>---- sample-etc_dhcpc_dhcpcd-eth0.exe.orig	Sun Jun 15 03:39:16 2003
>-+++ sample-etc_dhcpc_dhcpcd-eth0.exe	Thu Aug  7 14:33:00 2003
>+--- sample-etc_dhcpc_dhcpcd-eth0.exe.orig	Sun Oct 24 03:52:38 2004
>++++ sample-etc_dhcpc_dhcpcd-eth0.exe	Sun Oct 24 03:52:58 2004
> @@ -2,7 +2,7 @@
>  ######################################################################
>- ## $Header: /home/paul/src/ddclient/RCS/sample-etc_dhcpc_dhcpcd-eth0.exe,v 3.6 2002/11/03 20:20:16 root Exp $
>+ ## $Header: /cvsroot/ddclient/ddclient/sample-etc_dhcpc_dhcpcd-eth0.exe,v 1.1 2004/10/07 19:19:37 wimpunk Exp $
>  ######################################################################
> -PATH=/usr/sbin:${PATH}
> +PATH=%%PREFIX%%/sbin:${PATH}
>  
>  ## update the DNS server unless the IP address is a private address
>  ## that may be used as a internal LAN address. This may be true if
>---- sample-etc_ppp_ip-up.local.orig	Sun Jun 15 03:39:16 2003
>-+++ sample-etc_ppp_ip-up.local	Thu Aug  7 14:33:32 2003
>+--- sample-etc_ppp_ip-up.local.orig	Sun Oct 24 03:53:15 2004
>++++ sample-etc_ppp_ip-up.local	Sun Oct 24 03:54:06 2004
> @@ -16,7 +16,7 @@
>  ## in the environment as either PPP_LOCAL or IPLOCAL.
>  ##
>diff -ruN ddclient.orig/pkg-descr ddclient/pkg-descr
>--- ddclient.orig/pkg-descr	Sun Oct 24 03:30:42 2004
>+++ ddclient/pkg-descr	Sun Oct 24 04:51:16 2004
>@@ -1,4 +1,4 @@
> ddclient is a Perl client used to update dynamic DNS entries for
> accounts on many dynamic DNS services.
> 
>-WWW: http://members.rogers.com/ddclient/pub/
>+WWW: http://ddclient.sourceforge.net/
>diff -ruN ddclient.orig/pkg-message ddclient/pkg-message
>--- ddclient.orig/pkg-message	Sun Oct 24 03:30:42 2004
>+++ ddclient/pkg-message	Sun Oct 24 04:50:13 2004
>@@ -8,12 +8,10 @@
> 
> and edit it to fit your needs.
> 
>-If you would like to run ddclient as a daemon consider
>-copying
>+If you would like to run ddclient as a daemon add the
>+following line to /etc/rc.conf
> 
>-	/usr/local/etc/rc.d/ddclient.sh.sample
>-to
>-	/usr/local/etc/rc.d/ddclient.sh
>+	ddclient_enable="YES"
> 
> ***********************************************************
> 
>diff -ruN ddclient.orig/pkg-plist ddclient/pkg-plist
>--- ddclient.orig/pkg-plist	Sun Oct 24 03:30:42 2004
>+++ ddclient/pkg-plist	Sun Oct 24 04:49:17 2004
>@@ -1,5 +1,5 @@
> etc/ddclient.conf.sample
>-etc/rc.d/ddclient.sh.sample
>+etc/rc.d/ddclient.sh
> sbin/ddclient
> share/ddclient/COPYING
> share/ddclient/COPYRIGHT

Actions: View | Diff

Attachments on bug 73059: 47697