Version bump #211186 and cleanup #171402.

Package-Manager: portage-2.2_pre5

11 files changed, 107 insertions, 578 deletions

diff --git a/net-misc/dhcp/Manifest b/net-misc/dhcp/Manifest
index 5e1f7a215003..c488daab5911 100644
--- a/net-misc/dhcp/Manifest
+++ b/net-misc/dhcp/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX dhcp-3.0-ddns-example.patch 401 RMD160 0188ae91fb58fc6f8c0d1b5bcbed58582dfed099 SHA1 c9e0f4c9ccbf1ff89076ff1bec37fb6d1276b7f0 SHA256 cf136ce92ea8f3337b9ded9c6f4f019db9782a68c63a3e8b712d26a04c2c9584
 AUX dhcp-3.0-fix-perms.patch 485 RMD160 3857270dffed5feee95609aeb37d0c9ef8844945 SHA1 1217265a8a7f1416b781e9f79e8dfb8304268e6c SHA256 a805a60b36e148886887aebb797e80f642386b3e55ef4a0b5132f96a2877e018
 AUX dhcp-3.0-paranoia.patch 5366 RMD160 7c64e3dac5b07ff3859fcaa7a8b0e52a0c50446c SHA1 a30103c138e480766f84644fffb1d0897709c27d SHA256 a8db9eb98397a9c1b3a0de07fc107c39dc4f6a4a331d404fc6fcc4a8dbc7aeae
@@ -7,8 +10,8 @@ AUX dhcp-3.0.3-dhclient-hostname.patch 523 RMD160 38c20bcc417822ae858626eb5d0eaf
 AUX dhcp-3.0.3-dhclient-metric.patch 7270 RMD160 04187868f66e03a62dafd31b4cdcdd2029283ce5 SHA1 1d726d1526ae97adbdf1b259bb55e05145060375 SHA256 7e5ace014ed55d7d4e90a6cdac7dec4842ea9d178bb19bf6cdccf295eba9da7d
 AUX dhcp-3.0.3-dhclient-mtu.patch 6413 RMD160 2517c7fe58d7dca95bdbdc80e96b6260cc205e56 SHA1 da342800bafee86726570aa0a5e4e3c8bd5f1371 SHA256 0a4bff3c4c44252125f66a3a4423f677465592b84a8f7f500bad9ba4e3b5cb06
 AUX dhcp-3.0.3-dhclient-no-down.patch 2332 RMD160 26d0c88534b71070e81c86c12b76a2b4ec7c9c2c SHA1 b2a00d46754414e937dc6c3d63a28b63b3b57ac9 SHA256 a5a67de79f6435d9bc4eeea416aff7a904ab567e5e8d75ecf34495bc9f2c5a44
-AUX dhcp-3.0.3-dhclient-ntp.patch 5868 RMD160 41522438308fc8b82dc298752192d1c77b4c26aa SHA1 48b5dd346e714880f8b4af1d95f3ec2ce8074a66 SHA256 751fdfa0b36eab386f4029284d61c0c2b41b3135878738caa02e512999f2ca65
-AUX dhcp-3.0.3-dhclient-resolvconf.patch 6671 RMD160 e4a4825df57fb2eed317a44d474f48edbef21fd7 SHA1 aaa15866035759fb4d39a7b00146995115b718ec SHA256 b27c5eeef6efdc8252e68f660424acdfdffaa1a308ec209773cfac78d9faf2a6
+AUX dhcp-3.0.3-dhclient-ntp.patch 5862 RMD160 73d001b7b2df36cf84aba9db76a1753c8d423a7d SHA1 cc3db6430f07f956c2ad25ed00e47d468eef2600 SHA256 80ab30eee75fb03c099416c25f031d03744011a582e8940c73077d5ee587c1ee
+AUX dhcp-3.0.3-dhclient-resolvconf.patch 6659 RMD160 27e6d97ca0ca52fc85abeb4f21f4cea526cbffcb SHA1 d4808b4ba195a2fe1232136c2e36fb534a4c07c3 SHA256 3e2ec3758f6a56658aa1ef9c8ab29f655716015f0c75eba022fa6e1a5e28b1ac
 AUX dhcp-3.0.3-dhclient-stdin-conf.patch 1948 RMD160 42f32a5bbfe2a937827c2972ef84cfa78c2c401c SHA1 ac7afd5ecbde5348e9acea532dab1e01e3a58e8b SHA256 e1bfd26b7da10acc4bd718e35aae4235308abcacde78dedf39533b11ab18b3ae
 AUX dhcp-3.0.3-libdst.patch 322 RMD160 5216c754a912cfcfc65683afcf44dbe1a7871212 SHA1 804bab67ae06269336c51183d5ff1e8ba45c20b5 SHA256 68e9a081739736980c0ad834dfa6197f940982f53d4d16054715c0346b5b9eca
 AUX dhcp-3.0.3-no_isc_blurb.patch 3002 RMD160 d70f89e1763bfeb23ce8f09399426983df01f7c8 SHA1 99a9fe69988226d29ccc6c2dc745ffab9b66817c SHA256 09c451cd9667fc8effcecd640f4cbe8629d41f6abacf9d1f2f923aab1f6e0bbb
@@ -16,7 +19,7 @@ AUX dhcp-3.0.3-tr.patch 377 RMD160 fe81fefb55796b4e06fa73ec180026dceef5599d SHA1
 AUX dhcp-3.0.3-x-option.patch 6478 RMD160 a0fa5b3c7caf2d303a76c3d6fc135783cfa2bbc6 SHA1 4c77474307f9e657e45618f93ba9120eafd83a9e SHA256 6628629a95ee7e711f9dbce6b7d527b15f98eaf7592a1d0855d7bf65961bc3f7
 AUX dhcp-3.0.4-dhclient-stdin-conf.patch 2176 RMD160 fae08899f6b57da3ec7ab0068e288bbdf2fbf2ae SHA1 c10c35dcf4a94f45f4bc98147a70e9dcf3f01dd5 SHA256 80141fe71e52774f1c7b1a02f2cbd49bc646f19753ceefc1c3605104df0cae5f
 AUX dhcp-3.0.5-bpf-nofallback.patch 1473 RMD160 1a5ece77cb481416935b0d2eea53e85dc4c4ee93 SHA1 d4cad638075a98606e07c633551c8a1d2f78f2e7 SHA256 b215c5ff4a282b475f28168250c05bbbc85e7c37e7af92616571d499b8c14da6
