Andreas Wacknitz
2023-12-05 fc3b5823aa1b478a7c4ead5b1ce194b0690484ff
libvncserver: update to 0.9.14 & add test results

2 files deleted
2 files added
4 files modified
533 ■■■■ changed files
components/library/libvncserver/Makefile 58 ●●●● patch | view | raw | blame | history
components/library/libvncserver/libvncserver.license 340 ●●●●● patch | view | raw | blame | history
components/library/libvncserver/libvncserver.p5m 26 ●●●●● patch | view | raw | blame | history
components/library/libvncserver/manifests/sample-manifest.p5m 26 ●●●●● patch | view | raw | blame | history
components/library/libvncserver/patches/01-CVE-2018-7225.patch 60 ●●●●● patch | view | raw | blame | history
components/library/libvncserver/patches/01-includetest_sh.patch 10 ●●●●● patch | view | raw | blame | history
components/library/libvncserver/pkg5 4 ●●●● patch | view | raw | blame | history
components/library/libvncserver/test/results-all.master 9 ●●●●● patch | view | raw | blame | history
components/library/libvncserver/Makefile
@@ -10,55 +10,53 @@
#
# Copyright 2018 Harry Liebel
# Copyright 2023 Andreas Wacknitz
#
PREFERRED_BITS=64
BUILD_BITS= 64
BUILD_STYLE= cmake
OPENSSL_VERSION= 3.1
USE_DEFAULT_TEST_TRANSFORMS= yes
include ../../../make-rules/shared-macros.mk
COMPONENT_NAME=        libvncserver
COMPONENT_VERSION=    0.9.10
COMPONENT_REVISION=    1
COMPONENT_VERSION=    0.9.14
COMPONENT_SUMMARY=    VNC server and client C libraries
COMPONENT_DESCRIPTION=    LibVNCServer/LibVNCClient are cross-platform C libraries that allow you to easily implement VNC server or client functionality in your program.
COMPONENT_PROJECT_URL=    https://libvnc.github.io
COMPONENT_SRC=        $(COMPONENT_NAME)-LibVNCServer-$(COMPONENT_VERSION)
COMPONENT_ARCHIVE=    LibVNCServer-$(COMPONENT_VERSION).tar.gz
COMPONENT_ARCHIVE_HASH=    \
  sha256:ed10819a5bfbf269969f97f075939cc38273cc1b6d28bccfb0999fba489411f7
COMPONENT_ARCHIVE_URL= \
  https://github.com/LibVNC/$(COMPONENT_NAME)/archive/$(COMPONENT_ARCHIVE)
COMPONENT_ARCHIVE_HASH=    sha256:83104e4f7e28b02f8bf6b010d69b626fae591f887e949816305daebae527c9a5
COMPONENT_ARCHIVE_URL=    https://github.com/LibVNC/$(COMPONENT_NAME)/archive/$(COMPONENT_ARCHIVE)
COMPONENT_FMRI=        library/libvncserver
COMPONENT_CLASSIFICATION= Development/C
COMPONENT_LICENSE=    GPLv2
COMPONENT_LICENSE_FILE=    COPYING
COMPONENT_SUMMARY=    VNC server and client C libraries
COMPONENT_DESCRIPTION=    LibVNCServer/LibVNCClient are cross-platform C libraries that allow you to easily implement VNC server or client functionality in your program.
COMPONENT_CLASSIFICATION= Development/C
include $(WS_MAKE_RULES)/prep.mk
include $(WS_MAKE_RULES)/configure.mk
include $(WS_MAKE_RULES)/ips.mk
include $(WS_MAKE_RULES)/common.mk
COMPONENT_PREP_ACTION = \
    ( cd $(@D) && autoreconf -fiv )
