Re: WIP: dnsmasq 2.61rc1

2012-04-27 Thread Brad Smith 
On Thu, Apr 05, 2012 at 12:28:48PM -0400, Brad Smith wrote:
 dnsmasq 2.61 is close to the next release. This release has had a number of
 improvements and some bug fixes mainly with the new DHCPv6 and RA support.
 The ra-names feature now works on OpenBSD.
 
 Here is rc1 for anyone using dnsmasq that is interested in helping out
 test this and provide any feedback to the author.
 
Here is an updated diff for the rc4 release.

While testing the TFTP server with the pending IPv6 support diff for
tftp(1) I found that the TFTP server was broken over IPv4 back at
version 2.56 when IPv6 support was added. This has now been fixed.


Index: Makefile
===
RCS file: /cvs/ports/net/dnsmasq/Makefile,v
retrieving revision 1.21
diff -u -p -r1.21 Makefile
--- Makefile25 Oct 2011 10:20:26 -  1.21
+++ Makefile27 Apr 2012 18:43:33 -
@@ -1,10 +1,12 @@
 # $OpenBSD: Makefile,v 1.21 2011/10/25 10:20:26 sthen Exp $
 
-COMMENT=   caching DNS forwarder and DHCP server
+NOT_FOR_ARCHS= ${GCC2_ARCHS}
 
-DISTNAME=  dnsmasq-2.59
+COMMENT=   lightweight caching DNS forwarder, DHCP and TFTP server
+
+DISTNAME=  dnsmasq-2.61rc4
 CATEGORIES=net
-MASTER_SITES=  http://www.thekelleys.org.uk/dnsmasq/
+MASTER_SITES=  http://www.thekelleys.org.uk/dnsmasq/release-candidates/
 
 HOMEPAGE=  http://www.thekelleys.org.uk/dnsmasq/doc.html
 
@@ -27,8 +29,8 @@ pre-build:
${WRKSRC}/dnsmasq.conf.example
 
 do-install:
-   ${INSTALL_PROGRAM} ${WRKSRC}/src/dnsmasq ${PREFIX}/sbin
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/dnsmasq
+   ${INSTALL_PROGRAM} ${WRKSRC}/src/dnsmasq ${PREFIX}/sbin
${INSTALL_DATA} ${WRKSRC}/dnsmasq.conf.example 
${PREFIX}/share/examples/dnsmasq
${INSTALL_MAN} ${WRKSRC}/man/dnsmasq.8 ${PREFIX}/man/man8
 
Index: distinfo
===
RCS file: /cvs/ports/net/dnsmasq/distinfo,v
retrieving revision 1.16
diff -u -p -r1.16 distinfo
--- distinfo25 Oct 2011 10:20:26 -  1.16
+++ distinfo27 Apr 2012 18:43:33 -
@@ -1,5 +1,5 @@
-MD5 (dnsmasq-2.59.tar.gz) = tXV+8te2UXSO7ruIrynX1g==
-RMD160 (dnsmasq-2.59.tar.gz) = 0u2FX0/BcH3zI92sAnq4/QdwuCc=
-SHA1 (dnsmasq-2.59.tar.gz) = kwLzjRLQCCPSDMkScJBQi0h2xa4=
-SHA256 (dnsmasq-2.59.tar.gz) = vcHmYJn6/6sOL9OUwGRscYsk9BfssP8ygzgqIEbxQQs=
-SIZE (dnsmasq-2.59.tar.gz) = 474036
+MD5 (dnsmasq-2.61rc4.tar.gz) = zcTYZlzKwwmWrDx5e8nMwQ==
+RMD160 (dnsmasq-2.61rc4.tar.gz) = mGINzfOloDKyoxfrAZWr/Mm/4Ks=
+SHA1 (dnsmasq-2.61rc4.tar.gz) = 8A1dgRhFebGURqLZfDRA2jlHw5U=
+SHA256 (dnsmasq-2.61rc4.tar.gz) = hPVtSo3Zd1vqsjmSeB116/kCn/xmF7blAnzy2/XJU+8=
+SIZE (dnsmasq-2.61rc4.tar.gz) = 547656
Index: patches/patch-dnsmasq_conf_example
===
RCS file: /cvs/ports/net/dnsmasq/patches/patch-dnsmasq_conf_example,v
retrieving revision 1.1
diff -u -p -r1.1 patch-dnsmasq_conf_example
--- patches/patch-dnsmasq_conf_example  14 Jun 2009 17:07:25 -  1.1
+++ patches/patch-dnsmasq_conf_example  27 Apr 2012 18:43:33 -
@@ -1,6 +1,6 @@
 $OpenBSD: patch-dnsmasq_conf_example,v 1.1 2009/06/14 17:07:25 kili Exp $
 dnsmasq.conf.example.orig  Mon Jun  8 23:05:30 2009
