Pullup ticket #4106 - requested by taca

net/isc-dhclient4: security update
net/isc-dhcp4: security update
net/isc-dhcpd4: security update
net/isc-dhcrelay4: security update

Revisions pulled up:
- net/isc-dhclient4/Makefile                                    1.7
- net/isc-dhcp4/Makefile                                        1.9-1.10
- net/isc-dhcp4/Makefile.common                                 1.18-1.19
- net/isc-dhcp4/distinfo                                        1.14-1.15
- net/isc-dhcpd4/Makefile                                       1.7

---
   Module Name:	pkgsrc
   Committed By:	jperkin
   Date:		Wed Feb  6 23:24:19 UTC 2013

   Modified Files:
   	pkgsrc/net/isc-dhcp4: Makefile

   Log Message:
   PKGREVISION bumps for the security/openssl 1.0.1d update.

---
   Module Name:	pkgsrc
   Committed By:	taca
   Date:		Fri Jan 11 13:35:58 UTC 2013

   Modified Files:
   	pkgsrc/net/isc-dhclient4: Makefile
   	pkgsrc/net/isc-dhcp4: Makefile.common distinfo
   	pkgsrc/net/isc-dhcpd4: Makefile

   Log Message:
   Update ISC DHCP to 4.2.5.

   Changes are too many to write here, please refer RELNOTES.

---
   Module Name:	pkgsrc
   Committed By:	taca
   Date:		Tue Mar 26 16:25:06 UTC 2013

   Modified Files:
   	pkgsrc/net/isc-dhcp4: Makefile Makefile.common distinfo

   Log Message:
   Update ISC DHCP packages to 4.2.5p1 (4.2.5-P1).
   	isc-dhclient4
   	isc-dhcp4
   	isc-dhcpd4
   	isc-dhcrelay4

4 files changed, 12 insertions, 10 deletions

diff --git a/net/isc-dhclient4/Makefile b/net/isc-dhclient4/Makefile
index 1ba36fa34af..9a0c6a01f86 100644
--- a/net/isc-dhclient4/Makefile
+++ b/net/isc-dhclient4/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2012/10/23 17:18:29 asau Exp $
+# $NetBSD: Makefile,v 1.6.2.1 2013/03/30 13:38:50 tron Exp $
 #
 
 PKGNAME=	isc-dhclient-${DHVER}
@@ -16,7 +16,8 @@ FILES_SUBST+=	DHCP_HOME=${DHCP_HOME}
 INSTALLATION_DIRS+=	${EGDIR}
 
 post-install:
-	${INSTALL_DATA} ${WRKSRC}/client/dhclient.conf ${DESTDIR}${EGDIR}
+	${INSTALL_DATA} ${WRKSRC}/client/dhclient.conf.example \
+		${DESTDIR}${EGDIR}/dhclient.conf
 
 .include "../../net/isc-dhcp4/Makefile.common"
 .include "../../net/isc-dhcp4/buildlink3.mk"
diff --git a/net/isc-dhcp4/Makefile.common b/net/isc-dhcp4/Makefile.common
index 3d4eb9a4730..3f6868aae9e 100644
--- a/net/isc-dhcp4/Makefile.common
+++ b/net/isc-dhcp4/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.17 2012/09/13 01:38:57 taca Exp $
+# $NetBSD: Makefile.common,v 1.17.4.1 2013/03/30 13:38:50 tron 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-P2
+VERSION=		4.2.5-P1
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/net/isc-dhcp4/distinfo b/net/isc-dhcp4/distinfo
index 369bb240120..cf5da69abfe 100644
--- a/net/isc-dhcp4/distinfo
+++ b/net/isc-dhcp4/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.13 2012/09/13 01:38:57 taca Exp $
+$NetBSD: distinfo,v 1.13.4.1 2013/03/30 13:38:50 tron Exp $
 
-SHA1 (dhcp-4.2.4-P2.tar.gz) = 78a819d7af6688942429de2178124ea371f038f2
-RMD160 (dhcp-4.2.4-P2.tar.gz) = a02661dc79079b1936db888666e56c7436b5bab9
-Size (dhcp-4.2.4-P2.tar.gz) = 8190209 bytes
+SHA1 (dhcp-4.2.5-P1.tar.gz) = 120b6e476b2ac0d35e1dc8dee53752c42449b925
+RMD160 (dhcp-4.2.5-P1.tar.gz) = 8633cea4a2e5a1900c8a6dac3ebcbd6ff53c2fa9
+Size (dhcp-4.2.5-P1.tar.gz) = 8255960 bytes
 SHA1 (patch-aa) = cdb64616f16ee79bf14f496518a2958352ce1fc9
 SHA1 (patch-ab) = 3a36eb65c6b0a865f2d8a350fa083fa2fe549efd
 SHA1 (patch-ac) = 97af5dd9e787c63ca387fb05df20f42d90b985fb
diff --git a/net/isc-dhcpd4/Makefile b/net/isc-dhcpd4/Makefile
index 107b039e98c..e22d1dedbf4 100644
--- a/net/isc-dhcpd4/Makefile
+++ b/net/isc-dhcpd4/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2012/10/23 17:18:29 asau Exp $
+# $NetBSD: Makefile,v 1.6.2.1 2013/03/30 13:38:51 tron Exp $
 #
 
 PKGNAME=	isc-dhcpd-${DHVER}
@@ -16,7 +16,8 @@ FILES_SUBST+=	DHCP_HOME=${DHCP_HOME}
 INSTALLATION_DIRS+=	${EGDIR}
 
 post-install:
-	${INSTALL_DATA} ${WRKSRC}/server/dhcpd.conf ${DESTDIR}${EGDIR}
+	${INSTALL_DATA} ${WRKSRC}/server/dhcpd.conf.example \
+		${DESTDIR}${EGDIR}/dhcpd.conf
 
 .include "../../net/isc-dhcp4/Makefile.common"
 .include "../../net/isc-dhcp4/buildlink3.mk"