diff --git a/avahi.spec b/avahi.spec index 17238af..fdfd602 100644 --- a/avahi.spec +++ b/avahi.spec @@ -3,7 +3,7 @@ Name: avahi Version: 0.8 -Release: 18 +Release: 19 Summary: Avahi is a local network service discovery License: LGPLv2+ URL: http://avahi.org @@ -23,9 +23,8 @@ Patch6003: backport-CVE-2023-1981.patch Patch6004: backport-CVE-2023-38470.patch Patch6005: backport-CVE-2023-38473.patch Patch6006: backport-CVE-2023-38472.patch -Patch6007: backport-0001-CVE-2023-38471.patch -Patch6008: backport-0002-CVE-2023-38471.patch -Patch6009: backport-CVE-2023-38469.patch +Patch6007: backport-CVE-2023-38471.patch +Patch6008: backport-CVE-2023-38469.patch BuildRequires: gcc automake libtool desktop-file-utils gtk2-devel glib2-devel gcc-c++ BuildRequires: libcap-devel expat-devel gdbm-devel make @@ -585,6 +584,9 @@ fi %{_mandir}/man8/* %changelog +* Sun Feb 4 2024 zhangpan - 0.8-19 +- delete redundant patch + * Mon Nov 6 2023 zhangpan - 0.8-18 - fix CVE-2023-38469 CVE-2023-38471 CVE-2023-38472 CVE-2023-38473 diff --git a/backport-0001-CVE-2023-38471.patch b/backport-0001-CVE-2023-38471.patch deleted file mode 100644 index 5152952..0000000 --- a/backport-0001-CVE-2023-38471.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 1c599d80f0cdd6845ad2e9bd91465d59c9b0c211 Mon Sep 17 00:00:00 2001 -From: Evgeny Vereshchagin -Date: Fri, 9 Dec 2022 14:33:16 +0000 -Subject: [PATCH] dbus: deny SetHostName via org.freedesktop.Avahi.Server2 as - well - -Looks like the policy wasn't updated when the Server2 interface was -introduced. - -It's a follow-up to https://github.com/lathiat/avahi/pull/175 - -Reference:https://github.com/lathiat/avahi/commit/1c599d80f0cdd6845ad2e9bd91465d59c9b0c211 -Conflict:NA - ---- - avahi-daemon/avahi-dbus.conf.in | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/avahi-daemon/avahi-dbus.conf.in b/avahi-daemon/avahi-dbus.conf.in -index 1df0cc478..a78f02850 100644 ---- a/avahi-daemon/avahi-dbus.conf.in -+++ b/avahi-daemon/avahi-dbus.conf.in -@@ -18,6 +18,8 @@ - - -+ - - - diff --git a/backport-0002-CVE-2023-38471.patch b/backport-CVE-2023-38471.patch similarity index 100% rename from backport-0002-CVE-2023-38471.patch rename to backport-CVE-2023-38471.patch