-+++ dnsmasq.conf.example   Sat Jun 13 12:34:06 2009
+--- dnsmasq.conf.example.orig  Mon Apr 16 12:26:19 2012
 dnsmasq.conf.example   Mon Apr 16 20:42:36 2012
 @@ -2,7 +2,7 @@
  #
  # Format is one option per line, legal options are the same
@@ -8,5 +8,5 @@ $OpenBSD: patch-dnsmasq_conf_example,v 1
 -# /usr/sbin/dnsmasq --help or man 8 dnsmasq for details.
 +# ${LOCALBASE}/sbin/dnsmasq --help or man 8 dnsmasq for details.
  
- # The following two options make you a better netizen, since they
- # tell dnsmasq to filter out queries which the public DNS cannot
+ # Listen on this specific port instead of the standard DNS port
+ # (53). Setting this to zero completely disables DNS function,
Index: patches/patch-man_dnsmasq_8
===
RCS file: /cvs/ports/net/dnsmasq/patches/patch-man_dnsmasq_8,v
retrieving revision 1.10
diff -u -p -r1.10 patch-man_dnsmasq_8
--- patches/patch-man_dnsmasq_8 7 Sep 2011 10:34:26 -   1.10
+++ patches/patch-man_dnsmasq_8 27 Apr 2012 18:43:33 -
@@ -1,6 +1,6 @@
 $OpenBSD: patch-man_dnsmasq_8,v 1.10 2011/09/07 10:34:26 jasper Exp $
 man/dnsmasq.8.orig Tue Aug  9 11:05:38 2011
-+++ man/dnsmasq.8  Mon Aug 29 17:35:40 2011
+--- man/dnsmasq.8.orig Fri Apr 20 16:28:49 2012
 man/dnsmasq.8  Fri Apr 20 23:04:18 2012
 @@ -113,13 +113,12 @@ Specify an alternate path for dnsmasq to record its pr
  .TP
  .B \-u, --user=username
@@ -17,7 +17,7 @@ $OpenBSD: patch-man_dnsmasq_8,v 1.10 201
  .TP
  .B \-v, --version
  Print the version number.
-@@ -1206,7 +1205,7 @@ with # are always skipped. This flag may be given on t
+@@ -1430,7 +1429,7 @@ with # are always skipped. This flag may be

WIP: dnsmasq 2.61rc1

2012-04-05 Thread Brad Smith 
dnsmasq 2.61 is close to the next release. This release has had a number of
improvements and some bug fixes mainly with the new DHCPv6 and RA support.
The ra-names feature now works on OpenBSD.

Here is rc1 for anyone using dnsmasq that is interested in helping out
test this and provide any feedback to the author.


Index: Makefile
===
RCS file: /cvs/ports/net/dnsmasq/Makefile,v
retrieving revision 1.21
diff -u -p -r1.21 Makefile
--- Makefile25 Oct 2011 10:20:26 -  1.21
+++ Makefile5 Apr 2012 16:22:47 -
@@ -1,10 +1,10 @@
 # $OpenBSD: Makefile,v 1.21 2011/10/25 10:20:26 sthen Exp $
 
-COMMENT=   caching DNS forwarder and DHCP server
+COMMENT=   lightweight caching DNS forwarder, DHCP and TFTP server
 
-DISTNAME=  dnsmasq-2.59
+DISTNAME=  dnsmasq-2.61rc1
 CATEGORIES=net
