svn commit: r411990 - in head: audio/ario audio/pianobar audio/tomahawk benchmarks/postal databases/freetds databases/freetds-devel databases/glom deskutils/fusenshi deskutils/fusenshi/files deskut...

Sun Mar 27 14:58:09 UTC 2016

Author: tijl
Date: Sun Mar 27 14:57:59 2016
New Revision: 411990
URL: https://svnweb.freebsd.org/changeset/ports/411990

Log:
  - Update security/gnutls to 3.4.10.
  - Rename the LIBDANE option DANE because that's the name of the protocol
    supported by libgnutls-dane and gnutls-cli.  Also clarify the option
    description.
  - Add an IDN option.
  - libgnutls-openssl has been removed in 3.4.  Some ports used this library
    in their LIB_DEPENDS but no port actually required it.
  - Some old API functions have been removed.  Ports that used these have been
    updated or patched to use the new API.
  - Add a patch to print/cups to prevent overlinking of libgnutls.so.
  - Bump PORTREVISION on dependent ports.
  
  net-im/jabber: This port used the old API to give users fine grained
  control over which crypto algorithms were used via a configuration file.
  It's not immediately obvious how to port this to the new API so the port
  always uses the defaults now.
  
  www/hydra: Mark BROKEN.  This uses more removed calls than the other ports,
  is said to be alpha quality and not fully functional and has been abandoned
  10 years ago.
  
  PR:		207768
  Exp-run by:	antoine
  Approved by:	portmgr (antoine)

Added:
  head/deskutils/fusenshi/files/patch-src_net_fusenshisslclientsocket.cpp   (contents, props changed)
  head/deskutils/fusenshi/files/patch-src_net_fusenshisslserversocket.cpp   (contents, props changed)
  head/devel/gwenhywfar/files/patch-src-sio-syncio_tls.c   (contents, props changed)
  head/editors/abiword/files/patch-plugins_collab_backends_service_xp_tls_tunnel.cpp   (contents, props changed)
  head/ftp/wzdftpd/files/patch-libwzd-core_wzd_tls.c   (contents, props changed)
  head/net/net6/files/patch-src-encrypt.cpp   (contents, props changed)
  head/net/sixxs-aiccu/files/patch-common-common.c   (contents, props changed)
  head/print/cups/files/patch-cups-config.in   (contents, props changed)
  head/security/gnutls/files/patch-configure   (contents, props changed)
  head/security/gnutls/files/patch-lib-tpm.c   (contents, props changed)
  head/sysutils/heartbeat/files/patch-crm-cib-remote.c   (contents, props changed)
  head/sysutils/heartbeat/files/patch-lib-mgmt-mgmt_tls_lib.c   (contents, props changed)
  head/textproc/iksemel/files/patch-src-stream.c   (contents, props changed)
Deleted:
  head/net-im/loudmouth/files/
  head/security/gnutls/files/patch-lib__x509__rfc2818_hostname.c
  head/security/libprelude/files/
  head/security/libpreludedb/files/patch-Makefile.in
