Attachment 890649 Details for Bug 1092245 – Update to the latest git commit 646f844

[patch] Update to the latest git commit 646f844

0001-Update-to-the-latest-git-commit-646f844.patch (text/plain), 7.99 KB, created by poma on 2014-04-29 04:40:53 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: poma

Created: 2014-04-29 04:40:53 UTC

Size: 7.99 KB

patch

obsolete

>From f62d62fd4b3dc2dfe1f9f06e02e3b93c887c7978 Mon Sep 17 00:00:00 2001
>From: poma <pomidorabelisima@gmail.com>
>Date: Tue, 29 Apr 2014 06:16:46 +0200
>Subject: [PATCH] Update to the latest git commit 646f844
>
>---
> ...r-sockets.c-do-not-segfault-when-listenSo.patch | 29 -------------
> ...kets.c-to-allow-the-use-of-IPv6-without-I.patch | 48 ----------------------
> LibVNCServer-0.9.9-no_x11vnc.patch                 |  2 +-
> LibVNCServer-0.9.9-system_minilzo.patch            |  8 ++--
> libvncserver.spec                                  | 14 +++----
> sources                                            |  2 +-
> 6 files changed, 11 insertions(+), 92 deletions(-)
> delete mode 100644 0005-libvncserver-sockets.c-do-not-segfault-when-listenSo.patch
> delete mode 100644 0010-Patched-sockets.c-to-allow-the-use-of-IPv6-without-I.patch
>
>diff --git a/0005-libvncserver-sockets.c-do-not-segfault-when-listenSo.patch b/0005-libvncserver-sockets.c-do-not-segfault-when-listenSo.patch
>deleted file mode 100644
>index 1d2a4cb..0000000
>--- a/0005-libvncserver-sockets.c-do-not-segfault-when-listenSo.patch
>+++ /dev/null
>@@ -1,29 +0,0 @@
>-From 66282f58000c8863e104666c30cb67b1d5cbdee3 Mon Sep 17 00:00:00 2001
>-From: "Kyle J. McKay" <mackyle@gmail.com>
>-Date: Fri, 18 May 2012 00:30:11 -0700
>-Subject: [PATCH 05/32] libvncserver/sockets.c: do not segfault when
>- listenSock/listen6Sock == -1
>-
>----
>- libvncserver/sockets.c | 4 ++--
>- 1 file changed, 2 insertions(+), 2 deletions(-)
>-
>-diff --git a/libvncserver/sockets.c b/libvncserver/sockets.c
>-index 84c9c98..3ff2aac 100644
>---- a/libvncserver/sockets.c
>-+++ b/libvncserver/sockets.c
>-@@ -402,9 +402,9 @@ rfbProcessNewConnection(rfbScreenInfoPtr rfbScreen)
>-       rfbLogPerror("rfbProcessNewConnection: error in select");
>-       return FALSE;
>-     }
>--    if (FD_ISSET(rfbScreen->listenSock, &listen_fds)) 
>-+    if (rfbScreen->listenSock >= 0 && FD_ISSET(rfbScreen->listenSock, &listen_fds))
>-       chosen_listen_sock = rfbScreen->listenSock;
>--    if (FD_ISSET(rfbScreen->listen6Sock, &listen_fds)) 
>-+    if (rfbScreen->listen6Sock >= 0 && FD_ISSET(rfbScreen->listen6Sock, &listen_fds))
>-       chosen_listen_sock = rfbScreen->listen6Sock;
>- 
>-     if ((sock = accept(chosen_listen_sock,
>--- 
>-1.8.3.1
>-
>diff --git a/0010-Patched-sockets.c-to-allow-the-use-of-IPv6-without-I.patch b/0010-Patched-sockets.c-to-allow-the-use-of-IPv6-without-I.patch
>deleted file mode 100644
>index 98e680f..0000000
>--- a/0010-Patched-sockets.c-to-allow-the-use-of-IPv6-without-I.patch
>+++ /dev/null
>@@ -1,48 +0,0 @@
>-From 584542ba97d35706a9e5c001b5cdf64296b5dd7f Mon Sep 17 00:00:00 2001
>-From: Oliver Loch <o.loch@gmx.net>
>-Date: Wed, 8 Aug 2012 22:09:13 +0200
>-Subject: [PATCH 10/32] Patched sockets.c to allow the use of IPv6 without
>- IPv4.
>-
>-As requested only those lines are indented that have been changed.
>----
>- libvncserver/sockets.c | 7 ++++++-
>- 1 file changed, 6 insertions(+), 1 deletion(-)
>-
>-diff --git a/libvncserver/sockets.c b/libvncserver/sockets.c
>-index 3ff2aac..15b40ac 100644
>---- a/libvncserver/sockets.c
>-+++ b/libvncserver/sockets.c
>-@@ -176,7 +176,9 @@ rfbInitSockets(rfbScreenInfoPtr rfbScreen)
>- 	rfbScreen->maxFd = max((int)rfbScreen->listen6Sock,rfbScreen->maxFd);
>- #endif
>-     }
>--    else if(rfbScreen->port>0) {
>-+    else
>-+    {
>-+	    if(rfbScreen->port>0) {
>-       FD_ZERO(&(rfbScreen->allFds));
>- 
>-       if ((rfbScreen->listenSock = rfbListenOnTCPPort(rfbScreen->port, iface)) < 0) {
>-@@ -187,8 +189,10 @@ rfbInitSockets(rfbScreenInfoPtr rfbScreen)
>-   
>-       FD_SET(rfbScreen->listenSock, &(rfbScreen->allFds));
>-       rfbScreen->maxFd = rfbScreen->listenSock;
>-+	    }
>- 
>- #ifdef LIBVNCSERVER_IPv6
>-+	    if (rfbScreen->ipv6port>0) {
>-       if ((rfbScreen->listen6Sock = rfbListenOnTCP6Port(rfbScreen->ipv6port, rfbScreen->listen6Interface)) < 0) {
>- 	/* ListenOnTCP6Port has its own detailed error printout */
>- 	return;
>-@@ -197,6 +201,7 @@ rfbInitSockets(rfbScreenInfoPtr rfbScreen)
>- 	
>-       FD_SET(rfbScreen->listen6Sock, &(rfbScreen->allFds));
>-       rfbScreen->maxFd = max((int)rfbScreen->listen6Sock,rfbScreen->maxFd);
>-+	    }
>- #endif
>- 
>-     }
>--- 
>-1.8.3.1
>-
>diff --git a/LibVNCServer-0.9.9-no_x11vnc.patch b/LibVNCServer-0.9.9-no_x11vnc.patch
>index db2ec9d..27cc21f 100644
>--- a/LibVNCServer-0.9.9-no_x11vnc.patch
>+++ b/LibVNCServer-0.9.9-no_x11vnc.patch
>@@ -1,7 +1,7 @@
> diff -up LibVNCServer-0.9.9/configure.ac.system_minilzo LibVNCServer-0.9.9/configure.ac
> --- LibVNCServer-0.9.9/configure.ac.system_minilzo	2012-05-04 11:27:08.000000000 -0500
> +++ LibVNCServer-0.9.9/configure.ac	2012-05-07 08:22:19.473583597 -0500
>-@@ -992,7 +992,7 @@ if test "$build_x11vnc" = "yes"; then
>+@@ -1020,7 +1020,7 @@
>  	#
>  	# configure.ac:690: required file `x11vnc/Makefile.in' not found
>  	#
>diff --git a/LibVNCServer-0.9.9-system_minilzo.patch b/LibVNCServer-0.9.9-system_minilzo.patch
>index f6d7db9..40f1824 100644
>--- a/LibVNCServer-0.9.9-system_minilzo.patch
>+++ b/LibVNCServer-0.9.9-system_minilzo.patch
>@@ -1,14 +1,14 @@
> diff -up LibVNCServer-0.9.9/libvncclient/Makefile.am.system_minilzo LibVNCServer-0.9.9/libvncclient/Makefile.am
> --- LibVNCServer-0.9.9/libvncclient/Makefile.am.system_minilzo	2012-05-04 09:19:00.000000000 -0500
> +++ LibVNCServer-0.9.9/libvncclient/Makefile.am	2012-05-07 08:22:19.474583585 -0500
>-@@ -13,10 +13,10 @@ endif
>+@@ -13,10 +13,10 @@
>  endif
>  
>  
> -libvncclient_la_SOURCES=cursor.c listen.c rfbproto.c sockets.c vncviewer.c ../common/minilzo.c $(TLSSRCS)
>--libvncclient_la_LIBADD=$(TLSLIBS)
>+-libvncclient_la_LIBADD=$(TLSLIBS) $(VA_LIBS)
> +libvncclient_la_SOURCES=cursor.c listen.c rfbproto.c sockets.c vncviewer.c $(TLSSRCS)
>-+libvncclient_la_LIBADD=$(TLSLIBS) -lminilzo
>++libvncclient_la_LIBADD=$(TLSLIBS) $(VA_LIBS) -lminilzo
>  
> -noinst_HEADERS=../common/lzodefs.h ../common/lzoconf.h ../common/minilzo.h tls.h
> +noinst_HEADERS=tls.h
>@@ -18,7 +18,7 @@ diff -up LibVNCServer-0.9.9/libvncclient/Makefile.am.system_minilzo LibVNCServer
> diff -up LibVNCServer-0.9.9/libvncclient/rfbproto.c.system_minilzo LibVNCServer-0.9.9/libvncclient/rfbproto.c
> --- LibVNCServer-0.9.9/libvncclient/rfbproto.c.system_minilzo	2012-05-04 09:19:00.000000000 -0500
> +++ LibVNCServer-0.9.9/libvncclient/rfbproto.c	2012-05-07 08:22:19.474583585 -0500
>-@@ -59,7 +59,7 @@
>+@@ -61,7 +61,7 @@
>  #include <gcrypt.h>
>  #endif
>  
>diff --git a/libvncserver.spec b/libvncserver.spec
>index 77bc0d6..54ccc00 100644
>--- a/libvncserver.spec
>+++ b/libvncserver.spec
>@@ -2,12 +2,12 @@
> Summary: Library to make writing a vnc server easy
> Name:    libvncserver
> Version: 0.9.9
>-Release: 11%{?dist}
>+Release: 12%{?dist}
> 
> # NOTE: --with-tightvnc-filetransfer => GPLv2
> License: GPLv2+
> URL:     http://libvncserver.sourceforge.net/
>-Source0: http://downloads.sf.net/libvncserver/LibVNCServer-%{version}.tar.gz
>+Source0: https://github.com/LibVNC/libvncserver/archive/master.zip
> 
> # workaround there being no x11vnc/ dir in tarball
> Patch0: LibVNCServer-0.9.9-no_x11vnc.patch
>@@ -16,10 +16,6 @@ Patch2: libvncserver-0.9.1-multilib.patch
> # pkgconfig love (upstreamable)
> Patch3: LibVNCServer-0.9.9-pkgconfig.patch
> 
>-## upstream patches
>-Patch105: 0005-libvncserver-sockets.c-do-not-segfault-when-listenSo.patch
>-Patch110: 0010-Patched-sockets.c-to-allow-the-use-of-IPv6-without-I.patch
>-
> # upstream name
> Obsoletes: LibVNCServer < 0.9.1
> Provides:  LibVNCServer = %{version}-%{release}
>@@ -64,9 +60,6 @@ Provides:  LibVNCServer-devel = %{version}-%{release}
> %prep
> %setup -q -n LibVNCServer-%{version}
> 
>-%patch105 -p1 -b .0005
>-%patch110 -p1 -b .0010
>-
> %patch0 -p1 -b .no_x11vnc
> %patch1 -p1 -b .system_minilzo
> #nuke bundled minilzo
>@@ -135,6 +128,9 @@ xvfb-run -a make -C test test ||:
> 
> 
> %changelog
>+* Tue Apr 29 2014 poma <poma@gmail.com> 0.9.9-12
>+- Update to the latest git commit 646f844
>+
> * Mon Mar 31 2014 Rex Dieter <rdieter@fedoraproject.org> 0.9.9-11
> - x11vnc crash when client connect (#972618)
>   pull in some upstream commits that may help
>diff --git a/sources b/sources
>index 2564e4a..f88511b 100644
>--- a/sources
>+++ b/sources
>@@ -1 +1 @@
>-70422169b122765693d2a294d13e3714  LibVNCServer-0.9.9.tar.gz
>+ea11c86ec4940fd315506eaa867a2e4f  LibVNCServer-0.9.9.tar.gz
>-- 
>1.9.0
>

Actions: View | Diff

Attachments on bug 1092245: 890649 | 890656