Browse Source
keepalived: update to version 2.0.14
Redmine-patch-id: 3383 Update keepalived to version 2.0.14. Add Config.in file. Authored-by: Quentin Armitage <quentin@armitage.org.uk> Signed-off-by: Florian Eckert <fe@dev.tdt.de>lilik-openwrt-22.03
Florian Eckert
6 years ago
3 changed files with 585 additions and 27 deletions
Unified View
Diff Options
-
+164 -0net/keepalived/Config.in
-
+209 -27net/keepalived/Makefile
-
+212 -0net/keepalived/patches/001-fix-systemd.patch
+ 164
- 0
net/keepalived/Config.in
View File
| @ -0,0 +1,164 @@ | |||||
| if PACKAGE_keepalived | |||||
| menu "Configuration" | |||||
| config KEEPALIVED_BFD | |||||
| bool | |||||
| default n | |||||
| prompt "Enable BFD support" | |||||
| help | |||||
| Builds support for BFD | |||||
| config KEEPALIVED_SHA1 | |||||
| bool | |||||
| default y | |||||
| prompt "Enable SHA1 support in genhash" | |||||
| help | |||||
| Builds support for using SHA1 with genhash | |||||
| config KEEPALIVED_LVS | |||||
| bool | |||||
| default y | |||||
| prompt "Enable IPVS support" | |||||
| help | |||||
| Builds support for IPVS | |||||
| config KEEPALIVED_LVS_SYNCD | |||||
| depends on KEEPALIVED_LVS | |||||
| bool | |||||
| default y | |||||
| prompt "Enable IPVS syncd daemon control" | |||||
| help | |||||
| Builds support for configuring IPVS syncd daemon | |||||
| config KEEPALIVED_LVS_64BIT_STATS | |||||
| depends on KEEPALIVED_LVS | |||||
| bool | |||||
| default y | |||||
| prompt "Enable IPVS 64 bit stats" | |||||
| help | |||||
| Builds support for IPVS 64 bit stats | |||||
| config KEEPALIVED_FWMARK | |||||
| depends on KEEPALIVED_LVS | |||||
| bool | |||||
| default y | |||||
| prompt "Enable support for setting FWMARK on sockets" | |||||
| help | |||||
| Builds support for setting firewall mark on checker sockets | |||||
| config KEEPALIVED_SNMP_CHECKER | |||||
| depends on KEEPALIVED_LVS | |||||
| bool | |||||
| default n | |||||
| prompt "Enable SNMP support for checker (LVS)" | |||||
| help | |||||
| Builds support for using SNMP with LVS | |||||
| config KEEPALIVED_VRRP | |||||
| bool | |||||
| default y | |||||
| prompt "Enable VRRP support" | |||||
| help | |||||
| Builds support for VRRP | |||||
| config KEEPALIVED_IPTABLES | |||||
| depends on KEEPALIVED_VRRP | |||||
| bool | |||||
| default y | |||||
| prompt "Enable iptables for VIP filtering" | |||||
| help | |||||
| Builds support for using iptables/ipsets for filtering packets | |||||
| to VIPs | |||||
| config KEEPALIVED_SNMP_VRRP | |||||
| depends on KEEPALIVED_VRRP | |||||
| bool | |||||
| default n | |||||
| prompt "Enable SNMP support for VRRP" | |||||
| help | |||||
| Builds support for using SNMP with VRRP | |||||
| config KEEPALIVED_SNMP_RFC2 | |||||
| depends on KEEPALIVED_VRRP | |||||
| bool | |||||
| default n | |||||
| prompt "Enable SNMP support for VRRPv2 (RFC2787)" | |||||
| help | |||||
| Builds support for using RFC2787 SNMP support for VRRPv2 | |||||
| config KEEPALIVED_SNMP_RFC3 | |||||
| depends on KEEPALIVED_VRRP | |||||
| bool | |||||
| default n | |||||
| prompt "Enable SNMP support for VRRPv3 (RFC6527)" | |||||
| help | |||||
| Builds support for using RFC6527 SNMP support for VRRPv3 | |||||
| config KEEPALIVED_SNMP_REPLY_V3_FOR_V2 | |||||
| depends on KEEPALIVED_SNMP_RFC3 | |||||
| bool | |||||
| default n | |||||
| prompt "Enable SNMP v3 responses for VRRPv2 instances" | |||||
| help | |||||
| Builds support for using SNMP v3 responses for VRRPv2 instances | |||||
| config KEEPALIVED_DBUS | |||||
| depends on KEEPALIVED_VRRP | |||||
| bool | |||||
| default n | |||||
| prompt "Enable DBus support" | |||||
| help | |||||
| Builds support for using DBus with VRRP | |||||
| config KEEPALIVED_JSON | |||||
| depends on KEEPALIVED_VRRP | |||||
| bool | |||||
| default n | |||||
| prompt "Enable JSON support with VRRP" | |||||
| help | |||||
| Builds support for using JSON output for VRRP | |||||
| config KEEPALIVED_VRRP_AUTH | |||||
| depends on KEEPALIVED_VRRP | |||||
| bool | |||||
| default y | |||||
| prompt "Enable (removed) VRRPv2 authentication" | |||||
| help | |||||
| Builds support for using (removed) VRRPv2 authentication | |||||
| Note: authentication was removed from the VRRPv2 specification | |||||
| by RFC3768 in 2004. | |||||
| Use of this option is non-compliant and can cause problems. | |||||
| Avoid using if possible, except when using unicast, where it | |||||
| can be helpful. | |||||
| config KEEPALIVED_CHECKSUM_COMPAT | |||||
| depends on KEEPALIVED_VRRP | |||||
| bool | |||||
| default y | |||||
| prompt "Enable checksum compatibility" | |||||
| help | |||||
| Builds support for interworking with instances using | |||||
| old(incorrect) checksum method | |||||
| config KEEPALIVED_ROUTES | |||||
| depends on KEEPALIVED_VRRP | |||||
| bool | |||||
| default y | |||||
| prompt "Enable support for VRRP instances managing routes and rules" | |||||
| help | |||||
| Builds support for VRRP instances adding and removing IP | |||||
| routes and rules | |||||
| config KEEPALIVED_LINKBEAT | |||||
| depends on KEEPALIVED_VRRP | |||||
| bool | |||||
| default y | |||||
| prompt "Enable support for linkbeat" | |||||
| help | |||||
| Builds support for using linkbeat polling to monitor the state | |||||
| of interfaces | |||||
| endmenu | |||||
| endif # PACKAGE_keepalived | |||||
+ 209
- 27
net/keepalived/Makefile
View File
+ 212
- 0
net/keepalived/patches/001-fix-systemd.patch
View File
| @ -0,0 +1,212 @@ | |||||
| --- a/configure.ac 2019-03-30 12:47:15.935627522 +0000 | |||||
| +++ b/configure.ac 2019-03-30 12:47:55.590028792 +0000 | |||||
| @@ -272,8 +272,7 @@ AC_ARG_ENABLE(Werror, | |||||
| [AS_HELP_STRING([--enable-Werror], [compile with warnings being errors])]) | |||||
| AC_ARG_WITH([systemdsystemunitdir], | |||||
| - AS_HELP_STRING([--with-systemdsystemunitdir=DIR], [Directory for systemd service files]), | |||||
| - [], [with_systemdsystemunitdir=$($PKG_CONFIG --variable=systemdsystemunitdir systemd)]) | |||||
| + AS_HELP_STRING([--with-systemdsystemunitdir=DIR], [Directory for systemd service files])]) | |||||
| # Set the kernel headers path | |||||
| if test -n "$kernel_src_path"; then | |||||
| @@ -551,7 +550,7 @@ do | |||||
| eval $LOCAL_WARN_VAR=yes | |||||
| add_to_var([KA_CFLAGS], [-W$WARN]) | |||||
| AC_DEFINE_UNQUOTED([$WARN_VAR], [ 1 ]) | |||||
| - AS_IF([test -z $WARN_VAR_SHORT], [], | |||||
| + AS_IF([test -z "$WARN_VAR_SHORT"], [], | |||||
| [AC_DEFINE_UNQUOTED([$WARN_VAR_SHORT], [ 1 ])] | |||||
| ) | |||||
| ], | |||||
| @@ -2451,41 +2450,39 @@ AM_CONDITIONAL([RPM_BIP], [test $RPM_NO_ | |||||
| dnl ----[ Determine system init type]---- | |||||
| INIT_TYPE= | |||||
| -if test -z $init_type; then | |||||
| +AS_IF( | |||||
| + [test -n "$init_type"], [INIT_TYPE=$init_type], | |||||
| + [test -n "$with_systemdsystemunitdir"], [INIT_TYPE=systemd], | |||||
| + [ | |||||
| /sbin/init --version 2>/dev/null | grep -q upstart | |||||
| - if test $? -eq 0; then | |||||
| - INIT_TYPE=upstart | |||||
| - else | |||||
| + AS_IF( | |||||
| + [test $? -eq 0], [INIT_TYPE=upstart], | |||||
| + [ | |||||
| init_path=`which systemctl 2>/dev/null` | |||||
| - if test \( $? -eq 0 -a -x "$init_path" \); then | |||||
| + AS_IF([test \( $? -eq 0 -a -x "$init_path" \)], | |||||
| + [ | |||||
| systemctl | grep -q -- "-\.mount" | |||||
| - if test $? -eq 0; then | |||||
| - INIT_TYPE=systemd | |||||
| - fi | |||||
| - fi | |||||
| - if test \( -z "$INIT_TYPE" -a -f /etc/init.d/networking \); then | |||||
| + AS_IF([test $? -eq 0], [INIT_TYPE=systemd]) | |||||
| + ]) | |||||
| + AS_IF([test \( -z "$INIT_TYPE" -a -f /etc/init.d/networking \)], | |||||
| + [ | |||||
| init_path=`which openrc-run 2>/dev/null` | |||||
| - if test \( $? -eq 0 -a -x "$init_path" \); then | |||||
| + AS_IF([test \( $? -eq 0 -a -x "$init_path" \)], | |||||
| + [ | |||||
| head -1 /etc/init.d/networking | grep -q "^#! */.*/openrc-run$" | |||||
| - if test $? -eq 0; then | |||||
| - INIT_TYPE=openrc | |||||
| - fi | |||||
| - fi | |||||
| - fi | |||||
| - if test \( -z "$INIT_TYPE" -a -f /etc/init.d/cron -a ! -h /etc/init.d/cron \); then | |||||
| - INIT_TYPE=SYSV | |||||
| - fi | |||||
| - fi | |||||
| -else | |||||
| - INIT_TYPE=$init_type | |||||
| -fi | |||||
| + AS_IF([test $? -eq 0], [INIT_TYPE=openrc]) | |||||
| + ]) | |||||
| + ]) | |||||
| + AS_IF([test \( -z "$INIT_TYPE" -a -f /etc/init.d/cron -a ! -h /etc/init.d/cron \)], [INIT_TYPE=SYSV]) | |||||
| + ]) | |||||
| + ]) | |||||
| +AS_IF([test \( .$INIT_TYPE = .systemd -a -z "$with_systemdsystemunitdir" \)], [with_systemdsystemunitdir=$($PKG_CONFIG --variable=systemdsystemunitdir systemd)]) | |||||
| dnl ----[Default keepalived configuration file]---- | |||||
| AS_IF([test $default_config_file], | |||||
| [ | |||||
| AS_IF([test $default_config_file = yes -o $default_config_file = no], | |||||
| - AC_MSG_ERROR([A filename must be specified for default-config-file]) | |||||
| - ]) | |||||
| + [AC_MSG_ERROR([A filename must be specified for default-config-file])]) | |||||
| CONFIG_FILE=$default_config_file | |||||
| add_config_opt([DEFAULT_CONFIG_FILE=${default_config_file}]) | |||||
| ], | |||||
| @@ -2493,7 +2490,7 @@ AS_IF([test $default_config_file], | |||||
| AC_DEFINE_UNQUOTED([DEFAULT_CONFIG_FILE], ["$default_config_file"], [The default configuration file]) | |||||
| AC_SUBST([DEFAULT_CONFIG_FILE], [$default_config_file]) | |||||
| -if test -z $INIT_TYPE; then | |||||
| +if test -z "$INIT_TYPE"; then | |||||
| INIT_TYPE=undetected | |||||
| elif test $INIT_TYPE = systemd; then | |||||
| AC_SUBST([systemdsystemunitdir], [$with_systemdsystemunitdir]) | |||||
| --- a/configure 2019-03-30 12:47:25.313485929 +0000 | |||||
| +++ b/configure 2019-03-30 12:48:08.009841269 +0000 | |||||
| @@ -1631,7 +1631,7 @@ Optional Packages: | |||||
| --with-default-config-file=FILE | |||||
| Default configuration file | |||||
| --with-systemdsystemunitdir=DIR | |||||
| - Directory for systemd service files | |||||
| + Directory for systemd service files] | |||||
| Some influential environment variables: | |||||
| PKG_CONFIG path to pkg-config utility | |||||
| @@ -3858,8 +3858,6 @@ fi | |||||
| # Check whether --with-systemdsystemunitdir was given. | |||||
| if test "${with_systemdsystemunitdir+set}" = set; then : | |||||
| withval=$with_systemdsystemunitdir; | |||||
| -else | |||||
| - with_systemdsystemunitdir=$($PKG_CONFIG --variable=systemdsystemunitdir systemd) | |||||
| fi | |||||
| @@ -5931,7 +5929,7 @@ $as_echo "yes" >&6; } | |||||
| #define $WARN_VAR 1 | |||||
| _ACEOF | |||||
| - if test -z $WARN_VAR_SHORT; then : | |||||
| + if test -z "$WARN_VAR_SHORT"; then : | |||||
| else | |||||
| cat >>confdefs.h <<_ACEOF | |||||
| @@ -12520,44 +12518,58 @@ fi | |||||
| INIT_TYPE= | |||||
| -if test -z $init_type; then | |||||
| +if test -n "$init_type"; then : | |||||
| + INIT_TYPE=$init_type | |||||
| +elif test -n "$with_systemdsystemunitdir"; then : | |||||
| + INIT_TYPE=systemd | |||||
| +else | |||||
| + | |||||
| /sbin/init --version 2>/dev/null | grep -q upstart | |||||
| - if test $? -eq 0; then | |||||
| + if test $? -eq 0; then : | |||||
| INIT_TYPE=upstart | |||||
| - else | |||||
| +else | |||||
| + | |||||
| init_path=`which systemctl 2>/dev/null` | |||||
| - if test \( $? -eq 0 -a -x "$init_path" \); then | |||||
| + if test \( $? -eq 0 -a -x "$init_path" \); then : | |||||
| + | |||||
| systemctl | grep -q -- "-\.mount" | |||||
| - if test $? -eq 0; then | |||||
| + if test $? -eq 0; then : | |||||
| INIT_TYPE=systemd | |||||
| - fi | |||||
| - fi | |||||
| - if test \( -z "$INIT_TYPE" -a -f /etc/init.d/networking \); then | |||||
| +fi | |||||
| + | |||||
| +fi | |||||
| + if test \( -z "$INIT_TYPE" -a -f /etc/init.d/networking \); then : | |||||
| + | |||||
| init_path=`which openrc-run 2>/dev/null` | |||||
| - if test \( $? -eq 0 -a -x "$init_path" \); then | |||||
| + if test \( $? -eq 0 -a -x "$init_path" \); then : | |||||
| + | |||||
| head -1 /etc/init.d/networking | grep -q "^#! */.*/openrc-run$" | |||||
| - if test $? -eq 0; then | |||||
| + if test $? -eq 0; then : | |||||
| INIT_TYPE=openrc | |||||
| - fi | |||||
| - fi | |||||
| - fi | |||||
| - if test \( -z "$INIT_TYPE" -a -f /etc/init.d/cron -a ! -h /etc/init.d/cron \); then | |||||
| +fi | |||||
| + | |||||
| +fi | |||||
| + | |||||
| +fi | |||||
| + if test \( -z "$INIT_TYPE" -a -f /etc/init.d/cron -a ! -h /etc/init.d/cron \); then : | |||||
| INIT_TYPE=SYSV | |||||
| - fi | |||||
| - fi | |||||
| -else | |||||
| - INIT_TYPE=$init_type | |||||
| +fi | |||||
| + | |||||
| +fi | |||||
| + | |||||
| +fi | |||||
| +if test \( .$INIT_TYPE = .systemd -a -z "$with_systemdsystemunitdir" \); then : | |||||
| + with_systemdsystemunitdir=$($PKG_CONFIG --variable=systemdsystemunitdir systemd) | |||||
| fi | |||||
| if test $default_config_file; then : | |||||
| if test $default_config_file = yes -o $default_config_file = no; then : | |||||
| as_fn_error $? "A filename must be specified for default-config-file" "$LINENO" 5 | |||||
| - | |||||
| fi | |||||
| CONFIG_FILE=$default_config_file | |||||
| CONFIG_OPTIONS="$CONFIG_OPTIONS DEFAULT_CONFIG_FILE=${default_config_file}" | |||||
| - ] | |||||
| + | |||||
| else | |||||
| default_config_file="/etc/$PACKAGE/$PACKAGE.conf" | |||||
| fi | |||||
| @@ -12569,7 +12581,7 @@ _ACEOF | |||||
| DEFAULT_CONFIG_FILE=$default_config_file | |||||
| -if test -z $INIT_TYPE; then | |||||
| +if test -z "$INIT_TYPE"; then | |||||
| INIT_TYPE=undetected | |||||
| elif test $INIT_TYPE = systemd; then | |||||
| systemdsystemunitdir=$with_systemdsystemunitdir | |||||