Modified:
  head/audio/ario/Makefile
  head/audio/pianobar/Makefile
  head/audio/tomahawk/Makefile
  head/benchmarks/postal/Makefile
  head/databases/freetds-devel/Makefile
  head/databases/freetds/Makefile
  head/databases/glom/Makefile
  head/deskutils/fusenshi/Makefile
  head/deskutils/taskd/Makefile
  head/deskutils/taskwarrior/Makefile
  head/devel/anjuta/Makefile
  head/devel/gsoap/Makefile
  head/devel/gwenhywfar/Makefile
  head/devel/hs-git-annex/Makefile
  head/devel/librelp/Makefile
  head/devel/libvirt/Makefile
  head/dns/knot2/Makefile
  head/editors/abiword/Makefile
  head/editors/emacs-devel/Makefile
  head/editors/emacs/Makefile
  head/editors/vanubi/Makefile
  head/emulators/qemu-devel/Makefile
  head/emulators/qemu-sbruno/Makefile
  head/emulators/qemu/Makefile
  head/emulators/wine-devel/Makefile
  head/emulators/wine/Makefile
  head/ftp/curl/Makefile
  head/ftp/filezilla/Makefile
  head/ftp/lftp/Makefile
  head/ftp/wget/Makefile
  head/ftp/wput/Makefile
  head/ftp/wzdftpd/Makefile
  head/games/libggz/Makefile
  head/games/macopix/Makefile
  head/games/pokerth/Makefile
  head/graphics/gnome-color-manager/Makefile
  head/irc/anope/Makefile
  head/irc/bitlbee/Makefile
  head/irc/ctrlproxy/Makefile
  head/irc/inspircd/Makefile
  head/irc/minbif/Makefile
  head/irc/ngircd/Makefile
  head/irc/scrollz/Makefile
  head/irc/weechat/Makefile
  head/japanese/jd/Makefile
  head/lang/gnustep-base/Makefile
  head/mail/anubis/Makefile
  head/mail/courier-imap/Makefile
  head/mail/exim/Makefile
  head/mail/libetpan/Makefile
  head/mail/libvmime/Makefile
  head/mail/mpop/Makefile
  head/mail/msmtp/Makefile
  head/mail/nullmailer/Makefile
  head/mail/opendkim/Makefile
  head/mail/wmbiff/Makefile
  head/mail/xfce4-mailwatch-plugin/Makefile
  head/multimedia/ffmpeg/Makefile
  head/multimedia/kodi/Makefile
  head/multimedia/libav/Makefile
  head/multimedia/mencoder/Makefile
  head/multimedia/mplayer/Makefile
  head/multimedia/vlc/Makefile
  head/net-im/climm/Makefile
  head/net-im/empathy/Makefile
  head/net-im/gloox/Makefile
  head/net-im/jabber/Makefile
  head/net-im/jabber/files/patch-jabberd-mio_tls.cc
  head/net-im/libpurple/Makefile
  head/net-im/licq-jabber/Makefile
  head/net-im/loudmouth/Makefile
  head/net-im/loudmouth/distinfo
  head/net-im/loudmouth/pkg-descr
  head/net-im/loudmouth/pkg-plist
  head/net-im/telepathy-gabble/Makefile
  head/net-im/telepathy-salut/Makefile
  head/net-p2p/gnunet/Makefile
  head/net-p2p/gtk-gnutella/Makefile
  head/net-p2p/ncdc/Makefile
  head/net/csync2/Makefile
  head/net/glib-networking/Makefile
  head/net/gtk-vnc/Makefile
  head/net/hs-network-protocol-xmpp/Makefile
  head/net/libvncserver/Makefile
  head/net/morebalance/Makefile
  head/net/net6/Makefile
  head/net/ocserv/Makefile
  head/net/remmina-plugin-vnc/Makefile
  head/net/samba41/Makefile
  head/net/samba42/Makefile
  head/net/samba43/Makefile
  head/net/sixxs-aiccu/Makefile
  head/net/tigervnc/Makefile
  head/net/uget/Makefile
  head/net/vinagre/Makefile
  head/net/vino/Makefile
  head/net/wireshark/Makefile
  head/news/nzbget/Makefile
  head/polish/ekg2/Makefile
  head/print/cups-bjnp/Makefile
  head/print/cups-filters/Makefile
  head/print/cups/Makefile
  head/print/ghostscript8-base/Makefile
  head/print/ghostscript9-agpl-base/Makefile
  head/print/ghostscript9-base/Makefile
  head/print/gnome-cups-manager/Makefile
  head/print/gtklp/Makefile
  head/print/gutenprint-cups/Makefile
  head/print/gutenprint-foomatic/Makefile
  head/print/gutenprint-ijs/Makefile
  head/print/libgnomecups/Makefile
  head/print/libgnomeprint/Makefile
  head/print/p5-Net-CUPS/Makefile
  head/print/qpdfview/Makefile
  head/print/splix/Makefile
  head/security/gnomint/Makefile
  head/security/gnupg/Makefile
  head/security/gnutls/Makefile
  head/security/gnutls/distinfo
  head/security/gnutls/pkg-plist
  head/security/gsasl/Makefile
  head/security/hs-gnutls/Makefile
  head/security/libprelude/Makefile
  head/security/libprelude/distinfo
  head/security/libprelude/pkg-descr
  head/security/libprelude/pkg-plist
  head/security/libpreludedb/Makefile
  head/security/libpreludedb/distinfo
  head/security/libpreludedb/pkg-descr
  head/security/libpreludedb/pkg-plist
  head/security/openconnect/Makefile
  head/security/openvas-cli/Makefile
  head/security/openvas-libraries/Makefile
  head/security/openvas-manager/Makefile
  head/security/py-gnutls/Makefile
  head/security/shishi/Makefile
  head/security/suricata/Makefile
  head/security/xmlsec1/Makefile
  head/sysutils/cinnamon-settings-daemon/Makefile
  head/sysutils/gkrellm2/Makefile
  head/sysutils/gnome-control-center/Makefile
  head/sysutils/gnome-settings-daemon/Makefile
  head/sysutils/heartbeat/Makefile
  head/sysutils/heartbeat/files/patch-lib__plugins__quorum__quorumd.c
  head/sysutils/heartbeat/files/patch-membership__quorumd__quorumdtest.c
  head/sysutils/rsyslog7/Makefile
  head/sysutils/rsyslog8/Makefile
  head/textproc/iksemel/Makefile
  head/www/aws/Makefile
  head/www/gurlchecker/Makefile
  head/www/hydra/Makefile
  head/www/libepc/Makefile
  head/www/libmicrohttpd/Makefile
  head/www/ocaml-net/Makefile
  head/www/retawq/Makefile
  head/www/tntnet/Makefile
  head/www/webkit2-gtk3/Makefile
  head/www/wwwoffle/Makefile
  head/www/xombrero/Makefile
  head/x11-toolkits/gnustep-gui/Makefile
  head/x11-toolkits/gtk20/Makefile
  head/x11-toolkits/gtk30/Makefile
  head/x11-toolkits/nucleo/Makefile
  head/x11-toolkits/vte3/Makefile
  head/x11/gnome-terminal/Makefile
  head/x11/sakura/Makefile

Modified: head/audio/ario/Makefile
==============================================================================

