diff --git a/net/keepalived/Makefile b/net/keepalived/Makefile index f020e11f8255a..31292398733a2 100644 --- a/net/keepalived/Makefile +++ b/net/keepalived/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=keepalived PKG_VERSION:=2.2.8 -PKG_RELEASE:=7 +PKG_RELEASE:=9 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://www.keepalived.org/software diff --git a/net/keepalived/files/etc/hotplug.d/keepalived/511-firewall b/net/keepalived/files/etc/hotplug.d/keepalived/511-firewall index d8619e9f1872b..b85a703819e88 100644 --- a/net/keepalived/files/etc/hotplug.d/keepalived/511-firewall +++ b/net/keepalived/files/etc/hotplug.d/keepalived/511-firewall @@ -5,6 +5,7 @@ set_service_name firewall +set_skip_running_check set_reload_if_sync add_sync_file /etc/config/firewall diff --git a/net/keepalived/files/etc/hotplug.d/keepalived/551-dnsmasq b/net/keepalived/files/etc/hotplug.d/keepalived/551-dnsmasq index a9b3c79e395fe..82545212123fc 100644 --- a/net/keepalived/files/etc/hotplug.d/keepalived/551-dnsmasq +++ b/net/keepalived/files/etc/hotplug.d/keepalived/551-dnsmasq @@ -7,7 +7,6 @@ set_service_name dnsmasq set_restart_if_master set_stop_if_backup -set_reload_if_sync add_sync_file /etc/config/dhcp add_sync_file /tmp/dhcp.leases diff --git a/net/keepalived/files/lib/functions/keepalived/hotplug.sh b/net/keepalived/files/lib/functions/keepalived/hotplug.sh index 8691872c6dc4a..5bd96d5cf564b 100644 --- a/net/keepalived/files/lib/functions/keepalived/hotplug.sh +++ b/net/keepalived/files/lib/functions/keepalived/hotplug.sh @@ -31,17 +31,17 @@ _service() { [ ! -x "$rc" ] && return case $1 in - start) $rc running || $rc start ;; - stop) $rc running && $rc stop ;; + start) _service_running_check "$rc" || $rc start ;; + stop) _service_running_check "$rc" && $rc stop ;; reload) - if $rc running; then + if _service_running_check "$rc"; then $rc reload else $rc start fi ;; restart) - if $rc running; then + if _service_running_check "$rc"; then $rc restart else $rc start @@ -50,6 +50,10 @@ _service() { esac } +_service_running_check() { + skip_running_check || "$1" running +} + _start_service() { _service start } @@ -78,7 +82,7 @@ is_sync_file() { list_contains SYNC_FILES_LIST "$1" } -set_update_target() { +_set_update_target() { set_var UPDATE_TARGET "${1:-1}" } @@ -86,8 +90,8 @@ get_update_target() { get_var UPDATE_TARGET } -unset_update_target() { - set_var UPDATE_TARGET +set_disable_update_target() { + _set_update_target 0 } is_update_target() { @@ -158,8 +162,20 @@ backup_and_stop() { get_var_flag NOTIFY_BACKUP_STOP 1 } +set_skip_running_check() { + set_var NOTIFY_SKIP_RUNNING 1 +} + +skip_running_check() { + get_var_flag NOTIFY_SKIP_RUNNING +} + +_set_reload_if_sync() { + set_var NOTIFY_SYNC_RELOAD "${1:-0}" +} + set_reload_if_sync() { - set_var NOTIFY_SYNC_RELOAD "${1:-1}" + _set_reload_if_sync 1 } get_reload_if_sync() { @@ -245,8 +261,8 @@ keepalived_hotplug() { [ -z "$(get_fault_cb)" ] && set_fault_cb _notify_fault [ -z "$(get_sync_cb)" ] && set_sync_cb _notify_sync - [ -z "$(get_update_target)" ] && set_update_target "$@" - [ -z "$(get_reload_if_sync)" ] && set_reload_if_sync "$@" + [ -z "$(get_update_target)" ] && _set_update_target "$@" + [ -z "$(get_reload_if_sync)" ] && _set_reload_if_sync "$@" case $ACTION in NOTIFY_MASTER) call_cb "$(get_master_cb)" ;; diff --git a/net/netbird/Makefile b/net/netbird/Makefile index fa4105a001c84..361bc29f66618 100644 --- a/net/netbird/Makefile +++ b/net/netbird/Makefile @@ -1,12 +1,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=netbird -PKG_VERSION:=0.30.1 +PKG_VERSION:=0.30.2 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/netbirdio/netbird/tar.gz/v$(PKG_VERSION)? -PKG_HASH:=46014fb96e5320715efef5d1e767278e4f13dbe11eb18df7cdfb2bd06b12eabf +PKG_HASH:=4d27fed679da342b3f50c3aa5feda3342de761cb038a31b9337c4db7f50445d3 PKG_MAINTAINER:=Oskari Rauta PKG_LICENSE:=BSD-3-Clause diff --git a/utils/owut/Makefile b/utils/owut/Makefile index c5dddd2c5c56a..de07136464235 100644 --- a/utils/owut/Makefile +++ b/utils/owut/Makefile @@ -6,13 +6,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=owut -PKG_SOURCE_DATE:=2024-10-11 +PKG_SOURCE_DATE:=2024-10-15 PKG_RELEASE:=1 PKG_SOURCE_PROTO:=git -PKG_SOURCE_VERSION:=e17c906dc5f00cc0173cdeb8a25313a17e453866 +PKG_SOURCE_VERSION:=cdfbc24c7fb08f4ded018afffc7c2b6e30022d50 PKG_SOURCE_URL:=https://github.com/efahl/owut.git -PKG_MIRROR_HASH:=56b4dc31c08020abd54abd739c00375f84e9b7cf8ab2531bbaa1597e02e6128f +PKG_MIRROR_HASH:=c88dba1a319fc77d8ce4e0cb23bbf46ac4b533d7795da78ddf1db3072d0124fe PKG_MAINTAINER:=Eric Fahlgren PKG_LICENSE:=GPL-2.0-only