svn commit: r445054 - in head/net/libvncserver: . files
Marcelo Araujo
araujo at FreeBSD.org
Wed Jul 5 08:04:38 UTC 2017
Author: araujo
Date: Wed Jul 5 08:04:36 2017
New Revision: 445054
URL: https://svnweb.freebsd.org/changeset/ports/445054
Log:
- Add few patches that fixes some usability such like md5 and sha1 when
we use the shared library with dlopen(3).
- Bump PORTREVISION.
Sponsored by: iXsystems, Inc.
Added:
head/net/libvncserver/files/
head/net/libvncserver/files/patch-common_md5.c (contents, props changed)
head/net/libvncserver/files/patch-common_md5.h (contents, props changed)
head/net/libvncserver/files/patch-common_vncauth.c (contents, props changed)
head/net/libvncserver/files/patch-rfb_rfb.h (contents, props changed)
Modified:
head/net/libvncserver/Makefile
Modified: head/net/libvncserver/Makefile
==============================================================================
--- head/net/libvncserver/Makefile Wed Jul 5 07:53:45 2017 (r445053)
+++ head/net/libvncserver/Makefile Wed Jul 5 08:04:36 2017 (r445054)
@@ -3,6 +3,7 @@
PORTNAME= libvncserver
PORTVERSION= 0.9.11
+PORTREVISION= 1
DISTVERSIONPREFIX= LibVNCServer-
CATEGORIES= net devel
Added: head/net/libvncserver/files/patch-common_md5.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/net/libvncserver/files/patch-common_md5.c Wed Jul 5 08:04:36 2017 (r445054)
@@ -0,0 +1,11 @@
+--- common/md5.c.orig 2017-07-05 07:48:23 UTC
++++ common/md5.c
+@@ -29,7 +29,7 @@
+ #include "md5.h"
+
+ /* #ifdef _LIBC */
+-# include <endian.h>
++# include <sys/endian.h>
+ # if __BYTE_ORDER == __BIG_ENDIAN
+ # define WORDS_BIGENDIAN 1
+ # endif
Added: head/net/libvncserver/files/patch-common_md5.h
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/net/libvncserver/files/patch-common_md5.h Wed Jul 5 08:04:36 2017 (r445054)
@@ -0,0 +1,59 @@
+--- common/md5.h.orig 2017-07-05 07:48:49 UTC
++++ common/md5.h
+@@ -98,21 +98,21 @@ struct md5_ctx
+
+ /* Initialize structure containing state of computation.
+ (RFC 1321, 3.3: Step 3) */
+-extern void __md5_init_ctx (struct md5_ctx *ctx) __THROW;
++extern void __md5_init_ctx (struct md5_ctx *ctx) ;
+
+ /* Starting with the result of former calls of this function (or the
+ initialization function update the context for the next LEN bytes
+ starting at BUFFER.
+ It is necessary that LEN is a multiple of 64!!! */
+ extern void __md5_process_block (const void *buffer, size_t len,
+- struct md5_ctx *ctx) __THROW;
++ struct md5_ctx *ctx) ;
+
+ /* Starting with the result of former calls of this function (or the
+ initialization function update the context for the next LEN bytes
+ starting at BUFFER.
+ It is NOT required that LEN is a multiple of 64. */
+ extern void __md5_process_bytes (const void *buffer, size_t len,
+- struct md5_ctx *ctx) __THROW;
++ struct md5_ctx *ctx) ;
+
+ /* Process the remaining bytes in the buffer and put result from CTX
+ in first 16 bytes following RESBUF. The result is always in little
+@@ -121,7 +121,7 @@ extern void __md5_process_bytes (const void *buffer, s
+
+ IMPORTANT: On some systems it is required that RESBUF is correctly
+ aligned for a 32 bits value. */
+-extern void *__md5_finish_ctx (struct md5_ctx *ctx, void *resbuf) __THROW;
++extern void *__md5_finish_ctx (struct md5_ctx *ctx, void *resbuf) ;
+
+
+ /* Put result from CTX in first 16 bytes following RESBUF. The result is
+@@ -130,19 +130,19 @@ extern void *__md5_finish_ctx (struct md5_ctx *ctx, vo
+
+ IMPORTANT: On some systems it is required that RESBUF is correctly
+ aligned for a 32 bits value. */
+-extern void *__md5_read_ctx (const struct md5_ctx *ctx, void *resbuf) __THROW;
++extern void *__md5_read_ctx (const struct md5_ctx *ctx, void *resbuf) ;
+
+
+ /* Compute MD5 message digest for bytes read from STREAM. The
+ resulting message digest number will be written into the 16 bytes
+ beginning at RESBLOCK. */
+-extern int __md5_stream (FILE *stream, void *resblock) __THROW;
++extern int __md5_stream (FILE *stream, void *resblock) ;
+
+ /* Compute MD5 message digest for LEN bytes beginning at BUFFER. The
+ result is always in little endian byte order, so that a byte-wise
+ output yields to the wanted ASCII representation of the message
+ digest. */
+ extern void *__md5_buffer (const char *buffer, size_t len,
+- void *resblock) __THROW;
++ void *resblock) ;
+
+ #endif /* md5.h */
Added: head/net/libvncserver/files/patch-common_vncauth.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/net/libvncserver/files/patch-common_vncauth.c Wed Jul 5 08:04:36 2017 (r445054)
@@ -0,0 +1,22 @@
+--- common/vncauth.c.orig 2017-07-05 07:43:58 UTC
++++ common/vncauth.c
+@@ -42,6 +42,10 @@
+ #include <sys/stat.h>
+ #endif
+
++#ifdef __FreeBSD__
++#include <fcntl.h>
++#endif
++
+ #include <time.h>
+
+ #ifdef WIN32
+@@ -196,6 +200,8 @@ rfbEncryptBytes(unsigned char *bytes, char *passwd)
+ rfbDes(bytes+i, bytes+i);
+ }
+ }
++
++void rfbEncryptBytes2(unsigned char *, const int, unsigned char *);
+
+ void
+ rfbEncryptBytes2(unsigned char *where, const int length, unsigned char *key) {
Added: head/net/libvncserver/files/patch-rfb_rfb.h
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/net/libvncserver/files/patch-rfb_rfb.h Wed Jul 5 08:04:36 2017 (r445054)
@@ -0,0 +1,20 @@
+--- rfb/rfb.h.orig 2017-07-05 07:45:47 UTC
++++ rfb/rfb.h
+@@ -43,7 +43,7 @@ extern "C"
+ #include <string.h>
+ #include <rfb/rfbproto.h>
+
+-#if defined(ANDROID) || defined(LIBVNCSERVER_HAVE_ANDROID)
++#if defined(ANDROID) || defined(LIBVNCSERVER_HAVE_ANDROID) || defined(__FreeBSD__)
+ #include <arpa/inet.h>
+ #include <sys/select.h>
+ #endif
+@@ -265,6 +265,8 @@ typedef struct _rfbScreenInfo
+ rfbBool autoPort;
+ int port;
+ SOCKET listenSock;
++ SOCKET unixSock;
++ const char *unixSockPath;
+ int maxSock;
+ int maxFd;
+ #ifdef WIN32
More information about the svn-ports-head
mailing list