Added a small iaid patch

4 files changed, 99 insertions, 3 deletions

diff --git a/net-misc/dhcpv6/Manifest b/net-misc/dhcpv6/Manifest
index 8d4b50bc6104..46431217afb3 100644
--- a/net-misc/dhcpv6/Manifest
+++ b/net-misc/dhcpv6/Manifest
@@ -1,10 +1,10 @@
 MD5 3a3c81a9a37780ba5c93bd6d69c8d94d dhcpv6-0.7.ebuild 941
 MD5 75b3fedfc4dbaa3a2f6a552554f0b7d8 dhcpv6-0.8.ebuild 1035
-MD5 9357061567b2d620f01a2e42f50ab9e3 ChangeLog 1186
+MD5 af836e3a3e9d3423da8cfd67c4e90173 ChangeLog 1390
 MD5 50d13df7d502388704b8444c1a65d10d dhcpv6-0.85.ebuild 956
-MD5 1c5da33b5303f459c1757eba9c5e797d dhcpv6-0.85-r1.ebuild 1039
+MD5 2088169a13b1e03d9344ab928b209e48 dhcpv6-0.85-r1.ebuild 1042
 MD5 59be4530b61c0481b3e2bb0949ce94f5 files/dhcp6s.rc 781
-MD5 60d0451a46700b83ae1e76eb82ff82c3 files/patch-iaid-dhcp6-0.85 2181
+MD5 51d319bd332569369a97c63a010418a1 files/patch-iaid-dhcp6-0.85 2207
 MD5 b18f95260c8f0563f943cffd467a5686 files/digest-dhcpv6-0.85 59
 MD5 3ccbf593dfca962e8b6490e2f792b429 files/negative-iaid-patch-0.8 17822
 MD5 b18f95260c8f0563f943cffd467a5686 files/digest-dhcpv6-0.85-r1 59
diff --git a/net-misc/dhcpv6/dhcpv6-0.85-r1.ebuild b/net-misc/dhcpv6/dhcpv6-0.85-r1.ebuild
new file mode 100644
index 000000000000..120fcb6af76e
--- /dev/null
+++ b/net-misc/dhcpv6/dhcpv6-0.85-r1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcpv6/dhcpv6-0.85-r1.ebuild,v 1.1 2003/08/05 04:58:29 latexer Exp $
+
+DESCRIPTION="Server and client for DHCPv6"
+
+MY_P=${P/dhcpv6/dhcp6}
+HOMEPAGE="http://www.sourceforge.net/projects/dhcp6/"
+SRC_URI="mirror://sourceforge/dhcpv6/${MY_P}.tgz"
+LICENSE="GPL-2"
+SLOT="0"
+
+KEYWORDS="~x86"
+IUSE=""
+DEPEND=""
+S=${WORKDIR}/${MY_P}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/patch-iaid-dhcp6-${PV}
+}
+
+src_install() {
+	einstall || die
+	dodoc Install ReadMe docs/draft-ietf-dhc-dhcpv6-28.txt \
+		docs/draft-ietf-dhc-dhcpv6-interop-{00,01}.txt \
+		docs/draft-ietf-dhc-dhcpv6-opt-dnsconfig-03.txt \
+		docs/draft-ietf-dhc-dhcpv6-opt-prefix-delegation-{02,03}.txt \
+		dhcp6c.conf dhcp6s.conf
+	
+	dodir /var/lib/dhcpv6
+	exeinto /etc/init.d
+	newexe ${FILESDIR}/dhcp6s.rc dhcp6s
+}
+pkg_postinst() {
+	einfo "Sample dhcp6c.conf and dhcp6s.conf files are in"
+	einfo "/usr/share/doc/${P}/"
+}
diff --git a/net-misc/dhcpv6/files/digest-dhcpv6-0.85-r1 b/net-misc/dhcpv6/files/digest-dhcpv6-0.85-r1
new file mode 100644
index 000000000000..f82d82bab93d
--- /dev/null
+++ b/net-misc/dhcpv6/files/digest-dhcpv6-0.85-r1
@@ -0,0 +1 @@
+MD5 ade11341e841c2a33ad05629d2f48b9c dhcp6-0.85.tgz 218102
diff --git a/net-misc/dhcpv6/files/patch-iaid-dhcp6-0.85 b/net-misc/dhcpv6/files/patch-iaid-dhcp6-0.85
new file mode 100644
index 000000000000..edefd2c7eb09
--- /dev/null
+++ b/net-misc/dhcpv6/files/patch-iaid-dhcp6-0.85
@@ -0,0 +1,56 @@
+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];