Support partial FQDN optiondiff -r1.22 -r1.23 pkgsrc/net/dnsmasq/Makefile
(roy)
@@ -1,17 +1,18 @@ | @@ -1,17 +1,18 @@ | |||
1 | # $NetBSD: Makefile,v 1.22 2013/05/28 09:32:00 fhajny Exp $ | 1 | # $NetBSD: Makefile,v 1.23 2013/07/21 07:59:26 roy Exp $ | |
2 | # | 2 | # | |
3 | 3 | |||
4 | DISTNAME= dnsmasq-2.66 | 4 | DISTNAME= dnsmasq-2.66 | |
5 | PKGREVISION= 1 | |||
5 | CATEGORIES= net | 6 | CATEGORIES= net | |
6 | MASTER_SITES= http://www.thekelleys.org.uk/dnsmasq/ | 7 | MASTER_SITES= http://www.thekelleys.org.uk/dnsmasq/ | |
7 | LICENSE= gnu-gpl-v3 | 8 | LICENSE= gnu-gpl-v3 | |
8 | 9 | |||
9 | MAINTAINER= roy@NetBSD.org | 10 | MAINTAINER= roy@NetBSD.org | |
10 | HOMEPAGE= http://www.thekelleys.org.uk/dnsmasq/doc.html | 11 | HOMEPAGE= http://www.thekelleys.org.uk/dnsmasq/doc.html | |
11 | COMMENT= Lightweight, easy to configure DNS forwarder | 12 | COMMENT= Lightweight, easy to configure DNS forwarder | |
12 | 13 | |||
13 | RCD_SCRIPTS= dnsmasq | 14 | RCD_SCRIPTS= dnsmasq | |
14 | CONF_FILES= ${PREFIX}/share/examples/dnsmasq/dnsmasq.conf.example \ | 15 | CONF_FILES= ${PREFIX}/share/examples/dnsmasq/dnsmasq.conf.example \ | |
15 | ${PKG_SYSCONFDIR}/dnsmasq.conf | 16 | ${PKG_SYSCONFDIR}/dnsmasq.conf | |
16 | 17 | |||
17 | PKG_OPTIONS_VAR= PKG_OPTIONS.dnsmasq | 18 | PKG_OPTIONS_VAR= PKG_OPTIONS.dnsmasq |
@@ -1,5 +1,6 @@ | @@ -1,5 +1,6 @@ | |||
1 | $NetBSD: distinfo,v 1.19 2013/05/28 09:32:00 fhajny Exp $ | 1 | $NetBSD: distinfo,v 1.20 2013/07/21 07:59:26 roy Exp $ | |
2 | 2 | |||
3 | SHA1 (dnsmasq-2.66.tar.gz) = fb6b1690de53014a8e6c8bfa6f1653062b965741 | 3 | SHA1 (dnsmasq-2.66.tar.gz) = fb6b1690de53014a8e6c8bfa6f1653062b965741 | |
4 | RMD160 (dnsmasq-2.66.tar.gz) = fd5492852a933b54bb38f9e0c531c6c6e4325862 | 4 | RMD160 (dnsmasq-2.66.tar.gz) = fd5492852a933b54bb38f9e0c531c6c6e4325862 | |
5 | Size (dnsmasq-2.66.tar.gz) = 574715 bytes | 5 | Size (dnsmasq-2.66.tar.gz) = 574715 bytes | |
6 | SHA1 (patch-src_rfc2131.c) = c136273e0026452ff9f1a929474663a4b56631de |
$NetBSD: patch-src_rfc2131.c,v 1.1 2013/07/21 07:59:26 roy Exp $
Don't assume a trailing terminator.
--- src/rfc2131.c.orig 2013-04-17 12:52:49.000000000 +0000
+++ src/rfc2131.c
@@ -534,7 +534,7 @@ size_t dhcp_reply(struct dhcp_context *c
}
if (fqdn_flags & 0x04)
- while (*op != 0 && ((op + (*op) + 1) - pp) < len)
+ while (*op != 0 && ((op + (*op)) - pp) < len)
{
memcpy(pq, op+1, *op);
pq += *op;