--- head/audio/ario/Makefile	Sun Mar 27 14:49:45 2016	(r411989)
+++ head/audio/ario/Makefile	Sun Mar 27 14:57:59 2016	(r411990)
@@ -3,7 +3,7 @@
 
 PORTNAME=	ario
 PORTVERSION=	1.5.1
-PORTREVISION=	10
+PORTREVISION=	11
 CATEGORIES=	audio
 MASTER_SITES=	SF/ario-player/ario-player/${PORTVERSION}
 

Modified: head/audio/pianobar/Makefile
==============================================================================
--- head/audio/pianobar/Makefile	Sun Mar 27 14:49:45 2016	(r411989)
+++ head/audio/pianobar/Makefile	Sun Mar 27 14:57:59 2016	(r411990)
@@ -3,7 +3,7 @@
 
 PORTNAME=	pianobar
 PORTVERSION=	2015.11.22
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	http://6xq.net/projects/${PORTNAME}/
 

Modified: head/audio/tomahawk/Makefile
==============================================================================
--- head/audio/tomahawk/Makefile	Sun Mar 27 14:49:45 2016	(r411989)
+++ head/audio/tomahawk/Makefile	Sun Mar 27 14:57:59 2016	(r411990)
@@ -3,6 +3,7 @@
 
 PORTNAME=	tomahawk
 PORTVERSION=	0.8.4
+PORTREVISION=	1
 CATEGORIES=	audio
 
 MAINTAINER=	ports at FreeBSD.org

Modified: head/benchmarks/postal/Makefile
==============================================================================
--- head/benchmarks/postal/Makefile	Sun Mar 27 14:49:45 2016	(r411989)
+++ head/benchmarks/postal/Makefile	Sun Mar 27 14:57:59 2016	(r411990)
@@ -3,7 +3,7 @@
 
 PORTNAME=	postal
 PORTVERSION=	0.73
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	benchmarks mail
 MASTER_SITES=	http://www.coker.com.au/postal/
 

Modified: head/databases/freetds-devel/Makefile
==============================================================================
--- head/databases/freetds-devel/Makefile	Sun Mar 27 14:49:45 2016	(r411989)
+++ head/databases/freetds-devel/Makefile	Sun Mar 27 14:57:59 2016	(r411990)
@@ -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/

Modified: head/databases/freetds/Makefile
==============================================================================
--- head/databases/freetds/Makefile	Sun Mar 27 14:49:45 2016	(r411989)
+++ head/databases/freetds/Makefile	Sun Mar 27 14:57:59 2016	(r411990)
@@ -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/

Modified: head/databases/glom/Makefile
==============================================================================
--- head/databases/glom/Makefile	Sun Mar 27 14:49:45 2016	(r411989)
+++ head/databases/glom/Makefile	Sun Mar 27 14:57:59 2016	(r411990)
@@ -3,7 +3,7 @@
 
 PORTNAME=	glom
 PORTVERSION=	1.28.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	databases gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3

Modified: head/deskutils/fusenshi/Makefile
==============================================================================
--- head/deskutils/fusenshi/Makefile	Sun Mar 27 14:49:45 2016	(r411989)
+++ head/deskutils/fusenshi/Makefile	Sun Mar 27 14:57:59 2016	(r411990)
@@ -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/
 

Added: head/deskutils/fusenshi/files/patch-src_net_fusenshisslclientsocket.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/deskutils/fusenshi/files/patch-src_net_fusenshisslclientsocket.cpp	Sun Mar 27 14:57:59 2016	(r411990)
@@ -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);
+ 		

Added: head/deskutils/fusenshi/files/patch-src_net_fusenshisslserversocket.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/deskutils/fusenshi/files/patch-src_net_fusenshisslserversocket.cpp	Sun Mar 27 14:57:59 2016	(r411990)
@@ -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);

Modified: head/deskutils/taskd/Makefile
==============================================================================
--- head/deskutils/taskd/Makefile	Sun Mar 27 14:49:45 2016	(r411989)
+++ head/deskutils/taskd/Makefile	Sun Mar 27 14:57:59 2016	(r411990)
@@ -3,7 +3,7 @@
 
 PORTNAME=	taskd
 PORTVERSION=	1.1.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	deskutils
 MASTER_SITES=	http://taskwarrior.org/download/
 

Modified: head/deskutils/taskwarrior/Makefile
==============================================================================
--- head/deskutils/taskwarrior/Makefile	Sun Mar 27 14:49:45 2016	(r411989)
+++ head/deskutils/taskwarrior/Makefile	Sun Mar 27 14:57:59 2016	(r411990)
@@ -3,6 +3,7 @@
 
 PORTNAME=	taskwarrior
 PORTVERSION=	2.5.0
+PORTREVISION=	1
 CATEGORIES=	deskutils
 DISTNAME=	task-${PORTVERSION}
 

Modified: head/devel/anjuta/Makefile
==============================================================================
--- head/devel/anjuta/Makefile	Sun Mar 27 14:49:45 2016	(r411989)
+++ head/devel/anjuta/Makefile	Sun Mar 27 14:57:59 2016	(r411990)
@@ -3,6 +3,7 @@
 
 PORTNAME=	anjuta
 PORTVERSION=	3.18.2
