Attachment 201108 Details for Bug 234929 – Update to 0.9.12

[patch] Update to 0.9.12

0001-Update-net-libvncserver-to-0.9.12.patch (text/plain), 12.16 KB, created by Derek Schrock on 2019-01-14 00:44:24 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Derek Schrock

Created: 2019-01-14 00:44:24 UTC

Size: 12.16 KB

patch

obsolete

>From fc1747f35b2331ae90e9bab67cd1dd904a38260a Mon Sep 17 00:00:00 2001
>From: Derek Schrock <dereks@lifeofadishwasher.com>
>Date: Sun, 6 Jan 2019 20:55:16 -0500
>Subject: [PATCH] Update net/libvncserver to 0.9.12
>
>- Update to 0.9.12 [1]
>- cmake is the new build system
>- portlint clean up
>- patch-common_md5* is now in upstream
>- lzo2 is now included via a shared lib
>- libva removed in 0.9.11
>
>[1] - https://github.com/LibVNC/libvncserver/releases/tag/LibVNCServer-0.9.12
>---
> emulators/aqemu/Makefile                      |  1 +
> emulators/bochs/Makefile                      |  2 +-
> emulators/kcemu/Makefile                      |  2 +-
> emulators/virtualbox-ose/Makefile             |  2 +-
> graphics/osg-devel/Makefile                   |  2 +-
> graphics/osg/Makefile                         |  2 +-
> net/krdc/Makefile                             |  1 +
> net/libvncserver/Makefile                     | 29 ++++-----
> net/libvncserver/distinfo                     |  6 +-
> net/libvncserver/files/patch-common_md5.c     | 11 ----
> net/libvncserver/files/patch-common_md5.h     | 59 -------------------
> net/libvncserver/files/patch-common_vncauth.c |  6 +-
> net/libvncserver/files/patch-rfb_rfb.h        |  4 +-
> net/libvncserver/pkg-plist                    |  7 +--
> net/remmina-plugin-vnc/Makefile               |  1 +
> net/x11vnc/Makefile                           |  1 +
> 16 files changed, 30 insertions(+), 106 deletions(-)
> delete mode 100644 net/libvncserver/files/patch-common_md5.c
> delete mode 100644 net/libvncserver/files/patch-common_md5.h
>
>diff --git a/emulators/aqemu/Makefile b/emulators/aqemu/Makefile
>index 66d1826dd0b7..619804a5342a 100644
>--- a/emulators/aqemu/Makefile
>+++ b/emulators/aqemu/Makefile
>@@ -3,6 +3,7 @@
> PORTNAME=	aqemu
> DISTVERSIONPREFIX=	v
> DISTVERSION=	0.9.2
>+PORTREVISION=	1
> CATEGORIES=	emulators
> 
> MAINTAINER=	ports@FreeBSD.org
>diff --git a/emulators/bochs/Makefile b/emulators/bochs/Makefile
>index ccb40bb420df..9cc4bba5f5a8 100644
>--- a/emulators/bochs/Makefile
>+++ b/emulators/bochs/Makefile
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	bochs
> PORTVERSION=	2.6.9
>-PORTREVISION=	2
>+PORTREVISION=	3
> PORTEPOCH=	2
> CATEGORIES=	emulators
> MASTER_SITES=	SF
>diff --git a/emulators/kcemu/Makefile b/emulators/kcemu/Makefile
>index fcd91717fb60..a9c8b0ce7fbc 100644
>--- a/emulators/kcemu/Makefile
>+++ b/emulators/kcemu/Makefile
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	kcemu
> PORTVERSION=	0.5.1
>-PORTREVISION=	16
>+PORTREVISION=	17
> CATEGORIES=	emulators
> MASTER_SITES=	SF/${PORTNAME}/KCemu/KCemu-${PORTVERSION}
> DISTNAME=	KCemu-${PORTVERSION}
>diff --git a/emulators/virtualbox-ose/Makefile b/emulators/virtualbox-ose/Makefile
>index 9384da64824b..7bb5323ed798 100644
>--- a/emulators/virtualbox-ose/Makefile
>+++ b/emulators/virtualbox-ose/Makefile
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	virtualbox-ose
> PORTVERSION=	5.2.22
>-PORTREVISION=	2
>+PORTREVISION=	3
> CATEGORIES=	emulators
> MASTER_SITES=	http://download.virtualbox.org/virtualbox/${PORTVERSION}/
> DISTFILES=	VirtualBox-${PORTVERSION}${EXTRACT_SUFX} ${GUESTADDITIONS}
>diff --git a/graphics/osg-devel/Makefile b/graphics/osg-devel/Makefile
>index 8caf143b9827..504062092bae 100644
>--- a/graphics/osg-devel/Makefile
>+++ b/graphics/osg-devel/Makefile
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	osg
> PORTVERSION=	3.5.1
>-PORTREVISION=	7
>+PORTREVISION=	8
> CATEGORIES=	graphics
> MASTER_SITES=	http://trac.openscenegraph.org/downloads/developer_releases/ \
> 		http://mirror.amdmi3.ru/distfiles/
>diff --git a/graphics/osg/Makefile b/graphics/osg/Makefile
>index eb00ea025dc9..35ed42ddc86e 100644
>--- a/graphics/osg/Makefile
>+++ b/graphics/osg/Makefile
>@@ -4,7 +4,7 @@
> PORTNAME=	osg
> PORTVERSION=	3.4.1
> DISTVERSIONPREFIX=	OpenSceneGraph-
>-PORTREVISION=	5
>+PORTREVISION=	6
> CATEGORIES=	graphics
> 
> MAINTAINER=	amdmi3@FreeBSD.org
>diff --git a/net/krdc/Makefile b/net/krdc/Makefile
>index c6be8c14fc56..cbba6cf117a9 100644
>--- a/net/krdc/Makefile
>+++ b/net/krdc/Makefile
>@@ -2,6 +2,7 @@
> 
> PORTNAME=	krdc
> DISTVERSION=	${KDE_APPLICATIONS_VERSION}
>+PORTREVISION=	1
> CATEGORIES=	net kde kde-applications
> 
> MAINTAINER=	kde@FreeBSD.org
>diff --git a/net/libvncserver/Makefile b/net/libvncserver/Makefile
>index 9585f2ce4c84..b8f3b09dddd2 100644
>--- a/net/libvncserver/Makefile
>+++ b/net/libvncserver/Makefile
>@@ -2,8 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	libvncserver
>-PORTVERSION=	0.9.11
>-PORTREVISION=	2
>+PORTVERSION=	0.9.12
> DISTVERSIONPREFIX=	LibVNCServer-
> CATEGORIES=	net devel
> 
>@@ -12,19 +11,16 @@ COMMENT=	Provide an easy API to a custom vnc server
> 
> LICENSE=	GPLv2
> 
>-LIB_DEPENDS=	libpng.so:graphics/png
>+LIB_DEPENDS=	libpng.so:graphics/png \
>+		liblzo2.so:archivers/lzo2
>+
>+USES=		cmake jpeg libtool pathfix pkgconfig
>+USE_LDCONFIG=	yes
> 
> USE_GITHUB=	yes
> GH_ACCOUNT=	LibVNC
> 
>-USES=		autoreconf jpeg libtool pathfix pkgconfig
>-USE_LDCONFIG=	yes
>-GNU_CONFIGURE=	yes
>-CPPFLAGS+=	-I${LOCALBASE}/include
>-LDFLAGS+=	-L${LOCALBASE}/lib
>-INSTALL_TARGET=	install-strip
>-
>-OPTIONS_DEFINE=		GCRYPT IPV6 VAAPI
>+OPTIONS_DEFINE=		GCRYPT IPV6
> OPTIONS_SINGLE=		SSL
> OPTIONS_SINGLE_SSL=	GNUTLS OPENSSL
> OPTIONS_DEFAULT=	OPENSSL
>@@ -32,19 +28,16 @@ GCRYPT_DESC=		libgcrypt support
> 
> GNUTLS_IMPLIES=		GCRYPT
> GNUTLS_LIB_DEPENDS=	libgnutls.so:security/gnutls
>-GNUTLS_CONFIGURE_WITH=	gnutls
>+GNUTLS_CMAKE_BOOL=	WITH_GNUTLS
> 
>-OPENSSL_CONFIGURE_WITH=	crypto ssl
>+OPENSSL_CMAKE_BOOL=	WITH_OPENSSL
> OPENSSL_USES=		ssl
> 
> GCRYPT_LIB_DEPENDS=	libgcrypt.so:security/libgcrypt \
> 			libgpg-error.so:security/libgpg-error
>-GCRYPT_CONFIGURE_WITH=	gcrypt
>-
>-IPV6_CONFIGURE_WITH=	ipv6
>+GCRYPT_CMAKE_BOOL=	WITH_GCRYPT
> 
>-VAAPI_LIB_DEPENDS=	libva.so:multimedia/libva
>-VAAPI_CONFIGURE_WITH=	libva
>+IPV6_CMAKE_BOOL=	WITH_IPv6
> 
> post-install:
> 	${INSTALL_DATA} ${WRKSRC}/rfb/default8x16.h ${STAGEDIR}${PREFIX}/include/rfb
>diff --git a/net/libvncserver/distinfo b/net/libvncserver/distinfo
>index ce60bf65f078..426ca2abeda5 100644
>--- a/net/libvncserver/distinfo
>+++ b/net/libvncserver/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1483637975
>-SHA256 (LibVNC-libvncserver-LibVNCServer-0.9.11_GH0.tar.gz) = 193d630372722a532136fd25c5326b2ca1a636cbb8bf9bb115ef869c804d2894
>-SIZE (LibVNC-libvncserver-LibVNCServer-0.9.11_GH0.tar.gz) = 1413739
>+TIMESTAMP = 1546804739
>+SHA256 (LibVNC-libvncserver-LibVNCServer-0.9.12_GH0.tar.gz) = 33cbbb4e15bb390f723c311b323cef4a43bcf781984f92d92adda3243a116136
>+SIZE (LibVNC-libvncserver-LibVNCServer-0.9.12_GH0.tar.gz) = 2237447
>diff --git a/net/libvncserver/files/patch-common_md5.c b/net/libvncserver/files/patch-common_md5.c
>deleted file mode 100644
>index c2b4aa538622..000000000000
>--- a/net/libvncserver/files/patch-common_md5.c
>+++ /dev/null
>@@ -1,11 +0,0 @@
>---- 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
>diff --git a/net/libvncserver/files/patch-common_md5.h b/net/libvncserver/files/patch-common_md5.h
>deleted file mode 100644
>index 585fa75eeb32..000000000000
>--- a/net/libvncserver/files/patch-common_md5.h
>+++ /dev/null
>@@ -1,59 +0,0 @@
>---- 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 */
>diff --git a/net/libvncserver/files/patch-common_vncauth.c b/net/libvncserver/files/patch-common_vncauth.c
>index ddbe8704295e..19308088150c 100644
>--- a/net/libvncserver/files/patch-common_vncauth.c
>+++ b/net/libvncserver/files/patch-common_vncauth.c
>@@ -1,6 +1,6 @@
>---- common/vncauth.c.orig	2017-07-05 07:43:58 UTC
>+--- common/vncauth.c.orig	2019-01-06 19:09:30 UTC
> +++ common/vncauth.c
>-@@ -42,6 +42,10 @@
>+@@ -44,6 +44,10 @@
>  #include <sys/stat.h>
>  #endif
>  
>@@ -11,7 +11,7 @@
>  #include <time.h>
>  
>  #ifdef WIN32
>-@@ -196,6 +200,8 @@ rfbEncryptBytes(unsigned char *bytes, char *passwd)
>+@@ -198,6 +202,8 @@ rfbEncryptBytes(unsigned char *bytes, char *passwd)
>  	rfbDes(bytes+i, bytes+i);
>      }
>  }
>diff --git a/net/libvncserver/files/patch-rfb_rfb.h b/net/libvncserver/files/patch-rfb_rfb.h
>index 6276f8584c50..f04a6b923ca3 100644
>--- a/net/libvncserver/files/patch-rfb_rfb.h
>+++ b/net/libvncserver/files/patch-rfb_rfb.h
>@@ -1,4 +1,4 @@
>---- rfb/rfb.h.orig	2017-07-05 07:45:47 UTC
>+--- rfb/rfb.h.orig	2019-01-06 19:09:30 UTC
> +++ rfb/rfb.h
> @@ -43,7 +43,7 @@ extern "C"
>  #include <string.h>
>@@ -9,7 +9,7 @@
>  #include <arpa/inet.h>
>  #include <sys/select.h>
>  #endif
>-@@ -265,6 +265,8 @@ typedef struct _rfbScreenInfo
>+@@ -266,6 +266,8 @@ typedef struct _rfbScreenInfo
>      rfbBool autoPort;
>      int port;
>      SOCKET listenSock;
>diff --git a/net/libvncserver/pkg-plist b/net/libvncserver/pkg-plist
>index 3c12a1792837..cb1d35686c09 100644
>--- a/net/libvncserver/pkg-plist
>+++ b/net/libvncserver/pkg-plist
>@@ -1,4 +1,3 @@
>-bin/libvncserver-config
> include/rfb/default8x16.h
> include/rfb/keysym.h
> include/rfb/rfb.h
>@@ -6,13 +5,11 @@ include/rfb/rfbclient.h
> include/rfb/rfbconfig.h
> include/rfb/rfbproto.h
> include/rfb/rfbregion.h
>-lib/libvncclient.a
> lib/libvncclient.so
> lib/libvncclient.so.1
>-lib/libvncclient.so.1.0.0
>-lib/libvncserver.a
>+lib/libvncclient.so.0.9.12
> lib/libvncserver.so
> lib/libvncserver.so.1
>-lib/libvncserver.so.1.0.0
>+lib/libvncserver.so.0.9.12
> libdata/pkgconfig/libvncclient.pc
> libdata/pkgconfig/libvncserver.pc
>diff --git a/net/remmina-plugin-vnc/Makefile b/net/remmina-plugin-vnc/Makefile
>index 26b278fa7850..8c27163b333f 100644
>--- a/net/remmina-plugin-vnc/Makefile
>+++ b/net/remmina-plugin-vnc/Makefile
>@@ -1,6 +1,7 @@
> # Created by: Alexander Logvinov <avl@FreeBSD.org>
> # $FreeBSD$
> 
>+PORTREVISION=	1
> PKGNAMESUFFIX=	-vnc
> 
> COMMENT=	Remmina plugin for VNC protocol
>diff --git a/net/x11vnc/Makefile b/net/x11vnc/Makefile
>index 3d55c659fccc..0cded093a157 100644
>--- a/net/x11vnc/Makefile
>+++ b/net/x11vnc/Makefile
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	x11vnc
> PORTVERSION=	0.9.16
>+PORTREVISION=	1
> CATEGORIES=	net
> 
> MAINTAINER=	dinoex@FreeBSD.org
>-- 
>2.20.1
>

Actions: View | Diff

Attachments on bug 234929: 201108 | 201478 | 201492 | 201520