From 02be0c7213e1f3a285ac208a2549b89b59119e24 Mon Sep 17 00:00:00 2001 From: Jan Grulich Date: Dec 01 2015 15:08:23 +0000 Subject: Requires: gstream-plugins-good --- diff --git a/tigervnc-fix-reversed-logic.patch b/tigervnc-fix-reversed-logic.patch deleted file mode 100644 index f0e6158..0000000 --- a/tigervnc-fix-reversed-logic.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/unix/xserver/hw/vnc/RFBGlue.cc b/unix/xserver/hw/vnc/RFBGlue.cc -index 09832ab..a150792 100644 ---- a/unix/xserver/hw/vnc/RFBGlue.cc -+++ b/unix/xserver/hw/vnc/RFBGlue.cc -@@ -194,7 +194,7 @@ int vncIsTCPPortUsed(int port) - std::list dummy; - network::createTcpListeners (&dummy, 0, port); - } catch (rdr::Exception& e) { -- return 0; -+ return 1; - } -- return 1; -+ return 0; - } diff --git a/tigervnc-inetd-nowait.patch b/tigervnc-inetd-nowait.patch index 922acee..b158e19 100644 --- a/tigervnc-inetd-nowait.patch +++ b/tigervnc-inetd-nowait.patch @@ -1,21 +1,21 @@ diff --git a/common/network/TcpSocket.cxx b/common/network/TcpSocket.cxx -index 1ebaeec..2d7a52f 100644 +index 5a8f75d..6ef8f2e 100644 --- a/common/network/TcpSocket.cxx +++ b/common/network/TcpSocket.cxx -@@ -369,18 +369,12 @@ bool TcpSocket::cork(int sock, bool enable) { +@@ -360,18 +360,12 @@ bool TcpSocket::cork(int sock, bool enable) { #endif } - + -bool TcpSocket::isSocket(int sock) --{ ++bool TcpSocket::isListening(int sock) + { - vnc_sockaddr_t sa; - socklen_t sa_size = sizeof(sa); - return getsockname(sock, &sa.u.sa, &sa_size) >= 0; -} - -bool TcpSocket::isConnected(int sock) -+bool TcpSocket::isListening(int sock) - { +-{ - vnc_sockaddr_t sa; - socklen_t sa_size = sizeof(sa); - return getpeername(sock, &sa.u.sa, &sa_size) >= 0; @@ -24,14 +24,14 @@ index 1ebaeec..2d7a52f 100644 + return getsockopt(sock, SOL_SOCKET, SO_ACCEPTCONN, &listening, + &listening_size) >= 0 && listening; } - + int TcpSocket::getSockPort(int sock) diff --git a/common/network/TcpSocket.h b/common/network/TcpSocket.h -index 979cd4b..2bfe47b 100644 +index 02f04c9..a97e683 100644 --- a/common/network/TcpSocket.h +++ b/common/network/TcpSocket.h @@ -65,8 +65,7 @@ namespace network { - + static bool enableNagles(int sock, bool enable); static bool cork(int sock, bool enable); - static bool isSocket(int sock); @@ -41,16 +41,16 @@ index 979cd4b..2bfe47b 100644 private: bool closeFd; diff --git a/unix/xserver/hw/vnc/vncExtInit.cc b/unix/xserver/hw/vnc/vncExtInit.cc -index e307e31..dc449bd 100644 +index 2d918b0..863cd36 100644 --- a/unix/xserver/hw/vnc/vncExtInit.cc +++ b/unix/xserver/hw/vnc/vncExtInit.cc @@ -137,8 +137,7 @@ void vncExtensionInit(void) - std::list listeners; - std::list httpListeners; + std::list listeners; + std::list httpListeners; if (scr == 0 && vncInetdSock != -1) { - if (network::TcpSocket::isSocket(vncInetdSock) && - !network::TcpSocket::isConnected(vncInetdSock)) + if (network::TcpSocket::isListening(vncInetdSock)) { - listeners.push_back (network::TcpListener(vncInetdSock)); + listeners.push_back(new network::TcpListener(vncInetdSock)); vlog.info("inetd wait"); diff --git a/tigervnc-manpages.patch b/tigervnc-manpages.patch index 989e704..5919226 100644 --- a/tigervnc-manpages.patch +++ b/tigervnc-manpages.patch @@ -1,18 +1,20 @@ -diff -up tigervnc-1.4.2/unix/vncserver.manpages tigervnc-1.4.2/unix/vncserver ---- tigervnc-1.4.2/unix/vncserver.manpages 2015-02-12 19:39:32.253788841 +0000 -+++ tigervnc-1.4.2/unix/vncserver 2015-02-12 19:39:32.326789294 +0000 -@@ -551,6 +551,7 @@ sub Usage +diff --git a/unix/vncserver b/unix/vncserver +index c4d0535..08a9308 100755 +--- a/unix/vncserver ++++ b/unix/vncserver +@@ -637,6 +637,7 @@ sub Usage " [-geometry x]\n". " [-pixelformat rgbNNN|bgrNNN]\n". " [-fp ]\n". + " [-cc ]\n". " [-fg]\n". " [-autokill]\n". - " ...\n\n". -diff -up tigervnc-1.4.2/vncviewer/vncviewer.cxx.manpages tigervnc-1.4.2/vncviewer/vncviewer.cxx ---- tigervnc-1.4.2/vncviewer/vncviewer.cxx.manpages 2015-01-23 23:37:23.000000000 +0000 -+++ tigervnc-1.4.2/vncviewer/vncviewer.cxx 2015-02-12 19:39:32.327789300 +0000 -@@ -265,6 +265,11 @@ static void usage(const char *programNam + " [-noxstartup]\n". +diff --git a/vncviewer/vncviewer.cxx b/vncviewer/vncviewer.cxx +index a2bc029..6923d0e 100644 +--- a/vncviewer/vncviewer.cxx ++++ b/vncviewer/vncviewer.cxx +@@ -338,6 +338,11 @@ static void usage(const char *programName) " %s [parameters] -listen [port] [parameters]\n", programName, programName); fprintf(stderr,"\n" diff --git a/tigervnc-xstartup.patch b/tigervnc-xstartup.patch index 696d92b..b2ed420 100644 --- a/tigervnc-xstartup.patch +++ b/tigervnc-xstartup.patch @@ -1,7 +1,8 @@ -diff -up tigervnc-1.3.0/unix/vncserver.xstartup tigervnc-1.3.0/unix/vncserver ---- tigervnc-1.3.0/unix/vncserver.xstartup 2014-02-10 14:52:39.902673875 +0000 -+++ tigervnc-1.3.0/unix/vncserver 2014-02-10 14:53:30.398847723 +0000 -@@ -59,27 +59,7 @@ $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". @@ -28,5 +29,5 @@ diff -up tigervnc-1.3.0/unix/vncserver.xstartup tigervnc-1.3.0/unix/vncserver - "twm &\n"); + "exec /etc/X11/xinit/xinitrc\n"); - chop($host = `uname -n`); - + $defaultConfig + = ("## Supported server options to pass to vncserver upon invocation can be listed\n". diff --git a/tigervnc.spec b/tigervnc.spec index 6c149d2..321cac7 100644 --- a/tigervnc.spec +++ b/tigervnc.spec @@ -1,6 +1,6 @@ Name: tigervnc -Version: 1.5.0 -Release: 4%{?dist} +Version: 1.5.90 +Release: 1%{?dist} Summary: A TigerVNC remote display system %global _hardened_build 1 @@ -22,7 +22,7 @@ BuildRequires: xorg-x11-xtrans-devel, xorg-x11-util-macros, libXtst-devel BuildRequires: libdrm-devel, libXt-devel, pixman-devel libXfont-devel BuildRequires: libxkbfile-devel, openssl-devel, libpciaccess-devel BuildRequires: mesa-libGL-devel, libXinerama-devel, ImageMagick -BuildRequires: freetype-devel, libXdmcp-devel +BuildRequires: freetype-devel, libXdmcp-devel, libxshmfence-devel BuildRequires: desktop-file-utils, java-devel, jpackage-utils BuildRequires: libjpeg-turbo-devel, gnutls-devel, pam-devel BuildRequires: systemd, cmake @@ -46,7 +46,6 @@ Provides: tightvnc = 1.5.0-0.15.20090204svn3586 Obsoletes: tightvnc < 1.5.0-0.15.20090204svn3586 Patch1: tigervnc-cookie.patch -Patch2: tigervnc-fix-reversed-logic.patch Patch3: tigervnc-libvnc-os.patch Patch4: tigervnc11-rh692048.patch Patch5: tigervnc-inetd-nowait.patch @@ -154,7 +153,6 @@ This package contains icons for TigerVNC viewer %setup -q %patch1 -p1 -b .cookie -%patch2 -p1 -b .fix-reversed-logic %patch3 -p1 -b .libvnc-os %patch4 -p1 -b .rh692048 @@ -356,6 +354,9 @@ fi %{_datadir}/icons/hicolor/*/apps/* %changelog +* Tue Dec 01 2015 Jan Grulich - 1.5.90-1 +- Update to 1.5.90 (1.6.0 beta) + * Thu Nov 19 2015 Jan Grulich - 1.5.0-4 - rebuild against final xorg server 1.18 release (bug #1279146)