# HG changeset patch
# User Christopher Rogers <slaxemulator@gmail.com>
# Date 1289964622 0
# Node ID 82e83ddb59bd556bcea4f28fd3eabab04eef62d2
# Parent  9fa62bfcec022ad74a0f504daab5985d7c8c4871
Up: dhcp6 to 4.2.0-P1.

diff -r 9fa62bfcec02 -r 82e83ddb59bd dhcp6-client/receipt
--- a/dhcp6-client/receipt	Wed Nov 17 03:07:03 2010 +0000
+++ b/dhcp6-client/receipt	Wed Nov 17 03:30:22 2010 +0000
@@ -1,7 +1,7 @@
 # SliTaz package receipt.
 
 PACKAGE="dhcp6-client"
-VERSION="4.1.1b1"
+VERSION="4.2.0-P1"
 CATEGORY="network"
 SHORT_DESC="Dynamic Host Configuration Protocol ISC client with ipv6 support."
 MAINTAINER="pascal.bellard@slitaz.org"
diff -r 9fa62bfcec02 -r 82e83ddb59bd dhcp6-relay/receipt
--- a/dhcp6-relay/receipt	Wed Nov 17 03:07:03 2010 +0000
+++ b/dhcp6-relay/receipt	Wed Nov 17 03:30:22 2010 +0000
@@ -1,7 +1,7 @@
 # SliTaz package receipt.
 
 PACKAGE="dhcp6-relay"
-VERSION="4.1.1b1"
+VERSION="4.2.0-P1"
 CATEGORY="network"
 SHORT_DESC="Dynamic Host Configuration Protocol relay with ipv6 support."
 MAINTAINER="pascal.bellard@slitaz.org"
diff -r 9fa62bfcec02 -r 82e83ddb59bd dhcp6/receipt
--- a/dhcp6/receipt	Wed Nov 17 03:07:03 2010 +0000
+++ b/dhcp6/receipt	Wed Nov 17 03:30:22 2010 +0000
@@ -1,7 +1,7 @@
 # SliTaz package receipt.
 
 PACKAGE="dhcp6"
-VERSION="4.1.1b1"
+VERSION="4.2.0-P1"
 CATEGORY="network"
 SHORT_DESC="Dynamic Host Configuration Protocol server with ipv6 support."
 MAINTAINER="pascal.bellard@slitaz.org"
@@ -10,6 +10,7 @@
 WEB_SITE="http://www.isc.org/products/DHCP/"
 WGET_URL="http://ftp.isc.org/isc/$SOURCE/$TARBALL"
 DEPENDS="libcrypto"
+BUILD_DEPENDS="perl"
 CONFIG_FILES="/etc/dhcpd.conf"
 PROVIDE="dhcp"
 
@@ -22,11 +23,6 @@
 	sed -i "s/SEMI/MYEOL = '\\\\n',\n\tQUESTION = '?',\n\t&/" \
 		includes/dhctoken.h
 	sed -i 's/== NOERROR/== (isc_result_t) NOERROR/' server/ddns.c
-	for i in start-without-ipv6 ; do
-		[ -f $i.done ] && continue
-		patch -p1 < ../stuff/$i.u || return 1
-		touch $i.done
-	done
 	./configure --prefix=/usr --infodir=/usr/share/info \
 	--sysconfdir=/etc --mandir=/usr/share/man $CONFIGURE_ARGS && \
 	make && make DESTDIR=$PWD/_pkg install
@@ -39,10 +35,5 @@
 	cp $_pkg/etc/dhcpd.conf $fs/etc
 	cp $_pkg/usr/sbin/dhcpd $fs/usr/sbin
 	cp $WOK/dhcp/stuff/dhcpd $fs/etc/init.d
-	# Package all dhcp pkgs
-	for i in $(cd $WOK; ls -d dhcp6-*)
-	do
-		tazwok genpkg $i
-	done
 }
 
diff -r 9fa62bfcec02 -r 82e83ddb59bd dhcp6/stuff/start-without-ipv6.u
--- a/dhcp6/stuff/start-without-ipv6.u	Wed Nov 17 03:07:03 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,49 +0,0 @@
---- dhcp-4.1.1b1/common/discover.c
-+++ dhcp-4.1.1b1/common/discover.c
-@@ -443,15 +443,17 @@
- 	}
- 
- #ifdef DHCPv6
--	ifaces->fp6 = fopen("/proc/net/if_inet6", "r");
--	if (ifaces->fp6 == NULL) {
--		log_error("Error opening '/proc/net/if_inet6' to "
--			  "list IPv6 interfaces; %m");
--		close(ifaces->sock);
--		ifaces->sock = -1;
--		fclose(ifaces->fp);
--		ifaces->fp = NULL;
--		return 0;
-+	if (local_family == AF_INET6) {
-+		ifaces->fp6 = fopen("/proc/net/if_inet6", "r");
-+		if (ifaces->fp6 == NULL) {
-+			log_error("Error opening '/proc/net/if_inet6' to "
-+				  "list IPv6 interfaces; %m");
-+			close(ifaces->sock);
-+			ifaces->sock = -1;
-+			fclose(ifaces->fp);
-+			ifaces->fp = NULL;
-+			return 0;
-+		}
- 	}
- #endif
- 
-@@ -720,7 +722,8 @@
- 	}
- #ifdef DHCPv6
- 	if (!(*err)) {
--		return next_iface6(info, err, ifaces);
-+		if (local_family == AF_INET6)
-+			return next_iface6(info, err, ifaces);
- 	}
- #endif
- 	return 0;
-@@ -736,7 +739,8 @@
- 	close(ifaces->sock);
- 	ifaces->sock = -1;
- #ifdef DHCPv6
--	fclose(ifaces->fp6);
-+	if (local_family == AF_INET6)
-+		fclose(ifaces->fp6);
- 	ifaces->fp6 = NULL;
- #endif
- }