+PORTREVISION=	1
 CATEGORIES=	devel gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3

Modified: head/devel/gsoap/Makefile
==============================================================================
--- head/devel/gsoap/Makefile	Sun Mar 27 14:49:45 2016	(r411989)
+++ head/devel/gsoap/Makefile	Sun Mar 27 14:57:59 2016	(r411990)
@@ -3,6 +3,7 @@
 
 PORTNAME=	gsoap
 PORTVERSION=	2.8.27
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	SF/${PORTNAME}2/gSOAP
 DISTNAME=	${PORTNAME}_${PORTVERSION}

Modified: head/devel/gwenhywfar/Makefile
==============================================================================
--- head/devel/gwenhywfar/Makefile	Sun Mar 27 14:49:45 2016	(r411989)
+++ head/devel/gwenhywfar/Makefile	Sun Mar 27 14:57:59 2016	(r411990)
@@ -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=/
 

Added: head/devel/gwenhywfar/files/patch-src-sio-syncio_tls.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/gwenhywfar/files/patch-src-sio-syncio_tls.c	Sun Mar 27 14:57:59 2016	(r411990)
@@ -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;
+     }

Modified: head/devel/hs-git-annex/Makefile
==============================================================================
--- head/devel/hs-git-annex/Makefile	Sun Mar 27 14:49:45 2016	(r411989)
+++ head/devel/hs-git-annex/Makefile	Sun Mar 27 14:57:59 2016	(r411990)
@@ -3,6 +3,7 @@
 
 PORTNAME=	git-annex
 PORTVERSION=	5.20150727
+PORTREVISION=	1
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell at FreeBSD.org

Modified: head/devel/librelp/Makefile
==============================================================================
--- head/devel/librelp/Makefile	Sun Mar 27 14:49:45 2016	(r411989)
+++ head/devel/librelp/Makefile	Sun Mar 27 14:57:59 2016	(r411990)
@@ -3,6 +3,7 @@
 
 PORTNAME=	librelp
 PORTVERSION=	1.2.9
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	http://download.rsyslog.com/librelp/
 

Modified: head/devel/libvirt/Makefile
==============================================================================
--- head/devel/libvirt/Makefile	Sun Mar 27 14:49:45 2016	(r411989)
+++ head/devel/libvirt/Makefile	Sun Mar 27 14:57:59 2016	(r411990)
@@ -3,6 +3,7 @@
 
 PORTNAME=	libvirt
 PORTVERSION=	1.3.2
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	http://libvirt.org/sources/ \
 		ftp://libvirt.org/libvirt/

Modified: head/dns/knot2/Makefile
==============================================================================
--- head/dns/knot2/Makefile	Sun Mar 27 14:49:45 2016	(r411989)
+++ head/dns/knot2/Makefile	Sun Mar 27 14:57:59 2016	(r411990)
@@ -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/

Modified: head/editors/abiword/Makefile
==============================================================================
--- head/editors/abiword/Makefile	Sun Mar 27 14:49:45 2016	(r411989)
+++ head/editors/abiword/Makefile	Sun Mar 27 14:57:59 2016	(r411990)
@@ -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

Added: head/editors/abiword/files/patch-plugins_collab_backends_service_xp_tls_tunnel.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/editors/abiword/files/patch-plugins_collab_backends_service_xp_tls_tunnel.cpp	Sun Mar 27 14:57:59 2016	(r411990)
@@ -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

Modified: head/editors/emacs-devel/Makefile
==============================================================================
--- head/editors/emacs-devel/Makefile	Sun Mar 27 14:49:45 2016	(r411989)
+++ head/editors/emacs-devel/Makefile	Sun Mar 27 14:57:59 2016	(r411990)
@@ -3,6 +3,7 @@
 
 PORTNAME=	emacs
 PORTVERSION=	${EMACS_VER}
+PORTREVISION=	1
 PORTEPOCH=	2
 CATEGORIES=	editors ipv6
 MASTER_SITES=	GNU_ALPHA/emacs/pretest

Modified: head/editors/emacs/Makefile
==============================================================================
--- head/editors/emacs/Makefile	Sun Mar 27 14:49:45 2016	(r411989)
+++ head/editors/emacs/Makefile	Sun Mar 27 14:57:59 2016	(r411990)
@@ -3,7 +3,7 @@
 
 PORTNAME=	emacs
 PORTVERSION=	${EMACS_VER}
-PORTREVISION=	2
+PORTREVISION=	3
 PORTEPOCH=	3
 CATEGORIES=	editors ipv6
 MASTER_SITES=	GNU

Modified: head/editors/vanubi/Makefile
==============================================================================
--- head/editors/vanubi/Makefile	Sun Mar 27 14:49:45 2016	(r411989)
+++ head/editors/vanubi/Makefile	Sun Mar 27 14:57:59 2016	(r411990)
@@ -4,6 +4,7 @@
 PORTNAME=	vanubi
 PORTVERSION=	0.0.16
 DISTVERSIONPREFIX=	v
+PORTREVISION=	1
 CATEGORIES=	editors
 
 MAINTAINER=	olivierd at FreeBSD.org

