开源软件构建与测试

Changes of Revision 2

_service:tar_scm:avahi.spec Changed

@@ -3,7 +3,7 @@
 
 Name:             avahi
 Version:          0.8
-Release:          13
+Release:          16
 Summary:          Avahi is a local network service discovery
 License:          LGPLv2+
 URL:              http://avahi.org
@@ -19,12 +19,17 @@
 
 Patch6001:        backport-CVE-2021-3468.patch
 Patch6002:        backport-CVE-2021-36217.patch
+Patch6023:        backport-CVE-2023-1981.patch
 
 BuildRequires:    gcc automake libtool desktop-file-utils gtk2-devel glib2-devel gcc-c++
-BuildRequires:    libcap-devel expat-devel gdbm-devel
-BuildRequires:    intltool perl-XML-Parser xmltoman systemd libevent-devel
-BuildRequires:    dbus-devel >= 0.90 dbus-glib-devel >= 0.70 gtk3-devel >= 2.99.0 libdaemon-devel >= 0.11
-BuildRequires:    pkgconfig(pygobject-3.0) pkgconfig(libevent) >= 2.0.21 
+BuildRequires:    libcap-devel expat-devel gdbm-devel make
+BuildRequires:    intltool perl-XML-Parser systemd libevent-devel
+BuildRequires:    dbus-devel >= 0.90 dbus-glib-devel >= 0.70 libdaemon-devel >= 0.11
+BuildRequires:    pkgconfig(libevent) >= 2.0.21
+%if 0%{?build_cross} == 0
+BuildRequires:    pkgconfig(pygobject-3.0) xmltoman gtk3-devel >= 2.99.0
+%endif
+
 %if %{WITH_QT5}
 BuildRequires:    qt5-qtbase-devel
 %endif
@@ -73,6 +78,7 @@
 %description ui-tools
 Avahi Graphical user interface tools for mDNS services.
 
+%if 0%{?build_cross} == 0
 %package ui
 Summary:          Gtk uesr interface library for Avahi (Gtk2)
 Requires:         %{name}-libs = %{version}-%{release}
@@ -81,6 +87,7 @@
 
 %description ui
 This package contains a Gtk 2.x widget for browsing services.
+%endif
 
 %package autoipd
 Summary:          Link-local IPv4 address automatic configuration daemon (IPv4LL)
@@ -199,6 +206,7 @@
 The avahi-gobject-devel package contains the header files and libraries
 necessary for developing programs using avahi-gobject.
 
+%if 0%{?build_cross} == 0
 %package ui-gtk3
 Summary:          Gtk user interface library for Avahi (Gtk+ 3 version)
 Requires:         %{name}-libs = %{version}-%{release}
@@ -217,6 +225,7 @@
 %description ui-devel
 The avahi-ui-devel package contains the header files and libraries
 necessary for developing programs using avahi-ui.
+%endif
 
 %package libs
 Summary:          Libraries for avahi run-time use
@@ -260,7 +269,11 @@
         --with-systemdsystemunitdir=%{_unitdir}  --enable-introspection=no \
         --enable-shared=yes --enable-static=no  --disable-silent-rules \
         --enable-compat-libdns_sd --enable-compat-howl --disable-qt3 \
+	%if 0%{?build_cross} == 0
         --disable-qt4 --disable-mono --enable-gtk\
+	%else
+        --disable-qt4 --disable-mono --disable-gtk --disable-gtk3\
+	%endif
         --with-distro=none\
 %if ! %{WITH_PYTHON}
     --disable-python \
@@ -374,9 +387,11 @@
 
 %postun compat-libdns_sd -p /sbin/ldconfig
 
+%if 0%{?build_cross} == 0
 %post   ui -p /sbin/ldconfig
 
 %postun ui -p /sbin/ldconfig
+%endif
 
 %post   libs -p /sbin/ldconfig
 
@@ -386,9 +401,11 @@
 
 %postun glib -p /sbin/ldconfig
 
+%if 0%{?build_cross} == 0
 %post   ui-gtk3 -p /sbin/ldconfig
 
 %postun ui-gtk3 -p /sbin/ldconfig
+%endif
 
 %post   gobject -p /sbin/ldconfig
 
@@ -458,6 +475,7 @@
 %{_includedir}/avahi-gobject
 %{_libdir}/pkgconfig/avahi-gobject.pc
 
+%if 0%{?build_cross} == 0
 %files ui-gtk3
 %{_libdir}/libavahi-ui-gtk3.so.*
 
