[main] Fixes to `SPECS-EXTENDED`. (#2550)
* Fixing 'babl' build. * Fixing 'spice-vdagent' and removing 'alsa-firmware'. * Fixing 'catatonit'.
This commit is contained in:
Pawel Winogrodzki
GitHub
Родитель
7fa28dac55
Коммит
0529434362
|
|
@ -1,5 +0,0 @@
|
|||
{
|
||||
"Signatures": {
|
||||
"alsa-firmware-1.2.1.tar.bz2": "aea27c571dbe02ede298cf9f637d8dfdb758e032e372c8d7e96ccb2b15fa08ab"
|
||||
}
|
||||
}
|
||||
|
|
@ -1,342 +0,0 @@
|
|||
Vendor: Microsoft Corporation
|
||||
Distribution: Mariner
|
||||
# This is a firmware package, so binaries (which are not run on the host)
|
||||
# in the end package are expected.
|
||||
%define _binaries_in_noarch_packages_terminate_build 0
|
||||
|
||||
Summary: Firmware for several ALSA-supported sound cards
|
||||
Name: alsa-firmware
|
||||
Version: 1.2.1
|
||||
Release: 8%{?dist}
|
||||
# See later in the spec for a breakdown of licensing
|
||||
License: GPL+ and BSD and GPLv2+ and GPLv2 and LGPLv2+
|
||||
URL: http://www.alsa-project.org/
|
||||
Source: ftp://ftp.alsa-project.org/pub/firmware/%{name}-%{version}.tar.bz2
|
||||
|
||||
Requires: alsa-tools-firmware >= 1.1.7
|
||||
Requires: systemd
|
||||
BuildRequires: libtool autoconf automake
|
||||
|
||||
# noarch, since the package is firmware
|
||||
BuildArch: noarch
|
||||
|
||||
%description
|
||||
This package contains the firmware binaries for a number of sound cards.
|
||||
Some (but not all of these) require firmware loaders which are included in
|
||||
the alsa-tools-firmware package.
|
||||
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
|
||||
|
||||
%build
|
||||
|
||||
# Leaving this directory in place ends up with the following crazy, broken
|
||||
# symlinks in the output RPM, with no sign of the actual firmware (*.bin) files
|
||||
# themselves:
|
||||
#
|
||||
# /lib/firmware/turtlebeach:
|
||||
# msndinit.bin -> /etc/sound/msndinit.bin
|
||||
# msndperm.bin -> /etc/sound/msndperm.bin
|
||||
# pndsperm.bin -> /etc/sound/pndsperm.bin
|
||||
# pndspini.bin -> /etc/sound/pndspini.bin
|
||||
#
|
||||
# Probably an upstream package bug.
|
||||
sed -i s#'multisound/Makefile \\'## configure.ac
|
||||
sed -i s#multisound## Makefile.am
|
||||
|
||||
autoreconf -vif
|
||||
%configure --disable-loader
|
||||
make %{?_smp_mflags}
|
||||
|
||||
# Rename README files from firmware subdirs that have them
|
||||
for i in hdsploader mixartloader pcxhrloader usx2yloader vxloader ca0132
|
||||
do
|
||||
mv ${i}/README README.${i}
|
||||
done
|
||||
mv aica/license.txt LICENSE.aica_firmware
|
||||
mv aica/Dreamcast_sound.txt aica_dreamcast_sound.txt
|
||||
mv ca0132/creative.txt LICENSE.creative_txt
|
||||
|
||||
|
||||
%install
|
||||
make install DESTDIR=%{buildroot}
|
||||
|
||||
|
||||
%files
|
||||
%license LICENSE*
|
||||
%doc COPYING README*
|
||||
%doc aica_dreamcast_sound.txt
|
||||
|
||||
# License: KOS (3-clause BSD)
|
||||
/lib/firmware/aica_firmware.bin
|
||||
|
||||
# License: No explicit license; default package license is GPLv2+
|
||||
/lib/firmware/asihpi
|
||||
|
||||
# License: GPL (undefined version)
|
||||
/lib/firmware/digiface_firmware*
|
||||
|
||||
%dir /lib/firmware/ea
|
||||
# The licenses for the Echo Audio firmware vary slightly so each is enumerated
|
||||
# separately, to be really sure.
|
||||
# LGPLv2.1+
|
||||
/lib/firmware/ea/3g_asic.fw
|
||||
# GPL (undefined version)
|
||||
/lib/firmware/ea/darla20_dsp.fw
|
||||
# LGPLv2.1+
|
||||
/lib/firmware/ea/darla24_dsp.fw
|
||||
# LGPLv2.1+
|
||||
/lib/firmware/ea/echo3g_dsp.fw
|
||||
# GPL (undefined version)
|
||||
/lib/firmware/ea/gina20_dsp.fw
|
||||
# GPL (undefined version)
|
||||
/lib/firmware/ea/gina24_301_asic.fw
|
||||
# GPL (undefined version)
|
||||
/lib/firmware/ea/gina24_301_dsp.fw
|
||||
# GPL (undefined version)
|
||||
/lib/firmware/ea/gina24_361_asic.fw
|
||||
# GPL (undefined version)
|
||||
/lib/firmware/ea/gina24_361_dsp.fw
|
||||
# LGPLv2.1+
|
||||
/lib/firmware/ea/indigo_dj_dsp.fw
|
||||
# LGPLv2.1+
|
||||
/lib/firmware/ea/indigo_djx_dsp.fw
|
||||
# LGPLv2.1+
|
||||
/lib/firmware/ea/indigo_dsp.fw
|
||||
# LGPLv2.1+
|
||||
/lib/firmware/ea/indigo_io_dsp.fw
|
||||
# LGPLv2.1+
|
||||
/lib/firmware/ea/indigo_iox_dsp.fw
|
||||
# GPL (undefined version)
|
||||
/lib/firmware/ea/layla20_asic.fw
|
||||
# GPL (undefined version)
|
||||
/lib/firmware/ea/layla20_dsp.fw
|
||||
# GPL (undefined version)
|
||||
/lib/firmware/ea/layla24_1_asic.fw
|
||||
# GPL (undefined version)
|
||||
/lib/firmware/ea/layla24_2A_asic.fw
|
||||
# GPL (undefined version)
|
||||
/lib/firmware/ea/layla24_2S_asic.fw
|
||||
# GPL (undefined version)
|
||||
/lib/firmware/ea/layla24_dsp.fw
|
||||
# GPL (undefined version)
|
||||
/lib/firmware/ea/loader_dsp.fw
|
||||
# LGPLv2.1+
|
||||
/lib/firmware/ea/mia_dsp.fw
|
||||
# GPL (undefined version)
|
||||
/lib/firmware/ea/mona_2_asic.fw
|
||||
# GPL (undefined version)
|
||||
/lib/firmware/ea/mona_301_1_asic_48.fw
|
||||
# GPL (undefined version)
|
||||
/lib/firmware/ea/mona_301_1_asic_96.fw
|
||||
# GPL (undefined version)
|
||||
/lib/firmware/ea/mona_301_dsp.fw
|
||||
# GPL (undefined version)
|
||||
/lib/firmware/ea/mona_361_1_asic_48.fw
|
||||
# GPL (undefined version)
|
||||
/lib/firmware/ea/mona_361_1_asic_96.fw
|
||||
# GPL (undefined version)
|
||||
/lib/firmware/ea/mona_361_dsp.fw
|
||||
|
||||
%dir /lib/firmware/emu
|
||||
# Licenses vary so are enumerated separately
|
||||
# GPLv2
|
||||
/lib/firmware/emu/audio_dock.fw
|
||||
# GPLv2
|
||||
/lib/firmware/emu/emu0404.fw
|
||||
# GPLv2
|
||||
/lib/firmware/emu/emu1010_notebook.fw
|
||||
# GPLv2
|
||||
/lib/firmware/emu/emu1010b.fw
|
||||
# GPLv2
|
||||
/lib/firmware/emu/hana.fw
|
||||
# GPLv2+
|
||||
/lib/firmware/emu/micro_dock.fw
|
||||
|
||||
# License: GPL (undefined version)
|
||||
/lib/firmware/ess
|
||||
|
||||
# License: No explicit license; default package license is GPLv2+
|
||||
/lib/firmware/korg
|
||||
|
||||
# License: GPL (undefined version)
|
||||
/lib/firmware/mixart
|
||||
|
||||
# License: GPL (undefined version)
|
||||
/lib/firmware/multiface_firmware*
|
||||
|
||||
# License: GPL (undefined version)
|
||||
/lib/firmware/pcxhr
|
||||
|
||||
# License: GPL (undefined version)
|
||||
/lib/firmware/rpm_firmware.bin
|
||||
|
||||
# License: GPLv2+
|
||||
/lib/firmware/sb16
|
||||
|
||||
# License: GPL (undefined version)
|
||||
/lib/firmware/vx
|
||||
|
||||
# License: No explicit license; default package license is GPLv2+
|
||||
# See ALSA bug #3412
|
||||
/lib/firmware/yamaha
|
||||
|
||||
# Licence: Redistribution allowed, see ca0132/creative.txt
|
||||
/lib/firmware/ctefx.bin
|
||||
/lib/firmware/ctspeq.bin
|
||||
/lib/firmware/ctefx-desktop.bin
|
||||
/lib/firmware/ctefx-r3di.bin
|
||||
|
||||
# Licence: No explicit license; says it's copied from kernel where the cs46xx
|
||||
# driver is labelled as GPLv2+
|
||||
/lib/firmware/cs46xx
|
||||
|
||||
# Even with --disable-loader, we still get usxxx firmware here; looking at the
|
||||
# alsa-tools-firmware package, it seems like these devices probably use an old-
|
||||
# style hotplug loading method
|
||||
# License: GPL (undefined version)
|
||||
%{_datadir}/alsa/firmware
|
||||
|
||||
|
||||
%changelog
|
||||
* Fri Oct 15 2021 Pawel Winogrodzki <pawelwi@microsoft.com> - 1.2.1-8
|
||||
- Initial CBL-Mariner import from Fedora 32 (license: MIT).
|
||||
|
||||
* Tue Mar 3 2020 Jaroslav Kysela <perex@perex.cz> - 1.2.1-7
|
||||
- Removed Intel SOF firmware files (moved to alsa-sof-firmware package)
|
||||
|
||||
* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.1-6
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
||||
|
||||
* Tue Jan 21 2020 Jaroslav Kysela <perex@perex.cz> - 1.2.1-5
|
||||
- Updated Intel SOF firmware files to 1.4.2
|
||||
|
||||
* Mon Jan 6 2020 Jaroslav Kysela <perex@perex.cz> - 1.2.1-4
|
||||
- Intel SOF firmware files to 1.4.1 fixes (symlinks)
|
||||
|
||||
* Thu Dec 5 2019 Jaroslav Kysela <perex@perex.cz> - 1.2.1-3
|
||||
- Updated Intel SOF firmware files to 1.4.1
|
||||
|
||||
* Wed Nov 13 2019 Jaroslav Kysela <perex@perex.cz> - 1.2.1-2
|
||||
- Updated to 1.2.1
|
||||
- Added Intel SOF firmware files
|
||||
|
||||
* Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.29-9
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
||||
|
||||
* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.29-8
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
||||
|
||||
* Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.29-7
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
||||
|
||||
* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.29-6
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
|
||||
|
||||
* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.29-5
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
|
||||
|
||||
* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.29-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
|
||||
|
||||
* Wed Feb 03 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.29-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
|
||||
|
||||
* Tue Jun 16 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0.29-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
|
||||
|
||||
* Thu Feb 26 2015 Jaroslav Kysela <perex@perex.cz> - 1.0.29-1
|
||||
- Updated to 1.0.29
|
||||
|
||||
* Thu Jul 24 2014 Peter Robinson <pbrobinson@fedoraproject.org> 1.0.28-1
|
||||
- Update to 1.0.28
|
||||
|
||||
* Tue Jun 17 2014 Peter Robinson <pbrobinson@fedoraproject.org> 1.0.27-5
|
||||
- Fix FTBFS once more with feeling
|
||||
- Update spec
|
||||
|
||||
* Sun Jun 15 2014 Tim Jackson <rpm@timj.co.uk> - 1.0.27-4
|
||||
- Fix FTBFS (rhbz#1105946)
|
||||
|
||||
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0.27-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
|
||||
|
||||
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0.27-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
|
||||
|
||||
* Fri Apr 12 2013 Jaroslav Kysela <perex@perex.cz> - 1.0.27-1
|
||||
- Update to 1.0.27
|
||||
|
||||
* Wed Feb 13 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0.25-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
|
||||
|
||||
* Wed Jul 18 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0.25-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
|
||||
|
||||
* Wed Feb 1 2012 Jaroslav Kysela <perex@perex.cz> - 1.0.25-1
|
||||
- Update to 1.0.25
|
||||
|
||||
* Thu Jan 12 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0.24.1-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
|
||||
|
||||
* Mon Feb 07 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0.24.1-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
|
||||
|
||||
* Thu Feb 03 2011 Tim Jackson <rpm@timj.co.uk> - 1.0.24.1-1
|
||||
- Update to 1.0.24.1
|
||||
|
||||
* Mon May 3 2010 Tom "spot" Callaway <tcallawa@redhat.com> - 1.0.23-1
|
||||
- update to 1.0.23
|
||||
|
||||
* Fri Jul 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0.20-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
|
||||
|
||||
* Sun May 10 2009 Tim Jackson <rpm@timj.co.uk> - 1.0.20-1
|
||||
- Update to 1.0.20
|
||||
|
||||
* Sat Feb 28 2009 Tim Jackson <rpm@timj.co.uk> - 1.0.19-4
|
||||
- Fix build on recent RPM versions
|
||||
|
||||
* Mon Feb 23 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0.19-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
|
||||
|
||||
* Sat Feb 14 2009 Tim Jackson <rpm@timj.co.uk> - 1.0.19-2
|
||||
- Fix unowned directories problem (#483321)
|
||||
|
||||
* Tue Jan 20 2009 Tim Jackson <rpm@timj.co.uk> - 1.0.19-1
|
||||
- Update to 1.0.19
|
||||
|
||||
* Mon Jul 21 2008 Jaroslav Kysela <jkysela@redhat.com> - 1.0.17-1
|
||||
- Updated to 1.0.17
|
||||
|
||||
* Mon May 12 2008 Tim Jackson <rpm@timj.co.uk> - 1.0.16-1
|
||||
- Update to upstream 1.0.16
|
||||
- Clarify licensing conditions
|
||||
|
||||
* Tue Aug 14 2007 Tim Jackson <rpm@timj.co.uk> - 1.0.14-1
|
||||
- Update to upstream 1.0.14, but skip turtlebeach firmware as it doesn't seem
|
||||
to install properly
|
||||
- Remove files from old-style firmware loader locations
|
||||
- Spec file cosmetics, keep rpmlint quiet
|
||||
|
||||
* Sat Nov 25 2006 Tim Jackson <rpm@timj.co.uk> - 1.0.12-1
|
||||
- Update to 1.0.12
|
||||
- Add udev dep
|
||||
|
||||
* Fri Apr 08 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
|
||||
- rebuilt
|
||||
|
||||
* Sat Apr 03 2004 Thorsten Leemhuis <fedora[AT]leemhuis.info> - 1.0.4-0.fdr.1
|
||||
- Update to 1.0.4
|
||||
|
||||
* Fri Jan 16 2004 Thorsten Leemhuis <fedora[AT]leemhuis.info> - 1.0.1-0.fdr.2
|
||||
- add missing rm in install section
|
||||
|
||||
* Fri Jan 09 2004 Thorsten Leemhuis <fedora[AT]leemhuis.info> - 1.0.1-0.fdr.1
|
||||
- Update to 1.0.1
|
||||
- Contains now the license -- is "Distributable under GPL"
|
||||
|
||||
* Thu Dec 04 2003 Thorsten Leemhuis <fedora[AT]leemhuis.info> 1.0.0-0.fdr.0.1.rc1
|
||||
- Initial build.
|
||||
|
|
@ -17,7 +17,7 @@ Distribution: Mariner
|
|||
Summary: A dynamic, any to any, pixel format conversion library
|
||||
Name: babl
|
||||
Version: 0.1.82
|
||||
Release: 2%{?dist}
|
||||
Release: 3%{?dist}
|
||||
|
||||
# Compute some version related macros
|
||||
# Ugly hack, you need to get your quoting backslashes/percent signs straight
|
||||
|
|
@ -36,6 +36,7 @@ BuildRequires: gobject-introspection-devel
|
|||
BuildRequires: librsvg2-tools
|
||||
BuildRequires: meson, vala
|
||||
BuildRequires: pkgconfig(lcms2)
|
||||
BuildRequires: openssh-clients
|
||||
|
||||
%description
|
||||
Babl is a dynamic, any to any, pixel format conversion library. It
|
||||
|
|
@ -117,6 +118,10 @@ popd
|
|||
%doc %{develdocdir}
|
||||
|
||||
%changelog
|
||||
* Fri Mar 18 2022 Pawel Winogrodzki <pawelwi@microsoft.com> - 0.1.82-3
|
||||
- Adding BR on "openssh-clients" to provide "scp".
|
||||
- License verified.
|
||||
|
||||
* Fri Oct 15 2021 Pawel Winogrodzki <pawelwi@microsoft.com> - 0.1.82-2
|
||||
- Initial CBL-Mariner import from Fedora 33 (license: MIT).
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
{
|
||||
"Signatures": {
|
||||
"catatonit-0.1.5.tar.gz": "60a2b4ed44a8d1fd76a5475adf52a7c18981e765bc23c2d8d409829bfcfdf683"
|
||||
"catatonit-0.1.7.tar.gz": "e22bc72ebc23762dad8f5d2ed9d5ab1aaad567bdd54422f1d1da775277a93296"
|
||||
}
|
||||
}
|
||||
|
|
@ -1,16 +1,13 @@
|
|||
Vendor: Microsoft Corporation
|
||||
Distribution: Mariner
|
||||
%define built_tag v0.1.5
|
||||
%define built_tag_strip %(b=%{built_tag}; echo ${b:1})
|
||||
%define download_url %{url}/archive/%{built_tag}.tar.gz
|
||||
|
||||
Name: catatonit
|
||||
Version: 0.1.5
|
||||
Release: 4%{?dist}
|
||||
Version: 0.1.7
|
||||
Release: 5%{?dist}
|
||||
Summary: A signal-forwarding process manager for containers
|
||||
License: GPLv3+
|
||||
URL: https://github.com/openSUSE/catatonit
|
||||
Source0: %{download_url}#/%{name}-%{version}.tar.gz
|
||||
Source0: %{url}/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
|
||||
BuildRequires: autoconf
|
||||
BuildRequires: automake
|
||||
BuildRequires: file
|
||||
|
|
@ -18,6 +15,9 @@ BuildRequires: gcc
|
|||
BuildRequires: git
|
||||
BuildRequires: glibc-static
|
||||
BuildRequires: libtool
|
||||
BuildRequires: make
|
||||
|
||||
Provides: podman-%{name} = %{version}-%{release}
|
||||
|
||||
%description
|
||||
Catatonit is a /sbin/init program for use within containers. It
|
||||
|
|
@ -30,7 +30,8 @@ This is a reimplementation of other container init programs (such as
|
|||
signalfd(2)) and has no additional features.
|
||||
|
||||
%prep
|
||||
%autosetup -Sgit -n %{name}-%{built_tag_strip}
|
||||
%autosetup -Sgit
|
||||
sed -i '$d' configure.ac
|
||||
|
||||
%build
|
||||
autoreconf -fi
|
||||
|
|
@ -59,8 +60,11 @@ ln -s %{_libexecdir}/%{name}/%{name} %{buildroot}%{_libexecdir}/podman/%{name}
|
|||
%dir %{_libexecdir}/podman
|
||||
%{_libexecdir}/podman/%{name}
|
||||
|
||||
# rhcontainerbot account currently managed by @lsm5
|
||||
%changelog
|
||||
* Fri Mar 18 2022 Pawel Winogrodzki <pawelwi@microsoft.com> - 0.1.7-1
|
||||
- Updating to 0.1.7 using Fedora 35 spec (license: MIT) for guidance.
|
||||
- License verified.
|
||||
|
||||
* Fri Oct 15 2021 Pawel Winogrodzki <pawelwi@microsoft.com> - 0.1.5-4
|
||||
- Initial CBL-Mariner import from Fedora 32 (license: MIT).
|
||||
|
||||
|
|
|
|||
|
|
@ -1,103 +0,0 @@
|
|||
From 9b8c0ebb9fb573e6ce3c5416371509f416503d0c Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Jakub=20Jank=C5=AF?= <jjanku@redhat.com>
|
||||
Date: Fri, 20 Mar 2020 10:36:03 +0100
|
||||
Subject: [PATCH 1/2] vdagentd: work around GLib's fork issues
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Creating threads is not compatible with forking as only the thread
|
||||
that calls fork() is inherited.
|
||||
|
||||
Handlers registered with g_unix_signal_add() create a thread so
|
||||
move these calls after fork.
|
||||
|
||||
Also call g_socket_service_start() after fork to avoid creation of
|
||||
new threads before it is necessary.
|
||||
|
||||
Fixes: https://gitlab.freedesktop.org/spice/linux/vd_agent/issues/18
|
||||
|
||||
Also see: https://gitlab.gnome.org/GNOME/glib/issues/2073
|
||||
|
||||
Signed-off-by: Jakub Janků <jjanku@redhat.com>
|
||||
Acked-by: Frediano Ziglio <fziglio@redhat.com>
|
||||
---
|
||||
src/udscs.c | 6 ++++++
|
||||
src/udscs.h | 2 ++
|
||||
src/vdagentd/vdagentd.c | 9 +++++----
|
||||
3 files changed, 13 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/src/udscs.c b/src/udscs.c
|
||||
index 4de75f8..7c99eed 100644
|
||||
--- a/src/udscs.c
|
||||
+++ b/src/udscs.c
|
||||
@@ -186,6 +186,7 @@ struct udscs_server *udscs_server_new(
|
||||
server->read_callback = read_callback;
|
||||
server->error_cb = error_cb;
|
||||
server->service = g_socket_service_new();
|
||||
+ g_socket_service_stop(server->service);
|
||||
|
||||
g_signal_connect(server->service, "incoming",
|
||||
G_CALLBACK(udscs_server_accept_cb), server);
|
||||
@@ -223,6 +224,11 @@ void udscs_server_listen_to_address(struct udscs_server *server,
|
||||
g_object_unref(sock_addr);
|
||||
}
|
||||
|
||||
+void udscs_server_start(struct udscs_server *server)
|
||||
+{
|
||||
+ g_socket_service_start(server->service);
|
||||
+}
|
||||
+
|
||||
void udscs_server_destroy_connection(struct udscs_server *server,
|
||||
UdscsConnection *conn)
|
||||
{
|
||||
diff --git a/src/udscs.h b/src/udscs.h
|
||||
index 45ebd3f..4f7ea36 100644
|
||||
--- a/src/udscs.h
|
||||
+++ b/src/udscs.h
|
||||
@@ -98,6 +98,8 @@ void udscs_server_listen_to_address(struct udscs_server *server,
|
||||
const gchar *addr,
|
||||
GError **err);
|
||||
|
||||
+void udscs_server_start(struct udscs_server *server);
|
||||
+
|
||||
void udscs_server_destroy_connection(struct udscs_server *server,
|
||||
UdscsConnection *conn);
|
||||
|
||||
diff --git a/src/vdagentd/vdagentd.c b/src/vdagentd/vdagentd.c
|
||||
index cfd0a51..1b63ec8 100644
|
||||
--- a/src/vdagentd/vdagentd.c
|
||||
+++ b/src/vdagentd/vdagentd.c
|
||||
@@ -1184,10 +1184,6 @@ int main(int argc, char *argv[])
|
||||
uinput_device = g_strdup(DEFAULT_UINPUT_DEVICE);
|
||||
}
|
||||
|
||||
- g_unix_signal_add(SIGINT, signal_handler, NULL);
|
||||
- g_unix_signal_add(SIGHUP, signal_handler, NULL);
|
||||
- g_unix_signal_add(SIGTERM, signal_handler, NULL);
|
||||
-
|
||||
openlog("spice-vdagentd", do_daemonize ? 0 : LOG_PERROR, LOG_USER);
|
||||
|
||||
/* Setup communication with vdagent process(es) */
|
||||
@@ -1240,6 +1236,10 @@ int main(int argc, char *argv[])
|
||||
}
|
||||
#endif
|
||||
|
||||
+ g_unix_signal_add(SIGINT, signal_handler, NULL);
|
||||
+ g_unix_signal_add(SIGHUP, signal_handler, NULL);
|
||||
+ g_unix_signal_add(SIGTERM, signal_handler, NULL);
|
||||
+
|
||||
if (want_session_info)
|
||||
session_info = session_info_create(debug);
|
||||
if (session_info) {
|
||||
@@ -1252,6 +1252,7 @@ int main(int argc, char *argv[])
|
||||
|
||||
active_xfers = g_hash_table_new(g_direct_hash, g_direct_equal);
|
||||
|
||||
+ udscs_server_start(server);
|
||||
loop = g_main_loop_new(NULL, FALSE);
|
||||
g_main_loop_run(loop);
|
||||
|
||||
--
|
||||
2.25.1
|
||||
|
||||
|
|
@ -1,44 +0,0 @@
|
|||
From 7b0435ef66af088c1a1be20b6bc6b0fcb76e4e1a Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Jakub=20Jank=C5=AF?= <jjanku@redhat.com>
|
||||
Date: Fri, 20 Mar 2020 17:18:32 +0100
|
||||
Subject: [PATCH 2/2] vdagentd: init static uinput before fork
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Otherwise the caller doesn't know that the init failed
|
||||
because we're returning 0 in the parent and 1 in child.
|
||||
|
||||
Signed-off-by: Jakub Janků <jjanku@redhat.com>
|
||||
Acked-by: Frediano Ziglio <fziglio@redhat.com>
|
||||
---
|
||||
src/vdagentd/vdagentd.c | 6 +++---
|
||||
1 file changed, 3 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/src/vdagentd/vdagentd.c b/src/vdagentd/vdagentd.c
|
||||
index 1b63ec8..753c9bf 100644
|
||||
--- a/src/vdagentd/vdagentd.c
|
||||
+++ b/src/vdagentd/vdagentd.c
|
||||
@@ -1224,9 +1224,6 @@ int main(int argc, char *argv[])
|
||||
}
|
||||
}
|
||||
|
||||
- if (do_daemonize)
|
||||
- daemonize();
|
||||
-
|
||||
#ifdef WITH_STATIC_UINPUT
|
||||
uinput = vdagentd_uinput_create(uinput_device, 1024, 768, NULL, 0,
|
||||
debug > 1, uinput_fake);
|
||||
@@ -1236,6 +1233,9 @@ int main(int argc, char *argv[])
|
||||
}
|
||||
#endif
|
||||
|
||||
+ if (do_daemonize)
|
||||
+ daemonize();
|
||||
+
|
||||
g_unix_signal_add(SIGINT, signal_handler, NULL);
|
||||
g_unix_signal_add(SIGHUP, signal_handler, NULL);
|
||||
g_unix_signal_add(SIGTERM, signal_handler, NULL);
|
||||
--
|
||||
2.25.1
|
||||
|
||||
|
|
@ -1,7 +1,5 @@
|
|||
{
|
||||
"Signatures": {
|
||||
"spice-vdagent-0.20.0.tar.bz2": "2e6b7222675ee19ea38c52165abe4d836c2ac5d5bf902d4dfca13da1ec143359",
|
||||
"spice-vdagent-0.20.0.tar.bz2.sig": "fbfbdd9e67f72e026d619b9cd3da9af10fc467c193cf96dc9677b5f9014e7ea6",
|
||||
"victortoso-E37A484F.keyring": "baf674e73d98c2070ee63a914d192111d0df4777f64a9f523a1f9096dce2b6f7"
|
||||
"spice-vdagent-0.22.1.tar.bz2": "93b0d15aca4762cc7d379b179a7101149dbaed62b72112fffb2b3e90b11687a0"
|
||||
}
|
||||
}
|
||||
|
|
@ -1,17 +1,16 @@
|
|||
Vendor: Microsoft Corporation
|
||||
Distribution: Mariner
|
||||
Name: spice-vdagent
|
||||
Version: 0.20.0
|
||||
Release: 3%{?dist}
|
||||
Version: 0.22.1
|
||||
Release: 1%{?dist}
|
||||
Summary: Agent for Spice guests
|
||||
License: GPLv3+
|
||||
URL: https://spice-space.org/
|
||||
Source0: https://spice-space.org/download/releases/%{name}-%{version}.tar.bz2
|
||||
Source1: https://spice-space.org/download/releases/%{name}-%{version}.tar.bz2.sig
|
||||
Source2: victortoso-E37A484F.keyring
|
||||
BuildRequires: make
|
||||
BuildRequires: systemd-devel
|
||||
BuildRequires: glib2-devel >= 2.50
|
||||
BuildRequires: spice-protocol >= 0.14.1
|
||||
BuildRequires: spice-protocol >= 0.14.3
|
||||
BuildRequires: libpciaccess-devel libXrandr-devel libXinerama-devel
|
||||
BuildRequires: libXfixes-devel systemd desktop-file-utils libtool
|
||||
BuildRequires: alsa-lib-devel dbus-devel libdrm-devel
|
||||
|
|
@ -20,9 +19,6 @@ BuildRequires: automake autoconf
|
|||
BuildRequires: gnupg2
|
||||
%{?systemd_requires}
|
||||
|
||||
Patch0001: 0001-vdagentd-work-around-GLib-s-fork-issues.patch
|
||||
Patch0002: 0002-vdagentd-init-static-uinput-before-fork.patch
|
||||
|
||||
%description
|
||||
Spice agent for Linux guests offering the following features:
|
||||
|
||||
|
|
@ -37,18 +33,17 @@ Features:
|
|||
|
||||
|
||||
%prep
|
||||
gpgv2 --quiet --keyring %{SOURCE2} %{SOURCE1} %{SOURCE0}
|
||||
%autosetup -p1
|
||||
autoreconf -fi
|
||||
|
||||
|
||||
%build
|
||||
%configure --with-session-info=systemd --with-init-script=systemd
|
||||
make %{?_smp_mflags} V=2
|
||||
%make_build V=2
|
||||
|
||||
|
||||
%install
|
||||
make install DESTDIR=$RPM_BUILD_ROOT V=2
|
||||
%make_install V=2
|
||||
|
||||
|
||||
%post
|
||||
|
|
@ -62,11 +57,13 @@ make install DESTDIR=$RPM_BUILD_ROOT V=2
|
|||
|
||||
|
||||
%files
|
||||
%doc COPYING CHANGELOG.md README.md
|
||||
%license COPYING
|
||||
%doc CHANGELOG.md README.md
|
||||
/usr/lib/udev/rules.d/70-spice-vdagentd.rules
|
||||
%{_unitdir}/spice-vdagentd.service
|
||||
%{_unitdir}/spice-vdagentd.socket
|
||||
%{_prefix}/lib/tmpfiles.d/spice-vdagentd.conf
|
||||
%{_userunitdir}/spice-vdagent.service
|
||||
%{_bindir}/spice-vdagent
|
||||
%{_sbindir}/spice-vdagentd
|
||||
%{_var}/run/spice-vdagentd
|
||||
|
|
@ -78,6 +75,10 @@ make install DESTDIR=$RPM_BUILD_ROOT V=2
|
|||
|
||||
|
||||
%changelog
|
||||
* Fri Mar 18 2022 Pawel Winogrodzki <pawelwi@microsoft.com> - 0.22.1-1
|
||||
- Updating to version 0.22.1 using Fedora 36 spec (license: MIT) for guidance.
|
||||
- License verified.
|
||||
|
||||
* Fri Oct 15 2021 Pawel Winogrodzki <pawelwi@microsoft.com> - 0.20.0-3
|
||||
- Initial CBL-Mariner import from Fedora 32 (license: MIT).
|
||||
|
||||
|
|
|
|||
Различия файлов скрыты, потому что одна или несколько строк слишком длинны
|
|
@ -46,7 +46,6 @@
|
|||
"adwaita-icon-theme",
|
||||
"afflib",
|
||||
"aide",
|
||||
"alsa-firmware",
|
||||
"alsa-plugins",
|
||||
"amtk",
|
||||
"amtterm",
|
||||
|
|
|
|||
|
|
@ -130,16 +130,6 @@
|
|||
}
|
||||
}
|
||||
},
|
||||
{
|
||||
"component": {
|
||||
"type": "other",
|
||||
"other": {
|
||||
"name": "alsa-firmware",
|
||||
"version": "1.2.1",
|
||||
"downloadUrl": "ftp://ftp.alsa-project.org/pub/firmware/alsa-firmware-1.2.1.tar.bz2"
|
||||
}
|
||||
}
|
||||
},
|
||||
{
|
||||
"component": {
|
||||
"type": "other",
|
||||
|
|
@ -1587,8 +1577,8 @@
|
|||
"type": "other",
|
||||
"other": {
|
||||
"name": "catatonit",
|
||||
"version": "0.1.5",
|
||||
"downloadUrl": "https://github.com/openSUSE/catatonit/archive/v0.1.5.tar.gz"
|
||||
"version": "0.1.7",
|
||||
"downloadUrl": "https://github.com/openSUSE/catatonit/archive/v0.1.7.tar.gz"
|
||||
}
|
||||
}
|
||||
},
|
||||
|
|
@ -27557,8 +27547,8 @@
|
|||
"type": "other",
|
||||
"other": {
|
||||
"name": "spice-vdagent",
|
||||
"version": "0.20.0",
|
||||
"downloadUrl": "https://spice-space.org/download/releases/spice-vdagent-0.20.0.tar.bz2"
|
||||
"version": "0.22.1",
|
||||
"downloadUrl": "https://spice-space.org/download/releases/spice-vdagent-0.22.1.tar.bz2"
|
||||
}
|
||||
}
|
||||
},
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче