updated 2 packages

avahi-0.8-2

xmltoman-0.4-23

a/avahi/avahi-vl.spec

@@ -9,8 +9,8 @@ Summary:        Local network service discovery
 Summary(ja):	ローカルネットワークサービス検出システム
 Name:           avahi
 Version:        0.8
-Release:        1%{?_dist_release}%{?with_systemd:.systemd}
+Release:        2%{?_dist_release}%{?with_systemd:.systemd}
-Group:          System Environment/Base
+Group:          system
 Vendor:         Project Vine
 Distribution:   Vine Linux
 
@@ -28,6 +28,8 @@ Patch11:        0011-avahi_dns_packet_consume_uint32-fix-potential-undefi.patch
 
 Patch1000:      avahi-0.6.31-vine.patch
 
+Patch2000:      CVE-2021-3502.patch
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-root
 BuildRequires:  dbus-devel, dbus-glib-devel
 BuildRequires:  desktop-file-utils
@@ -43,7 +45,6 @@ BuildRequires:  libdaemon-devel >= 0.12
 BuildRequires:  libevent-devel
 BuildRequires:  mesa-libGL-devel
 BuildRequires:  xmltoman
-BuildRequires:  xorg-x11-devel
 Requires:       dbus
 
 Requires(post):   dbus
@@ -68,17 +69,19 @@ shared. This kind of technology is already found in MacOS X (branded
 'Rendezvous', 'Bonjour' and sometimes 'ZeroConf') and is very
 convenient.
 
+
 %package tools
 Summary: Tools for mDNS browsing and publishing
-Group: System Environment/Base
+Group: admin-tools
 Requires: %{name} = %{version}, gdbm
 
 %description tools
 Tools that use avahi to browse and publish mDNS services and hosts.
 
+
 %package ui-gtk3
 Summary: Gtk user interface library for Avahi (Gtk+ 3 version)
-Group: System Environment/Base
+Group: admin-tools
 Provides: avahi-ui = %{version}-%{release}
 Obsoletes: avahi-ui < %{version}-%{release}
 Requires: %{name} = %{version}-%{release}
@@ -87,9 +90,10 @@ Requires: gtk3
 %description ui-gtk3
 This library contains a Gtk 3.x widget for browsing services.
 
+
 %package ui-gtk3-devel
 Summary: Libraries and header files for avahi ui development
-Group: Development/Libraries
+Group: programming
 Provides: avahi-ui-devel = %{version}-%{release}
 Obsoletes: avahi-ui-devel < %{version}-%{release}
 Requires: %{name}-devel = %{version}
@@ -100,19 +104,21 @@ Requires: gtk3-devel
 The avahi-ui-devel package contains the header files and libraries
 necessary for developing programs using avahi with gtk+.
 
+
 %package glib
 Summary: Glib libraries for avahi
 Summary(ja): avahi 用 glib ライブラリ
-Group: System Environment/Libraries
+Group: system
 Requires: %{name} = %{version}
 Requires: glib2
 
 %description glib
 Libraries for easy use of avahi from glib applications.
 
+
 %package glib-devel
 Summary: Libraries and header files for avahi glib development
-Group: Development/Libraries
+Group: programming
 Requires: %{name}-devel = %{version}
 Requires: %{name}-glib = %{version}
 Requires: glib2-devel
@@ -121,20 +127,22 @@ Requires: glib2-devel
 The avahi-glib-devel package contains the header files and libraries
 necessary for developing programs using avahi with glib.
 
+
 %package gobject
 Summary: GObject library for Avahi
 Summary(ja): Avahi 用 GObject ライブラリ
-Group: System Environment/Base
+Group: system
 Requires: glib2
 Requires: %{name}-glib = %{version}-%{release}
 
 %description gobject
 This library contains a GObject wrapper for the Avahi API
 
+
 %package gobject-devel
 Summary: Libraries and header files for Avahi GObject development
 Summary(ja): Avahi GObject 開発用ライブラリとヘッダファイル
-Group: Development/Libraries
+Group: programming
 Requires: %{name}-gobject = %{version}-%{release}
 Requires: %{name}-devel = %{version}-%{release}
 Requires: %{name}-glib-devel = %{version}-%{release}
@@ -143,9 +151,10 @@ Requires: %{name}-glib-devel = %{version}-%{release}
 The avahi-gobject-devel package contains the header files and libraries
 necessary for developing programs using avahi-gobject.
 
+
 %package devel
 Summary: Libraries and header files for avahi development
-Group: Development/Libraries
+Group: programming
 Requires: %{name} = %{version}
 Obsoletes: howl-devel
 
@@ -153,11 +162,12 @@ Obsoletes: howl-devel
 The avahi-devel package contains the header files and libraries
 necessary for developing programs using avahi.
 
+
 # compat32
 %package -n compat32-%{name}
 Summary:        Local network service discovery 
 Summary(ja):	ローカルネットワークサービス検出システム
-Group:          System Environment/Base
+Group:          system
 Requires: %{name} = %{version}-%{release}
 
 %description -n compat32-%{name}
@@ -169,9 +179,10 @@ shared. This kind of technology is already found in MacOS X (branded
 'Rendezvous', 'Bonjour' and sometimes 'ZeroConf') and is very
 convenient.
 
+
 %package -n compat32-%{name}-ui-gtk3
 Summary: Gtk user interface library for Avahi (Gtk+ 3 version)
-Group: System Environment/Base
+Group: admin-tools,legacy
 Provides: compat32-avahi-ui = %{version}-%{release}
 Obsoletes: compat32-avahi-ui < %{version}-%{release}
 Requires: %{name}-ui-gtk3 = %{version}-%{release}
@@ -181,9 +192,10 @@ Requires: compat32-gtk3
 %description -n compat32-%{name}-ui-gtk3
 This library contains a Gtk 3.x widget for browsing services.
 
+
 %package -n compat32-%{name}-ui-gtk3-devel
 Summary: Libraries and header files for avahi ui development
-Group: Development/Libraries
+Group: programming,legacy
 Provides: compat32-avahi-ui-devel = %{version}-%{release}
 Obsoletes: compat32-avahi-ui-devel < %{version}-%{release}
 Requires: %{name}-ui-devel = %{version}-%{release}
@@ -195,10 +207,11 @@ Requires: compat32-gtk3-devel
 The avahi-ui-devel package contains the header files and libraries
 necessary for developing programs using avahi with gtk+.
 
+
 %package -n compat32-%{name}-glib
 Summary: Glib libraries for avahi
 Summary(ja): avahi 用 glib ライブラリ
-Group: System Environment/Libraries
+Group: system,legacy
 Requires: %{name}-glib = %{version}-%{release}
 Requires: compat32-%{name} = %{version}-%{release}
 Requires: compat32-glib2
@@ -208,7 +221,7 @@ Libraries for easy use of avahi from glib applications.
 
 %package -n compat32-%{name}-glib-devel
 Summary: Libraries and header files for avahi glib development
-Group: Development/Libraries
+Group: programming,legacy
 Requires: %{name}-glib-devel = %{version}-%{release}
 Requires: compat32-%{name}-devel = %{version}-%{release}
 Requires: compat32-%{name}-glib = %{version}-%{release}
@@ -221,7 +234,7 @@ necessary for developing programs using avahi with glib.
 %package -n compat32-%{name}-gobject
 Summary: GObject library for Avahi
 Summary(ja): Avahi 用 GObject ライブラリ
-Group: System Environment/Base
+Group: system,legacy
 Requires: %{name}-gobject = %{version}-%{release}
 Requires: compat32-glib2
 Requires: compat32-%{name}-glib = %{version}-%{release}
@@ -229,10 +242,11 @@ Requires: compat32-%{name}-glib = %{version}-%{release}
 %description -n compat32-%{name}-gobject
 This library contains a GObject wrapper for the Avahi API
 
+
 %package -n compat32-%{name}-gobject-devel
 Summary: Libraries and header files for Avahi GObject development
 Summary(ja): Avahi GObject 開発用ライブラリとヘッダファイル
