summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSven Wegener <swegener@gentoo.org>2007-07-20 19:24:17 +0000
committerSven Wegener <swegener@gentoo.org>2007-07-20 19:24:17 +0000
commit5308d2739c3de20579babda04e0d3ba92763e54b (patch)
tree24a46d21cde4bbe847272fedeaabaa1b28537882 /x11-misc/x11vnc/files
parentStable on sparc (diff)
downloadhistorical-5308d2739c3de20579babda04e0d3ba92763e54b.tar.gz
historical-5308d2739c3de20579babda04e0d3ba92763e54b.tar.bz2
historical-5308d2739c3de20579babda04e0d3ba92763e54b.zip
Pull in a fix from upstream to fix building with USE="-ssl", bug #180770.
Package-Manager: portage-7278-svn
Diffstat (limited to 'x11-misc/x11vnc/files')
-rw-r--r--x11-misc/x11vnc/files/x11vnc-0.9.1-ssl.patch32
1 files changed, 32 insertions, 0 deletions
diff --git a/x11-misc/x11vnc/files/x11vnc-0.9.1-ssl.patch b/x11-misc/x11vnc/files/x11vnc-0.9.1-ssl.patch
new file mode 100644
index 000000000000..fa5f6c0f2525
--- /dev/null
+++ b/x11-misc/x11vnc/files/x11vnc-0.9.1-ssl.patch
@@ -0,0 +1,32 @@
+Index: x11vnc/sslhelper.c
+===================================================================
+RCS file: /cvsroot/libvncserver/libvncserver/x11vnc/sslhelper.c,v
+retrieving revision 1.31
+retrieving revision 1.32
+diff --unified -r1.31 -r1.32
+--- x11vnc/sslhelper.c 16 May 2007 21:29:44 -0000 1.31
++++ x11vnc/sslhelper.c 15 Jun 2007 03:19:06 -0000 1.32
+@@ -34,6 +34,11 @@
+ pid_t openssl_last_helper_pid = 0;
+ char *openssl_last_ip = NULL;
+
++static char *certret = NULL;
++static int certret_fd = -1;
++static mode_t omode;
++char *certret_str = NULL;
++
+ void raw_xfer(int csock, int s_in, int s_out);
+
+ #if !LIBVNCSERVER_HAVE_LIBSSL
+@@ -1315,11 +1320,6 @@
+ return 1;
+ }
+
+-static char *certret = NULL;
+-static int certret_fd = -1;
+-static mode_t omode;
+-char *certret_str = NULL;
+-
+ void accept_openssl(int mode, int presock) {
+ int sock = -1, listen = -1, cport, csock, vsock;
+ int peerport = 0;