-AUX dhcp-3.1.0a1-dhclient-resolvconf.patch 10328 RMD160 672eb37b32486655a027b37b4c37d103c6e87c15 SHA1 a882cdc741637f921d15238d6761ff8e45ddb8f4 SHA256 f662f98eefe57a5c21cbbcefc6d092c7b60a239b59f10942fe13560ed684889c
+AUX dhcp-3.1.0a1-dhclient-resolvconf.patch 10316 RMD160 183bedd1660bf5a5f9dc7d002199e76aec12341c SHA1 1e0332ea31cfdbe92f3053405587f08117de8f8b SHA256 112b2ed44aab92592eb3810c61ada7f30d9d01fe43b647667326972a37b412a1
 AUX dhcpd.conf 1092 RMD160 936bb112c7cdf8e669b695599252d1f6626be2f3 SHA1 cbabbcea73a0cbc9692462683b983c96d6f18b0c SHA256 b86d27e0560689057b01a352474582fceb3a398eaf3b17f901378ec56284c4d5
 AUX dhcpd.init 1989 RMD160 7f6b6858020100e47efa5d6a0809b2959e551249 SHA1 2c611adc6425fd095740aa56d09d8aafb4fea58a SHA256 916bfeb81dcb3423fd4239270ac2dce2e6dc105b28a06e03b352f6bf6b30ed1e
 AUX dhcrelay.conf 421 RMD160 456edbc9bcc8d3a44db5bb6dbf0c3003c3e7419c SHA1 78ecdb000382893fb49d0052ced063955b0ad9cf SHA256 409b895ed489e75c1a08f72961b45d641b93fd9357f528abc78b1fd036b7f730
@@ -27,5 +30,12 @@ DIST dhcp-3.1.0.tar.gz 797100 RMD160 59ef8b695b66d3cb61437e25a179d9f17639017d SH
 EBUILD dhcp-3.0.3-r9.ebuild 7186 RMD160 e59315a08a6b382915ec7ded0a4c7cfa38c9a5de SHA1 6c11653e84a8f3e81913f3916dabb6d6a38aedb5 SHA256 eee8b146f259da6645b0f901038e63f6c9d4dec8ffd1627c997ad8fde76338b0
 EBUILD dhcp-3.0.6.ebuild 7532 RMD160 8b67dd9acc7d1f392a6fd7d1d3a1e9ce8c00460b SHA1 c0b406cc528a97db2409324688e3a7ab93862677 SHA256 e550750c928525b090ff08087df2a9f63764805d663aee72b8991244a417e509
 EBUILD dhcp-3.1.0.ebuild 7431 RMD160 bd267b1ae0ee8568ae5b8fce5267a41258fb5d48 SHA1 b77e78900b054ee2fd06f1059fff84cc1db3499c SHA256 a2a75e7c2e1b60c84a49f66d59360571534c1ea5245e6a8a14d8c039c1115bfb
