Here is an update to dnsmasq 2.57.
Index: Makefile =================================================================== RCS file: /home/cvs/ports/net/dnsmasq/Makefile,v retrieving revision 1.18 diff -u -p -r1.18 Makefile --- Makefile 10 Jan 2011 22:08:26 -0000 1.18 +++ Makefile 2 Mar 2011 22:42:03 -0000 @@ -2,8 +2,9 @@ COMMENT= caching DNS forwarder and DHCP server -DISTNAME= dnsmasq-2.55 +DISTNAME= dnsmasq-2.57 CATEGORIES= net +MASTER_SITES= http://www.thekelleys.org.uk/dnsmasq/test-releases/ MAINTAINER= Rui Reis <r...@openbsd.org> @@ -16,11 +17,9 @@ PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes WANTLIB= c -MASTER_SITES= http://www.thekelleys.org.uk/dnsmasq/ - MAKE_ENV= CC="${CC}" -USE_GROFF = Yes +USE_GROFF= Yes NO_REGRESS= Yes pre-build: Index: distinfo =================================================================== RCS file: /home/cvs/ports/net/dnsmasq/distinfo,v retrieving revision 1.13 diff -u -p -r1.13 distinfo --- distinfo 10 Jan 2011 22:08:26 -0000 1.13 +++ distinfo 2 Mar 2011 22:42:06 -0000 @@ -1,5 +1,5 @@ -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 +MD5 (dnsmasq-2.57.tar.gz) = 0Q+utAlxfq6UcY13FspjpA== +RMD160 (dnsmasq-2.57.tar.gz) = +pRxfU4MfQldc0oYp3uqRt3CzVQ= +SHA1 (dnsmasq-2.57.tar.gz) = N+NlZPis/ZSvBFX6KkPa+fIzi3Y= +SHA256 (dnsmasq-2.57.tar.gz) = wuDHuCEi1jaTOyihwo5rzLbarUkWLnU0tkGzwzQP+K4= +SIZE (dnsmasq-2.57.tar.gz) = 456035 Index: patches/patch-man_dnsmasq_8 =================================================================== RCS file: /home/cvs/ports/net/dnsmasq/patches/patch-man_dnsmasq_8,v retrieving revision 1.8 diff -u -p -r1.8 patch-man_dnsmasq_8 --- patches/patch-man_dnsmasq_8 10 Jan 2011 22:08:26 -0000 1.8 +++ patches/patch-man_dnsmasq_8 16 Feb 2011 00:11:53 -0000 @@ -1,6 +1,6 @@ $OpenBSD: patch-man_dnsmasq_8,v 1.8 2011/01/10 22:08:26 ajacoutot Exp $ ---- man/dnsmasq.8.orig Sun Jun 6 15:22:30 2010 -+++ man/dnsmasq.8 Tue Dec 28 18:55:44 2010 +--- man/dnsmasq.8.orig Sat Feb 12 16:12:13 2011 ++++ man/dnsmasq.8 Tue Feb 15 19:11:50 2011 @@ -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.8 2011 .TP .B \-v, --version Print the version number. -@@ -1133,7 +1132,7 @@ with # are always skipped. This flag may be given on t +@@ -1173,7 +1172,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.8 2011 if it exists. (On FreeBSD, the file is .I /usr/local/etc/dnsmasq.conf -@@ -1440,7 +1439,7 @@ dnsmasq has no direct way of determining the charset i +@@ -1480,7 +1479,7 @@ dnsmasq has no direct way of determining the charset i assume that it is the system default. .SH FILES Index: patches/patch-src_bpf_c =================================================================== RCS file: patches/patch-src_bpf_c diff -N patches/patch-src_bpf_c --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-src_bpf_c 2 Mar 2011 22:42:55 -0000 @@ -0,0 +1,17 @@ +$OpenBSD$ +--- src/bpf.c.orig Wed Mar 2 17:42:32 2011 ++++ src/bpf.c Wed Mar 2 17:42:43 2011 +@@ -35,6 +35,13 @@ static struct iovec ifreq = { + #include <net/if_dl.h> + #include <netinet/if_ether.h> + ++#ifndef SA_SIZE ++#define SA_SIZE(sa) \ ++ ( (!(sa) || ((struct sockaddr *)(sa))->sa_len == 0) ? \ ++ sizeof(long) : \ ++ 1 + ( (((struct sockaddr *)(sa))->sa_len - 1) | (sizeof(long) - 1) ) ) ++#endif ++ + int arp_enumerate(void *parm, int (*callback)()) + { + int mib[6]; Index: patches/patch-src_config_h =================================================================== RCS file: /home/cvs/ports/net/dnsmasq/patches/patch-src_config_h,v retrieving revision 1.7 diff -u -p -r1.7 patch-src_config_h --- patches/patch-src_config_h 27 Dec 2009 19:34:33 -0000 1.7 +++ patches/patch-src_config_h 18 Feb 2011 20:01:34 -0000 @@ -1,7 +1,7 @@ $OpenBSD: patch-src_config_h,v 1.7 2009/12/27 19:34:33 sthen Exp $ ---- src/config.h.orig Fri Oct 9 14:13:11 2009 -+++ src/config.h Thu Dec 24 14:21:01 2009 -@@ -55,13 +55,13 @@ +--- 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 @@ # if defined(__FreeBSD__) # define CONFFILE "/usr/local/etc/dnsmasq.conf" # else @@ -15,6 +15,6 @@ $OpenBSD: patch-src_config_h,v 1.7 2009/ -#define CHGRP "dip" +#define CHUSER "_dnsmasq" +#define CHGRP "_dnsmasq" + #define NAMESERVER_PORT 53 #define DHCP_SERVER_PORT 67 #define DHCP_CLIENT_PORT 68 - #define DHCP_SERVER_ALTPORT 1067 Index: patches/patch-src_dnsmasq_h =================================================================== RCS file: /home/cvs/ports/net/dnsmasq/patches/patch-src_dnsmasq_h,v retrieving revision 1.7 diff -u -p -r1.7 patch-src_dnsmasq_h --- patches/patch-src_dnsmasq_h 10 Jan 2011 22:08:26 -0000 1.7 +++ patches/patch-src_dnsmasq_h 18 Feb 2011 20:01:30 -0000 @@ -1,7 +1,7 @@ $OpenBSD: patch-src_dnsmasq_h,v 1.7 2011/01/10 22:08:26 ajacoutot Exp $ ---- 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 { +--- src/dnsmasq.h.orig Thu Feb 17 10:30:15 2011 ++++ src/dnsmasq.h Fri Feb 18 14:58:43 2011 +@@ -593,7 +593,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 --- patches/patch-src_rfc1035_c 10 Jan 2011 22:08:26 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,14 +0,0 @@ -$OpenBSD: patch-src_rfc1035_c,v 1.1 2011/01/10 22:08:26 ajacoutot Exp $ ---- 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.8 diff -u -p -r1.8 patch-src_tftp_c --- patches/patch-src_tftp_c 10 Jan 2011 22:08:26 -0000 1.8 +++ patches/patch-src_tftp_c 16 Feb 2011 00:11:53 -0000 @@ -2,9 +2,9 @@ $OpenBSD: patch-src_tftp_c,v 1.8 2011/01 gcc2 fixes to struct errmess, struct oackmess, struct datamess from kili ---- 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 +--- src/tftp.c.orig Tue Jan 18 17:23:57 2011 ++++ src/tftp.c Tue Feb 15 19:11:50 2011 +@@ -606,7 +606,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); -@@ -576,7 +576,7 @@ static ssize_t get_block(char *packet, struct tftp_tra +@@ -633,7 +633,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; -@@ -599,7 +599,7 @@ static ssize_t get_block(char *packet, struct tftp_tra +@@ -656,7 +656,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.