-MASTER_SITES=  http://www.thekelleys.org.uk/dnsmasq/
+MASTER_SITES=  http://www.thekelleys.org.uk/dnsmasq/release-candidates/
 
 HOMEPAGE=  http://www.thekelleys.org.uk/dnsmasq/doc.html
 
@@ -27,8 +27,8 @@ pre-build:
${WRKSRC}/dnsmasq.conf.example
 
 do-install:
-   ${INSTALL_PROGRAM} ${WRKSRC}/src/dnsmasq ${PREFIX}/sbin
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/dnsmasq
+   ${INSTALL_PROGRAM} ${WRKSRC}/src/dnsmasq ${PREFIX}/sbin
${INSTALL_DATA} ${WRKSRC}/dnsmasq.conf.example 
${PREFIX}/share/examples/dnsmasq
${INSTALL_MAN} ${WRKSRC}/man/dnsmasq.8 ${PREFIX}/man/man8
 
Index: distinfo
===
RCS file: /cvs/ports/net/dnsmasq/distinfo,v
retrieving revision 1.16
diff -u -p -r1.16 distinfo
--- distinfo25 Oct 2011 10:20:26 -  1.16
+++ distinfo5 Apr 2012 16:22:47 -
@@ -1,5 +1,5 @@
-MD5 (dnsmasq-2.59.tar.gz) = tXV+8te2UXSO7ruIrynX1g==
-RMD160 (dnsmasq-2.59.tar.gz) = 0u2FX0/BcH3zI92sAnq4/QdwuCc=
-SHA1 (dnsmasq-2.59.tar.gz) = kwLzjRLQCCPSDMkScJBQi0h2xa4=
-SHA256 (dnsmasq-2.59.tar.gz) = vcHmYJn6/6sOL9OUwGRscYsk9BfssP8ygzgqIEbxQQs=
-SIZE (dnsmasq-2.59.tar.gz) = 474036
+MD5 (dnsmasq-2.61rc1.tar.gz) = xE3HGqgfU5egP1AcXNtS8g==
+RMD160 (dnsmasq-2.61rc1.tar.gz) = yWMX85ClrZr1yZi2D5v8pfA4ILU=
+SHA1 (dnsmasq-2.61rc1.tar.gz) = vJOnx47TYfjriRROSTyrt4yqngA=
+SHA256 (dnsmasq-2.61rc1.tar.gz) = XelV6k89kUBsm1VJX1Qjx2L3aCzbTZRg4r7uZyhBFOI=
+SIZE (dnsmasq-2.61rc1.tar.gz) = 544897
Index: patches/patch-man_dnsmasq_8
===
RCS file: /cvs/ports/net/dnsmasq/patches/patch-man_dnsmasq_8,v
retrieving revision 1.10
diff -u -p -r1.10 patch-man_dnsmasq_8
--- patches/patch-man_dnsmasq_8 7 Sep 2011 10:34:26 -   1.10
+++ patches/patch-man_dnsmasq_8 5 Apr 2012 16:22:47 -
@@ -1,6 +1,6 @@
 $OpenBSD: patch-man_dnsmasq_8,v 1.10 2011/09/07 10:34:26 jasper Exp $
 man/dnsmasq.8.orig Tue Aug  9 11:05:38 2011
-+++ man/dnsmasq.8  Mon Aug 29 17:35:40 2011
+--- man/dnsmasq.8.orig Sat Mar 31 16:35:12 2012
 man/dnsmasq.8  Sat Mar 31 21:50:13 2012
 @@ -113,13 +113,12 @@ Specify an alternate path for dnsmasq to record its pr
  .TP
  .B \-u, --user=username
@@ -17,7 +17,7 @@ $OpenBSD: patch-man_dnsmasq_8,v 1.10 201
  .TP
  .B \-v, --version
  Print the version number.
-@@ -1206,7 +1205,7 @@ with # are always skipped. This flag may be given on t
+@@ -1420,7 +1419,7 @@ with # are always skipped. This flag may be given on t
  line or in a configuration file.
  .SH CONFIG FILE
  At startup, dnsmasq reads
