Attachment 168606 Details for Bug 207768 – patch5

[patch] patch5

gnutls.patch (text/plain), 144.14 KB, created by Tijl Coosemans on 2016-03-25 09:08:30 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tijl Coosemans

Created: 2016-03-25 09:08:30 UTC

Size: 144.14 KB

patch

obsolete

>Index: audio/ario/Makefile
>===================================================================
>--- audio/ario/Makefile	(revision 411799)
>+++ audio/ario/Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	ario
> PORTVERSION=	1.5.1
>-PORTREVISION=	10
>+PORTREVISION=	11
> CATEGORIES=	audio
> MASTER_SITES=	SF/ario-player/ario-player/${PORTVERSION}
> 
>Index: audio/pianobar/Makefile
>===================================================================
>--- audio/pianobar/Makefile	(revision 411799)
>+++ audio/pianobar/Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	pianobar
> PORTVERSION=	2015.11.22
>-PORTREVISION=	0
>+PORTREVISION=	1
> CATEGORIES=	audio
> MASTER_SITES=	http://6xq.net/projects/${PORTNAME}/
> 
>Index: audio/tomahawk/Makefile
>===================================================================
>--- audio/tomahawk/Makefile	(revision 411799)
>+++ audio/tomahawk/Makefile	(working copy)
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	tomahawk
> PORTVERSION=	0.8.4
>+PORTREVISION=	1
> CATEGORIES=	audio
> 
> MAINTAINER=	ports@FreeBSD.org
>Index: benchmarks/postal/Makefile
>===================================================================
>--- benchmarks/postal/Makefile	(revision 411799)
>+++ benchmarks/postal/Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	postal
> PORTVERSION=	0.73
>-PORTREVISION=	2
>+PORTREVISION=	3
> CATEGORIES=	benchmarks mail
> MASTER_SITES=	http://www.coker.com.au/postal/
> 
>Index: databases/freetds/Makefile
>===================================================================
>--- databases/freetds/Makefile	(revision 411799)
>+++ databases/freetds/Makefile	(working copy)
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	freetds
> PORTVERSION=	0.95.87
>+PORTREVISION=	1
> PORTEPOCH=	1
> CATEGORIES=	databases
> MASTER_SITES=	ftp://ftp.freetds.org/pub/freetds/stable/
>Index: databases/freetds-devel/Makefile
>===================================================================
>--- databases/freetds-devel/Makefile	(revision 411799)
>+++ databases/freetds-devel/Makefile	(working copy)
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	freetds
> PORTVERSION=	0.99.614
>+PORTREVISION=	1
> PORTEPOCH=	1
> CATEGORIES=	databases
> MASTER_SITES=	ftp://ftp.freetds.org/pub/freetds/current/
>Index: databases/glom/Makefile
>===================================================================
>--- databases/glom/Makefile	(revision 411799)
>+++ databases/glom/Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	glom
> PORTVERSION=	1.28.0
>-PORTREVISION=	1
>+PORTREVISION=	2
> CATEGORIES=	databases gnome
> MASTER_SITES=	GNOME
> DIST_SUBDIR=	gnome3
>Index: deskutils/fusenshi/Makefile
>===================================================================
>--- deskutils/fusenshi/Makefile	(revision 411799)
>+++ deskutils/fusenshi/Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	fusenshi
> PORTVERSION=	0.9.0
>-PORTREVISION=	13
>+PORTREVISION=	14
> CATEGORIES=	deskutils
> MASTER_SITES=	http://www.ongs.co.jp/projects/fusenshi/
> 
>Index: deskutils/fusenshi/files/patch-src_net_fusenshisslclientsocket.cpp
>===================================================================
>--- deskutils/fusenshi/files/patch-src_net_fusenshisslclientsocket.cpp	(nonexistent)
>+++ deskutils/fusenshi/files/patch-src_net_fusenshisslclientsocket.cpp	(working copy)
>@@ -0,0 +1,20 @@
>+--- src/net/fusenshisslclientsocket.cpp.orig	2007-04-02 10:44:52 UTC
>++++ src/net/fusenshisslclientsocket.cpp
>+@@ -52,9 +52,6 @@ bool FusenshiSSLClientSocket::connect(un
>+ {
>+     // ÄÌ¿®¤ò°Å¹æ²½¤·¤Þ¤¹¤¬¡¢¥Û¥¹¥È¤Î¾ÚÌÀ¤Ï¹Ô¤¤¤Þ¤»¤ó¡£
>+     int ret;
>+-	const int cert_priority[] = {
>+-		GNUTLS_CRT_X509, 0
>+-	};
>+ 
>+     if (NULL != m_session) close();
>+     
>+@@ -64,7 +61,6 @@ bool FusenshiSSLClientSocket::connect(un
>+         
>+ 		gnutls_init(&m_session, GNUTLS_CLIENT);
>+ 		gnutls_set_default_priority(m_session);
>+-		gnutls_certificate_type_set_priority(m_session, cert_priority);
>+ 
>+ 		gnutls_credentials_set(m_session, GNUTLS_CRD_CERTIFICATE, cert);
>+ 		
>
>Property changes on: deskutils/fusenshi/files/patch-src_net_fusenshisslclientsocket.cpp
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: deskutils/fusenshi/files/patch-src_net_fusenshisslserversocket.cpp
>===================================================================
>--- deskutils/fusenshi/files/patch-src_net_fusenshisslserversocket.cpp	(nonexistent)
>+++ deskutils/fusenshi/files/patch-src_net_fusenshisslserversocket.cpp	(working copy)
>@@ -0,0 +1,22 @@
>+--- src/net/fusenshisslserversocket.cpp.orig	2007-04-02 10:44:52 UTC
>++++ src/net/fusenshisslserversocket.cpp
>+@@ -56,9 +56,6 @@ public:
>+     bool sslAccept(int sock)
>+     {
>+     	int ret;
>+-		const int cert_priority[] = {
>+-			GNUTLS_CRT_X509, 0
>+-		};
>+ 
>+         m_socket = sock;
>+ 
>+@@ -69,8 +66,7 @@ public:
>+         if (!cert) return false;
>+ 
>+ 		gnutls_init(&m_session, GNUTLS_SERVER);
>+-		gnutls_set_default_export_priority(m_session);
>+-		gnutls_certificate_type_set_priority(m_session, cert_priority);
>++		gnutls_set_default_priority(m_session);
>+ 
>+ 		gnutls_credentials_set(m_session, GNUTLS_CRD_CERTIFICATE, cert);
>+ 		gnutls_certificate_server_set_request(m_session, GNUTLS_CERT_REQUIRE);
>
>Property changes on: deskutils/fusenshi/files/patch-src_net_fusenshisslserversocket.cpp
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: deskutils/taskd/Makefile
>===================================================================
>--- deskutils/taskd/Makefile	(revision 411799)
>+++ deskutils/taskd/Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	taskd
> PORTVERSION=	1.1.0
>-PORTREVISION=	1
>+PORTREVISION=	2
> CATEGORIES=	deskutils
> MASTER_SITES=	http://taskwarrior.org/download/
> 
>Index: deskutils/taskwarrior/Makefile
>===================================================================
>--- deskutils/taskwarrior/Makefile	(revision 411799)
>+++ deskutils/taskwarrior/Makefile	(working copy)
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	taskwarrior
> PORTVERSION=	2.5.0
>+PORTREVISION=	1
> CATEGORIES=	deskutils
> DISTNAME=	task-${PORTVERSION}
> 
>Index: devel/anjuta/Makefile
>===================================================================
>--- devel/anjuta/Makefile	(revision 411799)
>+++ devel/anjuta/Makefile	(working copy)
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	anjuta
> PORTVERSION=	3.18.2
>+PORTREVISION=	1
> CATEGORIES=	devel gnome
> MASTER_SITES=	GNOME
> DIST_SUBDIR=	gnome3
>Index: devel/gsoap/Makefile
>===================================================================
>--- devel/gsoap/Makefile	(revision 411799)
>+++ devel/gsoap/Makefile	(working copy)
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	gsoap
> PORTVERSION=	2.8.27
>+PORTREVISION=	1
> CATEGORIES=	devel
> MASTER_SITES=	SF/${PORTNAME}2/gSOAP
> DISTNAME=	${PORTNAME}_${PORTVERSION}
>Index: devel/gwenhywfar/Makefile
>===================================================================
>--- devel/gwenhywfar/Makefile	(revision 411799)
>+++ devel/gwenhywfar/Makefile	(working copy)
>@@ -2,7 +2,7 @@
> 
> PORTNAME=	gwenhywfar
> PORTVERSION=	4.14.0
>-PORTREVISION?=	0
>+PORTREVISION?=	1
> CATEGORIES=	devel net security
> MASTER_SITES=	http://www.aquamaniac.de/sites/download/download.php?package=01&release=01&file=01&dummy=/
> 
>Index: devel/gwenhywfar/files/patch-src-sio-syncio_tls.c
>===================================================================
>--- devel/gwenhywfar/files/patch-src-sio-syncio_tls.c	(nonexistent)
>+++ devel/gwenhywfar/files/patch-src-sio-syncio_tls.c	(working copy)
>@@ -0,0 +1,17 @@
>+--- src/sio/syncio_tls.c.orig	2014-10-12 13:12:22 UTC
>++++ src/sio/syncio_tls.c
>+@@ -361,12 +361,10 @@ int GWEN_SyncIo_Tls_Prepare(GWEN_SYNCIO 
>+ 
>+   /* possibly force protocol priority */
>+   if (lflags & GWEN_SYNCIO_TLS_FLAGS_FORCE_SSL_V3) {
>+-    const int proto_prio[2] = { GNUTLS_SSL3, 0 };
>+-
>+     DBG_INFO(GWEN_LOGDOMAIN, "Forcing SSL v3");
>+-    rv=gnutls_protocol_set_priority(xio->session, proto_prio);
>++    rv=gnutls_priority_set_direct(xio->session, "NORMAL:-VERS-TLS-ALL:+VERS-SSL3.0", NULL);
>+     if (rv) {
>+-      DBG_ERROR(GWEN_LOGDOMAIN, "gnutls_protocol_set_priority: %d (%s)", rv, gnutls_strerror(rv));
>++      DBG_ERROR(GWEN_LOGDOMAIN, "gnutls_priority_set_direct: %d (%s)", rv, gnutls_strerror(rv));
>+       gnutls_deinit(xio->session);
>+       return GWEN_ERROR_GENERIC;
>+     }
>
>Property changes on: devel/gwenhywfar/files/patch-src-sio-syncio_tls.c
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: devel/hs-git-annex/Makefile
>===================================================================
>--- devel/hs-git-annex/Makefile	(revision 411799)
>+++ devel/hs-git-annex/Makefile	(working copy)
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	git-annex
> PORTVERSION=	5.20150727
>+PORTREVISION=	1
> CATEGORIES=	devel haskell
> 
> MAINTAINER=	haskell@FreeBSD.org
>Index: devel/librelp/Makefile
>===================================================================
>--- devel/librelp/Makefile	(revision 411799)
>+++ devel/librelp/Makefile	(working copy)
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	librelp
> PORTVERSION=	1.2.9
>+PORTREVISION=	1
> CATEGORIES=	devel
> MASTER_SITES=	http://download.rsyslog.com/librelp/
> 
>Index: devel/libvirt/Makefile
>===================================================================
>--- devel/libvirt/Makefile	(revision 411799)
>+++ devel/libvirt/Makefile	(working copy)
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	libvirt
> PORTVERSION=	1.3.2
>+PORTREVISION=	1
> CATEGORIES=	devel
> MASTER_SITES=	http://libvirt.org/sources/ \
> 		ftp://libvirt.org/libvirt/
>Index: dns/knot2/Makefile
>===================================================================
>--- dns/knot2/Makefile	(revision 411799)
>+++ dns/knot2/Makefile	(working copy)
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	knot
> DISTVERSION=	2.1.1
>+PORTREVISION=	1
> CATEGORIES=	dns ipv6
> MASTER_SITES=	https://secure.nic.cz/files/knot-dns/ \
> 		http://dns-lab.com/downloads/knot-dns/
>Index: editors/abiword/Makefile
>===================================================================
>--- editors/abiword/Makefile	(revision 411799)
>+++ editors/abiword/Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	abiword
> PORTVERSION=	3.0.1
>-PORTREVISION=	1
>+PORTREVISION=	2
> CATEGORIES=	editors
> MASTER_SITES=	http://www.abisource.com/downloads/abiword/${PORTVERSION}/source/
> DIST_SUBDIR=	AbiWord
>Index: editors/abiword/files/patch-plugins_collab_backends_service_xp_tls_tunnel.cpp
>===================================================================
>--- editors/abiword/files/patch-plugins_collab_backends_service_xp_tls_tunnel.cpp	(nonexistent)
>+++ editors/abiword/files/patch-plugins_collab_backends_service_xp_tls_tunnel.cpp	(working copy)
>@@ -0,0 +1,24 @@
>+--- plugins/collab/backends/service/xp/tls_tunnel.cpp.orig	2014-11-04 01:12:14 UTC
>++++ plugins/collab/backends/service/xp/tls_tunnel.cpp
>+@@ -306,8 +306,6 @@ void Proxy::tunnel_(transport_ptr_t tran
>+ 	disconnect_(transport_ptr, session_ptr, local_socket_ptr, remote_socket_ptr);		
>+ }
>+ 
>+-static const int PRIORITIES[] = { GNUTLS_KX_ANON_DH, GNUTLS_KX_RSA, GNUTLS_KX_DHE_DSS, GNUTLS_KX_DHE_RSA, 0 };
>+-static const int CIPHERS[] = { GNUTLS_CIPHER_AES_256_CBC, GNUTLS_CIPHER_AES_128_CBC, GNUTLS_CIPHER_3DES_CBC, GNUTLS_CIPHER_ARCFOUR_128, 0 };
>+ 
>+ // FIXME: this clientproxy can only handle 1 SSL connection at the same time
>+ ClientProxy::ClientProxy(const std::string& connect_address, unsigned short connect_port, 
>+@@ -399,9 +397,9 @@ session_ptr_t ClientProxy::setup_tls_ses
>+ 
>+ 	// setup session
>+ 	return_val_if_neg(gnutls_init(session_ptr.get(), GNUTLS_CLIENT), session_ptr_t());
>+-	return_val_if_neg(gnutls_set_default_priority(*session_ptr), session_ptr_t());
>+-	return_val_if_neg(gnutls_kx_set_priority(*session_ptr,PRIORITIES), session_ptr_t());
>+-	return_val_if_neg(gnutls_cipher_set_priority(*session_ptr,CIPHERS), session_ptr_t());
>++	return_val_if_neg(gnutls_priority_set_direct(*session_ptr,"NORMAL"
>++		":-CIPHER-ALL:+AES-256-CBC:+AES-128-CBC:+3DES-CBC:+ARCFOUR-128"
>++		":-KX-ALL:+ANON-DH:+RSA:+DHE-DSS:+DHE-RSA",NULL), session_ptr_t());
>+ 	return_val_if_neg(gnutls_credentials_set(*session_ptr, GNUTLS_CRD_CERTIFICATE, x509cred), session_ptr_t());
>+ 
>+ 	// setup transport
>
>Property changes on: editors/abiword/files/patch-plugins_collab_backends_service_xp_tls_tunnel.cpp
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: editors/emacs/Makefile
>===================================================================
>--- editors/emacs/Makefile	(revision 411799)
>+++ editors/emacs/Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	emacs
> PORTVERSION=	${EMACS_VER}
>-PORTREVISION=	2
>+PORTREVISION=	3
> PORTEPOCH=	3
> CATEGORIES=	editors ipv6
> MASTER_SITES=	GNU
>Index: editors/emacs-devel/Makefile
>===================================================================
>--- editors/emacs-devel/Makefile	(revision 411799)
>+++ editors/emacs-devel/Makefile	(working copy)
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	emacs
> PORTVERSION=	${EMACS_VER}
>+PORTREVISION=	1
> PORTEPOCH=	2
> CATEGORIES=	editors ipv6
> MASTER_SITES=	GNU_ALPHA/emacs/pretest
>Index: editors/vanubi/Makefile
>===================================================================
>--- editors/vanubi/Makefile	(revision 411799)
>+++ editors/vanubi/Makefile	(working copy)
>@@ -4,6 +4,7 @@
> PORTNAME=	vanubi
> PORTVERSION=	0.0.16
> DISTVERSIONPREFIX=	v
>+PORTREVISION=	1
> CATEGORIES=	editors
> 
> MAINTAINER=	olivierd@FreeBSD.org
>Index: emulators/qemu/Makefile
>===================================================================
>--- emulators/qemu/Makefile	(revision 411799)
>+++ emulators/qemu/Makefile	(working copy)
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	qemu
> PORTVERSION=	2.4.1
>+PORTREVISION=	1
> CATEGORIES=	emulators
> MASTER_SITES=	http://wiki.qemu.org/download/
> DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
>Index: emulators/qemu-devel/Makefile
>===================================================================
>--- emulators/qemu-devel/Makefile	(revision 411799)
>+++ emulators/qemu-devel/Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	qemu
> DISTVERSION=	2.5.0
>-PORTREVISION=	3
>+PORTREVISION=	4
> CATEGORIES=	emulators
> MASTER_SITES=	http://wiki.qemu.org/download/
> PKGNAMESUFFIX=	-devel
>Index: emulators/qemu-sbruno/Makefile
>===================================================================
>--- emulators/qemu-sbruno/Makefile	(revision 411799)
>+++ emulators/qemu-sbruno/Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	qemu
> PORTVERSION=	2.5.50.g20160215
>-PORTREVISION=	3
>+PORTREVISION=	4
> CATEGORIES=	emulators
> MASTER_SITES=	GH \
> 		LOCAL/nox:dtc \
>Index: emulators/wine/Makefile
>===================================================================
>--- emulators/wine/Makefile	(revision 411799)
>+++ emulators/wine/Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	wine
> DISTVERSION=	1.8.1
>-PORTREVISION=	2
>+PORTREVISION=	3
> PORTEPOCH=	1
> CATEGORIES=	emulators
> MASTER_SITES=	SF/${PORTNAME}/Source \
>Index: emulators/wine-devel/Makefile
>===================================================================
>--- emulators/wine-devel/Makefile	(revision 411799)
>+++ emulators/wine-devel/Makefile	(working copy)
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	wine
> DISTVERSION=	1.9.6
>+PORTREVISION=	1
> PORTEPOCH=	1
> CATEGORIES=	emulators
> MASTER_SITES=	SF/${PORTNAME}/Source \
>Index: ftp/curl/Makefile
>===================================================================
>--- ftp/curl/Makefile	(revision 411799)
>+++ ftp/curl/Makefile	(working copy)
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	curl
> PORTVERSION=	7.48.0
>+PORTREVISION=	1
> CATEGORIES=	ftp www
> MASTER_SITES=	http://curl.haxx.se/download/ \
> 		LOCAL/sunpoet
>Index: ftp/filezilla/Makefile
>===================================================================
>--- ftp/filezilla/Makefile	(revision 411799)
>+++ ftp/filezilla/Makefile	(working copy)
>@@ -2,6 +2,7 @@
> 
> PORTNAME=	filezilla
> PORTVERSION=	3.16.0
>+PORTREVISION=	1
> CATEGORIES=	ftp
> MASTER_SITES=	SF/${PORTNAME}/FileZilla_Client/${PORTVERSION}
> DISTNAME=	FileZilla_${PORTVERSION}_src
>Index: ftp/lftp/Makefile
>===================================================================
>--- ftp/lftp/Makefile	(revision 411799)
>+++ ftp/lftp/Makefile	(working copy)
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	lftp
> PORTVERSION=	4.6.5
>+PORTREVISION=	1
> CATEGORIES=	ftp ipv6
> MASTER_SITES=	http://lftp.yar.ru/ftp/ \
> 		http://lftp.yar.ru/ftp/old/ \
>Index: ftp/wget/Makefile
>===================================================================
>--- ftp/wget/Makefile	(revision 411799)
>+++ ftp/wget/Makefile	(working copy)
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	wget
> DISTVERSION=	1.16.3
>+PORTREVISION=	1
> CATEGORIES=	ftp www ipv6
> MASTER_SITES=	GNU
> 
>Index: ftp/wput/Makefile
>===================================================================
>--- ftp/wput/Makefile	(revision 411799)
>+++ ftp/wput/Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	wput
> PORTVERSION=	0.6.2
>-PORTREVISION=	5
>+PORTREVISION=	6
> CATEGORIES=	ftp
> MASTER_SITES=	SF
> 
>Index: ftp/wzdftpd/Makefile
>===================================================================
>--- ftp/wzdftpd/Makefile	(revision 411799)
>+++ ftp/wzdftpd/Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	wzdftpd
> PORTVERSION=	0.8.3
>-PORTREVISION=	5
>+PORTREVISION=	6
> CATEGORIES=	ftp ipv6
> MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-sources/${PORTNAME}-${PORTVERSION:R}
> 
>Index: ftp/wzdftpd/files/patch-libwzd-core_wzd_tls.c
>===================================================================
>--- ftp/wzdftpd/files/patch-libwzd-core_wzd_tls.c	(nonexistent)
>+++ ftp/wzdftpd/files/patch-libwzd-core_wzd_tls.c	(working copy)
>@@ -0,0 +1,52 @@
>+--- libwzd-core/wzd_tls.c.orig	2007-10-25 17:25:33 UTC
>++++ libwzd-core/wzd_tls.c
>+@@ -946,19 +946,13 @@ int tls_exit(void)
>+ 
>+ static gnutls_session initialize_tls_session(gnutls_connection_end con_end)
>+ {
>+-  /* Allow connections to servers that have OpenPGP keys as well.
>+-   */
>+-  const int cert_type_priority[3] = { GNUTLS_CRT_X509, GNUTLS_CRT_OPENPGP, 0 };
>+-
>+   gnutls_session session;
>+ 
>+   gnutls_init(&session, con_end);
>+ 
>+-  /* avoid calling all the priority functions, since the defaults
>+-   * are adequate.
>++  /* Allow connections to servers that have OpenPGP keys as well.
>+    */
>+-  gnutls_set_default_priority(session);
>+-  gnutls_certificate_type_set_priority(session, cert_type_priority);
>++  gnutls_priority_set_direct(session, "NORMAL:+CTYPE-OPENPGP", NULL);
>+ 
>+   gnutls_credentials_set(session, GNUTLS_CRD_CERTIFICATE, x509_cred);
>+ 
>+@@ -1001,27 +995,6 @@ int tls_auth (const char *type, wzd_cont
>+   }
>+ 
>+   /** \todo XXX parse TLS cipher names */
>+-  {
>+-    /** Note that the priority is set on the client. The server does not use
>+-     * the algorithm's priority except for disabling algorithms that were not
>+-     * specified.
>+-     */
>+-    const int cipherPriority[] =
>+-    {
>+-      GNUTLS_CIPHER_ARCFOUR_128,
>+-      GNUTLS_CIPHER_3DES_CBC,
>+-      GNUTLS_CIPHER_AES_128_CBC,
>+-      GNUTLS_CIPHER_AES_256_CBC,
>+-      GNUTLS_CIPHER_ARCFOUR_40,
>+-#if ( (LIBGNUTLS_VERSION_MAJOR > 1) || (LIBGNUTLS_VERSION_MINOR >= 3) )
>+-      GNUTLS_CIPHER_RC2_40_CBC,
>+-      GNUTLS_CIPHER_DES_CBC,
>+-#endif
>+-      0
>+-    };
>+-
>+-    gnutls_cipher_set_priority(session, cipherPriority);
>+-  }
>+ 
>+   /* ensure socket is non-blocking */
>+ #if defined(_MSC_VER) || (defined(__CYGWIN__) && defined(WINSOCK_SUPPORT))
>
>Property changes on: ftp/wzdftpd/files/patch-libwzd-core_wzd_tls.c
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: games/libggz/Makefile
>===================================================================
>--- games/libggz/Makefile	(revision 411799)
>+++ games/libggz/Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	libggz
> PORTVERSION=	${GGZ_VERSION}
>-PORTREVISION=	16
>+PORTREVISION=	17
> CATEGORIES=	games
> 
> MAINTAINER=	ports@FreeBSD.org
>Index: games/macopix/Makefile
>===================================================================
>--- games/macopix/Makefile	(revision 411799)
>+++ games/macopix/Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	macopix
> PORTVERSION=	1.7.4
>-PORTREVISION=	10
>+PORTREVISION=	11
> CATEGORIES=	games
> MASTER_SITES=	http://rosegray.sakura.ne.jp/macopix/
> DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${RESTRICTED_FILES}
>Index: games/pokerth/Makefile
>===================================================================
>--- games/pokerth/Makefile	(revision 411799)
>+++ games/pokerth/Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	pokerth
> PORTVERSION=	1.1.1
>-PORTREVISION=	7
>+PORTREVISION=	8
> CATEGORIES=	games
> MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/1.1
> DISTNAME=	PokerTH-${PORTVERSION}-src
>Index: graphics/gnome-color-manager/Makefile
>===================================================================
>--- graphics/gnome-color-manager/Makefile	(revision 411799)
>+++ graphics/gnome-color-manager/Makefile	(working copy)
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	gnome-color-manager
> PORTVERSION=	3.18.0
>+PORTREVISION=	1
> CATEGORIES=	graphics gnome
> MASTER_SITES=	GNOME
> DIST_SUBDIR=	gnome3
>Index: irc/anope/Makefile
>===================================================================
>--- irc/anope/Makefile	(revision 411799)
>+++ irc/anope/Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	anope
> PORTVERSION=	2.0.2
>-PORTREVISION=	1
>+PORTREVISION=	2
> CATEGORIES=	irc
> 
> MAINTAINER=	feld@FreeBSD.org
>Index: irc/bitlbee/Makefile
>===================================================================
>--- irc/bitlbee/Makefile	(revision 411799)
>+++ irc/bitlbee/Makefile	(working copy)
>@@ -2,7 +2,7 @@
> 
> PORTNAME=	bitlbee
> PORTVERSION=	3.4.1
>-PORTREVISION=	4
>+PORTREVISION=	5
> CATEGORIES=	irc
> MASTER_SITES=	http://get.bitlbee.org/src/ \
> 		LOCAL/brix
>Index: irc/ctrlproxy/Makefile
>===================================================================
>--- irc/ctrlproxy/Makefile	(revision 411799)
>+++ irc/ctrlproxy/Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	ctrlproxy
> PORTVERSION=	3.0.8
>-PORTREVISION=	7
>+PORTREVISION=	8
> CATEGORIES=	irc
> MASTER_SITES=	http://launchpadlibrarian.net/50016234/ \
> 		LOCAL/ashish/
>Index: irc/inspircd/Makefile
>===================================================================
>--- irc/inspircd/Makefile	(revision 411799)
>+++ irc/inspircd/Makefile	(working copy)
>@@ -4,7 +4,7 @@
> PORTNAME=	inspircd
> PORTVERSION=	2.0.20
> DISTVERSIONPREFIX=	v
>-PORTREVISION=	0
>+PORTREVISION=	1
> CATEGORIES=	irc
> 
> MAINTAINER=	feld@FreeBSD.org
>Index: irc/minbif/Makefile
>===================================================================
>--- irc/minbif/Makefile	(revision 411799)
>+++ irc/minbif/Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	minbif
> PORTVERSION=	1.0.5
>-PORTREVISION=	8
>+PORTREVISION=	9
> CATEGORIES=	irc net-im
> MASTER_SITES=	https://symlink.me/attachments/download/148/
> 
>Index: irc/ngircd/Makefile
>===================================================================
>--- irc/ngircd/Makefile	(revision 411799)
>+++ irc/ngircd/Makefile	(working copy)
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	ngircd
> PORTVERSION=	23
>+PORTREVISION=	1
> PORTEPOCH=	1
> CATEGORIES=	irc ipv6
> MASTER_SITES=	http://arthur.barton.de/pub/${PORTNAME}/ \
>Index: irc/scrollz/Makefile
>===================================================================
>--- irc/scrollz/Makefile	(revision 411799)
>+++ irc/scrollz/Makefile	(working copy)
>@@ -4,6 +4,7 @@
> PORTNAME=	ScrollZ
> PORTVERSION=	2.3
> DISTVERSIONPREFIX=	${PORTNAME}-
>+PORTREVISION=	1
> CATEGORIES=	irc ipv6
> 
> MAINTAINER=	freebsd@bitchx.org
>Index: irc/weechat/Makefile
>===================================================================
>--- irc/weechat/Makefile	(revision 411799)
>+++ irc/weechat/Makefile	(working copy)
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	weechat
> PORTVERSION=	1.4
>+PORTREVISION=	1
> CATEGORIES=	irc
> MASTER_SITES=	http://weechat.org/files/src/
> 
>@@ -54,7 +55,7 @@ JAVASCRIPT_LIB_DEPENDS=	libv8.so:${PORTS
> 
> GNUTLS_CMAKE_OFF=	-DENABLE_GNUTLS=no
> GNUTLS_USES=		pkgconfig
>-GNUTLS_LIB_DEPENDS=	libgnutls.so.28:${PORTSDIR}/security/gnutls
>+GNUTLS_LIB_DEPENDS=	libgnutls.so:${PORTSDIR}/security/gnutls
> 
> LUA_CMAKE_OFF=		-DENABLE_LUA=no
> LUA_CMAKE_ON=		-DBSD_LUA_LIBDIR=${LUA_LIBDIR} \
>Index: japanese/jd/Makefile
>===================================================================
>--- japanese/jd/Makefile	(revision 411799)
>+++ japanese/jd/Makefile	(working copy)
>@@ -4,6 +4,7 @@
> PORTNAME=	jd
> PORTVERSION=	2.8.9
> DISTVERSIONSUFFIX=	-150226
>+PORTREVISION=	1
> CATEGORIES=	japanese www
> MASTER_SITES=	SFJP/jd4linux/62877
> 
>Index: lang/gnustep-base/Makefile
>===================================================================
>--- lang/gnustep-base/Makefile	(revision 411799)
>+++ lang/gnustep-base/Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	gnustep-base
> PORTVERSION=	1.24.8
>-PORTREVISION=	1
>+PORTREVISION=	2
> CATEGORIES=	lang devel gnustep
> MASTER_SITES=	GNUSTEP/core
> 
>@@ -49,10 +49,8 @@ MDNS_DESC=		Zeroconf via mDNSResponder
> ICU_LIB_DEPENDS=	libicuuc.so:${PORTSDIR}/devel/icu
> ICU_CONFIGURE_OFF=	--disable-icu
> 
>-GNUTLS_LIB_DEPENDS=	libgnutls-openssl.so:${PORTSDIR}/security/gnutls
>-GNUTLS_CONFIGURE_ON=	--with-tls-prefix=${LOCALBASE} \
>-			TLS_CONFIG="pkg-config -gnutls"
>-GNUTLS_CONFIGURE_OFF=	--disable-tls
>+GNUTLS_LIB_DEPENDS=	libgnutls.so:${PORTSDIR}/security/gnutls
>+GNUTLS_CONFIGURE_ENABLE=tls
> 
> OPENSSL_USE=		OPENSSL=yes
> OPENSSL_CONFIGURE_OFF=	--disable-openssl
>Index: mail/anubis/Makefile
>===================================================================
>--- mail/anubis/Makefile	(revision 411799)
>+++ mail/anubis/Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	anubis
> PORTVERSION=	4.2
>-PORTREVISION=	3
>+PORTREVISION=	4
> CATEGORIES=	mail
> MASTER_SITES=	GNU
> 
>Index: mail/courier-imap/Makefile
>===================================================================
>--- mail/courier-imap/Makefile	(revision 411799)
>+++ mail/courier-imap/Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	courier-imap
> PORTVERSION=	4.16.2
>-PORTREVISION=	1
>+PORTREVISION=	2
> PORTEPOCH=	2
> CATEGORIES=	mail ipv6
> MASTER_SITES=	SF/courier/imap/${PORTVERSION}
>Index: mail/exim/Makefile
>===================================================================
>--- mail/exim/Makefile	(revision 411799)
>+++ mail/exim/Makefile	(working copy)
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	exim
> PORTVERSION?=	${EXIM_VERSION}
>+PORTREVISION=	1
> CATEGORIES=	mail ipv6
> MASTER_SITES=	EXIM/exim4/:exim
> DISTNAME=	${PORTNAME}-${EXIM_VERSION}
>Index: mail/libetpan/Makefile
>===================================================================
>--- mail/libetpan/Makefile	(revision 411799)
>+++ mail/libetpan/Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	libetpan
> PORTVERSION=	1.6
>-PORTREVISION=	1
>+PORTREVISION=	2
> CATEGORIES=	mail ipv6
> 
> MAINTAINER=	pawel@FreeBSD.org
>Index: mail/libvmime/Makefile
>===================================================================
>--- mail/libvmime/Makefile	(revision 411799)
>+++ mail/libvmime/Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	libvmime
> PORTVERSION=	0.9.2.s20140721
>-PORTREVISION=	2
>+PORTREVISION=	3
> CATEGORIES=	mail
> 
> MAINTAINER=	delphij@FreeBSD.org
>Index: mail/mpop/Makefile
>===================================================================
>--- mail/mpop/Makefile	(revision 411799)
>+++ mail/mpop/Makefile	(working copy)
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	mpop
> DISTVERSION=	1.2.4
>+PORTREVISION=	1
> CATEGORIES=	mail
> MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${DISTVERSION}
> 
>Index: mail/msmtp/Makefile
>===================================================================
>--- mail/msmtp/Makefile	(revision 411799)
>+++ mail/msmtp/Makefile	(working copy)
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	msmtp
> PORTVERSION=	1.6.4
>+PORTREVISION=	1
> CATEGORIES=	mail ipv6
> MASTER_SITES=	SF
> 
>Index: mail/nullmailer/Makefile
>===================================================================
>--- mail/nullmailer/Makefile	(revision 411799)
>+++ mail/nullmailer/Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	nullmailer
> PORTVERSION=	1.13
>-PORTREVISION=	2
>+PORTREVISION=	3
> PORTEPOCH=	1
> CATEGORIES=	mail
> MASTER_SITES=	http://untroubled.org/nullmailer/ \
>Index: mail/opendkim/Makefile
>===================================================================
>--- mail/opendkim/Makefile	(revision 411799)
>+++ mail/opendkim/Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=		opendkim
> PORTVERSION=		2.10.3
>-PORTREVISION=		4
>+PORTREVISION=		5
> CATEGORIES=		mail security
> MASTER_SITES=		SF/${PORTNAME} \
> 			SF/${PORTNAME}/Previous%20Releases \
>Index: mail/wmbiff/Makefile
>===================================================================
>--- mail/wmbiff/Makefile	(revision 411799)
>+++ mail/wmbiff/Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	wmbiff
> PORTVERSION=	0.4.27
>-PORTREVISION=	17
>+PORTREVISION=	18
> CATEGORIES=	mail windowmaker afterstep
> MASTER_SITES=	SF
> 
>Index: mail/xfce4-mailwatch-plugin/Makefile
>===================================================================
>--- mail/xfce4-mailwatch-plugin/Makefile	(revision 411799)
>+++ mail/xfce4-mailwatch-plugin/Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	xfce4-mailwatch-plugin
> PORTVERSION=	1.2.0
>-PORTREVISION=	7
>+PORTREVISION=	8
> CATEGORIES=	mail xfce
> MASTER_SITES=	XFCE/src/panel-plugins/${PORTNAME}/${PORTVERSION:R}
> DIST_SUBDIR=	xfce4
>Index: multimedia/ffmpeg/Makefile
>===================================================================
>--- multimedia/ffmpeg/Makefile	(revision 411799)
>+++ multimedia/ffmpeg/Makefile	(working copy)
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	ffmpeg
> PORTVERSION=	2.8.6
>+PORTREVISION=	1
> PORTEPOCH=	1
> CATEGORIES=	multimedia audio ipv6 net
> MASTER_SITES=	http://ffmpeg.org/releases/
>Index: multimedia/kodi/Makefile
>===================================================================
>--- multimedia/kodi/Makefile	(revision 411799)
>+++ multimedia/kodi/Makefile	(working copy)
>@@ -2,7 +2,7 @@
> 
> PORTNAME=	kodi
> DISTVERSION=	15.2
>-PORTREVISION=	1
>+PORTREVISION=	2
> CATEGORIES=	multimedia java
> 
> MAINTAINER=	mickael.maillot@gmail.com
>Index: multimedia/libav/Makefile
>===================================================================
>--- multimedia/libav/Makefile	(revision 411799)
>+++ multimedia/libav/Makefile	(working copy)
>@@ -2,6 +2,7 @@
> 
> PORTNAME=	libav
> PORTVERSION=	11.6
>+PORTREVISION=	1
> CATEGORIES=	multimedia audio ipv6 net
> MASTER_SITES=	http://libav.org/releases/
> 
>Index: multimedia/mencoder/Makefile
>===================================================================
>--- multimedia/mencoder/Makefile	(revision 411799)
>+++ multimedia/mencoder/Makefile	(working copy)
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	mencoder
> PORTVERSION=	${MPLAYER_PORT_VERSION}
>+PORTREVISION=	1
> CATEGORIES=	multimedia audio
> 
> MAINTAINER=	riggs@FreeBSD.org
>Index: multimedia/mplayer/Makefile
>===================================================================
>--- multimedia/mplayer/Makefile	(revision 411799)
>+++ multimedia/mplayer/Makefile	(working copy)
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	mplayer
> PORTVERSION=	${MPLAYER_PORT_VERSION}
>+PORTREVISION=	1
> CATEGORIES=	multimedia audio
> 
> MAINTAINER=	riggs@FreeBSD.org
>Index: multimedia/vlc/Makefile
>===================================================================
>--- multimedia/vlc/Makefile	(revision 411799)
>+++ multimedia/vlc/Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	vlc
> DISTVERSION=	2.2.1
>-PORTREVISION=	7
>+PORTREVISION=	8
> PORTEPOCH=	4
> CATEGORIES=	multimedia audio ipv6 net www
> MASTER_SITES=	http://download.videolan.org/pub/videolan/${PORTNAME}/${DISTVERSION:S/a$//}/ \
>Index: net/csync2/Makefile
>===================================================================
>--- net/csync2/Makefile	(revision 411799)
>+++ net/csync2/Makefile	(working copy)
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	csync2
> PORTVERSION=	2.0
>+PORTREVISION=	1
> CATEGORIES=	net
> MASTER_SITES=	http://oss.linbit.com/csync2/
> 
>Index: net/glib-networking/Makefile
>===================================================================
>--- net/glib-networking/Makefile	(revision 411799)
>+++ net/glib-networking/Makefile	(working copy)
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	glib-networking
> PORTVERSION=	2.46.1
>+PORTREVISION=	1
> CATEGORIES=	net
> MASTER_SITES=	GNOME
> DIST_SUBDIR=	gnome2
>Index: net/gtk-vnc/Makefile
>===================================================================
>--- net/gtk-vnc/Makefile	(revision 411799)
>+++ net/gtk-vnc/Makefile	(working copy)
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	gtk-vnc
> PORTVERSION=	0.5.4
>+PORTREVISION=	1
> CATEGORIES=	net gnome
> MASTER_SITES=	GNOME
> 
>Index: net/hs-network-protocol-xmpp/Makefile
>===================================================================
>--- net/hs-network-protocol-xmpp/Makefile	(revision 411799)
>+++ net/hs-network-protocol-xmpp/Makefile	(working copy)
>@@ -2,6 +2,7 @@
> 
> PORTNAME=	network-protocol-xmpp
> PORTVERSION=	0.4.8
>+PORTREVISION=	1
> CATEGORIES=	net haskell
> 
> MAINTAINER=	haskell@FreeBSD.org
>Index: net/libvncserver/Makefile
>===================================================================
>--- net/libvncserver/Makefile	(revision 411799)
>+++ net/libvncserver/Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	libvncserver
> PORTVERSION=	0.9.9
>-PORTREVISION=	11
>+PORTREVISION=	12
> CATEGORIES=	net devel
> MASTER_SITES=	SF
> DISTNAME=	LibVNCServer-${PORTVERSION}
>Index: net/morebalance/Makefile
>===================================================================
>--- net/morebalance/Makefile	(revision 411799)
>+++ net/morebalance/Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	morebalance
> PORTVERSION=	0.4
>-PORTREVISION=	13
>+PORTREVISION=	14
> CATEGORIES=	net
> MASTER_SITES=	http://morebalance.coolprojects.org/
> 
>Index: net/net6/Makefile
>===================================================================
>--- net/net6/Makefile	(revision 411799)
>+++ net/net6/Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	net6
> PORTVERSION=	1.3.14
>-PORTREVISION=	3
>+PORTREVISION=	4
> CATEGORIES=	net devel
> MASTER_SITES=	http://releases.0x539.de/net6/
> 
>Index: net/net6/files/patch-src-encrypt.cpp
>===================================================================
>--- net/net6/files/patch-src-encrypt.cpp	(nonexistent)
>+++ net/net6/files/patch-src-encrypt.cpp	(working copy)
>@@ -0,0 +1,14 @@
>+--- src/encrypt.cpp.orig	2011-09-28 11:15:10 UTC
>++++ src/encrypt.cpp
>+@@ -175,10 +175,7 @@ net6::tcp_encrypted_socket_base::
>+                                   gnutls_session_t sess):
>+ 	tcp_client_socket(cobj), session(sess), state(DEFAULT)
>+ {
>+-	const int kx_prio[] = { GNUTLS_KX_ANON_DH, 0 };
>+-
>+-	gnutls_set_default_priority(session);
>+-	gnutls_kx_set_priority(session, kx_prio);
>++	gnutls_priority_set_direct(session, "NORMAL:-KX-ALL:+ANON-DH", NULL);
>+ 
>+ 	gnutls_transport_set_ptr(
>+ 		session,
>
>Property changes on: net/net6/files/patch-src-encrypt.cpp
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: net/ocserv/Makefile
>===================================================================
>--- net/ocserv/Makefile	(revision 411799)
>+++ net/ocserv/Makefile	(working copy)
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	ocserv
> PORTVERSION=	0.10.12
>+PORTREVISION=	1
> CATEGORIES=	net security
> MASTER_SITES=	ftp://ftp.infradead.org/pub/ocserv/
> 
>Index: net/remmina-plugin-vnc/Makefile
>===================================================================
>--- net/remmina-plugin-vnc/Makefile	(revision 411799)
>+++ net/remmina-plugin-vnc/Makefile	(working copy)
>@@ -1,7 +1,7 @@
> # Created by: Alexander Logvinov <avl@FreeBSD.org>
> # $FreeBSD$
> 
>-PORTREVISION=	5
>+PORTREVISION=	6
> PKGNAMESUFFIX=	-vnc
> 
> COMMENT=	Remmina plugin for VNC protocol
>Index: net/samba41/Makefile
>===================================================================
>--- net/samba41/Makefile	(revision 411799)
>+++ net/samba41/Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME?=		${SAMBA4_BASENAME}41
> PORTVERSION?=		${SAMBA4_VERSION}
>-PORTREVISION?=		1
>+PORTREVISION?=		2
> CATEGORIES?=		net
> MASTER_SITES=		SAMBA/samba/stable SAMBA/samba/rc
> DISTNAME=		${SAMBA4_DISTNAME}
>Index: net/samba42/Makefile
>===================================================================
>--- net/samba42/Makefile	(revision 411799)
>+++ net/samba42/Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME?=		${SAMBA4_BASENAME}42
> PORTVERSION?=		${SAMBA4_VERSION}
>-PORTREVISION?=		1
>+PORTREVISION?=		2
> CATEGORIES?=		net
> MASTER_SITES=		SAMBA/samba/stable SAMBA/samba/rc
> DISTNAME=		${SAMBA4_DISTNAME}
>Index: net/samba43/Makefile
>===================================================================
>--- net/samba43/Makefile	(revision 411799)
>+++ net/samba43/Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME?=		${SAMBA4_BASENAME}43
> PORTVERSION?=		${SAMBA4_VERSION}
>-PORTREVISION?=		1
>+PORTREVISION?=		2
> CATEGORIES?=		net
> MASTER_SITES=		SAMBA/samba/stable SAMBA/samba/rc
> DISTNAME=		${SAMBA4_DISTNAME}
>Index: net/sixxs-aiccu/Makefile
>===================================================================
>--- net/sixxs-aiccu/Makefile	(revision 411799)
>+++ net/sixxs-aiccu/Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	aiccu
> PORTVERSION=	20070115
>-PORTREVISION=	4
>+PORTREVISION=	5
> CATEGORIES=	net ipv6
> MASTER_SITES=	http://www.sixxs.net/archive/sixxs/aiccu/unix/
> PKGNAMEPREFIX=	sixxs-
>@@ -34,7 +34,7 @@ OPTIONS_DEFAULT+=	GNUTLS
> .include <bsd.port.options.mk>
> 
> .if ${PORT_OPTIONS:MGNUTLS}
>-LIB_DEPENDS+=	libgnutls-openssl.so:${PORTSDIR}/security/gnutls
>+LIB_DEPENDS+=	libgnutls.so:${PORTSDIR}/security/gnutls
> CFLAGS+=	-DAICCU_GNUTLS
> LDFLAGS+=	-lgnutls
> .endif
>Index: net/sixxs-aiccu/files/patch-common-common.c
>===================================================================
>--- net/sixxs-aiccu/files/patch-common-common.c	(nonexistent)
>+++ net/sixxs-aiccu/files/patch-common-common.c	(working copy)
>@@ -0,0 +1,25 @@
>+--- common/common.c.orig	2006-12-21 14:08:50 UTC
>++++ common/common.c
>+@@ -271,8 +271,6 @@ TLSSOCKET sock_alloc(void);
>+ TLSSOCKET sock_alloc(void)
>+ {
>+ #ifdef AICCU_GNUTLS
>+-	/* Allow connections to servers that have OpenPGP keys as well */
>+-	const int	cert_type_priority[3] = { GNUTLS_CRT_X509, GNUTLS_CRT_OPENPGP, 0 };
>+ 	int		ret;
>+ #endif /* AICCU_GNUTLS*/
>+ 
>+@@ -296,11 +294,8 @@ TLSSOCKET sock_alloc(void)
>+ 		return NULL;
>+ 	}
>+ 
>+-	/* Use default priorities */
>+-	gnutls_set_default_priority(sock->session);
>+-	/* XXX: Return value is not documented in GNUTLS documentation! */
>+-
>+-	gnutls_certificate_type_set_priority(sock->session, cert_type_priority);
>++	/* Allow connections to servers that have OpenPGP keys as well */
>++	gnutls_priority_set_direct(sock->session, "NORMAL:+CTYPE-OPENPGP", NULL);
>+ 	/* XXX: Return value is not documented in GNUTLS documentation! */
>+ 
>+ 	/* Configure the x509 credentials for the current session */
>
>Property changes on: net/sixxs-aiccu/files/patch-common-common.c
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: net/tigervnc/Makefile
>===================================================================
>--- net/tigervnc/Makefile	(revision 411799)
>+++ net/tigervnc/Makefile	(working copy)
>@@ -3,8 +3,8 @@
> 
> PORTNAME=	tigervnc
> PORTVERSION=	1.6.0
>-PORTREVISION=	1
> DISTVERSIONPREFIX=	v
>+PORTREVISION=	2
> CATEGORIES=	net x11-servers
> 
> MAINTAINER=	meta+ports@vmeta.jp
>Index: net/uget/Makefile
>===================================================================
>--- net/uget/Makefile	(revision 411799)
>+++ net/uget/Makefile	(working copy)
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	uget
> PORTVERSION=	2.0.5
>+PORTREVISION=	1
> CATEGORIES=	net
> MASTER_SITES=	SF/urlget/${PORTNAME}%20%28stable%29/${PORTVERSION}
> 
>Index: net/vinagre/Makefile
>===================================================================
>--- net/vinagre/Makefile	(revision 411799)
>+++ net/vinagre/Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	vinagre
> PORTVERSION=	3.18.2
>-PORTREVISION=	2
>+PORTREVISION=	3
> CATEGORIES=	net gnome
> MASTER_SITES=	GNOME
> DIST_SUBDIR=	gnome3
>Index: net/vino/Makefile
>===================================================================
>--- net/vino/Makefile	(revision 411799)
>+++ net/vino/Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	vino
> PORTVERSION=	3.18.1
>-PORTREVISION=	1
>+PORTREVISION=	2
> CATEGORIES=	net gnome
> MASTER_SITES=	GNOME
> DIST_SUBDIR=	gnome3
>Index: net/wireshark/Makefile
>===================================================================
>--- net/wireshark/Makefile	(revision 411799)
>+++ net/wireshark/Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME?=	wireshark
> PORTVERSION=	2.0.2
>-PORTREVISION?=	0
>+PORTREVISION?=	1
> CATEGORIES=	net ipv6
> MASTER_SITES=	http://www.wireshark.org/download/src/ \
> 		http://ftp.uni-kl.de/pub/wireshark/src/ \
>Index: net-im/climm/Makefile
>===================================================================
>--- net-im/climm/Makefile	(revision 411799)
>+++ net-im/climm/Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	climm
> PORTVERSION=	0.7.1
>-PORTREVISION=	11
>+PORTREVISION=	12
> CATEGORIES=	net-im
> MASTER_SITES=	http://www.climm.org/source/ \
> 		http://http.bg.climm.org/source/
>Index: net-im/empathy/Makefile
>===================================================================
>--- net-im/empathy/Makefile	(revision 411799)
>+++ net-im/empathy/Makefile	(working copy)
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	empathy
> PORTVERSION=	3.12.11
>+PORTREVISION=	1
> CATEGORIES=	net-im gnome
> MASTER_SITES=	GNOME
> 
>Index: net-im/gloox/Makefile
>===================================================================
>--- net-im/gloox/Makefile	(revision 411799)
>+++ net-im/gloox/Makefile	(working copy)
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	gloox
> PORTVERSION=	1.0.14
>+PORTREVISION=	1
> CATEGORIES=	net-im
> MASTER_SITES=	http://camaya.net/download/
> 
>Index: net-im/jabber/Makefile
>===================================================================
>--- net-im/jabber/Makefile	(revision 411799)
>+++ net-im/jabber/Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	jabber
> PORTVERSION=	1.6.1.1
>-PORTREVISION=	18
>+PORTREVISION=	19
> PORTEPOCH=	1
> CATEGORIES=	net-im ipv6
> MASTER_SITES=	http://download.jabberd.org/jabberd14/%SUBDIR%/
>Index: net-im/jabber/files/patch-jabberd-mio_tls.cc
>===================================================================
>--- net-im/jabber/files/patch-jabberd-mio_tls.cc	(revision 411799)
>+++ net-im/jabber/files/patch-jabberd-mio_tls.cc	(working copy)
>@@ -1,5 +1,5 @@
>---- jabberd/mio_tls.cc.orig	2008-03-06 10:21:01.669677189 +0100
>-+++ jabberd/mio_tls.cc	2008-03-06 10:35:04.744064592 +0100
>+--- jabberd/mio_tls.cc.orig	2007-07-16 23:20:44 UTC
>++++ jabberd/mio_tls.cc
> @@ -39,7 +39,6 @@
>  #include <set>
>  #include <string>
>@@ -8,7 +8,7 @@
>  #include <vector>
>  #include <list>
>  #include <iostream>
>-@@ -612,7 +611,7 @@
>+@@ -612,7 +611,7 @@ static void mio_tls_process_credentials(
>  	    }
>  
>  	    // load OpenPGP key/certificate
>@@ -17,7 +17,7 @@
>  	    if (ret < 0) {
>  		log_error(NULL, "Error loading OpenPGP key pub=%s/priv=%s: %s", pubfile, privfile, gnutls_strerror(ret));
>  		continue;
>-@@ -631,7 +630,7 @@
>+@@ -631,7 +630,7 @@ static void mio_tls_process_credentials(
>  	    }
>  
>  	    // load the OpenPGP keyring
>@@ -26,7 +26,7 @@
>  	    if (ret < 0) {
>  		log_error(NULL, "Error loading OpenPGP keyring %s: %s", file, gnutls_strerror(ret));
>  		continue;
>-@@ -640,23 +639,6 @@
>+@@ -640,23 +639,6 @@ static void mio_tls_process_credentials(
>  	    continue;
>  	}
>  
>@@ -50,7 +50,7 @@
>  	// setup protocols to use
>  	if (j_strcmp(xmlnode_get_localname(cur), "protocols") == 0) {
>  	    char const *const protocols_data = xmlnode_get_data(cur);
>-@@ -916,7 +898,7 @@
>+@@ -916,7 +898,7 @@ bool mio_tls_early_init() {
>      /* load asn1 tree to be used by libtasn1 */
>      ret = asn1_array2tree(subjectAltName_asn1_tab, &mio_tls_asn1_tree, NULL);
>      if (ret != ASN1_SUCCESS) {
>@@ -59,7 +59,88 @@
>  	return false;
>  	/* XXX we have to delete the structure on shutdown using asn1_delete_structure(&mio_tls_asn1_tree) */
>      }
>-@@ -1498,7 +1480,6 @@
>+@@ -1302,80 +1284,32 @@ int mio_ssl_starttls(mio m, int originat
>+ 
>+     // overwrite protocol priorities?
>+     if (mio_tls_protocols.find(identity) != mio_tls_protocols.end()) {
>+-	ret = gnutls_protocol_set_priority(session, mio_tls_protocols[identity]);
>+-	if (ret < 0) {
>+-	    log_notice(identity, "error setting protocol priority: %s", gnutls_strerror(ret));
>+-	}
>+     } else if (mio_tls_protocols.find("*") != mio_tls_protocols.end()) {
>+-	ret = gnutls_protocol_set_priority(session, mio_tls_protocols["*"]);
>+-	if (ret < 0) {
>+-	    log_notice(identity, "error setting protocol priority: %s", gnutls_strerror(ret));
>+-	}
>+     }
>+ 
>+     // overwrite kx algorithm priorities?
>+     if (mio_tls_kx.find(identity) != mio_tls_kx.end()) {
>+-	ret = gnutls_kx_set_priority(session, mio_tls_kx[identity]);
>+-	if (ret < 0) {
>+-	    log_notice(identity, "error setting kx algorithm priority: %s", gnutls_strerror(ret));
>+-	}
>+     } else if (mio_tls_kx.find("*") != mio_tls_kx.end()) {
>+-	ret = gnutls_kx_set_priority(session, mio_tls_kx["*"]);
>+-	if (ret < 0) {
>+-	    log_notice(identity, "error setting kx algorithm priority: %s", gnutls_strerror(ret));
>+-	}
>+     }
>+ 
>+     // overwrite cipher priorities?
>+     if (mio_tls_ciphers.find(identity) != mio_tls_ciphers.end()) {
>+-	ret = gnutls_cipher_set_priority(session, mio_tls_ciphers[identity]);
>+-	if (ret < 0) {
>+-	    log_notice(identity, "error setting cipher algorithm priority: %s", gnutls_strerror(ret));
>+-	}
>+     } else if (mio_tls_ciphers.find("*") != mio_tls_ciphers.end()) {
>+-	ret = gnutls_cipher_set_priority(session, mio_tls_ciphers["*"]);
>+-	if (ret < 0) {
>+-	    log_notice(identity, "error setting cipher algorithm priority: %s", gnutls_strerror(ret));
>+-	}
>+     }
>+ 
>+     // overwrite certificate priorities?
>+     if (mio_tls_certtypes.find(identity) != mio_tls_certtypes.end()) {
>+-	ret = gnutls_certificate_type_set_priority(session, mio_tls_certtypes[identity]);
>+-	if (ret < 0) {
>+-	    log_notice(identity, "error setting certificate priorities: %s", gnutls_strerror(ret));
>+-	}
>+     } else if (mio_tls_certtypes.find("*") != mio_tls_certtypes.end()) {
>+-	ret = gnutls_certificate_type_set_priority(session, mio_tls_certtypes["*"]);
>+-	if (ret < 0) {
>+-	    log_notice(identity, "error setting certificate priorities: %s", gnutls_strerror(ret));
>+-	}
>+     }
>+ 
>+     // overwrite mac algorithm priorities?
>+     if (mio_tls_mac.find(identity) != mio_tls_mac.end()) {
>+-	ret = gnutls_mac_set_priority(session, mio_tls_mac[identity]);
>+-	if (ret < 0) {
>+-	    log_notice(identity, "error setting mac algorithm priorities: %s", gnutls_strerror(ret));
>+-	}
>+     } else if (mio_tls_mac.find("*") != mio_tls_mac.end()) {
>+-	ret = gnutls_mac_set_priority(session, mio_tls_mac["*"]);
>+-	if (ret < 0) {
>+-	    log_notice(identity, "error setting mac algorithm priorities: %s", gnutls_strerror(ret));
>+-	}
>+     }
>+ 
>+     // overwrite compression algorithm priorities?
>+     if (mio_tls_compression.find(identity) != mio_tls_compression.end()) {
>+-	ret = gnutls_compression_set_priority(session, mio_tls_compression[identity]);
>+-	if (ret < 0) {
>+-	    log_notice(identity, "error setting compression algorithm priorities: %s", gnutls_strerror(ret));
>+-	}
>+     } else if (mio_tls_compression.find("*") != mio_tls_compression.end()) {
>+-	ret = gnutls_compression_set_priority(session, mio_tls_compression["*"]);
>+-	if (ret < 0) {
>+-	    log_notice(identity, "error setting compression algorithm priorities: %s", gnutls_strerror(ret));
>+-	}
>+     }
>+ 
>+     /* setting certificate credentials */
>+@@ -1498,7 +1432,6 @@ static int mio_tls_check_openpgp(mio m, 
>      const gnutls_datum_t *cert_list = NULL;
>      unsigned int cert_list_size = 0;
>  
>@@ -67,7 +148,7 @@
>      // get the certificate (it's only a single one for OpenPGP)
>      cert_list = gnutls_certificate_get_peers(static_cast<gnutls_session_t>(m->ssl), &cert_list_size);
>      if (cert_list == NULL || cert_list_size <= 0) {
>-@@ -1566,7 +1547,6 @@
>+@@ -1566,7 +1499,6 @@ static int mio_tls_check_openpgp(mio m, 
>      // free memory
>      gnutls_openpgp_key_deinit(pgpkey);
>      pool_free(jidpool);
>@@ -75,7 +156,7 @@
>      return 0;
>  }
>  
>-@@ -1684,14 +1664,14 @@
>+@@ -1684,14 +1616,14 @@ static int mio_tls_check_x509(mio m, cha
>  		    /* init subjectAltName_element */
>  		    ret = asn1_create_element(mio_tls_asn1_tree, "PKIX1.SubjectAltName", &subjectAltName_element);
>  		    if (ret != ASN1_SUCCESS) {
>@@ -92,7 +173,7 @@
>  			asn1_delete_structure(&subjectAltName_element);
>  			break;
>  		    }
>-@@ -1712,7 +1692,7 @@
>+@@ -1712,7 +1644,7 @@ static int mio_tls_check_x509(mio m, cha
>  			    break;
>  			}
>  			if (ret != ASN1_SUCCESS) {
>@@ -101,7 +182,7 @@
>  			    break;
>  			}
>  
>-@@ -1732,7 +1712,7 @@
>+@@ -1732,7 +1664,7 @@ static int mio_tls_check_x509(mio m, cha
>  
>  				ret = asn1_read_value(subjectAltName_element, access_string, dNSName, &dNSName_len);
>  				if (ret != ASN1_SUCCESS) {
>@@ -110,7 +191,7 @@
>  				    break;
>  				}
>  
>-@@ -1772,7 +1752,7 @@
>+@@ -1772,7 +1704,7 @@ static int mio_tls_check_x509(mio m, cha
>  			    /* get the OID of the otherName */
>  			    ret = asn1_read_value(subjectAltName_element, access_string_type, otherNameType, &otherNameType_len);
>  			    if (ret != ASN1_SUCCESS) {
>@@ -119,7 +200,7 @@
>  				break;
>  			    }
>  
>-@@ -1785,7 +1765,7 @@
>+@@ -1785,7 +1717,7 @@ static int mio_tls_check_x509(mio m, cha
>  			    /* get the value of the otherName */
>  			    ret = asn1_read_value(subjectAltName_element, access_string_value, otherNameValue, &otherNameValue_len);
>  			    if (ret != ASN1_SUCCESS) {
>@@ -128,7 +209,7 @@
>  				break;
>  			    }
>  
>-@@ -1799,21 +1779,21 @@
>+@@ -1799,21 +1731,21 @@ static int mio_tls_check_x509(mio m, cha
>  
>  				ret = asn1_create_element(mio_tls_asn1_tree, "PKIX1.DirectoryString", &directoryString_element);
>  				if (ret != ASN1_SUCCESS) {
>Index: net-im/libpurple/Makefile
>===================================================================
>--- net-im/libpurple/Makefile	(revision 411799)
>+++ net-im/libpurple/Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME?=	libpurple
> PORTVERSION=	2.10.12
>-PORTREVISION?=	1
>+PORTREVISION?=	2
> CATEGORIES?=	net-im
> MASTER_SITES=	SF/pidgin/Pidgin/${PORTVERSION}
> DISTNAME=	pidgin-${PORTVERSION}
>Index: net-im/licq-jabber/Makefile
>===================================================================
>--- net-im/licq-jabber/Makefile	(revision 411799)
>+++ net-im/licq-jabber/Makefile	(working copy)
>@@ -2,7 +2,7 @@
> 
> PORTNAME=	jabber
> PORTVERSION=	1.8.2
>-PORTREVISION=	2
>+PORTREVISION=	3
> CATEGORIES=	net-im
> 
> MAINTAINER=	dinoex@FreeBSD.org
>Index: net-im/loudmouth/Makefile
>===================================================================
>--- net-im/loudmouth/Makefile	(revision 411799)
>+++ net-im/loudmouth/Makefile	(working copy)
>@@ -3,27 +3,28 @@
> #   $MCom: ports/trunk/net-im/loudmouth/Makefile 19914 2014-09-25 22:33:21Z kwm $
> 
> PORTNAME=	loudmouth
>-PORTVERSION=	1.4.3
>-PORTREVISION=	11
>-CATEGORIES=	net-im gnome
>-MASTER_SITES=	GNOME
>+PORTVERSION=	1.5.3
>+CATEGORIES=	net-im
>+MASTER_SITES=	https://mcabber.com/files/loudmouth/ \
>+		http://www.lilotux.net/~mikael/mcabber/files/loudmouth/
> 
> MAINTAINER=	gnome@FreeBSD.org
> COMMENT=	Lightweight Jabber client library
> 
>-LICENSE=	GPLv2
>+LICENSE=	LGPL21+
>+LICENSE_FILE=	${WRKSRC}/COPYING
> 
> LIB_DEPENDS=	libidn.so:${PORTSDIR}/dns/libidn
> 
>-USES=		gettext gmake libtool pathfix pkgconfig tar:bzip2
>+USES=		gettext gmake libtool pkgconfig tar:bzip2
> USE_GNOME=	glib20
> GNU_CONFIGURE=	yes
> USE_LDCONFIG=	yes
>-CONFIGURE_ARGS=	--disable-gtk-doc
>-CPPFLAGS+=	-I${LOCALBASE}/include
>-LDFLAGS+=	-Wl,-Bsymbolic -L${LOCALBASE}/lib
>+CONFIGURE_ARGS=	--disable-gtk-doc --disable-rebuilds \
>+		--with-pkgconfigdir=${PREFIX}/libdata/pkgconfig
> INSTALL_TARGET=	install-strip
> 
>+OPTIONS_DEFINE=	DOCS
> OPTIONS_DEFAULT=GNUTLS
> OPTIONS_RADIO=	SSL
> OPTIONS_RADIO_SSL=	GNUTLS OPENSSL
>@@ -32,21 +33,13 @@ OPTIONS_RADIO_SSL=	GNUTLS OPENSSL
> 
> .if ${PORT_OPTIONS:MGNUTLS}
> LIB_DEPENDS+=	libgnutls.so:${PORTSDIR}/security/gnutls
>-RUN_DEPENDS+=	${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss
>-.endif
>-
>-.if ${PORT_OPTIONS:MOPENSSL}
>+CONFIGURE_ARGS+=--with-ssl=gnutls
>+.elif ${PORT_OPTIONS:MOPENSSL}
> USE_OPENSSL=	yes
> CONFIGURE_ARGS+=--with-ssl=openssl
> RUN_DEPENDS+=	${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss
>-.endif
>-
>-.if !${PORT_OPTIONS:MGNUTLS} && !${PORT_OPTIONS:MOPENSSL}
>+.else
> CONFIGURE_ARGS+=--without-ssl
> .endif
> 
>-post-patch:
>-	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \
>-	    	${WRKSRC}/loudmouth/lm-ssl-gnutls.c
>-
> .include <bsd.port.mk>
>Index: net-im/loudmouth/distinfo
>===================================================================
>--- net-im/loudmouth/distinfo	(revision 411799)
>+++ net-im/loudmouth/distinfo	(working copy)
>@@ -1,2 +1,2 @@
>-SHA256 (loudmouth-1.4.3.tar.bz2) = 95a93f5d009b71ea8193d994aa11f311bc330a3efe1b7cd74dc48f11c7f929e3
>-SIZE (loudmouth-1.4.3.tar.bz2) = 366818
>+SHA256 (loudmouth-1.5.3.tar.bz2) = 54329415cb1bacb783c20f5f1f975de4fc460165d0d8a1e3b789367b5f69d32c
>+SIZE (loudmouth-1.5.3.tar.bz2) = 375974
>Index: net-im/loudmouth/files/patch-configure
>===================================================================
>--- net-im/loudmouth/files/patch-configure	(revision 411799)
>+++ net-im/loudmouth/files/patch-configure	(nonexistent)
>@@ -1,28 +0,0 @@
>---- configure.orig	2009-08-17 03:50:55.000000000 -0400
>-+++ configure	2009-08-17 03:50:59.000000000 -0400
>-@@ -21983,12 +21983,14 @@ fi
>-   if test x$libgnutls_config_prefix != x ; then
>-      libgnutls_config_args="$libgnutls_config_args --prefix=$libgnutls_config_prefix"
>-      if test x${LIBGNUTLS_CONFIG+set} != xset ; then
>--        LIBGNUTLS_CONFIG=$libgnutls_config_prefix/bin/libgnutls-config
>-+        LIBGNUTLS_CONFIG=pkg-config
>-      fi
>-   fi
>- 
>-+  libgnutls_config_args="$libgnutls_config_args gnutls"
>-+
>-   # Extract the first word of "libgnutls-config", so it can be a program name with args.
>--set dummy libgnutls-config; ac_word=$2
>-+set dummy pkg-config; ac_word=$2
>- { echo "$as_me:$LINENO: checking for $ac_word" >&5
>- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
>- if test "${ac_cv_path_LIBGNUTLS_CONFIG+set}" = set; then
>-@@ -22037,7 +22039,7 @@ echo $ECHO_N "checking for libgnutls - v
>-   else
>-     LIBGNUTLS_CFLAGS=`$LIBGNUTLS_CONFIG $libgnutls_config_args --cflags`
>-     LIBGNUTLS_LIBS=`$LIBGNUTLS_CONFIG $libgnutls_config_args --libs`
>--    libgnutls_config_version=`$LIBGNUTLS_CONFIG $libgnutls_config_args --version`
>-+    libgnutls_config_version=`$LIBGNUTLS_CONFIG $libgnutls_config_args --modversion`
>- 
>- 
>-       ac_save_CFLAGS="$CFLAGS"
>
>Property changes on: net-im/loudmouth/files/patch-configure
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: net-im/loudmouth/files/patch-loudmouth_Makefile.in
>===================================================================
>--- net-im/loudmouth/files/patch-loudmouth_Makefile.in	(revision 411799)
>+++ net-im/loudmouth/files/patch-loudmouth_Makefile.in	(nonexistent)
>@@ -1,12 +0,0 @@
>---- loudmouth/Makefile.in.orig	2008-07-06 15:44:25.000000000 -0400
>-+++ loudmouth/Makefile.in	2008-07-06 15:43:53.000000000 -0400
>-@@ -306,8 +306,7 @@ libloudmouthinclude_HEADERS = \
>- 
>- libloudmouth_1_la_LIBADD = \
>- 	$(LOUDMOUTH_LIBS)		\
>--	$(LIBIDN_LIBS) \
>--	-lresolv
>-+	$(LIBIDN_LIBS)
>- 
>- libloudmouth_1_la_LDFLAGS = \
>- 	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
>
>Property changes on: net-im/loudmouth/files/patch-loudmouth_Makefile.in
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: net-im/loudmouth/files/patch-loudmouth_lm-error.c
>===================================================================
>--- net-im/loudmouth/files/patch-loudmouth_lm-error.c	(revision 411799)
>+++ net-im/loudmouth/files/patch-loudmouth_lm-error.c	(nonexistent)
>@@ -1,11 +0,0 @@
>---- loudmouth/lm-error.c.orig	2012-05-22 10:05:29.000000000 +0200
>-+++ loudmouth/lm-error.c	2012-05-22 10:05:41.000000000 +0200
>-@@ -19,7 +19,7 @@
>-  */
>- 
>- #include <config.h>
>--#include <glib/gerror.h>
>-+#include <glib.h>
>- #include "lm-error.h"
>- 
>- /**
>
>Property changes on: net-im/loudmouth/files/patch-loudmouth_lm-error.c
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: net-im/loudmouth/files/patch-loudmouth_lm-ssl-gnutls.c
>===================================================================
>--- net-im/loudmouth/files/patch-loudmouth_lm-ssl-gnutls.c	(revision 411799)
>+++ net-im/loudmouth/files/patch-loudmouth_lm-ssl-gnutls.c	(nonexistent)
>@@ -1,28 +0,0 @@
>---- loudmouth/lm-ssl-gnutls.c.orig	2010-04-17 15:56:39.000000000 -0400
>-+++ loudmouth/lm-ssl-gnutls.c	2010-04-17 15:56:43.000000000 -0400
>-@@ -32,7 +32,7 @@
>- 
>- #include <gnutls/x509.h>
>- 
>--#define CA_PEM_FILE "/etc/ssl/certs/ca-certificates.crt"
>-+#define CA_PEM_FILE "%%LOCALBASE%%/share/certs/ca-root-nss.crt"
>- 
>- struct _LmSSL {
>- 	LmSSLBase base;
>-@@ -200,6 +200,7 @@ _lm_ssl_begin (LmSSL *ssl, gint fd, cons
>- 		{ GNUTLS_CRT_X509, GNUTLS_CRT_OPENPGP, 0 };
>- 	const int compression_priority[] =
>- 		{ GNUTLS_COMP_DEFLATE, GNUTLS_COMP_NULL, 0 };
>-+	gnutls_priority_t priorities_cache;
>- 
>- 	gnutls_init (&ssl->gnutls_session, GNUTLS_CLIENT);
>- 	gnutls_set_default_priority (ssl->gnutls_session);
>-@@ -213,6 +214,8 @@ _lm_ssl_begin (LmSSL *ssl, gint fd, cons
>- 
>- 	gnutls_transport_set_ptr (ssl->gnutls_session,
>- 				  (gnutls_transport_ptr_t)(glong) fd);
>-+	gnutls_priority_init (&priorities_cache, "NONE:+VERS-TLS1.0:+AES-128-CBC:+RSA:+SHA1:+COMP-NULL:NORMAL:%COMPAT", NULL);
>-+	gnutls_priority_set (ssl->gnutls_session, priorities_cache);
>- 
>- 	ret = gnutls_handshake (ssl->gnutls_session);
>- 
>
>Property changes on: net-im/loudmouth/files/patch-loudmouth_lm-ssl-gnutls.c
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: net-im/loudmouth/pkg-descr
>===================================================================
>--- net-im/loudmouth/pkg-descr	(revision 411799)
>+++ net-im/loudmouth/pkg-descr	(working copy)
>@@ -1,3 +1,5 @@
> Loudmouth is a lightweight and easy-to-use C library for programming with the
> Jabber protocol. It's designed to be easy to get started with and yet
> extensible to let you do anything the Jabber protocol allows.
>+
>+WWW: https://mcabber.com/
>Index: net-im/loudmouth/pkg-plist
>===================================================================
>--- net-im/loudmouth/pkg-plist	(revision 411799)
>+++ net-im/loudmouth/pkg-plist	(working copy)
>@@ -12,21 +12,23 @@ lib/libloudmouth-1.so
> lib/libloudmouth-1.so.0
> lib/libloudmouth-1.so.0.1.0
> libdata/pkgconfig/loudmouth-1.0.pc
>-share/gtk-doc/html/loudmouth/ch01.html
>-share/gtk-doc/html/loudmouth/home.png
>-share/gtk-doc/html/loudmouth/index.html
>-share/gtk-doc/html/loudmouth/index.sgml
>-share/gtk-doc/html/loudmouth/left.png
>-share/gtk-doc/html/loudmouth/loudmouth-lm-connection.html
>-share/gtk-doc/html/loudmouth/loudmouth-lm-error.html
>-share/gtk-doc/html/loudmouth/loudmouth-lm-message-handler.html
>-share/gtk-doc/html/loudmouth/loudmouth-lm-message.html
>-share/gtk-doc/html/loudmouth/loudmouth-lm-message-node.html
>-share/gtk-doc/html/loudmouth/loudmouth-lm-proxy.html
>-share/gtk-doc/html/loudmouth/loudmouth-lm-ssl.html
>-share/gtk-doc/html/loudmouth/loudmouth-lm-utils.html
>-share/gtk-doc/html/loudmouth/loudmouth.devhelp
>-share/gtk-doc/html/loudmouth/loudmouth.devhelp2
>-share/gtk-doc/html/loudmouth/right.png
>-share/gtk-doc/html/loudmouth/style.css
>-share/gtk-doc/html/loudmouth/up.png
>+%%PORTDOCS%%share/gtk-doc/html/loudmouth/ch01.html
>+%%PORTDOCS%%share/gtk-doc/html/loudmouth/home.png
>+%%PORTDOCS%%share/gtk-doc/html/loudmouth/index.html
>+%%PORTDOCS%%share/gtk-doc/html/loudmouth/index.sgml
>+%%PORTDOCS%%share/gtk-doc/html/loudmouth/left-insensitive.png
>+%%PORTDOCS%%share/gtk-doc/html/loudmouth/left.png
>+%%PORTDOCS%%share/gtk-doc/html/loudmouth/loudmouth-LmConnection.html
>+%%PORTDOCS%%share/gtk-doc/html/loudmouth/loudmouth-LmError.html
>+%%PORTDOCS%%share/gtk-doc/html/loudmouth/loudmouth-LmMessage.html
>+%%PORTDOCS%%share/gtk-doc/html/loudmouth/loudmouth-LmMessageHandler.html
>+%%PORTDOCS%%share/gtk-doc/html/loudmouth/loudmouth-LmMessageNode.html
>+%%PORTDOCS%%share/gtk-doc/html/loudmouth/loudmouth-LmProxy.html
>+%%PORTDOCS%%share/gtk-doc/html/loudmouth/loudmouth-LmSSL.html
>+%%PORTDOCS%%share/gtk-doc/html/loudmouth/loudmouth-Miscellaneous-Utility-Functions.html
>+%%PORTDOCS%%share/gtk-doc/html/loudmouth/loudmouth.devhelp2
>+%%PORTDOCS%%share/gtk-doc/html/loudmouth/right-insensitive.png
>+%%PORTDOCS%%share/gtk-doc/html/loudmouth/right.png
>+%%PORTDOCS%%share/gtk-doc/html/loudmouth/style.css
>+%%PORTDOCS%%share/gtk-doc/html/loudmouth/up-insensitive.png
>+%%PORTDOCS%%share/gtk-doc/html/loudmouth/up.png
>Index: net-im/telepathy-gabble/Makefile
>===================================================================
>--- net-im/telepathy-gabble/Makefile	(revision 411799)
>+++ net-im/telepathy-gabble/Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	telepathy-gabble
> PORTVERSION=	0.18.3
>-PORTREVISION=	2
>+PORTREVISION=	3
> CATEGORIES=	net-im
> MASTER_SITES=	http://telepathy.freedesktop.org/releases/${PORTNAME}/
> 
>Index: net-im/telepathy-salut/Makefile
>===================================================================
>--- net-im/telepathy-salut/Makefile	(revision 411799)
>+++ net-im/telepathy-salut/Makefile	(working copy)
>@@ -4,7 +4,7 @@
> 
> PORTNAME=	telepathy-salut
> PORTVERSION=	0.8.1
>-PORTREVISION=	1
>+PORTREVISION=	2
> CATEGORIES=	net-im
> MASTER_SITES=	http://telepathy.freedesktop.org/releases/${PORTNAME}/
> 
>Index: net-p2p/gnunet/Makefile
>===================================================================
>--- net-p2p/gnunet/Makefile	(revision 411799)
>+++ net-p2p/gnunet/Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	gnunet
> PORTVERSION=	0.10.1
>-PORTREVISION=	1
>+PORTREVISION=	2
> CATEGORIES=	net-p2p ipv6 security
> MASTER_SITES=	GNU
> 
>Index: net-p2p/gtk-gnutella/Makefile
>===================================================================
>--- net-p2p/gtk-gnutella/Makefile	(revision 411799)
>+++ net-p2p/gtk-gnutella/Makefile	(working copy)
>@@ -36,6 +36,7 @@
> 
> PORTNAME=	gtk-gnutella
> PORTVERSION=	1.1.9
>+PORTREVISION=	1
> CATEGORIES=	net-p2p ipv6
> MASTER_SITES=	SF
> 
>Index: net-p2p/ncdc/Makefile
>===================================================================
>--- net-p2p/ncdc/Makefile	(revision 411799)
>+++ net-p2p/ncdc/Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	ncdc
> PORTVERSION=	1.19.1
>-PORTREVISION=	6
>+PORTREVISION=	7
> CATEGORIES=	net-p2p
> MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION} \
> 		http://dev.yorhel.nl/download/
>Index: news/nzbget/Makefile
>===================================================================
>--- news/nzbget/Makefile	(revision 411799)
>+++ news/nzbget/Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	nzbget
> PORTVERSION=	16.4
>-PORTREVISION=	1
>+PORTREVISION=	2
> DISTVERSIONPREFIX=	v
> CATEGORIES=	news
> 
>Index: polish/ekg2/Makefile
>===================================================================
>--- polish/ekg2/Makefile	(revision 411799)
>+++ polish/ekg2/Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	ekg2
> PORTVERSION=	0.3.1
>-PORTREVISION=	7
>+PORTREVISION=	8
> PORTEPOCH=	1
> CATEGORIES=	polish net-im
> MASTER_SITES=	http://pl.ekg2.org/
>Index: print/cups/Makefile
>===================================================================
>--- print/cups/Makefile	(revision 411799)
>+++ print/cups/Makefile	(working copy)
>@@ -4,7 +4,7 @@
> PORTNAME=	cups
> PORTVERSION=	2.1.3
> DISTVERSIONSUFFIX=-source
>-PORTREVISION=	1
>+PORTREVISION=	2
> CATEGORIES=	print
> MASTER_SITES=	http://www.cups.org/software/${PORTVERSION}/
> 
>Index: print/cups/files/patch-cups-config.in
>===================================================================
>--- print/cups/files/patch-cups-config.in	(nonexistent)
>+++ print/cups/files/patch-cups-config.in	(working copy)
>@@ -0,0 +1,11 @@
>+--- cups-config.in.orig	2013-05-29 11:51:34 UTC
>++++ cups-config.in
>+@@ -105,7 +105,7 @@ while test $# -gt 0; do
>+ 	    ;;
>+ 	--libs)
>+ 	    if test $static = no; then
>+-	        libs="@EXTLINKCUPS@ $LIBS";
>++	        libs="@EXTLINKCUPS@";
>+  	        if test $image = yes; then
>+  	            libs="@EXTLINKCUPSIMAGE@ $libs"
>+ 		fi
>
>Property changes on: print/cups/files/patch-cups-config.in
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: print/cups-bjnp/Makefile
>===================================================================
>--- print/cups-bjnp/Makefile	(revision 411799)
>+++ print/cups-bjnp/Makefile	(working copy)
>@@ -2,7 +2,7 @@
> 
> PORTNAME=	cups-bjnp
> PORTVERSION=	2.0
>-PORTREVISION=	1
>+PORTREVISION=	2
> CATEGORIES=	print
> MASTER_SITES=	SF
> 
>Index: print/cups-filters/Makefile
>===================================================================
>--- print/cups-filters/Makefile	(revision 411799)
>+++ print/cups-filters/Makefile	(working copy)
>@@ -2,7 +2,7 @@
> 
> PORTNAME=	cups-filters
> PORTVERSION=	1.8.2
>-PORTREVISION=	4
>+PORTREVISION=	5
> CATEGORIES=	print
> MASTER_SITES=	http://www.openprinting.org/download/cups-filters/
> 
>Index: print/ghostscript8-base/Makefile
>===================================================================
>--- print/ghostscript8-base/Makefile	(revision 411799)
>+++ print/ghostscript8-base/Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	ghostscript
> PORTVERSION=	8.71
>-PORTREVISION=	20
>+PORTREVISION=	21
> CATEGORIES=	print
> MASTER_SITES=	http://downloads.ghostscript.com/public/:gs_srcs \
> 		SF/ghostscript/GPL%20Ghostscript/${PORTVERSION}:gs_srcs \
>Index: print/ghostscript9-agpl-base/Makefile
>===================================================================
>--- print/ghostscript9-agpl-base/Makefile	(revision 411799)
>+++ print/ghostscript9-agpl-base/Makefile	(working copy)
>@@ -2,7 +2,7 @@
> 
> PORTNAME=	ghostscript
> PORTVERSION=	9.16
>-PORTREVISION=	4
>+PORTREVISION=	5
> CATEGORIES=	print
> MASTER_SITES=	http://downloads.ghostscript.com/public/:gs_srcs \
> 		SF/ghostscript/GPL%20Ghostscript/${PORTVERSION}:gs_srcs \
>Index: print/ghostscript9-base/Makefile
>===================================================================
>--- print/ghostscript9-base/Makefile	(revision 411799)
>+++ print/ghostscript9-base/Makefile	(working copy)
>@@ -2,7 +2,7 @@
> 
> PORTNAME=	ghostscript
> PORTVERSION=	9.06
>-PORTREVISION=	12
>+PORTREVISION=	13
> CATEGORIES=	print
> MASTER_SITES=	http://downloads.ghostscript.com/public/:gs_srcs \
> 		SF/ghostscript/GPL%20Ghostscript/${PORTVERSION}:gs_srcs \
>Index: print/gnome-cups-manager/Makefile
>===================================================================
>--- print/gnome-cups-manager/Makefile	(revision 411799)
>+++ print/gnome-cups-manager/Makefile	(working copy)
>@@ -4,7 +4,7 @@
> 
> PORTNAME=	gnome-cups-manager
> PORTVERSION=	0.31
>-PORTREVISION=	15
>+PORTREVISION=	16
> PORTEPOCH=	1
> CATEGORIES=	print gnome
> MASTER_SITES=	GNOME
>Index: print/gtklp/Makefile
>===================================================================
>--- print/gtklp/Makefile	(revision 411799)
>+++ print/gtklp/Makefile	(working copy)
>@@ -4,7 +4,7 @@
> PORTNAME=	gtklp
> PORTVERSION=	1.3.1
> DISTVERSIONSUFFIX=	.src
>-PORTREVISION=	1
>+PORTREVISION=	2
> CATEGORIES=	print
> MASTER_SITES=	SF
> 
>Index: print/gutenprint-cups/Makefile
>===================================================================
>--- print/gutenprint-cups/Makefile	(revision 411799)
>+++ print/gutenprint-cups/Makefile	(working copy)
>@@ -2,7 +2,7 @@
> # $FreeBSD$
> #    $MCom: ports/print/gutenprint-cups/Makefile,v 1.1 2007/03/30 16:42:47 ahze Exp $
> 
>-PORTEPOCH=	0
>+PORTREVISION=	3
> PKGNAMESUFFIX=	-cups
> 
> MAINTAINER=	cmt@burggraben.net
>Index: print/gutenprint-foomatic/Makefile
>===================================================================
>--- print/gutenprint-foomatic/Makefile	(revision 411799)
>+++ print/gutenprint-foomatic/Makefile	(working copy)
>@@ -2,7 +2,7 @@
> # $FreeBSD$
> #    $MCom: ports/print/gutenprint-foomatic/Makefile,v 1.1 2007/03/30 16:42:47 ahze Exp $
> 
>-PORTEPOCH=	0
>+PORTREVISION=	2
> PKGNAMESUFFIX=	-foomatic
> 
> MAINTAINER=	cmt@burggraben.net
>Index: print/gutenprint-ijs/Makefile
>===================================================================
>--- print/gutenprint-ijs/Makefile	(revision 411799)
>+++ print/gutenprint-ijs/Makefile	(working copy)
>@@ -2,7 +2,7 @@
> # $FreeBSD$
> #    $MCom: ports/print/gutenprint-ijs/Makefile,v 1.1 2007/03/30 16:42:47 ahze Exp $
> 
>-PORTEPOCH=	0
>+PORTREVISION=	2
> PKGNAMESUFFIX=	-ijs
> 
> MAINTAINER=	cmt@burggraben.net
>Index: print/libgnomecups/Makefile
>===================================================================
>--- print/libgnomecups/Makefile	(revision 411799)
>+++ print/libgnomecups/Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	libgnomecups
> PORTVERSION=	0.2.3
>-PORTREVISION=	7
>+PORTREVISION=	8
> PORTEPOCH=	1
> CATEGORIES=	print gnome
> MASTER_SITES=	GNOME
>Index: print/libgnomeprint/Makefile
>===================================================================
>--- print/libgnomeprint/Makefile	(revision 411799)
>+++ print/libgnomeprint/Makefile	(working copy)
>@@ -4,7 +4,7 @@
> 
> PORTNAME=	libgnomeprint
> PORTVERSION=	2.18.8
>-PORTREVISION=	3
>+PORTREVISION=	4
> CATEGORIES=	print gnome
> MASTER_SITES=	GNOME
> DIST_SUBDIR=	gnome2
>Index: print/p5-Net-CUPS/Makefile
>===================================================================
>--- print/p5-Net-CUPS/Makefile	(revision 411799)
>+++ print/p5-Net-CUPS/Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	Net-CUPS
> PORTVERSION=	0.61
>-PORTREVISION=	4
>+PORTREVISION=	5
> CATEGORIES=	print perl5
> MASTER_SITES=	CPAN
> PKGNAMEPREFIX=	p5-
>Index: print/qpdfview/Makefile
>===================================================================
>--- print/qpdfview/Makefile	(revision 411799)
>+++ print/qpdfview/Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	qpdfview
> PORTVERSION=	0.4.16
>-PORTREVISION=	3
>+PORTREVISION=	4
> CATEGORIES=	print
> MASTER_SITES=	https://launchpadlibrarian.net/226592308/ \
> 	https://launchpad.net/${PORTVERSION}/trunk/${PORTVERSION}/+download/
>Index: print/splix/Makefile
>===================================================================
>--- print/splix/Makefile	(revision 411799)
>+++ print/splix/Makefile	(working copy)
>@@ -2,7 +2,7 @@
> 
> PORTNAME=	splix
> PORTVERSION=	2.0.0
>-PORTREVISION=	7
>+PORTREVISION=	8
> CATEGORIES?=	print
> MASTER_SITES=	SF
> 
>@@ -40,14 +40,7 @@ JBIG_DESC=	Enable use of JBIG algorithm 
> BLACKOPTIM_DESC=	Enable black correction algorithm
> OPTIONS_DEFAULT=	JBIG BLACKOPTIM
> 
>-.include "bsd.port.options.mk"
>-
>-post-patch:
>-	@${REINPLACE_CMD} -e '/^CC.*:= gcc/d' -e '/^CXX.*:= g++/d' \
>-		-e 's/make/gmake/' ${WRKSRC}/Makefile
>-	@${REINPLACE_CMD} -e 's/g++/$$(CXX)/' ${WRKSRC}/rules.mk
>-
>-post-configure:
>+.include <bsd.port.options.mk>
> 
> .if ${PORT_OPTIONS:MJBIG}
> PPD_SAMSUNG+=	${PPD_SAMSUNG_JBIG}
>@@ -65,6 +58,13 @@ MAKE_ARGS+=	DISABLE_BLACKOPTIM=1
> MAKE_ARGS+=	CACHESIZE=${CACHESIZE}
> .endif
> 
>+post-patch:
>+	@${REINPLACE_CMD} -e '/^CC.*:= gcc/d' -e '/^CXX.*:= g++/d' \
>+		-e 's/make/$$(MAKE)/' ${WRKSRC}/Makefile
>+	@${REINPLACE_CMD} '/cups-config --libs/s/$$/ -pthread/' \
>+		${WRKSRC}/module.mk
>+	@${REINPLACE_CMD} 's/g++/$$(CXX)/' ${WRKSRC}/rules.mk
>+
> do-install:
> 	${MKDIR} ${STAGEDIR}${BIN_DEST_DIR}
> .for MODEL in ${MODELS}
>Index: security/gnomint/Makefile
>===================================================================
>--- security/gnomint/Makefile	(revision 411799)
>+++ security/gnomint/Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	gnomint
> PORTVERSION=	1.2.1
>-PORTREVISION=	8
>+PORTREVISION=	9
> CATEGORIES=	security
> MASTER_SITES=	SF
> 
>Index: security/gnupg/Makefile
>===================================================================
>--- security/gnupg/Makefile	(revision 411799)
>+++ security/gnupg/Makefile	(working copy)
>@@ -2,7 +2,7 @@
> 
> PORTNAME=	gnupg
> PORTVERSION=	2.1.11
>-PORTREVISION=	1
>+PORTREVISION=	2
> CATEGORIES=	security
> MASTER_SITES=	GNUPG
> DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${DISTNAME}${EXTRACT_SUFX}.sig
>Index: security/gnutls/Makefile
>===================================================================
>--- security/gnutls/Makefile	(revision 411799)
>+++ security/gnutls/Makefile	(working copy)
>@@ -1,10 +1,9 @@
> # $FreeBSD$
> 
> PORTNAME=	gnutls
>-PORTVERSION=	3.3.17.1
>-PORTREVISION=	3
>+PORTVERSION=	3.4.10
> CATEGORIES=	security net
>-MASTER_SITES=	GNUPG/gnutls/v${PORTVERSION:R:R}
>+MASTER_SITES=	GNUPG/gnutls/v${PORTVERSION:R}
> 
> MAINTAINER=	tijl@FreeBSD.org
> COMMENT=	GNU Transport Layer Security library
>@@ -27,22 +26,26 @@ CONFIGURE_ARGS=	--disable-guile \
> 		--enable-local-libopts \
> 		ac_cv_type_max_align_t=yes
> CPPFLAGS+=	-I${LOCALBASE}/include
>-LDFLAGS+=	-L${LOCALBASE}/lib
>+LIBS+=		-L${LOCALBASE}/lib
> MAKE_ENV=	MAKEINFOFLAGS=--no-split
>+INSTALL_TARGET=	install-strip
> 
> CPE_VENDOR=	gnu
> 
>-OPTIONS_DEFINE=		CRYWRAP EXAMPLES LIBDANE NLS P11KIT TPM ZLIB
>-OPTIONS_DEFAULT=	CRYWRAP P11KIT TPM ZLIB
>+OPTIONS_DEFINE=		CRYWRAP DANE EXAMPLES IDN NLS P11KIT TPM ZLIB
>+OPTIONS_DEFAULT=	CRYWRAP IDN P11KIT TPM ZLIB
> OPTIONS_SUB=		yes
> 
> CRYWRAP_DESC=			Enable Crywrap TLS proxy service
>-CRYWRAP_LIB_DEPENDS=		libidn.so:${PORTSDIR}/dns/libidn
>+CRYWRAP_IMPLIES=		IDN
> CRYWRAP_CONFIGURE_ENABLE=	crywrap
> 
>-LIBDANE_DESC=			DNSSEC support for DANE (danetool --check)
>-LIBDANE_LIB_DEPENDS=		libunbound.so:${PORTSDIR}/dns/unbound
>-LIBDANE_CONFIGURE_ENABLE=	libdane
>+DANE_DESC=		Certificate verification via DNSSEC
>+DANE_LIB_DEPENDS=	libunbound.so:${PORTSDIR}/dns/unbound
>+DANE_CONFIGURE_ENABLE=	libdane
>+
>+IDN_CONFIGURE_WITH=	idn
>+IDN_LIB_DEPENDS=	libidn.so:${PORTSDIR}/dns/libidn
> 
> NLS_CONFIGURE_ENABLE=	nls
> NLS_USES=		gettext
>@@ -61,12 +64,9 @@ INFO=		gnutls gnutls-guile
> 
> post-patch:
> 	@${RM} ${WRKSRC}/doc/*.info*
>-	${SED} -i '' -e 's|^+_NORETURN_H|_NORETURN_H|' \
>-	  ${WRKSRC}/src/libopts/Makefile.in
> 
> post-install:
> 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
> 	${INSTALL_DATA} ${WRKSRC}/doc/examples/*.[ch] ${STAGEDIR}${EXAMPLESDIR}
>-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libgnutls*.so.*
> 
> .include <bsd.port.mk>
>Index: security/gnutls/distinfo
>===================================================================
>--- security/gnutls/distinfo	(revision 411799)
>+++ security/gnutls/distinfo	(working copy)
>@@ -1,2 +1,2 @@
>-SHA256 (gnutls-3.3.17.1.tar.xz) = b40f158030a92f450a07b20300a3996710ca19800848d9f6fd62493170c5bbb4
>-SIZE (gnutls-3.3.17.1.tar.xz) = 6339588
>+SHA256 (gnutls-3.4.10.tar.xz) = 6a32c2b4acbd33ff7eefcbd1357009da04c94c60146ef61320b6c076b1bdf59f
>+SIZE (gnutls-3.4.10.tar.xz) = 6645892
>Index: security/gnutls/files/patch-configure
>===================================================================
>--- security/gnutls/files/patch-configure	(nonexistent)
>+++ security/gnutls/files/patch-configure	(working copy)
>@@ -0,0 +1,18 @@
>+--- configure.orig	2016-03-03 07:52:15 UTC
>++++ configure
>+@@ -47228,6 +47228,7 @@ fi
>+ $as_echo "$enable_dane" >&6; }
>+ 
>+ if test "$enable_dane" != "no"; then
>++    oldlibs="$LIBS"
>+     LIBS="$oldlibs -lunbound"
>+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for unbound library" >&5
>+ $as_echo_n "checking for unbound library... " >&6; }
>+@@ -47444,6 +47445,7 @@ else
>+ fi
>+ 
>+ if test "$with_tpm" != "no"; then
>++    oldlibs="$LIBS"
>+     LIBS="$oldlibs -ltspi"
>+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tss library" >&5
>+ $as_echo_n "checking for tss library... " >&6; }
>
>Property changes on: security/gnutls/files/patch-configure
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: security/gnutls/files/patch-lib-tpm.c
>===================================================================
>--- security/gnutls/files/patch-lib-tpm.c	(nonexistent)
>+++ security/gnutls/files/patch-lib-tpm.c	(working copy)
>@@ -0,0 +1,10 @@
>+--- lib/tpm.c.orig	2015-09-26 12:02:10 UTC
>++++ lib/tpm.c
>+@@ -71,7 +71,6 @@ typedef TSS_RESULT (*Tspi_DecodeBER_TssB
>+ typedef TSS_RESULT (*Tspi_Context_LoadKeyByBlob_func)(TSS_HCONTEXT, TSS_HKEY, UINT32, BYTE*, TSS_HKEY*);
>+ typedef TSS_RESULT (*Tspi_Policy_AssignToObject_func)(TSS_HPOLICY, TSS_HOBJECT);
>+ typedef TSS_RESULT (*Tspi_GetAttribData_func)(TSS_HOBJECT, TSS_FLAG, TSS_FLAG, UINT32*, BYTE**);
>+-typedef TSS_RESULT (*Tspi_Context_GetTpmObject_func)(TSS_HCONTEXT, TSS_HTPM*);
>+ typedef TSS_RESULT (*Tspi_TPM_StirRandom_func)(TSS_HTPM, UINT32, BYTE*);
>+ typedef TSS_RESULT (*Tspi_SetAttribUint32_func)(TSS_HOBJECT, TSS_FLAG, TSS_FLAG, UINT32);
>+ typedef TSS_RESULT (*Tspi_EncodeDER_TssBlob_func)(UINT32, BYTE*, UINT32, UINT32*, BYTE*);
>
>Property changes on: security/gnutls/files/patch-lib-tpm.c
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: security/gnutls/files/patch-lib__x509__rfc2818_hostname.c
>===================================================================
>--- security/gnutls/files/patch-lib__x509__rfc2818_hostname.c	(revision 411799)
>+++ security/gnutls/files/patch-lib__x509__rfc2818_hostname.c	(nonexistent)
>@@ -1,10 +0,0 @@
>---- lib/x509/rfc2818_hostname.c.orig	2014-10-02 13:35:09.427374817 -0500
>-+++ lib/x509/rfc2818_hostname.c	2014-10-02 13:35:33.657427866 -0500
>-@@ -19,6 +19,7 @@
>-  *
>-  */
>- 
>-+#include <netinet/in.h>
>- #include <gnutls_int.h>
>- #include <gnutls_str.h>
>- #include <x509_int.h>
>
>Property changes on: security/gnutls/files/patch-lib__x509__rfc2818_hostname.c
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: security/gnutls/pkg-plist
>===================================================================
>--- security/gnutls/pkg-plist	(revision 411799)
>+++ security/gnutls/pkg-plist	(working copy)
>@@ -1,5 +1,5 @@
> bin/certtool
>-%%LIBDANE%%bin/danetool
>+%%DANE%%bin/danetool
> bin/gnutls-cli
> bin/gnutls-cli-debug
> bin/gnutls-serv
>@@ -11,19 +11,21 @@ bin/srptool
> include/gnutls/abstract.h
> include/gnutls/compat.h
> include/gnutls/crypto.h
>-%%LIBDANE%%include/gnutls/dane.h
>+%%DANE%%include/gnutls/dane.h
> include/gnutls/dtls.h
> include/gnutls/gnutls.h
> include/gnutls/gnutlsxx.h
> include/gnutls/ocsp.h
> include/gnutls/openpgp.h
>-include/gnutls/openssl.h
> include/gnutls/pkcs11.h
> include/gnutls/pkcs12.h
>+include/gnutls/pkcs7.h
> include/gnutls/self-test.h
>+include/gnutls/system-keys.h
> include/gnutls/tpm.h
>-include/gnutls/x509.h
>+include/gnutls/urls.h
> include/gnutls/x509-ext.h
>+include/gnutls/x509.h
> info/gnutls-client-server-use-case.png
> info/gnutls-handshake-sequence.png
> info/gnutls-handshake-state.png
>@@ -34,22 +36,19 @@ info/gnutls-modauth.png
> info/gnutls-pgp.png
> info/gnutls-x509.png
> info/pkcs11-vision.png
>-%%LIBDANE%%lib/libgnutls-dane.so
>-%%LIBDANE%%lib/libgnutls-dane.so.0
>-%%LIBDANE%%lib/libgnutls-dane.so.0.5.0
>-lib/libgnutls-openssl.so
>-lib/libgnutls-openssl.so.27
>-lib/libgnutls-openssl.so.27.0.2
>+%%DANE%%lib/libgnutls-dane.so
>+%%DANE%%lib/libgnutls-dane.so.0
>+%%DANE%%lib/libgnutls-dane.so.0.4.1
> lib/libgnutls.so
>-lib/libgnutls.so.28
>-lib/libgnutls.so.28.41.9
>+lib/libgnutls.so.30
>+lib/libgnutls.so.30.6.2
> lib/libgnutlsxx.so
> lib/libgnutlsxx.so.28
> lib/libgnutlsxx.so.28.1.0
> libdata/pkgconfig/gnutls.pc
>-%%LIBDANE%%libdata/pkgconfig/gnutls-dane.pc
>+%%DANE%%libdata/pkgconfig/gnutls-dane.pc
> man/man1/certtool.1.gz
>-%%LIBDANE%%man/man1/danetool.1.gz
>+%%DANE%%man/man1/danetool.1.gz
> man/man1/gnutls-cli-debug.1.gz
> man/man1/gnutls-cli.1.gz
> man/man1/gnutls-serv.1.gz
>@@ -58,6 +57,10 @@ man/man1/p11tool.1.gz
> man/man1/psktool.1.gz
> man/man1/srptool.1.gz
> man/man1/tpmtool.1.gz
>+man/man3/gnutls_aead_cipher_decrypt.3.gz
>+man/man3/gnutls_aead_cipher_deinit.3.gz
>+man/man3/gnutls_aead_cipher_encrypt.3.gz
>+man/man3/gnutls_aead_cipher_init.3.gz
> man/man3/gnutls_alert_get.3.gz
> man/man3/gnutls_alert_get_name.3.gz
> man/man3/gnutls_alert_get_strname.3.gz
>@@ -75,11 +78,11 @@ man/man3/gnutls_anon_set_server_params_f
> man/man3/gnutls_auth_client_get_type.3.gz
> man/man3/gnutls_auth_get_type.3.gz
> man/man3/gnutls_auth_server_get_type.3.gz
>+man/man3/gnutls_buffer_append_data.3.gz
> man/man3/gnutls_bye.3.gz
> man/man3/gnutls_certificate_activation_time_peers.3.gz
> man/man3/gnutls_certificate_allocate_credentials.3.gz
> man/man3/gnutls_certificate_client_get_request_status.3.gz
>-man/man3/gnutls_certificate_client_set_retrieve_function.3.gz
> man/man3/gnutls_certificate_expiration_time_peers.3.gz
> man/man3/gnutls_certificate_free_ca_names.3.gz
> man/man3/gnutls_certificate_free_cas.3.gz
>@@ -88,13 +91,19 @@ man/man3/gnutls_certificate_free_crls.3.
> man/man3/gnutls_certificate_free_keys.3.gz
> man/man3/gnutls_certificate_get_crt_raw.3.gz
> man/man3/gnutls_certificate_get_issuer.3.gz
>+man/man3/gnutls_certificate_get_openpgp_crt.3.gz
>+man/man3/gnutls_certificate_get_openpgp_key.3.gz
> man/man3/gnutls_certificate_get_ours.3.gz
> man/man3/gnutls_certificate_get_peers.3.gz
> man/man3/gnutls_certificate_get_peers_subkey_id.3.gz
>+man/man3/gnutls_certificate_get_trust_list.3.gz
>+man/man3/gnutls_certificate_get_verify_flags.3.gz
>+man/man3/gnutls_certificate_get_x509_crt.3.gz
>+man/man3/gnutls_certificate_get_x509_key.3.gz
> man/man3/gnutls_certificate_send_x509_rdn_sequence.3.gz
> man/man3/gnutls_certificate_server_set_request.3.gz
>-man/man3/gnutls_certificate_server_set_retrieve_function.3.gz
> man/man3/gnutls_certificate_set_dh_params.3.gz
>+man/man3/gnutls_certificate_set_flags.3.gz
> man/man3/gnutls_certificate_set_key.3.gz
> man/man3/gnutls_certificate_set_ocsp_status_request_file.3.gz
> man/man3/gnutls_certificate_set_ocsp_status_request_function.3.gz
>@@ -109,7 +118,6 @@ man/man3/gnutls_certificate_set_params_f
> man/man3/gnutls_certificate_set_pin_function.3.gz
> man/man3/gnutls_certificate_set_retrieve_function.3.gz
> man/man3/gnutls_certificate_set_retrieve_function2.3.gz
>-man/man3/gnutls_certificate_set_rsa_export_params.3.gz
> man/man3/gnutls_certificate_set_trust_list.3.gz
> man/man3/gnutls_certificate_set_verify_flags.3.gz
> man/man3/gnutls_certificate_set_verify_function.3.gz
>@@ -133,7 +141,6 @@ man/man3/gnutls_certificate_type_get.3.g
> man/man3/gnutls_certificate_type_get_id.3.gz
> man/man3/gnutls_certificate_type_get_name.3.gz
> man/man3/gnutls_certificate_type_list.3.gz
>-man/man3/gnutls_certificate_type_set_priority.3.gz
> man/man3/gnutls_certificate_verification_status_print.3.gz
> man/man3/gnutls_certificate_verify_peers.3.gz
> man/man3/gnutls_certificate_verify_peers2.3.gz
>@@ -156,7 +163,6 @@ man/man3/gnutls_cipher_init.3.gz
> man/man3/gnutls_cipher_list.3.gz
> man/man3/gnutls_cipher_self_test.3.gz
> man/man3/gnutls_cipher_set_iv.3.gz
>-man/man3/gnutls_cipher_set_priority.3.gz
> man/man3/gnutls_cipher_suite_get_name.3.gz
> man/man3/gnutls_cipher_suite_info.3.gz
> man/man3/gnutls_cipher_tag.3.gz
>@@ -164,10 +170,13 @@ man/man3/gnutls_compression_get.3.gz
> man/man3/gnutls_compression_get_id.3.gz
> man/man3/gnutls_compression_get_name.3.gz
> man/man3/gnutls_compression_list.3.gz
>-man/man3/gnutls_compression_set_priority.3.gz
> man/man3/gnutls_credentials_clear.3.gz
> man/man3/gnutls_credentials_get.3.gz
> man/man3/gnutls_credentials_set.3.gz
>+man/man3/gnutls_crypto_register_aead_cipher.3.gz
>+man/man3/gnutls_crypto_register_cipher.3.gz
>+man/man3/gnutls_crypto_register_digest.3.gz
>+man/man3/gnutls_crypto_register_mac.3.gz
> man/man3/gnutls_db_check_entry.3.gz
> man/man3/gnutls_db_check_entry_time.3.gz
> man/man3/gnutls_db_get_default_cache_expiration.3.gz
>@@ -192,10 +201,12 @@ man/man3/gnutls_dh_params_export_raw.3.g
> man/man3/gnutls_dh_params_generate2.3.gz
> man/man3/gnutls_dh_params_import_pkcs3.3.gz
> man/man3/gnutls_dh_params_import_raw.3.gz
>+man/man3/gnutls_dh_params_import_raw2.3.gz
> man/man3/gnutls_dh_params_init.3.gz
> man/man3/gnutls_dh_set_prime_bits.3.gz
> man/man3/gnutls_digest_get_id.3.gz
> man/man3/gnutls_digest_get_name.3.gz
>+man/man3/gnutls_digest_get_oid.3.gz
> man/man3/gnutls_digest_list.3.gz
> man/man3/gnutls_digest_self_test.3.gz
> man/man3/gnutls_dtls_cookie_send.3.gz
>@@ -208,12 +219,17 @@ man/man3/gnutls_dtls_set_data_mtu.3.gz
> man/man3/gnutls_dtls_set_mtu.3.gz
> man/man3/gnutls_dtls_set_timeouts.3.gz
> man/man3/gnutls_ecc_curve_get.3.gz
>+man/man3/gnutls_ecc_curve_get_id.3.gz
> man/man3/gnutls_ecc_curve_get_name.3.gz
>+man/man3/gnutls_ecc_curve_get_oid.3.gz
> man/man3/gnutls_ecc_curve_get_size.3.gz
> man/man3/gnutls_ecc_curve_list.3.gz
> man/man3/gnutls_error_is_fatal.3.gz
> man/man3/gnutls_error_to_alert.3.gz
> man/man3/gnutls_est_record_overhead_size.3.gz
>+man/man3/gnutls_ext_get_data.3.gz
>+man/man3/gnutls_ext_register.3.gz
>+man/man3/gnutls_ext_set_data.3.gz
> man/man3/gnutls_fingerprint.3.gz
> man/man3/gnutls_fips140_mode_enabled.3.gz
> man/man3/gnutls_global_deinit.3.gz
>@@ -248,7 +264,9 @@ man/man3/gnutls_heartbeat_pong.3.gz
> man/man3/gnutls_heartbeat_set_timeouts.3.gz
> man/man3/gnutls_hex2bin.3.gz
> man/man3/gnutls_hex_decode.3.gz
>+man/man3/gnutls_hex_decode2.3.gz
> man/man3/gnutls_hex_encode.3.gz
>+man/man3/gnutls_hex_encode2.3.gz
> man/man3/gnutls_hmac.3.gz
> man/man3/gnutls_hmac_deinit.3.gz
> man/man3/gnutls_hmac_fast.3.gz
>@@ -262,7 +280,6 @@ man/man3/gnutls_kx_get.3.gz
> man/man3/gnutls_kx_get_id.3.gz
> man/man3/gnutls_kx_get_name.3.gz
> man/man3/gnutls_kx_list.3.gz
>-man/man3/gnutls_kx_set_priority.3.gz
> man/man3/gnutls_load_file.3.gz
> man/man3/gnutls_mac_get.3.gz
> man/man3/gnutls_mac_get_id.3.gz
>@@ -271,7 +288,8 @@ man/man3/gnutls_mac_get_name.3.gz
> man/man3/gnutls_mac_get_nonce_size.3.gz
> man/man3/gnutls_mac_list.3.gz
> man/man3/gnutls_mac_self_test.3.gz
>-man/man3/gnutls_mac_set_priority.3.gz
>+man/man3/gnutls_memcmp.3.gz
>+man/man3/gnutls_memset.3.gz
> man/man3/gnutls_ocsp_req_add_cert.3.gz
> man/man3/gnutls_ocsp_req_add_cert_id.3.gz
> man/man3/gnutls_ocsp_req_deinit.3.gz
>@@ -294,6 +312,7 @@ man/man3/gnutls_ocsp_resp_get_extension.
> man/man3/gnutls_ocsp_resp_get_nonce.3.gz
> man/man3/gnutls_ocsp_resp_get_produced.3.gz
> man/man3/gnutls_ocsp_resp_get_responder.3.gz
>+man/man3/gnutls_ocsp_resp_get_responder_raw_id.3.gz
> man/man3/gnutls_ocsp_resp_get_response.3.gz
> man/man3/gnutls_ocsp_resp_get_signature.3.gz
> man/man3/gnutls_ocsp_resp_get_signature_algorithm.3.gz
>@@ -308,6 +327,11 @@ man/man3/gnutls_ocsp_resp_verify_direct.
> man/man3/gnutls_ocsp_status_request_enable_client.3.gz
> man/man3/gnutls_ocsp_status_request_get.3.gz
> man/man3/gnutls_ocsp_status_request_is_checked.3.gz
>+man/man3/gnutls_oid_to_digest.3.gz
>+man/man3/gnutls_oid_to_ecc_curve.3.gz
>+man/man3/gnutls_oid_to_pk.3.gz
>+man/man3/gnutls_oid_to_sign.3.gz
>+man/man3/gnutls_openpgp_crt_check_email.3.gz
> man/man3/gnutls_openpgp_crt_check_hostname.3.gz
> man/man3/gnutls_openpgp_crt_check_hostname2.3.gz
> man/man3/gnutls_openpgp_crt_deinit.3.gz
>@@ -379,32 +403,42 @@ man/man3/gnutls_openpgp_set_recv_key_fun
> man/man3/gnutls_packet_deinit.3.gz
> man/man3/gnutls_packet_get.3.gz
> man/man3/gnutls_pcert_deinit.3.gz
>+man/man3/gnutls_pcert_export_openpgp.3.gz
>+man/man3/gnutls_pcert_export_x509.3.gz
> man/man3/gnutls_pcert_import_openpgp.3.gz
> man/man3/gnutls_pcert_import_openpgp_raw.3.gz
> man/man3/gnutls_pcert_import_x509.3.gz
>+man/man3/gnutls_pcert_import_x509_list.3.gz
> man/man3/gnutls_pcert_import_x509_raw.3.gz
> man/man3/gnutls_pcert_list_import_x509_raw.3.gz
> man/man3/gnutls_pem_base64_decode.3.gz
>-man/man3/gnutls_pem_base64_decode_alloc.3.gz
>+man/man3/gnutls_pem_base64_decode2.3.gz
> man/man3/gnutls_pem_base64_encode.3.gz
>-man/man3/gnutls_pem_base64_encode_alloc.3.gz
>+man/man3/gnutls_pem_base64_encode2.3.gz
> man/man3/gnutls_perror.3.gz
> man/man3/gnutls_pk_algorithm_get_name.3.gz
> man/man3/gnutls_pk_bits_to_sec_param.3.gz
> man/man3/gnutls_pk_get_id.3.gz
> man/man3/gnutls_pk_get_name.3.gz
>+man/man3/gnutls_pk_get_oid.3.gz
> man/man3/gnutls_pk_list.3.gz
> man/man3/gnutls_pk_self_test.3.gz
> man/man3/gnutls_pk_to_sign.3.gz
> man/man3/gnutls_pkcs11_add_provider.3.gz
>+man/man3/gnutls_pkcs11_copy_attached_extension.3.gz
>+man/man3/gnutls_pkcs11_copy_pubkey.3.gz
> man/man3/gnutls_pkcs11_copy_secret_key.3.gz
> man/man3/gnutls_pkcs11_copy_x509_crt.3.gz
>+man/man3/gnutls_pkcs11_copy_x509_crt2.3.gz
> man/man3/gnutls_pkcs11_copy_x509_privkey.3.gz
>+man/man3/gnutls_pkcs11_copy_x509_privkey2.3.gz
> man/man3/gnutls_pkcs11_crt_is_known.3.gz
> man/man3/gnutls_pkcs11_deinit.3.gz
> man/man3/gnutls_pkcs11_delete_url.3.gz
> man/man3/gnutls_pkcs11_get_pin_function.3.gz
> man/man3/gnutls_pkcs11_get_raw_issuer.3.gz
>+man/man3/gnutls_pkcs11_get_raw_issuer_by_dn.3.gz
>+man/man3/gnutls_pkcs11_get_raw_issuer_by_subject_key_id.3.gz
> man/man3/gnutls_pkcs11_init.3.gz
> man/man3/gnutls_pkcs11_obj_deinit.3.gz
> man/man3/gnutls_pkcs11_obj_export.3.gz
>@@ -418,14 +452,17 @@ man/man3/gnutls_pkcs11_obj_get_info.3.gz
> man/man3/gnutls_pkcs11_obj_get_type.3.gz
> man/man3/gnutls_pkcs11_obj_import_url.3.gz
> man/man3/gnutls_pkcs11_obj_init.3.gz
>-man/man3/gnutls_pkcs11_obj_list_import_url.3.gz
>-man/man3/gnutls_pkcs11_obj_list_import_url2.3.gz
>+man/man3/gnutls_pkcs11_obj_list_import_url3.3.gz
>+man/man3/gnutls_pkcs11_obj_list_import_url4.3.gz
>+man/man3/gnutls_pkcs11_obj_set_info.3.gz
> man/man3/gnutls_pkcs11_obj_set_pin_function.3.gz
>+man/man3/gnutls_pkcs11_privkey_cpy.3.gz
> man/man3/gnutls_pkcs11_privkey_deinit.3.gz
> man/man3/gnutls_pkcs11_privkey_export_pubkey.3.gz
> man/man3/gnutls_pkcs11_privkey_export_url.3.gz
> man/man3/gnutls_pkcs11_privkey_generate.3.gz
> man/man3/gnutls_pkcs11_privkey_generate2.3.gz
>+man/man3/gnutls_pkcs11_privkey_generate3.3.gz
> man/man3/gnutls_pkcs11_privkey_get_info.3.gz
> man/man3/gnutls_pkcs11_privkey_get_pk_algorithm.3.gz
> man/man3/gnutls_pkcs11_privkey_import_url.3.gz
>@@ -445,6 +482,7 @@ man/man3/gnutls_pkcs11_token_set_pin.3.g
> man/man3/gnutls_pkcs11_type_get_name.3.gz
> man/man3/gnutls_pkcs12_bag_decrypt.3.gz
> man/man3/gnutls_pkcs12_bag_deinit.3.gz
>+man/man3/gnutls_pkcs12_bag_enc_info.3.gz
> man/man3/gnutls_pkcs12_bag_encrypt.3.gz
> man/man3/gnutls_pkcs12_bag_get_count.3.gz
> man/man3/gnutls_pkcs12_bag_get_data.3.gz
>@@ -457,33 +495,53 @@ man/man3/gnutls_pkcs12_bag_set_crt.3.gz
> man/man3/gnutls_pkcs12_bag_set_data.3.gz
> man/man3/gnutls_pkcs12_bag_set_friendly_name.3.gz
> man/man3/gnutls_pkcs12_bag_set_key_id.3.gz
>+man/man3/gnutls_pkcs12_bag_set_privkey.3.gz
> man/man3/gnutls_pkcs12_deinit.3.gz
> man/man3/gnutls_pkcs12_export.3.gz
> man/man3/gnutls_pkcs12_export2.3.gz
> man/man3/gnutls_pkcs12_generate_mac.3.gz
>+man/man3/gnutls_pkcs12_generate_mac2.3.gz
> man/man3/gnutls_pkcs12_get_bag.3.gz
> man/man3/gnutls_pkcs12_import.3.gz
> man/man3/gnutls_pkcs12_init.3.gz
>+man/man3/gnutls_pkcs12_mac_info.3.gz
> man/man3/gnutls_pkcs12_set_bag.3.gz
> man/man3/gnutls_pkcs12_simple_parse.3.gz
> man/man3/gnutls_pkcs12_verify_mac.3.gz
>+man/man3/gnutls_pkcs7_add_attr.3.gz
>+man/man3/gnutls_pkcs7_attrs_deinit.3.gz
> man/man3/gnutls_pkcs7_deinit.3.gz
> man/man3/gnutls_pkcs7_delete_crl.3.gz
> man/man3/gnutls_pkcs7_delete_crt.3.gz
> man/man3/gnutls_pkcs7_export.3.gz
> man/man3/gnutls_pkcs7_export2.3.gz
>+man/man3/gnutls_pkcs7_get_attr.3.gz
> man/man3/gnutls_pkcs7_get_crl_count.3.gz
> man/man3/gnutls_pkcs7_get_crl_raw.3.gz
>+man/man3/gnutls_pkcs7_get_crl_raw2.3.gz
> man/man3/gnutls_pkcs7_get_crt_count.3.gz
> man/man3/gnutls_pkcs7_get_crt_raw.3.gz
>+man/man3/gnutls_pkcs7_get_crt_raw2.3.gz
>+man/man3/gnutls_pkcs7_get_embedded_data.3.gz
>+man/man3/gnutls_pkcs7_get_signature_count.3.gz
>+man/man3/gnutls_pkcs7_get_signature_info.3.gz
> man/man3/gnutls_pkcs7_import.3.gz
> man/man3/gnutls_pkcs7_init.3.gz
>+man/man3/gnutls_pkcs7_print.3.gz
> man/man3/gnutls_pkcs7_set_crl.3.gz
> man/man3/gnutls_pkcs7_set_crl_raw.3.gz
> man/man3/gnutls_pkcs7_set_crt.3.gz
> man/man3/gnutls_pkcs7_set_crt_raw.3.gz
>+man/man3/gnutls_pkcs7_sign.3.gz
>+man/man3/gnutls_pkcs7_signature_info_deinit.3.gz
>+man/man3/gnutls_pkcs7_verify.3.gz
>+man/man3/gnutls_pkcs7_verify_direct.3.gz
>+man/man3/gnutls_pkcs8_info.3.gz
>+man/man3/gnutls_pkcs_schema_get_name.3.gz
>+man/man3/gnutls_pkcs_schema_get_oid.3.gz
> man/man3/gnutls_prf.3.gz
> man/man3/gnutls_prf_raw.3.gz
>+man/man3/gnutls_prf_rfc5705.3.gz
> man/man3/gnutls_priority_certificate_type_list.3.gz
> man/man3/gnutls_priority_cipher_list.3.gz
> man/man3/gnutls_priority_compression_list.3.gz
>@@ -497,11 +555,15 @@ man/man3/gnutls_priority_protocol_list.3
> man/man3/gnutls_priority_set.3.gz
> man/man3/gnutls_priority_set_direct.3.gz
> man/man3/gnutls_priority_sign_list.3.gz
>+man/man3/gnutls_priority_string_list.3.gz
> man/man3/gnutls_privkey_decrypt_data.3.gz
> man/man3/gnutls_privkey_deinit.3.gz
> man/man3/gnutls_privkey_export_dsa_raw.3.gz
> man/man3/gnutls_privkey_export_ecc_raw.3.gz
>+man/man3/gnutls_privkey_export_openpgp.3.gz
>+man/man3/gnutls_privkey_export_pkcs11.3.gz
> man/man3/gnutls_privkey_export_rsa_raw.3.gz
>+man/man3/gnutls_privkey_export_x509.3.gz
> man/man3/gnutls_privkey_generate.3.gz
> man/man3/gnutls_privkey_get_pk_algorithm.3.gz
> man/man3/gnutls_privkey_get_type.3.gz
>@@ -509,6 +571,7 @@ man/man3/gnutls_privkey_import_dsa_raw.3
> man/man3/gnutls_privkey_import_ecc_raw.3.gz
> man/man3/gnutls_privkey_import_ext.3.gz
> man/man3/gnutls_privkey_import_ext2.3.gz
>+man/man3/gnutls_privkey_import_ext3.3.gz
> man/man3/gnutls_privkey_import_openpgp.3.gz
> man/man3/gnutls_privkey_import_openpgp_raw.3.gz
> man/man3/gnutls_privkey_import_pkcs11.3.gz
>@@ -523,14 +586,12 @@ man/man3/gnutls_privkey_init.3.gz
> man/man3/gnutls_privkey_set_pin_function.3.gz
> man/man3/gnutls_privkey_sign_data.3.gz
> man/man3/gnutls_privkey_sign_hash.3.gz
>-man/man3/gnutls_privkey_sign_raw_data.3.gz
> man/man3/gnutls_privkey_status.3.gz
> man/man3/gnutls_privkey_verify_params.3.gz
> man/man3/gnutls_protocol_get_id.3.gz
> man/man3/gnutls_protocol_get_name.3.gz
> man/man3/gnutls_protocol_get_version.3.gz
> man/man3/gnutls_protocol_list.3.gz
>-man/man3/gnutls_protocol_set_priority.3.gz
> man/man3/gnutls_psk_allocate_client_credentials.3.gz
> man/man3/gnutls_psk_allocate_server_credentials.3.gz
> man/man3/gnutls_psk_client_get_hint.3.gz
>@@ -558,7 +619,6 @@ man/man3/gnutls_pubkey_get_key_usage.3.g
> man/man3/gnutls_pubkey_get_openpgp_key_id.3.gz
> man/man3/gnutls_pubkey_get_pk_algorithm.3.gz
> man/man3/gnutls_pubkey_get_preferred_hash_algorithm.3.gz
>-man/man3/gnutls_pubkey_get_verify_algorithm.3.gz
> man/man3/gnutls_pubkey_import.3.gz
> man/man3/gnutls_pubkey_import_dsa_raw.3.gz
> man/man3/gnutls_pubkey_import_ecc_raw.3.gz
>@@ -566,7 +626,6 @@ man/man3/gnutls_pubkey_import_ecc_x962.3
> man/man3/gnutls_pubkey_import_openpgp.3.gz
> man/man3/gnutls_pubkey_import_openpgp_raw.3.gz
> man/man3/gnutls_pubkey_import_pkcs11.3.gz
>-man/man3/gnutls_pubkey_import_pkcs11_url.3.gz
> man/man3/gnutls_pubkey_import_privkey.3.gz
> man/man3/gnutls_pubkey_import_rsa_raw.3.gz
> man/man3/gnutls_pubkey_import_tpm_raw.3.gz
>@@ -579,9 +638,7 @@ man/man3/gnutls_pubkey_init.3.gz
> man/man3/gnutls_pubkey_print.3.gz
> man/man3/gnutls_pubkey_set_key_usage.3.gz
> man/man3/gnutls_pubkey_set_pin_function.3.gz
>-man/man3/gnutls_pubkey_verify_data.3.gz
> man/man3/gnutls_pubkey_verify_data2.3.gz
>-man/man3/gnutls_pubkey_verify_hash.3.gz
> man/man3/gnutls_pubkey_verify_hash2.3.gz
> man/man3/gnutls_pubkey_verify_params.3.gz
> man/man3/gnutls_random_art.3.gz
>@@ -591,32 +648,25 @@ man/man3/gnutls_record_check_corked.3.gz
> man/man3/gnutls_record_check_pending.3.gz
> man/man3/gnutls_record_cork.3.gz
> man/man3/gnutls_record_disable_padding.3.gz
>+man/man3/gnutls_record_discard_queued.3.gz
> man/man3/gnutls_record_get_direction.3.gz
> man/man3/gnutls_record_get_discarded.3.gz
> man/man3/gnutls_record_get_max_size.3.gz
>+man/man3/gnutls_record_get_state.3.gz
> man/man3/gnutls_record_overhead_size.3.gz
> man/man3/gnutls_record_recv.3.gz
> man/man3/gnutls_record_recv_packet.3.gz
> man/man3/gnutls_record_recv_seq.3.gz
> man/man3/gnutls_record_send.3.gz
> man/man3/gnutls_record_send_range.3.gz
>-man/man3/gnutls_record_set_max_empty_records.3.gz
> man/man3/gnutls_record_set_max_size.3.gz
>+man/man3/gnutls_record_set_state.3.gz
> man/man3/gnutls_record_set_timeout.3.gz
> man/man3/gnutls_record_uncork.3.gz
>+man/man3/gnutls_register_custom_url.3.gz
> man/man3/gnutls_rehandshake.3.gz
> man/man3/gnutls_rnd.3.gz
> man/man3/gnutls_rnd_refresh.3.gz
>-man/man3/gnutls_rsa_export_get_modulus_bits.3.gz
>-man/man3/gnutls_rsa_export_get_pubkey.3.gz
>-man/man3/gnutls_rsa_params_cpy.3.gz
>-man/man3/gnutls_rsa_params_deinit.3.gz
>-man/man3/gnutls_rsa_params_export_pkcs1.3.gz
>-man/man3/gnutls_rsa_params_export_raw.3.gz
>-man/man3/gnutls_rsa_params_generate2.3.gz
>-man/man3/gnutls_rsa_params_import_pkcs1.3.gz
>-man/man3/gnutls_rsa_params_import_raw.3.gz
>-man/man3/gnutls_rsa_params_init.3.gz
> man/man3/gnutls_safe_renegotiation_status.3.gz
> man/man3/gnutls_sec_param_get_name.3.gz
> man/man3/gnutls_sec_param_to_pk_bits.3.gz
>@@ -625,6 +675,8 @@ man/man3/gnutls_server_name_get.3.gz
> man/man3/gnutls_server_name_set.3.gz
> man/man3/gnutls_session_channel_binding.3.gz
> man/man3/gnutls_session_enable_compatibility_mode.3.gz
>+man/man3/gnutls_session_etm_status.3.gz
>+man/man3/gnutls_session_ext_master_secret_status.3.gz
> man/man3/gnutls_session_force_valid.3.gz
> man/man3/gnutls_session_get_data.3.gz
> man/man3/gnutls_session_get_data2.3.gz
>@@ -633,34 +685,36 @@ man/man3/gnutls_session_get_id.3.gz
> man/man3/gnutls_session_get_id2.3.gz
> man/man3/gnutls_session_get_ptr.3.gz
> man/man3/gnutls_session_get_random.3.gz
>+man/man3/gnutls_session_get_verify_cert_status.3.gz
> man/man3/gnutls_session_is_resumed.3.gz
> man/man3/gnutls_session_resumption_requested.3.gz
> man/man3/gnutls_session_set_data.3.gz
> man/man3/gnutls_session_set_id.3.gz
> man/man3/gnutls_session_set_premaster.3.gz
> man/man3/gnutls_session_set_ptr.3.gz
>+man/man3/gnutls_session_set_verify_cert.3.gz
>+man/man3/gnutls_session_set_verify_cert2.3.gz
>+man/man3/gnutls_session_set_verify_function.3.gz
> man/man3/gnutls_session_ticket_enable_client.3.gz
> man/man3/gnutls_session_ticket_enable_server.3.gz
> man/man3/gnutls_session_ticket_key_generate.3.gz
>-man/man3/gnutls_set_default_export_priority.3.gz
> man/man3/gnutls_set_default_priority.3.gz
> man/man3/gnutls_sign_algorithm_get.3.gz
> man/man3/gnutls_sign_algorithm_get_client.3.gz
> man/man3/gnutls_sign_algorithm_get_requested.3.gz
>-man/man3/gnutls_sign_callback_get.3.gz
>-man/man3/gnutls_sign_callback_set.3.gz
> man/man3/gnutls_sign_get_hash_algorithm.3.gz
> man/man3/gnutls_sign_get_id.3.gz
> man/man3/gnutls_sign_get_name.3.gz
>+man/man3/gnutls_sign_get_oid.3.gz
> man/man3/gnutls_sign_get_pk_algorithm.3.gz
> man/man3/gnutls_sign_is_secure.3.gz
> man/man3/gnutls_sign_list.3.gz
> man/man3/gnutls_srp_allocate_client_credentials.3.gz
> man/man3/gnutls_srp_allocate_server_credentials.3.gz
> man/man3/gnutls_srp_base64_decode.3.gz
>-man/man3/gnutls_srp_base64_decode_alloc.3.gz
>+man/man3/gnutls_srp_base64_decode2.3.gz
> man/man3/gnutls_srp_base64_encode.3.gz
>-man/man3/gnutls_srp_base64_encode_alloc.3.gz
>+man/man3/gnutls_srp_base64_encode2.3.gz
> man/man3/gnutls_srp_free_client_credentials.3.gz
> man/man3/gnutls_srp_free_server_credentials.3.gz
> man/man3/gnutls_srp_server_get_username.3.gz
>@@ -688,6 +742,14 @@ man/man3/gnutls_subject_alt_names_get.3.
> man/man3/gnutls_subject_alt_names_init.3.gz
> man/man3/gnutls_subject_alt_names_set.3.gz
> man/man3/gnutls_supplemental_get_name.3.gz
>+man/man3/gnutls_supplemental_recv.3.gz
>+man/man3/gnutls_supplemental_register.3.gz
>+man/man3/gnutls_supplemental_send.3.gz
>+man/man3/gnutls_system_key_add_x509.3.gz
>+man/man3/gnutls_system_key_delete.3.gz
>+man/man3/gnutls_system_key_iter_deinit.3.gz
>+man/man3/gnutls_system_key_iter_get_info.3.gz
>+man/man3/gnutls_system_recv_timeout.3.gz
> man/man3/gnutls_tdb_deinit.3.gz
> man/man3/gnutls_tdb_init.3.gz
> man/man3/gnutls_tdb_set_store_commitment_func.3.gz
>@@ -792,6 +854,7 @@ man/man3/gnutls_x509_crq_get_key_rsa_raw
> man/man3/gnutls_x509_crq_get_key_usage.3.gz
> man/man3/gnutls_x509_crq_get_pk_algorithm.3.gz
> man/man3/gnutls_x509_crq_get_private_key_usage_period.3.gz
>+man/man3/gnutls_x509_crq_get_signature_algorithm.3.gz
> man/man3/gnutls_x509_crq_get_subject_alt_name.3.gz
> man/man3/gnutls_x509_crq_get_subject_alt_othername_oid.3.gz
> man/man3/gnutls_x509_crq_get_version.3.gz
>@@ -815,6 +878,7 @@ man/man3/gnutls_x509_crq_set_version.3.g
> man/man3/gnutls_x509_crq_sign.3.gz
> man/man3/gnutls_x509_crq_sign2.3.gz
> man/man3/gnutls_x509_crq_verify.3.gz
>+man/man3/gnutls_x509_crt_check_email.3.gz
> man/man3/gnutls_x509_crt_check_hostname.3.gz
> man/man3/gnutls_x509_crt_check_hostname2.3.gz
> man/man3/gnutls_x509_crt_check_issuer.3.gz
>@@ -857,6 +921,7 @@ man/man3/gnutls_x509_crt_get_key_usage.3
> man/man3/gnutls_x509_crt_get_name_constraints.3.gz
> man/man3/gnutls_x509_crt_get_pk_algorithm.3.gz
> man/man3/gnutls_x509_crt_get_pk_dsa_raw.3.gz
>+man/man3/gnutls_x509_crt_get_pk_ecc_raw.3.gz
> man/man3/gnutls_x509_crt_get_pk_rsa_raw.3.gz
> man/man3/gnutls_x509_crt_get_policy.3.gz
> man/man3/gnutls_x509_crt_get_preferred_hash_algorithm.3.gz
>@@ -873,11 +938,10 @@ man/man3/gnutls_x509_crt_get_subject_alt
> man/man3/gnutls_x509_crt_get_subject_alt_othername_oid.3.gz
> man/man3/gnutls_x509_crt_get_subject_key_id.3.gz
> man/man3/gnutls_x509_crt_get_subject_unique_id.3.gz
>-man/man3/gnutls_x509_crt_get_verify_algorithm.3.gz
> man/man3/gnutls_x509_crt_get_version.3.gz
> man/man3/gnutls_x509_crt_import.3.gz
> man/man3/gnutls_x509_crt_import_pkcs11.3.gz
>-man/man3/gnutls_x509_crt_import_pkcs11_url.3.gz
>+man/man3/gnutls_x509_crt_import_url.3.gz
> man/man3/gnutls_x509_crt_init.3.gz
> man/man3/gnutls_x509_crt_list_import.3.gz
> man/man3/gnutls_x509_crt_list_import2.3.gz
>@@ -901,6 +965,7 @@ man/man3/gnutls_x509_crt_set_extension_b
> man/man3/gnutls_x509_crt_set_issuer_alt_name.3.gz
> man/man3/gnutls_x509_crt_set_issuer_dn.3.gz
> man/man3/gnutls_x509_crt_set_issuer_dn_by_oid.3.gz
>+man/man3/gnutls_x509_crt_set_issuer_unique_id.3.gz
> man/man3/gnutls_x509_crt_set_key.3.gz
> man/man3/gnutls_x509_crt_set_key_purpose_oid.3.gz
> man/man3/gnutls_x509_crt_set_key_usage.3.gz
>@@ -915,16 +980,17 @@ man/man3/gnutls_x509_crt_set_serial.3.gz
> man/man3/gnutls_x509_crt_set_subject_alt_name.3.gz
> man/man3/gnutls_x509_crt_set_subject_alternative_name.3.gz
> man/man3/gnutls_x509_crt_set_subject_key_id.3.gz
>+man/man3/gnutls_x509_crt_set_subject_unique_id.3.gz
> man/man3/gnutls_x509_crt_set_version.3.gz
> man/man3/gnutls_x509_crt_sign.3.gz
> man/man3/gnutls_x509_crt_sign2.3.gz
> man/man3/gnutls_x509_crt_verify.3.gz
>-man/man3/gnutls_x509_crt_verify_data.3.gz
>-man/man3/gnutls_x509_crt_verify_hash.3.gz
>+man/man3/gnutls_x509_crt_verify_data2.3.gz
> man/man3/gnutls_x509_dn_deinit.3.gz
> man/man3/gnutls_x509_dn_export.3.gz
> man/man3/gnutls_x509_dn_export2.3.gz
> man/man3/gnutls_x509_dn_get_rdn_ava.3.gz
>+man/man3/gnutls_x509_dn_get_str.3.gz
> man/man3/gnutls_x509_dn_import.3.gz
> man/man3/gnutls_x509_dn_init.3.gz
> man/man3/gnutls_x509_dn_oid_known.3.gz
>@@ -998,6 +1064,7 @@ man/man3/gnutls_x509_privkey_import_rsa_
> man/man3/gnutls_x509_privkey_import_rsa_raw2.3.gz
> man/man3/gnutls_x509_privkey_init.3.gz
> man/man3/gnutls_x509_privkey_sec_param.3.gz
>+man/man3/gnutls_x509_privkey_set_pin_function.3.gz
> man/man3/gnutls_x509_privkey_sign_data.3.gz
> man/man3/gnutls_x509_privkey_sign_hash.3.gz
> man/man3/gnutls_x509_privkey_verify_params.3.gz
>@@ -1013,7 +1080,11 @@ man/man3/gnutls_x509_trust_list_add_trus
> man/man3/gnutls_x509_trust_list_add_trust_mem.3.gz
> man/man3/gnutls_x509_trust_list_deinit.3.gz
> man/man3/gnutls_x509_trust_list_get_issuer.3.gz
>+man/man3/gnutls_x509_trust_list_get_issuer_by_dn.3.gz
>+man/man3/gnutls_x509_trust_list_get_issuer_by_subject_key_id.3.gz
> man/man3/gnutls_x509_trust_list_init.3.gz
>+man/man3/gnutls_x509_trust_list_iter_deinit.3.gz
>+man/man3/gnutls_x509_trust_list_iter_get_ca.3.gz
> man/man3/gnutls_x509_trust_list_remove_cas.3.gz
> man/man3/gnutls_x509_trust_list_remove_trust_file.3.gz
> man/man3/gnutls_x509_trust_list_remove_trust_mem.3.gz
>Index: security/gsasl/Makefile
>===================================================================
>--- security/gsasl/Makefile	(revision 411799)
>+++ security/gsasl/Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	gsasl
> PORTVERSION=	1.8.0
>-PORTREVISION=	7
>+PORTREVISION=	8
> CATEGORIES=	security
> MASTER_SITES=	GNU
> 
>Index: security/hs-gnutls/Makefile
>===================================================================
>--- security/hs-gnutls/Makefile	(revision 411799)
>+++ security/hs-gnutls/Makefile	(working copy)
>@@ -2,6 +2,7 @@
> 
> PORTNAME=	gnutls
> PORTVERSION=	0.2
>+PORTREVISION=	1
> CATEGORIES=	security haskell
> 
> MAINTAINER=	haskell@FreeBSD.org
>Index: security/libprelude/Makefile
>===================================================================
>--- security/libprelude/Makefile	(revision 411799)
>+++ security/libprelude/Makefile	(working copy)
>@@ -2,75 +2,47 @@
> # $FreeBSD$
> 
> PORTNAME=	libprelude
>-PORTVERSION=	1.0.1
>-PORTREVISION=	9
>+PORTVERSION=	1.2.6
> CATEGORIES=	security
>-MASTER_SITES=	http://www.prelude-ids.org/attachments/download/241/
>+MASTER_SITES=	http://www.prelude-siem.org/attachments/download/410/
> 
> MAINTAINER=	koobs@FreeBSD.org
>-COMMENT=	Framework library for Prelude NIDS
>+COMMENT=	Sensor support library from Prelude SIEM
> 
>-LICENSE=	GPLv2
>-LICENSE_FILE=	${WRKSRC}/LICENSE.README
>+LICENSE=	GPLv2+
>+LICENSE_FILE=	${WRKSRC}/COPYING
> 
> LIB_DEPENDS=	libltdl.so:${PORTSDIR}/devel/libltdl \
>-		libgmp.so:${PORTSDIR}/math/gmp \
> 		libgnutls.so:${PORTSDIR}/security/gnutls \
>-		libgcrypt.so:${PORTSDIR}/security/libgcrypt \
>-		libgpg-error.so:${PORTSDIR}/security/libgpg-error \
>-		libnettle.so:${PORTSDIR}/security/nettle \
>-		libp11-kit.so:${PORTSDIR}/security/p11-kit
>-
>-BROKEN_sparc64=	does not compile
>+		libgcrypt.so:${PORTSDIR}/security/libgcrypt
> 
> OPTIONS_DEFINE=	DOCS PERL PYTHON
> OPTIONS_SUB=	yes
> 
>-USES=		charsetfix gettext gmake iconv libtool pathfix pkgconfig
>+USES=		charsetfix gettext-runtime gmake iconv libtool pathfix pkgconfig
> USE_LDCONFIG=	yes
> GNU_CONFIGURE=	yes
>-CONFIGURE_ARGS=	--enable-static \
>-		--localstatedir=/var \
>-		--enable-gtk-doc=no \
>-		--with-html-dir=${PREFIX}/share/doc
>-
>+CONFIGURE_ARGS=	--without-lua \
>+		--without-python3 \
>+		--without-swig \
>+		--without-valgrind \
>+		ac_cv_path_RUBY=
> CPPFLAGS+=	-I${LOCALBASE}/include
>-LDFLAGS+=	-L${LOCALBASE}/lib
>+LIBS+=		-L${LOCALBASE}/lib
> INSTALL_TARGET=	install-strip
> 
> ETCDIR=		${PREFIX}/etc/prelude
>-PORTDOCS=	*
> 
>-PERL_CONFIGURE_WITH=	perl
>+PERL_CONFIGURE_WITH=	perl=${PERL}
> PERL_USES=		perl5
>-PYTHON_CONFIGURE_WITH=	python
>-PYTHON_USES=		python
>-
>-.include <bsd.port.options.mk>
>-
>-.if ${PORT_OPTIONS:MPYTHON}
>-PLIST_SUB+=	PYTHON_VER="${PYTHON_VER}" VERSION="${PORTVERSION}"
>-.endif
>-
>-.include <bsd.port.pre.mk>
>-
>-post-patch:
>-	@${REINPLACE_CMD} '\,gnutls/extra\.h,d' \
>-		${WRKSRC}/prelude-admin/prelude-admin.c \
>-		${WRKSRC}/prelude-admin/server.c
>+PYTHON_CONFIGURE_WITH=	python2=${PYTHON_CMD}
>+PYTHON_USES=		python:2.7
>+PYTHON_PLIST_SUB=	VERSION="${PORTVERSION}"
> 
> post-install:
>-	${INSTALL_MAN} ${WRKSRC}/docs/manpages/*.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
>-
> .for f in client.conf global.conf idmef-client.conf tls.conf
>-	${INSTALL_DATA} ${WRKSRC}/${f} \
>+	${MV} ${STAGEDIR}${ETCDIR}/default/${f} \
> 		${STAGEDIR}${ETCDIR}/default/${f}.sample
>-	${RM} ${STAGEDIR}${ETCDIR}/default/${f}	# Remove files install-data-local installs
> .endfor
> 
>-.if ${PORT_OPTIONS:MDOCS}
>-	@${MKDIR} ${STAGEDIR}${DOCSDIR}
>-	${INSTALL_DATA} ${WRKSRC}/docs/api/html/* ${STAGEDIR}${DOCSDIR}
>-.endif
>-
>-.include <bsd.port.post.mk>
>+.include <bsd.port.mk>
>Index: security/libprelude/distinfo
>===================================================================
>--- security/libprelude/distinfo	(revision 411799)
>+++ security/libprelude/distinfo	(working copy)
>@@ -1,2 +1,2 @@
>-SHA256 (libprelude-1.0.1.tar.gz) = 852d981e7d23e49ec25a96a7f54c19a7ee72cd786a0d02c43a27e3e770d5cb6b
>-SIZE (libprelude-1.0.1.tar.gz) = 2791973
>+SHA256 (libprelude-1.2.6.tar.gz) = 37541fc6c0593da09410d74b3801cdc672344bdfd711f689157fd41eac06c9c7
>+SIZE (libprelude-1.2.6.tar.gz) = 2926210
>Index: security/libprelude/files/patch-src__include__prelude-plugin.h
>===================================================================
>--- security/libprelude/files/patch-src__include__prelude-plugin.h	(revision 411799)
>+++ security/libprelude/files/patch-src__include__prelude-plugin.h	(nonexistent)
>@@ -1,13 +0,0 @@
>---- src/include/prelude-plugin.h.orig	2012-06-02 00:12:30.000000000 +0900
>-+++ src/include/prelude-plugin.h	2012-09-11 15:46:33.000000000 +0900
>-@@ -61,9 +61,9 @@
>-  */
>- #ifdef PRELUDE_APPLICATION_USE_LIBTOOL2
>- # define lt_preloaded_symbols lt__PROGRAM__LTX_preloaded_symbols
>--#endif
>- 
>- extern const void *lt_preloaded_symbols[];
>-+#endif
>- 
>- #define PRELUDE_PLUGIN_SET_PRELOADED_SYMBOLS()         \
>-         prelude_plugin_set_preloaded_symbols(lt_preloaded_symbols)
>
>Property changes on: security/libprelude/files/patch-src__include__prelude-plugin.h
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: security/libprelude/pkg-descr
>===================================================================
>--- security/libprelude/pkg-descr	(revision 411799)
>+++ security/libprelude/pkg-descr	(working copy)
>@@ -1,7 +1,13 @@
>-Prelude is a new innovative hybrid Intrusion Detection system designed 
>-to be very modular, distributed, rock solid and fast. 
>+Prelude is a Universal "Security Information & Event Management" (SIEM)
>+system.  Prelude collects, normalizes, sorts, aggregates, correlates and
>+reports all security-related events.
> 
>-This library provides a number of features to sensors, including 
>-communication with the manager.
>+As well as being capable of recovering any type of log (system logs, syslog,
>+flat files, etc.), Prelude benefits from a native support with a number of
>+systems dedicated to enriching information even further (snort, samhain,
>+ossec, auditd, etc.).
> 
>-WWW: http://www.prelude-ids.org/
>+This library provides functionality for sensors (connection with a manager,
>+handling sensor-exported options,...).
>+
>+WWW: https://www.prelude-siem.org/
>Index: security/libprelude/pkg-plist
>===================================================================
>--- security/libprelude/pkg-plist	(revision 411799)
>+++ security/libprelude/pkg-plist	(working copy)
>@@ -11,6 +11,7 @@ include/libprelude/idmef.h
> include/libprelude/idmef.hxx
> include/libprelude/idmef-additional-data.h
> include/libprelude/idmef-class.h
>+include/libprelude/idmef-class.hxx
> include/libprelude/idmef-criteria.h
> include/libprelude/idmef-criteria.hxx
> include/libprelude/idmef-criterion-value.h
>@@ -20,6 +21,7 @@ include/libprelude/idmef-message-id.h
> include/libprelude/idmef-message-print.h
> include/libprelude/idmef-message-read.h
> include/libprelude/idmef-message-write.h
>+include/libprelude/idmef-object.h
> include/libprelude/idmef-path.h
> include/libprelude/idmef-path.hxx
> include/libprelude/idmef-time.h
>@@ -54,6 +56,7 @@ include/libprelude/prelude-linked-object
> include/libprelude/prelude-list.h
> include/libprelude/prelude-log.h
> include/libprelude/prelude-log.hxx
>+include/libprelude/prelude-macros.h
> include/libprelude/prelude-message-id.h
> include/libprelude/prelude-msg.h
> include/libprelude/prelude-msgbuf.h
>@@ -63,26 +66,69 @@ include/libprelude/prelude-plugin.h
> include/libprelude/prelude-string.h
> include/libprelude/prelude-thread.h
> include/libprelude/prelude-timer.h
>-lib/libprelude.a
> lib/libprelude.so
>-lib/libprelude.so.2
>-lib/libprelude.so.2.19.1
>-lib/libpreludecpp.a
>+lib/libprelude.so.23
>+lib/libprelude.so.23.1.0
> lib/libpreludecpp.so
>-lib/libpreludecpp.so.0
>-lib/libpreludecpp.so.0.3.0
>-man/man1/prelude-admin.1.gz
>+lib/libpreludecpp.so.8
>+lib/libpreludecpp.so.8.0.0
> %%PERL%%%%SITE_ARCH%%/Prelude.pm
> %%PERL%%%%SITE_ARCH%%/auto/Prelude/Prelude.so
>-%%PYTHON%%%%PYTHON_SITELIBDIR%%/PreludeEasy-%%VERSION%%-py%%PYTHON_VER%%.egg-info
>-%%PYTHON%%%%PYTHON_SITELIBDIR%%/PreludeEasy.py
>-%%PYTHON%%%%PYTHON_SITELIBDIR%%/PreludeEasy.pyc
>-%%PYTHON%%%%PYTHON_SITELIBDIR%%/_PreludeEasy.so
> %%PYTHON%%%%PYTHON_SITELIBDIR%%/_prelude.so
> %%PYTHON%%%%PYTHON_SITELIBDIR%%/prelude-%%VERSION%%-py%%PYTHON_VER%%.egg-info
> %%PYTHON%%%%PYTHON_SITELIBDIR%%/prelude.py
> %%PYTHON%%%%PYTHON_SITELIBDIR%%/prelude.pyc
> libdata/pkgconfig/libprelude.pc
>+man/man1/prelude-admin.1.gz
> share/aclocal/libprelude.m4
>-@dir %%ETCDIR%%/profile
>-@dir(root,wheel,711) /var/spool/prelude
>+%%PORTDOCS%%share/gtk-doc/html/libprelude/api-index-full.html
>+%%PORTDOCS%%share/gtk-doc/html/libprelude/ch01.html
>+%%PORTDOCS%%share/gtk-doc/html/libprelude/deprecated-api-index.html
>+%%PORTDOCS%%share/gtk-doc/html/libprelude/home.png
>+%%PORTDOCS%%share/gtk-doc/html/libprelude/index.html
>+%%PORTDOCS%%share/gtk-doc/html/libprelude/index.sgml
>+%%PORTDOCS%%share/gtk-doc/html/libprelude/left.png
>+%%PORTDOCS%%share/gtk-doc/html/libprelude/libprelude-idmef-additional-data.html
>+%%PORTDOCS%%share/gtk-doc/html/libprelude/libprelude-idmef-criteria.html
>+%%PORTDOCS%%share/gtk-doc/html/libprelude/libprelude-idmef-criterion-value.html
>+%%PORTDOCS%%share/gtk-doc/html/libprelude/libprelude-idmef-data.html
>+%%PORTDOCS%%share/gtk-doc/html/libprelude/libprelude-idmef-message-print.html
>+%%PORTDOCS%%share/gtk-doc/html/libprelude/libprelude-idmef-message-read.html
>+%%PORTDOCS%%share/gtk-doc/html/libprelude/libprelude-idmef-message-write.html
>+%%PORTDOCS%%share/gtk-doc/html/libprelude/libprelude-idmef-path.html
>+%%PORTDOCS%%share/gtk-doc/html/libprelude/libprelude-idmef-time.html
>+%%PORTDOCS%%share/gtk-doc/html/libprelude/libprelude-idmef-tree-wrap.html
>+%%PORTDOCS%%share/gtk-doc/html/libprelude/libprelude-idmef-value.html
>+%%PORTDOCS%%share/gtk-doc/html/libprelude/libprelude-prelude-async.html
>+%%PORTDOCS%%share/gtk-doc/html/libprelude/libprelude-prelude-client-profile.html
>+%%PORTDOCS%%share/gtk-doc/html/libprelude/libprelude-prelude-client.html
>+%%PORTDOCS%%share/gtk-doc/html/libprelude/libprelude-prelude-connection-pool.html
>+%%PORTDOCS%%share/gtk-doc/html/libprelude/libprelude-prelude-connection.html
>+%%PORTDOCS%%share/gtk-doc/html/libprelude/libprelude-prelude-error.html
>+%%PORTDOCS%%share/gtk-doc/html/libprelude/libprelude-prelude-failover.html
>+%%PORTDOCS%%share/gtk-doc/html/libprelude/libprelude-prelude-hash.html
>+%%PORTDOCS%%share/gtk-doc/html/libprelude/libprelude-prelude-ident.html
>+%%PORTDOCS%%share/gtk-doc/html/libprelude/libprelude-prelude-inttypes.html
>+%%PORTDOCS%%share/gtk-doc/html/libprelude/libprelude-prelude-io.html
>+%%PORTDOCS%%share/gtk-doc/html/libprelude/libprelude-prelude-linked-object.html
>+%%PORTDOCS%%share/gtk-doc/html/libprelude/libprelude-prelude-list.html
>+%%PORTDOCS%%share/gtk-doc/html/libprelude/libprelude-prelude-log.html
>+%%PORTDOCS%%share/gtk-doc/html/libprelude/libprelude-prelude-msg.html
>+%%PORTDOCS%%share/gtk-doc/html/libprelude/libprelude-prelude-msgbuf.html
>+%%PORTDOCS%%share/gtk-doc/html/libprelude/libprelude-prelude-option-wide.html
>+%%PORTDOCS%%share/gtk-doc/html/libprelude/libprelude-prelude-option.html
>+%%PORTDOCS%%share/gtk-doc/html/libprelude/libprelude-prelude-plugin.html
>+%%PORTDOCS%%share/gtk-doc/html/libprelude/libprelude-prelude-string.html
>+%%PORTDOCS%%share/gtk-doc/html/libprelude/libprelude-prelude-timer.html
>+%%PORTDOCS%%share/gtk-doc/html/libprelude/libprelude-prelude.html
>+%%PORTDOCS%%share/gtk-doc/html/libprelude/libprelude.devhelp
>+%%PORTDOCS%%share/gtk-doc/html/libprelude/libprelude.devhelp2
>+%%PORTDOCS%%share/gtk-doc/html/libprelude/object-tree.html
>+%%PORTDOCS%%share/gtk-doc/html/libprelude/right.png
>+%%PORTDOCS%%share/gtk-doc/html/libprelude/style.css
>+%%PORTDOCS%%share/gtk-doc/html/libprelude/up.png
>+%%DATADIR%%/swig/libpreludecpp.i
>+%%PERL%%%%DATADIR%%/swig/perl/libpreludecpp-perl.i
>+%%PYTHON%%%%DATADIR%%/swig/python/libpreludecpp-python.i
>+@dir(,,711) %%ETCDIR%%/profile
>+@dir(,,711) /var/spool/prelude
>Index: security/libpreludedb/Makefile
>===================================================================
>--- security/libpreludedb/Makefile	(revision 411799)
>+++ security/libpreludedb/Makefile	(working copy)
>@@ -2,36 +2,26 @@
> # $FreeBSD$
> 
> PORTNAME=	libpreludedb
>-PORTVERSION=	1.0.1p1
>-PORTREVISION=	10
>+PORTVERSION=	1.2.6
> CATEGORIES=	security
>-MASTER_SITES=	https://www.prelude-ids.org/attachments/download/287/
>+MASTER_SITES=	http://www.prelude-siem.org/attachments/download/408/
> 
> MAINTAINER=	ports@FreeBSD.org
>-COMMENT=	Framework library for access to Prelude NIDS database
>+COMMENT=	Library to access Prelude IDMEF database
> 
> LICENSE=	GPLv2+
> LICENSE_FILE=	${WRKSRC}/COPYING
> 
>-LIB_DEPENDS=	libltdl.so:${PORTSDIR}/devel/libltdl \
>-		libgmp.so:${PORTSDIR}/math/gmp \
>-		libgnutls.so:${PORTSDIR}/security/gnutls \
>-		libgcrypt.so:${PORTSDIR}/security/libgcrypt \
>-		libgpg-error.so:${PORTSDIR}/security/libgpg-error \
>-		libprelude.so:${PORTSDIR}/security/libprelude \
>-		libnettle.so:${PORTSDIR}/security/nettle \
>-		libp11-kit.so:${PORTSDIR}/security/p11-kit
>+LIB_DEPENDS=	libprelude.so:${PORTSDIR}/security/libprelude
> 
>-USES=		gettext gmake iconv libtool
>+USES=		gmake libtool
> GNU_CONFIGURE=	yes
>-CONFIGURE_ARGS=	--enable-gtk-doc=no \
>-		--with-html-dir=${PREFIX}/share/doc
>+CONFIGURE_ARGS=	--without-swig \
>+		--without-python3
> INSTALL_TARGET=	install-strip
> USE_LDCONFIG=	yes
> 
>-PORTDOCS=	*
>-
>-OPTIONS_DEFINE=		DOCS PERL PYTHON
>+OPTIONS_DEFINE=		DOCS PYTHON
> OPTIONS_MULTI=		DB
> OPTIONS_MULTI_DB=	MYSQL PGSQL SQLITE
> OPTIONS_DEFAULT=	MYSQL
>@@ -40,35 +30,14 @@ OPTIONS_SUB=		yes
> MYSQL_DESC=		MySQL plugin
> MYSQL_USE=		mysql=yes
> MYSQL_CONFIGURE_WITH=	mysql
>-PERL_DESC=		Perl bindings
>-PERL_USES=		perl5
>-PERL_USE=		perl5=build,run
>-PERL_CONFIGURE_WITH=	perl
> PGSQL_DESC=		PostgreSQL plugin
> PGSQL_USES=		pgsql
> PGSQL_CONFIGURE_WITH=	postgresql
>-PYTHON_USES=		python
>-PYTHON_CONFIGURE_WITH=	python
>-PYTHON_PLIST_SUB=	PYTHON_VER="${PYTHON_VER}"
>+PYTHON_USES=		python:2.7
>+PYTHON_CONFIGURE_WITH=	python2=${PYTHON_CMD}
>+PYTHON_PLIST_SUB=	VERSION=${PORTVERSION}
> SQLITE_DESC=		SQLite3 plugin
> SQLITE_USE=		sqlite=yes
> SQLITE_CONFIGURE_WITH=	sqlite3
> 
>-post-install:
>-	${INSTALL_MAN} ${WRKSRC}/docs/manpages/*.1 \
>-		${STAGEDIR}${MAN1PREFIX}/man/man1
>-
>-post-install-DOCS-on:
>-	@${MKDIR} ${STAGEDIR}${DOCSDIR}
>-	${INSTALL_DATA} ${WRKSRC}/docs/api/html/* \
>-		${STAGEDIR}${DOCSDIR}
>-
>-post-install-PERL-on:
>-	@${FIND} ${STAGEDIR}${PREFIX}/lib/perl5 \
>-		-name "*.so" | ${XARGS} ${STRIP_CMD}
>-
>-post-install-PYTHON-on:
>-	@${FIND} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR} \
>-		-name "*.so" | ${XARGS} ${STRIP_CMD}
>-
> .include <bsd.port.mk>
>Index: security/libpreludedb/distinfo
>===================================================================
>--- security/libpreludedb/distinfo	(revision 411799)
>+++ security/libpreludedb/distinfo	(working copy)
>@@ -1,2 +1,2 @@
>-SHA256 (libpreludedb-1.0.1p1.tar.gz) = c62a30d2d96bea4188328124a85a53e2aa1e6effebe15c83dd4440248e0f4f61
>-SIZE (libpreludedb-1.0.1p1.tar.gz) = 939675
>+SHA256 (libpreludedb-1.2.6.tar.gz) = e855358b90811132c5e2e9fecf168eedee3c2bda03cd8eb4ae34a6e31f1540b1
>+SIZE (libpreludedb-1.2.6.tar.gz) = 1230637
>Index: security/libpreludedb/files/patch-Makefile.in
>===================================================================
>--- security/libpreludedb/files/patch-Makefile.in	(revision 411799)
>+++ security/libpreludedb/files/patch-Makefile.in	(nonexistent)
>@@ -1,13 +0,0 @@
>---- Makefile.in.orig	2009-07-15 13:49:18.000000000 +0600
>-+++ Makefile.in	2009-09-04 10:56:03.000000000 +0600
>-@@ -645,9 +645,8 @@
>- top_builddir = @top_builddir@
>- top_srcdir = @top_srcdir@
>- ACLOCAL_AMFLAGS = -I m4 -I libmissing/m4
>--DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc
>- EXTRA_DIST = LICENSE.README HACKING.README
>--SUBDIRS = m4 libmissing src plugins bindings docs
>-+SUBDIRS = m4 libmissing src plugins bindings
>- MAINTAINERCLEANFILES = \
>- 	$(srcdir)/INSTALL \
>- 	$(srcdir)/aclocal.m4 \
>
>Property changes on: security/libpreludedb/files/patch-Makefile.in
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: security/libpreludedb/pkg-descr
>===================================================================
>--- security/libpreludedb/pkg-descr	(revision 411799)
>+++ security/libpreludedb/pkg-descr	(working copy)
>@@ -1,6 +1,12 @@
>-Prelude is a new innovative hybrid Intrusion Detection system designed 
>-to be very modular, distributed, rock solid and fast. 
>+Prelude is a Universal "Security Information & Event Management" (SIEM)
>+system.  Prelude collects, normalizes, sorts, aggregates, correlates and
>+reports all security-related events.
>+
>+As well as being capable of recovering any type of log (system logs, syslog,
>+flat files, etc.), Prelude benefits from a native support with a number of
>+systems dedicated to enriching information even further (snort, samhain,
>+ossec, auditd, etc.).
> 
> This library provides a framework for easy access to the Prelude database.
> 
>-WWW: http://www.prelude-ids.org/
>+WWW: https://www.prelude-siem.org/
>Index: security/libpreludedb/pkg-plist
>===================================================================
>--- security/libpreludedb/pkg-plist	(revision 411799)
>+++ security/libpreludedb/pkg-plist	(working copy)
>@@ -1,28 +1,53 @@
> bin/libpreludedb-config
> bin/preludedb-admin
> include/libpreludedb/preludedb.h
>+include/libpreludedb/preludedb.hxx
> include/libpreludedb/preludedb-error.h
>+include/libpreludedb/preludedb-error.hxx
> include/libpreludedb/preludedb-path-selection.h
> include/libpreludedb/preludedb-plugin-format.h
> include/libpreludedb/preludedb-plugin-sql.h
> include/libpreludedb/preludedb-sql-settings.h
> include/libpreludedb/preludedb-sql.h
>+include/libpreludedb/preludedb-sql.hxx
> include/libpreludedb/preludedb-version.h
> lib/libpreludedb.so
>-lib/libpreludedb.so.0
>-lib/libpreludedb.so.0.4.10
>+lib/libpreludedb.so.7
>+lib/libpreludedb.so.7.0.0
>+lib/libpreludedbcpp.so
>+lib/libpreludedbcpp.so.2
>+lib/libpreludedbcpp.so.2.0.0
> lib/libpreludedb/plugins/formats/classic.so
> %%MYSQL%%lib/libpreludedb/plugins/sql/mysql.so
> %%PGSQL%%lib/libpreludedb/plugins/sql/pgsql.so
> %%SQLITE%%lib/libpreludedb/plugins/sql/sqlite3.so
>-%%PERL%%%%SITE_ARCH%%/PreludeDB.pm
>-%%PERL%%%%SITE_ARCH%%/auto/PreludeDB/PreludeDB.so
> %%PYTHON%%%%PYTHON_SITELIBDIR%%/_preludedb.so
>-%%PYTHON%%%%PYTHON_SITELIBDIR%%/preludedb-0.0.0-py%%PYTHON_VER%%.egg-info
>+%%PYTHON%%%%PYTHON_SITELIBDIR%%/preludedb-%%VERSION%%-py%%PYTHON_VER%%.egg-info
> %%PYTHON%%%%PYTHON_SITELIBDIR%%/preludedb.py
> %%PYTHON%%%%PYTHON_SITELIBDIR%%/preludedb.pyc
> man/man1/preludedb-admin.1.gz
> share/aclocal/libpreludedb.m4
>+%%PORTDOCS%%share/gtk-doc/html/libpreludedb/api-index-full.html
>+%%PORTDOCS%%share/gtk-doc/html/libpreludedb/ch01.html
>+%%PORTDOCS%%share/gtk-doc/html/libpreludedb/deprecated-api-index.html
>+%%PORTDOCS%%share/gtk-doc/html/libpreludedb/home.png
>+%%PORTDOCS%%share/gtk-doc/html/libpreludedb/index.html
>+%%PORTDOCS%%share/gtk-doc/html/libpreludedb/index.sgml
>+%%PORTDOCS%%share/gtk-doc/html/libpreludedb/left.png
>+%%PORTDOCS%%share/gtk-doc/html/libpreludedb/libpreludedb-preludedb-error.html
>+%%PORTDOCS%%share/gtk-doc/html/libpreludedb/libpreludedb-preludedb-path-selection.html
>+%%PORTDOCS%%share/gtk-doc/html/libpreludedb/libpreludedb-preludedb-plugin-format.html
>+%%PORTDOCS%%share/gtk-doc/html/libpreludedb/libpreludedb-preludedb-plugin-sql.html
>+%%PORTDOCS%%share/gtk-doc/html/libpreludedb/libpreludedb-preludedb-sql-settings.html
>+%%PORTDOCS%%share/gtk-doc/html/libpreludedb/libpreludedb-preludedb-sql.html
>+%%PORTDOCS%%share/gtk-doc/html/libpreludedb/libpreludedb-preludedb-version.html
>+%%PORTDOCS%%share/gtk-doc/html/libpreludedb/libpreludedb-preludedb.html
>+%%PORTDOCS%%share/gtk-doc/html/libpreludedb/libpreludedb.devhelp
>+%%PORTDOCS%%share/gtk-doc/html/libpreludedb/libpreludedb.devhelp2
>+%%PORTDOCS%%share/gtk-doc/html/libpreludedb/object-tree.html
>+%%PORTDOCS%%share/gtk-doc/html/libpreludedb/right.png
>+%%PORTDOCS%%share/gtk-doc/html/libpreludedb/style.css
>+%%PORTDOCS%%share/gtk-doc/html/libpreludedb/up.png
> %%DATADIR%%/classic/mysql-update-14-1.sql
> %%DATADIR%%/classic/mysql-update-14-2.sql
> %%DATADIR%%/classic/mysql-update-14-3.sql
>Index: security/openconnect/Makefile
>===================================================================
>--- security/openconnect/Makefile	(revision 411799)
>+++ security/openconnect/Makefile	(working copy)
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	openconnect
> PORTVERSION=	7.06
>+PORTREVISION=	1
> CATEGORIES=	security
> MASTER_SITES=	ftp://ftp.infradead.org/pub/openconnect/ \
> 		http://mirrors.rit.edu/zi/
>Index: security/openvas-cli/Makefile
>===================================================================
>--- security/openvas-cli/Makefile	(revision 411799)
>+++ security/openvas-cli/Makefile	(working copy)
>@@ -2,6 +2,7 @@
> 
> PORTNAME=	openvas-cli
> PORTVERSION=	1.4.3
>+PORTREVISION=	1
> CATEGORIES=	security
> MASTER_SITES=	http://wald.intevation.org/frs/download.php/2209/
> 
>Index: security/openvas-libraries/Makefile
>===================================================================
>--- security/openvas-libraries/Makefile	(revision 411799)
>+++ security/openvas-libraries/Makefile	(working copy)
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	openvas-libraries
> PORTVERSION=	8.0.7
>+PORTREVISION=	1
> CATEGORIES=	security
> MASTER_SITES=	http://wald.intevation.org/frs/download.php/2291/
> 
>Index: security/openvas-manager/Makefile
>===================================================================
>--- security/openvas-manager/Makefile	(revision 411799)
>+++ security/openvas-manager/Makefile	(working copy)
>@@ -2,6 +2,7 @@
> 
> PORTNAME=	openvas-manager
> PORTVERSION=	6.0.8
>+PORTREVISION=	1
> CATEGORIES=	security
> MASTER_SITES=	http://wald.intevation.org/frs/download.php/2295/
> 
>Index: security/py-gnutls/Makefile
>===================================================================
>--- security/py-gnutls/Makefile	(revision 411799)
>+++ security/py-gnutls/Makefile	(working copy)
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	gnutls
> PORTVERSION=	2.0.1
>+PORTREVISION=	1
> CATEGORIES=	security python
> MASTER_SITES=	CHEESESHOP
> PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
>Index: security/shishi/Makefile
>===================================================================
>--- security/shishi/Makefile	(revision 411799)
>+++ security/shishi/Makefile	(working copy)
>@@ -2,7 +2,7 @@
> 
> PORTNAME=	shishi
> PORTVERSION=	1.0.2
>-PORTREVISION=	8
>+PORTREVISION=	9
> CATEGORIES=	security
> MASTER_SITES=	GNU
> 
>Index: security/suricata/Makefile
>===================================================================
>--- security/suricata/Makefile	(revision 411799)
>+++ security/suricata/Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	suricata
> PORTVERSION=	3.0
>-PORTREVISION=	1
>+PORTREVISION=	2
> CATEGORIES=	security
> MASTER_SITES=	http://www.openinfosecfoundation.org/download/
> 
>Index: security/xmlsec1/Makefile
>===================================================================
>--- security/xmlsec1/Makefile	(revision 411799)
>+++ security/xmlsec1/Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	xmlsec1
> PORTVERSION=	1.2.20
>-PORTREVISION=	3
>+PORTREVISION=	4
> CATEGORIES=	security
> MASTER_SITES=	http://www.aleksey.com/xmlsec/download/ \
> 		ftp://ftp.aleksey.com/pub/xmlsec/releases/ \
>Index: sysutils/cinnamon-settings-daemon/Makefile
>===================================================================
>--- sysutils/cinnamon-settings-daemon/Makefile	(revision 411799)
>+++ sysutils/cinnamon-settings-daemon/Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	cinnamon-settings-daemon
> PORTVERSION=	2.4.3
>-PORTREVISION=	1
>+PORTREVISION=	2
> CATEGORIES=	sysutils gnome
> DIST_SUBDIR=	gnome3
> 
>Index: sysutils/gkrellm2/Makefile
>===================================================================
>--- sysutils/gkrellm2/Makefile	(revision 411799)
>+++ sysutils/gkrellm2/Makefile	(working copy)
>@@ -2,7 +2,7 @@
> 
> PORTNAME=	gkrellm
> PORTVERSION=	2.3.5
>-PORTREVISION=	6
>+PORTREVISION=	7
> CATEGORIES=	sysutils ipv6
> MASTER_SITES=	http://members.dslextreme.com/users/billw/gkrellm/ \
> 		LOCAL/ume
>@@ -17,9 +17,7 @@ USES=		gmake pkgconfig tar:bzip2
> USE_RC_SUBR=	gkrellmd
> WANT_GNOME=	yes
> 
>-OPTIONS_DEFINE=		DOCS CLIENT NLS NTLM
>-OPTIONS_RADIO=		SSL
>-OPTIONS_RADIO_SSL=	GNUTLS OPENSSL
>+OPTIONS_DEFINE=		DOCS CLIENT NLS NTLM OPENSSL
> OPTIONS_DEFAULT=	CLIENT NTLM OPENSSL
> OPTIONS_SUB=		yes
> 
>@@ -40,11 +38,7 @@ USES+=		gettext
> .else
> MAKE_ENV+=	enable_nls=0
> .endif
>-.if ${PORT_OPTIONS:MGNUTLS}
>-LIB_DEPENDS+=	libgnutls-openssl.so:${PORTSDIR}/security/gnutls
>-MAKE_ENV+=	GNUTLSINC=${LOCALBASE}/include GNUTLSLIB=${LOCALBASE}/lib \
>-		without-ssl=1
>-.elif ${PORT_OPTIONS:MOPENSSL}
>+.if ${PORT_OPTIONS:MOPENSSL}
> USE_OPENSSL=	yes
> MAKE_ENV+=	without-gnutls=1
> .else
>Index: sysutils/gnome-control-center/Makefile
>===================================================================
>--- sysutils/gnome-control-center/Makefile	(revision 411799)
>+++ sysutils/gnome-control-center/Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	gnome-control-center
> PORTVERSION=	3.18.2
>-PORTREVISION=	1
>+PORTREVISION=	2
> CATEGORIES=	sysutils gnome
> MASTER_SITES=	GNOME
> DIST_SUBDIR=	gnome3
>Index: sysutils/gnome-settings-daemon/Makefile
>===================================================================
>--- sysutils/gnome-settings-daemon/Makefile	(revision 411799)
>+++ sysutils/gnome-settings-daemon/Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	gnome-settings-daemon
> PORTVERSION=	3.18.2
>-PORTREVISION=	1
>+PORTREVISION=	2
> CATEGORIES=	sysutils gnome
> MASTER_SITES=	GNOME
> DIST_SUBDIR=	gnome3
>Index: sysutils/heartbeat/Makefile
>===================================================================
>--- sysutils/heartbeat/Makefile	(revision 411799)
>+++ sysutils/heartbeat/Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	heartbeat
> PORTVERSION=	2.1.4
>-PORTREVISION=	26
>+PORTREVISION=	27
> CATEGORIES=	sysutils
> #MASTER_SITES=	http://hg.linux-ha.org/lha-2.1/archive/STABLE-2.1.4.tar.bz2
> MASTER_SITES=	LOCAL/kuriyama/heartbeat
>Index: sysutils/heartbeat/files/patch-crm-cib-remote.c
>===================================================================
>--- sysutils/heartbeat/files/patch-crm-cib-remote.c	(nonexistent)
>+++ sysutils/heartbeat/files/patch-crm-cib-remote.c	(working copy)
>@@ -0,0 +1,26 @@
>+--- crm/cib/remote.c.orig	2008-08-18 12:32:19 UTC
>++++ crm/cib/remote.c
>+@@ -45,13 +45,6 @@ void cib_send_remote_msg(void *session, 
>+ 
>+ #ifdef HAVE_GNUTLS_GNUTLS_H
>+ #  define DH_BITS 1024
>+-const int tls_kx_order[] = {
>+-	  GNUTLS_KX_ANON_DH,
>+-	  GNUTLS_KX_DHE_RSA,
>+-	  GNUTLS_KX_DHE_DSS,
>+-	  GNUTLS_KX_RSA,
>+-	0
>+-};
>+ gnutls_dh_params dh_params;
>+ gnutls_anon_server_credentials anon_cred;
>+ char *cib_send_tls(gnutls_session *session, HA_Message *msg);
>+@@ -83,8 +76,7 @@ create_tls_session(int csock)
>+ 	session = (gnutls_session*)gnutls_malloc(sizeof(gnutls_session));
>+ 
>+ 	gnutls_init(session, GNUTLS_SERVER);
>+-	gnutls_set_default_priority(*session);
>+- 	gnutls_kx_set_priority (*session, tls_kx_order);
>++ 	gnutls_priority_set_direct (*session, "NORMAL:-KX-ALL:+ANON-DH:+DHE-RSA:+DHE-DSS:+RSA", NULL);
>+ 	gnutls_credentials_set(*session, GNUTLS_CRD_ANON, anon_cred);
>+ 	gnutls_transport_set_ptr(*session,
>+ 				 (gnutls_transport_ptr) GINT_TO_POINTER(csock));
>
>Property changes on: sysutils/heartbeat/files/patch-crm-cib-remote.c
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: sysutils/heartbeat/files/patch-lib-mgmt-mgmt_tls_lib.c
>===================================================================
>--- sysutils/heartbeat/files/patch-lib-mgmt-mgmt_tls_lib.c	(nonexistent)
>+++ sysutils/heartbeat/files/patch-lib-mgmt-mgmt_tls_lib.c	(working copy)
>@@ -0,0 +1,34 @@
>+--- lib/mgmt/mgmt_tls_lib.c.orig	2008-08-18 12:32:19 UTC
>++++ lib/mgmt/mgmt_tls_lib.c
>+@@ -38,11 +38,6 @@ static gnutls_dh_params dh_params;
>+ gnutls_anon_server_credentials anoncred_server;
>+ gnutls_anon_client_credentials anoncred_client;
>+ 
>+-const int kx_prio[] =
>+-{
>+-	GNUTLS_KX_ANON_DH,
>+-	0
>+-};
>+ 
>+ int
>+ tls_init_client(void)
>+@@ -58,8 +53,7 @@ tls_attach_client(int sock)
>+ 	int ret;
>+ 	gnutls_session* session = (gnutls_session*)gnutls_malloc(sizeof(gnutls_session));
>+ 	gnutls_init(session, GNUTLS_CLIENT);
>+-	gnutls_set_default_priority(*session);
>+-	gnutls_kx_set_priority (*session, kx_prio);
>++	gnutls_priority_set_direct(*session, "NORMAL:-KX-ALL:+ANON-DH", NULL);
>+ 	gnutls_credentials_set(*session, GNUTLS_CRD_ANON, anoncred_client);
>+ 	gnutls_transport_set_ptr(*session, (gnutls_transport_ptr) GINT_TO_POINTER(sock));
>+ 	ret = gnutls_handshake(*session);
>+@@ -131,8 +125,7 @@ tls_attach_server(int sock)
>+ 	int ret;
>+ 	gnutls_session* session = (gnutls_session*)gnutls_malloc(sizeof(gnutls_session));
>+ 	gnutls_init(session, GNUTLS_SERVER);
>+-	gnutls_set_default_priority(*session);
>+-	gnutls_kx_set_priority (*session, kx_prio);
>++	gnutls_priority_set_direct(*session, "NORMAL:-KX-ALL:+ANON-DH", NULL);
>+ 	gnutls_credentials_set(*session, GNUTLS_CRD_ANON, anoncred_server);
>+ 	gnutls_dh_set_prime_bits(*session, DH_BITS);
>+ 	gnutls_transport_set_ptr(*session, (gnutls_transport_ptr) GINT_TO_POINTER(sock));
>
>Property changes on: sysutils/heartbeat/files/patch-lib-mgmt-mgmt_tls_lib.c
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: sysutils/heartbeat/files/patch-lib__plugins__quorum__quorumd.c
>===================================================================
>--- sysutils/heartbeat/files/patch-lib__plugins__quorum__quorumd.c	(revision 411799)
>+++ sysutils/heartbeat/files/patch-lib__plugins__quorum__quorumd.c	(working copy)
>@@ -1,9 +1,21 @@
>---- lib/plugins/quorum/quorumd.c.orig
>+--- lib/plugins/quorum/quorumd.c.orig	2008-08-18 12:32:19 UTC
> +++ lib/plugins/quorum/quorumd.c
>-@@ -353,15 +353,28 @@
>+@@ -327,11 +327,9 @@ initialize_tls_session (int sd)
>+ {
>+ 	int ret;
>+ 	gnutls_session session;
>+-	const int cert_type_priority[2] = { GNUTLS_CRT_X509,0};
>+ 	
>+ 	gnutls_init (&session, GNUTLS_CLIENT);
>+ 	gnutls_set_default_priority (session);
>+-	gnutls_certificate_type_set_priority (session, cert_type_priority);
>+ 	gnutls_credentials_set (session, GNUTLS_CRD_CERTIFICATE, xcred);
>+ 	gnutls_transport_set_ptr (session, (gnutls_transport_ptr) GINT_TO_POINTER(sd));
>+ 	ret = gnutls_handshake (session);
>+@@ -353,15 +351,28 @@ verify_certificate (gnutls_session sessi
>  	unsigned int cert_list_size;
>  	const gnutls_datum *cert_list;
>-	int ret;
>+ 	int ret;
> +	int status;
>  	gnutls_x509_crt cert;
>  
>Index: sysutils/heartbeat/files/patch-membership__quorumd__quorumdtest.c
>===================================================================
>--- sysutils/heartbeat/files/patch-membership__quorumd__quorumdtest.c	(revision 411799)
>+++ sysutils/heartbeat/files/patch-membership__quorumd__quorumdtest.c	(working copy)
>@@ -1,9 +1,21 @@
>---- membership/quorumd/quorumdtest.c.orig
>+--- membership/quorumd/quorumdtest.c.orig	2008-08-18 12:32:19 UTC
> +++ membership/quorumd/quorumdtest.c
>-@@ -162,16 +162,16 @@
>+@@ -136,11 +136,9 @@ initialize_tls_session (int sd)
>+ {
>+ 	int ret;
>+ 	gnutls_session session;
>+-	const int cert_type_priority[2] = { GNUTLS_CRT_X509,0};
>+ 	
>+ 	gnutls_init (&session, GNUTLS_CLIENT);
>+ 	gnutls_set_default_priority (session);
>+-	gnutls_certificate_type_set_priority (session, cert_type_priority);
>+ 	gnutls_credentials_set (session, GNUTLS_CRD_CERTIFICATE, xcred);
>+ 	gnutls_transport_set_ptr (session, (gnutls_transport_ptr) GINT_TO_POINTER(sd));
>+ 	ret = gnutls_handshake (session);
>+@@ -162,16 +160,16 @@ verify_certificate (gnutls_session sessi
>  	unsigned int cert_list_size;
>  	const gnutls_datum *cert_list;
>-	int ret;
>+ 	int ret;
> +	int status;
>  	gnutls_x509_crt cert;
>  
>@@ -19,7 +31,7 @@
>  	if (status & GNUTLS_CERT_INVALID) {
>  		printf("The certificate is not trusted.\n");
>  		return -1;
>-@@ -184,7 +184,6 @@
>+@@ -184,7 +182,6 @@ verify_certificate (gnutls_session sessi
>  		printf("The certificate has been revoked.\n");
>  		return -1;
>  	}
>Index: sysutils/rsyslog7/Makefile
>===================================================================
>--- sysutils/rsyslog7/Makefile	(revision 411799)
>+++ sysutils/rsyslog7/Makefile	(working copy)
>@@ -2,7 +2,7 @@
> 
> PORTNAME=	rsyslog
> PORTVERSION=	7.6.7
>-PORTREVISION=	1
>+PORTREVISION=	2
> CATEGORIES=	sysutils
> MASTER_SITES=	http://www.rsyslog.com/files/download/rsyslog/
> 
>Index: sysutils/rsyslog8/Makefile
>===================================================================
>--- sysutils/rsyslog8/Makefile	(revision 411799)
>+++ sysutils/rsyslog8/Makefile	(working copy)
>@@ -2,6 +2,7 @@
> 
> PORTNAME=	rsyslog
> PORTVERSION=	8.11.0
>+PORTREVISION=	1
> CATEGORIES=	sysutils
> MASTER_SITES=	http://www.rsyslog.com/files/download/rsyslog/
> 
>Index: textproc/iksemel/Makefile
>===================================================================
>--- textproc/iksemel/Makefile	(revision 411799)
>+++ textproc/iksemel/Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	iksemel
> PORTVERSION=	1.4
>-PORTREVISION=	6
>+PORTREVISION=	7
> CATEGORIES=	textproc
> MASTER_SITES=	GOOGLE_CODE
> 
>Index: textproc/iksemel/files/patch-src-stream.c
>===================================================================
>--- textproc/iksemel/files/patch-src-stream.c	(nonexistent)
>+++ textproc/iksemel/files/patch-src-stream.c	(working copy)
>@@ -0,0 +1,27 @@
>+--- src/stream.c.orig	2009-07-23 11:16:35 UTC
>++++ src/stream.c
>+@@ -63,11 +63,6 @@ tls_pull (iksparser *prs, char *buffer, 
>+ static int
>+ handshake (struct stream_data *data)
>+ {
>+-	const int protocol_priority[] = { GNUTLS_TLS1, GNUTLS_SSL3, 0 };
>+-	const int kx_priority[] = { GNUTLS_KX_RSA, 0 };
>+-	const int cipher_priority[] = { GNUTLS_CIPHER_3DES_CBC, GNUTLS_CIPHER_ARCFOUR, 0};
>+-	const int comp_priority[] = { GNUTLS_COMP_ZLIB, GNUTLS_COMP_NULL, 0 };
>+-	const int mac_priority[] = { GNUTLS_MAC_SHA, GNUTLS_MAC_MD5, 0 };
>+ 	int ret;
>+ 
>+ 	if (gnutls_global_init () != 0)
>+@@ -80,11 +75,7 @@ handshake (struct stream_data *data)
>+ 		gnutls_certificate_free_credentials (data->cred);
>+ 		return IKS_NOMEM;
>+ 	}
>+-	gnutls_protocol_set_priority (data->sess, protocol_priority);
>+-	gnutls_cipher_set_priority(data->sess, cipher_priority);
>+-	gnutls_compression_set_priority(data->sess, comp_priority);
>+-	gnutls_kx_set_priority(data->sess, kx_priority);
>+-	gnutls_mac_set_priority(data->sess, mac_priority);
>++	gnutls_set_default_priority(data->sess);
>+ 	gnutls_credentials_set (data->sess, GNUTLS_CRD_CERTIFICATE, data->cred);
>+ 
>+ 	gnutls_transport_set_push_function (data->sess, (gnutls_push_func) tls_push);
>
>Property changes on: textproc/iksemel/files/patch-src-stream.c
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: www/aws/Makefile
>===================================================================
>--- www/aws/Makefile	(revision 411799)
>+++ www/aws/Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	aws
> PORTVERSION=	3.3.0.0
>-PORTREVISION=	1
>+PORTREVISION=	2
> CATEGORIES=	www
> MASTER_SITES=	http://downloads.dragonlace.net/src/
> 
>Index: www/gurlchecker/Makefile
>===================================================================
>--- www/gurlchecker/Makefile	(revision 411799)
>+++ www/gurlchecker/Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	gurlchecker
> PORTVERSION=	0.10.1
>-PORTREVISION=	23
>+PORTREVISION=	24
> CATEGORIES=	www gnome
> MASTER_SITES=	http://labs.libre-entreprise.org/frs/download.php/547/
> 
>Index: www/hydra/Makefile
>===================================================================
>--- www/hydra/Makefile	(revision 411799)
>+++ www/hydra/Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	hydra
> PORTVERSION=	0.1.8
>-PORTREVISION=	9
>+PORTREVISION=	10
> CATEGORIES=	www
> MASTER_SITES=	http://hydra.hellug.gr/download/
> PKGNAMESUFFIX=	-web
>@@ -13,6 +13,8 @@ COMMENT=	High performance multi-threaded
> 
> LIB_DEPENDS=	libgnutls.so:${PORTSDIR}/security/gnutls
> 
>+BROKEN=		Needs to be ported to GnuTLS 3.4; abandoned upstream
>+
> USES=		perl5 pkgconfig shebangfix
> SHEBANG_FILES=	src/webindex.pl
> USE_RC_SUBR=	hydra
>Index: www/libepc/Makefile
>===================================================================
>--- www/libepc/Makefile	(revision 411799)
>+++ www/libepc/Makefile	(working copy)
>@@ -4,7 +4,7 @@
> 
> PORTNAME=	libepc
> PORTVERSION=	0.4.4
>-PORTREVISION=	1
>+PORTREVISION=	2
> CATEGORIES=	www
> MASTER_SITES=	GNOME
> 
>Index: www/libmicrohttpd/Makefile
>===================================================================
>--- www/libmicrohttpd/Makefile	(revision 411799)
>+++ www/libmicrohttpd/Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	libmicrohttpd
> PORTVERSION=	0.9.37
>-PORTREVISION=	1
>+PORTREVISION=	2
> CATEGORIES=	www
> MASTER_SITES=	GNU
> 
>Index: www/ocaml-net/Makefile
>===================================================================
>--- www/ocaml-net/Makefile	(revision 411799)
>+++ www/ocaml-net/Makefile	(working copy)
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	net
> PORTVERSION=	4.0.4
>+PORTREVISION=	1
> CATEGORIES=	www
> MASTER_SITES=	http://download.camlcity.org/download/
> PKGNAMEPREFIX=	ocaml-
>Index: www/retawq/Makefile
>===================================================================
>--- www/retawq/Makefile	(revision 411799)
>+++ www/retawq/Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	retawq
> DISTVERSION=	0.2.6c
>-PORTREVISION=	10
>+PORTREVISION=	11
> CATEGORIES=	www ipv6
> MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-0.2.6c
> 
>Index: www/tntnet/Makefile
>===================================================================
>--- www/tntnet/Makefile	(revision 411799)
>+++ www/tntnet/Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	tntnet
> PORTVERSION=	2.2.1
>-PORTREVISION=	4
>+PORTREVISION=	5
> CATEGORIES=	www devel
> MASTER_SITES=	http://www.tntnet.org/download/
> 
>Index: www/webkit2-gtk3/Makefile
>===================================================================
>--- www/webkit2-gtk3/Makefile	(revision 411799)
>+++ www/webkit2-gtk3/Makefile	(working copy)
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	webkit
> PORTVERSION=	2.8.5
>+PORTREVISION=	1
> CATEGORIES=	www
> MASTER_SITES=	http://webkitgtk.org/releases/
> PKGNAMESUFFIX=	2-gtk3
>Index: www/wwwoffle/Makefile
>===================================================================
>--- www/wwwoffle/Makefile	(revision 411799)
>+++ www/wwwoffle/Makefile	(working copy)
>@@ -2,7 +2,7 @@
> 
> PORTNAME=	wwwoffle
> PORTVERSION=	2.9i
>-PORTREVISION=	3
>+PORTREVISION=	4
> CATEGORIES=	www ipv6
> MASTER_SITES=	http://www.gedanken.org.uk/software/wwwoffle/download/
> 
>Index: www/xombrero/Makefile
>===================================================================
>--- www/xombrero/Makefile	(revision 411799)
>+++ www/xombrero/Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	xombrero
> PORTVERSION=	1.6.3
>-PORTREVISION=	2
>+PORTREVISION=	3
> CATEGORIES=	www
> MASTER_SITES=	https://opensource.conformal.com/snapshots/xombrero/
> 
>Index: x11/gnome-terminal/Makefile
>===================================================================
>--- x11/gnome-terminal/Makefile	(revision 411799)
>+++ x11/gnome-terminal/Makefile	(working copy)
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	gnome-terminal
> PORTVERSION=	3.18.1
>+PORTREVISION=	1
> CATEGORIES=	x11 gnome
> MASTER_SITES=	GNOME
> DIST_SUBDIR=	gnome3
>Index: x11/sakura/Makefile
>===================================================================
>--- x11/sakura/Makefile	(revision 411799)
>+++ x11/sakura/Makefile	(working copy)
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	sakura
> PORTVERSION=	3.3.4
>+PORTREVISION=	1
> CATEGORIES=	x11 gnome
> MASTER_SITES=	http://launchpadlibrarian.net/235602098/
> 
>Index: x11-toolkits/gnustep-gui/Makefile
>===================================================================
>--- x11-toolkits/gnustep-gui/Makefile	(revision 411799)
>+++ x11-toolkits/gnustep-gui/Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	gnustep-gui
> PORTVERSION=	0.24.1
>-PORTREVISION=	2
>+PORTREVISION=	3
> CATEGORIES=	x11-toolkits gnustep
> MASTER_SITES=	GNUSTEP/core
> 
>Index: x11-toolkits/gtk20/Makefile
>===================================================================
>--- x11-toolkits/gtk20/Makefile	(revision 411799)
>+++ x11-toolkits/gtk20/Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	gtk
> PORTVERSION=	2.24.29
>-PORTREVISION?=	1
>+PORTREVISION?=	2
> CATEGORIES=	x11-toolkits
> MASTER_SITES=	GNOME/sources/gtk+/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
> PKGNAMESUFFIX=	2
>Index: x11-toolkits/gtk30/Makefile
>===================================================================
>--- x11-toolkits/gtk30/Makefile	(revision 411799)
>+++ x11-toolkits/gtk30/Makefile	(working copy)
>@@ -5,7 +5,7 @@
> 
> PORTNAME=	gtk
> PORTVERSION=	3.18.8
>-PORTREVISION?=	1
>+PORTREVISION?=	3
> CATEGORIES=	x11-toolkits
> MASTER_SITES=	GNOME/sources/gtk+/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
> PKGNAMESUFFIX=	3
>Index: x11-toolkits/nucleo/Makefile
>===================================================================
>--- x11-toolkits/nucleo/Makefile	(revision 411799)
>+++ x11-toolkits/nucleo/Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	nucleo
> PORTVERSION=	0.7.6
>-PORTREVISION=	12
>+PORTREVISION=	13
> CATEGORIES=	x11-toolkits
> MASTER_SITES=	http://insitu.lri.fr/metisse/download/nucleo/
> 
>Index: x11-toolkits/vte3/Makefile
>===================================================================
>--- x11-toolkits/vte3/Makefile	(revision 411799)
>+++ x11-toolkits/vte3/Makefile	(working copy)
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	vte
> PORTVERSION=	0.42.4
>+PORTREVISION=	1
> CATEGORIES=	x11-toolkits gnome
> MASTER_SITES=	GNOME
> PKGNAMESUFFIX=	3

Actions: View | Diff

Attachments on bug 207768: 167795 | 168017 | 168018 | 168575 | 168606