wok-next rev 21589

updated dhcp and dhcp6 (4.2.2 -> 4.4.2)
author Hans-G?nter Theisgen
date Wed Jun 24 06:47:56 2020 +0100 (2020-06-24)
parents f2b6c26b0f7f
children e30533e0c5f7
files dhcp/receipt dhcp6/receipt
line diff
     1.1 --- a/dhcp/receipt	Wed Jun 24 06:22:56 2020 +0100
     1.2 +++ b/dhcp/receipt	Wed Jun 24 06:47:56 2020 +0100
     1.3 @@ -1,7 +1,7 @@
     1.4  # SliTaz package receipt v2.
     1.5  
     1.6  PACKAGE="dhcp"
     1.7 -VERSION="4.2.2"
     1.8 +VERSION="4.4.2"
     1.9  CATEGORY="network"
    1.10  SHORT_DESC="Dynamic Host Configuration Protocol"
    1.11  MAINTAINER="pascal.bellard@slitaz.org"
    1.12 @@ -9,30 +9,33 @@
    1.13  WEB_SITE="https://www.isc.org/downloads/DHCP/"
    1.14  
    1.15  TARBALL="$PACKAGE-$VERSION.tar.gz"
    1.16 -WGET_URL="https://ftp.isc.org/isc/dhcp/$TARBALL"
    1.17 +WGET_URL="https://ftp.isc.org/isc/$PACKAGE/$VERSION/$TARBALL"
    1.18  
    1.19  BUILD_DEPENDS="perl"
    1.20  SPLIT="$PACKAGE-client $PACKAGE-relay $PACKAGE-dev"
    1.21  SIBLINGS="dhcp6"
    1.22  
    1.23 -compile_rules() {
    1.24 +compile_rules()
    1.25 +{
    1.26  	grep -q MYEOL includes/dhctoken.h ||
    1.27  	sed -i "s/SEMI/MYEOL = '\\\\n',\n\tQUESTION = '?',\n\t&/" \
    1.28  		includes/dhctoken.h
    1.29 -	sed -i 's/== NOERROR/== (isc_result_t) NOERROR/' server/ddns.c
    1.30 +	sed -i 's/== NOERROR/== (isc_result_t) NOERROR/' \
    1.31 +		server/ddns.c
    1.32  
    1.33 -	./configure \
    1.34 -		--disable-dhcpv6 \
    1.35 +	./configure		\
    1.36 +		--disable-dhcpv6	\
    1.37  		$CONFIGURE_ARGS &&
    1.38  	make &&
    1.39  	make DESTDIR=$install install || return 1
    1.40  
    1.41  	mkdir -p $install/etc/init.d
    1.42 -	cp $stuff/dhcpd $install/etc/init.d
    1.43 -	cp $src/client/scripts/linux $install/etc/dhclient-script
    1.44 +	cp $stuff/dhcpd			$install/etc/init.d
    1.45 +	cp $src/client/scripts/linux	$install/etc/dhclient-script
    1.46  }
    1.47  
    1.48 -genpkg_rules() {
    1.49 +genpkg_rules()
    1.50 +{
    1.51  	case $PACKAGE in
    1.52  		dhcp)
    1.53  			copy dhcpd.conf dhcpd
     2.1 --- a/dhcp6/receipt	Wed Jun 24 06:22:56 2020 +0100
     2.2 +++ b/dhcp6/receipt	Wed Jun 24 06:47:56 2020 +0100
     2.3 @@ -1,36 +1,40 @@
     2.4  # SliTaz package receipt v2.
     2.5  
     2.6  PACKAGE="dhcp6"
     2.7 -VERSION="4.2.2"
     2.8 +VERSION="4.4.2"
     2.9  CATEGORY="network"
    2.10  SHORT_DESC="Dynamic Host Configuration Protocol with IPv6 support"
    2.11  MAINTAINER="pascal.bellard@slitaz.org"
    2.12  LICENSE="ISC"
    2.13  WEB_SITE="https://www.isc.org/downloads/DHCP/"
    2.14  
    2.15 -TARBALL="dhcp-$VERSION.tar.gz"
    2.16 -WGET_URL="https://ftp.isc.org/isc/dhcp/$TARBALL"
    2.17 +SOURCE="dhcp"
    2.18 +TARBALL="$SOURCE-$VERSION.tar.gz"
    2.19 +WGET_URL="https://ftp.isc.org/isc/$SOURCE/$VERSION/$TARBALL"
    2.20  
    2.21  BUILD_DEPENDS="perl"
    2.22  SPLIT="$PACKAGE-client $PACKAGE-relay $PACKAGE-dev"
    2.23  SIBLINGS="dhcp"
    2.24  
    2.25 -compile_rules() {
    2.26 +compile_rules()
    2.27 +{
    2.28  	grep -q MYEOL includes/dhctoken.h ||
    2.29  	sed -i "s/SEMI/MYEOL = '\\\\n',\n\tQUESTION = '?',\n\t&/" \
    2.30  		includes/dhctoken.h
    2.31 -	sed -i 's/== NOERROR/== (isc_result_t) NOERROR/' server/ddns.c
    2.32 +	sed -i 's/== NOERROR/== (isc_result_t) NOERROR/' \
    2.33 +		server/ddns.c
    2.34  
    2.35  	./configure $CONFIGURE_ARGS &&
    2.36  	make &&
    2.37  	make DESTDIR=$install install || return 1
    2.38  
    2.39  	mkdir -p $install/etc/init.d
    2.40 -	cp $WOK/dhcp/stuff/dhcpd     $install/etc/init.d
    2.41 -	cp $src/client/scripts/linux $install/etc/dhclient-script
    2.42 +	cp $WOK/dhcp/stuff/dhcpd		$install/etc/init.d
    2.43 +	cp $src/client/scripts/linux	$install/etc/dhclient-script
    2.44  }
    2.45  
    2.46 -genpkg_rules() {
    2.47 +genpkg_rules()
    2.48 +{
    2.49  	case $PACKAGE in
    2.50  		dhcp6)
    2.51  			copy dhcpd.conf dhcpd