Date: Sat, 12 Mar 2011 04:43:52 GMT From: Rob Farmer <rfarmer@predatorlabs.net> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/155486: [maintainer] [patch] dns/ddclient Two fixes Message-ID: <201103120443.p2C4hq6b097861@red.freebsd.org> Resent-Message-ID: <201103120450.p2C4oBkH037064@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 155486 >Category: ports >Synopsis: [maintainer] [patch] dns/ddclient Two fixes >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Sat Mar 12 04:50:10 UTC 2011 >Closed-Date: >Last-Modified: >Originator: Rob Farmer >Release: 9.0-CURRENT >Organization: >Environment: FreeBSD turquoise.predatorlabs.net 9.0-CURRENT FreeBSD 9.0-CURRENT #0: Fri Mar 4 15:10:24 PST 2011 rfarmer@turquoise.predatorlabs.net:/usr/obj/usr/src/sys/TURQUOISE amd64 >Description: -Fix with non-standard PREFIX/LOCALBASE -Fix error with undefined variables on some services. This is upstream ticket #2: [1] http://sourceforge.net/apps/trac/ddclient/ticket/2 Reported and tested by: Pavel Kolomensky <forsite at gmail.com> [1] >How-To-Repeat: >Fix: Patch attached with submission follows: Index: Makefile =================================================================== RCS file: /home/ncvs/ports/dns/ddclient/Makefile,v retrieving revision 1.26 diff -u -r1.26 Makefile --- Makefile 10 Mar 2011 01:20:38 -0000 1.26 +++ Makefile 11 Mar 2011 08:18:48 -0000 @@ -7,7 +7,7 @@ PORTNAME= ddclient PORTVERSION= 3.8.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= dns MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION} @@ -35,11 +35,13 @@ post-patch: @${GREP} -lr '/usr' ${WRKSRC} | ${XARGS} ${REINPLACE_CMD} -e 's|/usr|${PREFIX}|g' @${REINPLACE_CMD} \ - -e 's|/etc/ddclient|${PREFIX}/etc|' \ -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' ${WRKSRC}/ddclient + -e 's|/usr.*perl|${PERL}|g' \ + -e 's|/usr/local|${LOCALBASE}|g' \ + -e 's|/etc/ddclient|${PREFIX}/etc|' \ + ${WRKSRC}/ddclient do-install: @${INSTALL_DATA} ${WRKSRC}/sample-etc_ddclient.conf ${PREFIX}/etc/ddclient.conf.sample Index: files/patch-ticket2 =================================================================== RCS file: files/patch-ticket2 diff -N files/patch-ticket2 --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/patch-ticket2 11 Mar 2011 08:05:00 -0000 @@ -0,0 +1,21 @@ +--- 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; + >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201103120443.p2C4hq6b097861>