From e443a3ddd9bf3d7dd18c6cb7adc53813c53ada46 Mon Sep 17 00:00:00 2001 From: Packit Service Date: Dec 09 2020 13:35:25 +0000 Subject: Add spec-file for the distribution --- diff --git a/SPECS/freerdp.spec b/SPECS/freerdp.spec index 304d3a3..6f67d18 100644 --- a/SPECS/freerdp.spec +++ b/SPECS/freerdp.spec @@ -1,5 +1,3 @@ -%global gittag 2.0.0-rc4 - # Can be rebuilt with FFmpeg/H264 support enabled by passing "--with=ffmpeg", # "--with=x264" or "--with=openh264" to mock/rpmbuild; or by globally setting # these variables: @@ -16,19 +14,23 @@ # https://bugzilla.redhat.com/show_bug.cgi?id=1639165 %{!?rhel:%global _with_server 1} +# Disable support for missing codecs in RHEL +%{!?rhel:%global _with_soxr 1} +%if 0%{?fedora} || 0%{?rhel} >= 8 +%global _with_lame 1 +%endif + Name: freerdp -Version: 2.0.0 -Release: 46.rc4%{?dist}.1 +Version: 2.1.1 +Release: 1%{?dist} Epoch: 2 Summary: Free implementation of the Remote Desktop Protocol (RDP) License: ASL 2.0 URL: http://www.freerdp.com/ -Source0: https://github.com/FreeRDP/FreeRDP/archive/%{gittag}/FreeRDP-%{gittag}.tar.gz +Source0: https://github.com/FreeRDP/FreeRDP/archive/%{version}/FreeRDP-%{version}.tar.gz -Patch1: Fixed-CVE-2020-11521-Out-of-bounds-write-in-planar-c.patch -Patch2: Fix-CVE-2020-11523-clamp-invalid-rectangles-to-size-.patch -Patch3: Fix-CVE-2020-11524-out-of-bounds-access-in-interleav.patch +Patch1: winpr-library-Use-RTLD_GLOBAL-for-dlopen.patch BuildRequires: gcc BuildRequires: gcc-c++ @@ -36,6 +38,8 @@ BuildRequires: alsa-lib-devel BuildRequires: cmake >= 2.8 BuildRequires: cups-devel BuildRequires: gsm-devel +%{?_with_lame:BuildRequires: lame-devel} +BuildRequires: libicu-devel BuildRequires: libjpeg-turbo-devel BuildRequires: libX11-devel BuildRequires: libXcursor-devel @@ -54,6 +58,7 @@ BuildRequires: xmlto BuildRequires: zlib-devel BuildRequires: multilib-rpm-config +BuildRequires: pkgconfig(cairo) BuildRequires: pkgconfig(dbus-1) BuildRequires: pkgconfig(dbus-glib-1) BuildRequires: pkgconfig(glib-2.0) @@ -68,7 +73,9 @@ BuildRequires: pkgconfig(gstreamer-video-1.0) BuildRequires: pkgconfig(libpcsclite) BuildRequires: pkgconfig(libpulse) BuildRequires: pkgconfig(libsystemd) +BuildRequires: pkgconfig(libusb-1.0) BuildRequires: pkgconfig(openssl) +%{?_with_soxr:BuildRequires: pkgconfig(soxr)} BuildRequires: pkgconfig(wayland-client) BuildRequires: pkgconfig(wayland-scanner) BuildRequires: pkgconfig(xkbcommon) @@ -78,7 +85,7 @@ BuildRequires: pkgconfig(libavcodec) >= 57.48.101 BuildRequires: pkgconfig(libavutil) } -Provides: xfreerdp = %{version}-%{release} +Provides: xfreerdp = %{?epoch}:%{version}-%{release} Requires: %{name}-libs%{?_isa} = %{?epoch}:%{version}-%{release} Requires: libwinpr%{?_isa} = %{?epoch}:%{version}-%{release} @@ -126,7 +133,7 @@ the RDP protocol. %package -n libwinpr Summary: Windows Portable Runtime Provides: %{name}-libwinpr = %{?epoch}:%{version}-%{release} -Obsoletes: %{name}-libwinpr < %{?epoch}:%{version}-%{release} +Obsoletes: %{name}-libwinpr < 1:1.2.0 %description -n libwinpr WinPR provides API compatibility for applications targeting non-Windows @@ -144,7 +151,7 @@ The %{name}-libwinpr-devel package contains libraries and header files for developing applications that use %{name}-libwinpr. %prep -%autosetup -p1 -n FreeRDP-%{gittag} +%autosetup -p1 -n FreeRDP-%{version} # Rpmlint fixes find . -name "*.h" -exec chmod 664 {} \; @@ -163,8 +170,10 @@ find . -name "*.c" -exec chmod 664 {} \; -DWITH_GSSAPI=%{?_with_gss:ON}%{?!_with_gss:OFF} \ -DWITH_GSTREAMER_1_0=ON -DWITH_GSTREAMER_0_10=OFF \ -DGSTREAMER_1_0_INCLUDE_DIRS=%{_includedir}/gstreamer-1.0 \ + -DWITH_ICU=ON \ -DWITH_IPP=OFF \ -DWITH_JPEG=ON \ + -DWITH_LAME=%{?_with_lame:ON}%{?!_with_lame:OFF} \ -DWITH_MANPAGES=ON \ -DWITH_OPENH264=%{?_with_openh264:ON}%{?!_with_openh264:OFF} \ -DWITH_OPENSSL=ON \ @@ -174,6 +183,7 @@ find . -name "*.c" -exec chmod 664 {} \; -DWITH_SERVER_INTERFACE=%{?_with_server:ON}%{?!_with_server:OFF} \ -DWITH_SHADOW_X11=%{?_with_server:ON}%{?!_with_server:OFF} \ -DWITH_SHADOW_MAC=%{?_with_server:ON}%{?!_with_server:OFF} \ + -DWITH_SOXR=%{?_with_soxr:ON}%{?!_with_soxr:OFF} \ -DWITH_WAYLAND=ON \ -DWITH_X11=ON \ -DWITH_X264=%{?_with_x264:ON}%{?!_with_x264:OFF} \ @@ -188,6 +198,7 @@ find . -name "*.c" -exec chmod 664 {} \; -DWITH_ZLIB=ON \ %ifarch x86_64 -DWITH_SSE2=ON \ + -DWITH_VAAPI=%{?_with_ffmpeg:ON}%{?!_with_ffmpeg:OFF} \ %else -DWITH_SSE2=OFF \ %endif @@ -205,10 +216,10 @@ find . -name "*.c" -exec chmod 664 {} \; %endif . -make %{?_smp_mflags} +%make_build pushd winpr/tools/makecert-cli -make %{?_smp_mflags} +%make_build popd %install @@ -219,27 +230,19 @@ find %{buildroot} -name "*.a" -delete %multilib_fix_c_header --file %{_includedir}/freerdp2/freerdp/build-config.h -%post libs -p /sbin/ldconfig - -%postun libs -p /sbin/ldconfig - -%post -n libwinpr -p /sbin/ldconfig - -%postun -n libwinpr -p /sbin/ldconfig - %files %{_bindir}/winpr-hash %{_bindir}/winpr-makecert %{_bindir}/wlfreerdp %{_bindir}/xfreerdp -%{_mandir}/man1/winpr-hash.1.* -%{_mandir}/man1/winpr-makecert.1.* -%{_mandir}/man1/wlfreerdp.1.* -%{_mandir}/man1/xfreerdp.1.* +%{_mandir}/man1/winpr-hash.1* +%{_mandir}/man1/winpr-makecert.1* +%{_mandir}/man1/wlfreerdp.1* +%{_mandir}/man1/xfreerdp.1* %files libs %license LICENSE -%doc README ChangeLog +%doc README.md ChangeLog %{_libdir}/freerdp2/ %{_libdir}/libfreerdp-client2.so.* %{?_with_server: @@ -279,14 +282,14 @@ find %{buildroot} -name "*.a" -delete %{?_with_server: %files server +%{_bindir}/freerdp-proxy %{_bindir}/freerdp-shadow-cli -%{_mandir}/man1/freerdp-shadow-cli.1.* +%{_mandir}/man1/freerdp-shadow-cli.1* } %files -n libwinpr -%{!?_licensedir:%global license %%doc} %license LICENSE -%doc README ChangeLog +%doc README.md ChangeLog %{_libdir}/libwinpr2.so.* %{_libdir}/libwinpr-tools2.so.* @@ -299,10 +302,12 @@ find %{buildroot} -name "*.a" -delete %{_libdir}/pkgconfig/winpr-tools2.pc %changelog -* Wed May 20 2020 Ondrej Holy - 2:2.0.0-46.rc4.1 -- CVE-2020-11521: Fix out-of-bounds write in planar.c (#1837632) -- CVE-2020-11523: Fix integer overflow in region.c (#1837633) -- CVE-2020-11524: Fix out-of-bounds write in interleaved.c (#1837631) +* Mon May 25 2020 Ondrej Holy - 2:2.1.1-1 +- Update to 2.1.1 (rhbz#1834287). + +* Fri Apr 17 2020 Ondrej Holy - 2:2.0.0-47.rc4 +- Fix SCARD_INSUFFICIENT_BUFFER error (rhbz#1803054) +- Do not advertise /usb in help output (rhbz#1761144) * Wed Nov 28 2018 Ondrej Holy - 2:2.0.0-46.rc4 - Update to 2.0.0-rc4 (#1624340)