ports/62083: [maintainer update] dns/dnsmasq update to version 2.1

Thu Jan 29 22:50:12 UTC 2004

>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 <shonson at isoproplex.net>
+# Whom:					Steven Honson <steven at honson.org>
 #
 # $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 at isoproplex.net
+MAINTAINER=	steven at 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 <bsd.port.mk>
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 at isoproplex.net
+steven at 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:
 

