diff options
| author |   Sven Wegener <swegener@gentoo.org> | 2007-07-20 19:24:17 +0000 |
|---|---|---|
| committer | Sven Wegener <swegener@gentoo.org> | 2007-07-20 19:24:17 +0000 |
| commit | 3ca559913cab4c2041bb0683f4d468b3b7ca13ce (patch) | |
| tree | 788439e9dad1e08cb09b104098bf150a5051c45f /x11-misc/x11vnc | |
| parent | Stable on sparc (diff) | |
| download | gentoo-2-3ca559913cab4c2041bb0683f4d468b3b7ca13ce.tar.gz gentoo-2-3ca559913cab4c2041bb0683f4d468b3b7ca13ce.tar.bz2 gentoo-2-3ca559913cab4c2041bb0683f4d468b3b7ca13ce.zip | |
Pull in a fix from upstream to fix building with USE="-ssl", bug #180770.
(Portage version: 7278-svn)
Diffstat (limited to 'x11-misc/x11vnc')
| -rw-r--r-- | x11-misc/x11vnc/ChangeLog | 6 | ||||
| -rw-r--r-- | x11-misc/x11vnc/files/x11vnc-0.9.1-ssl.patch | 32 | ||||
| -rw-r--r-- | x11-misc/x11vnc/x11vnc-0.9.1.ebuild | 11 |
3 files changed, 47 insertions, 2 deletions
diff --git a/x11-misc/x11vnc/ChangeLog b/x11-misc/x11vnc/ChangeLog index e99878a72255..c51ef41e5539 100644 --- a/x11-misc/x11vnc/ChangeLog +++ b/x11-misc/x11vnc/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-misc/x11vnc # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/x11vnc/ChangeLog,v 1.42 2007/07/06 17:03:06 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-misc/x11vnc/ChangeLog,v 1.43 2007/07/20 19:24:17 swegener Exp $ + + 20 Jul 2007; Sven Wegener <swegener@gentoo.org> + +files/x11vnc-0.9.1-ssl.patch, x11vnc-0.9.1.ebuild: + Pull in a fix from upstream to fix building with USE="-ssl", bug #180770. 06 Jul 2007; Raúl Porcel <armin76@gentoo.org> x11vnc-0.9.2-r1.ebuild: Readd ~ia64 wrt #183009 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; diff --git a/x11-misc/x11vnc/x11vnc-0.9.1.ebuild b/x11-misc/x11vnc/x11vnc-0.9.1.ebuild index 16252898f92c..dc0e551af7f8 100644 --- a/x11-misc/x11vnc/x11vnc-0.9.1.ebuild +++ b/x11-misc/x11vnc/x11vnc-0.9.1.ebuild @@ -1,6 +1,8 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/x11vnc/x11vnc-0.9.1.ebuild,v 1.2 2007/06/25 14:28:06 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-misc/x11vnc/x11vnc-0.9.1.ebuild,v 1.3 2007/07/20 19:24:17 swegener Exp $ + +inherit eutils DESCRIPTION="A VNC server for real X displays" HOMEPAGE="http://www.karlrunge.com/x11vnc/" @@ -41,6 +43,13 @@ DEPEND="${RDEPEND} virtual/x11 )" +src_unpack() { + unpack ${A} + cd "${S}" + + epatch "${FILESDIR}"/${P}-ssl.patch +} + src_compile() { econf \ $(use_with avahi) \ |