From 6d72311eb77d4bfe89ba10809d89015ad2d8dfac Mon Sep 17 00:00:00 2001
From: roy <roy@pkgsrc.org>
Date: Sun, 21 Jul 2013 07:59:26 +0000
Subject: Support partial FQDN option

---
 net/dnsmasq/Makefile                    |  3 ++-
 net/dnsmasq/distinfo                    |  3 ++-
 net/dnsmasq/patches/patch-src_rfc2131.c | 15 +++++++++++++++
 3 files changed, 19 insertions(+), 2 deletions(-)
 create mode 100644 net/dnsmasq/patches/patch-src_rfc2131.c

(limited to 'net')

diff --git a/net/dnsmasq/Makefile b/net/dnsmasq/Makefile
index ed5647752e9..69e4cb6dc3f 100644
--- a/net/dnsmasq/Makefile
+++ b/net/dnsmasq/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.22 2013/05/28 09:32:00 fhajny Exp $
+# $NetBSD: Makefile,v 1.23 2013/07/21 07:59:26 roy Exp $
 #
 
 DISTNAME=		dnsmasq-2.66
+PKGREVISION=		1
 CATEGORIES=		net
 MASTER_SITES=		http://www.thekelleys.org.uk/dnsmasq/
 LICENSE=		gnu-gpl-v3
diff --git a/net/dnsmasq/distinfo b/net/dnsmasq/distinfo
index 65f1bbd755b..5e7b5892199 100644
--- a/net/dnsmasq/distinfo
+++ b/net/dnsmasq/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.19 2013/05/28 09:32:00 fhajny Exp $
+$NetBSD: distinfo,v 1.20 2013/07/21 07:59:26 roy Exp $
 
 SHA1 (dnsmasq-2.66.tar.gz) = fb6b1690de53014a8e6c8bfa6f1653062b965741
 RMD160 (dnsmasq-2.66.tar.gz) = fd5492852a933b54bb38f9e0c531c6c6e4325862
 Size (dnsmasq-2.66.tar.gz) = 574715 bytes
+SHA1 (patch-src_rfc2131.c) = c136273e0026452ff9f1a929474663a4b56631de
diff --git a/net/dnsmasq/patches/patch-src_rfc2131.c b/net/dnsmasq/patches/patch-src_rfc2131.c
new file mode 100644
index 00000000000..59b47a0a224
--- /dev/null
+++ b/net/dnsmasq/patches/patch-src_rfc2131.c
@@ -0,0 +1,15 @@
+$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;
-- 
cgit v1.2.3