pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/net Update to 4.1.0
details: https://anonhg.NetBSD.org/pkgsrc/rev/29030c6b8a33
branches: trunk
changeset: 552426:29030c6b8a33
user: adrianp <adrianp%pkgsrc.org@localhost>
date: Sun Jan 04 00:56:32 2009 +0000
description:
Update to 4.1.0
ISC DHCP 4.1.x will have several new DHCPv6 features that were not in DHCP 4.0.x. These new features include:
* Support for the rapid-commit option on the client side
* Prefix Delegation support
* IA_TA address support
* A basic DHCPv6 relay agent
* basic DHCPv6 Leasequery support
diffstat:
net/isc-dhclient4/Makefile | 5 +--
net/isc-dhclient4/PLIST | 6 ++--
net/isc-dhclient4/distinfo | 8 -------
net/isc-dhclient4/files/isc_dhclient.sh | 33 ++++++++++++++++++++++++++++++
net/isc-dhcp4/Makefile | 13 +++++------
net/isc-dhcp4/Makefile.common | 12 +++++-----
net/isc-dhcp4/PLIST | 10 ++++----
net/isc-dhcp4/buildlink3.mk | 20 +++++++++---------
net/isc-dhcp4/distinfo | 12 +++++-----
net/isc-dhcp4/files/isc_dhclient.sh | 33 ------------------------------
net/isc-dhcp4/files/isc_dhcpd.sh | 36 ---------------------------------
net/isc-dhcp4/files/isc_dhcrelay.sh | 33 ------------------------------
net/isc-dhcp4/patches/patch-aa | 8 +++---
net/isc-dhcp4/patches/patch-ab | 8 +++---
net/isc-dhcpd4/Makefile | 5 +--
net/isc-dhcpd4/PLIST | 6 ++--
net/isc-dhcpd4/distinfo | 8 -------
net/isc-dhcpd4/files/isc_dhcpd.sh | 36 +++++++++++++++++++++++++++++++++
net/isc-dhcrelay4/Makefile | 5 +--
net/isc-dhcrelay4/distinfo | 8 -------
net/isc-dhcrelay4/files/isc_dhcrelay.sh | 33 ++++++++++++++++++++++++++++++
21 files changed, 155 insertions(+), 183 deletions(-)
diffs (truncated from 526 to 300 lines):
diff -r 7a7918402d7f -r 29030c6b8a33 net/isc-dhclient4/Makefile
--- a/net/isc-dhclient4/Makefile Sun Jan 04 00:53:23 2009 +0000
+++ b/net/isc-dhclient4/Makefile Sun Jan 04 00:56:32 2009 +0000
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2008/12/21 21:24:08 adrianp Exp $
+# $NetBSD: Makefile,v 1.3 2009/01/04 00:59:23 adrianp Exp $
#
+PKGNAME= isc-dhclient-${DHVER}
COMMENT= ISC Dynamic Host Configuration Protocol (DHCP) Client
-COMPONENT= client
-PKGREVISION= 1
SUBDIR= client
CONF_FILES+= ${EGDIR}/dhclient.conf ${PKG_SYSCONFDIR}/dhclient.conf
diff -r 7a7918402d7f -r 29030c6b8a33 net/isc-dhclient4/PLIST
--- a/net/isc-dhclient4/PLIST Sun Jan 04 00:53:23 2009 +0000
+++ b/net/isc-dhclient4/PLIST Sun Jan 04 00:56:32 2009 +0000
@@ -1,9 +1,9 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2008/02/13 22:05:21 adrianp Exp $
+@comment $NetBSD: PLIST,v 1.2 2009/01/04 00:59:23 adrianp Exp $
man/man5/dhclient.conf.5
man/man5/dhclient.leases.5
man/man8/dhclient-script.8
man/man8/dhclient.8
sbin/dhclient
-share/examples/isc-dhcp-client/dhclient.conf
+share/examples/isc-dhclient/dhclient.conf
share/examples/rc.d/isc_dhclient
-@dirrm share/examples/isc-dhcp-client
+@dirrm share/examples/isc-dhclient
diff -r 7a7918402d7f -r 29030c6b8a33 net/isc-dhclient4/distinfo
--- a/net/isc-dhclient4/distinfo Sun Jan 04 00:53:23 2009 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
-$NetBSD: distinfo,v 1.2 2008/12/21 21:24:08 adrianp Exp $
-
-SHA1 (dhcp-4.0.0.tar.gz) = acb4ab7634ba002893b15baba1443ef4d6c92201
-RMD160 (dhcp-4.0.0.tar.gz) = 86963598124617bc7d1059262c75176db431f26d
-Size (dhcp-4.0.0.tar.gz) = 1043725 bytes
-SHA1 (patch-aa) = 162f8950cfcbb9647b81d8d1518867aaf8ec7905
-SHA1 (patch-ab) = cd38b5075d2f3a3121fb7dc9f870a6091c603ef1
-SHA1 (patch-ac) = 7079a37a7bbdf7ede805ecba61700ecf86fffaea
diff -r 7a7918402d7f -r 29030c6b8a33 net/isc-dhclient4/files/isc_dhclient.sh
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/net/isc-dhclient4/files/isc_dhclient.sh Sun Jan 04 00:56:32 2009 +0000
@@ -0,0 +1,33 @@
+#!@RCD_SCRIPTS_SHELL@
+#
+# $NetBSD: isc_dhclient.sh,v 1.1 2009/01/04 00:59:23 adrianp Exp $
+#
+
+# PROVIDE: dhclient
+# REQUIRE: network mountcritlocal
+# BEFORE: NETWORKING
+#
+# Note that there no syslog logging of dhclient messages at boot because
+# dhclient needs to start before services that syslog depends upon do.
+#
+
+if [ -f /etc/rc.subr ]; then
+ . /etc/rc.subr
+fi
+
+name="isc_dhclient"
+rcvar="${name}"
+command="@PREFIX@/sbin/dhclient"
+pidfile="@VARBASE@/run/isc-dhcp/isc-dhclient.pid"
+start_precmd="isc_dhclient_precmd"
+
+isc_dhclient_precmd()
+{
+ if [ ! -d @VARBASE@/run/isc-dhcp ]; then
+ @MKDIR@ @VARBASE@/run/isc-dhcp
+ @CHMOD@ 0770 @VARBASE@/run/isc-dhcp
+ fi
+}
+
+load_rc_config $rcvar
+run_rc_command "$1"
diff -r 7a7918402d7f -r 29030c6b8a33 net/isc-dhcp4/Makefile
--- a/net/isc-dhcp4/Makefile Sun Jan 04 00:53:23 2009 +0000
+++ b/net/isc-dhcp4/Makefile Sun Jan 04 00:56:32 2009 +0000
@@ -1,22 +1,21 @@
-# $NetBSD: Makefile,v 1.2 2008/12/21 21:24:08 adrianp Exp $
+# $NetBSD: Makefile,v 1.3 2009/01/04 00:56:32 adrianp Exp $
#
+PKGNAME= isc-dhcp-${DHVER}
COMMENT= ISC Dynamic Host Configuration Protocol (DHCP) Base
-COMPONENT= base
-PKGREVISION= 1
SUBDIR= includes common minires dst
.include "options.mk"
post-install:
- ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/isc-dhcp-${COMPONENT}
+ ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/${PKGBASE}
${INSTALL_DATA} ${WRKSRC}/README \
- ${PREFIX}/share/doc/isc-dhcp-${COMPONENT}
+ ${PREFIX}/share/doc/${PKGBASE}
${INSTALL_DATA} ${WRKSRC}/RELNOTES \
- ${PREFIX}/share/doc/isc-dhcp-${COMPONENT}
+ ${PREFIX}/share/doc/${PKGBASE}
${INSTALL_DATA} ${WRKSRC}/doc/References.txt \
- ${PREFIX}/share/doc/isc-dhcp-${COMPONENT}
+ ${PREFIX}/share/doc/${PKGBASE}
.include "../../net/isc-dhcp4/Makefile.common"
.include "../../mk/bsd.pkg.mk"
diff -r 7a7918402d7f -r 29030c6b8a33 net/isc-dhcp4/Makefile.common
--- a/net/isc-dhcp4/Makefile.common Sun Jan 04 00:53:23 2009 +0000
+++ b/net/isc-dhcp4/Makefile.common Sun Jan 04 00:56:32 2009 +0000
@@ -1,17 +1,17 @@
-# $NetBSD: Makefile.common,v 1.3 2008/12/21 21:24:08 adrianp Exp $
+# $NetBSD: Makefile.common,v 1.4 2009/01/04 00:56:32 adrianp 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.0.0
-PKGNAME= ${DISTNAME:S/dhcp/isc-dhcp-${COMPONENT}/}
+DISTNAME= dhcp-4.1.0
+DHVER= ${DISTNAME:S/dhcp-//}
CATEGORIES= net
MASTER_SITES= http://ftp.isc.org/isc/dhcp/
MAINTAINER= adrianp%NetBSD.org@localhost
-HOMEPAGE= http://www.isc.org/sw/dhcp/dhcp4_0.php
+HOMEPAGE= https://www.isc.org/sw/dhcp
CONFLICTS+= isc-dhcp-base-3.*{,nb*}
@@ -22,9 +22,9 @@
DHCP_PID?= ${VARBASE}/run/isc-dhcp
PKG_SYSCONFSUBDIR= dhcp
-FILESDIR= ${.CURDIR}/../isc-dhcp4/files
PATCHDIR= ${.CURDIR}/../isc-dhcp4/patches
-EGDIR= ${PREFIX}/share/examples/isc-dhcp-${COMPONENT}
+DISTINFO_FILE= ${.CURDIR}/../isc-dhcp4/distinfo
+EGDIR= ${PREFIX}/share/examples/${PKGBASE}
BUILD_DEFS+= VARBASE DHCP_HOME DHCP_PID
CONFIGURE_ARGS+= --localstatedir=${VARBASE}
diff -r 7a7918402d7f -r 29030c6b8a33 net/isc-dhcp4/PLIST
--- a/net/isc-dhcp4/PLIST Sun Jan 04 00:53:23 2009 +0000
+++ b/net/isc-dhcp4/PLIST Sun Jan 04 00:56:32 2009 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2008/02/13 22:03:58 adrianp Exp $
+@comment $NetBSD: PLIST,v 1.2 2009/01/04 00:56:32 adrianp Exp $
include/isc-dhcp/boolean.h
include/isc-dhcp/commandline.h
include/isc-dhcp/dst.h
@@ -21,9 +21,9 @@
lib/libdst.a
man/man5/dhcp-eval.5
man/man5/dhcp-options.5
-share/doc/isc-dhcp-base/README
-share/doc/isc-dhcp-base/RELNOTES
-share/doc/isc-dhcp-base/References.txt
-@dirrm share/doc/isc-dhcp-base
+share/doc/isc-dhcp/README
+share/doc/isc-dhcp/RELNOTES
+share/doc/isc-dhcp/References.txt
+@dirrm share/doc/isc-dhcp
@dirrm include/isc-dhcp
@dirrm include/omapip
diff -r 7a7918402d7f -r 29030c6b8a33 net/isc-dhcp4/buildlink3.mk
--- a/net/isc-dhcp4/buildlink3.mk Sun Jan 04 00:53:23 2009 +0000
+++ b/net/isc-dhcp4/buildlink3.mk Sun Jan 04 00:56:32 2009 +0000
@@ -1,19 +1,19 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2008/02/13 22:03:58 adrianp Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/01/04 00:56:32 adrianp Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
-ISC_DHCP_BASE_BUILDLINK3_MK:= ${ISC_DHCP_BASE_BUILDLINK3_MK}+
+ISC_DHCP_BUILDLINK3_MK:= ${ISC_DHCP_BUILDLINK3_MK}+
.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+= isc-dhcp-base
+BUILDLINK_DEPENDS+= isc-dhcp
.endif
-BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nisc-dhcp-base}
-BUILDLINK_PACKAGES+= isc-dhcp-base
-BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}isc-dhcp-base
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nisc-dhcp}
+BUILDLINK_PACKAGES+= isc-dhcp
+BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}isc-dhcp
-.if ${ISC_DHCP_BASE_BUILDLINK3_MK} == "+"
-BUILDLINK_API_DEPENDS.isc-dhcp-base+= isc-dhcp-base>=4.0.0
-BUILDLINK_PKGSRCDIR.isc-dhcp-base?= ../../net/isc-dhcp4
-.endif # ISC_DHCP_BASE_BUILDLINK3_MK
+.if ${ISC_DHCP_BUILDLINK3_MK} == "+"
+BUILDLINK_API_DEPENDS.isc-dhcp+= isc-dhcp>=4.1.0
+BUILDLINK_PKGSRCDIR.isc-dhcp?= ../../net/isc-dhcp4
+.endif # ISC_DHCP_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff -r 7a7918402d7f -r 29030c6b8a33 net/isc-dhcp4/distinfo
--- a/net/isc-dhcp4/distinfo Sun Jan 04 00:53:23 2009 +0000
+++ b/net/isc-dhcp4/distinfo Sun Jan 04 00:56:32 2009 +0000
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.2 2008/12/21 21:24:08 adrianp Exp $
+$NetBSD: distinfo,v 1.3 2009/01/04 00:56:32 adrianp Exp $
-SHA1 (dhcp-4.0.0.tar.gz) = acb4ab7634ba002893b15baba1443ef4d6c92201
-RMD160 (dhcp-4.0.0.tar.gz) = 86963598124617bc7d1059262c75176db431f26d
-Size (dhcp-4.0.0.tar.gz) = 1043725 bytes
-SHA1 (patch-aa) = 162f8950cfcbb9647b81d8d1518867aaf8ec7905
-SHA1 (patch-ab) = cd38b5075d2f3a3121fb7dc9f870a6091c603ef1
+SHA1 (dhcp-4.1.0.tar.gz) = 46e161892140a3b60cd56e62b442f48f51bc605f
+RMD160 (dhcp-4.1.0.tar.gz) = bf96fa9d135a65b4d9b27f8caf4f3744f0636c80
+Size (dhcp-4.1.0.tar.gz) = 1086815 bytes
+SHA1 (patch-aa) = 4090c4198ee16bd596d16a06856cfb5bb83dab81
+SHA1 (patch-ab) = 049a3a5037c91a83c0f3eb22e76d861d8c3aa801
SHA1 (patch-ac) = 7079a37a7bbdf7ede805ecba61700ecf86fffaea
diff -r 7a7918402d7f -r 29030c6b8a33 net/isc-dhcp4/files/isc_dhclient.sh
--- a/net/isc-dhcp4/files/isc_dhclient.sh Sun Jan 04 00:53:23 2009 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,33 +0,0 @@
-#!@RCD_SCRIPTS_SHELL@
-#
-# $NetBSD: isc_dhclient.sh,v 1.1.1.1 2008/02/13 22:03:58 adrianp Exp $
-#
-
-# PROVIDE: dhclient
-# REQUIRE: network mountcritlocal
-# BEFORE: NETWORKING
-#
-# Note that there no syslog logging of dhclient messages at boot because
-# dhclient needs to start before services that syslog depends upon do.
-#
-
-if [ -f /etc/rc.subr ]; then
- . /etc/rc.subr
-fi
-
-name="dhclient"
-rcvar="isc_${name}"
-command="@PREFIX@/sbin/${name}"
-pidfile="@VARBASE@/run/isc-dhcp/isc-${name}.pid"
-start_precmd="isc_dhclient_precmd"
-
-isc_dhclient_precmd()
-{
- if [ ! -d @VARBASE@/run/isc-dhcp ]; then
- @MKDIR@ @VARBASE@/run/isc-dhcp
- @CHMOD@ 0770 @VARBASE@/run/isc-dhcp
- fi
-}
-
-load_rc_config $rcvar
-run_rc_command "$1"
diff -r 7a7918402d7f -r 29030c6b8a33 net/isc-dhcp4/files/isc_dhcpd.sh
--- a/net/isc-dhcp4/files/isc_dhcpd.sh Sun Jan 04 00:53:23 2009 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,36 +0,0 @@
-#!@RCD_SCRIPTS_SHELL@
-#
-# $NetBSD: isc_dhcpd.sh,v 1.1.1.1 2008/02/13 22:03:58 adrianp Exp $
-#
-
-# PROVIDE: dhcpd
-# REQUIRE: DAEMON
-# BEFORE: LOGIN
-
-if [ -f /etc/rc.subr ]; then
- . /etc/rc.subr
-fi
-
-name="dhcpd"
-rcvar="isc_${name}"
-command="@PREFIX@/sbin/${name}"
-pidfile="@VARBASE@/run/isc-dhcp/isc-${name}.pid"
-required_files="@PKG_SYSCONFDIR@/${name}.conf"
-start_precmd="isc_dhcpd_precmd"
-
-isc_dhcpd_precmd()
-{
- if [ ! -d @VARBASE@/run/isc-dhcp ]; then
- @MKDIR@ @VARBASE@/run/isc-dhcp
- @CHMOD@ 0770 @VARBASE@/run/isc-dhcp
- fi
-
- if [ ! -f @DHCP_HOME@/dhcpd.leases ]; then
- @MKDIR@ @DHCP_HOME@
- @TOUCH@ @DHCP_HOME@/dhcpd.leases
- @CHMOD@ 0640 @DHCP_HOME@/dhcpd.leases
- fi
-}
-
-load_rc_config $rcvar
-run_rc_command "$1"
Home |
Main Index |
Thread Index |
Old Index