Attachment #201108 for bug #234929

Lines 3-8 Link Here

(-)b/emulators/aqemu/Makefile (+1 lines)
3	PORTNAME= aqemu	3	PORTNAME= aqemu
4	DISTVERSIONPREFIX= v	4	DISTVERSIONPREFIX= v
5	DISTVERSION= 0.9.2	5	DISTVERSION= 0.9.2
		6	PORTREVISION= 1
6	CATEGORIES= emulators	7	CATEGORIES= emulators
7		8
8	MAINTAINER= ports@FreeBSD.org	9	MAINTAINER= ports@FreeBSD.org

Lines 3-9 Link Here

(-)b/emulators/bochs/Makefile (-1 / +1 lines)
3		3
4	PORTNAME= bochs	4	PORTNAME= bochs
5	PORTVERSION= 2.6.9	5	PORTVERSION= 2.6.9
6	PORTREVISION= 2	6	PORTREVISION= 3
7	PORTEPOCH= 2	7	PORTEPOCH= 2
8	CATEGORIES= emulators	8	CATEGORIES= emulators
9	MASTER_SITES= SF	9	MASTER_SITES= SF

Lines 3-9 Link Here

(-)b/emulators/kcemu/Makefile (-1 / +1 lines)
3		3
4	PORTNAME= kcemu	4	PORTNAME= kcemu
5	PORTVERSION= 0.5.1	5	PORTVERSION= 0.5.1
6	PORTREVISION= 16	6	PORTREVISION= 17
7	CATEGORIES= emulators	7	CATEGORIES= emulators
8	MASTER_SITES= SF/${PORTNAME}/KCemu/KCemu-${PORTVERSION}	8	MASTER_SITES= SF/${PORTNAME}/KCemu/KCemu-${PORTVERSION}
9	DISTNAME= KCemu-${PORTVERSION}	9	DISTNAME= KCemu-${PORTVERSION}

Lines 3-9 Link Here

(-)b/emulators/virtualbox-ose/Makefile (-1 / +1 lines)
3		3
4	PORTNAME= virtualbox-ose	4	PORTNAME= virtualbox-ose
5	PORTVERSION= 5.2.22	5	PORTVERSION= 5.2.22
6	PORTREVISION= 2	6	PORTREVISION= 3
7	CATEGORIES= emulators	7	CATEGORIES= emulators
8	MASTER_SITES= http://download.virtualbox.org/virtualbox/${PORTVERSION}/	8	MASTER_SITES= http://download.virtualbox.org/virtualbox/${PORTVERSION}/
9	DISTFILES= VirtualBox-${PORTVERSION}${EXTRACT_SUFX} ${GUESTADDITIONS}	9	DISTFILES= VirtualBox-${PORTVERSION}${EXTRACT_SUFX} ${GUESTADDITIONS}

Lines 3-9 Link Here

(-)b/graphics/osg-devel/Makefile (-1 / +1 lines)
3		3
4	PORTNAME= osg	4	PORTNAME= osg
5	PORTVERSION= 3.5.1	5	PORTVERSION= 3.5.1
6	PORTREVISION= 7	6	PORTREVISION= 8
7	CATEGORIES= graphics	7	CATEGORIES= graphics
8	MASTER_SITES= http://trac.openscenegraph.org/downloads/developer_releases/ \	8	MASTER_SITES= http://trac.openscenegraph.org/downloads/developer_releases/ \
9	http://mirror.amdmi3.ru/distfiles/	9	http://mirror.amdmi3.ru/distfiles/

Lines 4-10 Link Here

(-)b/graphics/osg/Makefile (-1 / +1 lines)
4	PORTNAME= osg	4	PORTNAME= osg
5	PORTVERSION= 3.4.1	5	PORTVERSION= 3.4.1
6	DISTVERSIONPREFIX= OpenSceneGraph-	6	DISTVERSIONPREFIX= OpenSceneGraph-
7	PORTREVISION= 5	7	PORTREVISION= 6
8	CATEGORIES= graphics	8	CATEGORIES= graphics
9		9
10	MAINTAINER= amdmi3@FreeBSD.org	10	MAINTAINER= amdmi3@FreeBSD.org

