From 305988add00cbe98c7ac8a7fa71a9a5b79b80058 Mon Sep 17 00:00:00 2001 From: eabdullin Date: Thu, 21 Sep 2023 18:39:28 +0000 Subject: [PATCH] import CS gnome-remote-desktop-40.0-10.el9 --- .../0001-build-Set-rpath-on-executable.patch | 50 ------------------- ...VNCServer-0.9.13-static-library-link.patch | 47 +++++++++++++++++ SPECS/gnome-remote-desktop.spec | 30 ++++++----- 3 files changed, 64 insertions(+), 63 deletions(-) delete mode 100644 SOURCES/0001-build-Set-rpath-on-executable.patch create mode 100644 SOURCES/libvncserver-LibVNCServer-0.9.13-static-library-link.patch diff --git a/SOURCES/0001-build-Set-rpath-on-executable.patch b/SOURCES/0001-build-Set-rpath-on-executable.patch deleted file mode 100644 index 12fe9f6..0000000 --- a/SOURCES/0001-build-Set-rpath-on-executable.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 1a6737f4a26c38f3c703d84263d0a0779a607359 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Jonas=20=C3=85dahl?= -Date: Wed, 21 Apr 2021 14:49:36 +0200 -Subject: [PATCH] build: Set rpath on executable - ---- - meson.build | 1 + - src/meson.build | 1 + - tests/meson.build | 1 + - 3 files changed, 3 insertions(+) - -diff --git a/meson.build b/meson.build -index 9d7bda1..9148eb9 100644 ---- a/meson.build -+++ b/meson.build -@@ -75,6 +75,7 @@ top_srcdir = meson.current_source_dir() - builddir = meson.current_build_dir() - - prefix = get_option('prefix') -+libdir = join_paths(prefix, get_option('libdir')) - libexecdir = join_paths(prefix, get_option('libexecdir')) - datadir = join_paths(prefix, get_option('datadir')) - schemadir = join_paths(datadir, 'glib-2.0', 'schemas') -diff --git a/src/meson.build b/src/meson.build -index 843746d..3757afb 100644 ---- a/src/meson.build -+++ b/src/meson.build -@@ -100,6 +100,7 @@ executable('gnome-remote-desktop-daemon', - daemon_sources, - dependencies: deps, - include_directories: [configinc], -+ install_rpath: join_paths(libdir, 'gnome-remote-desktop'), - install: true, - install_dir: libexecdir) - -diff --git a/tests/meson.build b/tests/meson.build -index 978ae23..ab74a28 100644 ---- a/tests/meson.build -+++ b/tests/meson.build -@@ -5,6 +5,7 @@ if have_vnc - dependencies: [glib_dep, - libvncclient_dep], - include_directories: [configinc], -+ install_rpath: join_paths(libdir, 'gnome-remote-desktop'), - install: false) - - test_runner = find_program('vnc-test-runner.sh') --- -2.31.1 - diff --git a/SOURCES/libvncserver-LibVNCServer-0.9.13-static-library-link.patch b/SOURCES/libvncserver-LibVNCServer-0.9.13-static-library-link.patch new file mode 100644 index 0000000..5a3eed4 --- /dev/null +++ b/SOURCES/libvncserver-LibVNCServer-0.9.13-static-library-link.patch @@ -0,0 +1,47 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 0b6228a..20fec85 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -495,7 +495,7 @@ if(WIN32) + endif(WITH_TIGHTVNC_FILETRANSFER) + endif(WIN32) + +-target_link_libraries(vncclient ++target_link_libraries(vncclient PUBLIC + ${ADDITIONAL_LIBS} + ${ZLIB_LIBRARIES} + ${LZO_LIBRARIES} +@@ -504,7 +504,7 @@ target_link_libraries(vncclient + ${GNUTLS_LIBRARIES} + ${OPENSSL_LIBRARIES} + ) +-target_link_libraries(vncserver ++target_link_libraries(vncserver PUBLIC + ${ADDITIONAL_LIBS} + ${ZLIB_LIBRARIES} + ${LZO_LIBRARIES} +diff --git a/libvncclient.pc.cmakein b/libvncclient.pc.cmakein +index ceeda39..f131dca 100644 +--- a/libvncclient.pc.cmakein ++++ b/libvncclient.pc.cmakein +@@ -8,7 +8,6 @@ Description: A library for easy implementation of a VNC client. + Version: @LibVNCServer_VERSION@ + Requires: + Requires.private: +-Libs: -L${libdir} -lvncclient +-Libs.private: @PRIVATE_LIBS@ ++Libs: -L${libdir} -lvncclient @PRIVATE_LIBS@ + Cflags: -I${includedir} + +diff --git a/libvncserver.pc.cmakein b/libvncserver.pc.cmakein +index 33ec668..5ae98c9 100644 +--- a/libvncserver.pc.cmakein ++++ b/libvncserver.pc.cmakein +@@ -8,6 +8,5 @@ Description: A library for easy implementation of a VNC server. + Version: @LibVNCServer_VERSION@ + Requires: + Requires.private: +-Libs: -L${libdir} -lvncserver +-Libs.private: @PRIVATE_LIBS@ ++Libs: -L${libdir} -lvncserver @PRIVATE_LIBS@ + Cflags: -I${includedir} diff --git a/SPECS/gnome-remote-desktop.spec b/SPECS/gnome-remote-desktop.spec index 2913277..a018430 100644 --- a/SPECS/gnome-remote-desktop.spec +++ b/SPECS/gnome-remote-desktop.spec @@ -15,7 +15,7 @@ Name: gnome-remote-desktop Version: 40.0 -Release: 7%{?dist} +Release: 10%{?dist} Summary: GNOME Remote Desktop screen share service License: GPLv2+ @@ -30,9 +30,6 @@ Patch0: gnutls-anontls.patch # Backport upstream leak fix (rhbz#1951129) Patch1: 0001-pipewire-stream-Don-t-leak-GSource-s.patch -## LibVNCServer patches required for bundling -Patch100: 0001-build-Set-rpath-on-executable.patch - ### LibVNCServer patches ## TLS security type enablement patches # https://github.com/LibVNC/libvncserver/pull/234 @@ -51,6 +48,7 @@ Patch1004: 0001-libvncserver-don-t-NULL-out-internal-of-the-default-.patch ## downstream patches Patch2000: libvncserver-LibVNCServer-0.9.13-system-crypto-policy.patch +Patch2001: libvncserver-LibVNCServer-0.9.13-static-library-link.patch ## Don't compile SHA1 support Patch2100: 0001-crypto-Don-t-compile-SHA1-support-when-Websockets-ar.patch @@ -108,6 +106,8 @@ GNOME desktop environment. %patch1003 -p1 -b .pointers %patch1004 -p1 -b .cursor_null %patch2000 -p1 -b .crypto_policy +%patch2001 -p1 -b .static +%patch2100 -p1 -b .no-sha1 # Nuke bundled minilzo rm -fv common/lzodefs.h common/lzoconf.h commmon/minilzo.h common/minilzo.c @@ -125,9 +125,6 @@ done %setup -n %{name}-%{tarball_version} %patch0 -p1 %patch1 -p1 -%if 0%{?bundle_libvncserver} -%patch100 -p1 -%endif %build @@ -145,7 +142,7 @@ mkdir -p %{_builddir}/libvncserver/ -DSYSCONF_INSTALL_DIR=%{libvncserver_install_dir}/etc \ -DWITH_FFMPEG=OFF -DWITH_GTK=OFF -DWITH_OPENSSL=OFF -DWITH_GNUTLS=ON \ -DWITH_SDL=OFF -DWITH_X11=OFF -DWITH_WEBSOCKETS=OFF \ - -DLIBVNCSERVER_WITH_WEBSOCKETS=OFF + -DLIBVNCSERVER_WITH_WEBSOCKETS=OFF -DBUILD_SHARED_LIBS=OFF %cmake_build %__cmake --install "%{__cmake_builddir}" popd @@ -172,8 +169,6 @@ popd %if 0%{?bundle_libvncserver} pushd ../libvncserver-%{libvncserver_name}-%{libvncserver_version} -mkdir -p %{buildroot}/%{_libdir}/gnome-remote-desktop/ -cp %{__cmake_builddir}/libvncserver.so.1 %{buildroot}/%{_libdir}/gnome-remote-desktop/ cp COPYING %{_builddir}/%{name}-%{tarball_version}/COPYING.libvncserver popd %endif @@ -198,15 +193,24 @@ popd %endif %doc README %{_libexecdir}/gnome-remote-desktop-daemon -%if 0%{?bundle_libvncserver} -%{_libdir}/gnome-remote-desktop/libvncserver.so.1 -%endif %{_userunitdir}/gnome-remote-desktop.service %{_datadir}/glib-2.0/schemas/org.gnome.desktop.remote-desktop.gschema.xml %{_datadir}/glib-2.0/schemas/org.gnome.desktop.remote-desktop.enums.xml %changelog +* Wed Jul 19 2023 Jonas Ådahl - 40.0-10 +- Don't compile in SHA1 support again + Resolves: #2223925 + +* Wed Jul 19 2023 Jonas Ådahl - 40.0-9 +- Bump version number + Related: rhbz#2188174 + +* Wed Apr 19 2023 Yaakov Selkowitz - 40.0-8 +- Do not provide libvncserver.so.1 + Resolves: rhbz#2188174 + * Mon Oct 25 2021 Jonas Ådahl - 40.0-7 - Don't compile in SHA1 support Resolves: #1936594