[PATCH 1/2] libvncserver: Update to latest commit post 0.9.12

[PATCH 1/2] libvncserver: Update to latest commit post 0.9.12

[Randy MacLeod]

Update to latest git HEAD rather than just 0.9.12 since
that includes a fix for CVE-2018-15127.

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

Signed-off-by: Randy MacLeod <Randy.MacLeod@windriver.com>
---
 meta-oe/recipes-graphics/libvncserver/libvncserver_git.bb | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/meta-oe/recipes-graphics/libvncserver/libvncserver_git.bb b/meta-oe/recipes-graphics/libvncserver/libvncserver_git.bb
index b493f7f01..627b03109 100644
--- a/meta-oe/recipes-graphics/libvncserver/libvncserver_git.bb
+++ b/meta-oe/recipes-graphics/libvncserver/libvncserver_git.bb
@@ -9,6 +9,7 @@ PACKAGECONFIG ??= " \
     gcrypt \
     gnutls \
     jpeg \
+    lzo \
     png \
     ${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd','',d)} \
     sdl \
@@ -17,6 +18,7 @@ PACKAGECONFIG ??= " \
 PACKAGECONFIG[gcrypt] = ",,libgcrypt,libgcrypt"
 PACKAGECONFIG[gnutls] = ",,gnutls"
 PACKAGECONFIG[jpeg] = ",-DWITH_JPEG=OFF,jpeg"
+PACKAGECONFIG[lzo] = ",-DWITH_LZO=OFF,lzo"
 PACKAGECONFIG[openssl] = ",-DWITH_OPENSSL=OFF,openssl"
 PACKAGECONFIG[png] = ",-DWITH_PNG=OFF,libpng,libpng"
 PACKAGECONFIG[systemd] = ",,systemd"
@@ -26,6 +28,7 @@ PACKAGECONFIG[zlib] = ",,zlib"
 inherit cmake
 
 SRC_URI = "git://github.com/LibVNC/libvncserver"
-SRCREV = "f997b5a75fa171d79c5e568b7157fba83c8d8355"
+SRCREV = "c0a23857a5c42b45b6d22ccf7218becd1fa69402"
+
 
 S = "${WORKDIR}/git"
-- 
2.17.0

[PATCH 2/2] libvncserver: make PACKAGECONFIG flags explicit

[Randy MacLeod]

Set all the PACKAGECONFIG enable/disable flags explicitly
rather than rely on assumed defaults. This also makes it
clear what the intended configuration is in log files.

Signed-off-by: Randy MacLeod <Randy.MacLeod@windriver.com>
---
 .../libvncserver/libvncserver_git.bb           | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/meta-oe/recipes-graphics/libvncserver/libvncserver_git.bb b/meta-oe/recipes-graphics/libvncserver/libvncserver_git.bb
index 627b03109..88a859ba2 100644
--- a/meta-oe/recipes-graphics/libvncserver/libvncserver_git.bb
+++ b/meta-oe/recipes-graphics/libvncserver/libvncserver_git.bb
@@ -15,15 +15,15 @@ PACKAGECONFIG ??= " \
     sdl \
     zlib \
 "
-PACKAGECONFIG[gcrypt] = ",,libgcrypt,libgcrypt"
-PACKAGECONFIG[gnutls] = ",,gnutls"
-PACKAGECONFIG[jpeg] = ",-DWITH_JPEG=OFF,jpeg"
-PACKAGECONFIG[lzo] = ",-DWITH_LZO=OFF,lzo"
-PACKAGECONFIG[openssl] = ",-DWITH_OPENSSL=OFF,openssl"
-PACKAGECONFIG[png] = ",-DWITH_PNG=OFF,libpng,libpng"
-PACKAGECONFIG[systemd] = ",,systemd"
-PACKAGECONFIG[sdl] = ",,libsdl2"
-PACKAGECONFIG[zlib] = ",,zlib"
+PACKAGECONFIG[gcrypt] = "-DWITH_GCRYPT=ON,-DWITH_GCRYPT=OFF,libgcrypt,libgcrypt"
+PACKAGECONFIG[gnutls] = "-DWITH_GNUTLS=ON,-DWITH_GNUTLS=OFF,gnutls"
+PACKAGECONFIG[jpeg] = "-DWITH_JPEG=ON,-DWITH_JPEG=OFF,jpeg"
+PACKAGECONFIG[lzo] = "-DWITH_LZO=ON,-DWITH_LZO=OFF,lzo"
+PACKAGECONFIG[openssl] = "-DWITH_OPENSSL=ON,-DWITH_OPENSSL=OFF,openssl"
+PACKAGECONFIG[png] = "-DWITH_PNG=ON,-DWITH_PNG=OFF,libpng,libpng"
+PACKAGECONFIG[systemd] = "-DWITH_SYSTEMD=ON,-DWITH_SYSTEMD=OFF,systemd"
+PACKAGECONFIG[sdl] = "-DWITH_SDL=ON,-DWITH_SDL=OFF,libsdl2"
+PACKAGECONFIG[zlib] = "-DWITH_ZLIB=ON,-DWITH_ZLIB=OFF,zlib"
 
 inherit cmake
 
-- 
2.17.0