Lines 2-7 Link Here

(-)b/net/krdc/Makefile (+1 lines)
2		2
3	PORTNAME= krdc	3	PORTNAME= krdc
4	DISTVERSION= ${KDE_APPLICATIONS_VERSION}	4	DISTVERSION= ${KDE_APPLICATIONS_VERSION}
		5	PORTREVISION= 1
5	CATEGORIES= net kde kde-applications	6	CATEGORIES= net kde kde-applications
6		7
7	MAINTAINER= kde@FreeBSD.org	8	MAINTAINER= kde@FreeBSD.org




# $FreeBSD$

PORTNAME=	libvncserver
PORTVERSION=	0.9.12
PORTREVISION=	2
DISTVERSIONPREFIX=	LibVNCServer-
CATEGORIES=	net devel



LICENSE=	GPLv2

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

OPTIONS_DEFINE=		GCRYPT IPV6
USE_LDCONFIG=	yes
GNU_CONFIGURE=	yes
CPPFLAGS+=	-I${LOCALBASE}/include
LDFLAGS+=	-L${LOCALBASE}/lib
INSTALL_TARGET=	install-strip

OPTIONS_DEFINE=		GCRYPT IPV6 VAAPI
OPTIONS_SINGLE=		SSL
OPTIONS_SINGLE_SSL=	GNUTLS OPENSSL
OPTIONS_DEFAULT=	OPENSSL


GNUTLS_IMPLIES=		GCRYPT
GNUTLS_LIB_DEPENDS=	libgnutls.so:security/gnutls
GNUTLS_CMAKE_BOOL=	WITH_GNUTLS

OPENSSL_CMAKE_BOOL=	WITH_OPENSSL
OPENSSL_USES=		ssl

GCRYPT_LIB_DEPENDS=	libgcrypt.so:security/libgcrypt \
			libgpg-error.so:security/libgpg-error
GCRYPT_CMAKE_BOOL=	WITH_GCRYPT

IPV6_CONFIGURE_WITH=	ipv6

IPV6_CMAKE_BOOL=	WITH_IPv6
VAAPI_CONFIGURE_WITH=	libva

post-install:
	${INSTALL_DATA} ${WRKSRC}/rfb/default8x16.h ${STAGEDIR}${PREFIX}/include/rfb

Lines 1-3 Link Here

(-)b/net/libvncserver/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1483637975	1	TIMESTAMP = 1546804739
2	SHA256 (LibVNC-libvncserver-LibVNCServer-0.9.11_GH0.tar.gz) = 193d630372722a532136fd25c5326b2ca1a636cbb8bf9bb115ef869c804d2894	2	SHA256 (LibVNC-libvncserver-LibVNCServer-0.9.12_GH0.tar.gz) = 33cbbb4e15bb390f723c311b323cef4a43bcf781984f92d92adda3243a116136
3	SIZE (LibVNC-libvncserver-LibVNCServer-0.9.11_GH0.tar.gz) = 1413739	3	SIZE (LibVNC-libvncserver-LibVNCServer-0.9.12_GH0.tar.gz) = 2237447

Removed Link Here

(-)a/net/libvncserver/files/patch-common_md5.c (-11 lines)
1	--- common/md5.c.orig 2017-07-05 07:48:23 UTC
2	+++ common/md5.c
3	@@ -29,7 +29,7 @@
4	#include "md5.h"
5
6	/* #ifdef _LIBC */
7	-# include <endian.h>
8	+# include <sys/endian.h>
9	# if __BYTE_ORDER == __BIG_ENDIAN
10	# define WORDS_BIGENDIAN 1
11	# endif




--- 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 */

Lines 1-6 Link Here

