!32 【轻量级 PR】：fix bogus date in %changelog

From: @loong-C Reviewed-by: @seuzw Signed-off-by: @seuzw
fix bogus date in %changelog
2022-06-15 07:52:34 +00:00 · 2022-06-13 08:15:17 +00:00 · 2022-03-29 11:55:28 +00:00 · 2022-03-29 19:26:48 +08:00 · 2021-12-22 02:11:50 +00:00 · 2021-12-21 17:35:32 +08:00
5 changed files with 67 additions and 5 deletions
--- a/CVE-2021-44225.patch
+++ b/CVE-2021-44225.patch
@ -0,0 +1,39 @@
+From 7977fec0be89ae6fe87405b3f8da2f0b5e415e3d 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.
+CVE-2021-44225
+https://nvd.nist.gov/vuln/detail/CVE-2021-44225
+Reference:https://github.com/acassen/keepalived/commit/7977fec0be89ae6fe87405b3f8da2f0b5e415e3d.patch
+Conflict:NA
+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 2b78a575c..b5ced6085 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>
--- a/keepalived-2.0.12.tar.gz
+++ b/keepalived-2.0.12.tar.gz
--- a/keepalived-2.2.4.tar.gz
+++ b/keepalived-2.2.4.tar.gz
--- a/keepalived.service
+++ b/keepalived.service
@ -5,7 +5,7 @@ Wants=network-online.target

 [Service]
 Type=forking
-PIDFile=/var/run/keepalived.pid
+PIDFile=/run/keepalived.pid
 KillMode=process
 EnvironmentFile=-/etc/sysconfig/keepalived
 ExecStart=/usr/sbin/keepalived $KEEPALIVED_OPTIONS
--- a/keepalived.spec
+++ b/keepalived.spec
@ -2,12 +2,13 @@
 %bcond_without vrrp
 %bcond_without sha1
 %bcond_with profile
+%bcond_without nftables
 %bcond_with debug

 %global _hardened_build 1

 Name:		keepalived
-Version:	2.0.12
+Version:	2.2.4
 Release:	2
 Summary:	High Availability monitor built upon LVS, VRRP and service pollers
 License:	GPLv2+
@ -15,8 +16,11 @@ URL:		http://www.keepalived.org/
 Source0:	http://www.keepalived.org/software/keepalived-%{version}.tar.gz
 Source1: 	keepalived.service

+Patch0001:	CVE-2021-44225.patch
+
 BuildRequires:	net-snmp-devel gcc systemd-units openssl-devel libnl3-devel
-BuildRequires:  ipset-devel iptables-devel libnfnetlink-devel
+BuildRequires:  ipset-devel iptables-devel libnfnetlink-devel libnftnl-devel
+BuildRequires:  file-devel libmnl-devel
 %{?systemd requires}

 %description
@ -38,12 +42,13 @@ or all together to provide resilient infrastructures.
 %package_help

 %prep
-%autosetup -n %{name}-%{version}
+%autosetup -n %{name}-%{version} -p1

 %build
 %configure  %{?with_debug:--enable-debug}  %{?with_profile:--enable-profile} \
            %{!?with_vrrp:--disable-vrrp} %{?with_sha1:--enable-sha1} \
 	    --with-init=systemd %{!?with_vrrp:--disable-vrrp} \
+            %{?with_nftables:--enable-nftables --disable-iptables --disable-ipset} \
 	    %{?with_snmp:--enable-snmp --enable-snmp-rfc} \
            
 %make_build STRIP=/bin/true
@ -87,5 +92,23 @@ install -Dd -m 0755 %{buildroot}%{_libexecdir}/keepalived
 %{_mandir}/man*

 %changelog
-* Sat Dec 21 2019 openEuler Buildteam <buildteam@openeuler.org> - 2.0.12-2
+* Tue Mar 29 2022 kwb0523 <kwb0523@163.com> -  2.2.4-2
+- Type:bugfix
+- ID:NA 
+- SUG:NA
+- DESC:fix CVE-2021-44225
+
+* Tue Dec 21 2021 kwb0523 <kwb0523@163.com> -  2.2.4-1
+- Type:bugfix
+- ID:NA 
+- SUG:NA
+- DESC:upgrade keepalived to 2.2.4
+
+* Thu Jun 10 2021 wangxp006 <wangxp006@163.com> -  2.0.20-3
+- Type:bugfix
+- ID:NA 
+- SUG:NA
+- DESC:backport upstream patches
+
+* Tue May 12 2020 openEuler Buildteam <buildteam@openeuler.org> - 2.0.20-2
 - Package init
Author	SHA1	Message	Date
openeuler-ci-bot	f87166e73d	!32 【轻量级 PR】：fix bogus date in %changelog From: @loong-C Reviewed-by: @seuzw Signed-off-by: @seuzw	2022-06-15 07:52:34 +00:00
loong-C	dd67d8dffd	fix bogus date in %changelog ![输入图片说明](https://images.gitee.com/uploads/images/2022/0613/161323_2053e9c9_9884780.png "屏幕截图.png")	2022-06-13 08:15:17 +00:00
openeuler-ci-bot	032ec31466	!27 fix CVE-2021-44225 From: @kwb0523 Reviewed-by: @wangxp006 Signed-off-by: @wangxp006	2022-03-29 11:55:28 +00:00
kwb0523	b5261efeda	fix CVE-2021-44225	2022-03-29 19:26:48 +08:00
openeuler-ci-bot	fc9e8ae150	!20 upgrade keepalived to 2.2.4 Merge pull request !20 from kwb0523/openEuler-22.03-LTS-Next	2021-12-22 02:11:50 +00:00
chengyechun	7689b73dde	update to 2.2.4	2021-12-21 17:35:32 +08:00
openeuler-ci-bot	6b36e6d39b	!15 add upstream patches From: @wangxp006 Reviewed-by: @seuzw,@orange-snn Signed-off-by: @seuzw,@orange-snn	2021-06-10 10:34:19 +08:00
wangxp006	5798c18150	add upstream patch	2021-06-10 09:43:12 +08:00
wangxp006	2bb87dc150	add upstream patches	2021-06-10 09:41:29 +08:00
openeuler-ci-bot	5266ccc2ad	!4 update to master Merge pull request !4 from zhouxudong8/openEuler-20.03-LTS	2020-07-25 14:24:37 +08:00
openeuler-ci-bot	6af6a8f01a	!3 update to 2.0.20 Merge pull request !3 from seuzw/master	2020-05-12 15:22:00 +08:00
seuzw	3d6a1f0a63	update to 2.0.20	2020-05-12 11:47:24 +08:00