Update to dnsmasq 2.68.

ok sthen@
This commit is contained in:
brad 2013-12-23 21:13:39 +00:00
parent 4a87375c06
commit 8a4c16b2a1
4 changed files with 13 additions and 26 deletions

View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.34 2013/11/03 00:48:45 brad Exp $
# $OpenBSD: Makefile,v 1.35 2013/12/23 21:13:39 brad Exp $
COMMENT= lightweight caching DNS forwarder, DHCP and TFTP server
DISTNAME= dnsmasq-2.67
DISTNAME= dnsmasq-2.68
CATEGORIES= net
MASTER_SITES= http://www.thekelleys.org.uk/dnsmasq/
EXTRACT_SUFX= .tar.xz
@ -18,18 +18,16 @@ WANTLIB= c
MAKE_ENV= CC="${CC}"
MAKE_FLAGS= CFLAGS="${CFLAGS} -Wall -W"
FAKE_FLAGS= MANDIR="${PREFIX}/man"
NO_TEST= Yes
pre-build:
@${SUBST_CMD} ${WRKSRC}/man/dnsmasq.8 \
${WRKSRC}/src/config.h \
${WRKSRC}/dnsmasq.conf.example
@${SUBST_CMD} ${WRKSRC}/man/dnsmasq.8 ${WRKSRC}/src/config.h \
${WRKSRC}/dnsmasq.conf.example
do-install:
post-install:
${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
.include <bsd.port.mk>

View File

@ -1,2 +1,2 @@
SHA256 (dnsmasq-2.67.tar.xz) = qPHOydPzjRnHxU4oeXA9QnSKzg9iwy5pWwggUb3ScF0=
SIZE (dnsmasq-2.67.tar.xz) = 418484
SHA256 (dnsmasq-2.68.tar.xz) = BVkE85plv2Ucy+DyWSLIjPbn4bheixkFgEJTtpV+x6A=
SIZE (dnsmasq-2.68.tar.xz) = 420968

View File

@ -1,6 +1,6 @@
$OpenBSD: patch-man_dnsmasq_8,v 1.16 2013/11/03 00:48:45 brad Exp $
--- man/dnsmasq.8.orig Wed Oct 16 09:33:23 2013
+++ man/dnsmasq.8 Wed Oct 16 23:42:24 2013
$OpenBSD: patch-man_dnsmasq_8,v 1.17 2013/12/23 21:13:39 brad Exp $
--- man/dnsmasq.8.orig Tue Dec 3 11:05:30 2013
+++ man/dnsmasq.8 Wed Dec 4 00:28:03 2013
@@ -125,13 +125,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.16 2013/11/03 00:48:45 brad Exp $
.TP
.B \-v, --version
Print the version number.
@@ -1635,7 +1634,7 @@ with # are always skipped. This flag may be given on t
@@ -1649,7 +1648,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.16 2013/11/03 00:48:45 brad Exp $
if it exists. (On
FreeBSD, the file is
.I /usr/local/etc/dnsmasq.conf
@@ -2066,7 +2065,7 @@ dnsmasq has no direct way of determining the charset i
@@ -2086,7 +2085,7 @@ dnsmasq has no direct way of determining the charset i
assume that it is the system default.
.SH FILES

View File

@ -1,11 +0,0 @@
$OpenBSD: patch-src_bpf_c,v 1.5 2013/11/03 20:42:49 naddy Exp $
--- src/bpf.c.orig Fri Oct 25 11:37:30 2013
+++ src/bpf.c Sun Nov 3 18:52:07 2013
@@ -29,6 +29,7 @@
# include <net/if_var.h>
#endif
#include <netinet/in_var.h>
+#include <netinet6/in6_var.h>
#ifndef SA_SIZE
#define SA_SIZE(sa) \