(-)b/net/libvncserver/files/patch-common_vncauth.c (-3 / +3 lines)
1	--- common/vncauth.c.orig 2017-07-05 07:43:58 UTC	1	--- common/vncauth.c.orig 2019-01-06 19:09:30 UTC
2	+++ common/vncauth.c	2	+++ common/vncauth.c
3	@@ -42,6 +42,10 @@	3	@@ -44,6 +44,10 @@
4	#include <sys/stat.h>	4	#include <sys/stat.h>
5	#endif	5	#endif
6		6
Lines 11-17 Link Here
11	#include <time.h>	11	#include <time.h>
12		12
13	#ifdef WIN32	13	#ifdef WIN32
14	@@ -196,6 +200,8 @@ rfbEncryptBytes(unsigned char bytes, char passwd)	14	@@ -198,6 +202,8 @@ rfbEncryptBytes(unsigned char bytes, char passwd)
15	rfbDes(bytes+i, bytes+i);	15	rfbDes(bytes+i, bytes+i);
16	}	16	}
17	}	17	}

Lines 1-4 Link Here

(-)b/net/libvncserver/files/patch-rfb_rfb.h (-2 / +2 lines)
1	--- rfb/rfb.h.orig 2017-07-05 07:45:47 UTC	1	--- rfb/rfb.h.orig 2019-01-06 19:09:30 UTC
2	+++ rfb/rfb.h	2	+++ rfb/rfb.h
3	@@ -43,7 +43,7 @@ extern "C"	3	@@ -43,7 +43,7 @@ extern "C"
4	#include <string.h>	4	#include <string.h>
Lines 9-15 Link Here
9	#include <arpa/inet.h>	9	#include <arpa/inet.h>
10	#include <sys/select.h>	10	#include <sys/select.h>
11	#endif	11	#endif
12	@@ -265,6 +265,8 @@ typedef struct _rfbScreenInfo	12	@@ -266,6 +266,8 @@ typedef struct _rfbScreenInfo
13	rfbBool autoPort;	13	rfbBool autoPort;
14	int port;	14	int port;
15	SOCKET listenSock;	15	SOCKET listenSock;




bin/libvncserver-config
include/rfb/default8x16.h
include/rfb/keysym.h
include/rfb/rfb.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.0.9.12
lib/libvncserver.a
lib/libvncserver.so
lib/libvncserver.so.1
lib/libvncserver.so.0.9.12
libdata/pkgconfig/libvncclient.pc
libdata/pkgconfig/libvncserver.pc

Lines 1-6 Link Here

(-)b/net/remmina-plugin-vnc/Makefile (+1 lines)
1	# Created by: Alexander Logvinov <avl@FreeBSD.org>	1	# Created by: Alexander Logvinov <avl@FreeBSD.org>
2	# $FreeBSD$	2	# $FreeBSD$
3		3
		4	PORTREVISION= 1
4	PKGNAMESUFFIX= -vnc	5	PKGNAMESUFFIX= -vnc
5		6
6	COMMENT= Remmina plugin for VNC protocol	7	COMMENT= Remmina plugin for VNC protocol

Lines 3-8 Link Here

(-)b/net/x11vnc/Makefile (-1 / +1 lines)
3		3
4	PORTNAME= x11vnc	4	PORTNAME= x11vnc
5	PORTVERSION= 0.9.16	5	PORTVERSION= 0.9.16
		6	PORTREVISION= 1
6	CATEGORIES= net	7	CATEGORIES= net
7		8
8	MAINTAINER= dinoex@FreeBSD.org	9	MAINTAINER= dinoex@FreeBSD.org
9	-

Return to bug 234929

Lines 2-9 Link Here

