mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-06-08 03:49:57 +00:00
Code Issues Projects Releases Wiki Activity

tigervnc: upgrade to 1.11.0

Browse Source 
Upgrade to latest stable version.

The 1.10 branch is not maitained any more, it stops update in 2019.
The 1.11 branch has fix for CVE-2020-26117, which is a high risk CVE.
https://nvd.nist.gov/vuln/detail/CVE-2020-26117

Some changes in this new version are as below.
1) 'bash' is added to RDEPENDS as /usr/libexec/vncsession-start requires it.
2) DEPENDS on libpam and requires 'pam' distro feature.
   This is because upstream has made 'pam' mandatory in the following commit.
   """
   commit d80817f101d1b3f1a9b1c5ec268f28fffa2d75f9
   Author: Pierre Ossman <ossman@cendio.se>
   Date:   Wed Jul 11 15:49:46 2018 +0200

       Make PAM mandatory

       It is present on all UNIX systems anyway, so let's simplify things.
       We will need it for more proper session startup anyway.
   """

Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Chen Qi
2021-04-21 00:01:43 -07:00
committed by Khem Raj
parent b5ad9c011d
commit e0fe062ee4
3 changed files with 32 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-oe/recipes-graphics/tigervnc/files/0002-do-not-build-tests-sub-directory.patch
+11 -10
View File
@@ -1,29 +1,30 @@
From c3460d63f0b6cd50b9a64265f420f0439e12a1d5 Mon Sep 17 00:00:00 2001 From 076d0e12a7be6cd2108e4ca0dcde1cb658918fa5 Mon Sep 17 00:00:00 2001
From: Hongxu Jia <hongxu.jia@windriver.com> From: Chen Qi <Qi.Chen@windriver.com>
Date: Tue, 25 Apr 2017 01:36:44 -0400 Date: Mon, 19 Apr 2021 23:02:45 -0700
Subject: [PATCH 2/4] do not build tests sub directory Subject: [PATCH] do not build tests sub directory
Upstream-Status: Inappropriate [oe specific] Upstream-Status: Inappropriate [OE Specific]
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> Signed-off-by: Hongxu Jia <Hongxu.Jia@windriver.com>
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
--- ---
CMakeLists.txt | 3 --- CMakeLists.txt | 3 ---
1 file changed, 3 deletions(-) 1 file changed, 3 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt diff --git a/CMakeLists.txt b/CMakeLists.txt
index 94ec2ef..fb72a00 100644 index 7bf99441..bda80598 100644
--- a/CMakeLists.txt --- a/CMakeLists.txt
+++ b/CMakeLists.txt +++ b/CMakeLists.txt
@@ -300,9 +300,6 @@ if(BUILD_VIEWER) @@ -304,9 +304,6 @@ if(BUILD_VIEWER)
add_subdirectory(media) add_subdirectory(media)
endif() endif()
-add_subdirectory(tests) -add_subdirectory(tests)
- -
- -
include(cmake/BuildPackages.cmake) add_subdirectory(release)
# uninstall # uninstall
-- --
2.7.4 2.30.2
meta-oe/recipes-graphics/tigervnc/files/0004-tigervnc-add-fPIC-option-to-COMPILE_FLAGS.patch
+13 -23
View File
@@ -1,44 +1,34 @@
From 9563b69640227da2220ee0c39077afb736cc96d1 Mon Sep 17 00:00:00 2001 From 7f8acd59bb2e54f9be25a98dd71534700a9e355a Mon Sep 17 00:00:00 2001
From: Hongxu Jia <hongxu.jia@windriver.com> From: Chen Qi <Qi.Chen@windriver.com>
Date: Thu, 20 Jul 2017 17:12:17 +0800 Date: Mon, 19 Apr 2021 23:14:28 -0700
Subject: [PATCH 4/4] tigervnc: add fPIC option to COMPILE_FLAGS Subject: [PATCH] tigervnc: add fPIC option to COMPILE_FLAGS
The static libraries in Xregion/network/rdr/rfb were linked by shared The static libraries in network/rdr/rfb were linked by shared
library libvnc.so, so we should add fPIC option to COMPILE_FLAGS to fix library libvnc.so, so we should add fPIC option to COMPILE_FLAGS to fix
relocation issue. relocation issue.
Upstream-Status: Pending Upstream-Status: Pending
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
--- ---
common/Xregion/CMakeLists.txt | 1 +
common/network/CMakeLists.txt | 1 + common/network/CMakeLists.txt | 1 +
common/rdr/CMakeLists.txt | 1 + common/rdr/CMakeLists.txt | 1 +
common/rfb/CMakeLists.txt | 1 + common/rfb/CMakeLists.txt | 1 +
4 files changed, 4 insertions(+) 3 files changed, 3 insertions(+)
diff --git a/common/Xregion/CMakeLists.txt b/common/Xregion/CMakeLists.txt
index 40ca97e..9411328 100644
--- a/common/Xregion/CMakeLists.txt
+++ b/common/Xregion/CMakeLists.txt
@@ -3,4 +3,5 @@ add_library(Xregion STATIC
if(UNIX)
libtool_create_control_file(Xregion)
+ set_target_properties(Xregion PROPERTIES COMPILE_FLAGS -fPIC)
endif()
diff --git a/common/network/CMakeLists.txt b/common/network/CMakeLists.txt diff --git a/common/network/CMakeLists.txt b/common/network/CMakeLists.txt
index b624c8e..6c06ec9 100644 index d00ca452..e84e0290 100644
--- a/common/network/CMakeLists.txt --- a/common/network/CMakeLists.txt
+++ b/common/network/CMakeLists.txt +++ b/common/network/CMakeLists.txt
@@ -9,4 +9,5 @@ endif() @@ -16,4 +16,5 @@ endif()
if(UNIX) if(UNIX)
libtool_create_control_file(network) libtool_create_control_file(network)
+ set_target_properties(network PROPERTIES COMPILE_FLAGS -fPIC) + set_target_properties(network PROPERTIES COMPILE_FLAGS -fPIC)
endif() endif()
diff --git a/common/rdr/CMakeLists.txt b/common/rdr/CMakeLists.txt diff --git a/common/rdr/CMakeLists.txt b/common/rdr/CMakeLists.txt
index 989ba2f..20f6489 100644 index 989ba2f4..20f6489d 100644
--- a/common/rdr/CMakeLists.txt --- a/common/rdr/CMakeLists.txt
+++ b/common/rdr/CMakeLists.txt +++ b/common/rdr/CMakeLists.txt
@@ -27,4 +27,5 @@ target_link_libraries(rdr ${RDR_LIBRARIES}) @@ -27,4 +27,5 @@ target_link_libraries(rdr ${RDR_LIBRARIES})
@@ -48,15 +38,15 @@ index 989ba2f..20f6489 100644
+ set_target_properties(rdr PROPERTIES COMPILE_FLAGS -fPIC) + set_target_properties(rdr PROPERTIES COMPILE_FLAGS -fPIC)
endif() endif()
diff --git a/common/rfb/CMakeLists.txt b/common/rfb/CMakeLists.txt diff --git a/common/rfb/CMakeLists.txt b/common/rfb/CMakeLists.txt
index 5047e5e..88838ab 100644 index fc5a37bf..7f5ce131 100644
--- a/common/rfb/CMakeLists.txt --- a/common/rfb/CMakeLists.txt
+++ b/common/rfb/CMakeLists.txt +++ b/common/rfb/CMakeLists.txt
@@ -98,4 +98,5 @@ target_link_libraries(rfb ${RFB_LIBRARIES}) @@ -99,4 +99,5 @@ target_link_libraries(rfb ${RFB_LIBRARIES})
if(UNIX) if(UNIX)
libtool_create_control_file(rfb) libtool_create_control_file(rfb)
+ set_target_properties(rfb PROPERTIES COMPILE_FLAGS -fPIC) + set_target_properties(rfb PROPERTIES COMPILE_FLAGS -fPIC)
endif() endif()
-- --
2.7.4 2.30.2
meta-oe/recipes-graphics/tigervnc/tigervnc_1.10.1.bb → meta-oe/recipes-graphics/tigervnc/tigervnc_1.11.0.bb
+8 -5
View File
@@ -2,22 +2,22 @@ DESCRIPTION = "TigerVNC remote display system"
HOMEPAGE = "http://www.tigervnc.com/" HOMEPAGE = "http://www.tigervnc.com/"
LICENSE = "GPLv2+" LICENSE = "GPLv2+"
SECTION = "x11/utils" SECTION = "x11/utils"
DEPENDS = "xserver-xorg gnutls jpeg libxtst gettext-native fltk" DEPENDS = "xserver-xorg gnutls jpeg libxtst gettext-native fltk libpam"
RDEPENDS_${PN} = "coreutils hicolor-icon-theme perl" RDEPENDS_${PN} = "coreutils hicolor-icon-theme perl bash"
LIC_FILES_CHKSUM = "file://LICENCE.TXT;md5=75b02c2872421380bbd47781d2bd75d3" LIC_FILES_CHKSUM = "file://LICENCE.TXT;md5=75b02c2872421380bbd47781d2bd75d3"
S = "${WORKDIR}/git" S = "${WORKDIR}/git"
inherit features_check inherit features_check
REQUIRED_DISTRO_FEATURES = "x11" REQUIRED_DISTRO_FEATURES = "x11 pam"
inherit autotools cmake inherit autotools cmake
B = "${S}" B = "${S}"
SRCREV = "4739493b635372bd40a34640a719f79fa90e4dba" SRCREV = "540bfc3278e396321124d4b18a798ac2bc18b6ca"
SRC_URI = "git://github.com/TigerVNC/tigervnc.git;branch=1.10-branch \ SRC_URI = "git://github.com/TigerVNC/tigervnc.git;branch=1.11-branch \
file://0002-do-not-build-tests-sub-directory.patch \ file://0002-do-not-build-tests-sub-directory.patch \
file://0003-add-missing-dynamic-library-to-FLTK_LIBRARIES.patch \ file://0003-add-missing-dynamic-library-to-FLTK_LIBRARIES.patch \
file://0004-tigervnc-add-fPIC-option-to-COMPILE_FLAGS.patch \ file://0004-tigervnc-add-fPIC-option-to-COMPILE_FLAGS.patch \
@@ -83,6 +83,8 @@ EXTRA_OECONF = "--disable-xorg --disable-xnest --disable-xvfb --disable-dmx \
--disable-xwayland \ --disable-xwayland \
" "
EXTRA_OECMAKE += "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '-DCMAKE_INSTALL_UNITDIR=/lib/systemd/system', '-DINSTALL_SYSTEMD_UNITS=OFF', d)}"
do_configure_append () { do_configure_append () {
olddir=`pwd` olddir=`pwd`
cd ${XSERVER_SOURCE_DIR} cd ${XSERVER_SOURCE_DIR}
@@ -125,6 +127,7 @@ do_install_append() {
FILES_${PN} += " \ FILES_${PN} += " \
${libdir}/xorg/modules/extensions \ ${libdir}/xorg/modules/extensions \
${datadir}/icons \ ${datadir}/icons \
${systemd_unitdir} \
" "
FILES_${PN}-dbg += "${libdir}/xorg/modules/extensions/.debug" FILES_${PN}-dbg += "${libdir}/xorg/modules/extensions/.debug"