diff --git a/package/emortal/ipv6-helper/files/60-ipv6-lifetime b/package/emortal/ipv6-helper/files/60-ipv6-lifetime index 64fdd2f1ef..249453609c 100755 --- a/package/emortal/ipv6-helper/files/60-ipv6-lifetime +++ b/package/emortal/ipv6-helper/files/60-ipv6-lifetime @@ -6,7 +6,7 @@ uci -q get system.@imm_init[0] > "/dev/null" || uci -q add system imm_init > "/d uci -q batch <<-EOF delete dhcp.lan.dhcpv6 delete dhcp.lan.ra_flags - add_list dhcp.lan.ra_flags="none" + add_list dhcp.lan.ra_flags="other-config" set dhcp.lan.max_preferred_lifetime="2700" set dhcp.lan.max_valid_lifetime="5400" commit dhcp diff --git a/package/network/config/netifd/Makefile b/package/network/config/netifd/Makefile index ec1fb199b1..4df496db3b 100644 --- a/package/network/config/netifd/Makefile +++ b/package/network/config/netifd/Makefile @@ -5,9 +5,9 @@ PKG_RELEASE:=1 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL=$(PROJECT_GIT)/project/netifd.git -PKG_SOURCE_DATE:=2023-12-12 -PKG_SOURCE_VERSION:=e3fc2b0026a5ca45de76f3e2a950dca85a361bd3 -PKG_MIRROR_HASH:=e1d461fb6aff4c2128f897d43e38a2759a50094ad777bf947c9b0ac898a9e3cf +PKG_SOURCE_DATE:=2023-12-17 +PKG_SOURCE_VERSION:=66a7652176a7580b55076a0975b77c2bfb5bf7ce +PKG_MIRROR_HASH:=4bf3a1ad11d3ea6b382ef9f9414696e647549046b4208fab8d5817928126b27a PKG_MAINTAINER:=Felix Fietkau PKG_LICENSE:=GPL-2.0 diff --git a/package/network/services/dnsmasq/files/dnsmasq.init b/package/network/services/dnsmasq/files/dnsmasq.init index 16966e103f..cb82fbd85e 100755 --- a/package/network/services/dnsmasq/files/dnsmasq.init +++ b/package/network/services/dnsmasq/files/dnsmasq.init @@ -862,7 +862,7 @@ dnsmasq_start() { local cfg="$1" local disabled user_dhcpscript logfacility - local resolvfile resolvdir localuse=0 + local resolvfile resolvdir localuse=1 config_get_bool disabled "$cfg" disabled 0 [ "$disabled" -gt 0 ] && return 0 @@ -1060,7 +1060,7 @@ dnsmasq_start() config_get resolvfile "$cfg" resolvfile /tmp/resolv.conf.d/resolv.conf.auto [ -n "$resolvfile" ] && [ ! -e "$resolvfile" ] && touch "$resolvfile" xappend "--resolv-file=$resolvfile" - [ "$resolvfile" = "/tmp/resolv.conf.d/resolv.conf.auto" ] && localuse=1 + [ "$resolvfile" != "/tmp/resolv.conf.d/resolv.conf.auto" ] && localuse=0 resolvdir="$(dirname "$resolvfile")" fi config_get_bool localuse "$cfg" localuse "$localuse" @@ -1239,12 +1239,12 @@ dnsmasq_start() dnsmasq_stop() { local cfg="$1" - local noresolv resolvfile localuse=0 + local noresolv resolvfile localuse=1 config_get_bool noresolv "$cfg" noresolv 0 config_get resolvfile "$cfg" "resolvfile" - [ "$noresolv" = 0 ] && [ "$resolvfile" = "/tmp/resolv.conf.d/resolv.conf.auto" ] && localuse=1 + [ "$noresolv" = 0 ] && [ "$resolvfile" != "/tmp/resolv.conf.d/resolv.conf.auto" ] && localuse=0 config_get_bool localuse "$cfg" localuse "$localuse" [ "$localuse" -gt 0 ] && ln -sf "/tmp/resolv.conf.d/resolv.conf.auto" /tmp/resolv.conf diff --git a/package/utils/firmware-utils/Makefile b/package/utils/firmware-utils/Makefile index 432d3797ac..5e5f57e5a0 100644 --- a/package/utils/firmware-utils/Makefile +++ b/package/utils/firmware-utils/Makefile @@ -7,9 +7,9 @@ PKG_RELEASE:=1 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL=$(PROJECT_GIT)/project/firmware-utils.git -PKG_SOURCE_DATE:=2023-11-21 -PKG_SOURCE_VERSION:=12bf1a99bd6eebae90caa144bb4d8b0cd763ff8f -PKG_MIRROR_HASH:=f711bf80123a6f14737da27ab8dfff87a4d429c74057de355b1693e89f223abc +PKG_SOURCE_DATE:=2023-11-22 +PKG_SOURCE_VERSION:=d87b6c4b6423201e595459840f51d0dced04a4eb +PKG_MIRROR_HASH:=f34fbf4dc4bd13d18ea94e6e25090b57cde11b3dc7133e46f6ce3bb9164ab8fb PKG_BUILD_DEPENDS:=openssl zlib diff --git a/tools/firmware-utils/Makefile b/tools/firmware-utils/Makefile index 6dc77621ea..4809c9aa19 100644 --- a/tools/firmware-utils/Makefile +++ b/tools/firmware-utils/Makefile @@ -11,9 +11,9 @@ PKG_RELEASE:=1 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL=$(PROJECT_GIT)/project/firmware-utils.git -PKG_SOURCE_DATE:=2023-11-21 -PKG_SOURCE_VERSION:=12bf1a99bd6eebae90caa144bb4d8b0cd763ff8f -PKG_MIRROR_HASH:=f711bf80123a6f14737da27ab8dfff87a4d429c74057de355b1693e89f223abc +PKG_SOURCE_DATE:=2023-11-22 +PKG_SOURCE_VERSION:=d87b6c4b6423201e595459840f51d0dced04a4eb +PKG_MIRROR_HASH:=f34fbf4dc4bd13d18ea94e6e25090b57cde11b3dc7133e46f6ce3bb9164ab8fb include $(INCLUDE_DIR)/host-build.mk include $(INCLUDE_DIR)/cmake.mk