(-)b/net/libvncserver/Makefile (-18 / +11 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= libvncserver	4	PORTNAME= libvncserver
5	PORTVERSION= 0.9.11	5	PORTVERSION= 0.9.12
6	PORTREVISION= 2
7	DISTVERSIONPREFIX= LibVNCServer-	6	DISTVERSIONPREFIX= LibVNCServer-
8	CATEGORIES= net devel	7	CATEGORIES= net devel
9		8
Lines 12-30 COMMENT= Provide an easy API to a custom vnc server Link Here
12		11
13	LICENSE= GPLv2	12	LICENSE= GPLv2
14		13
15	LIB_DEPENDS= libpng.so:graphics/png	14	LIB_DEPENDS= libpng.so:graphics/png \
		15	liblzo2.so:archivers/lzo2
		16
		17	USES= cmake jpeg libtool pathfix pkgconfig
		18	USE_LDCONFIG= yes
16		19
17	USE_GITHUB= yes	20	USE_GITHUB= yes
18	GH_ACCOUNT= LibVNC	21	GH_ACCOUNT= LibVNC
19		22
20	USES= autoreconf jpeg libtool pathfix pkgconfig	23	OPTIONS_DEFINE= GCRYPT IPV6
21	USE_LDCONFIG= yes
22	GNU_CONFIGURE= yes
23	CPPFLAGS+= -I${LOCALBASE}/include
24	LDFLAGS+= -L${LOCALBASE}/lib
25	INSTALL_TARGET= install-strip
26
27	OPTIONS_DEFINE= GCRYPT IPV6 VAAPI
28	OPTIONS_SINGLE= SSL	24	OPTIONS_SINGLE= SSL
29	OPTIONS_SINGLE_SSL= GNUTLS OPENSSL	25	OPTIONS_SINGLE_SSL= GNUTLS OPENSSL
30	OPTIONS_DEFAULT= OPENSSL	26	OPTIONS_DEFAULT= OPENSSL
Lines 32-50 GCRYPT_DESC= libgcrypt support Link Here
32		28
33	GNUTLS_IMPLIES= GCRYPT	29	GNUTLS_IMPLIES= GCRYPT
34	GNUTLS_LIB_DEPENDS= libgnutls.so:security/gnutls	30	GNUTLS_LIB_DEPENDS= libgnutls.so:security/gnutls
35	GNUTLS_CONFIGURE_WITH= gnutls	31	GNUTLS_CMAKE_BOOL= WITH_GNUTLS
36		32
37	OPENSSL_CONFIGURE_WITH= crypto ssl	33	OPENSSL_CMAKE_BOOL= WITH_OPENSSL
38	OPENSSL_USES= ssl	34	OPENSSL_USES= ssl
39		35
40	GCRYPT_LIB_DEPENDS= libgcrypt.so:security/libgcrypt \	36	GCRYPT_LIB_DEPENDS= libgcrypt.so:security/libgcrypt \
41	libgpg-error.so:security/libgpg-error	37	libgpg-error.so:security/libgpg-error
42	GCRYPT_CONFIGURE_WITH= gcrypt	38	GCRYPT_CMAKE_BOOL= WITH_GCRYPT
43
44	IPV6_CONFIGURE_WITH= ipv6
45		39
46	VAAPI_LIB_DEPENDS= libva.so:multimedia/libva	40	IPV6_CMAKE_BOOL= WITH_IPv6
47	VAAPI_CONFIGURE_WITH= libva
48		41
49	post-install:	42	post-install:
50	${INSTALL_DATA} ${WRKSRC}/rfb/default8x16.h ${STAGEDIR}${PREFIX}/include/rfb	43	${INSTALL_DATA} ${WRKSRC}/rfb/default8x16.h ${STAGEDIR}${PREFIX}/include/rfb

Removed Link Here

(-)a/net/libvncserver/files/patch-common_md5.h (-59 lines)
1	--- common/md5.h.orig 2017-07-05 07:48:49 UTC
2	+++ common/md5.h
3	@@ -98,21 +98,21 @@ struct md5_ctx
4
5	/* Initialize structure containing state of computation.
6	(RFC 1321, 3.3: Step 3) */
7	-extern void __md5_init_ctx (struct md5_ctx *ctx) __THROW;
8	+extern void __md5_init_ctx (struct md5_ctx *ctx) ;
9
10	/* Starting with the result of former calls of this function (or the
11	initialization function update the context for the next LEN bytes
12	starting at BUFFER.
13	It is necessary that LEN is a multiple of 64!!! */
14	extern void __md5_process_block (const void *buffer, size_t len,
15	- struct md5_ctx *ctx) __THROW;
16	+ struct md5_ctx *ctx) ;
17
18	/* Starting with the result of former calls of this function (or the
19	initialization function update the context for the next LEN bytes
20	starting at BUFFER.
21	It is NOT required that LEN is a multiple of 64. */
22	extern void __md5_process_bytes (const void *buffer, size_t len,
23	- struct md5_ctx *ctx) __THROW;
24	+ struct md5_ctx *ctx) ;
25
26	/* Process the remaining bytes in the buffer and put result from CTX
27	in first 16 bytes following RESBUF. The result is always in little
28	@@ -121,7 +121,7 @@ extern void __md5_process_bytes (const void *buffer, s
29
30	IMPORTANT: On some systems it is required that RESBUF is correctly
31	aligned for a 32 bits value. */
32	-extern void __md5_finish_ctx (struct md5_ctx ctx, void *resbuf) __THROW;
33	+extern void __md5_finish_ctx (struct md5_ctx ctx, void *resbuf) ;
34
35
36	/* Put result from CTX in first 16 bytes following RESBUF. The result is
37	@@ -130,19 +130,19 @@ extern void __md5_finish_ctx (struct md5_ctx ctx, vo
38
39	IMPORTANT: On some systems it is required that RESBUF is correctly
40	aligned for a 32 bits value. */
41	-extern void __md5_read_ctx (const struct md5_ctx ctx, void *resbuf) __THROW;
42	+extern void __md5_read_ctx (const struct md5_ctx ctx, void *resbuf) ;
43
44
45	/* Compute MD5 message digest for bytes read from STREAM. The
46	resulting message digest number will be written into the 16 bytes
47	beginning at RESBLOCK. */
48	-extern int __md5_stream (FILE stream, void resblock) __THROW;
49	+extern int __md5_stream (FILE stream, void resblock) ;
50
51	/* Compute MD5 message digest for LEN bytes beginning at BUFFER. The
52	result is always in little endian byte order, so that a byte-wise
53	output yields to the wanted ASCII representation of the message
54	digest. */
55	extern void __md5_buffer (const char buffer, size_t len,
56	- void *resblock) __THROW;
57	+ void *resblock) ;
58
59	#endif /* md5.h */

