diff --git a/libs/libudev-zero/Makefile b/libs/libudev-zero/Makefile index 7cb991f75..ea5177b69 100644 --- a/libs/libudev-zero/Makefile +++ b/libs/libudev-zero/Makefile @@ -5,12 +5,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libudev-zero -PKG_VERSION:=1.0.1 +PKG_VERSION:=1.0.3 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/illiliti/libudev-zero/tar.gz/$(PKG_VERSION)? -PKG_HASH:=c4cf149ea96295c1e6e86038d10c725344c751982ed4a790b06c76776923e0ea +PKG_HASH:=0bd89b657d62d019598e6c7ed726ff8fed80e8ba092a83b484d66afb80b77da5 PKG_MAINTAINER:=Daniel Golle PKG_LICENSE:=MIT diff --git a/net/cloudflared/Makefile b/net/cloudflared/Makefile index bd652249b..5580eae20 100644 --- a/net/cloudflared/Makefile +++ b/net/cloudflared/Makefile @@ -5,12 +5,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=cloudflared -PKG_VERSION:=2023.7.1 +PKG_VERSION:=2023.7.3 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/cloudflare/cloudflared/tar.gz/$(PKG_VERSION)? -PKG_HASH:=0863eadade6c6ac5838510d8fb514ec2332bb79bf54edc34e90cc79652b6c816 +PKG_HASH:=772ddcb721f5b479192117d1156b1091505721aa81d6bab3de9577176b930191 PKG_LICENSE:=Apache-2.0 PKG_LICENSE_FILES:=LICENSE diff --git a/net/isc-dhcp/Makefile b/net/isc-dhcp/Makefile index 906cae673..8d3be4c91 100644 --- a/net/isc-dhcp/Makefile +++ b/net/isc-dhcp/Makefile @@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=isc-dhcp UPSTREAM_NAME:=dhcp PKG_VERSION:=4.4.3-P1 -PKG_RELEASE:=4 +PKG_RELEASE:=5 PKG_LICENSE:=BSD-3-Clause PKG_LICENSE_FILES:=LICENSE diff --git a/net/isc-dhcp/files/dhcpd.init b/net/isc-dhcp/files/dhcpd.init index fd036c6ea..382594484 100755 --- a/net/isc-dhcp/files/dhcpd.init +++ b/net/isc-dhcp/files/dhcpd.init @@ -138,29 +138,20 @@ create_empty_zone() { } append_routes() { - local tuple tuples="$1" - local string= + local tuple tuple="$(trim "$1")" + local network prefix router save octets compacted - local IFS=',' - for tuple in $tuples; do - local network prefix router save octets compacted + save="${tuple% *}" + router="$(trim "${tuple#${save} }")" - tuple="$(trim "$tuple")" + network="$(trim "${save%/[0-9]*}")" - save="${tuple% *}" - router="$(trim "${tuple#${save} }")" + prefix="$(trim "${save##${network}/}")" - network="$(trim "${save%/[0-9]*}")" + octets=$((($prefix + 7) / 8)) + compacted="$(echo "$network" | cut -d. -f1-$octets)" - prefix="$(trim "${save##${network}/}")" - - octets=$((($prefix + 7) / 8)) - compacted="$(echo "$network" | cut -d. -f1-$octets)" - - string="${string:+, }$(explode "$prefix${compacted:+.$compacted}.$router")" - done - - echo " option classless-ipv4-route $string;" + routes="$routes${routes:+, }$(explode "$prefix${compacted:+.$compacted}.$router")" } append_dhcp_options() { @@ -306,8 +297,14 @@ static_host_add() { extra_options="$extra_options${extra_options:+ }0c" ;; domain-name) extra_options="$extra_options${extra_options:+ }0f" ;; + renewal-time) + extra_options="$extra_options${extra_options:+ }3a" ;; + rebinding-time) + extra_options="$extra_options${extra_options:+ }3b" ;; fqdn) extra_options="$extra_options${extra_options:+ }51" ;; + routes) + extra_options="$extra_options${extra_options:+ }79" ;; *) echo "unknown option: $option" >&2 ;; esac @@ -344,7 +341,11 @@ static_host_add() { if [ -n "$gateway" ] ; then echo " option routers $gateway;" fi + + local routes= config_list_foreach "$cfg" "routes" append_routes + [ -n "$routes" ] && echo " option classless-ipv4-route $routes;" + config_list_foreach "$cfg" "dhcp_option" append_dhcp_options if [ -n "$extra_options" ]; then echo -e " if exists dhcp-parameter-request-list {\n option dhcp-parameter-request-list = concat(option dhcp-parameter-request-list, $extra_options);\n }" @@ -391,7 +392,11 @@ gen_dhcp_subnet() { echo " option routers $gateway;" fi echo " option domain-name-servers $DNS;" + + local routes= config_list_foreach "$cfg" "routes" append_routes + [ -n "$routes" ] && echo " option classless-ipv4-route $routes;" + config_list_foreach "$cfg" "dhcp_option" append_dhcp_options echo "}" }