Skip to content
Snippets Groups Projects
Commit 14ff2b81 authored by Leigh Arber's avatar Leigh Arber
Browse files

user/tigervnc: Update 1.10.1 to 1.13.1 

Closes: #380
parent 8c11ce7f
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
user/tigervnc/0001-CSecurityTLS-Use-size_t-as-argument-for-new.patch deleted 100644 → 0
+ 0
− 66
View file @ 8c11ce7f
From 065a471d16636c3fba5da8aed86ffa30dcfd489b Mon Sep 17 00:00:00 2001
From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
Date: Wed, 20 Mar 2019 13:22:51 -0500
Subject: [PATCH 1/2] CSecurityTLS: Use size_t as argument for new
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Using an 'int' is invalid, and produces the following output under GCC 8.3.0:
tigervnc-1.9.0/common/rfb/CSecurityTLS.cxx: In member function ‘void rfb::CSecurityTLS::checkSession()’:
tigervnc-1.9.0/common/rfb/CSecurityTLS.cxx:384:11: error: specified bound range [18446744071562067968, 18446744073709551615] exceeds ‘INT_MAX’ [-Werror=format-truncation=]
snprintf(certinfo, len, "This certificate has been signed by an unknown "
~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
"authority:\n\n%s\n\nDo you want to save it and "
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
"continue? ", info.data);
~~~~~~~~~~~~~~~~~~~~~~~~
tigervnc-1.9.0/common/rfb/CSecurityTLS.cxx:380:26: error: argument 1 range [18446744071562067968, 18446744073709551615] exceeds maximum object size 9223372036854775807 [-Werror=alloc-size-larger-than=]
certinfo = new char[len];
^
In file included from /usr/include/c++/8.3.0/ext/new_allocator.h:33,
from /usr/include/c++/8.3.0/powerpc64-foxkit-linux-musl/bits/c++allocator.h:33,
from /usr/include/c++/8.3.0/bits/allocator.h:46,
from /usr/include/c++/8.3.0/bits/stl_tree.h:64,
from /usr/include/c++/8.3.0/set:60,
from tigervnc-1.9.0/common/rfb/ConnParams.h:26,
from tigervnc-1.9.0/common/rfb/SMsgHandler.h:28,
from tigervnc-1.9.0/common/rfb/SConnection.h:29,
from tigervnc-1.9.0/common/rfb/SSecurity.h:47,
from tigervnc-1.9.0/common/rfb/SSecurityStack.h:23,
from tigervnc-1.9.0/common/rfb/SSecurityVeNCrypt.h:32,
from tigervnc-1.9.0/common/rfb/CSecurityTLS.h:34,
from tigervnc-1.9.0/common/rfb/CSecurityTLS.cxx:36:
/usr/include/c++/8.3.0/new:122:7: note: in a call to allocation function ‘void* operator new [](std::size_t)’ declared here
void* operator new[](std::size_t) _GLIBCXX_THROW (std::bad_alloc)
^~~~~~~~
---
common/rfb/CSecurityTLS.cxx | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/common/rfb/CSecurityTLS.cxx b/common/rfb/CSecurityTLS.cxx
index c6d1e310..235df45d 100644
--- a/common/rfb/CSecurityTLS.cxx
+++ b/common/rfb/CSecurityTLS.cxx
@@ -383,7 +383,7 @@ void CSecurityTLS::checkSession()
size_t out_size = 0;
char *out_buf = NULL;
char *certinfo = NULL;
- int len = 0;
+ size_t len = 0;
vlog.debug("certificate issuer unknown");
@@ -403,7 +403,7 @@ void CSecurityTLS::checkSession()
"authority:\n\n%s\n\nDo you want to save it and "
"continue? ", info.data);
- for (int i = 0; i < len - 1; i++)
+ for (size_t i = 0; i < len - 1; i++)
if (certinfo[i] == ',' && certinfo[i + 1] == ' ')
certinfo[i] = '\n';
--
2.19.2
user/tigervnc/APKBUILD
+ 4
− 9
View file @ 14ff2b81
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=tigervnc
pkgver=1.10.1
pkgver=1.13.1
pkgrel=0
pkgdesc="High-performance, platform-neutral VNC remote desktop application"
url="https://tigervnc.org/"
......@@ -11,12 +11,9 @@ license="GPL-2.0"
depends=""
makedepends="cmake fltk-dev fontconfig-dev gnutls-dev intltool
libjpeg-turbo-dev libx11-dev libxcursor-dev libxfixes-dev libxft-dev
libxrender-dev libxtst-dev linux-pam-dev zlib-dev"
libxrender-dev libxtst-dev linux-pam-dev pixman-dev zlib-dev"
subpackages="$pkgname-lang $pkgname-doc"
source="tigervnc-$pkgver.tar.gz::https://github.com/TigerVNC/tigervnc/archive/v$pkgver.tar.gz
use-intltool.patch
0001-CSecurityTLS-Use-size_t-as-argument-for-new.patch
"
source="tigervnc-$pkgver.tar.gz::https://github.com/TigerVNC/tigervnc/archive/v$pkgver.tar.gz"
build() {
if [ "$CBUILD" != "$CHOST" ]; then
......@@ -37,6 +34,4 @@ package() {
make DESTDIR="$pkgdir" install
}
sha512sums="3486ff772d39217feb8c075860cae58e1021bdb8095443d8b5c383929cc6c622b57ea61c31d06ff0bd48c7e6889db4b6a99d0742bdd60edf323fb2a3ad328705 tigervnc-1.10.1.tar.gz
5c1cee98b7ba41c7cf121480fdfe16d5ef17c9562ff2ba3ea4e74235161fc63e2e3ed63e788c0aa999610b660b394c1269d6fdcc9716c5563651fd67d723f619 use-intltool.patch
f95328f6b669e6608b9971de3db25d5eb26a733fbe32f13291c309ed57eacba6c86461a516c3b8cdc12ff7482ee0249a45189864d473d52df81df0a3541d95b9 0001-CSecurityTLS-Use-size_t-as-argument-for-new.patch"
sha512sums="9190dbcd3b57ba52286c158c0675104d68463d7e3ea8e23493514b64451ddb511f3daf0f177339bc231155daea376d9c8dc58216663e10aa12f67468f4559da5 tigervnc-1.13.1.tar.gz"
user/tigervnc/use-intltool.patch deleted 100644 → 0
+ 0
− 32
View file @ 8c11ce7f
--- tigervnc-1.9.0/vncviewer/CMakeLists.txt.old 2018-07-16 14:08:55.000000000 +0000
+++ tigervnc-1.9.0/vncviewer/CMakeLists.txt 2018-07-25 05:43:25.670000000 +0000
@@ -66,14 +66,7 @@
configure_file(vncviewer.desktop.in.in vncviewer.desktop.in)
find_program(INTLTOOL_MERGE_EXECUTABLE intltool-merge)
- if("${GETTEXT_VERSION_STRING}" VERSION_GREATER 0.18.99)
- add_custom_command(OUTPUT vncviewer.desktop
- COMMAND ${GETTEXT_MSGFMT_EXECUTABLE}
- --desktop --template vncviewer.desktop.in
- -d ${CMAKE_SOURCE_DIR}/po -o vncviewer.desktop
- DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/vncviewer.desktop.in
- )
- elseif(INTLTOOL_MERGE_EXECUTABLE)
+ if(INTLTOOL_MERGE_EXECUTABLE)
add_custom_command(OUTPUT vncviewer.desktop
COMMAND sed -e 's/^Name/_Name/'
-e 's/^GenericName/_GenericName/'
@@ -84,6 +77,13 @@
vncviewer.desktop.intl vncviewer.desktop
DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/vncviewer.desktop.in
)
+ elseif("${GETTEXT_VERSION_STRING}" VERSION_GREATER 0.18.99)
+ add_custom_command(OUTPUT vncviewer.desktop
+ COMMAND ${GETTEXT_MSGFMT_EXECUTABLE}
+ --desktop --template vncviewer.desktop.in
+ -d ${CMAKE_SOURCE_DIR}/po -o vncviewer.desktop
+ DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/vncviewer.desktop.in
+ )
else()
add_custom_command(OUTPUT vncviewer.desktop
COMMAND cp vncviewer.desktop.in vncviewer.desktop
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment