[Pkg-tigervnc-devel] Bug present in stable, testing and unstable, but fixed in upstream 1.12 - shall I still report it?
Joachim Falk
joachim.falk at gmx.de
Wed Jan 26 18:11:10 GMT 2022
Hi All,
Am 26.01.22 um 17:38 schrieb Ola Lundqvist:
> Hi
>
> Generally yes. You report bugs on affected versions. Then wheter it is worth submitting a report is up to you. It needs to be rather important for the release team to accept it being corrected in a stable release. We must also be able to locate the patch because we are not allowed to release 1.12 in stable. Also the patch must notrisk regression problems.
I think the changes are small and unintrusive enough to be included in a stable update. Preliminary debdiff attached.
Best,
Joachim
-------------- next part --------------
diff -Nru tigervnc-1.11.0+dfsg/debian/changelog tigervnc-1.11.0+dfsg/debian/changelog
--- tigervnc-1.11.0+dfsg/debian/changelog 2021-03-22 22:21:28.000000000 +0100
+++ tigervnc-1.11.0+dfsg/debian/changelog 2022-01-26 18:59:24.000000000 +0100
@@ -1,3 +1,23 @@
+tigervnc (1.11.0+dfsg-2+deb11u1) UNRELEASED; urgency=medium
+
+ [ John Martin ]
+ * TigerVNC 1.11.0 contains a regression that causes vncviewer to display
+ incorrect colors when vncviewer and X11 server use different endianness.
+ (LP: #1929790)
+
+ [ Joachim Falk ]
+ * Fixed warnings use of uninitialized value in string eq at
+ /usr/share/perl5/TigerVNC/Config.pm line 401 or 414. (Closes: #1004366)
+ * Fixed tigervncserver/x0tigervncserver -list for VNC servers not using a
+ rfbport from 5900 to 5999. (Closes: #1004365)
+ * Fixed typo in tigervncserver man page (Closes: #1003715).
+ * Clear session argument from config file if -xstartup specified on the
+ command line (Closes: #1000871).
+ * Fixed gnome desktop start up when using tigervncserver at .service.
+ (Closes: #1004395)
+
+ -- Joachim Falk <joachim.falk at gmx.de> Wed, 26 Jan 2022 18:59:24 +0100
+
tigervnc (1.11.0+dfsg-2) unstable; urgency=medium
[ Joachim Falk ]
diff -Nru tigervnc-1.11.0+dfsg/debian/helpers/etc/pam.d/tigervnc tigervnc-1.11.0+dfsg/debian/helpers/etc/pam.d/tigervnc
--- tigervnc-1.11.0+dfsg/debian/helpers/etc/pam.d/tigervnc 2020-10-06 21:57:07.000000000 +0200
+++ tigervnc-1.11.0+dfsg/debian/helpers/etc/pam.d/tigervnc 2022-01-26 18:58:53.000000000 +0100
@@ -2,4 +2,4 @@
@include common-auth
@include common-account
- at include common-session-noninteractive
+ at include common-session
diff -Nru tigervnc-1.11.0+dfsg/debian/helpers/usr/share/man/man1/tigervncserver.1 tigervnc-1.11.0+dfsg/debian/helpers/usr/share/man/man1/tigervncserver.1
--- tigervnc-1.11.0+dfsg/debian/helpers/usr/share/man/man1/tigervncserver.1 2021-02-22 18:20:50.000000000 +0100
+++ tigervnc-1.11.0+dfsg/debian/helpers/usr/share/man/man1/tigervncserver.1 2022-01-26 18:58:47.000000000 +0100
@@ -11,7 +11,7 @@
.\"
.TH tigervncserver 1 "Jan 13th, 2021" "TigerVNC 1.11.0" "Virtual Network Computing"
.SH NAME
-tigervncserver \- start or stop a TigerVNC standaloe server
+tigervncserver \- start or stop a TigerVNC standalone server
.SH SYNOPSIS
.
.B tigervncserver
@@ -75,7 +75,7 @@
.RB [ \-cleanstale ]
.
.br
-.B x0tigervncserver -version
+.B tigervncserver -version
.
.SH DESCRIPTION
.B tigervncserver\fP is used to start a TigerVNC (Virtual Network Computing)
diff -Nru tigervnc-1.11.0+dfsg/debian/helpers/usr/share/perl5/TigerVNC/Config.pm tigervnc-1.11.0+dfsg/debian/helpers/usr/share/perl5/TigerVNC/Config.pm
--- tigervnc-1.11.0+dfsg/debian/helpers/usr/share/perl5/TigerVNC/Config.pm 2021-03-22 13:46:46.000000000 +0100
+++ tigervnc-1.11.0+dfsg/debian/helpers/usr/share/perl5/TigerVNC/Config.pm 2022-01-26 18:58:47.000000000 +0100
@@ -227,6 +227,11 @@
if (defined($options->{'vncStartup'}) && $options->{'vncStartup'} eq '__AUTO__') {
# vncStartup was not defined by the user configuration in ~/.vnc/vnc.conf.
$options->{'vncStartup'} = $vncStartupAuto;
+ } elsif (($options->{'src'}{'vncStartup'} // "undef") eq 'cmdline' &&
+ ($options->{'src'}{'session-orig'} // "undef") ne 'cmdline') {
+ # Clear config file session arguments if -xstartup specified on cmdline.
+ $options->{'src'}{'session-orig'} = 'cmdline';
+ $options->{'session-orig'} = $options->{'session'} = [];
}
}
@@ -398,7 +403,8 @@
if (@_ == 2) {
if ($_[1] eq '' || $_[1] eq '1') {
&{$override}('shared', 'never');
- } elsif ($options->{'shared'} eq 'never') {
+ } elsif (defined($options->{'shared'}) &&
+ $options->{'shared'} eq 'never') {
&{$override}('shared', undef);
}
} elsif (defined $options->{'shared'}) {
@@ -411,7 +417,8 @@
if (@_ == 2) {
if ($_[1] eq '' || $_[1] eq '1') {
&{$override}('shared', 'always');
- } elsif ($options->{'shared'} eq 'always') {
+ } elsif (defined($options->{'shared'}) &&
+ $options->{'shared'} eq 'always') {
&{$override}('shared', undef);
}
} elsif (defined $options->{'shared'}) {
diff -Nru tigervnc-1.11.0+dfsg/debian/helpers/usr/share/perl5/TigerVNC/Wrapper.pm tigervnc-1.11.0+dfsg/debian/helpers/usr/share/perl5/TigerVNC/Wrapper.pm
--- tigervnc-1.11.0+dfsg/debian/helpers/usr/share/perl5/TigerVNC/Wrapper.pm 2021-02-22 18:20:50.000000000 +0100
+++ tigervnc-1.11.0+dfsg/debian/helpers/usr/share/perl5/TigerVNC/Wrapper.pm 2022-01-26 18:58:47.000000000 +0100
@@ -294,12 +294,15 @@
$rfbport = $nr;
$usedDisplay = $nr - 5900 if $nr >= 5900 && $nr <= 5999;
}
- my $name = "$HOSTFQDN:$usedDisplay";
my $client = undef;
my $server = "Xtigervnc";
- my $DISPLAY = -e "/tmp/.X11-unix/X${usedDisplay}"
- ? ":${usedDisplay}"
- : "$HOSTFQDN:${usedDisplay}";
+ my ($name, $DISPLAY) = (undef, undef);
+ if (defined $usedDisplay) {
+ $name = "$HOSTFQDN:$usedDisplay";
+ $DISPLAY = -e "/tmp/.X11-unix/X${usedDisplay}"
+ ? ":${usedDisplay}"
+ : "$HOSTFQDN:${usedDisplay}";
+ }
{
my $logFile = desktopLog($options, $nr);
my $logFileFh = File::ReadBackwards->new($logFile);
diff -Nru tigervnc-1.11.0+dfsg/debian/patches/backport/0001-Update-Surface_X11.cxx.patch tigervnc-1.11.0+dfsg/debian/patches/backport/0001-Update-Surface_X11.cxx.patch
--- tigervnc-1.11.0+dfsg/debian/patches/backport/0001-Update-Surface_X11.cxx.patch 1970-01-01 01:00:00.000000000 +0100
+++ tigervnc-1.11.0+dfsg/debian/patches/backport/0001-Update-Surface_X11.cxx.patch 2022-01-26 18:58:47.000000000 +0100
@@ -0,0 +1,46 @@
+From 7ab92639848a6059e2b6b88499b008b9606f3af6 Mon Sep 17 00:00:00 2001
+From: johnmartin-oracle <55413843+johnmartin-oracle at users.noreply.github.com>
+Date: Thu, 27 Aug 2020 22:30:23 -0400
+Subject: [PATCH] Update Surface_X11.cxx
+
+Runtime sellection of ARGB XImage byte order
+---
+ vncviewer/Surface_X11.cxx | 22 +++++++++++-----------
+ 1 file changed, 11 insertions(+), 11 deletions(-)
+
+diff --git a/vncviewer/Surface_X11.cxx b/vncviewer/Surface_X11.cxx
+index 6562634d..8944c3f7 100644
+--- a/vncviewer/Surface_X11.cxx
++++ b/vncviewer/Surface_X11.cxx
+@@ -123,17 +123,17 @@ void Surface::alloc()
+ // we find such a format
+ templ.type = PictTypeDirect;
+ templ.depth = 32;
+-#if __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
+- templ.direct.alpha = 0;
+- templ.direct.red = 8;
+- templ.direct.green = 16;
+- templ.direct.blue = 24;
+-#else
+- templ.direct.alpha = 24;
+- templ.direct.red = 16;
+- templ.direct.green = 8;
+- templ.direct.blue = 0;
+-#endif
++ if (XImageByteOrder(fl_display) == MSBFirst) {
++ templ.direct.alpha = 0;
++ templ.direct.red = 8;
++ templ.direct.green = 16;
++ templ.direct.blue = 24;
++ } else {
++ templ.direct.alpha = 24;
++ templ.direct.red = 16;
++ templ.direct.green = 8;
++ templ.direct.blue = 0;
++ }
+ templ.direct.alphaMask = 0xff;
+ templ.direct.redMask = 0xff;
+ templ.direct.greenMask = 0xff;
+--
+2.30.2
+
diff -Nru tigervnc-1.11.0+dfsg/debian/patches/series tigervnc-1.11.0+dfsg/debian/patches/series
--- tigervnc-1.11.0+dfsg/debian/patches/series 2021-03-22 13:59:06.000000000 +0100
+++ tigervnc-1.11.0+dfsg/debian/patches/series 2022-01-26 18:58:47.000000000 +0100
@@ -12,6 +12,8 @@
0220-remove-systemd-service-obsolete-syslog-target.patch
0300-fix-Xtigervnc-boolparam-parsing.patch
+backport/0001-Update-Surface_X11.cxx.patch
+
# These patches are lifted from RedHat
rh/0904-Added-RH-patch-tigervnc11-rh588342.patch-which-fixes.patch
# These patches are lifted from RHEL 7.4 (tigervnc-1.8.0-2.el7_4.src.rpm)
-------------- next part --------------
A non-text attachment was scrubbed...
Name: OpenPGP_signature
Type: application/pgp-signature
Size: 840 bytes
Desc: OpenPGP digital signature
URL: <http://alioth-lists.debian.net/pipermail/pkg-tigervnc-devel/attachments/20220126/dfcb8b10/attachment-0001.sig>
More information about the Pkg-tigervnc-devel
mailing list