LDFLAGS += -lsocket -lnsl
LD_OPTIONS += $(LD_Z_DEFS)
CFLAGS  += -I$(OPENSSL_INCDIR)
LDFLAGS += -L$(OPENSSL_LIBDIR)
# Use OpenSSL
CONFIGURE_OPTIONS += --without-gnutls
# build with the system default libjpeg
CFLAGS   += $(JPEG_CPPFLAGS) $(JPEG_CFLAGS)
CXXFLAGS += $(JPEG_CPPFLAGS) $(JPEG_CXXFLAGS)
CPPFLAGS += $(JPEG_CPPFLAGS)
LDFLAGS  += $(JPEG_LDFLAGS)
CFLAGS +=    $(JPEG_CPPFLAGS) $(JPEG_CFLAGS)
LDFLAGS +=    $(JPEG_LDFLAGS)
build:        $(BUILD_64)
install:    $(INSTALL_64)
test:        $(TEST_64)
# Needed to find the correct jpeg libs
CMAKE_OPTIONS += -DJPEG_INCLUDE_DIR=$(JPEG_INCDIR)
CMAKE_OPTIONS += -DJPEG_LIBRARY=$(JPEG_LIBDIR)/libjpeg.so
# We prefer openssl over gnutls
CMAKE_OPTIONS += -DWITH_GNUTLS=OFF
# Auto-generated dependencies
REQUIRED_PACKAGES += image/library/libjpeg8-turbo
REQUIRED_PACKAGES += $(JPEG_IMPLEM_PKG)
REQUIRED_PACKAGES += image/library/libpng16
REQUIRED_PACKAGES += library/security/openssl
REQUIRED_PACKAGES += library/lzo
REQUIRED_PACKAGES += library/security/openssl-31
REQUIRED_PACKAGES += library/zlib
REQUIRED_PACKAGES += SUNWcs
REQUIRED_PACKAGES += system/library
REQUIRED_PACKAGES += system/library/security/libgcrypt
components/library/libvncserver/libvncserver.license
File was deleted
components/library/libvncserver/libvncserver.p5m
@@ -10,10 +10,11 @@
#
#
# Copyright 2018 Harry Liebel
# Copyright 2023 Andreas Wacknitz
#
set name=pkg.fmri value=pkg:/$(COMPONENT_FMRI)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.human-version value=$(HUMAN_VERSION)
set name=pkg.summary value="$(COMPONENT_SUMMARY)"
set name=info.classification value="$(COMPONENT_CLASSIFICATION)"
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
@@ -22,21 +23,24 @@
license $(COMPONENT_LICENSE_FILE) license='$(COMPONENT_LICENSE)'
file path=usr/bin/libvncserver-config
file path=usr/include/rfb/keysym.h
file path=usr/include/rfb/rfb.h
file path=usr/include/rfb/rfbclient.h
file path=usr/include/rfb/rfbconfig.h
file path=usr/include/rfb/rfbint.h
file path=usr/include/rfb/rfbproto.h
file path=usr/include/rfb/rfbregion.h
file path=usr/lib/$(MACH64)/libvncclient.a
link path=usr/lib/$(MACH64)/libvncclient.so target=libvncclient.so.0.0.0
link path=usr/lib/$(MACH64)/libvncclient.so.0 target=libvncclient.so.0.0.0
file path=usr/lib/$(MACH64)/libvncclient.so.0.0.0
file path=usr/lib/$(MACH64)/libvncserver.a
link path=usr/lib/$(MACH64)/libvncserver.so target=libvncserver.so.0.0.0
link path=usr/lib/$(MACH64)/libvncserver.so.0 target=libvncserver.so.0.0.0
file path=usr/lib/$(MACH64)/libvncserver.so.0.0.0
file path=usr/include/rfb/threading.h
file path=usr/lib/$(MACH64)/cmake/LibVNCServer/LibVNCServerConfig.cmake
file path=usr/lib/$(MACH64)/cmake/LibVNCServer/LibVNCServerConfigVersion.cmake
file path=usr/lib/$(MACH64)/cmake/LibVNCServer/LibVNCServerTargets-noconfig.cmake
file path=usr/lib/$(MACH64)/cmake/LibVNCServer/LibVNCServerTargets.cmake
link path=usr/lib/$(MACH64)/libvncclient.so target=libvncclient.so.1
file path=usr/lib/$(MACH64)/libvncclient.so.$(HUMAN_VERSION)
link path=usr/lib/$(MACH64)/libvncclient.so.1 \
    target=libvncclient.so.$(HUMAN_VERSION)
link path=usr/lib/$(MACH64)/libvncserver.so target=libvncserver.so.1
file path=usr/lib/$(MACH64)/libvncserver.so.$(HUMAN_VERSION)
link path=usr/lib/$(MACH64)/libvncserver.so.1 \
    target=libvncserver.so.$(HUMAN_VERSION)