Modified: head/emulators/qemu-devel/Makefile
==============================================================================
--- head/emulators/qemu-devel/Makefile	Sun Mar 27 14:49:45 2016	(r411989)
+++ head/emulators/qemu-devel/Makefile	Sun Mar 27 14:57:59 2016	(r411990)
@@ -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

Modified: head/emulators/qemu-sbruno/Makefile
==============================================================================
--- head/emulators/qemu-sbruno/Makefile	Sun Mar 27 14:49:45 2016	(r411989)
+++ head/emulators/qemu-sbruno/Makefile	Sun Mar 27 14:57:59 2016	(r411990)
@@ -3,7 +3,7 @@
 
 PORTNAME=	qemu
 PORTVERSION=	2.5.50.g20160215
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	emulators
 MASTER_SITES=	GH \
 		LOCAL/nox:dtc \

Modified: head/emulators/qemu/Makefile
==============================================================================
--- head/emulators/qemu/Makefile	Sun Mar 27 14:49:45 2016	(r411989)
+++ head/emulators/qemu/Makefile	Sun Mar 27 14:57:59 2016	(r411990)
@@ -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}

Modified: head/emulators/wine-devel/Makefile
==============================================================================
--- head/emulators/wine-devel/Makefile	Sun Mar 27 14:49:45 2016	(r411989)
+++ head/emulators/wine-devel/Makefile	Sun Mar 27 14:57:59 2016	(r411990)
@@ -3,6 +3,7 @@
 
 PORTNAME=	wine
 DISTVERSION=	1.9.6
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	emulators
 MASTER_SITES=	SF/${PORTNAME}/Source \

Modified: head/emulators/wine/Makefile
==============================================================================
--- head/emulators/wine/Makefile	Sun Mar 27 14:49:45 2016	(r411989)
+++ head/emulators/wine/Makefile	Sun Mar 27 14:57:59 2016	(r411990)
@@ -3,7 +3,7 @@
 
 PORTNAME=	wine
 DISTVERSION=	1.8.1
-PORTREVISION=	2
+PORTREVISION=	3
 PORTEPOCH=	1
 CATEGORIES=	emulators
 MASTER_SITES=	SF/${PORTNAME}/Source \

Modified: head/ftp/curl/Makefile
==============================================================================
--- head/ftp/curl/Makefile	Sun Mar 27 14:49:45 2016	(r411989)
+++ head/ftp/curl/Makefile	Sun Mar 27 14:57:59 2016	(r411990)
@@ -3,6 +3,7 @@
 
 PORTNAME=	curl
 PORTVERSION=	7.48.0
+PORTREVISION=	1
 CATEGORIES=	ftp www
 MASTER_SITES=	http://curl.haxx.se/download/ \
 		LOCAL/sunpoet

Modified: head/ftp/filezilla/Makefile
==============================================================================
--- head/ftp/filezilla/Makefile	Sun Mar 27 14:49:45 2016	(r411989)
+++ head/ftp/filezilla/Makefile	Sun Mar 27 14:57:59 2016	(r411990)
@@ -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

Modified: head/ftp/lftp/Makefile
==============================================================================
--- head/ftp/lftp/Makefile	Sun Mar 27 14:49:45 2016	(r411989)
+++ head/ftp/lftp/Makefile	Sun Mar 27 14:57:59 2016	(r411990)
@@ -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/ \

Modified: head/ftp/wget/Makefile
==============================================================================
--- head/ftp/wget/Makefile	Sun Mar 27 14:49:45 2016	(r411989)
+++ head/ftp/wget/Makefile	Sun Mar 27 14:57:59 2016	(r411990)
@@ -3,6 +3,7 @@
 
 PORTNAME=	wget
 DISTVERSION=	1.16.3
+PORTREVISION=	1
 CATEGORIES=	ftp www ipv6
 MASTER_SITES=	GNU
 

Modified: head/ftp/wput/Makefile
==============================================================================
--- head/ftp/wput/Makefile	Sun Mar 27 14:49:45 2016	(r411989)
+++ head/ftp/wput/Makefile	Sun Mar 27 14:57:59 2016	(r411990)
@@ -3,7 +3,7 @@
 
 PORTNAME=	wput
 PORTVERSION=	0.6.2
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	ftp
 MASTER_SITES=	SF
 

Modified: head/ftp/wzdftpd/Makefile
==============================================================================
--- head/ftp/wzdftpd/Makefile	Sun Mar 27 14:49:45 2016	(r411989)
+++ head/ftp/wzdftpd/Makefile	Sun Mar 27 14:57:59 2016	(r411990)
@@ -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}
 

Added: head/ftp/wzdftpd/files/patch-libwzd-core_wzd_tls.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/ftp/wzdftpd/files/patch-libwzd-core_wzd_tls.c	Sun Mar 27 14:57:59 2016	(r411990)
@@ -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))

Modified: head/games/libggz/Makefile
==============================================================================
--- head/games/libggz/Makefile	Sun Mar 27 14:49:45 2016	(r411989)
+++ head/games/libggz/Makefile	Sun Mar 27 14:57:59 2016	(r411990)
@@ -3,7 +3,7 @@
 
 PORTNAME=	libggz
 PORTVERSION=	${GGZ_VERSION}
-PORTREVISION=	16
+PORTREVISION=	17
 CATEGORIES=	games
 
 MAINTAINER=	ports at FreeBSD.org

Modified: head/games/macopix/Makefile
==============================================================================
--- head/games/macopix/Makefile	Sun Mar 27 14:49:45 2016	(r411989)
+++ head/games/macopix/Makefile	Sun Mar 27 14:57:59 2016	(r411990)
@@ -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}

Modified: head/games/pokerth/Makefile
==============================================================================
--- head/games/pokerth/Makefile	Sun Mar 27 14:49:45 2016	(r411989)
+++ head/games/pokerth/Makefile	Sun Mar 27 14:57:59 2016	(r411990)
@@ -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

Modified: head/graphics/gnome-color-manager/Makefile
==============================================================================
--- head/graphics/gnome-color-manager/Makefile	Sun Mar 27 14:49:45 2016	(r411989)
+++ head/graphics/gnome-color-manager/Makefile	Sun Mar 27 14:57:59 2016	(r411990)
@@ -3,6 +3,7 @@
 
 PORTNAME=	gnome-color-manager
 PORTVERSION=	3.18.0
+PORTREVISION=	1
 CATEGORIES=	graphics gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3

Modified: head/irc/anope/Makefile
==============================================================================
--- head/irc/anope/Makefile	Sun Mar 27 14:49:45 2016	(r411989)
+++ head/irc/anope/Makefile	Sun Mar 27 14:57:59 2016	(r411990)
@@ -3,7 +3,7 @@
 
 PORTNAME=	anope
 PORTVERSION=	2.0.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	irc
 
 MAINTAINER=	feld at FreeBSD.org

Modified: head/irc/bitlbee/Makefile
==============================================================================
--- head/irc/bitlbee/Makefile	Sun Mar 27 14:49:45 2016	(r411989)
+++ head/irc/bitlbee/Makefile	Sun Mar 27 14:57:59 2016	(r411990)
@@ -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

Modified: head/irc/ctrlproxy/Makefile
==============================================================================
--- head/irc/ctrlproxy/Makefile	Sun Mar 27 14:49:45 2016	(r411989)
+++ head/irc/ctrlproxy/Makefile	Sun Mar 27 14:57:59 2016	(r411990)
@@ -3,7 +3,7 @@
 
 PORTNAME=	ctrlproxy
 PORTVERSION=	3.0.8
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	irc
 MASTER_SITES=	http://launchpadlibrarian.net/50016234/ \
 		LOCAL/ashish/

Modified: head/irc/inspircd/Makefile
==============================================================================
--- head/irc/inspircd/Makefile	Sun Mar 27 14:49:45 2016	(r411989)
+++ head/irc/inspircd/Makefile	Sun Mar 27 14:57:59 2016	(r411990)
@@ -4,7 +4,7 @@
 PORTNAME=	inspircd
 PORTVERSION=	2.0.20
 DISTVERSIONPREFIX=	v
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	irc
 
 MAINTAINER=	feld at FreeBSD.org

Modified: head/irc/minbif/Makefile
==============================================================================
--- head/irc/minbif/Makefile	Sun Mar 27 14:49:45 2016	(r411989)
+++ head/irc/minbif/Makefile	Sun Mar 27 14:57:59 2016	(r411990)
@@ -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/
 

Modified: head/irc/ngircd/Makefile
==============================================================================
--- head/irc/ngircd/Makefile	Sun Mar 27 14:49:45 2016	(r411989)
+++ head/irc/ngircd/Makefile	Sun Mar 27 14:57:59 2016	(r411990)
@@ -3,6 +3,7 @@
 
 PORTNAME=	ngircd
 PORTVERSION=	23
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	irc ipv6
 MASTER_SITES=	http://arthur.barton.de/pub/${PORTNAME}/ \

Modified: head/irc/scrollz/Makefile
==============================================================================
--- head/irc/scrollz/Makefile	Sun Mar 27 14:49:45 2016	(r411989)
+++ head/irc/scrollz/Makefile	Sun Mar 27 14:57:59 2016	(r411990)
@@ -4,6 +4,7 @@
 PORTNAME=	ScrollZ
 PORTVERSION=	2.3
 DISTVERSIONPREFIX=	${PORTNAME}-
+PORTREVISION=	1
 CATEGORIES=	irc ipv6
 
 MAINTAINER=	freebsd at bitchx.org

Modified: head/irc/weechat/Makefile
==============================================================================
--- head/irc/weechat/Makefile	Sun Mar 27 14:49:45 2016	(r411989)
+++ head/irc/weechat/Makefile	Sun Mar 27 14:57:59 2016	(r411990)
@@ -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} \

Modified: head/japanese/jd/Makefile
==============================================================================
--- head/japanese/jd/Makefile	Sun Mar 27 14:49:45 2016	(r411989)
+++ head/japanese/jd/Makefile	Sun Mar 27 14:57:59 2016	(r411990)
@@ -4,6 +4,7 @@
 PORTNAME=	jd
 PORTVERSION=	2.8.9
 DISTVERSIONSUFFIX=	-150226
