OpenWrt
/
packages
mirror of https://git.openwrt.org/feed/packages.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #22298 from TDT-AG/pr/20231004-keepalived 

keepalived: update to version 2.2.8
This commit is contained in:
Florian Eckert 2023-10-06 08:34:24 +02:00 committed by GitHub
parent 3b9abf7836 09f20658d9
commit 71cb7ad0a4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
net/keepalived/Makefile
View File

@ -8,12 +8,12 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=keepalived PKG_NAME:=keepalived
PKG_VERSION:=2.2.7 PKG_VERSION:=2.2.8
PKG_RELEASE:=10 PKG_RELEASE:=3
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://www.keepalived.org/software PKG_SOURCE_URL:=https://www.keepalived.org/software
PKG_HASH:=c61940d874154a560a54627ecf7ef47adebdf832164368d10bf242a4d9b7d49d PKG_HASH:=85882eb62974f395d4c631be990a41a839594a7e62fbfebcb5649a937a7a1bb6
PKG_CPE_ID:=cpe:/a:keepalived:keepalived PKG_CPE_ID:=cpe:/a:keepalived:keepalived
PKG_LICENSE:=GPL-2.0-or-later PKG_LICENSE:=GPL-2.0-or-later

14
net/keepalived/files/keepalived.init
View File

@ -88,8 +88,11 @@ print_notify() {
shift shift
local name="$1" local name="$1"
shift shift
local indent="$1"
shift
for notify in "$@"; do for notify in "$@"; do
printf '%b%s' "${INDENT_1}" "$notify">> "$KEEPALIVED_CONF" printf '%b%s' "${indent}" "$notify">> "$KEEPALIVED_CONF"
notify="$(echo "$notify" | tr 'a-z' 'A-Z')" notify="$(echo "$notify" | tr 'a-z' 'A-Z')"
printf ' "/bin/busybox env -i ACTION=%s TYPE=%s NAME=%s /sbin/hotplug-call keepalived"\n' "$notify" "$type" "$name" >> "$KEEPALIVED_CONF" printf ' "/bin/busybox env -i ACTION=%s TYPE=%s NAME=%s /sbin/hotplug-call keepalived"\n' "$notify" "$type" "$name" >> "$KEEPALIVED_CONF"
done done
@ -320,7 +323,7 @@ vrrp_sync_group() {
print_elems_indent "$1" "$INDENT_1" no_val_smtp_alert no_val_global_tracking print_elems_indent "$1" "$INDENT_1" no_val_smtp_alert no_val_global_tracking
print_notify "GROUP" "$name" notify_backup notify_master \ print_notify "GROUP" "$name" "$INDENT_1" notify_backup notify_master \
notify_fault notify notify_fault notify
config_section_close config_section_close
@ -352,7 +355,7 @@ vrrp_instance() {
no_val_dont_track_primary no_val_smtp_alert no_val_nopreempt \ no_val_dont_track_primary no_val_smtp_alert no_val_nopreempt \
no_val_use_vmac no_val_use_vmac
print_notify "INSTANCE" "$name" notify_backup notify_master \ print_notify "INSTANCE" "$name" "$INDENT_1" notify_backup notify_master \
notify_fault notify_stop notify_fault notify_stop
# Handle virtual_ipaddress & virtual_ipaddress_excluded lists # Handle virtual_ipaddress & virtual_ipaddress_excluded lists
@ -501,7 +504,12 @@ real_server() {
[ -n "$ipaddr" ] && [ -n "$port" ] && { [ -n "$ipaddr" ] && [ -n "$port" ] && {
printf '%breal_server %s %d {\n' "${INDENT_1}" "$ipaddr" "$port" >> "$KEEPALIVED_CONF" printf '%breal_server %s %d {\n' "${INDENT_1}" "$ipaddr" "$port" >> "$KEEPALIVED_CONF"
printf '%bweight %d\n' "${INDENT_2}" "$weight" >> "$KEEPALIVED_CONF" printf '%bweight %d\n' "${INDENT_2}" "$weight" >> "$KEEPALIVED_CONF"
print_notify "REAL_SERVER" "$name" "$INDENT_2" notify_up notify_down
case "$check" in case "$check" in
PING_CHECK)
printf '%b%s {\n' "${INDENT_2}" "$check" >> "$KEEPALIVED_CONF"
printf '%b}\n' "${INDENT_2}" >> "$KEEPALIVED_CONF"
;;
TCP_CHECK) TCP_CHECK)
printf '%b%s {\n' "${INDENT_2}" "$check" >> "$KEEPALIVED_CONF" printf '%b%s {\n' "${INDENT_2}" "$check" >> "$KEEPALIVED_CONF"
print_elems_indent "$1" "$INDENT_3" connect_timeout \ print_elems_indent "$1" "$INDENT_3" connect_timeout \