@@ -26,7 +26,7 @@ $OpenBSD: patch-man_dnsmasq_8,v 1.10 201
  if it exists. (On
  FreeBSD, the file is 
  .I /usr/local/etc/dnsmasq.conf
-@@ -1524,7 +1523,7 @@ dnsmasq has no direct way of determining the charset i
+@@ -1738,7 +1737,7 @@ dnsmasq has no direct way of determining the charset i
  assume that it is the system default. 
   
  .SH FILES
Index: patches/patch-src_config_h
===
RCS file: /cvs/ports/net/dnsmasq/patches/patch-src_config_h,v
retrieving revision 1.8
diff -u -p -r1.8 patch-src_config_h
--- patches/patch-src_config_h  6 Mar 2011 11:19:53 -   1.8
+++ patches/patch-src_config_h  5 Apr 2012 16:22:47 -
@@ -1,7 +1,18 @@
 $OpenBSD: patch-src_config_h,v 1.8 2011/03/06 11:19:53 sthen Exp $
 src/config.h.orig  Fri Feb 18 05:18:39 2011
-+++ src/config.h   Fri Feb 18 15:00:08 2011
-@@ -57,13 +57,13 @@
+--- src/config.h.orig  Tue Feb 14 15:55:25 2012
 src/config.h   Wed Feb 15 17:24:57 2012
+@@ -34,8 +34,8 @@
+ #define ETHERSFILE /etc/ethers
+ #define RUNFILE /var/run/dnsmasq.pid
+ #define DEFLEASE 3600 /* default lease time, 1 hour */
+-#define CHUSER nobody
+-#define CHGRP dip
++#define CHUSER _dnsmasq
++#define CHGRP _dnsmasq
+ #define TFTP_MAX_CONNECTIONS 50 /* max simultaneous connections */
+ #define LOG_MAX 5 /* log-queue length */
+ #define RANDFILE /dev/urandom
+@@ -145,7 +145,7 @@ RESOLVFILE
  #   if defined(__FreeBSD__)
  #  define CONFFILE /usr/local/etc/dnsmasq.conf

Re: WIP: dnsmasq 2.61rc1

2012-04-05 Thread Brad Smith 
On Thu, Apr 05, 2012 at 12:28:48PM -0400, Brad Smith wrote:
 dnsmasq 2.61 is close to the next release. This release has had a number of
 improvements and some bug fixes mainly with the new DHCPv6 and RA support.
 The ra-names feature now works on OpenBSD.
 
 Here is rc1 for anyone using dnsmasq that is interested in helping out
 test this and provide any feedback to the author.

An updated diff with fixes mentioned by Stuart to use TRUEPREFIX in the
rc.d script and a tweak to DESCR.


Index: Makefile
===
RCS file: /cvs/ports/net/dnsmasq/Makefile,v
retrieving revision 1.21
diff -u -p -r1.21 Makefile
--- Makefile25 Oct 2011 10:20:26 -  1.21
+++ Makefile5 Apr 2012 17:05:48 -
@@ -1,10 +1,10 @@
 # $OpenBSD: Makefile,v 1.21 2011/10/25 10:20:26 sthen Exp $
 
-COMMENT=   caching DNS forwarder and DHCP server
+COMMENT=   lightweight caching DNS forwarder, DHCP and TFTP server
 
-DISTNAME=  dnsmasq-2.59
+DISTNAME=  dnsmasq-2.61rc1
 CATEGORIES=net
-MASTER_SITES=  http://www.thekelleys.org.uk/dnsmasq/
+MASTER_SITES=  http://www.thekelleys.org.uk/dnsmasq/release-candidates/
 
 HOMEPAGE=  http://www.thekelleys.org.uk/dnsmasq/doc.html
 
@@ -27,8 +27,8 @@ pre-build:
${WRKSRC}/dnsmasq.conf.example
 
 do-install:
-   ${INSTALL_PROGRAM} ${WRKSRC}/src/dnsmasq ${PREFIX}/sbin
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/dnsmasq
+   ${INSTALL_PROGRAM} ${WRKSRC}/src/dnsmasq ${PREFIX}/sbin
${INSTALL_DATA} ${WRKSRC}/dnsmasq.conf.example 
${PREFIX}/share/examples/dnsmasq
${INSTALL_MAN} ${WRKSRC}/man/dnsmasq.8 ${PREFIX}/man/man8
 
Index: distinfo
===
RCS file: /cvs/ports/net/dnsmasq/distinfo,v
retrieving revision 1.16
diff -u -p -r1.16 distinfo
--- distinfo25 Oct 2011 10:20:26 -  1.16
+++ distinfo5 Apr 2012 17:05:48 -
@@ -1,5 +1,5 @@
-MD5 (dnsmasq-2.59.tar.gz) = tXV+8te2UXSO7ruIrynX1g==
-RMD160 (dnsmasq-2.59.tar.gz) = 0u2FX0/BcH3zI92sAnq4/QdwuCc=
-SHA1 (dnsmasq-2.59.tar.gz) = kwLzjRLQCCPSDMkScJBQi0h2xa4=
-SHA256 (dnsmasq-2.59.tar.gz) = vcHmYJn6/6sOL9OUwGRscYsk9BfssP8ygzgqIEbxQQs=
-SIZE (dnsmasq-2.59.tar.gz) = 474036
+MD5 (dnsmasq-2.61rc1.tar.gz) = xE3HGqgfU5egP1AcXNtS8g==
+RMD160 (dnsmasq-2.61rc1.tar.gz) = yWMX85ClrZr1yZi2D5v8pfA4ILU=
+SHA1 (dnsmasq-2.61rc1.tar.gz) = vJOnx47TYfjriRROSTyrt4yqngA=
+SHA256 (dnsmasq-2.61rc1.tar.gz) = XelV6k89kUBsm1VJX1Qjx2L3aCzbTZRg4r7uZyhBFOI=
+SIZE (dnsmasq-2.61rc1.tar.gz) = 544897
Index: patches/patch-man_dnsmasq_8
===
RCS file: /cvs/ports/net/dnsmasq/patches/patch-man_dnsmasq_8,v
retrieving revision 1.10
diff -u -p -r1.10 patch-man_dnsmasq_8
--- patches/patch-man_dnsmasq_8 7 Sep 2011 10:34:26 -   1.10
+++ patches/patch-man_dnsmasq_8 5 Apr 2012 17:05:48 -
@@ -1,6 +1,6 @@
 $OpenBSD: patch-man_dnsmasq_8,v 1.10 2011/09/07 10:34:26 jasper Exp $
 man/dnsmasq.8.orig Tue Aug  9 11:05:38 2011
-+++ man/dnsmasq.8  Mon Aug 29 17:35:40 2011
+--- man/dnsmasq.8.orig Sat Mar 31 16:35:12 2012
 man/dnsmasq.8  Sat Mar 31 21:50:13 2012
 @@ -113,13 +113,12 @@ Specify an alternate path for dnsmasq to record its pr
  .TP
  .B \-u, --user=username
@@ -17,7 +17,7 @@ $OpenBSD: patch-man_dnsmasq_8,v 1.10 201
  .TP
  .B \-v, --version
  Print the version number.
-@@ -1206,7 +1205,7 @@ with # are always skipped. This flag may be given on t
+@@ -1420,7 +1419,7 @@ with # are always skipped. This flag may be given on t
  line or in a configuration file.
  .SH CONFIG FILE
  At startup, dnsmasq reads
@@ -26,7 +26,7 @@ $OpenBSD: patch-man_dnsmasq_8,v 1.10 201
  if it exists. (On
  FreeBSD, the file is 
  .I /usr/local/etc/dnsmasq.conf
-@@ -1524,7 +1523,7 @@ dnsmasq has no direct way of determining the charset i
+@@ -1738,7 +1737,7 @@ dnsmasq has no direct way of determining the charset i
  assume that it is the system default. 
   
  .SH FILES
Index: patches/patch-src_config_h
===
RCS file: /cvs/ports/net/dnsmasq/patches/patch-src_config_h,v
retrieving revision 1.8
diff -u -p -r1.8 patch-src_config_h
--- patches/patch-src_config_h  6 Mar 2011 11:19:53 -   1.8
+++ patches/patch-src_config_h  5 Apr 2012 17:05:48 -
@@ -1,7 +1,18 @@
 $OpenBSD: patch-src_config_h,v 1.8 2011/03/06 11:19:53 sthen Exp $
 src/config.h.orig  Fri Feb 18 05:18:39 2011
-+++ src/config.h   Fri Feb 18 15:00:08 2011
-@@ -57,13 +57,13 @@
+--- src/config.h.orig  Tue Feb 14 15:55:25 2012
 src/config.h   Wed Feb 15 17:24:57 2012
+@@ -34,8 +34,8 @@
+ #define ETHERSFILE /etc/ethers
+ #define RUNFILE /var/run/dnsmasq.pid
+ #define DEFLEASE 3600 /* default lease time, 1 hour */
+-#define CHUSER nobody
+-#define CHGRP dip
++#define CHUSER _dnsmasq
++#define CHGRP _dnsmasq
+ #define TFTP_MAX_CONNECTIONS 50 /* max simultaneous connections */
+ #define LOG_MAX

Re: WIP: dnsmasq 2.61rc1

2012-04-05 Thread Gonzalo L. R. 
working fine on i386, rc.d(8) script also.

El 04/05/12 14:08, Brad Smith escribió:
 Index: Makefile
 ===
 RCS file: /cvs/ports/net/dnsmasq/Makefile,v
 retrieving revision 1.21
 diff -u -p -r1.21 Makefile
 --- Makefile  25 Oct 2011 10:20:26 -  1.21
 +++ Makefile  5 Apr 2012 17:05:48 -
 @@ -1,10 +1,10 @@
  # $OpenBSD: Makefile,v 1.21 2011/10/25 10:20:26 sthen Exp $
  
 -COMMENT= caching DNS forwarder and DHCP server
 +COMMENT= lightweight caching DNS forwarder, DHCP and TFTP server
  
 -DISTNAME=dnsmasq-2.59
 +DISTNAME=dnsmasq-2.61rc1
  CATEGORIES=  net
 -MASTER_SITES=http://www.thekelleys.org.uk/dnsmasq/
 +MASTER_SITES=http://www.thekelleys.org.uk/dnsmasq/release-candidates/
  
  HOMEPAGE=http://www.thekelleys.org.uk/dnsmasq/doc.html
  
 @@ -27,8 +27,8 @@ pre-build:
   ${WRKSRC}/dnsmasq.conf.example
  
  do-install:
 - ${INSTALL_PROGRAM} ${WRKSRC}/src/dnsmasq ${PREFIX}/sbin
   ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/dnsmasq
 + ${INSTALL_PROGRAM} ${WRKSRC}/src/dnsmasq ${PREFIX}/sbin
   ${INSTALL_DATA} ${WRKSRC}/dnsmasq.conf.example 
 ${PREFIX}/share/examples/dnsmasq
   ${INSTALL_MAN} ${WRKSRC}/man/dnsmasq.8 ${PREFIX}/man/man8
  
 Index: distinfo
 ===
 RCS file: /cvs/ports/net/dnsmasq/distinfo,v
 retrieving revision 1.16
 diff -u -p -r1.16 distinfo
 --- distinfo  25 Oct 2011 10:20:26 -  1.16
 +++ distinfo  5 Apr 2012 17:05:48 -
 @@ -1,5 +1,5 @@
 -MD5 (dnsmasq-2.59.tar.gz) = tXV+8te2UXSO7ruIrynX1g==
 -RMD160 (dnsmasq-2.59.tar.gz) = 0u2FX0/BcH3zI92sAnq4/QdwuCc=
 -SHA1 (dnsmasq-2.59.tar.gz) = kwLzjRLQCCPSDMkScJBQi0h2xa4=
 -SHA256 (dnsmasq-2.59.tar.gz) = vcHmYJn6/6sOL9OUwGRscYsk9BfssP8ygzgqIEbxQQs=
 -SIZE (dnsmasq-2.59.tar.gz) = 474036
 +MD5 (dnsmasq-2.61rc1.tar.gz) = xE3HGqgfU5egP1AcXNtS8g==
 +RMD160 (dnsmasq-2.61rc1.tar.gz) = yWMX85ClrZr1yZi2D5v8pfA4ILU=
 +SHA1 (dnsmasq-2.61rc1.tar.gz) = vJOnx47TYfjriRROSTyrt4yqngA=
 +SHA256 (dnsmasq-2.61rc1.tar.gz) = 
 XelV6k89kUBsm1VJX1Qjx2L3aCzbTZRg4r7uZyhBFOI=
 +SIZE (dnsmasq-2.61rc1.tar.gz) = 544897
 Index: patches/patch-man_dnsmasq_8
 ===
 RCS file: /cvs/ports/net/dnsmasq/patches/patch-man_dnsmasq_8,v
 retrieving revision 1.10
 diff -u -p -r1.10 patch-man_dnsmasq_8
 --- patches/patch-man_dnsmasq_8   7 Sep 2011 10:34:26 -   1.10
 +++ patches/patch-man_dnsmasq_8   5 Apr 2012 17:05:48 -
 @@ -1,6 +1,6 @@
  $OpenBSD: patch-man_dnsmasq_8,v 1.10 2011/09/07 10:34:26 jasper Exp $
  man/dnsmasq.8.orig   Tue Aug  9 11:05:38 2011
 -+++ man/dnsmasq.8Mon Aug 29 17:35:40 2011
 +--- man/dnsmasq.8.orig   Sat Mar 31 16:35:12 2012
  man/dnsmasq.8Sat Mar 31 21:50:13 2012
  @@ -113,13 +113,12 @@ Specify an alternate path for dnsmasq to record its pr
   .TP
   .B \-u, --user=username
 @@ -17,7 +17,7 @@ $OpenBSD: patch-man_dnsmasq_8,v 1.10 201
   .TP
   .B \-v, --version
   Print the version number.
 -@@ -1206,7 +1205,7 @@ with # are always skipped. This flag may be given on t
 +@@ -1420,7 +1419,7 @@ with # are always skipped. This flag may be given on t
   line or in a configuration file.
   .SH CONFIG FILE
   At startup, dnsmasq reads
 @@ -26,7 +26,7 @@ $OpenBSD: patch-man_dnsmasq_8,v 1.10 201
   if it exists. (On
   FreeBSD, the file is 
   .I /usr/local/etc/dnsmasq.conf
 -@@ -1524,7 +1523,7 @@ dnsmasq has no direct way of determining the charset i
 +@@ -1738,7 +1737,7 @@ dnsmasq has no direct way of determining the charset i
   assume that it is the system default. 

   .SH FILES
 Index: patches/patch-src_config_h
 ===
 RCS file: /cvs/ports/net/dnsmasq/patches/patch-src_config_h,v
 retrieving revision 1.8
 diff -u -p -r1.8 patch-src_config_h
 --- patches/patch-src_config_h6 Mar 2011 11:19:53 -   1.8
 +++ patches/patch-src_config_h5 Apr 2012 17:05:48 -
 @@ -1,7 +1,18 @@
  $OpenBSD: patch-src_config_h,v 1.8 2011/03/06 11:19:53 sthen Exp $
  src/config.h.origFri Feb 18 05:18:39 2011
 -+++ src/config.h Fri Feb 18 15:00:08 2011
 -@@ -57,13 +57,13 @@
 +--- src/config.h.origTue Feb 14 15:55:25 2012
  src/config.h Wed Feb 15 17:24:57 2012
 +@@ -34,8 +34,8 @@
 + #define ETHERSFILE /etc/ethers
 + #define RUNFILE /var/run/dnsmasq.pid
 + #define DEFLEASE 3600 /* default lease time, 1 hour */
 +-#define CHUSER nobody
 +-#define CHGRP dip
 ++#define CHUSER _dnsmasq
 ++#define CHGRP _dnsmasq
 + #define TFTP_MAX_CONNECTIONS 50 /* max simultaneous connections */
 + #define LOG_MAX 5 /* log-queue length */
 + #define RANDFILE /dev/urandom
 +@@ -145,7 +145,7 @@ RESOLVFILE
   #   if defined(__FreeBSD__)
   #  define CONFFILE /usr/local/etc/dnsmasq.conf
   #   else
 @@ -10,11 +21,3 @@ $OpenBSD: patch-src_config_h,v 1.8 2011/
   #   endif
   #endif