-MISC ChangeLog 23857 RMD160 1c16097b94270149640d60dd26f6841cf23d9a4e SHA1 1b701d8e14c1b8fcd713dc01c3e00b8216061d3b SHA256 4bd9fa8a442c9ddcdee2254a4f16d6297e83fa46fb660321eb7617edea53dee4
+MISC ChangeLog 24102 RMD160 59bb22b91d4bb1503fa02192e4920550782d6f34 SHA1 5656e85d8322ac95fc227ebb596613d135c6ed82 SHA256 82ed3b7eb9f42b249f22fd3c88bf846f499051d9ed8a3af9ca37fe9e1888382e
 MISC metadata.xml 358 RMD160 97ecd4b6ee0a24352a71a66d5ad4fd82481156b4 SHA1 d80da2cf7c6892cdad6b681fda29e46472d68871 SHA256 8665f24cdfcc09576b595f8bd257333ff5f9ea7ee0ca2925ba6fb74d90e12415
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFH7p28j9hvisErhMIRAshaAKDM1Nk5MMw5YBUbFgrRYHVPsnojOwCggDKx
+7oouYX3+rY/CNqS9z5oW9E0=
+=+XZK
+-----END PGP SIGNATURE-----
diff --git a/net-misc/dhcpv6/ChangeLog b/net-misc/dhcpv6/ChangeLog
index 752200ae7a11..94deeb197809 100644
--- a/net-misc/dhcpv6/ChangeLog
+++ b/net-misc/dhcpv6/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-misc/dhcpv6
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcpv6/ChangeLog,v 1.17 2007/07/15 08:44:41 phreak Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcpv6/ChangeLog,v 1.18 2008/03/29 19:43:46 vapier Exp $
+
+*dhcpv6-1.0.14 (29 Mar 2008)
+
+  29 Mar 2008; Mike Frysinger <vapier@gentoo.org> -files/dhcp6s.rc,
+  +files/dhcp6x.initd.in, -files/negative-iaid-patch-0.8,
+  +files/dhcp6x.confd.in, -files/dhcpv6-bison-fix.patch,
+  -files/patch-iaid-dhcp6-0.85, -dhcpv6-0.10_pre20060828.ebuild,
+  +dhcpv6-1.0.14.ebuild:
+  Version bump #211186 and cleanup #171402.
 
   15 Jul 2007; Christian Heim <phreak@gentoo.org> metadata.xml:
   Assigning to m-needed, as beu is being retired (#66608).
diff --git a/net-misc/dhcpv6/Manifest b/net-misc/dhcpv6/Manifest
index 4aa6dc6c72d4..a8848777d6db 100644
--- a/net-misc/dhcpv6/Manifest
+++ b/net-misc/dhcpv6/Manifest
@@ -1,9 +1,16 @@
-AUX dhcp6s.rc 693 RMD160 fe3803013a924977d4baf2d403355525682b2269 SHA1 41cc438fa0d78bf36df3efa5a36b66c4a6753617 SHA256 a194ba3cedd66928494774db9b37cbdf916557fe5f7f16b18ae90f9203568a72
-AUX dhcpv6-bison-fix.patch 358 RMD160 2a35b46e4e6cb6e7a2d38a935deadd5890e84bad SHA1 267e1859ab4245b860a482696c4dfdbc575a5d16 SHA256 c1c0a0aac1ff8f639a9e868b48fd874c457a870ef5e3a6ae525223a1c65a5828
-AUX negative-iaid-patch-0.8 17822 RMD160 ad288c5f28145f8a45e5792b13096f7bb4fe86dd SHA1 c7322f4a78dcc3ff234a9c0b4d7742bde554e687 SHA256 d5f1838464d55f2bfdafb2afdc9163989b2e38f782cac872f7d01d4ea81b3b5f
-AUX patch-iaid-dhcp6-0.85 2181 RMD160 792e1a1ad8702a32c3dfed1cb9060a04396ea090 SHA1 9133e726f207a69fbef59690e45f7d93358dc121 SHA256 0df636b9f317aeaa66d47e1f11967311d8889e30aac73f7c16282eea10048bd3
-DIST dhcp-0.10.tgz 238704 RMD160 e34bf0edddef09042a7f69e7135fd1dd4e023c1b SHA1 e2df4dc815954382dd218d930e16072f9421be6c SHA256 281ecafc1969a8ddd761f2951dfed042f54762e2044b1dd20f23e22dae3f50ca
-DIST dhcpv6-cvs20060828.patch.bz2 92734 RMD160 59751b2ba4a1e6e853b78d751863ffb6d9d28b76 SHA1 cf6570bcd39383d3c4ab10b0bd75392a55697b0f SHA256 240c67058de242fe76097eb245192d8f04e61d00b22334fd0877f5659f30c473
-EBUILD dhcpv6-0.10_pre20060828.ebuild 909 RMD160 b32e380c1686c7802691a155fa651a88c4ef613c SHA1 4e2ac01d81304c064900dba47190e1527ad88081 SHA256 fd83e83d3236cc5a632da0a7acc0cb938b317c0ed99e8a3146f8eb8fb48d04cd
-MISC ChangeLog 2616 RMD160 09a8da71bb5108daf6e1f5b1601c3c2dc20a0e30 SHA1 9db31566b387268eccb2f68bcf0a838a896f77bc SHA256 bf4f1e02c7b8cfbe34152b1c7f6cdd3d5da0c8dd4d4c91e79b175bf273e8ae22
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX dhcp6x.confd.in 65 RMD160 3e0f77673bc50f0c741589fae3c077201c8f418d SHA1 db5fbabfc03efe4855615a058c2c9c8ebca5fd65 SHA256 bbb595c7e917b080ab87883eea55da49dc66a58d62261a3ae3956dcdaca5acfc
+AUX dhcp6x.initd.in 491 RMD160 f49f496ca5dc79132667ee3e76a4faf414d49db3 SHA1 2285e7636415b12bba5a217f4d17d0f41bb74c3e SHA256 96bd3e6d6343d7c05edd9e4c720d267a49ddebf1dd622861ff46c3c8517fd7f5
+DIST dhcpv6-1.0.14.tar.gz 701971 RMD160 cc25584b3d747f038275ab6133b50ad140ce1069 SHA1 6071be94ace3ef3662813fade6edf23cd5c42795 SHA256 37bad8c8a6febc29478b4fcbf514c37c69173b54a27b2afe1e07432acbca04fa
+EBUILD dhcpv6-1.0.14.ebuild 939 RMD160 24ff18495349889bd7ea202251243a46f72a2959 SHA1 4db939a441f00ac2cbe31a03c4cbf4402f646bd8 SHA256 30eefe7d70d6a9ee12cb0bbc0783acdf68e7527d04dd934d86e41a34c2f6f5eb
+MISC ChangeLog 2964 RMD160 f5a3a642b81cc48098586be02ee7df036cc50903 SHA1 0321389e4fbf4adc2ed89294b611676e5054d629 SHA256 4eacb33204be5f4274e6653a1e34f0f331d11755fc000067ea06101a9d750306
 MISC metadata.xml 236 RMD160 92f49f8275e75caf57b88a3172d5204eaa4e33ae SHA1 dd1a8550a514e55ab0ed6190ab4794bb090994f8 SHA256 56075995f83836ae824c7cb01931b98d6745f6d5a7764299c8262e801486b829
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFH7pzFj9hvisErhMIRAoqGAJ4izXnmRj8HYFNzJ04NejCpFwwbnwCgx0SO
+RFf0JOSJpMQc1v86cDLxr2Y=
+=FRK6
+-----END PGP SIGNATURE-----
diff --git a/net-misc/dhcpv6/dhcpv6-0.10_pre20060828.ebuild b/net-misc/dhcpv6/dhcpv6-0.10_pre20060828.ebuild
deleted file mode 100644
index a4a3b7a853eb..000000000000
--- a/net-misc/dhcpv6/dhcpv6-0.10_pre20060828.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcpv6/dhcpv6-0.10_pre20060828.ebuild,v 1.1 2006/08/28 07:54:27 vapier Exp $
-
-inherit flag-o-matic
-
-MY_P="dhcp-${PV/_pre*}"
-SNAP=${PV/*_pre}
-DESCRIPTION="Server and client for DHCPv6"
-HOMEPAGE="http://sourceforge.net/projects/dhcpv6/"
-SRC_URI="mirror://sourceforge/dhcpv6/${MY_P}.tgz
-	mirror://gentoo/${PN}-cvs${SNAP}.patch.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~x86"
-IUSE="static"
-
-DEPEND=""
-
-S=${WORKDIR}/${MY_P}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${WORKDIR}"/${PN}-cvs${SNAP}.patch
-}
-
-src_compile() {
-	econf || die
-	use static && append-ldflags -static
-	emake -j1 || die
-}
-
-src_install() {
-	einstall || die
-	dodoc Install ReadMe docs/*.txt *.conf
-	dodir /var/lib/dhcpv6
-	newinitd "${FILESDIR}"/dhcp6s.rc dhcp6s || die
-}
diff --git a/net-misc/dhcpv6/dhcpv6-1.0.14.ebuild b/net-misc/dhcpv6/dhcpv6-1.0.14.ebuild
new file mode 100644
index 000000000000..336edc9f2602
--- /dev/null
+++ b/net-misc/dhcpv6/dhcpv6-1.0.14.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcpv6/dhcpv6-1.0.14.ebuild,v 1.1 2008/03/29 19:43:46 vapier Exp $
+
+inherit flag-o-matic
+
+DESCRIPTION="Server and client for DHCPv6"
+HOMEPAGE="https://fedorahosted.org/dhcpv6/"
+SRC_URI="http://dcantrel.fedorapeople.org/dhcpv6/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~x86"
+IUSE="static"
+
+DEPEND=""
+
+src_compile() {
+	use static && append-ldflags -static
+	econf || die
+	emake || die
+}
+
+mkd() {
+	local x=$1 X=$2 i=$3
+	sed \
+		-e "s:6x:6${x}:g" \
+		-e "s:6X:6${X}:g" \
+		"${FILESDIR}"/dhcp6x.${i}d.in > dhcp6${x}.${i}d
+	new${i}d dhcp6${x}.${i}d dhcp6${x}
+}
+
+src_install() {
+	emake install DESTDIR="${D}" || die
+	dodoc AUTHORS ChangeLog README TODO
+	dodir /var/lib/dhcpv6
+
+	rm -rf "${D}"/etc/{rc.d,sysconfig}
+	mkd s S init
+	mkd s S conf
+	mkd r R init
+	mkd r R conf
+}
diff --git a/net-misc/dhcpv6/files/dhcp6s.rc b/net-misc/dhcpv6/files/dhcp6s.rc
deleted file mode 100644
index 509c22b97caa..000000000000
--- a/net-misc/dhcpv6/files/dhcp6s.rc
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcpv6/files/dhcp6s.rc,v 1.4 2006/08/28 07:54:27 vapier Exp $
-
-depend() {
-	need net
-}
-
-checkconfig() {
-	if [[ ! -e /etc/dhcp6s.conf ]] ; then
-		eerror "You need an /etc/dhcp6s.conf file to run dhcp6s"
-		eerror "There is a sample conf file in /usr/share/doc/dhcpv6-[PV]"
-		return 1
-	fi
-}
-
-start() {
-	checkconfig || return 1
-	ebegin "Starting dhcp6s"
-	start-stop-daemon --start --quiet --exec /usr/sbin/dhcp6s
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping dhcp6s"
-	start-stop-daemon --stop --quiet --exec /usr/sbin/dhcp6s
-	eend $?
-}
diff --git a/net-misc/dhcpv6/files/dhcp6x.confd.in b/net-misc/dhcpv6/files/dhcp6x.confd.in
new file mode 100644
index 000000000000..2e3cc3e6c69f
--- /dev/null
+++ b/net-misc/dhcpv6/files/dhcp6x.confd.in
@@ -0,0 +1,4 @@
+# /etc/conf.d/dhcp6x
+
+# Options to give to dhcp6x
+DHCP6X_OPTS=""
diff --git a/net-misc/dhcpv6/files/dhcp6x.initd.in b/net-misc/dhcpv6/files/dhcp6x.initd.in
new file mode 100644
index 000000000000..78678924f7ab
--- /dev/null
+++ b/net-misc/dhcpv6/files/dhcp6x.initd.in
@@ -0,0 +1,20 @@
+#!/sbin/runscript
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcpv6/files/dhcp6x.initd.in,v 1.1 2008/03/29 19:43:47 vapier Exp $
+
+depend() {
+	need net
+}
+
+start() {
+	ebegin "Starting dhcp6x"
+	start-stop-daemon --start --quiet --exec /usr/sbin/dhcp6x -- ${DHCP6X_OPTS}
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping dhcp6x"
+	start-stop-daemon --stop --quiet --exec /usr/sbin/dhcp6x
+	eend $?
+}
diff --git a/net-misc/dhcpv6/files/dhcpv6-bison-fix.patch b/net-misc/dhcpv6/files/dhcpv6-bison-fix.patch
deleted file mode 100644
index 77b157606bcf..000000000000
--- a/net-misc/dhcpv6/files/dhcpv6-bison-fix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -uNr dhcp6-0.85.orig/server6_parse.y dhcp6-0.85/server6_parse.y
---- dhcp6-0.85.orig/server6_parse.y	2004-06-12 00:29:01.384999104 +0000
-+++ dhcp6-0.85/server6_parse.y	2004-06-12 00:29:47.882930344 +0000
-@@ -83,7 +83,6 @@
- %token	<bool>	BOOLEAN
- %token	<addr>	IPV6ADDR
- %token 	<str>	INFINITY
--%token	<str>	OPTION
- 
- %token	<str>	HOST
- %token	<str>	POOL
diff --git a/net-misc/dhcpv6/files/negative-iaid-patch-0.8 b/net-misc/dhcpv6/files/negative-iaid-patch-0.8
deleted file mode 100644
index 1e9b08aea852..000000000000
--- a/net-misc/dhcpv6/files/negative-iaid-patch-0.8
+++ /dev/null
@@ -1,428 +0,0 @@
-diff -urN dhcp6-0.8/client6_addr.c dhcp6/client6_addr.c
---- dhcp6-0.8/client6_addr.c	2003-06-03 12:12:00.000000000 -0700
-+++ dhcp6/client6_addr.c	2003-06-13 14:55:25.000000000 -0700
-@@ -163,7 +163,7 @@
- 	/* set up start date, and renew timer */
- 	if ((client6_iaidaddr.timer = 
- 	    dhcp6_add_timer(dhcp6_iaidaddr_timo, &client6_iaidaddr)) == NULL) {
--		 dprintf(LOG_ERR, "%s" "failed to add a timer for iaid %d",
-+		 dprintf(LOG_ERR, "%s" "failed to add a timer for iaid %u",
- 			FNAME, client6_iaidaddr.client6_info.iaidinfo.iaid);
- 		 return (-1);
- 	}
-@@ -404,7 +404,7 @@
- 	if (client6_iaidaddr.timer == NULL) {
- 		if ((client6_iaidaddr.timer = 
- 		     dhcp6_add_timer(dhcp6_iaidaddr_timo, &client6_iaidaddr)) == NULL) {
--	 		dprintf(LOG_ERR, "%s" "failed to add a timer for iaid %d",
-+	 		dprintf(LOG_ERR, "%s" "failed to add a timer for iaid %u",
- 				FNAME, client6_iaidaddr.client6_info.iaidinfo.iaid);
- 	 		return (-1);
- 	    	}
-@@ -633,7 +633,7 @@
- 	struct dhcp6_if *ifp = client6_iaidaddr.ifp;
- 	unsigned long ioctl_cmd;
- 	char *cmdstr;
--	int s;
-+	int s, errno;
- 
- 	switch(cmd) {
- 	case IFADDRCONF_ADD:
-@@ -659,7 +659,7 @@
- 	
- 	req.ifr6_prefixlen = ifaddr->plen;
- 
--	if (ioctl(s, ioctl_cmd, &req)) {
-+	if (ioctl(s, ioctl_cmd, &req) && errno != EEXIST) {
- 		dprintf(LOG_NOTICE, "%s" "failed to %s an address on %s: %s",
- 		    FNAME, cmdstr, ifp->ifname, strerror(errno));
- 		close(s);
-@@ -668,7 +668,6 @@
- 
- 	dprintf(LOG_DEBUG, "%s" "%s an address %s on %s", FNAME, cmdstr,
- 	    in6addr2str(&ifaddr->addr, 0), ifp->ifname);
--	/* ToDo: netlink to DAD */
- 	close(s); 
- 	return (0);
- }
-@@ -684,7 +683,7 @@
- 	for (i = 0; i < num_device; i++, temp++) {
- 		if (!memcmp(temp->hwaddr.data, hdaddr.data, temp->hwaddr.len)
- 		    && hdaddr.len == temp->hwaddr.len && hdaddr.type == temp->hwaddr.type) {
--			dprintf(LOG_DEBUG, "%s"" found interface %s iaid %d", 
-+			dprintf(LOG_DEBUG, "%s"" found interface %s iaid %u", 
- 				FNAME, ifname, temp->iaid);
- 			return temp->iaid;
- 		} else 
-@@ -728,7 +727,7 @@
- 				sizeof(temp->iaid));
- 			temp->hwaddr.type = if_hwaddr.ifr_hwaddr.sa_family;	
- 		}
--		dprintf(LOG_DEBUG, "%s"" create iaid %d for interface %s", 
-+		dprintf(LOG_DEBUG, "%s"" create iaid %u for interface %s", 
- 				FNAME, temp->iaid, ifr->ifr_name);
- 		temp++;
- 	}
-diff -urN dhcp6-0.8/common.c dhcp6/common.c
---- dhcp6-0.8/common.c	2003-04-30 12:04:06.000000000 -0700
-+++ dhcp6/common.c	2003-06-13 14:55:25.000000000 -0700
-@@ -1029,7 +1029,7 @@
- 			/* check iaid */
- 			optinfo->flags |= DHCIFF_TEMP_ADDRS;
- 			optinfo->type = IATA;
--			dprintf(LOG_DEBUG, "%s" "get option iaid is %d", 
-+			dprintf(LOG_DEBUG, "%s" "get option iaid is %u", 
- 				FNAME, optinfo->iaidinfo.iaid);
- 			optinfo->iaidinfo.iaid = ntohl(*(u_int32_t *)cp);
- 			if (get_assigned_ipv6addrs(cp + 4, cp + optlen, optinfo))
-@@ -1049,8 +1049,8 @@
- 				ntohl(*(u_int32_t *)(cp + sizeof(u_int32_t)));
- 			optinfo->iaidinfo.rebindtime = 
- 				ntohl(*(u_int32_t *)(cp + 2 * sizeof(u_int32_t)));
--			dprintf(LOG_DEBUG, "get option iaid is %d, renewtime %d, "
--				"rebindtime %d", optinfo->iaidinfo.iaid,
-+			dprintf(LOG_DEBUG, "get option iaid is %u, renewtime %u, "
-+				"rebindtime %u", optinfo->iaidinfo.iaid,
- 				optinfo->iaidinfo.renewtime, optinfo->iaidinfo.rebindtime);
- 			if (get_assigned_ipv6addrs(cp + 3 * sizeof(u_int32_t), 
- 						cp + optlen, optinfo))
-@@ -1376,7 +1376,7 @@
- 		} else if (optinfo->type == IANA) {
- 			optlen = sizeof(opt_iana);
- 			dprintf(LOG_DEBUG, "set IA_NA iaidinfo: "
--		   		"iaid %d renewtime %d rebindtime %d", 
-+		   		"iaid %u renewtime %u rebindtime %u", 
- 		   		optinfo->iaidinfo.iaid, optinfo->iaidinfo.renewtime, 
- 		   		optinfo->iaidinfo.rebindtime);
- 			opt_iana.iaid = htonl(optinfo->iaidinfo.iaid);
-@@ -1459,7 +1459,7 @@
- 			break;
- 		optlen = sizeof(opt_iapd);
- 		dprintf(LOG_DEBUG, "set IA_PD iaidinfo: "
--		 	"iaid %d renewtime %d rebindtime %d", 
-+		 	"iaid %u renewtime %u rebindtime %u", 
- 		  	optinfo->iaidinfo.iaid, optinfo->iaidinfo.renewtime, 
- 		   	optinfo->iaidinfo.rebindtime);
- 		opt_iapd.iaid = htonl(optinfo->iaidinfo.iaid);
-diff -urN dhcp6-0.8/CVS/Entries dhcp6/CVS/Entries
---- dhcp6-0.8/CVS/Entries	1969-12-31 16:00:00.000000000 -0800
-+++ dhcp6/CVS/Entries	2003-06-13 14:53:35.000000000 -0700
-@@ -0,0 +1,54 @@
-+/.cvsignore/1.1.1.1/Thu Jan 16 15:41:11 2003//
-+/Install/1.1/Tue Feb 18 11:30:16 2003//
-+/Makefile.in/1.11/Tue May 27 20:54:52 2003//
-+/ReadMe/1.10/Wed May 28 21:18:22 2003//
-+/client6_addr.c/1.20/Tue Jun  3 19:12:00 2003//
-+/client6_parse.y/1.8/Mon Mar 31 22:05:28 2003//
-+/client6_token.l/1.7/Wed Apr  2 23:31:49 2003//
-+/common.c/1.16/Wed Apr 30 19:04:06 2003//
-+/common.h/1.9/Wed Apr 30 19:04:07 2003//
-+/config.c/1.9/Sat Apr 12 00:25:32 2003//
-+/config.guess/1.1.1.1/Thu Jan 16 15:41:11 2003//
-+/config.h/1.13/Fri May 16 21:40:46 2003//
-+/config.sub/1.1.1.1/Thu Jan 16 15:41:11 2003//
-+/configure/1.9/Sat Apr 12 00:25:32 2003//
-+/configure.in/1.4/Sat Apr 12 00:25:33 2003//
-+/dad_token.l/1.4/Thu May 29 22:23:28 2003//
-+/dhcp6.h/1.15/Wed May 28 21:10:32 2003//
-+/dhcp6c.8/1.3/Tue May 27 20:56:41 2003//
-+/dhcp6c.c/1.32/Thu Jun  5 22:51:00 2003//
-+/dhcp6c.conf/1.2/Wed Mar 12 00:09:04 2003//
-+/dhcp6c.conf.5/1.2/Fri Mar 28 20:16:36 2003//
-+/dhcp6c.sh/1.1/Tue Feb 18 11:33:13 2003//
-+/dhcp6c.sysconfig/1.1/Tue Feb 18 11:33:13 2003//
-+/dhcp6relay.8/1.1.1.1/Thu Jan 16 15:41:11 2003//
-+/dhcp6relay.c/1.2/Thu Feb 27 19:43:08 2003//
-+/dhcp6s.8/1.2/Fri Mar 28 20:16:37 2003//
-+/dhcp6s.c/1.17/Tue May 27 20:56:41 2003//
-+/dhcp6s.conf/1.3/Fri Apr 18 00:19:59 2003//
-+/dhcp6s.conf.5/1.3/Wed May 28 22:56:23 2003//
-+/dhcp6s.sh/1.1/Tue Feb 18 11:31:49 2003//
-+/dhcp6s.sysconfig/1.1/Tue Feb 18 11:31:49 2003//
-+/hash.c/1.7/Tue Jun  3 19:12:00 2003//
-+/hash.h/1.3/Sat Mar  1 00:24:49 2003//
-+/ifaddrs.c/1.4/Tue Apr 22 18:05:33 2003//
-+/ifaddrs.h/1.1.1.1/Thu Jan 16 15:41:11 2003//
-+/install-sh/1.1.1.1/Thu Jan 16 15:41:11 2003//
-+/lease.c/1.10/Tue Jun  3 19:12:00 2003//
-+/lease.h/1.12/Wed May 28 21:12:16 2003//
-+/lease_token.l/1.10/Tue Jun  3 19:51:13 2003//
-+/queue.h/1.1.1.1/Thu Jan 16 15:41:11 2003//
-+/ra_token.l/1.7/Mon Jun  2 20:38:15 2003//
-+/radvd_token.l/1.4/Thu May 29 22:18:25 2003//
-+/resolv_token.l/1.5/Thu May 22 23:00:30 2003//
-+/server6_addr.c/1.17/Tue Jun  3 19:53:29 2003//
-+/server6_addr.conf/1.2/Mon Feb 10 23:47:09 2003//
-+/server6_conf.c/1.13/Fri May 23 19:00:37 2003//
-+/server6_conf.h/1.9/Wed Apr 30 19:04:14 2003//
-+/server6_parse.y/1.6/Fri May 23 19:00:37 2003//
-+/server6_token.l/1.4/Fri Apr 18 20:33:17 2003//
-+/strlcat.c/1.1.1.1/Thu Jan 16 15:41:11 2003//
-+/strlcpy.c/1.1.1.1/Thu Jan 16 15:41:11 2003//
-+/timer.c/1.7/Tue Mar 11 23:52:23 2003//
-+/timer.h/1.2/Mon Feb 10 23:47:09 2003//
-+D
-diff -urN dhcp6-0.8/CVS/Entries.Log dhcp6/CVS/Entries.Log
---- dhcp6-0.8/CVS/Entries.Log	1969-12-31 16:00:00.000000000 -0800
-+++ dhcp6/CVS/Entries.Log	2003-06-13 14:53:35.000000000 -0700
-@@ -0,0 +1 @@
-+A D/docs////
-diff -urN dhcp6-0.8/CVS/Repository dhcp6/CVS/Repository
---- dhcp6-0.8/CVS/Repository	1969-12-31 16:00:00.000000000 -0800
-+++ dhcp6/CVS/Repository	2003-06-13 14:53:32.000000000 -0700
-@@ -0,0 +1 @@
-+dhcp6
-diff -urN dhcp6-0.8/CVS/Root dhcp6/CVS/Root
---- dhcp6-0.8/CVS/Root	1969-12-31 16:00:00.000000000 -0800
-+++ dhcp6/CVS/Root	2003-06-13 14:53:32.000000000 -0700
-@@ -0,0 +1 @@
-+:ext:shirleyma@cvs.sourceforge.net:/cvsroot/dhcpv6
-diff -urN dhcp6-0.8/dhcp6c.c dhcp6/dhcp6c.c
---- dhcp6-0.8/dhcp6c.c	2003-06-05 15:51:00.000000000 -0700
-+++ dhcp6/dhcp6c.c	2003-06-13 14:55:25.000000000 -0700
-@@ -478,7 +478,7 @@
- 				FNAME, ifp->ifname);
- 			exit(1);
- 		}
--		dprintf(LOG_DEBUG, "%s" "interface %s iaid is %d", 
-+		dprintf(LOG_DEBUG, "%s" "interface %s iaid is %u", 
- 			FNAME, ifp->ifname, ifp->iaidinfo.iaid);
- 	}
- 	client6_iaidaddr.ifp = ifp;
-@@ -487,7 +487,7 @@
- 	duidcpy(&client6_iaidaddr.client6_info.clientid, &client_duid);
- 	/* parse the lease file */
- 	strcpy(leasename, PATH_CLIENT6_LEASE);
--	sprintf(iaidstr, "%d", ifp->iaidinfo.iaid);
-+	sprintf(iaidstr, "%u", ifp->iaidinfo.iaid);
- 	strcat(leasename, iaidstr);
- 	if ((client6_lease_file = 
- 		init_leases(leasename)) == NULL) {
-@@ -954,7 +954,7 @@
- 		if (!(ifp->send_flags & DHCIFF_INFO_ONLY)) {
- 			memcpy(&optinfo.iaidinfo, &client6_iaidaddr.client6_info.iaidinfo,
- 					sizeof(optinfo.iaidinfo));
--			dprintf(LOG_DEBUG, "%s IAID is %d", FNAME, optinfo.iaidinfo.iaid);
-+			dprintf(LOG_DEBUG, "%s IAID is %u", FNAME, optinfo.iaidinfo.iaid);
- 			if (ifp->send_flags & DHCIFF_TEMP_ADDRS) 
- 				optinfo.type = IATA;
- 			else if (ifp->send_flags & DHCIFF_PREFIX_DELEGATION)
-@@ -1529,7 +1529,7 @@
- 			client6_iaidaddr.state = ACTIVE;
- 			if ((client6_iaidaddr.timer = dhcp6_add_timer(dhcp6_iaidaddr_timo, 
- 						&client6_iaidaddr)) == NULL) {
--		 		dprintf(LOG_ERR, "%s" "failed to add a timer for iaid %d",
-+		 		dprintf(LOG_ERR, "%s" "failed to add a timer for iaid %u",
- 					FNAME, client6_iaidaddr.client6_info.iaidinfo.iaid);
- 		 		return (-1);
- 			}
-diff -urN dhcp6-0.8/dhcp6s.c dhcp6/dhcp6s.c
---- dhcp6-0.8/dhcp6s.c	2003-05-27 13:56:41.000000000 -0700
-+++ dhcp6/dhcp6s.c	2003-06-13 14:55:25.000000000 -0700
-@@ -780,7 +780,7 @@
- 				if (dh6->dh6_msgtype == DH6_REBIND)
- 					goto fail;
- 				num = DH6OPT_STCODE_NOBINDING;
--				dprintf(LOG_INFO, "%s" "Nobinding for client %s iaid %d",
-+				dprintf(LOG_INFO, "%s" "Nobinding for client %s iaid %u",
- 					FNAME, duidstr(&optinfo->clientID), 
- 						optinfo->iaidinfo.iaid);
- 				break;
-@@ -804,7 +804,7 @@
- 				if (TAILQ_EMPTY(&roptinfo.addr_list)) {
- 					num = DH6OPT_STCODE_NOBINDING;
- 					dprintf(LOG_INFO, "%s" 
--					    "Bindings are not on link for client %s iaid %d",
-+					    "Bindings are not on link for client %s iaid %u",
- 						FNAME, duidstr(&optinfo->clientID), 
- 						roptinfo.iaidinfo.iaid);
- 					break;
-@@ -819,7 +819,7 @@
- 				if (dhcp6_update_iaidaddr(&roptinfo, addr_flag) 
- 						!= 0) {
- 					dprintf(LOG_INFO, "%s" 
--						"bindings failed for client %s iaid %d",
-+						"bindings failed for client %s iaid %u",
- 						FNAME, duidstr(&optinfo->clientID), 
- 							roptinfo.iaidinfo.iaid);
- 					num = DH6OPT_STCODE_UNSPECFAIL;
-@@ -871,7 +871,7 @@
- 			if (found_binding) {
- 			       if (dhcp6_update_iaidaddr(&roptinfo, addr_flag) != 0) {
- 					dprintf(LOG_ERR,
--					"assigned ipv6address for client iaid %d failed",
-+					"assigned ipv6address for client iaid %u failed",
- 						roptinfo.iaidinfo.iaid);
- 					num = DH6OPT_STCODE_UNSPECFAIL;
- 			       } else
-@@ -879,7 +879,7 @@
- 			} else {
- 			       	if (dhcp6_add_iaidaddr(&roptinfo) != 0) {
- 					dprintf(LOG_ERR, 
--					"assigned ipv6address for client iaid %d failed",
-+					"assigned ipv6address for client iaid %u failed",
- 						roptinfo.iaidinfo.iaid);
- 					num = DH6OPT_STCODE_UNSPECFAIL;
- 				} else
-diff -urN dhcp6-0.8/lease.c dhcp6/lease.c
---- dhcp6-0.8/lease.c	2003-06-03 12:12:00.000000000 -0700
-+++ dhcp6/lease.c	2003-06-13 14:55:25.000000000 -0700
-@@ -82,11 +82,11 @@
- 	if (dhcp6_mode == DHCP6_MODE_CLIENT) 
- 		fprintf(file, "\t SDUID: %s;\n", 
- 			duidstr(&lease_ptr->iaidaddr->client6_info.serverid));
--	fprintf(file, "\t IAID: %d ", lease_ptr->iaidaddr->client6_info.iaidinfo.iaid);
-+	fprintf(file, "\t IAID: %u ", lease_ptr->iaidaddr->client6_info.iaidinfo.iaid);
- 	fprintf(file, "\t type: %d;\n", lease_ptr->iaidaddr->client6_info.type);
--	fprintf(file, "\t RenewTime: %d;\n", 
-+	fprintf(file, "\t RenewTime: %u;\n", 
- 		lease_ptr->iaidaddr->client6_info.iaidinfo.renewtime);
--	fprintf(file, "\t RebindTime: %d;\n",
-+	fprintf(file, "\t RebindTime: %u;\n",
- 		lease_ptr->iaidaddr->client6_info.iaidinfo.rebindtime);
- 	if (!IN6_IS_ADDR_UNSPECIFIED(&lease_ptr->linklocal)) {
- 		if ((inet_ntop(AF_INET6, &lease_ptr->linklocal, addr_str, 
-@@ -107,10 +107,10 @@
- 		     brokendown_time.tm_hour,
- 		     brokendown_time.tm_min,
- 		     brokendown_time.tm_sec);
--	fprintf(file, "\t start date: %ld;\n", lease_ptr->start_date);
--	fprintf(file, "\t PreferredLifeTime: %d;\n",
-+	fprintf(file, "\t start date: %lu;\n", lease_ptr->start_date);
-+	fprintf(file, "\t PreferredLifeTime: %u;\n",
-                              lease_ptr->lease_addr.preferlifetime);
--	fprintf(file, "\t ValidLifeTime: %d;\n",
-+	fprintf(file, "\t ValidLifeTime: %u;\n",
-                              lease_ptr->lease_addr.validlifetime);
- 	fprintf(file, "}\n");
- 	if (fflush(file) == EOF) {
-diff -urN dhcp6-0.8/lease_token.l dhcp6/lease_token.l
---- dhcp6-0.8/lease_token.l	2003-06-03 12:51:13.000000000 -0700
-+++ dhcp6/lease_token.l	2003-06-13 14:55:25.000000000 -0700
-@@ -203,7 +203,7 @@
- <S_DUID>. {ABORT;}
- <S_SDUID>{duid_id} {configure_duid(yytext, &client6_info.serverid);}
- <S_SDUID>. {ABORT;}
--<S_IAID>{number} {client6_info.iaidinfo.iaid = atoi(yytext);
-+<S_IAID>{number} {client6_info.iaidinfo.iaid = atoll(yytext);
- 		lease_flags |= LEASE_IAID_FLAG;}
- <S_IAID>"type:" {BEGIN S_IATYPE;}
- <S_IAID>. {ABORT;}
-@@ -281,7 +281,7 @@
- 			memcpy(&client6_iaidaddr.client6_info, &client6_info, 
- 				sizeof(client6_iaidaddr.client6_info));
- 			dprintf(LOG_DEBUG, "hash add client iaidaddr type %d for "
--				" duid %s for iaid %d",
-+				" duid %s for iaid %u",
- 				client6_iaidaddr.client6_info.type, 
- 				duidstr(&client6_iaidaddr.client6_info.clientid), 
- 				client6_iaidaddr.client6_info.iaidinfo.iaid);
-@@ -344,14 +344,14 @@
- 			free(iaidaddr);
- 			return (-1);
- 		}
--		dprintf(LOG_DEBUG, "hash add client iaidaddr type %d for duid %s for iaid %d",
-+		dprintf(LOG_DEBUG, "hash add client iaidaddr type %d for duid %s for iaid %u",
- 			iaidaddr->client6_info.type, 
- 			duidstr(&iaidaddr->client6_info.clientid), 
- 			iaidaddr->client6_info.iaidinfo.iaid);
- 		/* update the start date and timer */
- 		if ((iaidaddr->timer = 
- 		     dhcp6_add_timer(dhcp6_iaidaddr_timo, iaidaddr)) == NULL) {
--	 		dprintf(LOG_ERR, "%s" "failed to add a timer for iaid %d",
-+	 		dprintf(LOG_ERR, "%s" "failed to add a timer for iaid %u",
- 				FNAME, iaidaddr->client6_info.iaidinfo.iaid);
- 	 		return (-1);
- 	    	}
-@@ -470,7 +470,7 @@
- 	lease_rec->iaidaddr = iaidaddr;
- 	lease_rec->lease_addr.status_code = DH6OPT_STCODE_UNDEFINE;
- 	TAILQ_INSERT_TAIL(&iaidaddr->lease_list, lease_rec, link);
--	dprintf(LOG_INFO, "%s" "add lease addr %s/%d type %d to %d", 
-+	dprintf(LOG_INFO, "%s" "add lease addr %s/%d type %d to %u", 
- 		FNAME, in6addr2str(&lease_rec->lease_addr.addr, 0), lease_rec->lease_addr.plen,
- 		lease_rec->lease_addr.type, lease_rec->iaidaddr->client6_info.iaidinfo.iaid);
- 	return (0);
-diff -urN dhcp6-0.8/server6_addr.c dhcp6/server6_addr.c
---- dhcp6-0.8/server6_addr.c	2003-06-03 12:53:29.000000000 -0700
-+++ dhcp6/server6_addr.c	2003-06-13 14:55:25.000000000 -0700
-@@ -127,7 +127,7 @@
- 	}
- 	/* it's meaningless to have an iaid without any leases */	
- 	if (TAILQ_EMPTY(&iaidaddr->lease_list)) {
--		dprintf(LOG_INFO, "%s" "no leases are added for duid %s iaid %d", 
-+		dprintf(LOG_INFO, "%s" "no leases are added for duid %s iaid %u", 
- 			FNAME, duidstr(&iaidaddr->client6_info.clientid), 
- 				iaidaddr->client6_info.iaidinfo.iaid);
- 		return (0);
-@@ -145,7 +145,7 @@
- 	/* set up timer for iaidaddr */
- 	if ((iaidaddr->timer =
- 	    dhcp6_add_timer(dhcp6_iaidaddr_timo, iaidaddr)) == NULL) {
--		dprintf(LOG_ERR, "%s" "failed to add a timer for iaid %d",
-+		dprintf(LOG_ERR, "%s" "failed to add a timer for iaid %u",
- 			FNAME, iaidaddr->client6_info.iaidinfo.iaid);
- 		dhcp6_remove_iaidaddr(iaidaddr);
- 		return (-1);
-@@ -171,14 +171,14 @@
- 		lv_next = TAILQ_NEXT(lv, link);
- 		if ((lease = hash_search(lease_hash_table, (void *)&lv->lease_addr)) != NULL) {
- 			if (dhcp6_remove_lease(lv)) {
--				dprintf(LOG_ERR, "%s" "failed to remove an iaid %d", FNAME,
-+				dprintf(LOG_ERR, "%s" "failed to remove an iaid %u", FNAME,
- 					 iaidaddr->client6_info.iaidinfo.iaid);
- 				return (-1);
- 			}
- 		}
- 	}
- 	if (hash_delete(server6_hash_table, &iaidaddr->client6_info) != 0) {
--		dprintf(LOG_ERR, "%s" "failed to remove an iaid %d from hash",
-+		dprintf(LOG_ERR, "%s" "failed to remove an iaid %u from hash",
- 			FNAME, iaidaddr->client6_info.iaidinfo.iaid);
- 		return (-1);
- 	}
-@@ -200,7 +200,7 @@
- 	client6_info.iaidinfo.iaid = optinfo->iaidinfo.iaid;
- 	client6_info.type = optinfo->type;
- 	if ((iaidaddr = hash_search(server6_hash_table, (void *)&client6_info)) == NULL) {
--		dprintf(LOG_DEBUG, "%s" "iaid %d iaidaddr for client duid %s doesn't exists", 
-+		dprintf(LOG_DEBUG, "%s" "iaid %u iaidaddr for client duid %s doesn't exists", 
- 			FNAME, client6_info.iaidinfo.iaid, 
- 			duidstr(&client6_info.clientid));
- 	}
-@@ -269,7 +269,7 @@
- 				dhcp6_remove_lease(lease);
- 			}
- 		}
--		dprintf(LOG_DEBUG, "%s" "update iaidaddr for iaid %d", FNAME, 
-+		dprintf(LOG_DEBUG, "%s" "update iaidaddr for iaid %u", FNAME, 
- 			iaidaddr->client6_info.iaidinfo.iaid);
- 	} else {
- 		/* remove leases */
-@@ -292,7 +292,7 @@
- 	}
- 	/* it's meaningless to have an iaid without any leases */	
- 	if (TAILQ_EMPTY(&iaidaddr->lease_list)) {
--		dprintf(LOG_INFO, "%s" "no leases are added for duid %s iaid %d", 
-+		dprintf(LOG_INFO, "%s" "no leases are added for duid %s iaid %u", 
- 			FNAME, duidstr(&iaidaddr->client6_info.clientid), 
- 				iaidaddr->client6_info.iaidinfo.iaid);
- 		dhcp6_remove_iaidaddr(iaidaddr);
-@@ -302,7 +302,7 @@
- 	if (iaidaddr->timer == NULL) {
- 		if ((iaidaddr->timer = 
- 		     dhcp6_add_timer(dhcp6_iaidaddr_timo, iaidaddr)) == NULL) {
--	 		dprintf(LOG_ERR, "%s" "failed to add a timer for iaid %d",
-+	 		dprintf(LOG_ERR, "%s" "failed to add a timer for iaid %u",
- 				FNAME, iaidaddr->client6_info.iaidinfo.iaid);
- 	 		return (-1);
- 	    	}
-@@ -403,7 +403,7 @@
- 	timo.tv_sec = (long)d;
- 	timo.tv_usec = 0;
- 	dhcp6_set_timer(&timo, sp->timer);
--	dprintf(LOG_DEBUG, "%s" "add lease for %s/%d iaid %d with preferlifetime %d"
-+	dprintf(LOG_DEBUG, "%s" "add lease for %s/%d iaid %u with preferlifetime %d"
- 			" with validlifetime %d", FNAME,
- 		in6addr2str(&sp->lease_addr.addr, 0), sp->lease_addr.plen, 
- 		sp->iaidaddr->client6_info.iaidinfo.iaid,
diff --git a/net-misc/dhcpv6/files/patch-iaid-dhcp6-0.85 b/net-misc/dhcpv6/files/patch-iaid-dhcp6-0.85
deleted file mode 100644
index edefd2c7eb09..000000000000
--- a/net-misc/dhcpv6/files/patch-iaid-dhcp6-0.85
+++ /dev/null
@@ -1,56 +0,0 @@
-diff -urN dhcp6-0.85/lease_token.l dhcp6/lease_token.l
---- dhcp6-0.85/lease_token.l	2003-07-01 19:21:25.000000000 -0700
-+++ dhcp6/lease_token.l	2003-07-16 12:09:53.000000000 -0700
-@@ -1,4 +1,4 @@
--/*	$Id: lease_token.l,v 1.12 2003/07/02 02:21:25 shirleyma Exp $	*/
-+/*	$Id: lease_token.l,v 1.13 2003/07/16 19:09:53 shirleyma Exp $	*/
- 
- /*
-  * Copyright (C) International Business Machines  Corp., 2003
-@@ -203,7 +203,7 @@
- <S_DUID>. {ABORT;}
- <S_SDUID>{duid_id} {configure_duid(yytext, &client6_info.serverid);}
- <S_SDUID>. {ABORT;}
--<S_IAID>{number} {client6_info.iaidinfo.iaid = atoll(yytext);
-+<S_IAID>{number} {client6_info.iaidinfo.iaid = strtoll(yytext, NULL, 10);
- 		lease_flags |= LEASE_IAID_FLAG;}
- <S_IAID>"type:" {BEGIN S_IATYPE;}
- <S_IAID>. {ABORT;}
-diff -urN dhcp6-0.85/server6_parse.y dhcp6/server6_parse.y
---- dhcp6-0.85/server6_parse.y	2003-05-23 12:00:37.000000000 -0700
-+++ dhcp6/server6_parse.y	2003-07-16 12:09:53.000000000 -0700
-@@ -1,4 +1,4 @@
--/*	$Id: server6_parse.y,v 1.6 2003/05/23 19:00:37 shirleyma Exp $	*/
-+/*	$Id: server6_parse.y,v 1.7 2003/07/16 19:09:53 shirleyma Exp $	*/
- 
- /*
-  * Copyright (C) International Business Machines  Corp., 2003
-@@ -112,7 +112,7 @@
- %type	<dhcp6addr>	hostaddr6 hostprefix6 addr6para v6address
- 
- %union {
--	int	num;
-+	unsigned int	num;
- 	int 	snum;
- 	char	*str;
- 	int 	dec;
-diff -urN dhcp6-0.85/server6_token.l dhcp6/server6_token.l
---- dhcp6-0.85/server6_token.l	2003-04-18 13:33:17.000000000 -0700
-+++ dhcp6/server6_token.l	2003-07-16 12:09:53.000000000 -0700
-@@ -1,4 +1,4 @@
--/*	$Id: server6_token.l,v 1.4 2003/04/18 20:33:17 shirleyma Exp $	*/
-+/*	$Id: server6_token.l,v 1.5 2003/07/16 19:09:53 shirleyma Exp $	*/
- 
- /*
-  * Copyright (C) International Business Machines  Corp., 2003
-@@ -139,8 +139,8 @@
- 			return IPV6ADDR;
- 		}
- 
--{number}	{ sfyylval.num = atoi(sfyytext); return NUMBER; }
--{snum}	{ sfyylval.snum = atoi(sfyytext); return SIGNEDNUMBER; }
-+{number}	{ sfyylval.num = strtoll(sfyytext, NULL, 10); return NUMBER; }
-+{snum}	{ sfyylval.snum = strtoll(sfyytext, NULL, 10); return SIGNEDNUMBER; }
- {decimal} { sfyylval.dec = atof(sfyytext); return DECIMAL; }
- {string}	{
- 			static char name[MAXDNAME];