+++ /dev/null
---- tigervnc-1.3.0/vncviewer/vncviewer.cxx.orig 2013-07-01 12:42:05.000000000 +0000
-+++ tigervnc-1.3.0/vncviewer/vncviewer.cxx 2013-07-18 13:01:58.387116062 +0000
-@@ -304,7 +304,7 @@
-
- snprintf(vncServerName, VNCSERVERNAMELEN, "localhost::%d", localPort);
- vncServerName[VNCSERVERNAMELEN - 1] = '\0';
-- vlog.error(vncServerName);
-+ vlog.error("%s", vncServerName);
-
- return 0;
- }
+++ /dev/null
---- tigervnc-1.2.0/unix/xserver/hw/vnc/Makefile.am~ 2012-03-23 13:48:14.821937463 +0100
-+++ tigervnc-1.2.0/unix/xserver/hw/vnc/Makefile.am 2012-03-23 13:53:47.718619148 +0100
-@@ -68,7 +68,7 @@
-
- pixman.h:
- for i in ${XSERVERLIBS_CFLAGS}; do \
-- if [[ "$$i" =~ "pixman" ]]; then \
-+ if [[ "$$i" = *pixman* ]]; then \
- PIXMANINCDIR=`echo $$i | sed s/-I//g`; \
- fi; \
- done; \
-diff -up tigervnc-1.3.0/unix/xserver/hw/vnc/InputXKB.cc.getmaster tigervnc-1.3.0/unix/xserver/hw/vnc/InputXKB.cc
---- tigervnc-1.3.0/unix/xserver/hw/vnc/InputXKB.cc.getmaster 2013-07-12 09:30:50.551459439 +0100
-+++ tigervnc-1.3.0/unix/xserver/hw/vnc/InputXKB.cc 2013-07-12 09:38:31.037480528 +0100
-@@ -232,10 +232,7 @@ void InputDevice::PrepareInputDevices(vo
-
- unsigned InputDevice::getKeyboardState(void)
+diff -up tigervnc-1.4.2/unix/xserver/hw/vnc/c.getmaster tigervnc-1.4.2/unix/xserver/hw/vnc/InputXKB.c
+--- tigervnc-1.4.2/unix/xserver/hw/vnc/InputXKB.c.getmaster 2015-01-23 23:37:23.000000000 +0000
++++ tigervnc-1.4.2/unix/xserver/hw/vnc/InputXKB.c 2015-02-13 12:32:54.398502082 +0000
+@@ -210,10 +210,7 @@ void vncPrepareInputDevices(void)
+
+ unsigned vncGetKeyboardState(void)
{
- DeviceIntPtr master;
-
-- master = GetMaster(keyboardDev, KEYBOARD_OR_FLOAT);
+- master = GetMaster(vncKeyboardDev, KEYBOARD_OR_FLOAT);
- return XkbStateFieldFromRec(&master->key->xkbInfo->state);
-+ return XkbStateFieldFromRec(&keyboardDev->master->key->xkbInfo->state);
++ return XkbStateFieldFromRec(&vncKeyboardDev->master->key->xkbInfo->state);
}
-
- unsigned InputDevice::getLevelThreeMask(void)
-@@ -256,7 +253,7 @@ unsigned InputDevice::getLevelThreeMask(
+
+ unsigned vncGetLevelThreeMask(void)
+@@ -232,7 +229,7 @@ unsigned InputDevice::vncGetLevelThreeMask(
return 0;
}
-
-- xkb = GetMaster(keyboardDev, KEYBOARD_OR_FLOAT)->key->xkbInfo->desc;
-+ xkb = keyboardDev->master->key->xkbInfo->desc;
-
+
+- xkb = GetMaster(vncKeyboardDev, KEYBOARD_OR_FLOAT)->key->xkbInfo->desc;
++ xkb = vncKeyboardDev->master->key->xkbInfo->desc;
+
act = XkbKeyActionPtr(xkb, keycode, state);
if (act == NULL)
-@@ -281,7 +278,7 @@ KeyCode InputDevice::pressShift(void)
+@@ -257,7 +254,7 @@ KeyCode InputDevice::vncPressShift(void)
if (state & ShiftMask)
return 0;
-
-- xkb = GetMaster(keyboardDev, KEYBOARD_OR_FLOAT)->key->xkbInfo->desc;
-+ xkb = keyboardDev->master->key->xkbInfo->desc;
+
+- xkb = GetMaster(vncKeyboardDev, KEYBOARD_OR_FLOAT)->key->xkbInfo->desc;
++ xkb = vncKeyboardDev->master->key->xkbInfo->desc;
for (key = xkb->min_key_code; key <= xkb->max_key_code; key++) {
XkbAction *act;
unsigned char mask;
-@@ -318,7 +315,7 @@ std::list<KeyCode> InputDevice::releaseS
- if (!(state & ShiftMask))
- return keys;
-
-- master = GetMaster(keyboardDev, KEYBOARD_OR_FLOAT);
-+ master = keyboardDev->master;
+@@ -299,7 +296,7 @@ size_t vncReleaseShift(KeyCode *keys, size_t maxKeys)
+
+ count = 0;
+
+- master = GetMaster(vncKeyboardDev, KEYBOARD_OR_FLOAT);
++ master = vncKeyboardDev->master;
xkb = master->key->xkbInfo->desc;
for (key = xkb->min_key_code; key <= xkb->max_key_code; key++) {
XkbAction *act;
-@@ -371,7 +368,7 @@ KeyCode InputDevice::pressLevelThree(voi
+@@ -347,7 +344,7 @@ KeyCode InputDevice::vncPressLevelThree(voi
return 0;
}
-
-- xkb = GetMaster(keyboardDev, KEYBOARD_OR_FLOAT)->key->xkbInfo->desc;
-+ xkb = keyboardDev->master->key->xkbInfo->desc;
-
+
+- xkb = GetMaster(vncKeyboardDev, KEYBOARD_OR_FLOAT)->key->xkbInfo->desc;
++ xkb = vncKeyboardDev->master->key->xkbInfo->desc;
+
act = XkbKeyActionPtr(xkb, keycode, state);
if (act == NULL)
-@@ -399,7 +396,7 @@ std::list<KeyCode> InputDevice::releaseL
- if (!(state & mask))
- return keys;
-
-- master = GetMaster(keyboardDev, KEYBOARD_OR_FLOAT);
-+ master = keyboardDev->master;
+@@ -386,7 +383,7 @@ size_t vncReleaseLevelThree(KeyCode *keys, size_t maxKeys)
+
+ count = 0;
+
+- master = GetMaster(vncKeyboardDev, KEYBOARD_OR_FLOAT);
++ master = vncKeyboardDev->master;
xkb = master->key->xkbInfo->desc;
for (key = xkb->min_key_code; key <= xkb->max_key_code; key++) {
XkbAction *act;
-@@ -440,7 +437,7 @@ KeyCode InputDevice::keysymToKeycode(Key
+@@ -416,7 +413,7 @@ KeyCode InputDevice::vncKeysymToKeycode(Key
if (new_state != NULL)
*new_state = state;
-
-- xkb = GetMaster(keyboardDev, KEYBOARD_OR_FLOAT)->key->xkbInfo->desc;
-+ xkb = keyboardDev->master->key->xkbInfo->desc;
+
+- xkb = GetMaster(vncKeyboardDev, KEYBOARD_OR_FLOAT)->key->xkbInfo->desc;
++ xkb = vncKeyboardDev->master->key->xkbInfo->desc;
for (key = xkb->min_key_code; key <= xkb->max_key_code; key++) {
unsigned int state_out;
KeySym dummy;
-@@ -497,7 +494,7 @@ bool InputDevice::isLockModifier(KeyCode
+@@ -473,7 +470,7 @@ bool InputDevice::vncIsLockModifier(KeyCode
XkbDescPtr xkb;
XkbAction *act;
-
-- xkb = GetMaster(keyboardDev, KEYBOARD_OR_FLOAT)->key->xkbInfo->desc;
-+ xkb = keyboardDev->master->key->xkbInfo->desc;
-
+
+- xkb = GetMaster(vncKeyboardDev, KEYBOARD_OR_FLOAT)->key->xkbInfo->desc;
++ xkb = vncKeyboardDev->master->key->xkbInfo->desc;
+
act = XkbKeyActionPtr(xkb, keycode, state);
if (act == NULL)
-@@ -535,7 +532,7 @@ bool InputDevice::isAffectedByNumLock(Ke
+@@ -524,7 +521,7 @@ int vncIsAffectedByNumLock(KeyCode keycode)
if (numlock_keycode == 0)
- return false;
-
-- xkb = GetMaster(keyboardDev, KEYBOARD_OR_FLOAT)->key->xkbInfo->desc;
-+ xkb = keyboardDev->master->key->xkbInfo->desc;
-
+ return 0;
+
+- xkb = GetMaster(vncKeyboardDev, KEYBOARD_OR_FLOAT)->key->xkbInfo->desc;
++ xkb = vncKeyboardDev->master->key->xkbInfo->desc;
+
act = XkbKeyActionPtr(xkb, numlock_keycode, state);
if (act == NULL)
-@@ -569,7 +566,7 @@ KeyCode InputDevice::addKeysym(KeySym ke
+@@ -545,7 +542,7 @@ KeyCode InputDevice::vncAddKeysym(KeySym ke
KeySym *syms;
KeySym upper, lower;
-
-- master = GetMaster(keyboardDev, KEYBOARD_OR_FLOAT);
-+ master = keyboardDev->master;
+
+- master = GetMaster(vncKeyboardDev, KEYBOARD_OR_FLOAT);
++ master = vncKeyboardDev->master;
xkb = master->key->xkbInfo->desc;
for (key = xkb->max_key_code; key >= xkb->min_key_code; key--) {
if (XkbKeyNumGroups(xkb, key) == 0)
+++ /dev/null
---- common/network/TcpSocket.cxx.orig 2010-02-12 03:19:32.000000000 -0600
-+++ common/network/TcpSocket.cxx 2011-04-11 10:58:52.000000000 -0500
-@@ -339,9 +339,38 @@
- return;
- }
-
-+ bool use_ipv6;
-+ int af;
-+#ifdef AF_INET6
-+ // - localhostOnly will mean "127.0.0.1 only", no IPv6
-+ if (use_ipv6 = !localhostOnly)
-+ af = AF_INET6;
-+ else
-+ af = AF_INET;
-+#else
-+ use_ipv6 = false;
-+ af = AF_INET;
-+#endif
-+
- initSockets();
-- if ((fd = socket(AF_INET, SOCK_STREAM, 0)) < 0)
-- throw SocketException("unable to create listening socket", errorNumber);
-+ if ((fd = socket(af, SOCK_STREAM, 0)) < 0) {
-+ // - Socket creation failed
-+ if (use_ipv6) {
-+ // - We were trying to make an IPv6-capable socket - try again, but IPv4-only
-+ use_ipv6 = false;
-+ af = AF_INET;
-+ fd = socket(af, SOCK_STREAM, 0);
-+ }
-+ if (fd < 0)
-+ throw SocketException("unable to create listening socket", errorNumber);
-+ } else {
-+ // - Socket creation succeeded
-+ if (use_ipv6) {
-+ // - We made an IPv6-capable socket, and we need it to do IPv4 too
-+ int opt = 0;
-+ setsockopt(fd, IPPROTO_IPV6, IPV6_V6ONLY, &opt, sizeof(opt));
-+ }
-+ }
-
- #ifndef WIN32
- // - By default, close the socket on exec()
-@@ -358,27 +387,39 @@
-
- // - Bind it to the desired port
- struct sockaddr_in addr;
-- memset(&addr, 0, sizeof(addr));
-- addr.sin_family = AF_INET;
--
-- if (localhostOnly) {
-- addr.sin_addr.s_addr = htonl(INADDR_LOOPBACK);
-- } else if (listenaddr != NULL) {
-+ struct sockaddr_in6 addr6;
-+ struct sockaddr *sa;
-+ int sa_len;
-+
-+ if (use_ipv6) {
-+ sa_len = sizeof(addr6);
-+ memset(&addr6, 0, sa_len);
-+ addr6.sin6_family = af;
-+ addr6.sin6_port = htons(port);
-+ sa = (struct sockaddr*) &addr6;
-+ } else {
-+ sa_len = sizeof(addr);
-+ memset(&addr, 0, sa_len);
-+ addr.sin_family = af;
-+ addr.sin_port = htons(port);
-+ if (localhostOnly)
-+ addr.sin_addr.s_addr = htonl(INADDR_LOOPBACK);
-+ else if (listenaddr != NULL) {
- #ifdef HAVE_INET_ATON
-- if (inet_aton(listenaddr, &addr.sin_addr) == 0)
-+ if (inet_aton(listenaddr, &addr.sin_addr) == 0)
- #else
-- /* Some systems (e.g. Windows) do not have inet_aton, sigh */
-- if ((addr.sin_addr.s_addr = inet_addr(listenaddr)) == INADDR_NONE)
-+ /* Some systems (e.g. Windows) do not have inet_aton, sigh */
-+ if ((addr.sin_addr.s_addr = inet_addr(listenaddr)) == INADDR_NONE)
- #endif
-- {
-- closesocket(fd);
-- throw Exception("invalid network interface address: %s", listenaddr);
-- }
-- } else
-- addr.sin_addr.s_addr = htonl(INADDR_ANY); /* Bind to 0.0.0.0 by default. */
--
-- addr.sin_port = htons(port);
-- if (bind(fd, (struct sockaddr *)&addr, sizeof(addr)) < 0) {
-+ {
-+ closesocket(fd);
-+ throw Exception("invalid network interface address: %s", listenaddr);
-+ }
-+ } else
-+ addr.sin_addr.s_addr = htonl(INADDR_ANY); /* Bind to 0.0.0.0 by default. */
-+ sa = (struct sockaddr*) &addr;
-+ }
-+ if (bind(fd, sa, sa_len) < 0) {
- int e = errorNumber;
- closesocket(fd);
- throw SocketException("unable to bind listening socket", e);
+++ /dev/null
-diff -up tigervnc-1.0.90-20100721svn4113/unix/xserver/hw/vnc/Makefile.am.ldnow tigervnc-1.0.90-20100721svn4113/unix/xserver/hw/vnc/Makefile.am
---- tigervnc-1.0.90-20100721svn4113/unix/xserver/hw/vnc/Makefile.am.ldnow 2010-05-18 15:48:02.000000000 +0200
-+++ tigervnc-1.0.90-20100721svn4113/unix/xserver/hw/vnc/Makefile.am 2010-07-21 17:05:45.242942531 +0200
-@@ -50,7 +50,7 @@ libvnc_la_CPPFLAGS = $(XVNC_CPPFLAGS) -I
- -I$(top_srcdir)/hw/xfree86/os-support/bus \
- -I$(includedir)/pixman-1 -I$(includedir)
-
--libvnc_la_LDFLAGS = -module -avoid-version
-+libvnc_la_LDFLAGS = -module -avoid-version -Wl,-z,now
-
- libvnc_la_LIBADD = libvnccommon.la $(COMMON_LIBS)
-
+++ /dev/null
-diff -up tigervnc-1.4.2/unix/xserver/hw/vnc/xorg-version.h.xserver117 tigervnc-1.4.2/unix/xserver/hw/vnc/xorg-version.h
---- tigervnc-1.4.2/unix/xserver/hw/vnc/xorg-version.h.xserver117 2015-01-23 23:37:23.000000000 +0000
-+++ tigervnc-1.4.2/unix/xserver/hw/vnc/xorg-version.h 2015-02-13 17:35:29.847294663 +0000
-@@ -48,8 +48,10 @@
- #define XORG 115
- #elif XORG_VERSION_CURRENT < ((1 * 10000000) + (16 * 100000) + (99 * 1000))
- #define XORG 116
-+#elif XORG_VERSION_CURRENT < ((1 * 10000000) + (17 * 100000) + (99 * 1000))
-+#define XORG 117
- #else
--#error "X.Org newer than 1.16 is not supported"
-+#error "X.Org newer than 1.17 is not supported"
- #endif
-
- #endif
-diff -up tigervnc-1.4.2/unix/xserver/hw/vnc/xvnc.cc.xserver117 tigervnc-1.4.2/unix/xserver/hw/vnc/xvnc.cc
---- tigervnc-1.4.2/unix/xserver/hw/vnc/xvnc.cc.xserver117 2015-01-23 23:37:23.000000000 +0000
-+++ tigervnc-1.4.2/unix/xserver/hw/vnc/xvnc.cc 2015-02-13 17:35:27.963265774 +0000
-@@ -717,9 +717,9 @@ vfbInstallColormap(ColormapPtr pmap)
- entries = pmap->pVisual->ColormapEntries;
- pVisual = pmap->pVisual;
-
-- ppix = (Pixel *)xalloc(entries * sizeof(Pixel));
-- prgb = (xrgb *)xalloc(entries * sizeof(xrgb));
-- defs = (xColorItem *)xalloc(entries * sizeof(xColorItem));
-+ ppix = (Pixel *)malloc(entries * sizeof(Pixel));
-+ prgb = (xrgb *)malloc(entries * sizeof(xrgb));
-+ defs = (xColorItem *)malloc(entries * sizeof(xColorItem));
-
- for (i = 0; i < entries; i++) ppix[i] = i;
- /* XXX truecolor */
-@@ -738,9 +738,9 @@ vfbInstallColormap(ColormapPtr pmap)
- }
- (*pmap->pScreen->StoreColors)(pmap, entries, defs);
-
-- xfree(ppix);
-- xfree(prgb);
-- xfree(defs);
-+ free(ppix);
-+ free(prgb);
-+ free(defs);
- }
- }
-
--- /dev/null
+diff -Nur tigervnc-49d0629dd87c0eb695d72dec7481e9169f55ae9e.orig/unix/xserver/hw/vnc/xorg-version.h tigervnc-49d0629dd87c0eb695d72dec7481e9169f55ae9e/unix/xserver/hw/vnc/xorg-version.h
+--- tigervnc-49d0629dd87c0eb695d72dec7481e9169f55ae9e.orig/unix/xserver/hw/vnc/xorg-version.h 2015-03-01 12:58:35.000000000 -0700
++++ tigervnc-49d0629dd87c0eb695d72dec7481e9169f55ae9e/unix/xserver/hw/vnc/xorg-version.h 2015-08-04 09:46:14.796336147 -0600
+@@ -48,8 +48,10 @@
+ #define XORG 116
+ #elif XORG_VERSION_CURRENT < ((1 * 10000000) + (17 * 100000) + (99 * 1000))
+ #define XORG 117
++#elif XORG_VERSION_CURRENT < ((1 * 10000000) + (18 * 100000) + (99 * 1000))
++#define XORG 118
+ #else
+-#error "X.Org newer than 1.17 is not supported"
++#error "X.Org newer than 1.18 is not supported"
+ #endif
+
+ #endif
+diff --git a/unix/xserver/hw/vnc/Input.c b/unix/xserver/hw/vnc/Input.c
+--- a/unix/xserver/hw/vnc/Input.c
++++ b/unix/xserver/hw/vnc/Input.c
+@@ -301,7 +301,7 @@ static inline void pressKey(DeviceIntPtr dev, int kc, Bool down, const char *msg
+ n = GetKeyboardEvents(eventq, dev, action, kc);
+ enqueueEvents(dev, n);
+ #else
+- QueueKeyboardEvents(dev, action, kc, NULL);
++ QueueKeyboardEvents(dev, action, kc);
+ #endif
+ }
+
-diff -ur tigervnc-1.3.0.orig/unix/vncserver tigervnc-1.3.0/unix/vncserver
---- tigervnc-1.3.0.orig/unix/vncserver 2013-07-18 16:37:54.000000000 +0000
-+++ tigervnc-1.3.0/unix/vncserver 2013-07-21 21:01:17.590116481 +0000
-@@ -57,27 +57,13 @@
-
- $defaultXStartup
+diff --git a/unix/vncserver b/unix/vncserver
+index c4d0535..64c6744 100755
+--- a/unix/vncserver
++++ b/unix/vncserver
+@@ -61,27 +61,7 @@ $defaultXStartup
= ("#!/bin/sh\n\n".
-- "unset SESSION_MANAGER\n".
-- "unset DBUS_SESSION_BUS_ADDRESS\n".
+ "unset SESSION_MANAGER\n".
+ "unset DBUS_SESSION_BUS_ADDRESS\n".
- "OS=`uname -s`\n".
- "if [ \$OS = 'Linux' ]; then\n".
- " case \"\$WINDOWMANAGER\" in\n".
- " exec sh /etc/X11/xinit/xinitrc\n".
- "fi\n".
- "[ -r \$HOME/.Xresources ] && xrdb \$HOME/.Xresources\n".
-+ "# Uncomment the following two lines for normal desktop:\n\n".
-+ "# unset SESSION_MANAGER\n".
-+ "# exec /etc/X11/xinit/xinitrc\n\n".
-+ "[ -x /etc/vnc/xstartup ] && exec /etc/vnc/xstartup\n".
-+ "[ -r $HOME/.Xresources ] && xrdb $HOME/.Xresources\n\n".
- "xsetroot -solid grey\n".
-+ "vncconfig -iconic &\n".
- "xterm -geometry 80x24+10+10 -ls -title \"\$VNCDESKTOP Desktop\" &\n".
- "twm &\n");
-
-@@ -322,8 +308,6 @@
- }
- $ENV{VNCDESKTOP}= $desktopName;
+- "xsetroot -solid grey\n".
+- "xterm -geometry 80x24+10+10 -ls -title \"\$VNCDESKTOP Desktop\" &\n".
+- "twm &\n");
++ "exec /etc/X11/xinit/xinitrc\n");
--system($exedir."vncconfig -iconic >> " . "edString($desktopLog) . " 2>&1 &");
--
- if ($opt{'-fg'}) {
- system("$vncUserDir/xstartup >> " . "edString($desktopLog) . " 2>&1");
- if (kill 0, `cat $pidFile`) {
+ $defaultConfig
+ = ("## Supported server options to pass to vncserver upon invocation can be listed\n".
Summary: A TigerVNC remote display system
Summary(pl.UTF-8): System zdalnego dostępu TigerVNC
Name: tigervnc
-Version: 1.4.3
-Release: 5
+Version: 1.6.0
+Release: 1
License: GPL v2
Group: X11/Applications/Networking
Source0: https://github.com/TigerVNC/tigervnc/archive/v%{version}.tar.gz?/%{name}-%{version}.tar.gz
-# Source0-md5: 2177ee42fa1a3902b6feeaa7747f1c2a
+# Source0-md5: 78b736445781d86c48e942465a391ccc
Source1: %{name}.desktop
Source2: vncserver.init
Source3: vncserver.sysconfig
Source4: vncserver.target
Source5: vncserver-service-generator
Patch0: %{name}-cookie.patch
-Patch1: %{name}-ldnow.patch
Patch3: %{name}-as-needed.patch
-Patch4: %{name}-ipv6.patch
Patch5: %{name}-rh692048.patch
-Patch6: no-bashizm.patch
-Patch7: format-security.patch
Patch8: tigervnc-xstartup.patch
Patch9: xserver.patch
Patch10: tigervnc-getmaster.patch
-Patch11: tigervnc-xserver-1.17.patch
+Patch11: tigervnc-xserver-1.18.patch
URL: http://www.tigervnc.com/
BuildRequires: ImageMagick
BuildRequires: ImageMagick-coder-png
%prep
%setup -q
%patch0 -p1
-%patch1 -p1
%patch3 -p1
-%patch4 -p0
%patch5 -p1
-%patch6 -p1
-%patch7 -p1
%patch8 -p1
%patch10 -p1
-%patch11 -p1
cp -a %{_usrsrc}/xorg-xserver-server-%{_xserverver}/* unix/xserver
cd unix/xserver
%patch9 -p1
+%patch11 -p3
%build
%cmake .
projects / packages / tigervnc.git / commitdiff