CVS commit: pkgsrc/net/libvncserver

["Manuel Bouyer" <bouyer%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   bouyer
Date:           Wed Jul 18 17:55:54 UTC 2018

Modified Files:
        pkgsrc/net/libvncserver: Makefile distinfo
Added Files:
        pkgsrc/net/libvncserver/patches: patch-rfb_rfbproto.h

Log Message:
NetBSD doens't define __BYTE_ORDER nor __BIG_ENDIAN, so the test
# if __BYTE_ORDER == __BIG_ENDIAN
is always true, and e.g. x11vnc wrongly sets bigEndian in the wire
strucure, causing clients to fail.
Check that __BYTE_ORDER is defined before using it, and add a test for
_BYTE_ORDER too.
Bump PKGREVISION


To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 pkgsrc/net/libvncserver/Makefile
cvs rdiff -u -r1.14 -r1.15 pkgsrc/net/libvncserver/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/net/libvncserver/patches/patch-rfb_rfbproto.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/net/libvncserver/Makefile
diff -u pkgsrc/net/libvncserver/Makefile:1.24 pkgsrc/net/libvncserver/Makefile:1.25
--- pkgsrc/net/libvncserver/Makefile:1.24       Tue Apr 17 22:29:33 2018
+++ pkgsrc/net/libvncserver/Makefile    Wed Jul 18 17:55:54 2018
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.24 2018/04/17 22:29:33 wiz Exp $
+# $NetBSD: Makefile,v 1.25 2018/07/18 17:55:54 bouyer Exp $
 #
 
 DISTNAME=              libvncserver-LibVNCServer-0.9.11
 PKGNAME=               libVNCServer-0.9.11
-PKGREVISION=           1
+PKGREVISION=           2
 CATEGORIES=            net
 MASTER_SITES=          ${MASTER_SITE_GITHUB:=LibVNC/}
 GITHUB_PROJECT=                libvncserver

Index: pkgsrc/net/libvncserver/distinfo
diff -u pkgsrc/net/libvncserver/distinfo:1.14 pkgsrc/net/libvncserver/distinfo:1.15
--- pkgsrc/net/libvncserver/distinfo:1.14       Tue Jan  2 10:09:06 2018
+++ pkgsrc/net/libvncserver/distinfo    Wed Jul 18 17:55:54 2018
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.14 2018/01/02 10:09:06 jperkin Exp $
+$NetBSD: distinfo,v 1.15 2018/07/18 17:55:54 bouyer Exp $
 
 SHA1 (libvncserver-LibVNCServer-0.9.11.tar.gz) = d844a2c9e69465d104a8468dce515a49e4db9585
 RMD160 (libvncserver-LibVNCServer-0.9.11.tar.gz) = a26da5e88d6571d112dfc48ef94a527b19760a36
 SHA512 (libvncserver-LibVNCServer-0.9.11.tar.gz) = e473c081b68dd3cdd96a1756b4f4945ece79d3c8e4cef62140be1699671555fc16d3080e81d764197a14ea83203ffcd0e18c3cc182e012d036e3faae943003fb
 Size (libvncserver-LibVNCServer-0.9.11.tar.gz) = 1413739 bytes
 SHA1 (patch-libvncserver_websockets.c) = eb4e50f8fcb8442dae54d1360e6950e2ebd4778b
+SHA1 (patch-rfb_rfbproto.h) = 6dcc68a90d444f88ab696616b1aee3eb66708877

Added files:

Index: pkgsrc/net/libvncserver/patches/patch-rfb_rfbproto.h
diff -u /dev/null pkgsrc/net/libvncserver/patches/patch-rfb_rfbproto.h:1.1
--- /dev/null   Wed Jul 18 17:55:54 2018
+++ pkgsrc/net/libvncserver/patches/patch-rfb_rfbproto.h        Wed Jul 18 17:55:54 2018
@@ -0,0 +1,18 @@
+$NetBSD: patch-rfb_rfbproto.h,v 1.1 2018/07/18 17:55:54 bouyer Exp $
+Fix endianess detection on NetBSD
+
+--- rfb/rfbproto.h.orig        2018-07-18 19:35:56.445752955 +0200
++++ rfb/rfbproto.h     2018-07-18 19:36:17.076925368 +0200
+@@ -82,8 +82,11 @@
+ #endif
+ 
+ #if LIBVNCSERVER_HAVE_ENDIAN_H
++#define _XOPEN_SOURCE
+ # include <endian.h>
+-# if __BYTE_ORDER == __BIG_ENDIAN
++# if defined(__BYTE_ORDER) && __BYTE_ORDER == __BIG_ENDIAN
++#  define LIBVNCSERVER_WORDS_BIGENDIAN 1
++# elsif defined(_BYTE_ORDER) && BYTE_ORDER == BIG_ENDIAN
+ #  define LIBVNCSERVER_WORDS_BIGENDIAN 1
+ # endif
+ #endif