From 961ca3c7d248740cb7411305488b328120ac79fc Mon Sep 17 00:00:00 2001
From: taca <taca@pkgsrc.org>
Date: Wed, 25 Jul 2012 00:56:52 +0000
Subject: Update isc-dhcp4 package to 4.2.4p1 (ISC DHCP 4.2.4-P1). Fixes
 security problems.

			Changes since 4.2.4

! Previously the server code was relaxed to allow packets with zero
  length client ids to be processed.  Under some situations use of
  zero length client ids can cause the server to go into an infinite
  loop.  As such ids are not valid according to RFC 2132 section 9.14
  the server no longer accepts them.  Client ids with a length of 1
  are also invalid but the server still accepts them in order to
  minimize disruption.  The restriction will likely be tightened in
  the future to disallow ids with a length of 1.
  Thanks to Markus Hietava of Codenomicon CROSS project for the
  finding this issue and CERT-FI for vulnerability coordination.
  [ISC-Bugs #29851]
  CVE: CVE-2012-3571

! When attempting to convert a DUID from a client id option
  into a hardware address handle unexpected client ids properly.
  Thanks to Markus Hietava of Codenomicon CROSS project for the
  finding this issue and CERT-FI for vulnerability coordination.
  [ISC-Bugs #29852]
  CVE: CVE-2012-3570

! A pair of memory leaks were found and fixed.  Thanks to
  Glen Eustace of Massey University, New Zealand for finding
  this issue.
  [ISC-Bugs #30024]
  CVE: CVE-2012-3954
---
 net/isc-dhcp4/Makefile.common                    |  4 ++--
 net/isc-dhcp4/distinfo                           | 10 +++++-----
 net/isc-dhcp4/patches/patch-includes_Makefile.in |  9 +++++----
 3 files changed, 12 insertions(+), 11 deletions(-)

(limited to 'net')

diff --git a/net/isc-dhcp4/Makefile.common b/net/isc-dhcp4/Makefile.common
index 8ac560b9c2f..26eb476f6c0 100644
--- a/net/isc-dhcp4/Makefile.common
+++ b/net/isc-dhcp4/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.15 2012/06/06 15:59:31 taca Exp $
+# $NetBSD: Makefile.common,v 1.16 2012/07/25 00:56:52 taca Exp $
 #
 # used by net/isc-dhcp4/Makefile
 # used by net/isc-dhcpd4/Makefile
@@ -17,7 +17,7 @@ LICENSE=		isc
 
 CONFLICTS+=		isc-dhcp-base-3.*{,nb*}
 
-VERSION=		4.2.4
+VERSION=		4.2.4-P1
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/net/isc-dhcp4/distinfo b/net/isc-dhcp4/distinfo
index 41642f43e0b..54d24eeea2c 100644
--- a/net/isc-dhcp4/distinfo
+++ b/net/isc-dhcp4/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.11 2012/06/06 15:59:31 taca Exp $
+$NetBSD: distinfo,v 1.12 2012/07/25 00:56:53 taca Exp $
 
-SHA1 (dhcp-4.2.4.tar.gz) = ba877b6af5f21df84831f698187814668432e8fe
-RMD160 (dhcp-4.2.4.tar.gz) = 99af87ead38807d414a32622996e9815d6b6a95d
-Size (dhcp-4.2.4.tar.gz) = 8063457 bytes
+SHA1 (dhcp-4.2.4-P1.tar.gz) = 0fe0f20b7be597d60e61951d2ccafe547d3bcec2
+RMD160 (dhcp-4.2.4-P1.tar.gz) = ff7c419eac5391fa6722d522d057d9e1e8b08a8e
+Size (dhcp-4.2.4-P1.tar.gz) = 8187359 bytes
 SHA1 (patch-aa) = cdb64616f16ee79bf14f496518a2958352ce1fc9
 SHA1 (patch-ab) = 3a36eb65c6b0a865f2d8a350fa083fa2fe549efd
 SHA1 (patch-ac) = 97af5dd9e787c63ca387fb05df20f42d90b985fb
-SHA1 (patch-includes_Makefile.in) = 3d81c1dce46854cee54742d6ea3593c4cb87f57d
+SHA1 (patch-includes_Makefile.in) = 6004f66e28cd53c0acd09746a284eefe70a3aef2
diff --git a/net/isc-dhcp4/patches/patch-includes_Makefile.in b/net/isc-dhcp4/patches/patch-includes_Makefile.in
index 8923c0b423c..b6696c50acb 100644
--- a/net/isc-dhcp4/patches/patch-includes_Makefile.in
+++ b/net/isc-dhcp4/patches/patch-includes_Makefile.in
@@ -1,15 +1,16 @@
-$NetBSD: patch-includes_Makefile.in,v 1.1 2011/04/08 14:09:24 taca Exp $
+$NetBSD: patch-includes_Makefile.in,v 1.2 2012/07/25 00:56:53 taca Exp $
 
---- includes/Makefile.in.orig	2011-03-24 21:58:37.000000000 +0000
+Don't need isc-dhcp/dst.h.
+
+--- includes/Makefile.in.orig	2012-07-13 06:17:54.000000000 +0000
 +++ includes/Makefile.in
-@@ -146,8 +146,8 @@ top_builddir = @top_builddir@
+@@ -147,8 +147,7 @@ top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
  nobase_include_HEADERS = omapip/alloc.h omapip/buffer.h omapip/convert.h \
  			 omapip/hash.h omapip/isclib.h omapip/omapip.h \
 -			 omapip/omapip_p.h omapip/result.h omapip/trace.h \
 -			 isc-dhcp/dst.h
 +			 omapip/omapip_p.h omapip/result.h omapip/trace.h
-+#			 isc-dhcp/dst.h
  
  EXTRA_DIST = cdefs.h ctrace.h dhcp.h dhcp6.h dhcpd.h dhctoken.h failover.h \
  	     heap.h inet.h minires.h osdep.h site.h statement.h tree.h \
-- 
cgit v1.2.3