An update to dnsmasq 2.55.
Tested on i386 and lightly tested on amd64.
Index: Makefile
===================================================================
RCS file: /home/cvs/ports/net/dnsmasq/Makefile,v
retrieving revision 1.17
diff -u -p -r1.17 Makefile
--- Makefile 18 Oct 2010 18:36:46 -0000 1.17
+++ Makefile 29 Dec 2010 00:08:01 -0000
@@ -2,7 +2,7 @@
COMMENT= caching DNS forwarder and DHCP server
-DISTNAME= dnsmasq-2.51
+DISTNAME= dnsmasq-2.55
CATEGORIES= net
MAINTAINER= Rui Reis <r...@openbsd.org>
@@ -24,7 +24,7 @@ USE_GROFF = Yes
NO_REGRESS= Yes
pre-build:
- ${SUBST_CMD} ${WRKSRC}/man/dnsmasq.8 \
+ @${SUBST_CMD} ${WRKSRC}/man/dnsmasq.8 \
${WRKSRC}/src/config.h \
${WRKSRC}/dnsmasq.conf.example
Index: distinfo
===================================================================
RCS file: /home/cvs/ports/net/dnsmasq/distinfo,v
retrieving revision 1.12
diff -u -p -r1.12 distinfo
--- distinfo 27 Dec 2009 19:34:33 -0000 1.12
+++ distinfo 28 Dec 2010 23:53:32 -0000
@@ -1,5 +1,5 @@
-MD5 (dnsmasq-2.51.tar.gz) = l0ZSYabeUlijw+3+UcoWpA==
-RMD160 (dnsmasq-2.51.tar.gz) = 6hUknW+Kjhu2LcBhiZiFwnkdaig=
-SHA1 (dnsmasq-2.51.tar.gz) = LxYbm86H3mz8GOLIQBd1O9sO8gk=
-SHA256 (dnsmasq-2.51.tar.gz) = CKf5XhqjRL4HaB9RTZkjILhpMsXcLwkaxu3QWZ/5BiI=
-SIZE (dnsmasq-2.51.tar.gz) = 407550
+MD5 (dnsmasq-2.55.tar.gz) = sJPXxrx/l65v010EhSkjKg==
+RMD160 (dnsmasq-2.55.tar.gz) = BhhSFXKoGcjuIDSM67VrWEGm2RE=
+SHA1 (dnsmasq-2.55.tar.gz) = ap+2tDhH5H0Hy+ME6ZoEuWCUIGg=
+SHA256 (dnsmasq-2.55.tar.gz) = z2Ps9Zd/AEdMvamDdqnYdDUAqC/ZjhP0PXA3vOn5+Sk=
+SIZE (dnsmasq-2.55.tar.gz) = 438852
Index: patches/patch-Makefile
===================================================================
RCS file: patches/patch-Makefile
diff -N patches/patch-Makefile
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-Makefile 28 Dec 2010 23:57:26 -0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- Makefile.orig Tue Dec 28 18:57:01 2010
++++ Makefile Tue Dec 28 18:57:18 2010
+@@ -24,7 +24,7 @@ MSGMERGE = msgmerge
+ MSGFMT = msgfmt
+ XGETTEXT = xgettext
+
+-CFLAGS = -Wall -W -O2
++CFLAGS += -Wall -W
+
+ #################################################################
+
Index: patches/patch-bld_Makefile
===================================================================
RCS file: patches/patch-bld_Makefile
diff -N patches/patch-bld_Makefile
--- patches/patch-bld_Makefile 14 Jun 2009 17:07:25 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,9 +0,0 @@
-$OpenBSD: patch-bld_Makefile,v 1.2 2009/06/14 17:07:25 kili Exp $
---- bld/Makefile.orig Mon Jun 8 23:05:30 2009
-+++ bld/Makefile Sat Jun 13 12:05:54 2009
-@@ -1,4 +1,4 @@
--CFLAGS = -Wall -W -O2
-+#CFLAGS = -Wall -W -O2
-
- OBJS = cache.o rfc1035.o util.o option.o forward.o network.o \
- dnsmasq.o dhcp.o lease.o rfc2131.o netlink.o dbus.o bpf.o \
Index: patches/patch-man_dnsmasq_8
===================================================================
RCS file: /home/cvs/ports/net/dnsmasq/patches/patch-man_dnsmasq_8,v
retrieving revision 1.7
diff -u -p -r1.7 patch-man_dnsmasq_8
--- patches/patch-man_dnsmasq_8 27 Dec 2009 19:34:33 -0000 1.7
+++ patches/patch-man_dnsmasq_8 28 Dec 2010 23:55:57 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-man_dnsmasq_8,v 1.7 2009/12/27 19:34:33 sthen Exp $
---- man/dnsmasq.8.orig Mon Oct 5 22:15:32 2009
-+++ man/dnsmasq.8 Thu Dec 24 14:21:01 2009
-@@ -106,13 +106,12 @@ Specify an alternate path for dnsmasq to record its pr
+--- man/dnsmasq.8.orig Sun Jun 6 15:22:30 2010
++++ man/dnsmasq.8 Tue Dec 28 18:55:44 2010
+@@ -113,13 +113,12 @@ Specify an alternate path for dnsmasq to record its pr
.TP
.B \-u, --user=<username>
Specify the userid to which dnsmasq will change after startup. Dnsmasq must
normally be started as root, but it will drop root
@@ -17,7 +17,7 @@ $OpenBSD: patch-man_dnsmasq_8,v 1.7 2009
.TP
.B \-v, --version
Print the version number.
-@@ -1011,7 +1010,7 @@ with # are always skipped. This flag may be given on t
+@@ -1133,7 +1132,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.7 2009
if it exists. (On
FreeBSD, the file is
.I /usr/local/etc/dnsmasq.conf
-@@ -1266,7 +1265,7 @@ dnsmasq has no direct way of determining the charset i
+@@ -1440,7 +1439,7 @@ dnsmasq has no direct way of determining the charset i
assume that it is the system default.
.SH FILES
Index: patches/patch-src_dnsmasq_h
===================================================================
RCS file: /home/cvs/ports/net/dnsmasq/patches/patch-src_dnsmasq_h,v
retrieving revision 1.6
diff -u -p -r1.6 patch-src_dnsmasq_h
--- patches/patch-src_dnsmasq_h 14 Jun 2009 17:07:25 -0000 1.6
+++ patches/patch-src_dnsmasq_h 28 Dec 2010 23:56:01 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-src_dnsmasq_h,v 1.6 2009/06/14 17:07:25 kili Exp $
---- src/dnsmasq.h.orig Mon Jun 8 23:05:30 2009
-+++ src/dnsmasq.h Sat Jun 13 12:05:54 2009
-@@ -572,7 +572,7 @@ struct tftp_file {
+--- src/dnsmasq.h.orig Sun Jun 6 15:22:30 2010
++++ src/dnsmasq.h Tue Dec 28 18:55:44 2010
+@@ -592,7 +592,7 @@ struct tftp_file {
off_t size;
dev_t dev;
ino_t inode;
Index: patches/patch-src_rfc1035_c
===================================================================
RCS file: patches/patch-src_rfc1035_c
diff -N patches/patch-src_rfc1035_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_rfc1035_c 29 Dec 2010 00:04:40 -0000
@@ -0,0 +1,14 @@
+$OpenBSD$
+--- src/rfc1035.c.orig Tue Dec 28 19:03:53 2010
++++ src/rfc1035.c Tue Dec 28 19:04:33 2010
+@@ -16,6 +16,10 @@
+
+ #include "dnsmasq.h"
+
++#ifndef NS_INT32SZ
++#define NS_INT32SZ 4
++#endif
++
+ static int add_resource_record(HEADER *header, char *limit, int *truncp,
+ unsigned int nameoffset, unsigned char **pp,
+ unsigned long ttl, unsigned int *offset,
unsigned short type,
Index: patches/patch-src_tftp_c
===================================================================
RCS file: /home/cvs/ports/net/dnsmasq/patches/patch-src_tftp_c,v
retrieving revision 1.7
diff -u -p -r1.7 patch-src_tftp_c
--- patches/patch-src_tftp_c 27 Dec 2009 19:34:33 -0000 1.7
+++ patches/patch-src_tftp_c 28 Dec 2010 23:55:57 -0000
@@ -2,9 +2,9 @@ $OpenBSD: patch-src_tftp_c,v 1.7 2009/12
gcc2 fixes to struct errmess, struct oackmess, struct datamess from kili
---- src/tftp.c.orig Tue Aug 25 20:51:53 2009
-+++ src/tftp.c Thu Dec 24 14:21:01 2009
-@@ -495,7 +495,7 @@ static ssize_t tftp_err(int err, char *packet, char *m
+--- src/tftp.c.orig Sun Jun 6 15:22:30 2010
++++ src/tftp.c Tue Dec 28 18:55:44 2010
+@@ -549,7 +549,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);
-@@ -522,7 +522,7 @@ static ssize_t get_block(char *packet, struct tftp_tra
+@@ -576,7 +576,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;
-@@ -545,7 +545,7 @@ static ssize_t get_block(char *packet, struct tftp_tra
+@@ -599,7 +599,7 @@ static ssize_t get_block(char *packet, struct tftp_tra
/* send data packet */
struct datamess {
unsigned short op, block;
--
This message has been scanned for viruses and
dangerous content by MailScanner, and is
believed to be clean.
