From 9588318bbdb01080d0b4c457a748c321653e8b58 Mon Sep 17 00:00:00 2001 From: taca Date: Fri, 8 Apr 2011 14:09:23 +0000 Subject: Update ISC DHCP package to 4.2.1p1 (4.2.1-P1), fixes a few security problems. For more detail, please refer: http://ftp.isc.org/isc/dhcp/dhcp-4.2.1-P1-RELNOTES --- net/isc-dhcp4/Makefile | 5 +++-- net/isc-dhcp4/Makefile.common | 5 +++-- net/isc-dhcp4/PLIST | 19 +++++-------------- net/isc-dhcp4/distinfo | 15 ++++++++------- net/isc-dhcp4/patches/patch-aa | 8 +++++--- net/isc-dhcp4/patches/patch-ab | 8 +++++--- net/isc-dhcp4/patches/patch-ac | 10 ++++++---- net/isc-dhcp4/patches/patch-includes_Makefile.in | 15 +++++++++++++++ 8 files changed, 50 insertions(+), 35 deletions(-) create mode 100644 net/isc-dhcp4/patches/patch-includes_Makefile.in (limited to 'net/isc-dhcp4') diff --git a/net/isc-dhcp4/Makefile b/net/isc-dhcp4/Makefile index c8effeb40d4..04789a1e8a8 100644 --- a/net/isc-dhcp4/Makefile +++ b/net/isc-dhcp4/Makefile @@ -1,9 +1,10 @@ -# $NetBSD: Makefile,v 1.6 2010/09/24 20:29:27 spz Exp $ +# $NetBSD: Makefile,v 1.7 2011/04/08 14:09:23 taca Exp $ # PKGNAME= isc-dhcp-${DHVER} COMMENT= ISC Dynamic Host Configuration Protocol (DHCP) Base -SUBDIR= includes common minires dst +BUILD_SUBDIR= bind includes tests common # dst +SUBDIR= includes common # dst PKG_DESTDIR_SUPPORT= user-destdir diff --git a/net/isc-dhcp4/Makefile.common b/net/isc-dhcp4/Makefile.common index f87afe21e3f..6fa24e6eaf1 100644 --- a/net/isc-dhcp4/Makefile.common +++ b/net/isc-dhcp4/Makefile.common @@ -1,11 +1,11 @@ -# $NetBSD: Makefile.common,v 1.8 2010/09/24 20:29:28 spz Exp $ +# $NetBSD: Makefile.common,v 1.9 2011/04/08 14:09:23 taca Exp $ # # used by net/isc-dhcp4/Makefile # used by net/isc-dhcpd4/Makefile # used by net/isc-dhclient4/Makefile # used by net/isc-dhcrelay4/Makefile -DISTNAME= dhcp-4.1.1-P1 +DISTNAME= dhcp-4.2.1-P1 DHVER= ${DISTNAME:S/dhcp-//:S/-P/p/} CATEGORIES= net MASTER_SITES= http://ftp.isc.org/isc/dhcp/ @@ -45,6 +45,7 @@ SUBST_SED.config= -e "s|@@PREFIX@@|${PREFIX}|g" SUBST_SED.config+= -e "s|@@PKG_SYSCONFDIR@@|${PKG_SYSCONFDIR}|g" SUBST_MESSAGE.config= Fixing configuration files. +BUILD_DIRS= ${BUILD_SUBDIR} INSTALL_DIRS= ${SUBDIR} .include "../../security/openssl/buildlink3.mk" diff --git a/net/isc-dhcp4/PLIST b/net/isc-dhcp4/PLIST index 961982754c7..8a57ec1532d 100644 --- a/net/isc-dhcp4/PLIST +++ b/net/isc-dhcp4/PLIST @@ -1,24 +1,15 @@ -@comment $NetBSD: PLIST,v 1.3 2009/06/14 18:09:30 joerg Exp $ -include/isc-dhcp/boolean.h -include/isc-dhcp/commandline.h -include/isc-dhcp/dst.h -include/isc-dhcp/formatcheck.h -include/isc-dhcp/int.h -include/isc-dhcp/lang.h -include/isc-dhcp/list.h -include/isc-dhcp/mem.h -include/isc-dhcp/print.h -include/isc-dhcp/result.h -include/isc-dhcp/string.h -include/isc-dhcp/types.h +@comment $NetBSD: PLIST,v 1.4 2011/04/08 14:09:23 taca Exp $ +@comment include/isc-dhcp/dst.h include/omapip/alloc.h include/omapip/buffer.h include/omapip/convert.h include/omapip/hash.h +include/omapip/isclib.h include/omapip/omapip.h include/omapip/omapip_p.h +include/omapip/result.h include/omapip/trace.h -lib/libdst.a +@comment lib/libdst.a man/man5/dhcp-eval.5 man/man5/dhcp-options.5 share/doc/isc-dhcp/README diff --git a/net/isc-dhcp4/distinfo b/net/isc-dhcp4/distinfo index 2dd6318577f..1019c0771b8 100644 --- a/net/isc-dhcp4/distinfo +++ b/net/isc-dhcp4/distinfo @@ -1,8 +1,9 @@ -$NetBSD: distinfo,v 1.5 2010/09/24 20:29:28 spz Exp $ +$NetBSD: distinfo,v 1.6 2011/04/08 14:09:23 taca Exp $ -SHA1 (dhcp-4.1.1-P1.tar.gz) = e9e756df09502f6666cd79bdf0ab3af0f92b41b0 -RMD160 (dhcp-4.1.1-P1.tar.gz) = d963e87a24e4dd8f98002577446169773a0b8422 -Size (dhcp-4.1.1-P1.tar.gz) = 1085414 bytes -SHA1 (patch-aa) = d55d7d6fae1ebaae4351b7c419c8750aeed77d2c -SHA1 (patch-ab) = 5e26435c3aab88d2752d7ebf2ba2822a69df5c73 -SHA1 (patch-ac) = 7079a37a7bbdf7ede805ecba61700ecf86fffaea +SHA1 (dhcp-4.2.1-P1.tar.gz) = 7767019313b4128357054a1eb053c66799831dd6 +RMD160 (dhcp-4.2.1-P1.tar.gz) = e3607828ea12eb718c0877430f9607d336d78c36 +Size (dhcp-4.2.1-P1.tar.gz) = 8797289 bytes +SHA1 (patch-aa) = cdb64616f16ee79bf14f496518a2958352ce1fc9 +SHA1 (patch-ab) = 3a36eb65c6b0a865f2d8a350fa083fa2fe549efd +SHA1 (patch-ac) = 97af5dd9e787c63ca387fb05df20f42d90b985fb +SHA1 (patch-includes_Makefile.in) = 3d81c1dce46854cee54742d6ea3593c4cb87f57d diff --git a/net/isc-dhcp4/patches/patch-aa b/net/isc-dhcp4/patches/patch-aa index 0df0ec74d7b..c702d5c63d5 100644 --- a/net/isc-dhcp4/patches/patch-aa +++ b/net/isc-dhcp4/patches/patch-aa @@ -1,8 +1,10 @@ -$NetBSD: patch-aa,v 1.3 2010/09/24 20:29:28 spz Exp $ +$NetBSD: patch-aa,v 1.4 2011/04/08 14:09:24 taca Exp $ ---- server/Makefile.in.orig 2010-05-17 20:52:18.000000000 +0000 +* Don't install config files. + +--- server/Makefile.in.orig 2011-03-24 21:58:37.000000000 +0000 +++ server/Makefile.in -@@ -368,13 +368,6 @@ uninstall-man8: +@@ -615,13 +615,6 @@ uninstall-man8: done install-dist_sysconfDATA: $(dist_sysconf_DATA) @$(NORMAL_INSTALL) diff --git a/net/isc-dhcp4/patches/patch-ab b/net/isc-dhcp4/patches/patch-ab index fe93f636208..1f7c5357ab4 100644 --- a/net/isc-dhcp4/patches/patch-ab +++ b/net/isc-dhcp4/patches/patch-ab @@ -1,8 +1,10 @@ -$NetBSD: patch-ab,v 1.3 2010/09/24 20:29:28 spz Exp $ +$NetBSD: patch-ab,v 1.4 2011/04/08 14:09:24 taca Exp $ ---- client/Makefile.in.orig 2010-07-10 03:26:17.000000000 +0000 +* Don't install config files. + +--- client/Makefile.in.orig 2011-03-24 21:58:36.000000000 +0000 +++ client/Makefile.in -@@ -350,13 +350,6 @@ uninstall-man8: +@@ -351,13 +351,6 @@ uninstall-man8: done install-dist_sysconfDATA: $(dist_sysconf_DATA) @$(NORMAL_INSTALL) diff --git a/net/isc-dhcp4/patches/patch-ac b/net/isc-dhcp4/patches/patch-ac index c313f3b0665..5a121fc9952 100644 --- a/net/isc-dhcp4/patches/patch-ac +++ b/net/isc-dhcp4/patches/patch-ac @@ -1,8 +1,10 @@ -$NetBSD: patch-ac,v 1.1 2008/12/21 21:24:08 adrianp Exp $ +$NetBSD: patch-ac,v 1.2 2011/04/08 14:09:24 taca Exp $ ---- includes/dhcpd.h.orig 2007-12-08 19:36:00.000000000 +0000 +* Honor PKG_SYSCONFDIR and PREFIX. + +--- includes/dhcpd.h.orig 2010-12-03 20:32:14.000000000 +0000 +++ includes/dhcpd.h -@@ -1241,7 +1241,7 @@ typedef unsigned char option_mask [16]; +@@ -1386,7 +1386,7 @@ typedef unsigned char option_mask [16]; #else /* !DEBUG */ #ifndef _PATH_DHCPD_CONF @@ -11,7 +13,7 @@ $NetBSD: patch-ac,v 1.1 2008/12/21 21:24:08 adrianp Exp $ #endif /* DEBUG */ #ifndef _PATH_DHCPD_DB -@@ -1263,11 +1263,11 @@ typedef unsigned char option_mask [16]; +@@ -1408,11 +1408,11 @@ typedef unsigned char option_mask [16]; #endif /* DEBUG */ #ifndef _PATH_DHCLIENT_CONF diff --git a/net/isc-dhcp4/patches/patch-includes_Makefile.in b/net/isc-dhcp4/patches/patch-includes_Makefile.in new file mode 100644 index 00000000000..8923c0b423c --- /dev/null +++ b/net/isc-dhcp4/patches/patch-includes_Makefile.in @@ -0,0 +1,15 @@ +$NetBSD: patch-includes_Makefile.in,v 1.1 2011/04/08 14:09:24 taca Exp $ + +--- includes/Makefile.in.orig 2011-03-24 21:58:37.000000000 +0000 ++++ includes/Makefile.in +@@ -146,8 +146,8 @@ 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