file path=usr/lib/$(MACH64)/pkgconfig/libvncclient.pc
file path=usr/lib/$(MACH64)/pkgconfig/libvncserver.pc
components/library/libvncserver/manifests/sample-manifest.p5m
@@ -10,10 +10,11 @@
#
#
# Copyright 2017 <contributor>
# Copyright 2023 <contributor>
#
set name=pkg.fmri value=pkg:/$(COMPONENT_FMRI)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.human-version value=$(HUMAN_VERSION)
set name=pkg.summary value="$(COMPONENT_SUMMARY)"
set name=info.classification value="$(COMPONENT_CLASSIFICATION)"
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
@@ -22,21 +23,24 @@
license $(COMPONENT_LICENSE_FILE) license='$(COMPONENT_LICENSE)'
file path=usr/bin/libvncserver-config
file path=usr/include/rfb/keysym.h
file path=usr/include/rfb/rfb.h
file path=usr/include/rfb/rfbclient.h
file path=usr/include/rfb/rfbconfig.h
file path=usr/include/rfb/rfbint.h
file path=usr/include/rfb/rfbproto.h
file path=usr/include/rfb/rfbregion.h
file path=usr/lib/$(MACH64)/libvncclient.a
link path=usr/lib/$(MACH64)/libvncclient.so target=libvncclient.so.0.0.0
link path=usr/lib/$(MACH64)/libvncclient.so.0 target=libvncclient.so.0.0.0
file path=usr/lib/$(MACH64)/libvncclient.so.0.0.0
file path=usr/lib/$(MACH64)/libvncserver.a
link path=usr/lib/$(MACH64)/libvncserver.so target=libvncserver.so.0.0.0
link path=usr/lib/$(MACH64)/libvncserver.so.0 target=libvncserver.so.0.0.0
file path=usr/lib/$(MACH64)/libvncserver.so.0.0.0
file path=usr/include/rfb/threading.h
file path=usr/lib/$(MACH64)/cmake/LibVNCServer/LibVNCServerConfig.cmake
file path=usr/lib/$(MACH64)/cmake/LibVNCServer/LibVNCServerConfigVersion.cmake
file path=usr/lib/$(MACH64)/cmake/LibVNCServer/LibVNCServerTargets-noconfig.cmake
file path=usr/lib/$(MACH64)/cmake/LibVNCServer/LibVNCServerTargets.cmake
link path=usr/lib/$(MACH64)/libvncclient.so target=libvncclient.so.1
file path=usr/lib/$(MACH64)/libvncclient.so.$(HUMAN_VERSION)
link path=usr/lib/$(MACH64)/libvncclient.so.1 \
    target=libvncclient.so.$(HUMAN_VERSION)
link path=usr/lib/$(MACH64)/libvncserver.so target=libvncserver.so.1
file path=usr/lib/$(MACH64)/libvncserver.so.$(HUMAN_VERSION)
link path=usr/lib/$(MACH64)/libvncserver.so.1 \
    target=libvncserver.so.$(HUMAN_VERSION)
file path=usr/lib/$(MACH64)/pkgconfig/libvncclient.pc
file path=usr/lib/$(MACH64)/pkgconfig/libvncserver.pc
components/library/libvncserver/patches/01-CVE-2018-7225.patch
File was deleted
components/library/libvncserver/patches/01-includetest_sh.patch
New file
@@ -0,0 +1,10 @@
We need to use gcc here because we don't have cc.
--- libvncserver-LibVNCServer-0.9.14/test/includetest.sh.orig    2023-12-04 08:57:31.644556391 +0100
+++ libvncserver-LibVNCServer-0.9.14/test/includetest.sh    2023-12-04 08:57:44.067316854 +0100
@@ -22,4 +22,4 @@
 }
 " > "$TMPDIR"/includetest.c
-cc -I "$TMPDIR/$PREFIX" "$TMPDIR"/includetest.c
+gcc -I "$TMPDIR/$PREFIX" "$TMPDIR"/includetest.c
components/library/libvncserver/pkg5
@@ -1,9 +1,9 @@
{
    "dependencies": [
        "SUNWcs",
        "image/library/libjpeg8-turbo",
        "image/library/libpng16",
        "library/security/openssl",
        "library/lzo",
        "library/security/openssl-31",
        "library/zlib",
        "system/library",
        "system/library/security/libgcrypt"
components/library/libvncserver/test/results-all.master
New file
@@ -0,0 +1,9 @@
    Start 1: cargs
1/4 Test #1: cargs ............................   Passed
    Start 2: includetest
2/4 Test #2: includetest ......................   Passed
    Start 3: turbojpeg
3/4 Test #3: turbojpeg ........................   Passed
    Start 4: wstest
4/4 Test #4: wstest ...........................   Passed
100% tests passed, 0 tests failed out of 4