+PORTREVISION=	1
 CATEGORIES=	japanese www
 MASTER_SITES=	SFJP/jd4linux/62877
 

Modified: head/lang/gnustep-base/Makefile
==============================================================================
--- head/lang/gnustep-base/Makefile	Sun Mar 27 14:49:45 2016	(r411989)
+++ head/lang/gnustep-base/Makefile	Sun Mar 27 14:57:59 2016	(r411990)
@@ -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

Modified: head/mail/anubis/Makefile
==============================================================================
--- head/mail/anubis/Makefile	Sun Mar 27 14:49:45 2016	(r411989)
+++ head/mail/anubis/Makefile	Sun Mar 27 14:57:59 2016	(r411990)
@@ -3,7 +3,7 @@
 
 PORTNAME=	anubis
 PORTVERSION=	4.2
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	mail
 MASTER_SITES=	GNU
 

Modified: head/mail/courier-imap/Makefile
==============================================================================
--- head/mail/courier-imap/Makefile	Sun Mar 27 14:49:45 2016	(r411989)
+++ head/mail/courier-imap/Makefile	Sun Mar 27 14:57:59 2016	(r411990)
@@ -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}

Modified: head/mail/exim/Makefile
==============================================================================
--- head/mail/exim/Makefile	Sun Mar 27 14:49:45 2016	(r411989)
+++ head/mail/exim/Makefile	Sun Mar 27 14:57:59 2016	(r411990)
@@ -3,6 +3,7 @@
 
 PORTNAME=	exim
 PORTVERSION?=	${EXIM_VERSION}
+PORTREVISION=	1
 CATEGORIES=	mail ipv6
 MASTER_SITES=	EXIM/exim4/:exim
 DISTNAME=	${PORTNAME}-${EXIM_VERSION}

Modified: head/mail/libetpan/Makefile
==============================================================================
--- head/mail/libetpan/Makefile	Sun Mar 27 14:49:45 2016	(r411989)
+++ head/mail/libetpan/Makefile	Sun Mar 27 14:57:59 2016	(r411990)
@@ -3,7 +3,7 @@
 
 PORTNAME=	libetpan
 PORTVERSION=	1.6
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail ipv6
 
 MAINTAINER=	pawel at FreeBSD.org

Modified: head/mail/libvmime/Makefile
==============================================================================
--- head/mail/libvmime/Makefile	Sun Mar 27 14:49:45 2016	(r411989)
+++ head/mail/libvmime/Makefile	Sun Mar 27 14:57:59 2016	(r411990)
@@ -3,7 +3,7 @@
 
 PORTNAME=	libvmime
 PORTVERSION=	0.9.2.s20140721
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	mail
 
 MAINTAINER=	delphij at FreeBSD.org

Modified: head/mail/mpop/Makefile
==============================================================================
--- head/mail/mpop/Makefile	Sun Mar 27 14:49:45 2016	(r411989)
+++ head/mail/mpop/Makefile	Sun Mar 27 14:57:59 2016	(r411990)
@@ -3,6 +3,7 @@
 
 PORTNAME=	mpop
 DISTVERSION=	1.2.4
+PORTREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${DISTVERSION}
 

Modified: head/mail/msmtp/Makefile
==============================================================================
--- head/mail/msmtp/Makefile	Sun Mar 27 14:49:45 2016	(r411989)
+++ head/mail/msmtp/Makefile	Sun Mar 27 14:57:59 2016	(r411990)
@@ -3,6 +3,7 @@
 
 PORTNAME=	msmtp
 PORTVERSION=	1.6.4
+PORTREVISION=	1
 CATEGORIES=	mail ipv6
 MASTER_SITES=	SF
 

Modified: head/mail/nullmailer/Makefile
==============================================================================
--- head/mail/nullmailer/Makefile	Sun Mar 27 14:49:45 2016	(r411989)
+++ head/mail/nullmailer/Makefile	Sun Mar 27 14:57:59 2016	(r411990)
@@ -3,7 +3,7 @@
 
 PORTNAME=	nullmailer
 PORTVERSION=	1.13
-PORTREVISION=	2
+PORTREVISION=	3
 PORTEPOCH=	1
 CATEGORIES=	mail
 MASTER_SITES=	http://untroubled.org/nullmailer/ \

Modified: head/mail/opendkim/Makefile
==============================================================================
--- head/mail/opendkim/Makefile	Sun Mar 27 14:49:45 2016	(r411989)
+++ head/mail/opendkim/Makefile	Sun Mar 27 14:57:59 2016	(r411990)
@@ -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 \

Modified: head/mail/wmbiff/Makefile
==============================================================================
--- head/mail/wmbiff/Makefile	Sun Mar 27 14:49:45 2016	(r411989)
+++ head/mail/wmbiff/Makefile	Sun Mar 27 14:57:59 2016	(r411990)
@@ -3,7 +3,7 @@
 
 PORTNAME=	wmbiff
 PORTVERSION=	0.4.27
-PORTREVISION=	17
+PORTREVISION=	18
 CATEGORIES=	mail windowmaker afterstep
 MASTER_SITES=	SF
 

