Hello community, here is the log from the commit of package x11vnc for openSUSE:Factory checked in at 2019-03-26 15:43:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/x11vnc (Old) and /work/SRC/openSUSE:Factory/.x11vnc.new.25356 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "x11vnc" Tue Mar 26 15:43:03 2019 rev:27 rq:685942 version:0.9.16 Changes: -------- --- /work/SRC/openSUSE:Factory/x11vnc/x11vnc.changes 2019-01-03 18:08:47.880024707 +0100 +++ /work/SRC/openSUSE:Factory/.x11vnc.new.25356/x11vnc.changes 2019-03-26 15:43:46.384195476 +0100 @@ -1,0 +2,54 @@ +Mon Mar 18 08:12:12 UTC 2019 - Tomáš Chvátal <[email protected]> + +- Switch to upstream download url + +------------------------------------------------------------------- +Wed Mar 13 08:30:42 UTC 2019 - Tuukka Pasanen <[email protected]> + +- Updated to version 0.9.16 which is now part of libvncserver as in + page http://www.karlrunge.com/x11vnc/ there is sentence + x11vnc is a contributed program to the LibVNCServer project at SourceForge.net or + https://github.com/LibVNC/x11vnc + + Changes: + * Build fixes. + * Misc. documentation fixes. + * Misc. buffer overflow and memleak fixes. + * Support for OpenSSL 1.1.0. + * Fix for Debian bug #672435. + * Added support for the X Composite Extension. For subwindow/appshare + modes this allows sharing the respective window/app when it + is partially or completely off-screen as XComposite renders + the window contents to an off-screen buffer. Before, updating + of the window contents would stop once it went even partially + off-screen. + * Added XInput 2 multi-pointer support which allows multiple clients + to view and control a single shared screen, all having their + own mouse pointers and keyboard foci. For in-depth info, read + http://edoc.hu-berlin.de/master/beier-christian-2011-07-19/PDF/beier.pdf, + especially section 5.1. + + Added some support for running under Wayland via the deskshot utility + found in the misc/ subdirectory. + + - miscellaneous new features and changes: + * Separated x11vnc sources from LibVNCServer. The project is now + hosted at GitHub under https://github.com/LibVNC/x11vnc/. + + * Deleted patches + - 0001-Fix-openssl-1.1.x-detection.patch this is upstreamed + - 0002-Support-openssl-1.1.0.patch this is upstreamed + - x11vnc-automake-1.13.patch this not needed anymore + - x11vnc-fix-buffer-overflow-in-record_CW.patch this is upstreamed + - x11vnc-fix-buffer-overflow-in-snapshot_stack_list.patch this is upstreamed + - x11vnc-lame-libm.diff FFMpeg/Lame has been removed + - x11vnc-lib64.diff Zlib is correctly found by configure.ac + + * Modified patches + - 10_usepkgconfig.diff + - x11vnc-examples.diff + - x11vnc-thread-auth.diff + - x11vnc.desktop.generics + - stack-check + +------------------------------------------------------------------- Old: ---- 0001-Fix-openssl-1.1.x-detection.patch 0002-Support-openssl-1.1.0.patch x11vnc-0.9.13.tar.gz x11vnc-automake-1.13.patch x11vnc-fix-buffer-overflow-in-record_CW.patch x11vnc-fix-buffer-overflow-in-snapshot_stack_list.patch x11vnc-lame-libm.diff x11vnc-lib64.diff New: ---- 0.9.16.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ x11vnc.spec ++++++ --- /var/tmp/diff_new_pack.2KFmgC/_old 2019-03-26 15:43:47.168194557 +0100 +++ /var/tmp/diff_new_pack.2KFmgC/_new 2019-03-26 15:43:47.172194552 +0100 @@ -2,7 +2,7 @@ # # spec file for package x11vnc # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 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 @@ -13,34 +13,27 @@ # 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/ # Name: x11vnc -Version: 0.9.13 +Version: 0.9.16 Release: 0 Summary: VNC Server for Real X Displays License: GPL-2.0-or-later Group: System/X11/Utilities -URL: http://www.karlrunge.com/x11vnc -Source: http://downloads.sourceforge.net/libvncserver/%{name}/%{version}/%{name}-%{version}.tar.gz +URL: https://github.com/LibVNC/x11vnc +Source: https://github.com/LibVNC/x11vnc/archive/%{version}.tar.gz Source1: %{name}-tkx11vnc.desktop Source2: x11vnc_ssh Source3: x11vnc.png Source99: %{name}-rpmlintrc -Patch1: %{name}-lib64.diff -Patch2: %{name}-lame-libm.diff -Patch3: stack-check -Patch5: x11vnc-thread-auth.diff -Patch6: x11vnc-examples.diff -Patch7: x11vnc.desktop.generics -Patch8: x11vnc-automake-1.13.patch -Patch9: x11vnc-fix-buffer-overflow-in-snapshot_stack_list.patch -Patch10: x11vnc-fix-buffer-overflow-in-record_CW.patch -Patch11: 0001-Fix-openssl-1.1.x-detection.patch -Patch12: 0002-Support-openssl-1.1.0.patch -Patch13: 10_usepkgconfig.diff +Patch1: stack-check +Patch2: x11vnc-thread-auth.diff +Patch3: x11vnc-examples.diff +Patch4: x11vnc.desktop.generics +Patch5: 10_usepkgconfig.diff BuildRequires: autoconf BuildRequires: automake BuildRequires: gcc @@ -51,9 +44,9 @@ BuildRequires: pkgconfig BuildRequires: unzip BuildRequires: update-desktop-files -BuildRequires: libmp3lame-devel BuildRequires: zlib-devel BuildRequires: pkgconfig(avahi-client) >= 0.6.4 +BuildRequires: pkgconfig(libvncserver) BuildRequires: pkgconfig(x11) BuildRequires: pkgconfig(xdamage) BuildRequires: pkgconfig(xext) @@ -98,23 +91,14 @@ %prep %setup -q -%if "%{_lib}"=="lib64" -%patch1 -%endif -%patch2 -%patch3 +%patch1 -p1 # workaround for Factory, as maintaining that patch with fuzz==0 is # too annoying (it patches files that are modified by other patches): -patch -p0 -i "%{PATCH5}" -%patch6 -%patch7 -%patch8 -p1 -%patch9 -p1 -%patch10 -p1 -%patch11 -p1 -%patch12 -p1 -%patch13 -p1 -mv x11vnc/misc x11vnc/examples +patch -p1 -i "%{PATCH2}" +%patch3 -p1 +%patch4 -p1 +%patch5 -p1 +mv misc examples %build autoreconf -fiv @@ -136,7 +120,7 @@ %install %make_install -install -m 0755 x11vnc/tkx11vnc "%{buildroot}%{_bindir}/" +install -m 0755 tkx11vnc "%{buildroot}%{_bindir}/" install -m 0755 "%{SOURCE2}" "%{buildroot}%{_bindir}/" install -D -m 0644 "%{SOURCE3}" "%{buildroot}%{_datadir}/pixmaps/x11vnc.png" install -D -m 0644 "%{SOURCE1}" "%{buildroot}%{_datadir}/applications/tkx11vnc.desktop" @@ -146,18 +130,17 @@ rm -rf "%{buildroot}%{_includedir}/rfb" -find x11vnc/examples/ -name 'Makefile*' -exec rm {} \; -find x11vnc/examples/ -type f -exec chmod 0644 {} \; +find examples -name 'Makefile*' -exec rm {} \; +find examples -type f -exec chmod 0644 {} \; %files %license COPYING -%doc AUTHORS README NEWS ChangeLog TODO -%doc x11vnc/examples +%doc AUTHORS README NEWS ChangeLog +%doc examples +%{_bindir}/Xdummy %{_bindir}/x11vnc %{_bindir}/x11vnc_ssh %{_mandir}/man1/x11vnc.1%{?ext_man} -%dir %{_datadir}/x11vnc -%{_datadir}/x11vnc/* %{_datadir}/applications/x11vnc.desktop %{_datadir}/pixmaps/x11vnc.png ++++++ x11vnc-0.9.13.tar.gz -> 0.9.16.tar.gz ++++++ ++++ 470538 lines of diff (skipped) ++++++ 10_usepkgconfig.diff ++++++ --- /var/tmp/diff_new_pack.2KFmgC/_old 2019-03-26 15:43:47.700193933 +0100 +++ /var/tmp/diff_new_pack.2KFmgC/_new 2019-03-26 15:43:47.704193929 +0100 @@ -1,24 +1,8 @@ -Description: Locate libvncserver/client with pkg-config instead of - libvncserver-config. - The latter causes unnecessary linkage. -Author: Andreas Metzler <[email protected]> -Author: Helmut Grohne <[email protected]> -Last-Update: 2016-11-17 - ---- - configure.ac | 11 ++++++----- - 1 file changed, 6 insertions(+), 5 deletions(-) - +diff --git a/configure.ac b/configure.ac +index b17beff..1659cfc 100644 --- a/configure.ac +++ b/configure.ac -@@ -17,6 +17,7 @@ AC_PROG_MAKE_SET - AC_PROG_RANLIB - AC_PATH_PROG([AR], [ar], [/usr/bin/ar], - [$PATH:/usr/ccs/bin]) -+PKG_PROG_PKG_CONFIG - - # Options - AH_TEMPLATE(WITH_TIGHTVNC_FILETRANSFER, [Disable TightVNCFileTransfer protocol]) -@@ -414,9 +415,9 @@ if test "x$with_avahi" != "xno"; then +@@ -368,9 +368,9 @@ if test "x$with_avahi" != "xno"; then AVAHI_LIBS="-L$with_avahi/lib -lavahi-common -lavahi-client" echo "using $with_avahi" with_avahi=yes @@ -31,14 +15,3 @@ with_avahi=yes echo yes else -@@ -504,8 +505,8 @@ new enough. - ========================================================================== - ]) - else -- SYSTEM_LIBVNCSERVER_CFLAGS=`libvncserver-config --cflags` -- SYSTEM_LIBVNCSERVER_LIBS="$rflag"`libvncserver-config --libs` -+ SYSTEM_LIBVNCSERVER_CFLAGS=`$PKG_CONFIG --cflags libvncserver libvncclient` -+ SYSTEM_LIBVNCSERVER_LIBS="$rflag"`$PKG_CONFIG --libs libvncserver libvncclient` - with_system_libvncserver=yes - echo yes - fi ++++++ stack-check ++++++ --- /var/tmp/diff_new_pack.2KFmgC/_old 2019-03-26 15:43:47.728193900 +0100 +++ /var/tmp/diff_new_pack.2KFmgC/_new 2019-03-26 15:43:47.728193900 +0100 @@ -1,9 +1,11 @@ ---- x11vnc/Makefile.am.orig 2010-07-23 05:37:33.000000000 +0200 -+++ x11vnc/Makefile.am 2010-08-09 21:14:42.000000000 +0200 -@@ -33,3 +33,8 @@ - INCLUDES = $(INCLUDES_LIBVNCSERVER) @X_CFLAGS@ @AVAHI_CFLAGS@ - - x11vnc_LDADD=$(LDADD) @SSL_LIBS@ @CRYPT_LIBS@ @X_LIBS@ @AVAHI_LIBS@ $(LD_CYGIPC) +diff --git a/src/Makefile.am b/src/Makefile.am +index 11168c7..12015cd 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -146,3 +146,8 @@ x11vnc_LDADD = \ + @XI2_LIBS@ \ + @CAIRO_LIBS@ \ + $(LD_CYGIPC) + +CFLAGS_avahi.c = $(CFLAGS) -fstack-protector +CFLAGS_connections.c = $(CFLAGS) -fstack-protector ++++++ x11vnc-examples.diff ++++++ --- /var/tmp/diff_new_pack.2KFmgC/_old 2019-03-26 15:43:47.736193891 +0100 +++ /var/tmp/diff_new_pack.2KFmgC/_new 2019-03-26 15:43:47.736193891 +0100 @@ -1,63 +1,21 @@ ---- x11vnc/help.c.orig 2011-10-18 22:11:23.033000420 +0200 -+++ x11vnc/help.c 2011-10-18 22:11:33.301000421 +0200 -@@ -1803,7 +1803,7 @@ - " Xdummy:\n" - "\n" - " The Xdummy wrapper is part of the x11vnc source code\n" --" (x11vnc/misc/Xdummy) It should be available in PATH\n" -+" (x11vnc/examples/Xdummy) It should be available in PATH\n" - " and have run \"Xdummy -install\" once to create the\n" - " shared library. Xdummy only works on Linux. As of\n" - " 12/2009 it no longer needs to be run as root, and the\n" ---- x11vnc/Makefile.in.orig 2011-10-18 22:10:18.218000421 +0200 -+++ x11vnc/Makefile.in 2011-10-18 22:10:21.622000420 +0200 -@@ -250,8 +250,8 @@ - @HAVE_X11_TRUE@@OSX_OPENGL_TRUE@@OSX_TRUE@GL = /System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib - @OSX_TRUE@x11vnc_LDFLAGS = $(FRAMEWORKS) - @OSX_TRUE@x11vnc_CFLAGS = -ObjC --SUBDIRS = misc --DIST_SUBDIRS = misc -+SUBDIRS = examples -+DIST_SUBDIRS = examples - desktopdir = $(datadir)/applications - desktop_DATA = x11vnc.desktop - man_MANS = x11vnc.1 ---- x11vnc/misc/turbovnc/README.orig 2011-10-18 22:11:41.278000421 +0200 -+++ x11vnc/misc/turbovnc/README 2011-10-18 22:11:47.087000419 +0200 -@@ -45,7 +45,7 @@ - - For those in a hurry: - -- cd x11vnc-x.y.z/x11vnc/misc/turbovnc -+ cd x11vnc-x.y.z/x11vnc/examples/turbovnc - ./apply_turbovnc - cd ../../.. - env LDFLAGS='-L/DIR -Xlinker --rpath=/DIR' ./configure -@@ -58,7 +58,7 @@ - ---------------------- - - After unpacking your x11vnc-x.y.z.tar.gz tarball cd to the --x11vnc-x.y.z/x11vnc/misc/turbovnc (where this README file is) and from -+x11vnc-x.y.z/x11vnc/examples/turbovnc (where this README file is) and from - that directory run: - - ./apply_turbovnc ---- x11vnc/Makefile.am.orig 2011-10-18 22:10:08.444000421 +0200 -+++ x11vnc/Makefile.am 2011-10-18 22:10:14.067000419 +0200 -@@ -17,8 +17,8 @@ - x11vnc_CFLAGS = -ObjC - endif - --SUBDIRS = misc --DIST_SUBDIRS = misc -+SUBDIRS = examples -+DIST_SUBDIRS = examples +diff --git a/Makefile.am b/Makefile.am +index 9ad698b..da1837a 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -2,7 +2,7 @@ ACLOCAL_AMFLAGS = -I m4 + + SUBDIRS = \ + src \ +- misc ++ examples desktopdir = $(datadir)/applications desktop_DATA = x11vnc.desktop ---- x11vnc/README.orig 2011-10-18 22:10:31.923000420 +0200 -+++ x11vnc/README 2011-10-18 22:11:14.365000420 +0200 -@@ -912,14 +912,14 @@ +diff --git a/README b/README +index d240c75..0db06b5 100644 +--- a/README ++++ b/README +@@ -943,14 +943,14 @@ make * Improved support for non-X11 touchscreen devices (e.g. handheld or cell phone) via Linux uinput input injection. Additional tuning parameters are added. TSLIB touchscreen calibration is supported. @@ -74,7 +32,7 @@ tweakable non-builtin direct input injection method. * The list of new uinput parameters for the above two features is: pressure, tslib_cal, touch_always, dragskip, btn_touch; -@@ -1036,7 +1036,7 @@ +@@ -1064,7 +1064,7 @@ make x11vnc to use the -xrandr screen size change trapping code. * New remote control query options: pointer_x, pointer_y, pointer_same, pointer_root, and pointer_mask. A demo script using @@ -83,16 +41,7 @@ * The -sslScripts option prints out the SSL certificate management scripts. -@@ -5525,7 +5525,7 @@ - Q-67: Can x11vnc provide a multi-user desktop web login service as an - Apache CGI or PHP script? - Yes. See the example script desktop.cgi for ideas. It is in the source -- tree in the directory x11vnc/misc. It serves x11vnc's SSL enabled Java -+ tree in the directory x11vnc/examples. It serves x11vnc's SSL enabled Java - Applet to the web browser with the correct connection information for - the user's virtual desktop (an Xvfb session via -create; be sure to - add the Xvfb package.) HTTPS/SSL enabled Apache should be used to -@@ -6479,12 +6479,12 @@ +@@ -6520,7 +6520,7 @@ EndSection down the delays, e.g. "-wait 5" and "-defer 5" (or even a smaller setting) to poll and pump things out more quickly. @@ -101,22 +50,7 @@ x11vnc with TurboVNC support. You will also need to download the TurboJPEG software. - In brief, the steps look like this: -- cd x11vnc-x.y.z/x11vnc/misc/turbovnc -+ cd x11vnc-x.y.z/x11vnc/examples/turbovnc - ./apply_turbovnc - cd ../../.. - env LDFLAGS='-L/DIR -Xlinker --rpath=/DIR' ./configure -@@ -6498,7 +6498,7 @@ - it went. - - There also may be some Linux.i686 and Darwin.i386 x11vnc binaries with -- TurboVNC support in the misc. bins directory. For other platforms you -+ TurboVNC support in the examples bins directory. For other platforms you - will need to compile yourself. - - On relatively cheap and old hardware (Althon64 X2 5000+ / GeForce -@@ -7740,7 +7740,7 @@ +@@ -7781,7 +7781,7 @@ minal #2) Note the -pipeinput helper program could actually control the raw framebuffer. In the libvncserver CVS a simple example program @@ -125,7 +59,7 @@ "slideshow" application. Also the builtin "-pipeinput VID" mode does this for webcams and TV capture devices (/dev/video0.) -@@ -7750,7 +7750,7 @@ +@@ -7791,7 +7791,7 @@ minal #2) Another example provided in libvncserver CVS is a script to inject keystrokes into the Linux console (e.g. the virtual consoles: @@ -134,7 +68,7 @@ the vncterm/LinuxVNC.c program also in the libvncserver CVS. So to view and interact with VT #2 (assuming it is the active VT) one can run something like: -@@ -8087,7 +8087,7 @@ +@@ -8128,7 +8128,7 @@ minal #2) writing the touchscreen events directly to /dev/input/event1 then input can be injected into the system. There is no x11vnc builtin mode for this yet (until we understand it better), but there is a working @@ -143,7 +77,7 @@ this way for example: x11vnc ... -rawfb console -pipeinput path/to/qt_tslib_inject.pl -env INJECT_O PTIONS=clickonly,cal=/etc/pointercal -@@ -8096,7 +8096,7 @@ +@@ -8137,7 +8137,7 @@ PTIONS=clickonly,cal=/etc/pointercal options mean (e.g. /etc/pointercal contains TSLIB's calibration parameters and are necessary to achieve accurate pointing.) @@ -152,7 +86,7 @@ to handle other devices where the uinput method fails. It could also be modified to create 'hot keys', etc. -@@ -9144,7 +9144,7 @@ +@@ -9185,7 +9185,7 @@ or: For inetd.conf, an example is: 5900 stream tcp6 nowait root /usr/sbin/tcpd /usr/local/bin/x11vnc_wrapper.sh @@ -161,18 +95,59 @@ acts as a relay for any IPv4 application to allow connections over IPv6. For example: inet6to4 5900 localhost:5900 -@@ -14238,7 +14238,7 @@ - Xdummy: +diff --git a/configure.ac b/configure.ac +index b17beff..1f54a45 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -524,7 +524,7 @@ AM_CONDITIONAL(HAVE_RPM, test "$RPMSOURCEDIR" != "NOT-FOUND") + AM_CONDITIONAL(WITH_X11VNC, test "$build_x11vnc" = "yes") + AC_SUBST(RPMSOURCEDIR) + +-AC_CONFIG_FILES([Makefile src/Makefile misc/Makefile misc/turbovnc/Makefile]) ++AC_CONFIG_FILES([Makefile src/Makefile examples/Makefile examples/turbovnc/Makefile]) + + AC_OUTPUT + +diff --git a/misc/turbovnc/README b/misc/turbovnc/README +index 328929c..7f95263 100644 +--- a/misc/turbovnc/README ++++ b/misc/turbovnc/README +@@ -45,7 +45,7 @@ QUICK-START: - The Xdummy wrapper is part of the x11vnc source code -- (x11vnc/misc/Xdummy) It should be available in PATH -+ (x11vnc/examples/Xdummy) It should be available in PATH - and have run "Xdummy -install" once to create the - shared library. Xdummy only works on Linux. As of - 12/2009 it no longer needs to be run as root, and the ---- x11vnc/x11vnc.1.orig 2011-10-18 22:12:02.480000421 +0200 -+++ x11vnc/x11vnc.1 2011-10-18 22:12:10.382000419 +0200 -@@ -2003,7 +2003,7 @@ + For those in a hurry: + +- cd x11vnc-x.y.z/x11vnc/misc/turbovnc ++ cd x11vnc-x.y.z/x11vnc/examples/turbovnc + ./apply_turbovnc + cd ../../.. + env LDFLAGS='-L/DIR -Xlinker --rpath=/DIR' ./configure +@@ -58,7 +58,7 @@ PATCHING AND BUILDING: + ---------------------- + + After unpacking your x11vnc-x.y.z.tar.gz tarball cd to the +-x11vnc-x.y.z/x11vnc/misc/turbovnc (where this README file is) and from ++x11vnc-x.y.z/x11vnc/examples/turbovnc (where this README file is) and from + that directory run: + + ./apply_turbovnc +diff --git a/src/help.c b/src/help.c +index 56e559f..5e63ad7 100644 +--- a/src/help.c ++++ b/src/help.c +@@ -1621,7 +1621,7 @@ void print_help(int mode) { + " Xdummy:\n" + "\n" + " The Xdummy wrapper is part of the x11vnc source code\n" +-" (x11vnc/misc/Xdummy) It should be available in PATH\n" ++" (x11vnc/examples/Xdummy) It should be available in PATH\n" + " and have run \"Xdummy -install\" once to create the\n" + " shared library. Xdummy only works on Linux. As of\n" + " 12/2009 it no longer needs to be run as root, and the\n" +diff --git a/x11vnc.1 b/x11vnc.1 +index 730f341..a23b1fd 100644 +--- a/x11vnc.1 ++++ b/x11vnc.1 +@@ -1788,7 +1788,7 @@ By default FINDCREATEDISPLAY will try Xvfb and then Xdummy: .IP The Xdummy wrapper is part of the x11vnc source code @@ -181,96 +156,3 @@ and have run "Xdummy \fB-install"\fR once to create the shared library. Xdummy only works on Linux. As of 12/2009 it no longer needs to be run as root, and the ---- README.orig 2011-10-18 22:08:05.333000420 +0200 -+++ README 2011-10-18 22:09:35.980000420 +0200 -@@ -912,14 +912,14 @@ - * Improved support for non-X11 touchscreen devices (e.g. handheld or - cell phone) via Linux uinput input injection. Additional tuning - parameters are added. TSLIB touchscreen calibration is supported. -- Tested on Qtmoko Neo Freerunner. A tool, misc/uinput.pl, is -+ Tested on Qtmoko Neo Freerunner. A tool, examples/uinput.pl, is - provided to diagnose uinput behavior on new devices. The env. - vars. X11VNC_UINPUT_BUS and X11VNC_UINPUT_VERSION are available if - leaving them unset does not work. - * The Linux uinput non-X11 input injection can now be bypassed: - events can be directly written to the /dev/input/event devices - specified by the user (direct_abs=..., etc.) A -pipeinput input -- injection helper script, misc/qt_tslib_inject.pl is provided as a -+ injection helper script, examples/qt_tslib_inject.pl is provided as a - tweakable non-builtin direct input injection method. - * The list of new uinput parameters for the above two features is: - pressure, tslib_cal, touch_always, dragskip, btn_touch; -@@ -1036,7 +1036,7 @@ - x11vnc to use the -xrandr screen size change trapping code. - * New remote control query options: pointer_x, pointer_y, - pointer_same, pointer_root, and pointer_mask. A demo script using -- them misc/panner.pl is provided. -+ them examples/panner.pl is provided. - * The -sslScripts option prints out the SSL certificate management - scripts. - -@@ -6479,7 +6479,7 @@ - down the delays, e.g. "-wait 5" and "-defer 5" (or even a smaller - setting) to poll and pump things out more quickly. - -- See the instructions in "x11vnc/misc/turbovnc/README" for how to build -+ See the instructions in "x11vnc/examples/turbovnc/README" for how to build - x11vnc with TurboVNC support. You will also need to download the - TurboJPEG software. - -@@ -7740,7 +7740,7 @@ - - Note the -pipeinput helper program could actually control the raw - framebuffer. In the libvncserver CVS a simple example program -- x11vnc/misc/slide.pl is provided that demonstrates a simple jpeg -+ x11vnc/examples/slide.pl is provided that demonstrates a simple jpeg - "slideshow" application. Also the builtin "-pipeinput VID" mode does - this for webcams and TV capture devices (/dev/video0.) - -@@ -7750,7 +7750,7 @@ - - Another example provided in libvncserver CVS is a script to inject - keystrokes into the Linux console (e.g. the virtual consoles: -- /dev/tty1, /dev/tty2, etc) in x11vnc/misc/vcinject.pl. It is based on -+ /dev/tty1, /dev/tty2, etc) in x11vnc/examples/vcinject.pl. It is based on - the vncterm/LinuxVNC.c program also in the libvncserver CVS. So to - view and interact with VT #2 (assuming it is the active VT) one can - run something like: -@@ -8087,7 +8087,7 @@ - writing the touchscreen events directly to /dev/input/event1 then - input can be injected into the system. There is no x11vnc builtin mode - for this yet (until we understand it better), but there is a working -- script provided in x11vnc/misc/qt_tslib_inject.pl. So one could use it -+ script provided in x11vnc/examples/qt_tslib_inject.pl. So one could use it - this way for example: - x11vnc ... -rawfb console -pipeinput path/to/qt_tslib_inject.pl -env INJECT_O - PTIONS=clickonly,cal=/etc/pointercal -@@ -8096,7 +8096,7 @@ - options mean (e.g. /etc/pointercal contains TSLIB's calibration - parameters and are necessary to achieve accurate pointing.) - -- The x11vnc/misc/qt_tslib_inject.pl script can potentially be modified -+ The x11vnc/examples/qt_tslib_inject.pl script can potentially be modified - to handle other devices where the uinput method fails. It could also - be modified to create 'hot keys', etc. - -@@ -9144,7 +9144,7 @@ - For inetd.conf, an example is: - 5900 stream tcp6 nowait root /usr/sbin/tcpd /usr/local/bin/x11vnc_wrapper.sh - -- We also provide a transitional tool in "x11vnc/misc/inet6to4" that -+ We also provide a transitional tool in "x11vnc/examples/inet6to4" that - acts as a relay for any IPv4 application to allow connections over - IPv6. For example: - inet6to4 5900 localhost:5900 ---- configure.ac.orig 2011-10-18 22:09:38.625000420 +0200 -+++ configure.ac 2011-10-18 22:09:47.621000421 +0200 -@@ -837,7 +837,7 @@ - # - # configure.ac:690: required file `x11vnc/Makefile.in' not found - # -- AC_CONFIG_FILES([x11vnc/Makefile x11vnc/misc/Makefile x11vnc/misc/turbovnc/Makefile]) -+ AC_CONFIG_FILES([x11vnc/Makefile x11vnc/examples/Makefile x11vnc/examples/turbovnc/Makefile]) - - if test ! -z "$with_system_libvncserver" -a "x$with_system_libvncserver" != "xno"; then - # need to move local tarball rfb headers aside: ++++++ x11vnc-thread-auth.diff ++++++ --- /var/tmp/diff_new_pack.2KFmgC/_old 2019-03-26 15:43:47.764193858 +0100 +++ /var/tmp/diff_new_pack.2KFmgC/_new 2019-03-26 15:43:47.764193858 +0100 @@ -1,10 +1,12 @@ ---- x11vnc/screen.c.orig 2009-12-21 05:58:10.000000000 +0100 -+++ x11vnc/screen.c 2009-12-21 23:17:28.000000000 +0100 -@@ -4201,6 +4201,37 @@ +diff --git a/src/screen.c b/src/screen.c +index 21e2eed..d5d42e4 100644 +--- a/src/screen.c ++++ b/src/screen.c +@@ -4363,6 +4363,37 @@ if (0 && dt > 0.0) fprintf(stderr, "dt: %.5f %.4f\n", dt, dnowx()); return msec; } -+/* ++/* + * Terrible hack for the multithreaded x11vnc ... + * But we get the client confused if we start sending stuff in our + * main loop prior to it being initialized properly. So wait. @@ -38,7 +40,7 @@ /* * main x11vnc loop: polls, checks for events, iterate libvncserver, etc. */ -@@ -4212,6 +4243,7 @@ +@@ -4374,6 +4405,7 @@ void watch_loop(void) { if (use_threads && !started_rfbRunEventLoop) { started_rfbRunEventLoop = 1; rfbRunEventLoop(screen, -1, TRUE);
