Accepting request 938262 from home:susnux:branches:network
- Update to 2.2.4 OBS-URL: https://build.opensuse.org/request/show/938262 OBS-URL: https://build.opensuse.org/package/show/network/keepalived?expand=0&rev=76
This commit is contained in:
parent
880cc896f5
commit
ab9aa02c4c
30
1915.patch
30
1915.patch
@ -1,30 +0,0 @@
|
|||||||
From 3fd0c21e4f63ac0a52b5d7a09575f0f364972e4d Mon Sep 17 00:00:00 2001
|
|
||||||
From: Quentin Armitage <quentin@armitage.org.uk>
|
|
||||||
Date: Tue, 8 Jun 2021 08:57:45 +0100
|
|
||||||
Subject: [PATCH] core: Fix compiling on RHEL 9
|
|
||||||
|
|
||||||
Signed-off-by: Quentin Armitage <quentin@armitage.org.uk>
|
|
||||||
---
|
|
||||||
keepalived/core/layer4.c | 3 ++-
|
|
||||||
1 file changed, 2 insertions(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/keepalived/core/layer4.c b/keepalived/core/layer4.c
|
|
||||||
index d2cc971a3..fdca04913 100644
|
|
||||||
--- a/keepalived/core/layer4.c
|
|
||||||
+++ b/keepalived/core/layer4.c
|
|
||||||
@@ -27,13 +27,14 @@
|
|
||||||
#include <errno.h>
|
|
||||||
#include <unistd.h>
|
|
||||||
#include <fcntl.h>
|
|
||||||
+#include <netinet/in.h>
|
|
||||||
+#include <net/if.h>
|
|
||||||
#include <linux/icmp.h>
|
|
||||||
#include <linux/icmpv6.h>
|
|
||||||
#ifdef ERRQUEUE_NEEDS_SYS_TIME
|
|
||||||
#include <sys/time.h>
|
|
||||||
#endif
|
|
||||||
#include <linux/errqueue.h>
|
|
||||||
-#include <netinet/in.h>
|
|
||||||
|
|
||||||
#include "layer4.h"
|
|
||||||
#include "logger.h"
|
|
@ -2,8 +2,8 @@ Index: keepalived-2.2.2/keepalived/keepalived.service.in
|
|||||||
===================================================================
|
===================================================================
|
||||||
--- keepalived-2.2.2.orig/keepalived/keepalived.service.in
|
--- keepalived-2.2.2.orig/keepalived/keepalived.service.in
|
||||||
+++ keepalived-2.2.2/keepalived/keepalived.service.in
|
+++ keepalived-2.2.2/keepalived/keepalived.service.in
|
||||||
@@ -4,6 +4,19 @@ After=network-online.target syslog.targe
|
@@ -8,6 +8,19 @@ After=network-online.target syslog.targe
|
||||||
Wants=network-online.target @SNMP_SERVICE@
|
Documentation=https://keepalived.org
|
||||||
|
|
||||||
[Service]
|
[Service]
|
||||||
+# added automatically, for details please see
|
+# added automatically, for details please see
|
||||||
|
@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:103692bd5345a4ed9f4581632ea636214fdf53e45682e200aab122c4fa674ece
|
|
||||||
size 1159896
|
|
3
keepalived-2.2.4.tar.gz
Normal file
3
keepalived-2.2.4.tar.gz
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:0138d69087d44beaaa589527f0cfa6885958b320a837147d02b6b7df73ebc1df
|
||||||
|
size 1151290
|
@ -1,3 +1,15 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Thu Dec 9 18:58:23 UTC 2021 - Ferdinand Thiessen <rpm@fthiessen.de>
|
||||||
|
|
||||||
|
- Update to 2.2.4
|
||||||
|
* Bug fixes
|
||||||
|
- Update to 2.2.3
|
||||||
|
* Added some new features and minor bug fixes
|
||||||
|
* genhash utility is now part of the mainline daemon
|
||||||
|
* https://www.keepalived.org/release-notes/Release-2.2.3.html
|
||||||
|
- Drop 1915.patch, merged upstream
|
||||||
|
- Drop outdated suse_version check
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Mon Sep 27 07:39:33 UTC 2021 - Johannes Segitz <jsegitz@suse.com>
|
Mon Sep 27 07:39:33 UTC 2021 - Johannes Segitz <jsegitz@suse.com>
|
||||||
|
|
||||||
|
@ -21,12 +21,6 @@
|
|||||||
%define _fillupdir /var/adm/fillup-templates
|
%define _fillupdir /var/adm/fillup-templates
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%if 0%{?suse_version} > 1210
|
|
||||||
%bcond_without systemd
|
|
||||||
%else
|
|
||||||
%bcond_with systemd
|
|
||||||
%endif
|
|
||||||
|
|
||||||
%if 0%{?suse_version} > 1500
|
%if 0%{?suse_version} > 1500
|
||||||
%bcond_without dbus
|
%bcond_without dbus
|
||||||
%bcond_without keepalived_nftables
|
%bcond_without keepalived_nftables
|
||||||
@ -41,9 +35,10 @@
|
|||||||
%bcond_with keepalived_regex
|
%bcond_with keepalived_regex
|
||||||
%endif
|
%endif
|
||||||
%bcond_without json
|
%bcond_without json
|
||||||
|
%bcond_without systemd
|
||||||
|
|
||||||
Name: keepalived
|
Name: keepalived
|
||||||
Version: 2.2.2
|
Version: 2.2.4
|
||||||
Release: 0
|
Release: 0
|
||||||
Summary: A keepalive facility for Linux
|
Summary: A keepalive facility for Linux
|
||||||
License: GPL-2.0-or-later
|
License: GPL-2.0-or-later
|
||||||
@ -51,10 +46,8 @@ Group: Productivity/Networking/Routing
|
|||||||
URL: http://www.keepalived.org/
|
URL: http://www.keepalived.org/
|
||||||
Source: http://www.keepalived.org/software/%{name}-%{version}.tar.gz
|
Source: http://www.keepalived.org/software/%{name}-%{version}.tar.gz
|
||||||
Source2: keepalive-rpmlintrc
|
Source2: keepalive-rpmlintrc
|
||||||
Patch1: keepalive-init.patch
|
Patch0: keepalive-init.patch
|
||||||
# PATCH-FIX-UPSTREAM: https://github.com/acassen/keepalived/pull/1915
|
Patch1: harden_keepalived.service.patch
|
||||||
Patch2: 1915.patch
|
|
||||||
Patch3: harden_keepalived.service.patch
|
|
||||||
BuildRequires: file-devel
|
BuildRequires: file-devel
|
||||||
BuildRequires: net-snmp-devel
|
BuildRequires: net-snmp-devel
|
||||||
BuildRequires: pkgconfig
|
BuildRequires: pkgconfig
|
||||||
@ -102,10 +95,9 @@ resilient infrastructures.
|
|||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q
|
%setup -q
|
||||||
%patch1 -p1
|
%patch0 -p1
|
||||||
%patch2 -p1
|
|
||||||
chmod 644 doc/samples/*
|
chmod 644 doc/samples/*
|
||||||
%patch3 -p1
|
%patch1 -p1
|
||||||
|
|
||||||
%build
|
%build
|
||||||
export STRIP=true
|
export STRIP=true
|
||||||
|
Loading…
Reference in New Issue
Block a user