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 -0000 1.21 > +++ Makefile 5 Apr 2012 17:05:48 -0000 > @@ -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 -0000 1.16 > +++ distinfo 5 Apr 2012 17:05:48 -0000 > @@ -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 -0000 1.10 > +++ patches/patch-man_dnsmasq_8 5 Apr 2012 17:05:48 -0000 > @@ -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 -0000 1.8 > +++ patches/patch-src_config_h 5 Apr 2012 17:05:48 -0000 > @@ -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" > # else > @@ -10,11 +21,3 @@ $OpenBSD: patch-src_config_h,v 1.8 2011/ > # endif > #endif > > - #define DEFLEASE 3600 /* default lease time, 1 hour */ > --#define CHUSER "nobody" > --#define CHGRP "dip" > -+#define CHUSER "_dnsmasq" > -+#define CHGRP "_dnsmasq" > - #define NAMESERVER_PORT 53 > - #define DHCP_SERVER_PORT 67 > - #define DHCP_CLIENT_PORT 68 > Index: patches/patch-src_dnsmasq_h > =================================================================== > RCS file: /cvs/ports/net/dnsmasq/patches/patch-src_dnsmasq_h,v > retrieving revision 1.9 > diff -u -p -r1.9 patch-src_dnsmasq_h > --- patches/patch-src_dnsmasq_h 7 Sep 2011 10:34:26 -0000 1.9 > +++ patches/patch-src_dnsmasq_h 5 Apr 2012 17:05:48 -0000 > @@ -2,9 +2,9 @@ $OpenBSD: patch-src_dnsmasq_h,v 1.9 2011 > > gcc2 fix to struct tftp_file > > ---- src/dnsmasq.h.orig Tue Jun 28 12:08:53 2011 > -+++ src/dnsmasq.h Thu Jul 14 17:02:11 2011 > -@@ -596,7 +596,7 @@ struct tftp_file { > +--- src/dnsmasq.h.orig Wed Mar 28 16:15:41 2012 > ++++ src/dnsmasq.h Thu Mar 29 21:12:08 2012 > +@@ -669,7 +669,7 @@ struct tftp_file { > off_t size; > dev_t dev; > ino_t inode; > Index: patches/patch-src_tftp_c > =================================================================== > RCS file: /cvs/ports/net/dnsmasq/patches/patch-src_tftp_c,v > retrieving revision 1.10 > diff -u -p -r1.10 patch-src_tftp_c > --- patches/patch-src_tftp_c 7 Sep 2011 10:34:26 -0000 1.10 > +++ patches/patch-src_tftp_c 5 Apr 2012 17:05:48 -0000 > @@ -2,9 +2,9 @@ $OpenBSD: patch-src_tftp_c,v 1.10 2011/0 > > gcc2 fixes to struct errmess, struct oackmess, struct datamess > > ---- src/tftp.c.orig Tue Aug 9 08:41:48 2011 > -+++ src/tftp.c Mon Aug 29 17:35:40 2011 > -@@ -611,7 +611,7 @@ static ssize_t tftp_err(int err, char *packet, char *m > +--- src/tftp.c.orig Sun Mar 25 15:44:38 2012 > ++++ src/tftp.c Sun Mar 25 16:03:29 2012 > +@@ -625,7 +625,7 @@ static ssize_t tftp_err(int err, char *packet, char *m > { > struct errmess { > unsigned short op, err; > @@ -13,7 +13,7 @@ gcc2 fixes to struct errmess, struct oac > } *mess = (struct errmess *)packet; > ssize_t ret = 4; > char *errstr = strerror(errno); > -@@ -638,7 +638,7 @@ static ssize_t get_block(char *packet, struct tftp_tra > +@@ -652,7 +652,7 @@ static ssize_t get_block(char *packet, struct tftp_tra > char *p; > struct oackmess { > unsigned short op; > @@ -22,7 +22,7 @@ gcc2 fixes to struct errmess, struct oac > } *mess = (struct oackmess *)packet; > > p = mess->data; > -@@ -661,7 +661,7 @@ static ssize_t get_block(char *packet, struct tftp_tra > +@@ -675,7 +675,7 @@ static ssize_t get_block(char *packet, struct tftp_tra > /* send data packet */ > struct datamess { > unsigned short op, block; > Index: pkg/DESCR > =================================================================== > RCS file: /cvs/ports/net/dnsmasq/pkg/DESCR,v > retrieving revision 1.1.1.1 > diff -u -p -r1.1.1.1 DESCR > --- pkg/DESCR 23 May 2005 18:46:58 -0000 1.1.1.1 > +++ pkg/DESCR 5 Apr 2012 17:05:48 -0000 > @@ -1,14 +1,13 @@ > -Dnsmasq is lightweight, easy to configure DNS forwarder and > -DHCP server. It is designed to provide DNS and, optionally, > -DHCP, to a small network. It can serve the names of local > -machines which are not in the global DNS. The DHCP server > -integrates with the DNS server and allows machines with > -DHCP-allocated addresses to appear in the DNS with names > -configured either in each host or in a central configuration > -file. Dnsmasq supports static and dynamic DHCP leases and BOOTP > -for network booting of diskless machines. > +Dnsmasq is a lightweight, easy to configure DNS forwarder and DHCP server. > +It is designed to provide DNS and, optionally, DHCP, to a small network. > +It can serve the names of local machines which are not in the global DNS. > +The DHCP server integrates with the DNS server and allows machines with > +DHCP-allocated addresses to appear in the DNS with names configured either > +in each host or in a central configuration file. Dnsmasq supports static > +and dynamic DHCP leases and BOOTP/TFTP/PXE for network booting of diskless > +machines. > > -Dnsmasq is targeted at home networks using NAT and connected to > -the internet via a modem, cable-modem or ADSL connection but > -would be a good choice for any small network where low resource > -use and ease of configuration are important. > +Dnsmasq is targeted at home networks using NAT and connected to the Internet > +via a modem, cable-modem or ADSL connection but would be a good choice for > +any smallish network (up to 1000 clients is known to work) where low resource > +use and ease of configuration are important. > Index: pkg/PLIST > =================================================================== > RCS file: /cvs/ports/net/dnsmasq/pkg/PLIST,v > retrieving revision 1.4 > diff -u -p -r1.4 PLIST > --- pkg/PLIST 14 Jun 2009 17:07:25 -0000 1.4 > +++ pkg/PLIST 5 Apr 2012 17:05:48 -0000 > @@ -6,3 +6,4 @@ > share/examples/dnsmasq/ > share/examples/dnsmasq/dnsmasq.conf.example > @sample ${SYSCONFDIR}/dnsmasq.conf > +@rcscript ${RCDIR}/dnsmasq > Index: pkg/dnsmasq.rc > =================================================================== > RCS file: pkg/dnsmasq.rc > diff -N pkg/dnsmasq.rc > --- /dev/null 1 Jan 1970 00:00:00 -0000 > +++ pkg/dnsmasq.rc 5 Apr 2012 17:05:48 -0000 > @@ -0,0 +1,11 @@ > +#!/bin/sh > +# > +# $OpenBSD$ > + > +daemon="${TRUEPREFIX}/sbin/dnsmasq" > + > +. /etc/rc.d/rc.subr > + > +rc_reload=NO > + > +rc_cmd $1
-- Sending from my Computer.
