diff --git a/net/isc-dhcp/Makefile b/net/isc-dhcp/Makefile index 8a2056ca6..46921ba3f 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.1 -PKG_RELEASE:=17 +PKG_RELEASE:=18 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 06415729e..680c112d1 100755 --- a/net/isc-dhcp/files/dhcpd.init +++ b/net/isc-dhcp/files/dhcpd.init @@ -48,6 +48,13 @@ time2seconds() { echo $(( number * multiplier )) } +trim() +{ + local arg="$1" + + echo "$arg" | sed -e 's/^ *//' -e 's/ *$//' +} + # duplicated from dnsmasq init script hex_to_hostid() { local var="$1" @@ -122,12 +129,14 @@ append_routes() { for tuple in $tuples; do local network prefix router save octets compacted - save="${tuple% *}" - router="${tuple#${save} }" + tuple="$(trim "$tuple")" - network="${save%/[0-9]*}" - prefix="${save##${network}}" - prefix="${prefix:1}" + save="${tuple% *}" + router="$(trim "${tuple#${save} }")" + + network="$(trim "${save%/[0-9]*}")" + + prefix="$(trim "${save##${network}/}")" octets=$((($prefix + 7) / 8)) compacted="$(echo "$network" | cut -d. -f1-$octets)"