[patch] git format-patch for new ebuild and patches

0001-Add-x11vnc-0.9.14-r1-ebuild-resolving-bug-567612.patch (text/plain), 17.95 KB, created by Paul B. Henson on 2016-04-15 03:53:05 UTC

From 6dc556ca02627e8302469e8c3b1532934d622a5e Mon Sep 17 00:00:00 2001
From: "Paul B. Henson" <[e-mail]>
Date: Thu, 14 Apr 2016 20:50:19 -0700
Subject: [PATCH] Add x11vnc-0.9.14-r1 ebuild resolving bug 567612.

---
 x11-misc/x11vnc/Manifest                           |  12 +
 .../x11vnc/files/x11vnc-0.9.14-r1-fixdefines.patch | 259 +++++++++++++++++++++
 .../x11vnc/files/x11vnc-0.9.14-r1-waitpid.patch    |  45 ++++
 x11-misc/x11vnc/x11vnc-0.9.14-r1.ebuild            |  66 ++++++
 4 files changed, 382 insertions(+)
 create mode 100644 x11-misc/x11vnc/files/x11vnc-0.9.14-r1-fixdefines.patch
 create mode 100644 x11-misc/x11vnc/files/x11vnc-0.9.14-r1-waitpid.patch
 create mode 100644 x11-misc/x11vnc/x11vnc-0.9.14-r1.ebuild

diff --git a/x11-misc/x11vnc/Manifest b/x11-misc/x11vnc/Manifest
index 85e88f5..18042a8 100644
--- a/x11-misc/x11vnc/Manifest
+++ b/x11-misc/x11vnc/Manifest
@@ -1,3 +1,15 @@
+AUX x11vnc-0.9.14-r1-fixdefines.patch 7343 SHA256 1b44c4fe63e9e9859a41a396bc7dc7a9d18c992c8910471e45886ebfc48d111f SHA512 b89975d3f491ddc3e6d5eb64ee47e45173b412afd46ee8c3f5469d8cb4a9357707f134e3b4975ef8d79b01f2ad7d9a907055e03b1210b0c4bc8fa499fe805c79 WHIRLPOOL fdf9fb662e637e3a734e18fe929ec11173022af178656a79f3d4f871278e68cca79d8208da2350e18c91d569d00db052022f0e3bb0c1264b7642fab1b39aca42
+AUX x11vnc-0.9.14-r1-waitpid.patch 1478 SHA256 e9f4236d9ecd6284cb4c258c3efeff4eda860ed2d8061600ea31b6b977187422 SHA512 e29dd48991299a6218954d4565184444bd53025c542d4fd8807361c966389f86f394acab3b55316a31ba89bbcc826399a0e8004bb4b3e8cd95414eba3dc86842 WHIRLPOOL 1568bb117aae61846db6b584b54a125ff79712eb30afa8ceff94e2a06441534b71e7bbae6cd117104df2b9eaebe6ac7bdb9c722b7e3d9c3450aa940d5bc7ef4c
+AUX x11vnc.conf.d 1435 SHA256 2657c7687876372a5196027b2fb694ff5364f59a054ea961015384d66bf4a80e SHA512 dedc94fab89a06ca6025b99c2c944cabe77640487c8fc761a6420e5be7062ee4c1c383f3846c17bed434ad4f3ec3b994badb493919acb99da3f61caa40c60246 WHIRLPOOL feef515c561ef06d640c09c0507e03fb60d018a2ac19e78419abf6557cb0d43010f08fb3e9e88ed81bfef0f09d8e88955f2607b448157a8cc7fee7ac7d164961
+AUX x11vnc.init.d 1727 SHA256 4ba2e183b521bbfc36cb4cf7b0838b5d869a4e5fdd6712fcf48fee9fb9a24bd6 SHA512 1c094328b8feb7398153e8d5b061ea3c1ab028404fb8c412c3a5dfdd3fb63b10495c45c5be11f627cf61b1366150ec8312c4bb08903c6d49bb0fa50a0873d007 WHIRLPOOL 9a936cddc75434b24f2dd0a5690e1e22d5b5e402d39aa22db6b2acc125c7e8924b873d30ade44d423b3552903eba0a2452e23263060ea66ba9730cacbc16ebfe
 DIST 82eb9752485db87c9c6d3d6bb4aa1ae7ac81174a.zip 1830730 SHA256 fc6a28df089e47b68931019ce038b6e2fcd78e93de7f6984a22262252d01c16f SHA512 0fa4f7b52442793ec1bd82c74f9d092c69262e4f1fa93584fef17bbe0e5cbde08bc5ad0924631801bb43b41d90c37077a317c61511553f98698096eab05791eb WHIRLPOOL f1a45b549fb6ff9bea2eb4e3719b5dd43a78f6f418c61691cebab313d56761147d928648e103c654309575bec7c716a6f1cd1ef7a9b484c09edee37233cb0ce7
 DIST x11vnc-0.9.13_p20150627.tar.gz 1700142 SHA256 14fb77e9b875224b47fee659d5a883c26c2792c5e37d1e32286b03103fdaef07 SHA512 c28cfe47c1a0bb486bb3290511a8a71cf499e55617e3f488d45cb6a1e9050e4f52c5bb6eb9f2f655728f2028d2472a88d8b9178d59e79c1f07464782555abc82 WHIRLPOOL d0342ef8d948b0dda119967f9e59be6f1e4d2639859f8c2a45c37eeb644e970b322937635f151256b3c30a69d37838f380ab4732c5afd44499e9decb8412aa15
 DIST x11vnc-0.9.14.tar.gz 1700802 SHA256 45f87c5e4382988c73e8c7891ac2bfb45d8f9ce1196ae06651c84636684ea143 SHA512 5d18e5ff493fbc4f6f1efe952812c1acd3087e855a2a9f2c99f3b2606cfa40a20b83e2d0c736e12b453b47f7ff7746069a1b6718d842d1a8f73b00d5c4c4a93f WHIRLPOOL 3980edaa9327395e55dffdf06fb4a2eab9b94e1aaf8da65cdd1b4c5d765351eedc003b1150b7d4da065385cb7460a556509bf57c58cf1cbe443865c551f6a170
