commit vncmanager for openSUSE:Factory

2020-09-02 Thread root
Hello community,

here is the log from the commit of package vncmanager for openSUSE:Factory 
checked in at 2020-09-03 01:18:36

Comparing /work/SRC/openSUSE:Factory/vncmanager (Old)
 and  /work/SRC/openSUSE:Factory/.vncmanager.new.3399 (New)


Package is "vncmanager"

Thu Sep  3 01:18:36 2020 rev:12 rq:831454 version:1.0.2

Changes:

--- /work/SRC/openSUSE:Factory/vncmanager/vncmanager.changes2020-07-09 
17:44:32.756588378 +0200
+++ /work/SRC/openSUSE:Factory/.vncmanager.new.3399/vncmanager.changes  
2020-09-03 01:19:15.588583201 +0200
@@ -1,0 +2,6 @@
+Wed Sep  2 11:58:04 UTC 2020 - Dominique Leuenberger 
+
+- Update n_use_with_vnc_key_wrapper.patch: use libexecdir as the
+  path to with-vnc-key.sh (boo#1176064).
+
+---



Other differences:
--
++ vncmanager.spec ++
--- /var/tmp/diff_new_pack.4q9Wwu/_old  2020-09-03 01:19:17.104583759 +0200
+++ /var/tmp/diff_new_pack.4q9Wwu/_new  2020-09-03 01:19:17.108583760 +0200
@@ -105,6 +105,7 @@
 
 %files
 %defattr(-,root,root)
+%license LICENSE
 %doc vncmanager.conf README.md
 %{_bindir}/vncmanager
 %{_unitdir}/vncmanager.service
@@ -112,6 +113,5 @@
 %dir %attr(0755,%{vncuser},%{vncuser}) %{_sysconfdir}/vnc
 /usr/lib/tmpfiles.d/%{name}.conf
 %ghost %dir /run/vncmanager
-%doc LICENSE
 
 %changelog

++ n_use_with_vnc_key_wrapper.patch ++
--- /var/tmp/diff_new_pack.4q9Wwu/_old  2020-09-03 01:19:17.148583775 +0200
+++ /var/tmp/diff_new_pack.4q9Wwu/_new  2020-09-03 01:19:17.148583775 +0200
@@ -8,7 +8,7 @@
  [Service]
  User=vnc
 -ExecStart=@CMAKE_INSTALL_FULL_BINDIR@/vncmanager
-+ExecStart=/usr/lib/vnc/with-vnc-key.sh @CMAKE_INSTALL_FULL_BINDIR@/vncmanager
++ExecStart=@CMAKE_INSTALL_FULL_LIBEXECDIR@/vnc/with-vnc-key.sh 
@CMAKE_INSTALL_FULL_BINDIR@/vncmanager
  
  [Install]
  WantedBy=multi-user.target




commit vncmanager for openSUSE:Factory

2020-07-09 Thread root
Hello community,

here is the log from the commit of package vncmanager for openSUSE:Factory 
checked in at 2020-07-09 17:44:30

Comparing /work/SRC/openSUSE:Factory/vncmanager (Old)
 and  /work/SRC/openSUSE:Factory/.vncmanager.new.3060 (New)


Package is "vncmanager"

Thu Jul  9 17:44:30 2020 rev:11 rq:819750 version:1.0.2

Changes:

--- /work/SRC/openSUSE:Factory/vncmanager/vncmanager.changes2020-07-07 
12:59:42.842008784 +0200
+++ /work/SRC/openSUSE:Factory/.vncmanager.new.3060/vncmanager.changes  
2020-07-09 17:44:32.756588378 +0200
@@ -1,0 +2,7 @@
+Thu Jul  9 14:33:21 UTC 2020 - Stefan Dirsch 
+
+- n_use_port_5901.patch
+  * changed port number also in code, which sets the default, not
+only in config file (boo#1173047)
+
+---



Other differences:
--
++ n_use_port_5901.patch ++
--- /var/tmp/diff_new_pack.t7FrKr/_old  2020-07-09 17:44:33.420590480 +0200
+++ /var/tmp/diff_new_pack.t7FrKr/_new  2020-07-09 17:44:33.424590494 +0200
@@ -1,8 +1,8 @@
 Matches the default port used by tigervnc xinetd service.
-Index: vncmanager-0.9.0/vncmanager.conf
+Index: vncmanager-1.0.2/vncmanager.conf
 ===
 vncmanager-0.9.0.orig/vncmanager.conf
-+++ vncmanager-0.9.0/vncmanager.conf
+--- vncmanager-1.0.2.orig/vncmanager.conf
 vncmanager-1.0.2/vncmanager.conf
 @@ -6,8 +6,8 @@
  
  # Port ot listen on.
@@ -14,3 +14,16 @@
  
  # VNC security types.
  # Comma separated list of allowed types. Order determines priority - VNC 
clients normally choose the first type they support.
+Index: vncmanager-1.0.2/Configuration.cpp
+===
+--- vncmanager-1.0.2.orig/Configuration.cpp
 vncmanager-1.0.2/Configuration.cpp
+@@ -78,7 +78,7 @@ bool Configuration::parse(int argc, char
+ po::options_description general("General");
+ general.add_options()
+ ("listen", po::value>()->multitoken(), 
"addresses to bind to")
+-("port",   po::value()->default_value("5900"), "tcp port 
to listen on")
++("port",   po::value()->default_value("5901"), "tcp port 
to listen on")
+ 
+ ("security", 
po::value()->default_value(defaultSecurity, 
defaultSecurityTxt), "list of VNC security types separated by commas, ordered 
by priority")
+ 




commit vncmanager for openSUSE:Factory

2020-07-07 Thread root
Hello community,

here is the log from the commit of package vncmanager for openSUSE:Factory 
checked in at 2020-07-07 12:58:55

Comparing /work/SRC/openSUSE:Factory/vncmanager (Old)
 and  /work/SRC/openSUSE:Factory/.vncmanager.new.3060 (New)


Package is "vncmanager"

Tue Jul  7 12:58:55 2020 rev:10 rq:819018 version:1.0.2

Changes:

--- /work/SRC/openSUSE:Factory/vncmanager/vncmanager.changes2020-05-26 
17:20:05.556074419 +0200
+++ /work/SRC/openSUSE:Factory/.vncmanager.new.3060/vncmanager.changes  
2020-07-07 12:59:42.842008784 +0200
@@ -1,0 +2,9 @@
+Mon Jul  6 14:03:37 UTC 2020 - Stefan Dirsch 
+
+- added n_UsrEtc.patch (boo#1173047)
+  * no longer install vncmanager.conf sample as config file
+  * added description of how to make use of vncmanager.conf sample
+to README.md
+- added README.md as %doc (boo#1173047)
+
+---

New:

  n_UsrEtc.patch



Other differences:
--
++ vncmanager.spec ++
--- /var/tmp/diff_new_pack.EHLqTw/_old  2020-07-07 12:59:44.654014696 +0200
+++ /var/tmp/diff_new_pack.EHLqTw/_new  2020-07-07 12:59:44.658014709 +0200
@@ -56,6 +56,7 @@
 Patch7: u_Fix_tight_decoder_on_888_encodings.patch
 Patch8: u_Fix-PixelFormat-ntoh-and-PixelFormat-hton.patch
 Patch9: u_Fix-TightCompressionControl-definition-for-big-endian.patch
+Patch10:n_UsrEtc.patch
 
 %description
 Session manager for VNC. It listens on VNC port and spawns Xvnc processes for 
incoming clients.
@@ -84,6 +85,7 @@
 %patch7 -p1
 %patch8 -p1
 %patch9 -p1
+%patch10 -p1
 
 %build
 %cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_VERBOSE_MAKEFILE=ON
@@ -91,6 +93,7 @@
 
 %install
 %cmake_install
+mkdir -p %{buildroot}/etc/vnc
 
 # tmpfiles
 install -d -m 0755 %{buildroot}/usr/lib/tmpfiles.d/
@@ -102,11 +105,11 @@
 
 %files
 %defattr(-,root,root)
+%doc vncmanager.conf README.md
 %{_bindir}/vncmanager
 %{_unitdir}/vncmanager.service
 %{_sbindir}/rcvncmanager
 %dir %attr(0755,%{vncuser},%{vncuser}) %{_sysconfdir}/vnc
-%config(noreplace) %{_sysconfdir}/vnc/vncmanager.conf
 /usr/lib/tmpfiles.d/%{name}.conf
 %ghost %dir /run/vncmanager
 %doc LICENSE

++ n_UsrEtc.patch ++
diff -u -p vncmanager-1.0.2.orig/CMakeLists.txt vncmanager-1.0.2/CMakeLists.txt
--- vncmanager-1.0.2.orig/CMakeLists.txt2020-07-06 15:52:37.434334000 
+0200
+++ vncmanager-1.0.2/CMakeLists.txt 2020-07-06 17:15:43.348893000 +0200
@@ -56,5 +56,3 @@ if(SYSTEMD_FOUND)
 configure_file("${CMAKE_CURRENT_SOURCE_DIR}/vncmanager.service.in" 
"${CMAKE_CURRENT_BINARY_DIR}/vncmanager.service")
 install(FILES "${CMAKE_CURRENT_BINARY_DIR}/vncmanager.service" DESTINATION 
"${SYSTEMD_SYSTEM_UNIT_DIR}")
 endif()
-
-install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/vncmanager.conf" DESTINATION 
"${SYSCONF_INSTALL_DIR}/vnc")
diff -u -p vncmanager-1.0.2.orig/README.md vncmanager-1.0.2/README.md
--- vncmanager-1.0.2.orig/README.md 2020-07-06 15:52:37.532327000 +0200
+++ vncmanager-1.0.2/README.md  2020-07-06 17:05:45.945006000 +0200
@@ -1,6 +1,10 @@
 # vncmanager
 VNC manager is a service that manages VNC sessions and directs VNC clients to 
them.
 
+Use vncmanager.conf as sample config file. Feel free to copy to /etc/vnc and 
adjust
+to your needs. The initial values in vncmanager.conf are the defaults already 
set
+thru the vncmanager code itself.
+
 TODO: Add more information.
 
 ## License



commit vncmanager for openSUSE:Factory

2020-05-26 Thread root
Hello community,

here is the log from the commit of package vncmanager for openSUSE:Factory 
checked in at 2020-05-26 17:19:47

Comparing /work/SRC/openSUSE:Factory/vncmanager (Old)
 and  /work/SRC/openSUSE:Factory/.vncmanager.new.2738 (New)


Package is "vncmanager"

Tue May 26 17:19:47 2020 rev:9 rq:807979 version:1.0.2

Changes:

--- /work/SRC/openSUSE:Factory/vncmanager/vncmanager.changes2020-01-05 
15:21:42.945577787 +0100
+++ /work/SRC/openSUSE:Factory/.vncmanager.new.2738/vncmanager.changes  
2020-05-26 17:20:05.556074419 +0200
@@ -1,0 +2,20 @@
+Thu May 21 09:59:58 UTC 2020 - Petr Tesařík 
+
+- Adjust upstream project URL.
+
+---
+Thu May 14 15:28:21 UTC 2020 - Petr Tesařík 
+
+- u_Fix-TightCompressionControl-definition-for-big-endian.patch
+  * Fix tight compression decoder on big-endian systems
+(bsc#1171344).
+
+---
+Wed May 13 03:52:02 UTC 2020 - Petr Tesařík 
+
+- u_Fix_tight_decoder_on_888_encodings.patch
+  * Fix tight decoder with 888 pixel encodings. (bsc#1169732)
+- u_Fix-PixelFormat-ntoh-and-PixelFormat-hton.patch
+  * Fix PixelFormat::ntoh() and PixelFormat::hton(). (bsc#1169732)
+
+---

New:

  u_Fix-PixelFormat-ntoh-and-PixelFormat-hton.patch
  u_Fix-TightCompressionControl-definition-for-big-endian.patch
  u_Fix_tight_decoder_on_888_encodings.patch



Other differences:
--
++ vncmanager.spec ++
--- /var/tmp/diff_new_pack.KZL4hk/_old  2020-05-26 17:20:06.984077489 +0200
+++ /var/tmp/diff_new_pack.KZL4hk/_new  2020-05-26 17:20:06.988077498 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package vncmanager
 #
-# Copyright (c) 2019 SUSE LLC
+# Copyright (c) 2020 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -40,7 +40,7 @@
 Requires:   xorg-x11-Xvnc:/usr/lib/vnc/with-vnc-key.sh
 Recommends: vncmanager-controller
 
-URL:https://github.com/michalsrb/vncmanager
+URL:https://github.com/openSUSE/vncmanager
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 Summary:Session manager for VNC
 License:MIT
@@ -53,6 +53,9 @@
 Patch4: n_disable_mit_shm.patch
 Patch5: U_ControllerConnection-Split-iostream-into-istream-and.patch
 Patch6: n_vncmanager-add-target-to-service.patch
+Patch7: u_Fix_tight_decoder_on_888_encodings.patch
+Patch8: u_Fix-PixelFormat-ntoh-and-PixelFormat-hton.patch
+Patch9: u_Fix-TightCompressionControl-definition-for-big-endian.patch
 
 %description
 Session manager for VNC. It listens on VNC port and spawns Xvnc processes for 
incoming clients.
@@ -78,6 +81,9 @@
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
+%patch7 -p1
+%patch8 -p1
+%patch9 -p1
 
 %build
 %cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_VERBOSE_MAKEFILE=ON

++ u_Fix-PixelFormat-ntoh-and-PixelFormat-hton.patch ++
From: Petr Tesarik 
Date: Tue, 12 May 2020 08:55:28 +0200
Subject: Fix PixelFormat::ntoh() and PixelFormat::hton()
References: bsc#1169732
Upstream: merged
Git-commit: 4626045b79011be2c0df8f8aa0e541ca9649f4ce

The bigEndianFlag corresponds to the X server pixel byte
order (defined as IMAGE_BYTE_ORDER in X.org sources). If it does
not match client byte order, every pixel value must be
byte-swapped.

It's wrong to skip byte conversion of the red/gren/blue max values
in struct PixelFormat itself when this flag is false. RFC6143 is
very clear on this matter and explicitly states:

> Note the -max values are always in big endian order.

Signed-off-by: Petr Tesarik 
---
 rfb.h | 12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/rfb.h b/rfb.h
index 949bed0..4c2e658 100644
--- a/rfb.h
+++ b/rfb.h
@@ -114,15 +114,15 @@ struct PixelFormat {
 uint8_t _padding[3] = { 0, 0, 0 };
 
 void ntoh() {
-if (bigEndianFlag) {
-redMax = ntohs(redMax);
-greenMax = ntohs(greenMax);
-blueMax = ntohs(blueMax);
-}
+   redMax = ntohs(redMax);
+   greenMax = ntohs(greenMax);
+   blueMax = ntohs(blueMax);
 }
 
 void hton() {
-bigEndianFlag = (__BYTE_ORDER == __BIG_ENDIAN);
+   redMax = htons(redMax);
+   greenMax = htons(greenMax);
+   blueMax = htons(blueMax);
 }
 
 bool operator==(const PixelFormat ) const {
-- 
2.16.4

++ u_Fix-TightCompressionControl-definition-for-big-endian.patch ++
From: Petr Tesarik 
Date: Thu, 14 May 2020 17:23:21 +0200
Subject: Fix TightCompressionControl definition for big-endian
References: bsc#1171344

commit vncmanager for openSUSE:Factory

2020-01-05 Thread root
Hello community,

here is the log from the commit of package vncmanager for openSUSE:Factory 
checked in at 2020-01-05 15:21:30

Comparing /work/SRC/openSUSE:Factory/vncmanager (Old)
 and  /work/SRC/openSUSE:Factory/.vncmanager.new.6675 (New)


Package is "vncmanager"

Sun Jan  5 15:21:30 2020 rev:8 rq:760839 version:1.0.2

Changes:

--- /work/SRC/openSUSE:Factory/vncmanager/vncmanager.changes2018-08-07 
09:43:22.969341841 +0200
+++ /work/SRC/openSUSE:Factory/.vncmanager.new.6675/vncmanager.changes  
2020-01-05 15:21:42.945577787 +0100
@@ -1,0 +2,6 @@
+Thu Dec 19 14:51:36 UTC 2019 - Dominique Leuenberger 
+
+- BuildRequire pkgconfig(libsystemd) instead of systemd-devel:
+  Allow OBS to shortcut through the -mini flavors.
+
+---



Other differences:
--
++ vncmanager.spec ++
--- /var/tmp/diff_new_pack.D6euiZ/_old  2020-01-05 15:21:44.233578434 +0100
+++ /var/tmp/diff_new_pack.D6euiZ/_new  2020-01-05 15:21:44.257578446 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package vncmanager
 #
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -12,7 +12,7 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
 
 
@@ -32,15 +32,15 @@
 BuildRequires:  gcc-c++
 BuildRequires:  libgnutls-devel
 BuildRequires:  pkg-config
-BuildRequires:  systemd-devel
 BuildRequires:  systemd-rpm-macros
+BuildRequires:  pkgconfig(libsystemd)
 Requires(post): xorg-x11-Xvnc
 Requires:   vncmanager-greeter
 Requires:   xorg-x11-Xvnc
 Requires:   xorg-x11-Xvnc:/usr/lib/vnc/with-vnc-key.sh
 Recommends: vncmanager-controller
 
-Url:https://github.com/michalsrb/vncmanager
+URL:https://github.com/michalsrb/vncmanager
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 Summary:Session manager for VNC
 License:MIT




commit vncmanager for openSUSE:Factory

2018-08-07 Thread root
Hello community,

here is the log from the commit of package vncmanager for openSUSE:Factory 
checked in at 2018-08-07 09:43:20

Comparing /work/SRC/openSUSE:Factory/vncmanager (Old)
 and  /work/SRC/openSUSE:Factory/.vncmanager.new (New)


Package is "vncmanager"

Tue Aug  7 09:43:20 2018 rev:7 rq:627669 version:1.0.2

Changes:

--- /work/SRC/openSUSE:Factory/vncmanager/vncmanager.changes2018-02-15 
19:31:37.358512988 +0100
+++ /work/SRC/openSUSE:Factory/.vncmanager.new/vncmanager.changes   
2018-08-07 09:43:22.969341841 +0200
@@ -1,0 +2,7 @@
+Mon Aug  6 12:22:52 UTC 2018 - m...@suse.com
+
+- n_vncmanager-add-target-to-service.patch
+  * Declare the service as part of xvnc.target so it can be used as
+dependency for xvnc-novnc.service. (bnc#1103552)
+
+---

New:

  n_vncmanager-add-target-to-service.patch



Other differences:
--
++ vncmanager.spec ++
--- /var/tmp/diff_new_pack.bKhVmr/_old  2018-08-07 09:43:23.725343157 +0200
+++ /var/tmp/diff_new_pack.bKhVmr/_new  2018-08-07 09:43:23.729343164 +0200
@@ -52,6 +52,7 @@
 Patch3: U_Add-xvnc-args-configuration-option.patch
 Patch4: n_disable_mit_shm.patch
 Patch5: U_ControllerConnection-Split-iostream-into-istream-and.patch
+Patch6: n_vncmanager-add-target-to-service.patch
 
 %description
 Session manager for VNC. It listens on VNC port and spawns Xvnc processes for 
incoming clients.
@@ -76,6 +77,7 @@
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
 
 %build
 %cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_VERBOSE_MAKEFILE=ON

++ n_vncmanager-add-target-to-service.patch ++
Index: vncmanager-1.0.2/vncmanager.service.in
===
--- vncmanager-1.0.2.orig/vncmanager.service.in
+++ vncmanager-1.0.2/vncmanager.service.in
@@ -1,6 +1,8 @@
 [Unit]
 Description=VNC manager
 After=network.target
+Before=xvnc.target
+Wants=xvnc.target
 
 [Service]
 User=vnc



commit vncmanager for openSUSE:Factory

2018-02-15 Thread root
Hello community,

here is the log from the commit of package vncmanager for openSUSE:Factory 
checked in at 2018-02-15 19:31:36

Comparing /work/SRC/openSUSE:Factory/vncmanager (Old)
 and  /work/SRC/openSUSE:Factory/.vncmanager.new (New)


Package is "vncmanager"

Thu Feb 15 19:31:36 2018 rev:6 rq:577032 version:1.0.2

Changes:

--- /work/SRC/openSUSE:Factory/vncmanager/vncmanager.changes2017-08-12 
20:28:19.322614604 +0200
+++ /work/SRC/openSUSE:Factory/.vncmanager.new/vncmanager.changes   
2018-02-15 19:31:37.358512988 +0100
@@ -1,0 +2,6 @@
+Thu Feb 15 13:42:56 UTC 2018 - m...@suse.com
+
+- U_ControllerConnection-Split-iostream-into-istream-and.patch
+  * Do not try to seek on unix socket. (bnc#1076730)
+
+---

New:

  U_ControllerConnection-Split-iostream-into-istream-and.patch



Other differences:
--
++ vncmanager.spec ++
--- /var/tmp/diff_new_pack.B7a9PR/_old  2018-02-15 19:31:38.274480113 +0100
+++ /var/tmp/diff_new_pack.B7a9PR/_new  2018-02-15 19:31:38.278479969 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package vncmanager
 #
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -51,6 +51,7 @@
 Patch2: n_use_with_vnc_key_wrapper.patch
 Patch3: U_Add-xvnc-args-configuration-option.patch
 Patch4: n_disable_mit_shm.patch
+Patch5: U_ControllerConnection-Split-iostream-into-istream-and.patch
 
 %description
 Session manager for VNC. It listens on VNC port and spawns Xvnc processes for 
incoming clients.
@@ -74,6 +75,7 @@
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 
 %build
 %cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_VERBOSE_MAKEFILE=ON

++ U_ControllerConnection-Split-iostream-into-istream-and.patch ++
>From 4bef799592eab400b0e050988ff61fa21935d86c Mon Sep 17 00:00:00 2001
From: Michal Srb 
Date: Thu, 15 Feb 2018 14:38:04 +0100
Subject: [PATCH] ControllerConnection: Split iostream into istream and
 ostream.

The boost::iostreams::file_descriptor is seekable by default, but seeking is
not possible on unix socket. Unfortunatelly there does not seem to be a way to
turn it into (non seekable) bidirectional, so lets split it into separate input
and output.
---
 ControllerConnection.cpp | 24 +---
 ControllerConnection.h   |  7 +--
 2 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/ControllerConnection.cpp b/ControllerConnection.cpp
index 17822e6..a1b4739 100644
--- a/ControllerConnection.cpp
+++ b/ControllerConnection.cpp
@@ -38,8 +38,10 @@
 ControllerConnection::ControllerConnection(XvncManager , int fd)
 : m_vncManager(vncManager)
 , m_fd(fd)
-, m_controllerStreamBuffer(boost::iostreams::file_descriptor(fd, 
boost::iostreams::close_handle))
-, m_controllerStream(_controllerStreamBuffer)
+, m_controllerStreamBufferIn(boost::iostreams::file_descriptor(fd, 
boost::iostreams::close_handle))
+, m_controllerStreamBufferOut(boost::iostreams::file_descriptor(fd, 
boost::iostreams::never_close_handle))
+, m_controllerStreamIn(_controllerStreamBufferIn)
+, m_controllerStreamOut(_controllerStreamBufferOut)
 {}
 
 void ControllerConnection::start()
@@ -48,7 +50,7 @@ void ControllerConnection::start()
 
 try {
 if (initialize()) {
-while (m_controllerStream.good()) {
+while (m_controllerStreamIn.good()) {
 receive();
 }
 }
@@ -64,19 +66,19 @@ void ControllerConnection::start()
 bool ControllerConnection::initialize()
 {
 int displayNumber;
-m_controllerStream >> displayNumber;
+m_controllerStreamIn >> displayNumber;
 
 m_xvnc = m_vncManager.getSessionByDisplayNumber(displayNumber);
 if (m_xvnc) {
-m_controllerStream << "OK" << std::endl;
-m_controllerStream.flush();
+m_controllerStreamOut << "OK" << std::endl;
+m_controllerStreamOut.flush();
 } else {
 Log::notice() << "Controller " << (intptr_t)this << " asked for 
display number " << displayNumber << " which is not managed by vncmanager." << 
std::endl;
 return false;
 }
 
 std::string key;
-m_controllerStream >> key;
+m_controllerStreamIn >> key;
 
 for (int tries = 0; ; tries++) {
 if (m_xvnc->isKeyApproved(key)) {
@@ -91,8 +93,8 @@ bool ControllerConnection::initialize()
 std::this_thread::sleep_for(std::chrono::milliseconds(100)); // TODO: 
Tune
 }
 
-m_controllerStream << "OK" << std::endl;
-

commit vncmanager for openSUSE:Factory

2017-08-12 Thread root
Hello community,

here is the log from the commit of package vncmanager for openSUSE:Factory 
checked in at 2017-08-12 20:28:14

Comparing /work/SRC/openSUSE:Factory/vncmanager (Old)
 and  /work/SRC/openSUSE:Factory/.vncmanager.new (New)


Package is "vncmanager"

Sat Aug 12 20:28:14 2017 rev:5 rq:516143 version:1.0.2

Changes:

--- /work/SRC/openSUSE:Factory/vncmanager/vncmanager.changes2017-05-22 
18:09:49.370231542 +0200
+++ /work/SRC/openSUSE:Factory/.vncmanager.new/vncmanager.changes   
2017-08-12 20:28:19.322614604 +0200
@@ -1,0 +2,8 @@
+Fri Aug 11 13:03:26 UTC 2017 - m...@suse.com
+
+- U_Add-xvnc-args-configuration-option.patch,
+  n_disable_mit_shm.patch
+  * Disable MIT-SHM extension in Xvnc started by vncmanager.
+(bnc#1053373)
+
+---

New:

  U_Add-xvnc-args-configuration-option.patch
  n_disable_mit_shm.patch



Other differences:
--
++ vncmanager.spec ++
--- /var/tmp/diff_new_pack.tVOLv7/_old  2017-08-12 20:28:20.166496310 +0200
+++ /var/tmp/diff_new_pack.tVOLv7/_new  2017-08-12 20:28:20.186493507 +0200
@@ -49,6 +49,8 @@
 Source1:tmpfile.conf
 Patch1: n_use_port_5901.patch
 Patch2: n_use_with_vnc_key_wrapper.patch
+Patch3: U_Add-xvnc-args-configuration-option.patch
+Patch4: n_disable_mit_shm.patch
 
 %description
 Session manager for VNC. It listens on VNC port and spawns Xvnc processes for 
incoming clients.
@@ -70,6 +72,8 @@
 %setup
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
+%patch4 -p1
 
 %build
 %cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_VERBOSE_MAKEFILE=ON

++ U_Add-xvnc-args-configuration-option.patch ++
>From 3bd1a087aa604545f8400bcdc1df37a00d7a4aa4 Mon Sep 17 00:00:00 2001
From: Michal Srb 
Date: Fri, 11 Aug 2017 14:58:33 +0200
Subject: [PATCH] Add xvnc-args configuration option.

It allows passing additional arguments to Xvnc.
---
 Configuration.cpp | 20 +++-
 Configuration.h   |  7 +++
 Xvnc.cpp  |  9 +
 vncmanager.conf   |  6 ++
 4 files changed, 41 insertions(+), 1 deletion(-)

diff --git a/Configuration.cpp b/Configuration.cpp
index 9d7f932..10f3f1f 100644
--- a/Configuration.cpp
+++ b/Configuration.cpp
@@ -64,6 +64,22 @@ static void validate(boost::any , std::vector 
const , VeNC
 throw po::invalid_option_value("No security type configured.");
 }
 
+static void validate(boost::any , std::vector const , 
XvncArgList *target_type, int /* boost template trickery */)
+{
+if (v.empty())
+v = boost::any(XvncArgList());
+
+XvncArgList *p = boost::any_cast();
+
+boost::escaped_list_separator sep('\\', ' ', '\"');
+for (const std::string & token : tokens) {
+boost::tokenizer tok(token, sep);
+for (auto str : tok) {
+p->values.push_back(str);
+}
+}
+}
+
 bool Configuration::parse(int argc, char *argv[], const char *config)
 {
 VeNCryptSubtypesList defaultSecurity = { VeNCryptSubtype::TLSNone, 
VeNCryptSubtype::X509None, VeNCryptSubtype::None };
@@ -92,7 +108,9 @@ bool Configuration::parse(int argc, char *argv[], const char 
*config)
 ("xvnc",po::value()->default_value("/usr/bin/Xvnc"),  
 "path to Xvnc executable")
 ("greeter", 
po::value()->default_value("/usr/bin/vncmanager-greeter"), "path 
to Greeter executable")
 ("xauth",   po::value()->default_value("/usr/bin/xauth"), 
 "path to xauth executable")
-("rundir",  
po::value()->default_value("/run/vncmanager"), "path 
to run directory");
+("rundir",  
po::value()->default_value("/run/vncmanager"), "path 
to run directory")
+
+("xvnc-args", po::value()->multitoken(), "Additional 
arguments that will be passed to Xvnc. Take care to not overwrite arguments set 
by vncmanager.");
 
 po::options_description tls("TLS");
 tls.add_options()
diff --git a/Configuration.h b/Configuration.h
index 59cc46d..ca7d167 100644
--- a/Configuration.h
+++ b/Configuration.h
@@ -29,6 +29,13 @@
 
 #include 
 
+
+/// Wrapper struct to allow custom parsing
+struct XvncArgList
+{
+std::vector values;
+};
+
 class Configuration
 {
 public:
diff --git a/Xvnc.cpp b/Xvnc.cpp
index d8709cc..4c26c68 100644
--- a/Xvnc.cpp
+++ b/Xvnc.cpp
@@ -246,6 +246,15 @@ void Xvnc::execute(bool queryDisplayManager)
 argv.push_back("-desktop");
 argv.push_back("VNC manager");
 }
+
+XvncArgList xvnc_args;
+if (!Configuration::options["xvnc-args"].empty()) {
+xvnc_args = Configuration::options["xvnc-args"].as();
+}
+for (auto _arg : xvnc_args.values) {
+ 

commit vncmanager for openSUSE:Factory

2017-05-22 Thread root
Hello community,

here is the log from the commit of package vncmanager for openSUSE:Factory 
checked in at 2017-05-22 18:09:48

Comparing /work/SRC/openSUSE:Factory/vncmanager (Old)
 and  /work/SRC/openSUSE:Factory/.vncmanager.new (New)


Package is "vncmanager"

Mon May 22 18:09:48 2017 rev:4 rq:497298 version:1.0.2

Changes:

--- /work/SRC/openSUSE:Factory/vncmanager/vncmanager.changes2017-03-02 
19:29:07.205394605 +0100
+++ /work/SRC/openSUSE:Factory/.vncmanager.new/vncmanager.changes   
2017-05-22 18:09:49.370231542 +0200
@@ -1,0 +2,7 @@
+Mon May 22 11:14:10 UTC 2017 - m...@suse.com
+
+- Update to 1.0.2
+  * Fix crash when client disconnects during of TLS negotiation
+  * Add geometry parameter (bnc#1038851)
+
+---

Old:

  vncmanager-1.0.1.tar.gz

New:

  vncmanager-1.0.2.tar.gz



Other differences:
--
++ vncmanager.spec ++
--- /var/tmp/diff_new_pack.6wmPHP/_old  2017-05-22 18:09:49.950149797 +0200
+++ /var/tmp/diff_new_pack.6wmPHP/_new  2017-05-22 18:09:49.954149232 +0200
@@ -20,7 +20,7 @@
 %define vncuser vnc
 
 Name:   vncmanager
-Version:1.0.1
+Version:1.0.2
 Release:0
 %if 0%{?suse_version} > 1325
 BuildRequires:  libboost_iostreams-devel

++ vncmanager-1.0.1.tar.gz -> vncmanager-1.0.2.tar.gz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/vncmanager-1.0.1/Configuration.cpp 
new/vncmanager-1.0.2/Configuration.cpp
--- old/vncmanager-1.0.1/Configuration.cpp  2016-06-16 12:30:02.0 
+0200
+++ new/vncmanager-1.0.2/Configuration.cpp  2017-05-22 13:10:53.0 
+0200
@@ -87,6 +87,8 @@
 
 ("query", po::value()->default_value("localhost"), 
"Address of XDMCP server that Xvnc should query.")
 
+("geometry", po::value()->default_value("1024x768"), 
"x The value of geometry parameter given to Xvnc. Sets the 
initial resolution.")
+
 ("xvnc",po::value()->default_value("/usr/bin/Xvnc"),  
 "path to Xvnc executable")
 ("greeter", 
po::value()->default_value("/usr/bin/vncmanager-greeter"), "path 
to Greeter executable")
 ("xauth",   po::value()->default_value("/usr/bin/xauth"), 
 "path to xauth executable")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/vncmanager-1.0.1/Xvnc.cpp 
new/vncmanager-1.0.2/Xvnc.cpp
--- old/vncmanager-1.0.1/Xvnc.cpp   2016-06-16 12:30:02.0 +0200
+++ new/vncmanager-1.0.2/Xvnc.cpp   2017-05-22 13:10:53.0 +0200
@@ -225,6 +225,7 @@
 "-MaxDisconnectionTime=5",
 "-securitytypes=none",
 "-displayfd", displayNumberPipeText.c_str(),
+"-geometry", 
Configuration::options["geometry"].as().c_str(),
 "-AllowOverride="
 // These parameters are normally allowed by default
 "Desktop,AcceptPointerEvents,SendCutText,AcceptCutText,"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/vncmanager-1.0.1/helper.h 
new/vncmanager-1.0.2/helper.h
--- old/vncmanager-1.0.1/helper.h   2016-06-16 12:30:02.0 +0200
+++ new/vncmanager-1.0.2/helper.h   2017-05-22 13:10:53.0 +0200
@@ -61,7 +61,12 @@
 /**
  * EOF for Stream.
  */
-class eof_exception : std::exception {}; // TODO: Move/change?
+class eof_exception : public std::exception {
+public:
+virtual const char* what() const noexcept {
+return "EOF";
+}
+};
 
 /**
  * Helper class that can be used to assure closing of file descriptor on scope 
exit.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/vncmanager-1.0.1/vncmanager.conf 
new/vncmanager-1.0.2/vncmanager.conf
--- old/vncmanager-1.0.1/vncmanager.conf2016-06-16 12:30:02.0 
+0200
+++ new/vncmanager-1.0.2/vncmanager.conf2017-05-22 13:10:53.0 
+0200
@@ -64,6 +64,11 @@
 #
 # query = localhost
 
+# The value of geometry parameter given to Xvnc. Sets the initial resolution.
+# Default: 1024x768
+#
+# geometry = 1024x768
+
 # Path to Xvnc executable
 # Default: /usr/bin/Xvnc
 #




commit vncmanager for openSUSE:Factory

2017-03-02 Thread root
Hello community,

here is the log from the commit of package vncmanager for openSUSE:Factory 
checked in at 2017-03-02 19:29:02

Comparing /work/SRC/openSUSE:Factory/vncmanager (Old)
 and  /work/SRC/openSUSE:Factory/.vncmanager.new (New)


Package is "vncmanager"

Thu Mar  2 19:29:02 2017 rev:3 rq:460045 version:1.0.1

Changes:

--- /work/SRC/openSUSE:Factory/vncmanager/vncmanager.changes2016-06-29 
15:01:32.0 +0200
+++ /work/SRC/openSUSE:Factory/.vncmanager.new/vncmanager.changes   
2017-03-02 19:29:07.205394605 +0100
@@ -1,0 +2,5 @@
+Thu Feb  2 15:32:25 UTC 2017 - adam.ma...@suse.de
+
+- use individual libboost-*-devel packages instead of boost-devel
+
+---



Other differences:
--
++ vncmanager.spec ++
--- /var/tmp/diff_new_pack.UvgCnO/_old  2017-03-02 19:29:07.813308568 +0100
+++ /var/tmp/diff_new_pack.UvgCnO/_new  2017-03-02 19:29:07.813308568 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package vncmanager
 #
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -22,7 +22,12 @@
 Name:   vncmanager
 Version:1.0.1
 Release:0
+%if 0%{?suse_version} > 1325
+BuildRequires:  libboost_iostreams-devel
+BuildRequires:  libboost_program_options-devel
+%else
 BuildRequires:  boost-devel
+%endif
 BuildRequires:  cmake
 BuildRequires:  gcc-c++
 BuildRequires:  libgnutls-devel




commit vncmanager for openSUSE:Factory

2016-06-29 Thread h_root
Hello community,

here is the log from the commit of package vncmanager for openSUSE:Factory 
checked in at 2016-06-29 15:01:31

Comparing /work/SRC/openSUSE:Factory/vncmanager (Old)
 and  /work/SRC/openSUSE:Factory/.vncmanager.new (New)


Package is "vncmanager"

Changes:

--- /work/SRC/openSUSE:Factory/vncmanager/vncmanager.changes2016-06-11 
00:00:50.0 +0200
+++ /work/SRC/openSUSE:Factory/.vncmanager.new/vncmanager.changes   
2016-06-29 15:01:32.0 +0200
@@ -1,0 +2,10 @@
+Thu Jun 16 12:07:33 UTC 2016 - m...@suse.com
+
+- Update to 1.0.1
+  * Fix build with gcc 6, fix licence link in README. (bnc#985002)
+- Add dependency on xorg-x11-Xvnc. (bnc#984461)
+- Add n_use_with_vnc_key_wrapper.patch
+  * Use with-vnc-key.sh wrapper to generate VNC key and certificate
+on first use. (bnc#982349)
+
+---

Old:

  vncmanager-1.0.0.tar.gz

New:

  n_use_with_vnc_key_wrapper.patch
  vncmanager-1.0.1.tar.gz



Other differences:
--
++ vncmanager.spec ++
--- /var/tmp/diff_new_pack.20JEDg/_old  2016-06-29 15:01:33.0 +0200
+++ /var/tmp/diff_new_pack.20JEDg/_new  2016-06-29 15:01:33.0 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package vncmanager
 #
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -15,17 +15,24 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
+
+%define vncgroup vnc
+%define vncuser vnc
+
 Name:   vncmanager
-Version:1.0.0
+Version:1.0.1
 Release:0
-BuildRequires:  gcc-c++
+BuildRequires:  boost-devel
 BuildRequires:  cmake
+BuildRequires:  gcc-c++
 BuildRequires:  libgnutls-devel
-BuildRequires:  boost-devel
 BuildRequires:  pkg-config
 BuildRequires:  systemd-devel
 BuildRequires:  systemd-rpm-macros
+Requires(post): xorg-x11-Xvnc
 Requires:   vncmanager-greeter
+Requires:   xorg-x11-Xvnc
+Requires:   xorg-x11-Xvnc:/usr/lib/vnc/with-vnc-key.sh
 Recommends: vncmanager-controller
 
 Url:https://github.com/michalsrb/vncmanager
@@ -36,6 +43,7 @@
 Source: vncmanager-%{version}.tar.gz
 Source1:tmpfile.conf
 Patch1: n_use_port_5901.patch
+Patch2: n_use_with_vnc_key_wrapper.patch
 
 %description
 Session manager for VNC. It listens on VNC port and spawns Xvnc processes for 
incoming clients.
@@ -56,6 +64,7 @@
 %prep
 %setup
 %patch1 -p1
+%patch2 -p1
 
 %build
 %cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_VERBOSE_MAKEFILE=ON
@@ -77,7 +86,7 @@
 %{_bindir}/vncmanager
 %{_unitdir}/vncmanager.service
 %{_sbindir}/rcvncmanager
-%dir %{_sysconfdir}/vnc
+%dir %attr(0755,%{vncuser},%{vncuser}) %{_sysconfdir}/vnc
 %config(noreplace) %{_sysconfdir}/vnc/vncmanager.conf
 /usr/lib/tmpfiles.d/%{name}.conf
 %ghost %dir /run/vncmanager

++ n_use_with_vnc_key_wrapper.patch ++
Use Xvnc's with-vnc-key wrapper to create key and certificate on first use.
Index: vncmanager-1.0.1/vncmanager.service.in
===
--- vncmanager-1.0.1.orig/vncmanager.service.in
+++ vncmanager-1.0.1/vncmanager.service.in
@@ -4,7 +4,7 @@ After=network.target
 
 [Service]
 User=vnc
-ExecStart=@CMAKE_INSTALL_FULL_BINDIR@/vncmanager
+ExecStart=/usr/lib/vnc/with-vnc-key.sh @CMAKE_INSTALL_FULL_BINDIR@/vncmanager
 
 [Install]
 WantedBy=multi-user.target
++ vncmanager-1.0.0.tar.gz -> vncmanager-1.0.1.tar.gz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/vncmanager-1.0.0/README.md 
new/vncmanager-1.0.1/README.md
--- old/vncmanager-1.0.0/README.md  2016-04-27 23:16:22.0 +0200
+++ new/vncmanager-1.0.1/README.md  2016-06-16 12:30:02.0 +0200
@@ -4,4 +4,4 @@
 TODO: Add more information.
 
 ## License
-The project is open sourced under the [MIT 
license](http://www.tldrlegal.com/license/apache-license-2.0-%28apache-2.0%29).
+The project is open sourced under the [MIT 
license](https://tldrlegal.com/license/mit-license).
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/vncmanager-1.0.0/rfb.h new/vncmanager-1.0.1/rfb.h
--- old/vncmanager-1.0.0/rfb.h  2016-04-27 23:16:22.0 +0200
+++ new/vncmanager-1.0.1/rfb.h  2016-06-16 12:30:02.0 +0200
@@ -483,9 +483,9 @@
 
 enum class VeNCryptSubtype : uint32_t   // Contains only the supported subtypes
 {
-Invalid = SecurityType::Invalid,
-None = SecurityType::None,
-VncAuth = SecurityType::VncAuth,
+Invalid =