Sat Mar 30 13:38:51 2013 UTC ()
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


(tron)
diff -r1.6 -r1.6.2.1 pkgsrc/net/isc-dhclient4/Makefile
diff -r1.17 -r1.17.4.1 pkgsrc/net/isc-dhcp4/Makefile.common
diff -r1.13 -r1.13.4.1 pkgsrc/net/isc-dhcp4/distinfo
diff -r1.6 -r1.6.2.1 pkgsrc/net/isc-dhcpd4/Makefile
cvs diff -r1.6 -r1.6.2.1 pkgsrc/net/isc-dhclient4/Makefile (expand / switch to unified diff)

--- pkgsrc/net/isc-dhclient4/Makefile 2012/10/23 17:18:29 1.6
+++ pkgsrc/net/isc-dhclient4/Makefile 2013/03/30 13:38:50 1.6.2.1
@@ -1,23 +1,24 @@ @@ -1,23 +1,24 @@
1# $NetBSD: Makefile,v 1.6 2012/10/23 17:18:29 asau Exp $ 1# $NetBSD: Makefile,v 1.6.2.1 2013/03/30 13:38:50 tron Exp $
2# 2#
3 3
4PKGNAME= isc-dhclient-${DHVER} 4PKGNAME= isc-dhclient-${DHVER}
5COMMENT= ISC Dynamic Host Configuration Protocol (DHCP) Client 5COMMENT= ISC Dynamic Host Configuration Protocol (DHCP) Client
6BUILD_SUBDIR= bind includes tests common omapip client 6BUILD_SUBDIR= bind includes tests common omapip client
7SUBDIR= client 7SUBDIR= client
8 8
9CONF_FILES+= ${EGDIR}/dhclient.conf ${PKG_SYSCONFDIR}/dhclient.conf 9CONF_FILES+= ${EGDIR}/dhclient.conf ${PKG_SYSCONFDIR}/dhclient.conf
10 10
11RCD_SCRIPTS= isc_dhclient 11RCD_SCRIPTS= isc_dhclient
12FILES_SUBST+= DHCP_HOME=${DHCP_HOME} 12FILES_SUBST+= DHCP_HOME=${DHCP_HOME}
13 13
14.include "${.CURDIR}/../isc-dhcp4/options.mk" 14.include "${.CURDIR}/../isc-dhcp4/options.mk"
15 15
16INSTALLATION_DIRS+= ${EGDIR} 16INSTALLATION_DIRS+= ${EGDIR}
17 17
18post-install: 18post-install:
19 ${INSTALL_DATA} ${WRKSRC}/client/dhclient.conf ${DESTDIR}${EGDIR} 19 ${INSTALL_DATA} ${WRKSRC}/client/dhclient.conf.example \
 20 ${DESTDIR}${EGDIR}/dhclient.conf
20 21
21.include "../../net/isc-dhcp4/Makefile.common" 22.include "../../net/isc-dhcp4/Makefile.common"
22.include "../../net/isc-dhcp4/buildlink3.mk" 23.include "../../net/isc-dhcp4/buildlink3.mk"
23.include "../../mk/bsd.pkg.mk" 24.include "../../mk/bsd.pkg.mk"
cvs diff -r1.17 -r1.17.4.1 pkgsrc/net/isc-dhcp4/Makefile.common (expand / switch to unified diff)

--- pkgsrc/net/isc-dhcp4/Makefile.common 2012/09/13 01:38:57 1.17
+++ pkgsrc/net/isc-dhcp4/Makefile.common 2013/03/30 13:38:50 1.17.4.1
@@ -1,33 +1,33 @@ @@ -1,33 +1,33 @@
1# $NetBSD: Makefile.common,v 1.17 2012/09/13 01:38:57 taca Exp $ 1# $NetBSD: Makefile.common,v 1.17.4.1 2013/03/30 13:38:50 tron Exp $
2# 2#
3# used by net/isc-dhcp4/Makefile 3# used by net/isc-dhcp4/Makefile
4# used by net/isc-dhcpd4/Makefile 4# used by net/isc-dhcpd4/Makefile
5# used by net/isc-dhclient4/Makefile 5# used by net/isc-dhclient4/Makefile
6# used by net/isc-dhcrelay4/Makefile 6# used by net/isc-dhcrelay4/Makefile
7 7
8DISTNAME= dhcp-${VERSION} 8DISTNAME= dhcp-${VERSION}
9DHVER= ${DISTNAME:S/dhcp-//:S/-P/p/} 9DHVER= ${DISTNAME:S/dhcp-//:S/-P/p/}
10CATEGORIES= net 10CATEGORIES= net
11MASTER_SITES= ftp://ftp.isc.org/isc/dhcp/${VERSION}/ \ 11MASTER_SITES= ftp://ftp.isc.org/isc/dhcp/${VERSION}/ \
12 http://ftp.isc.org/isc/dhcp/${VERSION}/ 12 http://ftp.isc.org/isc/dhcp/${VERSION}/
13 13
14MAINTAINER= pkgsrc-users@NetBSD.org 14MAINTAINER= pkgsrc-users@NetBSD.org
15HOMEPAGE= https://www.isc.org/sw/dhcp 15HOMEPAGE= https://www.isc.org/sw/dhcp
16LICENSE= isc 16LICENSE= isc
17 17
18CONFLICTS+= isc-dhcp-base-3.*{,nb*} 18CONFLICTS+= isc-dhcp-base-3.*{,nb*}
19 19
20VERSION= 4.2.4-P2 20VERSION= 4.2.5-P1
21 21
22.include "../../mk/bsd.prefs.mk" 22.include "../../mk/bsd.prefs.mk"
23 23
24GNU_CONFIGURE= yes 24GNU_CONFIGURE= yes
25DHCP_HOME?= ${VARBASE}/db/isc-dhcp 25DHCP_HOME?= ${VARBASE}/db/isc-dhcp
26DHCP_PID?= ${VARBASE}/run/isc-dhcp 26DHCP_PID?= ${VARBASE}/run/isc-dhcp
27PKG_SYSCONFSUBDIR= dhcp 27PKG_SYSCONFSUBDIR= dhcp
28 28
29USE_TOOLS+= gmake 29USE_TOOLS+= gmake
30USE_LANGUAGES+= c c++ 30USE_LANGUAGES+= c c++
31 31
32PATCHDIR= ${.CURDIR}/../isc-dhcp4/patches 32PATCHDIR= ${.CURDIR}/../isc-dhcp4/patches
33DISTINFO_FILE= ${.CURDIR}/../isc-dhcp4/distinfo 33DISTINFO_FILE= ${.CURDIR}/../isc-dhcp4/distinfo
cvs diff -r1.13 -r1.13.4.1 pkgsrc/net/isc-dhcp4/distinfo (expand / switch to unified diff)

--- pkgsrc/net/isc-dhcp4/distinfo 2012/09/13 01:38:57 1.13
+++ pkgsrc/net/isc-dhcp4/distinfo 2013/03/30 13:38:50 1.13.4.1
@@ -1,9 +1,9 @@ @@ -1,9 +1,9 @@
1$NetBSD: distinfo,v 1.13 2012/09/13 01:38:57 taca Exp $ 1$NetBSD: distinfo,v 1.13.4.1 2013/03/30 13:38:50 tron Exp $
2 2
3SHA1 (dhcp-4.2.4-P2.tar.gz) = 78a819d7af6688942429de2178124ea371f038f2 3SHA1 (dhcp-4.2.5-P1.tar.gz) = 120b6e476b2ac0d35e1dc8dee53752c42449b925
4RMD160 (dhcp-4.2.4-P2.tar.gz) = a02661dc79079b1936db888666e56c7436b5bab9 4RMD160 (dhcp-4.2.5-P1.tar.gz) = 8633cea4a2e5a1900c8a6dac3ebcbd6ff53c2fa9
5Size (dhcp-4.2.4-P2.tar.gz) = 8190209 bytes 5Size (dhcp-4.2.5-P1.tar.gz) = 8255960 bytes
6SHA1 (patch-aa) = cdb64616f16ee79bf14f496518a2958352ce1fc9 6SHA1 (patch-aa) = cdb64616f16ee79bf14f496518a2958352ce1fc9
7SHA1 (patch-ab) = 3a36eb65c6b0a865f2d8a350fa083fa2fe549efd 7SHA1 (patch-ab) = 3a36eb65c6b0a865f2d8a350fa083fa2fe549efd
8SHA1 (patch-ac) = 97af5dd9e787c63ca387fb05df20f42d90b985fb 8SHA1 (patch-ac) = 97af5dd9e787c63ca387fb05df20f42d90b985fb
9SHA1 (patch-includes_Makefile.in) = 6004f66e28cd53c0acd09746a284eefe70a3aef2 9SHA1 (patch-includes_Makefile.in) = 6004f66e28cd53c0acd09746a284eefe70a3aef2
cvs diff -r1.6 -r1.6.2.1 pkgsrc/net/isc-dhcpd4/Makefile (expand / switch to unified diff)

--- pkgsrc/net/isc-dhcpd4/Makefile 2012/10/23 17:18:29 1.6
+++ pkgsrc/net/isc-dhcpd4/Makefile 2013/03/30 13:38:51 1.6.2.1
@@ -1,23 +1,24 @@ @@ -1,23 +1,24 @@
1# $NetBSD: Makefile,v 1.6 2012/10/23 17:18:29 asau Exp $ 1# $NetBSD: Makefile,v 1.6.2.1 2013/03/30 13:38:51 tron Exp $
2# 2#
3 3
4PKGNAME= isc-dhcpd-${DHVER} 4PKGNAME= isc-dhcpd-${DHVER}
5COMMENT= ISC Dynamic Host Configuration Protocol (DHCP) Server 5COMMENT= ISC Dynamic Host Configuration Protocol (DHCP) Server
6BUILD_SUBDIR= bind includes tests common omapip dhcpctl server 6BUILD_SUBDIR= bind includes tests common omapip dhcpctl server
7SUBDIR= omapip dhcpctl server 7SUBDIR= omapip dhcpctl server
8 8
9CONF_FILES+= ${EGDIR}/dhcpd.conf ${PKG_SYSCONFDIR}/dhcpd.conf 9CONF_FILES+= ${EGDIR}/dhcpd.conf ${PKG_SYSCONFDIR}/dhcpd.conf
10#CONF_FILES+= ${EGDIR}/dhcpd6.conf ${PKG_SYSCONFDIR}/dhcpd6.conf 10#CONF_FILES+= ${EGDIR}/dhcpd6.conf ${PKG_SYSCONFDIR}/dhcpd6.conf
11RCD_SCRIPTS= isc_dhcpd 11RCD_SCRIPTS= isc_dhcpd
12FILES_SUBST+= DHCP_HOME=${DHCP_HOME} 12FILES_SUBST+= DHCP_HOME=${DHCP_HOME}
13 13
14.include "${.CURDIR}/../isc-dhcp4/options.mk" 14.include "${.CURDIR}/../isc-dhcp4/options.mk"
15 15
16INSTALLATION_DIRS+= ${EGDIR} 16INSTALLATION_DIRS+= ${EGDIR}
17 17
18post-install: 18post-install:
19 ${INSTALL_DATA} ${WRKSRC}/server/dhcpd.conf ${DESTDIR}${EGDIR} 19 ${INSTALL_DATA} ${WRKSRC}/server/dhcpd.conf.example \
 20 ${DESTDIR}${EGDIR}/dhcpd.conf
20 21
21.include "../../net/isc-dhcp4/Makefile.common" 22.include "../../net/isc-dhcp4/Makefile.common"
22.include "../../net/isc-dhcp4/buildlink3.mk" 23.include "../../net/isc-dhcp4/buildlink3.mk"
23.include "../../mk/bsd.pkg.mk" 24.include "../../mk/bsd.pkg.mk"