Skip to contentSkip to conversation

libvncserver: Update to latest commit post 0.9.12

PATCH In review Randy MacLeod 2 participants 4 messages Jan 24, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 libvncserver: Update to latest commit post 0.9.12

Update to latest git HEAD which includes a fix for CVE-2018-15127.

Support for lzo in addition to a bundled minilzo was added so add a PACKAGECONFIG[lzo] and add it to the default config.

---
 meta-oe/recipes-graphics/libvncserver/libvncserver_git.bb | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
meta-oe/recipes-graphics/libvncserver/libvncserver_git.bb +3 -2
index 25917756f..b789055bb 100644
@@ -5,10 +5,11 @@ PRIORITY = "optional"
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=361b6b837cad26c6900a926b62aada5f"
 
-PACKAGECONFIG ??= "gcrypt gnutls jpeg png ${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd','',d)} sdl zlib"
+PACKAGECONFIG ??= "gcrypt gnutls jpeg png lzo ${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd','',d)} sdl zlib"
 PACKAGECONFIG[gcrypt] = ",,libgcrypt,libgcrypt"
 PACKAGECONFIG[gnutls] = ",,gnutls"
 PACKAGECONFIG[jpeg] = ",-DWITH_JPEG=OFF,jpeg"
+PACKAGECONFIG[lzo] = ",,lzo"
 PACKAGECONFIG[openssl] = ",,openssl"
 PACKAGECONFIG[png] = ",-DWITH_PNG=OFF,libpng,libpng"
 PACKAGECONFIG[systemd] = ",,systemd"
@@ -18,6 +19,6 @@ PACKAGECONFIG[zlib] = ",,zlib"
 inherit cmake
 
 SRC_URI = "git://github.com/LibVNC/libvncserver"
-SRCREV = "f997b5a75fa171d79c5e568b7157fba83c8d8355"
+SRCREV = "c0a23857a5c42b45b6d22ccf7218becd1fa69402"
 
 S = "${WORKDIR}/git"
Signature · 1 line
2.17.0
#1 lore raw
Quoted 29 lines · Randy MacLeod

Update to latest git HEAD which includes a fix for CVE-2018-15127.

Support for lzo in addition to a bundled minilzo was added so add a PACKAGECONFIG[lzo] and add it to the default config.

---
  meta-oe/recipes-graphics/libvncserver/libvncserver_git.bb | 5 +++--
  1 file changed, 3 insertions(+), 2 deletions(-)
meta-oe/recipes-graphics/libvncserver/libvncserver_git.bb +2 -1
index 25917756f..b789055bb 100644
@@ -5,10 +5,11 @@ PRIORITY = "optional"
  LICENSE = "GPLv2"
  LIC_FILES_CHKSUM = "file://COPYING;md5=361b6b837cad26c6900a926b62aada5f"
 
-PACKAGECONFIG ??= "gcrypt gnutls jpeg png ${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd','',d)} sdl zlib"
+PACKAGECONFIG ??= "gcrypt gnutls jpeg png lzo ${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd','',d)} sdl zlib"
  PACKAGECONFIG[gcrypt] = ",,libgcrypt,libgcrypt"
  PACKAGECONFIG[gnutls] = ",,gnutls"
  PACKAGECONFIG[jpeg] = ",-DWITH_JPEG=OFF,jpeg"
+PACKAGECONFIG[lzo] = ",,lzo"
  PACKAGECONFIG[openssl] = ",,openssl"
  PACKAGECONFIG[png] = ",-DWITH_PNG=OFF,libpng,libpng"
  PACKAGECONFIG[systemd] = ",,systemd"

meta-oe/recipes-graphics/libvncserver/libvncserver_git.bb PACKAGECONFIG[zlib] = ",,zlib" · line 24

Quoted 7 lines
meta-oe/recipes-graphics/libvncserver/libvncserver_git.bb +1 -1
@@ -18,6 +19,6 @@ PACKAGECONFIG[zlib] = ",,zlib"
  inherit cmake
 
  SRC_URI = "git://github.com/LibVNC/libvncserver"