Lines 1-4 Link Here

(-)b/net/libvncserver/pkg-plist (-5 / +2 lines)
1	bin/libvncserver-config
2	include/rfb/default8x16.h	1	include/rfb/default8x16.h
3	include/rfb/keysym.h	2	include/rfb/keysym.h
4	include/rfb/rfb.h	3	include/rfb/rfb.h
Lines 6-18 include/rfb/rfbclient.h Link Here
6	include/rfb/rfbconfig.h	5	include/rfb/rfbconfig.h
7	include/rfb/rfbproto.h	6	include/rfb/rfbproto.h
8	include/rfb/rfbregion.h	7	include/rfb/rfbregion.h
9	lib/libvncclient.a
10	lib/libvncclient.so	8	lib/libvncclient.so
11	lib/libvncclient.so.1	9	lib/libvncclient.so.1
12	lib/libvncclient.so.1.0.0	10	lib/libvncclient.so.0.9.12
13	lib/libvncserver.a
14	lib/libvncserver.so	11	lib/libvncserver.so
15	lib/libvncserver.so.1	12	lib/libvncserver.so.1
16	lib/libvncserver.so.1.0.0	13	lib/libvncserver.so.0.9.12
17	libdata/pkgconfig/libvncclient.pc	14	libdata/pkgconfig/libvncclient.pc
18	libdata/pkgconfig/libvncserver.pc	15	libdata/pkgconfig/libvncserver.pc