@@ -467,6 +485,7 @@
 %{_includedir}/avahi-ui
 %{_libdir}/pkgconfig/avahi-ui.pc
 %{_libdir}/pkgconfig/avahi-ui-gtk3.pc
+%endif
 
 %files  devel
 %{_libdir}/libavahi-common.so
@@ -477,7 +496,9 @@
 %{_libdir}/pkgconfig/avahi-client.pc
 %{_libdir}/pkgconfig/avahi-libevent.pc
 %{_includedir}/*
+%if 0%{?build_cross} == 0
 %exclude %{_includedir}/avahi-ui
+%endif
 %exclude %{_includedir}/avahi-compat-howl
 %exclude %{_includedir}/avahi-compat-libdns_sd
 %exclude %{_includedir}/dns_sd.h
@@ -513,8 +534,10 @@
 %{python2_sitelib}/avahi_discover/
 %endif
 
+%if 0%{?build_cross} == 0
 %files ui
 %{_libdir}/libavahi-ui.so.*
+%endif
 
 %files compat-howl
 %{_libdir}/libhowl.so.*
@@ -556,6 +579,15 @@
 %{_mandir}/man8/*
 
 %changelog
+* Wed Apr 12 2023 zhouwenpei <zhouwenpei1@h-partners.com> - 0.8-16
+- fix CVE-2023-1981
+
+* Mon Mar 27 2023 zhangpan <zhangpan103@h-partners.com> - 0.8-15
+- add build_cross to avoid install packages and files in self-build
+
+* Tue Dec 20 2022 zhouwenpei <zhouwenpei1@h-partners.com> - 0.8-14
+- add BuildRequires make
+
 * Sat Jun 11 2022 hanhui <hanhui15@h-partners.com> - 0.8-13
 - DESC:avahi.rpm no longer providers avahi-autoiod.rpm

_service:tar_scm:backport-CVE-2023-1981.patch Added

@@ -0,0 +1,53 @@
+From a2696da2f2c50ac43b6c4903f72290d5c3fa9f6f Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Petr=20Men=C5=A1=C3=ADk?= <pemensik@redhat.com>
+Date: Thu, 17 Nov 2022 01:51:53 +0100
+Subject: PATCH Emit error if requested service is not found
+
+It currently just crashes instead of replying with error. Check return
+value and emit error instead of passing NULL pointer to reply.
+
+Fixes #375
+---
+ avahi-daemon/dbus-protocol.c | 20 ++++++++++++++------
+ 1 file changed, 14 insertions(+), 6 deletions(-)
+
+diff --git a/avahi-daemon/dbus-protocol.c b/avahi-daemon/dbus-protocol.c
+index 70d7687bc..406d0b441 100644
+--- a/avahi-daemon/dbus-protocol.c
++++ b/avahi-daemon/dbus-protocol.c
+@@ -375,10 +375,14 @@ static DBusHandlerResult dbus_get_alternative_host_name(DBusConnection *c, DBusM
+     }
+ 
+     t = avahi_alternative_host_name(n);
+-    avahi_dbus_respond_string(c, m, t);
+-    avahi_free(t);
++    if (t) {
++        avahi_dbus_respond_string(c, m, t);
++        avahi_free(t);
+ 
+-    return DBUS_HANDLER_RESULT_HANDLED;
++        return DBUS_HANDLER_RESULT_HANDLED;
++    } else {
++        return avahi_dbus_respond_error(c, m, AVAHI_ERR_NOT_FOUND, "Hostname not found");
++    }
+ }
+ 
+ static DBusHandlerResult dbus_get_alternative_service_name(DBusConnection *c, DBusMessage *m, DBusError *error) {
+@@ -389,10 +393,14 @@ static DBusHandlerResult dbus_get_alternative_service_name(DBusConnection *c, DB
+     }
+ 
+     t = avahi_alternative_service_name(n);
+-    avahi_dbus_respond_string(c, m, t);
+-    avahi_free(t);
++    if (t) {
++        avahi_dbus_respond_string(c, m, t);
++        avahi_free(t);
+ 
+-    return DBUS_HANDLER_RESULT_HANDLED;
++        return DBUS_HANDLER_RESULT_HANDLED;
++    } else {
++        return avahi_dbus_respond_error(c, m, AVAHI_ERR_NOT_FOUND, "Service not found");
++    }
+ }
+ 
+ static DBusHandlerResult dbus_create_new_entry_group(DBusConnection *c, DBusMessage *m, DBusError *error) {

_service Changed