-Group: Development/Libraries
+Group: programming,legacy
 Requires: %{name}-gobject-devel = %{version}-%{release}
 Requires: compat32-%{name}-gobject = %{version}-%{release}
 Requires: compat32-%{name}-devel = %{version}-%{release}
@@ -242,9 +256,10 @@ Requires: compat32-%{name}-glib-devel = %{version}-%{release}
 The avahi-gobject-devel package contains the header files and libraries
 necessary for developing programs using avahi-gobject.
 
+
 %package -n compat32-%{name}-devel
 Summary: Libraries and header files for avahi development
-Group: Development/Libraries
+Group: programming,legacy
 Requires: %{name}-devel = %{version}-%{release}
 Requires: compat32-%{name} = %{version}-%{release}
 
@@ -253,6 +268,9 @@ The avahi-devel package contains the header files and libraries
 necessary for developing programs using avahi.
 
 
+%debug_package
+
+
 %prep
 %setup -q
 %autopatch -p1
@@ -345,6 +363,7 @@ rm -fv  %{buildroot}%{_datadir}/avahi/interfaces/avahi-discover.ui
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+
 %pre
 # Add the "avahi" group
 getent group avahi >/dev/null || /usr/sbin/groupadd -f -r avahi
@@ -367,7 +386,6 @@ fi
 exit 0
 
 %post
-/sbin/ldconfig
 dbus-send --system --type=method_call --dest=org.freedesktop.DBus / org.freedesktop.DBus.ReloadConfig >/dev/null 2>&1 || :
 if [ "$1" -eq 1 ]; then
    if [ -s /etc/localtime ]; then
@@ -396,7 +414,6 @@ fi
 %endif
 
 %postun
-/sbin/ldconfig
 %if %{with systemd}
 %systemd_postun_with_restart %{unitfiles}
 %else
@@ -406,33 +423,6 @@ if [ "$1" -eq "0" ]; then
 fi
 %endif
 
-%post ui-gtk3 -p /sbin/ldconfig
-
-%postun ui-gtk3 -p /sbin/ldconfig
-
-%post glib -p /sbin/ldconfig
-
-%postun glib -p /sbin/ldconfig
-
-%post gobject -p /sbin/ldconfig
-
-%postun gobject -p /sbin/ldconfig
-
-%post -n compat32-%{name} -p /sbin/ldconfig
-
-%postun -n compat32-%{name} -p /sbin/ldconfig
-
-%post -n compat32-%{name}-ui-gtk3 -p /sbin/ldconfig
-
-%postun -n compat32-%{name}-ui-gtk3 -p /sbin/ldconfig
-
-%post -n compat32-%{name}-glib -p /sbin/ldconfig
-
-%postun -n compat32-%{name}-glib -p /sbin/ldconfig
-
-%post -n compat32-%{name}-gobject -p /sbin/ldconfig
-
-%postun -n compat32-%{name}-gobject -p /sbin/ldconfig
 
 %files -f %{name}.lang
 %defattr(-,root,root)
@@ -572,7 +562,12 @@ fi
 %{_libdir}/libavahi-gobject.so
 %endif
 
+
 %changelog
+* Fri Jun 04 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 0.8-2
+- imported Patch2000 from upstream PR to fix CVE-2021-3502.
+- dropped ldconfig scriptlets.
+
 * Sat Apr 25 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 0.8-1
 - new upstream release.
 - added systemd support (disabled as default).

x/xmltoman/xmltoman-vl.spec

@@ -1,7 +1,8 @@
 Name:           xmltoman
 Version:        0.4
-Release:        22%{?_dist_release}
+Release:        23%{?_dist_release}
 Summary:        Scripts for converting XML to roff or HTML
+Group:          publishing
 Vendor:         Project Vine
 Distribution:   Vine Linux
 
@@ -44,7 +45,11 @@ cp -p *.1 %{buildroot}%{_mandir}/man1
 %{_datadir}/xmltoman
 %{_mandir}/*/*
 
+
 %changelog
+* Fri Jun 04 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 0.4-23
+- rebuilt with current environment.
+
 * Sun Apr 26 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 0.4-22
 - initial build for Vine Linux.