Compare commits
No commits in common. "c8" and "c9-beta" have entirely different histories.
2
.gitignore
vendored
2
.gitignore
vendored
@ -1 +1 @@
|
||||
SOURCES/keepalived-2.1.5.tar.gz
|
||||
SOURCES/keepalived-2.2.8.tar.gz
|
||||
|
||||
@ -1 +1 @@
|
||||
54128bc7b4f8b920028af4691be9013f25393a99 SOURCES/keepalived-2.1.5.tar.gz
|
||||
e35522125dcadb1f627e63f2be01f269f289c024 SOURCES/keepalived-2.2.8.tar.gz
|
||||
|
||||
@ -1,83 +0,0 @@
|
||||
diff -ur keepalived-2.1.5/keepalived/core/global_parser.c keepalived-2.1.5.patched/keepalived/core/global_parser.c
|
||||
--- keepalived-2.1.5/keepalived/core/global_parser.c 2020-07-10 17:41:46.000000000 +0100
|
||||
+++ keepalived-2.1.5.patched/keepalived/core/global_parser.c 2024-12-02 14:06:44.469215491 +0000
|
||||
@@ -955,6 +955,22 @@
|
||||
}
|
||||
}
|
||||
#ifdef _HAVE_LIBIPSET_
|
||||
+static bool
|
||||
+check_valid_ipset_name(const vector_t *strvec, unsigned entry, const char *log_name)
|
||||
+{
|
||||
+ if (strlen(strvec_slot(strvec, entry)) >= IPSET_MAXNAMELEN - 1) {
|
||||
+ report_config_error(CONFIG_GENERAL_ERROR, "VRRP Error : ipset %s name too long - ignored", log_name);
|
||||
+ return false;
|
||||
+ }
|
||||
+
|
||||
+ if (strlen(strvec_slot(strvec, entry)) == 0) {
|
||||
+ report_config_error(CONFIG_GENERAL_ERROR, "VRRP Error : ipset %s name empty - ignored", log_name);
|
||||
+ return false;
|
||||
+ }
|
||||
+
|
||||
+ return true;
|
||||
+}
|
||||
+
|
||||
static void
|
||||
vrrp_ipsets_handler(const vector_t *strvec)
|
||||
{
|
||||
@@ -974,17 +990,13 @@
|
||||
return;
|
||||
}
|
||||
|
||||
- if (strlen(strvec_slot(strvec,1)) >= IPSET_MAXNAMELEN - 1) {
|
||||
- report_config_error(CONFIG_GENERAL_ERROR, "VRRP Error : ipset address name too long - ignored");
|
||||
+ if (!check_valid_ipset_name(strvec, 1, "address"))
|
||||
return;
|
||||
- }
|
||||
global_data->vrrp_ipset_address = STRDUP(strvec_slot(strvec,1));
|
||||
|
||||
if (vector_size(strvec) >= 3) {
|
||||
- if (strlen(strvec_slot(strvec,2)) >= IPSET_MAXNAMELEN - 1) {
|
||||
- report_config_error(CONFIG_GENERAL_ERROR, "VRRP Error : ipset IPv6 address name too long - ignored");
|
||||
+ if (!check_valid_ipset_name(strvec, 2, "IPv6 address"))
|
||||
return;
|
||||
- }
|
||||
global_data->vrrp_ipset_address6 = STRDUP(strvec_slot(strvec,2));
|
||||
}
|
||||
else {
|
||||
@@ -995,10 +1007,8 @@
|
||||
global_data->vrrp_ipset_address6 = STRDUP(set_name);
|
||||
}
|
||||
if (vector_size(strvec) >= 4) {
|
||||
- if (strlen(strvec_slot(strvec,3)) >= IPSET_MAXNAMELEN - 1) {
|
||||
- report_config_error(CONFIG_GENERAL_ERROR, "VRRP Error : ipset IPv6 address_iface name too long - ignored");
|
||||
+ if (!check_valid_ipset_name(strvec, 3, "IPv6 address_iface"))
|
||||
return;
|
||||
- }
|
||||
global_data->vrrp_ipset_address_iface6 = STRDUP(strvec_slot(strvec,3));
|
||||
}
|
||||
else {
|
||||
@@ -1014,10 +1024,8 @@
|
||||
|
||||
#ifdef HAVE_IPSET_ATTR_IFACE
|
||||
if (vector_size(strvec) >= 5) {
|
||||
- if (strlen(strvec_slot(strvec,4)) >= IPSET_MAXNAMELEN - 1) {
|
||||
- report_config_error(CONFIG_GENERAL_ERROR, "VRRP Error : ipset IGMP name too long - ignored");
|
||||
+ if (!check_valid_ipset_name(strvec, 4, "IGMP"))
|
||||
return;
|
||||
- }
|
||||
global_data->vrrp_ipset_igmp = STRDUP(strvec_slot(strvec,4));
|
||||
}
|
||||
else {
|
||||
@@ -1028,10 +1036,8 @@
|
||||
global_data->vrrp_ipset_igmp = STRDUP(set_name);
|
||||
}
|
||||
if (vector_size(strvec) >= 6) {
|
||||
- if (strlen(strvec_slot(strvec,5)) >= IPSET_MAXNAMELEN - 1) {
|
||||
- report_config_error(CONFIG_GENERAL_ERROR, "VRRP Error : ipset MLD name too long - ignored");
|
||||
+ if (!check_valid_ipset_name(strvec, 5, "MLD"))
|
||||
return;
|
||||
- }
|
||||
global_data->vrrp_ipset_mld = STRDUP(strvec_slot(strvec,5));
|
||||
}
|
||||
else {
|
||||
Only in keepalived-2.1.5.patched/keepalived/core: global_parser.c.orig
|
||||
@ -1,55 +0,0 @@
|
||||
From ff476e860e91c1a814ac038ee16790a2a5b950af Mon Sep 17 00:00:00 2001
|
||||
From: Quentin Armitage <quentin@armitage.org.uk>
|
||||
Date: Mon, 18 Jan 2021 14:38:15 +0000
|
||||
Subject: [PATCH 1/2] Revert "Explicitly set LOG_USER log facility when
|
||||
syslogging"
|
||||
|
||||
This reverts commit db3bcf7b891881e8e70954424f0fe88ec7d37ce0.
|
||||
|
||||
This commit was just plain wrong. The facility should default to
|
||||
LOG_DAEMON (see keepalived(8) man page), but if --log-facility is
|
||||
specified, that is the facility to which log entries should be logged.
|
||||
---
|
||||
lib/logger.c | 5 +----
|
||||
lib/logger.h | 2 +-
|
||||
2 files changed, 2 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/lib/logger.c b/lib/logger.c
|
||||
index a0cc2048..34c83f32 100644
|
||||
--- a/lib/logger.c
|
||||
+++ b/lib/logger.c
|
||||
@@ -133,7 +133,7 @@ block_signals(sigset_t *cur_set)
|
||||
#endif
|
||||
|
||||
void
|
||||
-vlog_message(int facility, const char* format, va_list args)
|
||||
+vlog_message(const int facility, const char* format, va_list args)
|
||||
{
|
||||
#ifndef HAVE_SIGNALFD
|
||||
sigset_t cur_set;
|
||||
@@ -213,9 +213,6 @@ vlog_message(int facility, const char* format, va_list args)
|
||||
restore_signals = true;
|
||||
#endif
|
||||
|
||||
- if (!(facility & LOG_FACMASK))
|
||||
- facility |= LOG_USER;
|
||||
-
|
||||
#if HAVE_VSYSLOG
|
||||
vsyslog(facility, format, args);
|
||||
#else
|
||||
diff --git a/lib/logger.h b/lib/logger.h
|
||||
index 7536536a..20b2a7e4 100644
|
||||
--- a/lib/logger.h
|
||||
+++ b/lib/logger.h
|
||||
@@ -44,7 +44,7 @@ extern void open_log_file(const char *, const char *, const char *, const char *
|
||||
extern void flush_log_file(void);
|
||||
extern void update_log_file_perms(mode_t);
|
||||
#endif
|
||||
-extern void vlog_message(int facility, const char* format, va_list args)
|
||||
+extern void vlog_message(const int facility, const char* format, va_list args)
|
||||
__attribute__ ((format (printf, 2, 0)));
|
||||
extern void log_message(int priority, const char* format, ...)
|
||||
__attribute__ ((format (printf, 2, 3)));
|
||||
--
|
||||
2.31.1
|
||||
|
||||
@ -1,165 +0,0 @@
|
||||
From 75ea1d31c17f4bb3a73590167658310bc9f67149 Mon Sep 17 00:00:00 2001
|
||||
From: Quentin Armitage <quentin@armitage.org.uk>
|
||||
Date: Mon, 18 Jan 2021 14:57:30 +0000
|
||||
Subject: [PATCH 2/2] all: log to LOG_DAEMON facility by default
|
||||
|
||||
keepalived(8) man page states that the default log facility is LOG_DAEMON.
|
||||
Commit db3bcf7 - "Explicitly set LOG_USER log facility when syslogging"
|
||||
incorrectly set the facility to LOG_USER, and that has now been reverted.
|
||||
However, with that reverted, by default the VRRP process logs to LOG_LOCAL1
|
||||
and the checker and BFD processes log to LOG_LOCAL2, contrary to the
|
||||
documentation.
|
||||
|
||||
Since no-one has commented that logs were not going to LOG_LOCAL1/2 since
|
||||
commit db3bcf7 (April 28 2020), it is safe to assume that no-one was relying
|
||||
on that. This commit therefore reverts to the documentation and by default
|
||||
logs everything to the LOG_DAEMON facility.
|
||||
|
||||
Signed-off-by: Quentin Armitage <quentin@armitage.org.uk>
|
||||
---
|
||||
keepalived/bfd/bfd_daemon.c | 3 +--
|
||||
keepalived/check/check_daemon.c | 3 +--
|
||||
keepalived/core/main.c | 7 +++----
|
||||
keepalived/include/main.h | 1 -
|
||||
keepalived/vrrp/vrrp_daemon.c | 3 +--
|
||||
lib/logger.c | 2 ++
|
||||
lib/logger.h | 10 ++++++++++
|
||||
7 files changed, 18 insertions(+), 11 deletions(-)
|
||||
|
||||
diff --git a/keepalived/bfd/bfd_daemon.c b/keepalived/bfd/bfd_daemon.c
|
||||
index cf74eee3..47d87892 100644
|
||||
--- a/keepalived/bfd/bfd_daemon.c
|
||||
+++ b/keepalived/bfd/bfd_daemon.c
|
||||
@@ -396,8 +396,7 @@ start_bfd_child(void)
|
||||
|
||||
/* Opening local BFD syslog channel */
|
||||
if (!__test_bit(NO_SYSLOG_BIT, &debug))
|
||||
- openlog(syslog_ident, LOG_PID | ((__test_bit(LOG_CONSOLE_BIT, &debug)) ? LOG_CONS : 0)
|
||||
- , (log_facility==LOG_DAEMON) ? LOG_LOCAL2 : log_facility);
|
||||
+ open_syslog(syslog_ident);
|
||||
|
||||
#ifdef ENABLE_LOG_TO_FILE
|
||||
if (log_file_name)
|
||||
diff --git a/keepalived/check/check_daemon.c b/keepalived/check/check_daemon.c
|
||||
index 5e03cc4c..63bdf07b 100644
|
||||
--- a/keepalived/check/check_daemon.c
|
||||
+++ b/keepalived/check/check_daemon.c
|
||||
@@ -689,8 +689,7 @@ start_check_child(void)
|
||||
|
||||
/* Opening local CHECK syslog channel */
|
||||
if (!__test_bit(NO_SYSLOG_BIT, &debug))
|
||||
- openlog(syslog_ident, LOG_PID | ((__test_bit(LOG_CONSOLE_BIT, &debug)) ? LOG_CONS : 0)
|
||||
- , (log_facility==LOG_DAEMON) ? LOG_LOCAL2 : log_facility);
|
||||
+ open_syslog(syslog_ident);
|
||||
|
||||
#ifdef ENABLE_LOG_TO_FILE
|
||||
if (log_file_name)
|
||||
diff --git a/keepalived/core/main.c b/keepalived/core/main.c
|
||||
index be4488ea..756b2f12 100644
|
||||
--- a/keepalived/core/main.c
|
||||
+++ b/keepalived/core/main.c
|
||||
@@ -149,7 +149,6 @@ static const struct child_term children_term[] = {
|
||||
/* global var */
|
||||
const char *version_string = VERSION_STRING; /* keepalived version */
|
||||
const char *conf_file = KEEPALIVED_CONFIG_FILE; /* Configuration file */
|
||||
-int log_facility = LOG_DAEMON; /* Optional logging facilities */
|
||||
bool reload; /* Set during a reload */
|
||||
const char *main_pidfile; /* overrule default pidfile */
|
||||
static bool free_main_pidfile;
|
||||
@@ -2087,7 +2086,7 @@ keepalived_main(int argc, char **argv)
|
||||
umask(umask_val);
|
||||
|
||||
/* Open log with default settings so we can log initially */
|
||||
- openlog(PACKAGE_NAME, LOG_PID, log_facility);
|
||||
+ open_syslog(PACKAGE_NAME);
|
||||
|
||||
#ifdef _MEM_CHECK_
|
||||
mem_log_init(PACKAGE_NAME, "Parent process");
|
||||
@@ -2128,7 +2127,7 @@ keepalived_main(int argc, char **argv)
|
||||
if (parse_cmdline(argc, argv)) {
|
||||
closelog();
|
||||
if (!__test_bit(NO_SYSLOG_BIT, &debug))
|
||||
- openlog(PACKAGE_NAME, LOG_PID | ((__test_bit(LOG_CONSOLE_BIT, &debug)) ? LOG_CONS : 0) , log_facility);
|
||||
+ open_syslog(PACKAGE_NAME);
|
||||
}
|
||||
|
||||
if (__test_bit(LOG_CONSOLE_BIT, &debug))
|
||||
@@ -2212,7 +2211,7 @@ keepalived_main(int argc, char **argv)
|
||||
if ((syslog_ident = make_syslog_ident(PACKAGE_NAME))) {
|
||||
log_message(LOG_INFO, "Changing syslog ident to %s", syslog_ident);
|
||||
closelog();
|
||||
- openlog(syslog_ident, LOG_PID | ((__test_bit(LOG_CONSOLE_BIT, &debug)) ? LOG_CONS : 0), log_facility);
|
||||
+ open_syslog(syslog_ident);
|
||||
}
|
||||
else
|
||||
log_message(LOG_INFO, "Unable to change syslog ident");
|
||||
diff --git a/keepalived/include/main.h b/keepalived/include/main.h
|
||||
index 3e013bb6..6a34797b 100644
|
||||
--- a/keepalived/include/main.h
|
||||
+++ b/keepalived/include/main.h
|
||||
@@ -51,7 +51,6 @@ enum daemon_bits {
|
||||
extern const char *version_string; /* keepalived version */
|
||||
extern unsigned long daemon_mode; /* Which child processes are run */
|
||||
extern const char *conf_file; /* Configuration file */
|
||||
-extern int log_facility; /* Optional logging facilities */
|
||||
#ifdef _WITH_VRRP_
|
||||
extern pid_t vrrp_child; /* VRRP child process ID */
|
||||
extern const char *vrrp_pidfile; /* overrule default pidfile */
|
||||
diff --git a/keepalived/vrrp/vrrp_daemon.c b/keepalived/vrrp/vrrp_daemon.c
|
||||
index baa5f5f2..e22f8a81 100644
|
||||
--- a/keepalived/vrrp/vrrp_daemon.c
|
||||
+++ b/keepalived/vrrp/vrrp_daemon.c
|
||||
@@ -974,8 +974,7 @@ start_vrrp_child(void)
|
||||
syslog_ident = PROG_VRRP;
|
||||
|
||||
if (!__test_bit(NO_SYSLOG_BIT, &debug))
|
||||
- openlog(syslog_ident, LOG_PID | ((__test_bit(LOG_CONSOLE_BIT, &debug)) ? LOG_CONS : 0)
|
||||
- , (log_facility==LOG_DAEMON) ? LOG_LOCAL1 : log_facility);
|
||||
+ open_syslog(syslog_ident);
|
||||
|
||||
#ifdef ENABLE_LOG_TO_FILE
|
||||
if (log_file_name)
|
||||
diff --git a/lib/logger.c b/lib/logger.c
|
||||
index 34c83f32..7fad8ac6 100644
|
||||
--- a/lib/logger.c
|
||||
+++ b/lib/logger.c
|
||||
@@ -40,6 +40,8 @@
|
||||
/* Boolean flag - send messages to console as well as syslog */
|
||||
static bool log_console = false;
|
||||
|
||||
+int log_facility = LOG_DAEMON; /* Optional logging facilities */
|
||||
+
|
||||
#ifdef ENABLE_LOG_TO_FILE
|
||||
/* File to write log messages to */
|
||||
const char *log_file_name;
|
||||
diff --git a/lib/logger.h b/lib/logger.h
|
||||
index 20b2a7e4..c6f29138 100644
|
||||
--- a/lib/logger.h
|
||||
+++ b/lib/logger.h
|
||||
@@ -30,8 +30,13 @@
|
||||
#include <sys/stat.h>
|
||||
#endif
|
||||
|
||||
+#include "bitops.h"
|
||||
+#include "utils.h"
|
||||
+
|
||||
#define MAX_LOG_MSG 255
|
||||
|
||||
+extern int log_facility; /* Optional logging facilities */
|
||||
+
|
||||
#ifdef ENABLE_LOG_TO_FILE
|
||||
extern const char *log_file_name;
|
||||
#endif
|
||||
@@ -51,4 +56,9 @@ extern void log_message(int priority, const char* format, ...)
|
||||
extern void conf_write(FILE *fp, const char *format, ...)
|
||||
__attribute__ ((format (printf, 2, 3)));
|
||||
|
||||
+static inline void
|
||||
+open_syslog(const char *ident)
|
||||
+{
|
||||
+ openlog(ident, LOG_PID | ((__test_bit(LOG_CONSOLE_BIT, &debug)) ? LOG_CONS : 0), log_facility);
|
||||
+}
|
||||
#endif
|
||||
--
|
||||
2.31.1
|
||||
|
||||
@ -1,41 +0,0 @@
|
||||
From 763eaa49343acdda5ff359012e8cc49c9ffc8e81 Mon Sep 17 00:00:00 2001
|
||||
From: Vincent Bernat <vincent@bernat.ch>
|
||||
Date: Tue, 23 Nov 2021 06:50:59 +0100
|
||||
Subject: [PATCH] dbus: fix policy to not be overly broad
|
||||
|
||||
The DBus policy did not restrict the message destination, allowing any
|
||||
user to inspect and manipulate any property.
|
||||
|
||||
Signed-off-by: Vincent Bernat <vincent@bernat.ch>
|
||||
---
|
||||
keepalived/dbus/org.keepalived.Vrrp1.conf | 13 ++++++++-----
|
||||
1 file changed, 8 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/keepalived/dbus/org.keepalived.Vrrp1.conf b/keepalived/dbus/org.keepalived.Vrrp1.conf
|
||||
index 2b78a575..b5ced608 100644
|
||||
--- a/keepalived/dbus/org.keepalived.Vrrp1.conf
|
||||
+++ b/keepalived/dbus/org.keepalived.Vrrp1.conf
|
||||
@@ -3,12 +3,15 @@
|
||||
"http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
|
||||
<busconfig>
|
||||
<policy user="root">
|
||||
- <allow own="org.keepalived.Vrrp1"/>
|
||||
- <allow send_destination="org.keepalived.Vrrp1"/>
|
||||
+ <allow own="org.keepalived.Vrrp1" />
|
||||
+ <allow send_destination="org.keepalived.Vrrp1" />
|
||||
</policy>
|
||||
<policy context="default">
|
||||
- <allow send_interface="org.freedesktop.DBus.Introspectable" />
|
||||
- <allow send_interface="org.freedesktop.DBus.Peer" />
|
||||
- <allow send_interface="org.freedesktop.DBus.Properties" />
|
||||
+ <allow send_destination="org.keepalived.Vrrp1"
|
||||
+ send_interface="org.freedesktop.DBus.Introspectable" />
|
||||
+ <allow send_destination="org.keepalived.Vrrp1"
|
||||
+ send_interface="org.freedesktop.DBus.Peer" />
|
||||
+ <allow send_destination="org.keepalived.Vrrp1"
|
||||
+ send_interface="org.freedesktop.DBus.Properties" />
|
||||
</policy>
|
||||
</busconfig>
|
||||
--
|
||||
2.33.1
|
||||
|
||||
@ -1,41 +0,0 @@
|
||||
From d93b2051641ebfc4c5dcdc405ed0f26b9bcaa65a Mon Sep 17 00:00:00 2001
|
||||
From: Quentin Armitage <quentin@armitage.org.uk>
|
||||
Date: Sat, 25 Jul 2020 10:13:32 +0100
|
||||
Subject: [PATCH] vrrp: Don't remove unweighted track scripts from sync group
|
||||
members
|
||||
|
||||
Commit 3390697 - "vrrp: rewrote framework using list_head_t design"
|
||||
cleared the track_script list for any vrrp instance that was in a
|
||||
sync group. This was due to the old list structure allocating memory
|
||||
which had to be freed if the list was empty, but that is no longer
|
||||
the case with list_head.
|
||||
|
||||
Signed-off-by: Quentin Armitage <quentin@armitage.org.uk>
|
||||
---
|
||||
keepalived/vrrp/vrrp.c | 3 +--
|
||||
1 file changed, 1 insertion(+), 2 deletions(-)
|
||||
|
||||
diff --git a/keepalived/vrrp/vrrp.c b/keepalived/vrrp/vrrp.c
|
||||
index c8967eef..c7ded6b4 100644
|
||||
--- a/keepalived/vrrp/vrrp.c
|
||||
+++ b/keepalived/vrrp/vrrp.c
|
||||
@@ -3406,7 +3406,7 @@ vrrp_complete_instance(vrrp_t * vrrp)
|
||||
free_track_if_list(&vrrp->track_ifp);
|
||||
|
||||
/* Ignore any weighted script */
|
||||
- list_for_each_entry_safe(sc, sc_tmp, &vrrp->track_script,e_list) {
|
||||
+ list_for_each_entry_safe(sc, sc_tmp, &vrrp->track_script, e_list) {
|
||||
if (sc->weight) {
|
||||
report_config_error(CONFIG_GENERAL_ERROR, "(%s) ignoring "
|
||||
"tracked script %s with weights due to %s"
|
||||
@@ -3417,7 +3417,6 @@ vrrp_complete_instance(vrrp_t * vrrp)
|
||||
free_track_script(sc);
|
||||
}
|
||||
}
|
||||
- free_track_script_list(&vrrp->track_script);
|
||||
|
||||
/* Set tracking files to unweighted if weight not explicitly set, otherwise ignore */
|
||||
list_for_each_entry_safe(tfl, tfl_tmp, &vrrp->track_file, e_list) {
|
||||
--
|
||||
2.33.1
|
||||
|
||||
@ -4,11 +4,12 @@ After=network-online.target syslog.target
|
||||
Wants=network-online.target
|
||||
|
||||
[Service]
|
||||
Type=forking
|
||||
PIDFile=/var/run/keepalived.pid
|
||||
Type=notify
|
||||
NotifyAccess=all
|
||||
PIDFile=/run/keepalived.pid
|
||||
KillMode=process
|
||||
EnvironmentFile=-/etc/sysconfig/keepalived
|
||||
ExecStart=/usr/sbin/keepalived $KEEPALIVED_OPTIONS
|
||||
ExecStart=/usr/sbin/keepalived --dont-fork $KEEPALIVED_OPTIONS
|
||||
ExecReload=/bin/kill -HUP $MAINPID
|
||||
|
||||
[Install]
|
||||
|
||||
@ -1,7 +1,8 @@
|
||||
%bcond_without snmp
|
||||
%bcond_without vrrp
|
||||
%bcond_without sha1
|
||||
%bcond_with iptables
|
||||
%bcond_without json
|
||||
%bcond_without nftables
|
||||
%bcond_with profile
|
||||
%bcond_with debug
|
||||
|
||||
@ -9,21 +10,14 @@
|
||||
|
||||
Name: keepalived
|
||||
Summary: High Availability monitor built upon LVS, VRRP and service pollers
|
||||
Version: 2.1.5
|
||||
Release: 10%{?dist}
|
||||
Version: 2.2.8
|
||||
Release: 3%{?dist}
|
||||
License: GPLv2+
|
||||
URL: http://www.keepalived.org/
|
||||
Group: System Environment/Daemons
|
||||
|
||||
Source0: http://www.keepalived.org/software/keepalived-%{version}.tar.gz
|
||||
Source1: keepalived.service
|
||||
|
||||
Patch1: bz1977716-revert-explicit-set-LOG_USER-facility.patch
|
||||
Patch2: bz1977716-use-LOG_DAEMON-facility-by-default.patch
|
||||
Patch3: bz2028350-fix-dbus-policy-restrictions.patch
|
||||
Patch4: bz2054249-fix-unweighted-track-scripts.patch
|
||||
Patch5: RHEL-49561-validate-ipset-names-better.patch
|
||||
|
||||
Requires(post): systemd
|
||||
Requires(preun): systemd
|
||||
Requires(postun): systemd
|
||||
@ -31,16 +25,21 @@ Requires(postun): systemd
|
||||
%if %{with snmp}
|
||||
BuildRequires: net-snmp-devel
|
||||
%endif
|
||||
%if %{with iptables}
|
||||
%if %{with nftables}
|
||||
BuildRequires: libmnl-devel
|
||||
BuildRequires: libnftnl-devel
|
||||
%else
|
||||
BuildRequires: ipset-devel
|
||||
BuildRequires: iptables-devel
|
||||
%endif
|
||||
BuildRequires: gcc
|
||||
BuildRequires: automake
|
||||
BuildRequires: systemd-units
|
||||
BuildRequires: systemd-devel
|
||||
BuildRequires: openssl-devel
|
||||
BuildRequires: libnl3-devel
|
||||
BuildRequires: libnfnetlink-devel
|
||||
BuildRequires: file-devel
|
||||
BuildRequires: make
|
||||
|
||||
%description
|
||||
Keepalived provides simple and robust facilities for load balancing
|
||||
@ -58,20 +57,16 @@ infrastructures.
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
%patch1 -p1
|
||||
%patch2 -p1
|
||||
%patch3 -p1
|
||||
%patch4 -p1
|
||||
%patch5 -p1
|
||||
|
||||
%build
|
||||
%configure \
|
||||
%{?with_debug:--enable-debug} \
|
||||
%{?with_profile:--enable-profile} \
|
||||
%{!?with_vrrp:--disable-vrrp} \
|
||||
%{!?with_iptables:--disable-libiptc --disable-ipset} \
|
||||
%{?with_snmp:--enable-snmp --enable-snmp-rfc} \
|
||||
%{?with_nftables:--enable-nftables --disable-iptables} \
|
||||
%{?with_sha1:--enable-sha1} \
|
||||
%{?with_json:--enable-json} \
|
||||
--with-init=systemd
|
||||
%{__make} %{?_smp_mflags} STRIP=/bin/true
|
||||
|
||||
@ -80,6 +75,8 @@ rm -rf %{buildroot}
|
||||
make install DESTDIR=%{buildroot}
|
||||
rm -rf %{buildroot}%{_initrddir}/
|
||||
rm -rf %{buildroot}%{_sysconfdir}/keepalived/samples/
|
||||
mv %{buildroot}%{_sysconfdir}/keepalived/keepalived.conf.sample \
|
||||
%{buildroot}%{_sysconfdir}/keepalived/keepalived.conf
|
||||
%{__install} -p -D -m 0644 %{SOURCE1} %{buildroot}%{_unitdir}/keepalived.service
|
||||
mkdir -p %{buildroot}%{_libexecdir}/keepalived
|
||||
|
||||
@ -93,7 +90,6 @@ mkdir -p %{buildroot}%{_libexecdir}/keepalived
|
||||
%systemd_postun_with_restart keepalived.service
|
||||
|
||||
%files
|
||||
%defattr(-,root,root,-)
|
||||
%attr(0755,root,root) %{_sbindir}/keepalived
|
||||
%config(noreplace) %attr(0644,root,root) %{_sysconfdir}/sysconfig/keepalived
|
||||
%config(noreplace) %attr(0644,root,root) %{_sysconfdir}/keepalived/keepalived.conf
|
||||
@ -113,68 +109,146 @@ mkdir -p %{buildroot}%{_libexecdir}/keepalived
|
||||
%{_mandir}/man8/keepalived.8*
|
||||
|
||||
%changelog
|
||||
* Mon Dec 2 2024 Christine Caulfield <ccaulfie@redhat.com> - 2.1.5-10
|
||||
- CVE-2024-41184
|
||||
Resolves: RHEL-49561
|
||||
* Fri Jun 30 2023 Ryan O'Hara <rohara@redhat.com> - 2.2.8-2
|
||||
- Fix keepalived.conf installation (#2215308)
|
||||
|
||||
* Thu Jul 21 2022 Ryan O'Hara <rohara@redhat.com> - 2.1.5-9
|
||||
- Fix removal of unweighted track scripts from sync group (#2054249)
|
||||
* Thu Jun 15 2023 Ryan O'Hara <rohara@redhat.com> - 2.2.8-1
|
||||
- Update to 2.2.8 (#2215308)
|
||||
|
||||
* Tue Jan 18 2022 Ryan O'Hara <rohara@redhat.com> - 2.1.5-8
|
||||
- Fix DBus policy restrictions (#2028350, CVE-2021-44225)
|
||||
* Fri Dec 23 2022 Ryan O'Hara <rohara@redhat.com> - 2.2.4-6
|
||||
- Fix unterminated endif in previous patch (#2134749)
|
||||
|
||||
* Fri Oct 29 2021 Ryan O'Hara <rohara@redhat.com> - 2.1.5-7
|
||||
- Fix log-facility option (#197716)
|
||||
* Thu Dec 22 2022 Ryan O'Hara <rohara@redhat.com> - 2.2.4-5
|
||||
- Fix memory leak in https checks (#2134749)
|
||||
|
||||
* Tue Dec 15 2020 Ryan O'Hara <rohara@redhat.com> - 2.1.5-6
|
||||
- Fix changelog
|
||||
* Thu Dec 22 2022 Ryan O'Hara <rohara@redhat.com> - 2.2.4-4
|
||||
- Fix variable substitution in consditional lines (#2101493)
|
||||
|
||||
* Tue Oct 20 2020 Ryan O'Hara <rohara@redhat.com> - 2.1.5-5
|
||||
- Update to 2.1.5 (#1889440)
|
||||
- Fix intermittent child lost messages (#1868077)
|
||||
|
||||
* Tue Jun 16 2020 Ryan O'Hara <rohara@redhat.com> - 2.0.10-11
|
||||
- Fix vrrp_script execution (#1683438)
|
||||
* Thu Dec 22 2022 Ryan O'Hara <rohara@redhat.com> - 2.2.4-3
|
||||
- Enable JSON support (#2129819)
|
||||
|
||||
* Mon Feb 24 2020 Ryan O'Hara <rohara@redhat.com> - 2.0.10-10
|
||||
- Disable libiptc/ipset (#1806642)
|
||||
* Mon Feb 21 2022 Ryan O'Hara <rohara@redhat.com> - 2.2.4-2
|
||||
- Fix DBus policy restrictions (#2028351, CVE-2021-44225)
|
||||
|
||||
* Thu Jan 30 2020 Ryan O'Hara <rohara@redhat.com> - 2.0.10-9
|
||||
- Fix FAULT state when interface is renamed (#1792160)
|
||||
* Mon Aug 23 2021 Ryan O'Hara <rohara@redhat.com> - 2.2.4-1
|
||||
- Update to 2.2.4 (#1968596)
|
||||
|
||||
* Mon Jul 08 2019 Ryan O'Hara <rohara@redhat.com> - 2.0.10-7
|
||||
- Add gating tests (#1682114)
|
||||
* Mon Aug 16 2021 Ryan O'Hara <rohara@redhat.com> - 2.2.3-2
|
||||
- Add gating tests (#1968596)
|
||||
|
||||
* Wed May 01 2019 Ryan O'Hara <rohara@redhat.com> - 2.0.10-6
|
||||
- Fix segfault when smtp alerts configured (#1693706)
|
||||
- Fix double free when smtp_helo_name copied from local_name (#1693706)
|
||||
* Mon Aug 16 2021 Ryan O'Hara <rohara@redhat.com> - 2.2.3-1
|
||||
- Update to 2.2.3 (#1968596)
|
||||
|
||||
* Wed Mar 27 2019 Ryan O'Hara <rohara@redhat.com> - 2.0.10-5
|
||||
- Bump release nummber (#1688892)
|
||||
* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com>
|
||||
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
|
||||
Related: rhbz#1991688
|
||||
|
||||
* Mon Mar 18 2019 Ryan O'Hara <rohara@redhat.com> - 2.0.10-3
|
||||
- Rework fix for OpenSSL initialization segfault (#1688892)
|
||||
* Sat Aug 07 2021 Ryan O'Hara <rohara@redhat.com> - 2.2.2-5
|
||||
- Ignore badfuncs error in rpminspect (#1968596)
|
||||
|
||||
* Fri Mar 15 2019 Ryan O'Hara <rohara@redhat.com> - 2.0.10-2
|
||||
- Fix OpenSSL initialization segfault (#1688892)
|
||||
* Wed Jun 16 2021 Mohan Boddu <mboddu@redhat.com> - 2.2.2-4
|
||||
- Rebuilt for RHEL 9 BETA for openssl 3.0
|
||||
Related: rhbz#1971065
|
||||
|
||||
* Tue Jun 08 2021 Ryan O'Hara <rohara@redhat.com> - 2.2.2-3
|
||||
- Add systemd notify support (#1968596)
|
||||
|
||||
* Tue Jun 08 2021 Ryan O'Hara <rohara@redhat.com> - 2.2.2-2
|
||||
- Fix build errors (#1968596)
|
||||
|
||||
* Mon Jun 07 2021 Ryan O'Hara <rohara@redhat.com> - 2.2.2-1
|
||||
- Update to 2.2.2 (#1968596)
|
||||
|
||||
* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 2.2.1-3
|
||||
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
|
||||
|
||||
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.1-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
||||
|
||||
* Mon Jan 18 2021 Ryan O'Hara <rohara@redhat.com> - 2.2.1-1
|
||||
- Update to 2.2.1 (#1917152)
|
||||
|
||||
* Thu Jan 14 2021 Ryan O'Hara <rohara@redhat.com> - 2.2.0-1
|
||||
- Update to 2.2.0 (#1914512)
|
||||
|
||||
* Thu Aug 27 2020 Josef Řídký <jridky@redhat.com> - 2.1.5-3
|
||||
- Rebuilt for new net-snmp release
|
||||
|
||||
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.5-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||
|
||||
* Wed Jul 15 2020 Ryan O'Hara <rohara@redhat.com> - 2.1.5-1
|
||||
- Update to 2.1.5 (#1794135)
|
||||
|
||||
* Tue Feb 18 2020 Ryan O'Hara <rohara@redhat.com> - 2.0.20-3
|
||||
- Build with nftables support instead of iptables
|
||||
|
||||
* Thu Feb 13 2020 Ryan O'Hara <rohara@redhat.com> - 2.0.20-2
|
||||
- Remove unused patches
|
||||
|
||||
* Wed Feb 12 2020 Ryan O'Hara <rohara@redhat.com> - 2.0.20-1
|
||||
- Update to 2.0.20 (#1794135)
|
||||
|
||||
* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.19-5
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
||||
|
||||
* Tue Nov 12 2019 Ryan O'Hara <rohara@redhat.com> - 2.0.19-4
|
||||
- Fix file descriptor errors on reload
|
||||
|
||||
* Tue Nov 12 2019 Ryan O'Hara <rohara@redhat.com> - 2.0.19-3
|
||||
- Fix track_process with PIDs over 32767 (#1770766)
|
||||
|
||||
* Wed Nov 06 2019 Ryan O'Hara <rohara@redhat.com> - 2.0.19-2
|
||||
- Enable nftables support (#1769278)
|
||||
|
||||
* Wed Nov 06 2019 Ryan O'Hara <rohara@redhat.com> - 2.0.19-1
|
||||
- Update to 2.0.19 (#1763424)
|
||||
|
||||
* Tue Jul 30 2019 Ryan O'Hara <rohara@redhat.com> - 2.0.18-2
|
||||
- Change pidfile directory (#1712730)
|
||||
|
||||
* Tue Jul 30 2019 Ryan O'Hara <rohara@redhat.com> - 2.0.18-1
|
||||
- Update to 2.0.18 (#1678397)
|
||||
|
||||
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.12-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
||||
|
||||
* Tue Jun 25 2019 Björn Esser <besser82@fedoraproject.org> - 2.0.12-2
|
||||
- Rebuilt (iptables)
|
||||
|
||||
* Mon Feb 04 2019 Ryan O'Hara <rohara@redhat.com> - 2.0.12-1
|
||||
- Update to 2.0.12 (#1576138)
|
||||
|
||||
* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.11-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
||||
|
||||
* Wed Jan 09 2019 Ryan O'Hara <rohara@redhat.com> - 2.0.11-1
|
||||
- Update to 2.0.11
|
||||
|
||||
* Mon Nov 26 2018 Ryan O'Hara <rohara@redhat.com> - 2.0.10-1
|
||||
- Update to 2.0.10 (#1631816)
|
||||
|
||||
* Mon Oct 08 2018 Ryan O'Hara <rohara@redhat.com> - 2.0.7-2
|
||||
- Remove BuildRequires for ipset-devel
|
||||
|
||||
* Tue Oct 02 2018 Ryan O'Hara <rohara@redhat.com> - 2.0.7-1
|
||||
- Update to 2.0.7 (#1631816)
|
||||
|
||||
* Thu Aug 09 2018 Josef Ridky <jridky@redhat.com> - 2.0.6-2
|
||||
- Rebuild for Net-SNMP
|
||||
- Update to 2.0.10
|
||||
- Fix improper pathname validation (#1651864, CVE-2018-19044)
|
||||
- Fix insecure permissions when creating temporary files (#1651868, CVE-2018-19045)
|
||||
- Fix insecure use of temporary files (#1651870, CVE-2018-19046)
|
||||
- Fix buffer overflow when parsing HTTP status codes (#1651873, CVE-2018-19047)
|
||||
|
||||
* Wed Jul 25 2018 Ryan O'Hara <rohara@redhat.com> - 2.0.6-1
|
||||
- Update to 2.0.6
|
||||
- Update to 2.0.6 (#1576138)
|
||||
|
||||
* Tue Jul 24 2018 Adam Williamson <awilliam@redhat.com> - 2.0.5-3
|
||||
- Rebuild for new net-snmp
|
||||
|
||||
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.5-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
||||
|
||||
* Tue Jul 03 2018 Ryan O'Hara <rohara@redhat.com> - 2.0.5-1
|
||||
- Update to 2.0.5
|
||||
- Update to 2.0.5 (#1576138)
|
||||
|
||||
* Mon Jul 02 2018 Ryan O'Hara <rohara@redhat.com> - 1.4.5-1
|
||||
- Update to 1.4.5
|
||||
|
||||
* Thu May 10 2018 Ryan O'Hara <rohara@redhat.com> - 1.4.4-1
|
||||
- Update to 1.4.4 (#1576138)
|
||||
|
||||
* Thu Apr 19 2018 Ryan O'Hara <rohara@redhat.com> - 1.4.3-1
|
||||
- Update to 1.4.3 (#1565388)
|
||||
|
||||
Loading…
Reference in New Issue
Block a user