From 4ab779cc89c14df5f0ee3ce06524e821ea89ae4d Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Tue, 20 Feb 2024 08:48:13 +0100 Subject: dhcp: update to 4.4.3-P1 --- package/dhcp/Makefile | 6 +++--- package/dhcp/patches/patch-bind_Makefile_in | 13 ------------- package/dhcp/patches/patch-common_discover_c | 13 ------------- 3 files changed, 3 insertions(+), 29 deletions(-) delete mode 100644 package/dhcp/patches/patch-bind_Makefile_in delete mode 100644 package/dhcp/patches/patch-common_discover_c diff --git a/package/dhcp/Makefile b/package/dhcp/Makefile index d86e13725..a007837d1 100644 --- a/package/dhcp/Makefile +++ b/package/dhcp/Makefile @@ -4,13 +4,13 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= dhcp -PKG_VERSION:= 4.3.5 +PKG_VERSION:= 4.4.3-P1 PKG_RELEASE:= 1 -PKG_HASH:= eb95936bf15d2393c55dd505bc527d1d4408289cec5a9fa8abb99f7577e7f954 +PKG_HASH:= 0ac416bb55997ca8632174fd10737fd61cdb8dba2752160a335775bc21dc73c7 PKG_DESCR:= dhcp server PKG_SECTION:= net/dns PKG_URL:= https://www.isc.org/software/dhcp/ -PKG_SITES:= ftp://ftp.isc.org/isc/dhcp/${PKG_VERSION}/ +PKG_SITES:= https://downloads.isc.org/isc/dhcp/$(PKG_VERSION)/ PKG_NOPARALLEL:= 1 DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz diff --git a/package/dhcp/patches/patch-bind_Makefile_in b/package/dhcp/patches/patch-bind_Makefile_in deleted file mode 100644 index 8f686ec26..000000000 --- a/package/dhcp/patches/patch-bind_Makefile_in +++ /dev/null @@ -1,13 +0,0 @@ ---- dhcp-4.3.5.orig/bind/Makefile.in 2016-09-27 21:54:32.000000000 +0200 -+++ dhcp-4.3.5/bind/Makefile.in 2016-11-26 07:21:39.000000000 +0100 -@@ -30,7 +30,9 @@ bindconfig = --disable-kqueue --disable- - --without-openssl --without-libxml2 --enable-exportlib \ - --with-gssapi=no --enable-threads=no @BINDCONFIG@ \ - --with-export-includedir=${binddir}/include \ -- --with-export-libdir=${binddir}/lib -+ --with-export-libdir=${binddir}/lib \ -+ --target=@target_alias@ --host=@host_alias@ \ -+ --build=@build_alias@ - - @BIND_ATF_FALSE@cleandirs = ./lib ./include - @BIND_ATF_TRUE@cleandirs = ./lib ./include ./atf diff --git a/package/dhcp/patches/patch-common_discover_c b/package/dhcp/patches/patch-common_discover_c deleted file mode 100644 index 372ca8e1c..000000000 --- a/package/dhcp/patches/patch-common_discover_c +++ /dev/null @@ -1,13 +0,0 @@ ---- dhcp-4.3.5.orig/common/discover.c 2016-09-27 21:16:50.000000000 +0200 -+++ dhcp-4.3.5/common/discover.c 2016-11-26 07:09:35.000000000 +0100 -@@ -692,8 +692,8 @@ next_iface6(struct iface_info *info, int - for (i=0; i<16; i++) { - unsigned char byte; - static const char hex[] = "0123456789abcdef"; -- byte = ((index(hex, buf[i * 2]) - hex) << 4) | -- (index(hex, buf[i * 2 + 1]) - hex); -+ byte = ((strchr(hex, buf[i * 2]) - hex) << 4) | -+ (strchr(hex, buf[i * 2 + 1]) - hex); - addr.sin6_addr.s6_addr[i] = byte; - } - memcpy(&info->addr, &addr, sizeof(addr)); -- cgit v1.2.3