From owner-freebsd-ports-bugs@FreeBSD.ORG Thu Jan 29 14:50:12 2004 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7C15916A4CE for ; Thu, 29 Jan 2004 14:50:12 -0800 (PST) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id AE96A43D31 for ; Thu, 29 Jan 2004 14:50:07 -0800 (PST) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) i0TMo7FR056320 for ; Thu, 29 Jan 2004 14:50:07 -0800 (PST) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.10/8.12.10/Submit) id i0TMo7ic056319; Thu, 29 Jan 2004 14:50:07 -0800 (PST) (envelope-from gnats) Resent-Date: Thu, 29 Jan 2004 14:50:07 -0800 (PST) Resent-Message-Id: <200401292250.i0TMo7ic056319@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Steven Honson Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1D8A616A4CE for ; Thu, 29 Jan 2004 14:40:36 -0800 (PST) Received: from stormtrooper.enumerati.org (stormtrooper.enumerati.org [203.31.212.10]) by mx1.FreeBSD.org (Postfix) with ESMTP id BAC4543D2F for ; Thu, 29 Jan 2004 14:40:31 -0800 (PST) (envelope-from shonson@stormtrooper.enumerati.org) Received: (qmail 83893 invoked by uid 1004); 29 Jan 2004 22:38:13 -0000 Message-Id: <20040129223813.83892.qmail@stormtrooper.enumerati.org> Date: 29 Jan 2004 22:38:13 -0000 From: Steven Honson To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: ports/62083: [maintainer update] dns/dnsmasq update to version 2.1 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: Steven Honson List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 29 Jan 2004 22:50:12 -0000 >Number: 62083 >Category: ports >Synopsis: [maintainer update] dns/dnsmasq update to version 2.1 >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Thu Jan 29 14:50:06 PST 2004 >Closed-Date: >Last-Modified: >Originator: Steven Honson >Release: FreeBSD 5.1-RELEASE-p10 i386 >Organization: >Environment: >Description: Maintainer update to version 2.1 >How-To-Repeat: >Fix: --- dnsmasq-2.1.patch begins here --- diff -ruN /usr/ports/dns/dnsmasq/Makefile /usr/home/shonson/dnsmasq/Makefile --- /usr/ports/dns/dnsmasq/Makefile Tue Nov 11 00:44:27 2003 +++ /usr/home/shonson/dnsmasq/Makefile Fri Jan 30 09:17:49 2004 @@ -1,16 +1,16 @@ # New ports collection makefile for: dnsmasq # Date created: 1 June 2003 -# Whom: Steven Honson +# Whom: Steven Honson # # $FreeBSD: ports/dns/dnsmasq/Makefile,v 1.5 2003/11/10 13:26:57 leeym Exp $ # PORTNAME= dnsmasq -PORTVERSION= 1.18 +PORTVERSION= 2.1 CATEGORIES= dns MASTER_SITES= http://www.thekelleys.org.uk/dnsmasq/ -MAINTAINER= shonson@isoproplex.net +MAINTAINER= steven@honson.org COMMENT= A caching DNS forwarder USE_REINPLACE= yes @@ -23,7 +23,8 @@ s|^CFLAGS = -O2|CFLAGS+=-O2|g' ${WRKSRC}/Makefile do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/sbin + ${INSTALL_PROGRAM} ${WRKSRC}/src/dnsmasq ${PREFIX}/sbin + ${INSTALL_DATA} ${WRKSRC}/dnsmasq.conf.example ${PREFIX}/etc/dnsmasq.conf.example ${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.8 ${PREFIX}/man/man8 .include diff -ruN /usr/ports/dns/dnsmasq/distinfo /usr/home/shonson/dnsmasq/distinfo --- /usr/ports/dns/dnsmasq/distinfo Tue Nov 11 00:44:27 2003 +++ /usr/home/shonson/dnsmasq/distinfo Fri Jan 30 09:04:21 2004 @@ -1 +1 @@ -MD5 (dnsmasq-1.18.tar.gz) = a90478d2248009ada61ed5bee87c034c +MD5 (dnsmasq-2.1.tar.gz) = 9883dc9f3b984b1f174bce6b40f62ec2 diff -ruN /usr/ports/dns/dnsmasq/files/patch-config.h /usr/home/shonson/dnsmasq/files/patch-config.h --- /usr/ports/dns/dnsmasq/files/patch-config.h Thu Jan 1 11:00:00 1970 +++ /usr/home/shonson/dnsmasq/files/patch-config.h Fri Jan 30 09:15:29 2004 @@ -0,0 +1,11 @@ +--- src/config.h.orig Fri Jan 30 09:09:52 2004 ++++ src/config.h Fri Jan 30 09:10:09 2004 +@@ -19,7 +19,7 @@ + #define LOGRATE 120 /* log table overflows every LOGRATE seconds */ + #define CACHESIZ 150 /* default cache size */ + #define SMALLDNAME 40 /* most domain names are smaller than this */ +-#define CONFFILE "/etc/dnsmasq.conf" ++#define CONFFILE "/usr/local/etc/dnsmasq.conf" + #define HOSTSFILE "/etc/hosts" + #ifdef __uClinux__ + # define RESOLVFILE "/etc/config/resolv.conf" diff -ruN /usr/ports/dns/dnsmasq/files/patch-dnsmasq.8 /usr/home/shonson/dnsmasq/files/patch-dnsmasq.8 --- /usr/ports/dns/dnsmasq/files/patch-dnsmasq.8 Thu Jan 1 11:00:00 1970 +++ /usr/home/shonson/dnsmasq/files/patch-dnsmasq.8 Fri Jan 30 09:24:14 2004 @@ -0,0 +1,51 @@ +--- dnsmasq.8.orig Tue Jan 27 06:13:09 2004 ++++ dnsmasq.8 Fri Jan 30 09:23:54 2004 +@@ -132,7 +132,7 @@ + .TP + .B \-R, --no-resolv + Don't read /etc/resolv.conf. Get upstream servers only from the command +-line or /etc/dnsmasq.conf. ++line or /usr/local/etc/dnsmasq.conf. + .TP + .B \-o, --strict-order + By default, dnsmasq will send queries to any of the upstream servers +@@ -307,10 +307,10 @@ + Add the domain-suffix to simple names (without a period) in /etc/hosts + in the same way as for DHCP-derived names. + .SH CONFIG FILE +-At startup, dnsmasq reads /etc/dnsmasq.conf, if it exists. The format of this ++At startup, dnsmasq reads /usr/local/etc/dnsmasq.conf, if it exists. The format of this + file consists of one option per line, exactly as the long options detailed + in the OPTIONS section but without the leading "--". Lines starting with # are comments and ignored. For +-options which may only be specified once, /etc/dnsmasq.conf overrides ++options which may only be specified once, /usr/local/etc/dnsmasq.conf overrides + the command line. Use the --conf-file option to specify a different + configuration file. + .SH NOTES +@@ -320,7 +320,7 @@ + .B + --no-poll + is set SIGHUP also re-reads /etc/resolv.conf. SIGHUP +-does NOT re-read /etc/dnsmasq.conf. ++does NOT re-read /usr/local/etc/dnsmasq.conf. + .PP + When it receives a SIGUSR1, + .B dnsmasq +@@ -365,7 +365,7 @@ + last, giving automatic switching between DNS servers. + .PP + Upstream servers may also be specified on the command line or in +-/etc/dnsmasq.conf. These server specifications optionally take a ++/usr/local/etc/dnsmasq.conf. These server specifications optionally take a + domain name which tells dnsmasq to use that server only to find names + in that particular domain. + .PP +@@ -382,7 +382,7 @@ + option. This second technique allows for dynamic update of the server + addresses by PPP or DHCP. + .SH FILES +-.IR /etc/dnsmasq.conf ++.IR /usr/local/etc/dnsmasq.conf + + .IR /etc/resolv.conf + diff -ruN /usr/ports/dns/dnsmasq/pkg-descr /usr/home/shonson/dnsmasq/pkg-descr --- /usr/ports/dns/dnsmasq/pkg-descr Tue Jun 3 12:03:40 2003 +++ /usr/home/shonson/dnsmasq/pkg-descr Fri Jan 30 09:02:19 2004 @@ -7,4 +7,4 @@ WWW: http://www.thekelleys.org.uk/dnsmasq/doc.html - Steven Honson -shonson@isoproplex.net +steven@honson.org diff -ruN /usr/ports/dns/dnsmasq/pkg-plist /usr/home/shonson/dnsmasq/pkg-plist --- /usr/ports/dns/dnsmasq/pkg-plist Tue Jun 3 12:03:40 2003 +++ /usr/home/shonson/dnsmasq/pkg-plist Fri Jan 30 09:28:09 2004 @@ -1 +1,2 @@ +etc/dnsmasq.conf.example sbin/dnsmasq --- dnsmasq-2.1.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: