wok-4.x rev 7301

Up: dhcp6 to 4.2.0-P1.
author Christopher Rogers <slaxemulator@gmail.com>
date Wed Nov 17 03:30:22 2010 +0000 (2010-11-17)
parents 9fa62bfcec02
children 53e1828da719
files dhcp6-client/receipt dhcp6-relay/receipt dhcp6/receipt dhcp6/stuff/start-without-ipv6.u
line diff
     1.1 --- a/dhcp6-client/receipt	Wed Nov 17 03:07:03 2010 +0000
     1.2 +++ b/dhcp6-client/receipt	Wed Nov 17 03:30:22 2010 +0000
     1.3 @@ -1,7 +1,7 @@
     1.4  # SliTaz package receipt.
     1.5  
     1.6  PACKAGE="dhcp6-client"
     1.7 -VERSION="4.1.1b1"
     1.8 +VERSION="4.2.0-P1"
     1.9  CATEGORY="network"
    1.10  SHORT_DESC="Dynamic Host Configuration Protocol ISC client with ipv6 support."
    1.11  MAINTAINER="pascal.bellard@slitaz.org"
     2.1 --- a/dhcp6-relay/receipt	Wed Nov 17 03:07:03 2010 +0000
     2.2 +++ b/dhcp6-relay/receipt	Wed Nov 17 03:30:22 2010 +0000
     2.3 @@ -1,7 +1,7 @@
     2.4  # SliTaz package receipt.
     2.5  
     2.6  PACKAGE="dhcp6-relay"
     2.7 -VERSION="4.1.1b1"
     2.8 +VERSION="4.2.0-P1"
     2.9  CATEGORY="network"
    2.10  SHORT_DESC="Dynamic Host Configuration Protocol relay with ipv6 support."
    2.11  MAINTAINER="pascal.bellard@slitaz.org"
     3.1 --- a/dhcp6/receipt	Wed Nov 17 03:07:03 2010 +0000
     3.2 +++ b/dhcp6/receipt	Wed Nov 17 03:30:22 2010 +0000
     3.3 @@ -1,7 +1,7 @@
     3.4  # SliTaz package receipt.
     3.5  
     3.6  PACKAGE="dhcp6"
     3.7 -VERSION="4.1.1b1"
     3.8 +VERSION="4.2.0-P1"
     3.9  CATEGORY="network"
    3.10  SHORT_DESC="Dynamic Host Configuration Protocol server with ipv6 support."
    3.11  MAINTAINER="pascal.bellard@slitaz.org"
    3.12 @@ -10,6 +10,7 @@
    3.13  WEB_SITE="http://www.isc.org/products/DHCP/"
    3.14  WGET_URL="http://ftp.isc.org/isc/$SOURCE/$TARBALL"
    3.15  DEPENDS="libcrypto"
    3.16 +BUILD_DEPENDS="perl"
    3.17  CONFIG_FILES="/etc/dhcpd.conf"
    3.18  PROVIDE="dhcp"
    3.19  
    3.20 @@ -22,11 +23,6 @@
    3.21  	sed -i "s/SEMI/MYEOL = '\\\\n',\n\tQUESTION = '?',\n\t&/" \
    3.22  		includes/dhctoken.h
    3.23  	sed -i 's/== NOERROR/== (isc_result_t) NOERROR/' server/ddns.c
    3.24 -	for i in start-without-ipv6 ; do
    3.25 -		[ -f $i.done ] && continue
    3.26 -		patch -p1 < ../stuff/$i.u || return 1
    3.27 -		touch $i.done
    3.28 -	done
    3.29  	./configure --prefix=/usr --infodir=/usr/share/info \
    3.30  	--sysconfdir=/etc --mandir=/usr/share/man $CONFIGURE_ARGS && \
    3.31  	make && make DESTDIR=$PWD/_pkg install
    3.32 @@ -39,10 +35,5 @@
    3.33  	cp $_pkg/etc/dhcpd.conf $fs/etc
    3.34  	cp $_pkg/usr/sbin/dhcpd $fs/usr/sbin
    3.35  	cp $WOK/dhcp/stuff/dhcpd $fs/etc/init.d
    3.36 -	# Package all dhcp pkgs
    3.37 -	for i in $(cd $WOK; ls -d dhcp6-*)
    3.38 -	do
    3.39 -		tazwok genpkg $i
    3.40 -	done
    3.41  }
    3.42  
     4.1 --- a/dhcp6/stuff/start-without-ipv6.u	Wed Nov 17 03:07:03 2010 +0000
     4.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     4.3 @@ -1,49 +0,0 @@
     4.4 ---- dhcp-4.1.1b1/common/discover.c
     4.5 -+++ dhcp-4.1.1b1/common/discover.c
     4.6 -@@ -443,15 +443,17 @@
     4.7 - 	}
     4.8 - 
     4.9 - #ifdef DHCPv6
    4.10 --	ifaces->fp6 = fopen("/proc/net/if_inet6", "r");
    4.11 --	if (ifaces->fp6 == NULL) {
    4.12 --		log_error("Error opening '/proc/net/if_inet6' to "
    4.13 --			  "list IPv6 interfaces; %m");
    4.14 --		close(ifaces->sock);
    4.15 --		ifaces->sock = -1;
    4.16 --		fclose(ifaces->fp);
    4.17 --		ifaces->fp = NULL;
    4.18 --		return 0;
    4.19 -+	if (local_family == AF_INET6) {
    4.20 -+		ifaces->fp6 = fopen("/proc/net/if_inet6", "r");
    4.21 -+		if (ifaces->fp6 == NULL) {
    4.22 -+			log_error("Error opening '/proc/net/if_inet6' to "
    4.23 -+				  "list IPv6 interfaces; %m");
    4.24 -+			close(ifaces->sock);
    4.25 -+			ifaces->sock = -1;
    4.26 -+			fclose(ifaces->fp);
    4.27 -+			ifaces->fp = NULL;
    4.28 -+			return 0;
    4.29 -+		}
    4.30 - 	}
    4.31 - #endif
    4.32 - 
    4.33 -@@ -720,7 +722,8 @@
    4.34 - 	}
    4.35 - #ifdef DHCPv6
    4.36 - 	if (!(*err)) {
    4.37 --		return next_iface6(info, err, ifaces);
    4.38 -+		if (local_family == AF_INET6)
    4.39 -+			return next_iface6(info, err, ifaces);
    4.40 - 	}
    4.41 - #endif
    4.42 - 	return 0;
    4.43 -@@ -736,7 +739,8 @@
    4.44 - 	close(ifaces->sock);
    4.45 - 	ifaces->sock = -1;
    4.46 - #ifdef DHCPv6
    4.47 --	fclose(ifaces->fp6);
    4.48 -+	if (local_family == AF_INET6)
    4.49 -+		fclose(ifaces->fp6);
    4.50 - 	ifaces->fp6 = NULL;
    4.51 - #endif
    4.52 - }