Modified: head/mail/xfce4-mailwatch-plugin/Makefile
==============================================================================
--- head/mail/xfce4-mailwatch-plugin/Makefile	Sun Mar 27 14:49:45 2016	(r411989)
+++ head/mail/xfce4-mailwatch-plugin/Makefile	Sun Mar 27 14:57:59 2016	(r411990)
@@ -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

Modified: head/multimedia/ffmpeg/Makefile
==============================================================================
--- head/multimedia/ffmpeg/Makefile	Sun Mar 27 14:49:45 2016	(r411989)
+++ head/multimedia/ffmpeg/Makefile	Sun Mar 27 14:57:59 2016	(r411990)
@@ -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/

Modified: head/multimedia/kodi/Makefile
==============================================================================
--- head/multimedia/kodi/Makefile	Sun Mar 27 14:49:45 2016	(r411989)
+++ head/multimedia/kodi/Makefile	Sun Mar 27 14:57:59 2016	(r411990)
@@ -2,7 +2,7 @@
 
 PORTNAME=	kodi
 DISTVERSION=	15.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	multimedia java
 
 MAINTAINER=	mickael.maillot at gmail.com

Modified: head/multimedia/libav/Makefile
==============================================================================
--- head/multimedia/libav/Makefile	Sun Mar 27 14:49:45 2016	(r411989)
+++ head/multimedia/libav/Makefile	Sun Mar 27 14:57:59 2016	(r411990)
@@ -2,6 +2,7 @@
 
 PORTNAME=	libav
 PORTVERSION=	11.6
+PORTREVISION=	1
 CATEGORIES=	multimedia audio ipv6 net
 MASTER_SITES=	http://libav.org/releases/
 

Modified: head/multimedia/mencoder/Makefile
==============================================================================
--- head/multimedia/mencoder/Makefile	Sun Mar 27 14:49:45 2016	(r411989)
+++ head/multimedia/mencoder/Makefile	Sun Mar 27 14:57:59 2016	(r411990)
@@ -3,6 +3,7 @@
 
 PORTNAME=	mencoder
 PORTVERSION=	${MPLAYER_PORT_VERSION}
+PORTREVISION=	1
 CATEGORIES=	multimedia audio
 
 MAINTAINER=	riggs at FreeBSD.org

Modified: head/multimedia/mplayer/Makefile
==============================================================================
--- head/multimedia/mplayer/Makefile	Sun Mar 27 14:49:45 2016	(r411989)
+++ head/multimedia/mplayer/Makefile	Sun Mar 27 14:57:59 2016	(r411990)
@@ -3,6 +3,7 @@
 
 PORTNAME=	mplayer
 PORTVERSION=	${MPLAYER_PORT_VERSION}
+PORTREVISION=	1
 CATEGORIES=	multimedia audio
 
 MAINTAINER=	riggs at FreeBSD.org

Modified: head/multimedia/vlc/Makefile
==============================================================================
--- head/multimedia/vlc/Makefile	Sun Mar 27 14:49:45 2016	(r411989)
+++ head/multimedia/vlc/Makefile	Sun Mar 27 14:57:59 2016	(r411990)
@@ -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$//}/ \

Modified: head/net-im/climm/Makefile
==============================================================================
--- head/net-im/climm/Makefile	Sun Mar 27 14:49:45 2016	(r411989)
+++ head/net-im/climm/Makefile	Sun Mar 27 14:57:59 2016	(r411990)
@@ -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/

Modified: head/net-im/empathy/Makefile
==============================================================================
--- head/net-im/empathy/Makefile	Sun Mar 27 14:49:45 2016	(r411989)
+++ head/net-im/empathy/Makefile	Sun Mar 27 14:57:59 2016	(r411990)
@@ -3,6 +3,7 @@
 
 PORTNAME=	empathy
 PORTVERSION=	3.12.11
+PORTREVISION=	1
 CATEGORIES=	net-im gnome
 MASTER_SITES=	GNOME
 

Modified: head/net-im/gloox/Makefile
==============================================================================
--- head/net-im/gloox/Makefile	Sun Mar 27 14:49:45 2016	(r411989)
+++ head/net-im/gloox/Makefile	Sun Mar 27 14:57:59 2016	(r411990)
@@ -3,6 +3,7 @@
 
 PORTNAME=	gloox
 PORTVERSION=	1.0.14
+PORTREVISION=	1
 CATEGORIES=	net-im
 MASTER_SITES=	http://camaya.net/download/
 

Modified: head/net-im/jabber/Makefile
==============================================================================
--- head/net-im/jabber/Makefile	Sun Mar 27 14:49:45 2016	(r411989)
+++ head/net-im/jabber/Makefile	Sun Mar 27 14:57:59 2016	(r411990)
@@ -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%/

Modified: head/net-im/jabber/files/patch-jabberd-mio_tls.cc
==============================================================================
--- head/net-im/jabber/files/patch-jabberd-mio_tls.cc	Sun Mar 27 14:49:45 2016	(r411989)
+++ head/net-im/jabber/files/patch-jabberd-mio_tls.cc	Sun Mar 27 14:57:59 2016	(r411990)
@@ -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));

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