-SRCREV = "f997b5a75fa171d79c5e568b7157fba83c8d8355"
+SRCREV = "c0a23857a5c42b45b6d22ccf7218becd1fa69402"
 
  S = "${WORKDIR}/git"

glibc builds are fine,
musl builds are underway.

There are some packaging warnings that I haven't fixed.

It would seem to me that the .so files should be separated into:
libvncserver
libvncclient
along with a single -dev/dgb package just like debian does:

$ apt show libvnc<TAB>
libvncclient1        libvncclient1-dbg    libvncserver1 libvncserver1-dbg    libvncserver-config  libvncserver-dev

I'm not sure what's in the -config package yet.

I'll make these packaging changes in another commit in a few days unless someone objects or beats me to it.

Signature · 2 lines
# Randy MacLeod
# Wind River Linux
#2 lore raw

I missed that there were a couple of updates to libvncserver in flight. I've rebased noted that the PKGCFG[lzo] needs -DWITH_LZO=OFF I'll retest and resend.

../Randy

#3 lore raw
In reply to Randy MacLeod
Quoted 51 lines · Randy MacLeod
Quoted 29 lines · Randy MacLeod

Update to latest git HEAD which includes a fix for CVE-2018-15127.

Support for lzo in addition to a bundled minilzo was added so add a PACKAGECONFIG[lzo] and add it to the default config.

---
  meta-oe/recipes-graphics/libvncserver/libvncserver_git.bb | 5 +++--
  1 file changed, 3 insertions(+), 2 deletions(-)
meta-oe/recipes-graphics/libvncserver/libvncserver_git.bb +2 -1
index 25917756f..b789055bb 100644
@@ -5,10 +5,11 @@ PRIORITY = "optional"
  LICENSE = "GPLv2"
  LIC_FILES_CHKSUM = "file://COPYING;md5=361b6b837cad26c6900a926b62aada5f"
 
-PACKAGECONFIG ??= "gcrypt gnutls jpeg png ${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd','',d)} sdl zlib"
+PACKAGECONFIG ??= "gcrypt gnutls jpeg png lzo ${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd','',d)} sdl zlib"
  PACKAGECONFIG[gcrypt] = ",,libgcrypt,libgcrypt"
  PACKAGECONFIG[gnutls] = ",,gnutls"
  PACKAGECONFIG[jpeg] = ",-DWITH_JPEG=OFF,jpeg"
+PACKAGECONFIG[lzo] = ",,lzo"
  PACKAGECONFIG[openssl] = ",,openssl"
  PACKAGECONFIG[png] = ",-DWITH_PNG=OFF,libpng,libpng"
  PACKAGECONFIG[systemd] = ",,systemd"

meta-oe/recipes-graphics/libvncserver/libvncserver_git.bb PACKAGECONFIG[zlib] = ",,zlib" · line 24

Quoted 7 lines
meta-oe/recipes-graphics/libvncserver/libvncserver_git.bb +1 -1
@@ -18,6 +19,6 @@ PACKAGECONFIG[zlib] = ",,zlib"
  inherit cmake
 
  SRC_URI = "git://github.com/LibVNC/libvncserver"
-SRCREV = "f997b5a75fa171d79c5e568b7157fba83c8d8355"
+SRCREV = "c0a23857a5c42b45b6d22ccf7218becd1fa69402"
 
  S = "${WORKDIR}/git"

glibc builds are fine,
musl builds are underway.

There are some packaging warnings that I haven't fixed.

It would seem to me that the .so files should be separated into:
libvncserver
libvncclient
along with a single -dev/dgb package just like debian does:

Quoted 9 lines
$ apt show libvnc<TAB>
libvncclient1        libvncclient1-dbg    libvncserver1
libvncserver1-dbg    libvncserver-config  libvncserver-dev

I'm not sure what's in the -config package yet.

I'll make these packaging changes in another commit in a few days unless someone objects or beats me to it.

I will wait for v2 but give it a shot in local build but this patch does not apply on master.

Quoted 8 lines

--
# Randy MacLeod
# Wind River Linux
--
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel