diff options
| author | sborrill <sborrill@pkgsrc.org> | 2012-11-08 12:56:21 +0000 |
|---|---|---|
| committer | sborrill <sborrill@pkgsrc.org> | 2012-11-08 12:56:21 +0000 |
| commit | cfc7ecd32b627a66d0c15097f3a1706052dae9ef (patch) | |
| tree | 85d0e35dfac541dc529002ce227f328ffe5e6159 /x11 | |
| parent | 57086f1b139db73a0d02b0f9a796d4ebaf79f886 (diff) | |
| download | pkgsrc-cfc7ecd32b627a66d0c15097f3a1706052dae9ef.tar.gz | |
Properly disable IPv6 if inet6 option is not selected.
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/x11vnc/distinfo | 3 | ||||
| -rw-r--r-- | x11/x11vnc/options.mk | 3 | ||||
| -rw-r--r-- | x11/x11vnc/patches/patch-enc.h | 24 |
3 files changed, 28 insertions, 2 deletions
diff --git a/x11/x11vnc/distinfo b/x11/x11vnc/distinfo index 9c0882bf537..44c89aa3880 100644 --- a/x11/x11vnc/distinfo +++ b/x11/x11vnc/distinfo @@ -1,5 +1,6 @@ -$NetBSD: distinfo,v 1.18 2011/09/13 09:17:26 obache Exp $ +$NetBSD: distinfo,v 1.19 2012/11/08 12:56:21 sborrill Exp $ SHA1 (x11vnc-0.9.13.tar.gz) = f011d81488ac94dc8dce2d88739c23bd85a976fa RMD160 (x11vnc-0.9.13.tar.gz) = 5819a4ae85b25b41fb747ccafd27e228c3ee888e Size (x11vnc-0.9.13.tar.gz) = 2853769 bytes +SHA1 (patch-enc.h) = 5de28d00f5025357a41d3909a554f7dd67d70e0b diff --git a/x11/x11vnc/options.mk b/x11/x11vnc/options.mk index a4070cc9102..be781cd6b4e 100644 --- a/x11/x11vnc/options.mk +++ b/x11/x11vnc/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.4 2012/11/08 10:43:50 sborrill Exp $ +# $NetBSD: options.mk,v 1.5 2012/11/08 12:56:21 sborrill Exp $ # PKG_OPTIONS_VAR= PKG_OPTIONS.x11vnc @@ -16,6 +16,7 @@ CONFIGURE_ARGS+= --without-avahi .if empty(PKG_OPTIONS:Minet6) CONFIGURE_ARGS+= --without-ipv6 +CPPFLAGS+= -DX11VNC_IPV6=0 .endif .if !empty(PKG_OPTIONS:Mx11) diff --git a/x11/x11vnc/patches/patch-enc.h b/x11/x11vnc/patches/patch-enc.h new file mode 100644 index 00000000000..f7213385072 --- /dev/null +++ b/x11/x11vnc/patches/patch-enc.h @@ -0,0 +1,24 @@ +$NetBSD: patch-enc.h,v 1.1 2012/11/08 12:56:21 sborrill Exp $ + +Respect IPv6 build option used throughout rest of x11vnc + +--- x11vnc/enc.h.orig 2011-08-10 23:31:32.000000000 +0100 ++++ x11vnc/enc.h 2012-11-08 12:36:25.000000000 +0000 +@@ -1733,7 +1733,7 @@ + } + + try6: +-#ifdef AF_INET6 ++#if X11VNC_IPV6 && defined(AF_INET6) + if (!getenv("ULTRAVNC_DSM_HELPER_NOIPV6")) { + struct sockaddr_in6 sin; + int one = 1, sock = -1; +@@ -1826,7 +1826,7 @@ + exit(1); + } + } else if (FD_ISSET(listen_fd6, &fds)) { +-#ifdef AF_INET6 ++#if X11VNC_IPV6 && defined(AF_INET6) + struct sockaddr_in6 addr; + socklen_t addrlen = sizeof(addr); + |