+EBUILD x11vnc-0.9.13_p20150111-r1.ebuild 1479 SHA256 2940f89bf4468ad8c96aee8e39e0b9e22300652abe7ccdebfc34aad4cc2eebaa SHA512 36da596af5ec39acfaa21bd5d727d3964fad571cc06995863ce0b6d155e75012fb7cf3ec99350ea341cb8c5b90e7ffe781171a489398272a64d60114ef55d762 WHIRLPOOL 512a11f00fdce4c56bdb5416c98d5e60f686eb58ee370e4538bab8102eb59b9cfe415e3679b64626349c4de0d015bf5ff924a65c11d316923292f9122ac80677
+EBUILD x11vnc-0.9.13_p20150111.ebuild 1406 SHA256 f5ba179524c1b26b6f21744972c3bcd10051dc8b80373928c9d5bcc1d482122f SHA512 68d6d40a81fb2eab3e07094c56f455cc338a2f97165074224843ce2d49c074903c7c2e548a9e17b741d06e74ad8a08c6ccbcada53b78788a8c4dc6c362267f90 WHIRLPOOL d20ad176e4803916b7f3616ef8f091a62ae53401580dc35a98e4ebfbd7021d0ca8634ec0d6abdba8b6fbc673ce471a13c2875483b9a851ec29a9c0106e9ce6fd
+EBUILD x11vnc-0.9.13_p20150627.ebuild 1443 SHA256 f69f574aba3c04f7dc84e303c6aa0a284af4b239a4693dc6d1c26d74c7cbb90f SHA512 aac20a99b96ebf2d3afcb3312c560ccc3dcd472de7576108072d50250a0ff77b54299deb5b69a954286a4323c90a053a6b25bddf3c78af2f4f3bb54694dcac1f WHIRLPOOL 3a9a4f903b9046eca527e3c21e7b8f61a08b87312934d021e206dabecc2875ba8a33f1d4ef9936083fa8a6235868d1b7070bd5f67c752f671db94e158b0df297
+EBUILD x11vnc-0.9.14-r1.ebuild 1782 SHA256 03fbfd0162ed12c7cccd36988f5f7449f32fe8f8fd219f98e7dbf02e6f563d97 SHA512 2b85f091aa6e2897dda824785206caf90679f5e50a5ed6017148392d5d03c3dd26e80ebaebd716d33225afb32137c211a2b4c77485712cf687cfff83c7ac2940 WHIRLPOOL 7904f34703f25562ad91bdfbdbe0fdda12dac48be870be967ba9f369aed8859e77d16784b521647e7134e8afc456fdbe831d42f02c147b9e52f86475d26709b5
+EBUILD x11vnc-0.9.14.ebuild 1505 SHA256 b3ba0566ec133bb60b9ebe4c6bbba3b34586393fbb5a4a3fe87d149a83663d7f SHA512 4030f7f0e99f407614b74798c0b39d38c3025489b5467948bc30107e47ba1105b4fac539f5e8a97626ad6718cda5fee72ae1d561ce709da953c74d62b5401114 WHIRLPOOL 93f25db4c357996b2461f9f7a74cc90244630aece5d7d4d93c567f1fe4340ac04ee3d8fa3f3a8fc2c1ec36745c6815c8663dac0bf5369fa3d76a937c7c12ba46
+MISC ChangeLog 4472 SHA256 2f8c673239a2d52fcd8031da8c29d34ef2f871da60172be12133614248512daf SHA512 a0c161797e3185dfdd4bfcebef8400fe22685aa24a67ec2e4c33f866c4ae1b7288aeea8307b92db6b531aed48577776e481035ba6f849d1520f0002332a096aa WHIRLPOOL 5f439c5ef91df19a5f9797f38a4b573f188da578f539d190fda5816964bf9bfd059a6e0d82d9f836343b27ae0222c85e50efaf804bbc7c7b22979dcd9896199f
+MISC ChangeLog-2015 16652 SHA256 6e144c043741ba849817f72760fd0a7678cd356be2db07656ffe8bdac2b6a782 SHA512 9342adf2a8833e80fd662bf63a6e18766ad58bb4d3d91b2dcb67efc197bcd1f5cc576c7174107814e1b5d845290e8c7e1e86399174d605d0bc0843e8fd405781 WHIRLPOOL a37a6ccb5fa7fc4daf6d75abd07c11fcdc582cd9e4a3b6559804a886a97c409591d1d3d4e86fe0a89504f085ef28ea022dc603b3d84fea6435b1e33e7c73b740
+MISC metadata.xml 756 SHA256 13dd31940f0ffc2eb5dae7008cbc84c2146a20cfdd0b920189c032ac04c1a26a SHA512 a5d38752cb83eaa2592dd94248414b6552d9abc06be9044a264f4d73e361c42f4c17d013cddd143b7501106912426b8943e5df923586b758847c4b66a45af573 WHIRLPOOL 63e0e362012e7110ceaf3df7e82d7ab97d49abcd1ac8f31e2588953fbfa30f20ef8436b218c3bfb7e813b8ffca7f3ac03389a367ddf0c7fc40bed69d67731880
diff --git a/x11-misc/x11vnc/files/x11vnc-0.9.14-r1-fixdefines.patch b/x11-misc/x11vnc/files/x11vnc-0.9.14-r1-fixdefines.patch
new file mode 100644
index 0000000..a4836f0
--- /dev/null
+++ b/x11-misc/x11vnc/files/x11vnc-0.9.14-r1-fixdefines.patch
@@ -0,0 +1,259 @@
+From e70123d8f778e3f0c3bf1606f68a70b0d9748c6a Mon Sep 17 00:00:00 2001
+From: Christian Beier <[e-mail]>
+Date: Tue, 1 Dec 2015 14:14:00 +0100
+Subject: [PATCH] Fix the remaining x11vnc-specific defines that are not in
+ LibVNCServer anymore.
+
+---
+ src/macosx.c        |  4 ++--
+ src/macosx_opengl.c |  2 +-
+ src/screen.c        |  2 +-
+ src/uinput.c        |  4 ++--
+ src/unixpw.c        | 30 +++++++++++++++---------------
+ src/user.c          |  6 +++---
+ src/v4l.c           |  2 +-
+ src/x11vnc.h        |  8 ++++----
+ 8 files changed, 29 insertions(+), 29 deletions(-)
+
+diff --git a/src/macosx.c b/src/macosx.c
+index 6645018..df622db 100644
+--- a/src/macosx.c
++++ b/src/macosx.c
+@@ -33,7 +33,7 @@ so, delete this exception statement from your version.
+ /* -- macosx.c -- */
+ 
+ #include "config.h"
+-#if (defined(__MACH__) && defined(__APPLE__) && defined(LIBVNCSERVER_HAVE_MACOSX_NATIVE_DISPLAY))
++#if (defined(__MACH__) && defined(__APPLE__) && defined(HAVE_MACOSX_NATIVE_DISPLAY))
+ 
+ #define DOMAC 1
+ 
+@@ -748,5 +748,5 @@ int macosx_check_clipped(int win, int *list, int n) {
+ }
+ 
+ 
+-#endif 	/* LIBVNCSERVER_HAVE_MACOSX_NATIVE_DISPLAY */
++#endif 	/* HAVE_MACOSX_NATIVE_DISPLAY */
+ 
+diff --git a/src/macosx_opengl.c b/src/macosx_opengl.c
+index 9788279..4efc7be 100644
+--- a/src/macosx_opengl.c
++++ b/src/macosx_opengl.c
+@@ -38,7 +38,7 @@ so, delete this exception statement from your version.
+ #include <ApplicationServices/ApplicationServices.h>
+ 
+ #include <rfb/rfb.h>
+-#if LIBVNCSERVER_HAVE_MACOSX_OPENGL_H
++#if HAVE_MACOSX_OPENGL_H
+ #include <OpenGL/OpenGL.h>
+ #include <OpenGL/gl.h>
+ #endif
+diff --git a/src/screen.c b/src/screen.c
+index 5d37761..bda4690 100644
+--- a/src/screen.c
++++ b/src/screen.c
+@@ -2119,7 +2119,7 @@ if (db) fprintf(stderr, "initialize_raw_fb reset\n");
+ 
+ 	if (sscanf(str, "shm:%d", &shmid) == 1) {
+ 		/* shm:N */
+-#if HAVE_XSHM || LIBVNCSERVER_HAVE_SHMAT
++#if HAVE_XSHM || HAVE_SHMAT
+ 		raw_fb_addr = (char *) shmat(shmid, 0, SHM_RDONLY);
+ 		if (! raw_fb_addr) {
+ 			rfbLogEnable(1);
+diff --git a/src/uinput.c b/src/uinput.c
+index ac0324f..d9e2b26 100644
+--- a/src/uinput.c
++++ b/src/uinput.c
+@@ -42,8 +42,8 @@ so, delete this exception statement from your version.
+ #include "allowed_input_t.h"
+ 
+ #if LIBVNCSERVER_HAVE_SYS_IOCTL_H
+-#if LIBVNCSERVER_HAVE_LINUX_INPUT_H
+-#if LIBVNCSERVER_HAVE_LINUX_UINPUT_H
++#if HAVE_LINUX_INPUT_H
++#if HAVE_LINUX_UINPUT_H
+ #define UINPUT_OK
+ #endif
+ #endif
+diff --git a/src/unixpw.c b/src/unixpw.c
+index 3a54880..66b776f 100644
+--- a/src/unixpw.c
++++ b/src/unixpw.c
+@@ -62,14 +62,14 @@ extern char *crypt(const char*, const char *);
+ #endif
+ 
+ #ifdef IGNORE_GETSPNAM
+-#undef LIBVNCSERVER_HAVE_GETSPNAM
+-#define LIBVNCSERVER_HAVE_GETSPNAM 0
++#undef HAVE_GETSPNAM
++#define HAVE_GETSPNAM 0
+ #endif
+ 
+-#if LIBVNCSERVER_HAVE_PWD_H && LIBVNCSERVER_HAVE_GETPWNAM
++#if LIBVNCSERVER_HAVE_PWD_H && HAVE_GETPWNAM
+ #if LIBVNCSERVER_HAVE_CRYPT || LIBVNCSERVER_HAVE_LIBCRYPT || HAVE_LIBCRYPT
+ #define UNIXPW_CRYPT
+-#if LIBVNCSERVER_HAVE_GETSPNAM
++#if HAVE_GETSPNAM
+ #include <shadow.h>
+ #endif
+ #endif
+@@ -78,10 +78,10 @@ extern char *crypt(const char*, const char *);
+ #if LIBVNCSERVER_HAVE_SYS_IOCTL_H
+ #include <sys/ioctl.h>
+ #endif
+-#if LIBVNCSERVER_HAVE_TERMIOS_H
++#if HAVE_TERMIOS_H
+ #include <termios.h>
+ #endif
+-#if LIBVNCSERVER_HAVE_SYS_STROPTS_H
++#if HAVE_SYS_STROPTS_H
+ #include <sys/stropts.h>
+ #endif
+ 
+@@ -520,7 +520,7 @@ char *get_pty_ptmx(int *fd_p) {
+ 
+ 	*fd_p = -1;
+ 
+-#if LIBVNCSERVER_HAVE_GRANTPT
++#if HAVE_GRANTPT
+ 
+ 	for (i=0; i < ndevs; i++) {
+ #ifdef O_NOCTTY
+@@ -628,7 +628,7 @@ char *get_pty(int *fd_p) {
+ #ifdef IS_BSD
+ 	return get_pty_loop(fd_p);
+ #else
+-#if LIBVNCSERVER_HAVE_GRANTPT
++#if HAVE_GRANTPT
+ 	used_get_pty_ptmx = 1;
+ 	return get_pty_ptmx(fd_p);
+ #else
+@@ -644,16 +644,16 @@ void try_to_be_nobody(void) {
+ 	pw = getpwnam("nobody");
+ 
+ 	if (pw) {
+-#if LIBVNCSERVER_HAVE_SETUID
++#if HAVE_SETUID
+ 		setuid(pw->pw_uid);
+ #endif
+-#if LIBVNCSERVER_HAVE_SETEUID
++#if HAVE_SETEUID
+ 		seteuid(pw->pw_uid);
+ #endif
+-#if LIBVNCSERVER_HAVE_SETGID
++#if HAVE_SETGID
+ 		setgid(pw->pw_gid);
+ #endif
+-#if LIBVNCSERVER_HAVE_SETEGID
++#if HAVE_SETEGID
+ 		setegid(pw->pw_gid);
+ #endif
+ 	}
+@@ -788,7 +788,7 @@ int crypt_verify(char *user, char *pass) {
+ 
+ 	if (strlen(realpw) < 12) {
+ 		/* e.g. "x", try getspnam(), sometimes root for inetd, etc */
+-#if LIBVNCSERVER_HAVE_GETSPNAM
++#if HAVE_GETSPNAM
+ 		struct spwd *sp = getspnam(user);
+ 		if (sp != NULL && sp->sp_pwdp != NULL) {
+ 			if (db) fprintf(stderr, "using getspnam()\n");
+@@ -1086,7 +1086,7 @@ int su_verify(char *user, char *pass, char *cmd, char *rbuf, int *rbuf_size, int
+ 
+ /* streams options fixups, handle cases as they are found: */
+ #if defined(__hpux)
+-#if LIBVNCSERVER_HAVE_SYS_STROPTS_H
++#if HAVE_SYS_STROPTS_H
+ #if LIBVNCSERVER_HAVE_SYS_IOCTL_H && defined(I_PUSH)
+ 		if (used_get_pty_ptmx) {
+ 			ioctl(sfd, I_PUSH, "ptem");
+@@ -1127,7 +1127,7 @@ int su_verify(char *user, char *pass, char *cmd, char *rbuf, int *rbuf_size, int
+ 		chdir("/");
+ 
+ 		try_to_be_nobody();
+-#if LIBVNCSERVER_HAVE_GETUID
++#if HAVE_GETUID
+ 		if (getuid() == 0 || geteuid() == 0) {
+ 			exit(1);
+ 		}
+diff --git a/src/user.c b/src/user.c
+index b759a61..aa14814 100644
+--- a/src/user.c
++++ b/src/user.c
+@@ -140,7 +140,7 @@ void check_switched_user(void) {
+ /* utilities for switching users */
+ static char *get_login_list(int with_display) {
+ 	char *out;
+-#if LIBVNCSERVER_HAVE_UTMPX_H
++#if HAVE_UTMPX_H
+ 	int i, cnt, max = 200, ut_namesize = 32;
+ 	int dpymax = 1000, sawdpy[1000];
+ 	struct utmpx *utx;
+@@ -761,7 +761,7 @@ static int switch_user_env(uid_t uid, gid_t gid, char *name, char *home, int fb_
+ 	int reset_fb = 0;
+ 	int grp_ok = 0;
+ 
+-#if !LIBVNCSERVER_HAVE_SETUID
++#if !HAVE_SETUID
+ 	return 0;
+ #else
+ 	/*
+@@ -773,7 +773,7 @@ static int switch_user_env(uid_t uid, gid_t gid, char *name, char *home, int fb_
+ 		clean_shm(0);
+ 		free_tiles();
+ 	}
+-#if LIBVNCSERVER_HAVE_INITGROUPS
++#if HAVE_INITGROUPS
+ #if LIBVNCSERVER_HAVE_PWD_H
+ 	if (getpwuid(uid) != NULL && getenv("X11VNC_SINGLE_GROUP") == NULL) {
+ 		struct passwd *p = getpwuid(uid);
+diff --git a/src/v4l.c b/src/v4l.c
+index 86c33a6..8a35813 100644
+--- a/src/v4l.c
++++ b/src/v4l.c
+@@ -41,7 +41,7 @@ so, delete this exception statement from your version.
+ #include "keyboard.h"
+ #include "allowed_input_t.h"
+ 
+-#if LIBVNCSERVER_HAVE_LINUX_VIDEODEV_H
++#if HAVE_LINUX_VIDEODEV_H
+ #if LIBVNCSERVER_HAVE_SYS_IOCTL_H
+ #include <sys/ioctl.h>
+ #define CONFIG_VIDEO_V4L1_COMPAT
+diff --git a/src/x11vnc.h b/src/x11vnc.h
+index 7a84703..79319a4 100644
+--- a/src/x11vnc.h
++++ b/src/x11vnc.h
+@@ -255,10 +255,10 @@ so, delete this exception statement from your version.
+ #endif
+ 
+ #if (SMALL_FOOTPRINT > 2)
+-#undef LIBVNCSERVER_HAVE_UTMPX_H
++#undef HAVE_UTMPX_H
+ #undef LIBVNCSERVER_HAVE_PWD_H
+ #undef REMOTE_CONTROL
+-#define LIBVNCSERVER_HAVE_UTMPX_H 0
++#define HAVE_UTMPX_H 0
+ #define LIBVNCSERVER_HAVE_PWD_H 0
+ #define REMOTE_CONTROL 0
+ #endif
+@@ -308,7 +308,7 @@ so, delete this exception statement from your version.
+ #include <sys/shm.h>
+ #include <X11/extensions/XShm.h>
+ #endif
+-#if LIBVNCSERVER_HAVE_SHMAT
++#if HAVE_SHMAT
+ #include <sys/ipc.h>
+ #include <sys/shm.h>
+ #endif
+@@ -392,7 +392,7 @@ extern int h_errno;
+ #if LIBVNCSERVER_HAVE_SYS_WAIT_H
+ #include <sys/wait.h>
+ #endif
+-#if LIBVNCSERVER_HAVE_UTMPX_H
++#if HAVE_UTMPX_H
+ #include <utmpx.h>
+ #endif
+ 
diff --git a/x11-misc/x11vnc/files/x11vnc-0.9.14-r1-waitpid.patch b/x11-misc/x11vnc/files/x11vnc-0.9.14-r1-waitpid.patch
new file mode 100644
index 0000000..dc526f9
--- /dev/null
+++ b/x11-misc/x11vnc/files/x11vnc-0.9.14-r1-waitpid.patch
@@ -0,0 +1,45 @@
+From a6852d61dce708bf5185a7e42770475a070433bc Mon Sep 17 00:00:00 2001
+From: Christian Beier <[e-mail]>
+Date: Fri, 27 Nov 2015 15:57:51 +0100
+Subject: [PATCH] Fix the remaining HAVE_WAITPID occurences.
+
+---
+ src/sslhelper.c | 4 ++--
+ src/unixpw.c    | 2 +-
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/sslhelper.c b/src/sslhelper.c
+index bae897f..8045d77 100644
+--- a/src/sslhelper.c
++++ b/src/sslhelper.c
+@@ -2964,7 +2964,7 @@ void ssl_helper_pid(pid_t pid, int sock) {
+ 					}
+ 				}
+ 
+-#if LIBVNCSERVER_HAVE_SYS_WAIT_H && LIBVNCSERVER_HAVE_WAITPID 
++#if LIBVNCSERVER_HAVE_SYS_WAIT_H && HAVE_WAITPID
+ 				wret = waitpid(helpers[i], &status, WNOHANG); 
+ 
+ if (db) fprintf(stderr, "waitpid(%d)\n", helpers[i]);
+@@ -3000,7 +3000,7 @@ if (db) fprintf(stderr, "ssl_helper_pid(%d, %d)\n", pid, sock);
+ 	for (i=0; i < HPSIZE; i++) {
+ 		if (helpers[i] == pid) {
+ 			if (sock == -1) {
+-#if LIBVNCSERVER_HAVE_SYS_WAIT_H && LIBVNCSERVER_HAVE_WAITPID 
++#if LIBVNCSERVER_HAVE_SYS_WAIT_H && HAVE_WAITPID
+ 				pid_t wret;
+ 				wret = waitpid(helpers[i], &status, WNOHANG); 
+ 
+diff --git a/src/unixpw.c b/src/unixpw.c
+index 4267b5c..3a54880 100644
+--- a/src/unixpw.c
++++ b/src/unixpw.c
+@@ -56,7 +56,7 @@ extern char *crypt(const char*, const char *);
+ #include "default8x16.h"
+ 
+ #if LIBVNCSERVER_HAVE_FORK
+-#if LIBVNCSERVER_HAVE_SYS_WAIT_H && LIBVNCSERVER_HAVE_WAITPID
++#if LIBVNCSERVER_HAVE_SYS_WAIT_H && HAVE_WAITPID
+ #define UNIXPW_SU
+ #endif
+ #endif
diff --git a/x11-misc/x11vnc/x11vnc-0.9.14-r1.ebuild b/x11-misc/x11vnc/x11vnc-0.9.14-r1.ebuild
new file mode 100644
index 0000000..633e87c
--- /dev/null
+++ b/x11-misc/x11vnc/x11vnc-0.9.14-r1.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit autotools eutils vcs-snapshot
+
+DESCRIPTION="A VNC server for real X displays"
+HOMEPAGE="https://libvnc.github.io/"
+SRC_URI="https://github.com/LibVNC/x11vnc/archive/0.9.14.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="avahi crypt fbcon libressl ssl xinerama"
+
+RDEPEND=">=net-libs/libvncserver-0.9.8
+	x11-libs/libX11
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXrandr
+	>=x11-libs/libXtst-1.1.0
+	avahi? ( >=net-dns/avahi-0.6.4 )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:= )
+	)
+	xinerama? ( x11-libs/libXinerama )"
+DEPEND="${RDEPEND}
+	x11-libs/libXt
+	x11-proto/inputproto
+	x11-proto/trapproto
+	x11-proto/recordproto
+	x11-proto/xproto
+	x11-proto/xextproto
+	xinerama? ( x11-proto/xineramaproto )"
+
+DOCS=(ChangeLog README)
+
+src_prepare() {
+	# https://github.com/LibVNC/x11vnc/commit/e70123d8f778e3f0c3bf1606f68a70b0d9748c6a
+	epatch "${FILESDIR}/x11vnc-0.9.14-r1-fixdefines.patch"
+	# https://github.com/LibVNC/x11vnc/commit/a6852d61dce708bf5185a7e42770475a070433bc
+	epatch "${FILESDIR}/x11vnc-0.9.14-r1-waitpid.patch"
+	eautoreconf
+}
+
+src_configure() {
+	# --without-v4l because of missing video4linux 2.x support wrt #389079
+	econf \
+		$(use_with avahi) \
+		$(use_with crypt) \
+		$(use_with fbcon fbdev) \
+		$(use_with ssl) \
+		$(use_with ssl crypto) \
+		--without-v4l \
+		$(use_with xinerama)
+}
+
+src_install() {
+	default
+	doinitd "${FILESDIR}/x11vnc.init.d"
+	doconfd "${FILESDIR}/x11vnc.conf.d"
+}
-- 
2.4.10