aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--MOVED1
-rw-r--r--audio/ario/Makefile2
-rw-r--r--audio/pianobar/Makefile2
-rw-r--r--benchmarks/postal/Makefile1
-rw-r--r--databases/freetds-devel/Makefile2
-rw-r--r--databases/freetds/Makefile2
-rw-r--r--deskutils/fusenshi/Makefile2
-rw-r--r--deskutils/taskd/Makefile1
-rw-r--r--deskutils/taskwarrior/Makefile1
-rw-r--r--devel/gsoap/Makefile2
-rw-r--r--devel/gwenhywfar-fox16/Makefile2
-rw-r--r--devel/gwenhywfar-gtk2/Makefile2
-rw-r--r--devel/gwenhywfar-qt4/Makefile2
-rw-r--r--devel/gwenhywfar/Makefile2
-rw-r--r--devel/librelp/Makefile1
-rw-r--r--devel/libvirt/Makefile1
-rw-r--r--editors/emacs-devel/Makefile23
-rw-r--r--editors/emacs-devel/files/patch-src_Makefile.in32
-rw-r--r--editors/emacs-nox11/Makefile2
-rw-r--r--editors/emacs/Makefile2
-rw-r--r--emulators/qemu-devel/Makefile2
-rw-r--r--emulators/qemu/Makefile2
-rw-r--r--emulators/wine-devel/Makefile1
-rw-r--r--emulators/wine/Makefile2
-rw-r--r--ftp/curl/Makefile1
-rw-r--r--ftp/filezilla/Makefile2
-rw-r--r--ftp/lftp/Makefile1
-rw-r--r--ftp/wget/Makefile1
-rw-r--r--ftp/wput/Makefile2
-rw-r--r--games/libggz/Makefile2
-rw-r--r--games/macopix/Makefile2
-rw-r--r--irc/bitlbee/Makefile1
-rw-r--r--irc/ctrlproxy/Makefile2
-rw-r--r--irc/ctrlproxy/files/patch-src_gnutls.c18
-rw-r--r--irc/minbif/Makefile2
-rw-r--r--irc/ngircd/Makefile1
-rw-r--r--irc/scrollz/Makefile1
-rw-r--r--irc/weechat-devel/Makefile2
-rw-r--r--irc/weechat/Makefile2
-rw-r--r--japanese/jd/Makefile1
-rw-r--r--lang/gnustep-base/Makefile2
-rw-r--r--mail/anubis/Makefile12
-rw-r--r--mail/anubis/distinfo4
-rw-r--r--mail/anubis/files/patch-config.h.in23
-rw-r--r--mail/anubis/files/patch-configure.ac43
-rw-r--r--mail/anubis/files/patch-src__headers.h10
-rw-r--r--mail/anubis/pkg-plist5
-rw-r--r--mail/claws-mail/Makefile1
-rw-r--r--mail/courier-imap/Makefile2
-rw-r--r--mail/exim/Makefile1
-rw-r--r--mail/libetpan/Makefile1
-rw-r--r--mail/libvmime/Makefile44
-rw-r--r--mail/libvmime/distinfo4
-rw-r--r--mail/libvmime/files/patch-cmake__FindIconv.cmake11
-rw-r--r--mail/libvmime/files/patch-configure59
-rw-r--r--mail/libvmime/files/patch-src__mailboxField.cpp11
-rw-r--r--mail/libvmime/files/patch-src__vmime__platforms__posix__posixHandler.cpp21
-rw-r--r--mail/libvmime/files/patch-vmime__base.hpp11
-rw-r--r--mail/libvmime/files/patch-vmime__utility__smartPtrInt.hpp11
-rw-r--r--mail/libvmime/pkg-plist90
-rw-r--r--mail/mpop/Makefile1
-rw-r--r--mail/msmtp/Makefile2
-rw-r--r--mail/nullmailer/Makefile1
-rw-r--r--mail/opendkim/Makefile1
-rw-r--r--mail/wmbiff/Makefile2
-rw-r--r--mail/xfce4-mailwatch-plugin/Makefile1
-rw-r--r--multimedia/ffmpeg/Makefile2
-rw-r--r--multimedia/libav/Makefile1
-rw-r--r--multimedia/vlc/Makefile6
-rw-r--r--net-im/finch/Makefile2
-rw-r--r--net-im/gloox/Makefile2
-rw-r--r--net-im/jabber.el/Makefile1
-rw-r--r--net-im/jabber/Makefile2
-rw-r--r--net-im/jabber/files/patch-configure13
-rw-r--r--net-im/jabber/files/patch-jabberd-jabberd.h14
-rw-r--r--net-im/jabber/files/patch-jabberd-mio_tls.cc28
-rw-r--r--net-im/libpurple/Makefile2
-rw-r--r--net-im/loudmouth/Makefile2
-rw-r--r--net-p2p/gtk-gnutella/Makefile2
-rw-r--r--net-p2p/ncdc/Makefile2
-rw-r--r--net/csync2/Makefile2
-rw-r--r--net/glib-networking/Makefile2
-rw-r--r--net/gtk-vnc/Makefile2
-rw-r--r--net/libgnetwork/Makefile2
-rw-r--r--net/libvncserver/Makefile2
-rw-r--r--net/morebalance/Makefile2
-rw-r--r--net/net6/Makefile2
-rw-r--r--net/remmina-plugins/Makefile2
-rw-r--r--net/samba4/Makefile2
-rw-r--r--net/samba41/Makefile2
-rw-r--r--net/sixxs-aiccu/Makefile2
-rw-r--r--net/spserver/Makefile2
-rw-r--r--net/tigervnc/Makefile2
-rw-r--r--net/vino/Makefile2
-rw-r--r--net/wireshark/Makefile1
-rw-r--r--news/nzbget/Makefile2
-rw-r--r--print/cups-base/Makefile2
-rw-r--r--security/Makefile1
-rw-r--r--security/gnomint/Makefile5
-rw-r--r--security/gnomint/files/patch-src__import.c29
-rw-r--r--security/gnutls/Makefile98
-rw-r--r--security/gnutls/distinfo4
-rw-r--r--security/gnutls/files/patch-doc-scripts-gdoc612
-rw-r--r--security/gnutls/files/patch-lib-gnutls_cipher.c11
-rw-r--r--security/gnutls/files/patch-lib-gnutls_handshake.c11
-rw-r--r--security/gnutls/files/patch-lib__x509__verify.c103
-rw-r--r--security/gnutls/pkg-descr21
-rw-r--r--security/gnutls/pkg-plist439
-rw-r--r--security/gnutls3/Makefile93
-rw-r--r--security/gnutls3/distinfo2
-rw-r--r--security/gnutls3/pkg-descr17
-rw-r--r--security/gnutls3/pkg-plist943
-rw-r--r--security/gsasl/Makefile2
-rw-r--r--security/libprelude/Makefile5
-rw-r--r--security/libpreludedb/Makefile2
-rw-r--r--security/openconnect/Makefile6
-rw-r--r--security/openvas-libnasl/Makefile2
-rw-r--r--security/openvas-libraries/Makefile2
-rw-r--r--security/openvas-libraries/files/patch-libopenvas-network.c11
-rw-r--r--security/openvas-plugins/Makefile2
-rw-r--r--security/prelude-lml/Makefile2
-rw-r--r--security/prelude-manager/Makefile2
-rw-r--r--security/py-gnutls/Makefile1
-rw-r--r--security/shishi/Makefile2
-rw-r--r--security/xmlsec1/Makefile1
-rw-r--r--sysutils/gkrellm2/Makefile2
-rw-r--r--sysutils/heartbeat/Makefile2
-rw-r--r--sysutils/heartbeat/files/patch-lib__plugins__quorum__quorumd.c32
-rw-r--r--sysutils/heartbeat/files/patch-membership__quorumd__quorumd.c34
-rw-r--r--sysutils/heartbeat/files/patch-membership__quorumd__quorumdtest.c29
-rw-r--r--sysutils/rsyslog7-devel/Makefile2
-rw-r--r--sysutils/rsyslog7/Makefile2
-rw-r--r--sysutils/rsyslog8-devel/Makefile2
-rw-r--r--sysutils/rsyslog8/Makefile2
-rw-r--r--textproc/iksemel/Makefile2
-rw-r--r--www/aws/Makefile4
-rw-r--r--www/gurlchecker/Makefile2
-rw-r--r--www/hydra/Makefile2
-rw-r--r--www/libmicrohttpd/Makefile1
-rw-r--r--www/mod_gnutls/Makefile2
-rw-r--r--www/retawq/Makefile2
-rw-r--r--www/tntnet/Makefile2
-rw-r--r--www/wwwoffle/Makefile2
-rw-r--r--www/xombrero/Makefile1
-rw-r--r--x11-toolkits/nucleo/Makefile2
145 files changed, 854 insertions, 2323 deletions
diff --git a/MOVED b/MOVED
index e3a90d7032f0..00b553dcac45 100644
--- a/MOVED
+++ b/MOVED
@@ -6267,3 +6267,4 @@ misc/bigboard||2014-07-21|Has expired: gnome-panel will be updated to the 3.x ve
net/desktop-data-model||2014-07-21|Has expired: gnome-desktop 2.x will be updated in the GNOME 3 import
net/online-desktop||2014-07-21|Has expired: Disappeared upstream, depends on expired ports
x11-toolkits/libgail-gnome||2014-07-21|Has expired: gnome-panel 2.x will be updated in the GNOME 3 import
+security/gnutls3|security/gnutls|2014-07-22|Moved to replace GnuTLS 2.x port
diff --git a/audio/ario/Makefile b/audio/ario/Makefile
index 619be0df8594..e1e53b4a7000 100644
--- a/audio/ario/Makefile
+++ b/audio/ario/Makefile
@@ -3,7 +3,7 @@
PORTNAME= ario
PORTVERSION= 1.5.1
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= audio
MASTER_SITES= SF/ario-player/ario-player/${PORTVERSION}
diff --git a/audio/pianobar/Makefile b/audio/pianobar/Makefile
index e7947ec876a9..c90b1bd7d9cc 100644
--- a/audio/pianobar/Makefile
+++ b/audio/pianobar/Makefile
@@ -3,7 +3,7 @@
PORTNAME= pianobar
PORTVERSION= 2013.09.15
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= audio
MASTER_SITES= http://6xq.net/projects/${PORTNAME}/
diff --git a/benchmarks/postal/Makefile b/benchmarks/postal/Makefile
index b0b3bb4bbb9e..89133e2699dd 100644
--- a/benchmarks/postal/Makefile
+++ b/benchmarks/postal/Makefile
@@ -3,6 +3,7 @@
PORTNAME= postal
PORTVERSION= 0.73
+PORTREVISION= 1
CATEGORIES= benchmarks mail
MASTER_SITES= http://www.coker.com.au/postal/
EXTRACT_SUFX= .tgz
diff --git a/databases/freetds-devel/Makefile b/databases/freetds-devel/Makefile
index 555f6baa6a7f..6a3dd85ef7bc 100644
--- a/databases/freetds-devel/Makefile
+++ b/databases/freetds-devel/Makefile
@@ -3,7 +3,7 @@
PORTNAME= freetds
PORTVERSION= 0.92.79
-PORTREVISION= 1
+PORTREVISION= 2
PORTEPOCH= 1
CATEGORIES= databases
MASTER_SITES= ftp://ftp.freetds.org/pub/freetds/stable/
diff --git a/databases/freetds/Makefile b/databases/freetds/Makefile
index 23239143e0cd..ee55ea4741fb 100644
--- a/databases/freetds/Makefile
+++ b/databases/freetds/Makefile
@@ -3,7 +3,7 @@
PORTNAME= freetds
PORTVERSION= 0.64
-PORTREVISION= 10
+PORTREVISION= 11
PORTEPOCH= 1
CATEGORIES= databases
MASTER_SITES= ${MASTER_SITE_SUNSITE}
diff --git a/deskutils/fusenshi/Makefile b/deskutils/fusenshi/Makefile
index 93f37516fc63..7427ec29ba0e 100644
--- a/deskutils/fusenshi/Makefile
+++ b/deskutils/fusenshi/Makefile
@@ -3,7 +3,7 @@
PORTNAME= fusenshi
PORTVERSION= 0.9.0
-PORTREVISION= 11
+PORTREVISION= 12
CATEGORIES= deskutils
MASTER_SITES= http://www.ongs.co.jp/projects/fusenshi/
EXTRACT_SUFX= .tgz
diff --git a/deskutils/taskd/Makefile b/deskutils/taskd/Makefile
index b9268d33c538..b7ee09fe720c 100644
--- a/deskutils/taskd/Makefile
+++ b/deskutils/taskd/Makefile
@@ -3,6 +3,7 @@
PORTNAME= taskd
PORTVERSION= 1.0.0
+PORTREVISION= 1
CATEGORIES= deskutils
MASTER_SITES= http://taskwarrior.org/download/
diff --git a/deskutils/taskwarrior/Makefile b/deskutils/taskwarrior/Makefile
index e70b1de76110..1f8b75dbe855 100644
--- a/deskutils/taskwarrior/Makefile
+++ b/deskutils/taskwarrior/Makefile
@@ -3,6 +3,7 @@
PORTNAME= taskwarrior
PORTVERSION= 2.3.0
+PORTREVISION= 1
CATEGORIES= deskutils
MASTER_SITES= http://taskwarrior.org/download/
DISTNAME= task-${PORTVERSION}
diff --git a/devel/gsoap/Makefile b/devel/gsoap/Makefile
index 9f33d492166d..2c937e1fdcde 100644
--- a/devel/gsoap/Makefile
+++ b/devel/gsoap/Makefile
@@ -3,7 +3,7 @@
PORTNAME= gsoap
PORTVERSION= 2.8.17
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel
MASTER_SITES= SF/${PORTNAME}2/gSOAP
DISTNAME= ${PORTNAME}_${PORTVERSION}
diff --git a/devel/gwenhywfar-fox16/Makefile b/devel/gwenhywfar-fox16/Makefile
index 254e0d53b0e6..62a36961a20b 100644
--- a/devel/gwenhywfar-fox16/Makefile
+++ b/devel/gwenhywfar-fox16/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-PORTREVISION= 4
+PORTREVISION= 5
PKGNAMESUFFIX= -${SLAVEPORT}
MAINTAINER= jhale@FreeBSD.org
diff --git a/devel/gwenhywfar-gtk2/Makefile b/devel/gwenhywfar-gtk2/Makefile
index b99b4082de84..79000071cb31 100644
--- a/devel/gwenhywfar-gtk2/Makefile
+++ b/devel/gwenhywfar-gtk2/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-PORTREVISION= 1
+PORTREVISION= 2
PKGNAMESUFFIX= -${SLAVEPORT}
MAINTAINER= jhale@FreeBSD.org
diff --git a/devel/gwenhywfar-qt4/Makefile b/devel/gwenhywfar-qt4/Makefile
index 06969d530b14..a52e0525a8f0 100644
--- a/devel/gwenhywfar-qt4/Makefile
+++ b/devel/gwenhywfar-qt4/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-PORTREVISION= 1
+PORTREVISION= 2
PKGNAMESUFFIX= -${SLAVEPORT}
MAINTAINER= jhale@FreeBSD.org
diff --git a/devel/gwenhywfar/Makefile b/devel/gwenhywfar/Makefile
index b7f5fd5d804c..c718626a2308 100644
--- a/devel/gwenhywfar/Makefile
+++ b/devel/gwenhywfar/Makefile
@@ -2,7 +2,7 @@
PORTNAME= gwenhywfar
PORTVERSION= 4.3.3
-PORTREVISION?= 5
+PORTREVISION?= 6
CATEGORIES= devel net security
MASTER_SITES= http://www.aquamaniac.de/sites/download/download.php?package=01&release=67&file=01&dummy=/
diff --git a/devel/librelp/Makefile b/devel/librelp/Makefile
index 63cce8dcce33..f7a37bfbe562 100644
--- a/devel/librelp/Makefile
+++ b/devel/librelp/Makefile
@@ -3,6 +3,7 @@
PORTNAME= librelp
PORTVERSION= 1.2.7
+PORTREVISION= 1
CATEGORIES= devel
MASTER_SITES= http://download.rsyslog.com/librelp/
diff --git a/devel/libvirt/Makefile b/devel/libvirt/Makefile
index 48183548bf37..f2824524d17e 100644
--- a/devel/libvirt/Makefile
+++ b/devel/libvirt/Makefile
@@ -3,6 +3,7 @@
PORTNAME= libvirt
PORTVERSION= 1.2.6
+PORTREVISION= 1
CATEGORIES= devel
MASTER_SITES= http://libvirt.org/sources/ \
ftp://libvirt.org/libvirt/
diff --git a/editors/emacs-devel/Makefile b/editors/emacs-devel/Makefile
index e315673ae388..805ab3fbf226 100644
--- a/editors/emacs-devel/Makefile
+++ b/editors/emacs-devel/Makefile
@@ -3,7 +3,7 @@
PORTNAME= emacs
PORTVERSION= ${EMACS_VER}.${EMACS_REV}
-PORTREVISION= 2
+PORTREVISION= 3
PORTEPOCH= 2
CATEGORIES= editors ipv6
MASTER_SITES= http://distfiles.pirateparty.in/%SUBDIR%/ \
@@ -55,7 +55,7 @@ INFO= ada-mode auth autotype bovine calc ccmode cl dbus dired-x \
OPTIONS_DEFINE= X11 ACL DBUS GCONF GIF JPEG M17N OTF PNG SOUND SOURCES SVG TIFF SCROLLBARS \
XFT XIM XML XPM MAGICK GNUTLS GSETTINGS LTO FILENOTIFY
-OPTIONS_SINGLE= X11 SOUND GNUTLS
+OPTIONS_SINGLE= X11 SOUND
ACL_DESC= ACL support
GSETTINGS_DESC= GSettings support
@@ -69,15 +69,12 @@ M17N_DESC= M17N support for text-shaping
OTF_DESC= Opentype fonts suport
FILENOTIFY_DESC= File notification support
LTO_DESC= Enable link-time optimization (requires GCC 4.6+)
-GNUTLS2_DESC= GnuTLS 2.x
-GNUTLS3_DESC= GnuTLS 3.x
OPTIONS_SINGLE_X11= GTK2 GTK3 XAW XAW3D MOTIF
OPTIONS_SINGLE_SOUND= ALSA OSS
-OPTIONS_SINGLE_GNUTLS= GNUTLS2 GNUTLS3
OPTIONS_DEFAULT=ACL DBUS GCONF GIF GTK2 JPEG M17N OTF PNG SOUND SOURCES SVG TIFF \
- SCROLLBARS XFT XIM XML XPM MAGICK GNUTLS GSETTINGS FILENOTIFY OSS X11 GNUTLS3
+ SCROLLBARS XFT XIM XML XPM MAGICK GNUTLS GSETTINGS FILENOTIFY OSS X11
OPTIONS_SUB= SOURCES
@@ -88,11 +85,9 @@ OSS_CONFIGURE_ON= --with-sound=oss
DBUS_LIB_DEPENDS= libdbus-1.so:${PORTSDIR}/devel/dbus
DBUS_CONFIGURE_WITH= dbus
+GNUTLS_LIB_DEPENDS= libgnutls.so:${PORTSDIR}/security/gnutls
GNUTLS_CONFIGURE_WITH= gnutls
-GNUTLS3_LIB_DEPENDS= libgnutls.so:${PORTSDIR}/security/gnutls3
-GNUTLS2_LIB_DEPENDS= libgnutls.so:${PORTSDIR}/security/gnutls
-
XML_USE= GNOME=libxml2
XML_CONFIGURE_WITH= xml2
@@ -216,25 +211,15 @@ LDFLAGS+= -ltinfo
BROKEN= Emacs 24.X does not currently build on ia64
.endif
-.if ${PORT_OPTIONS:MGNUTLS3}
-GNUTLS3_RPATH= -Wl,-rpath,${LOCALBASE}/lib/gnutls3
-.else
-GNUTLS3_RPATH=
-.endif
-
post-patch:
@${RM} -f ${WRKSRC}/info/*
@${REINPLACE_CMD} -e "s/%%EMACS_VER%%/${EMACS_VER}/g" -e "s/%%DATADIR%%/${DATADIR:C/\//\\\//g}/g" ${WRKSRC}/sources.el
.if empty(PORT_OPTIONS:MX11)
@${REINPLACE_CMD} -e 's/^Terminal=.*$$/Terminal=true/' ${WRKSRC}/etc/emacs.desktop
.endif
-.if ${PORT_OPTIONS:MGNUTLS3}
- @${REINPLACE_CMD} -e '/HAVE_GNUTLS3=yes/s/gnutls >=/gnutls3 >=/' ${WRKSRC}/configure.ac
-.endif
post-configure:
@${REINPLACE_CMD} -e "s/^\(DBUS_LIBS.*\)-pthread\(.*\)$$/\1$$(${DBUS_PTHREAD_LIBS})\2/" \
- -e 's|%%GNUTLS3_RPATH%%|${GNUTLS3_RPATH}|g' \
${WRKSRC}/src/Makefile
add-plist-data:
diff --git a/editors/emacs-devel/files/patch-src_Makefile.in b/editors/emacs-devel/files/patch-src_Makefile.in
deleted file mode 100644
index 6cea350f16ee..000000000000
--- a/editors/emacs-devel/files/patch-src_Makefile.in
+++ /dev/null
@@ -1,32 +0,0 @@
-
-$FreeBSD$
-
---- src/Makefile.in.orig
-+++ src/Makefile.in
-@@ -283,7 +283,7 @@
-
- LIBSELINUX_LIBS = @LIBSELINUX_LIBS@
-
--LIBGNUTLS_LIBS = @LIBGNUTLS_LIBS@
-+LIBGNUTLS_LIBS = %%GNUTLS3_RPATH%% @LIBGNUTLS_LIBS@
- LIBGNUTLS_CFLAGS = @LIBGNUTLS_CFLAGS@
-
- LIB_PTHREAD_SIGMASK = @LIB_PTHREAD_SIGMASK@
-@@ -409,7 +409,7 @@
- $(LIBXML2_LIBS) $(LIBGPM) $(LIBRESOLV) $(LIBS_SYSTEM) \
- $(LIBS_TERMCAP) $(GETLOADAVG_LIBS) $(SETTINGS_LIBS) $(LIBSELINUX_LIBS) \
- $(FREETYPE_LIBS) $(FONTCONFIG_LIBS) $(LIBOTF_LIBS) $(M17N_FLT_LIBS) \
-- $(LIBGNUTLS_LIBS) $(LIB_PTHREAD) $(LIB_PTHREAD_SIGMASK) \
-+ $(LIB_PTHREAD) $(LIB_PTHREAD_SIGMASK) \
- $(GFILENOTIFY_LIBS) $(LIB_MATH) $(LIBZ)
-
- all: emacs$(EXEEXT) $(OTHER_FILES)
-@@ -489,7 +489,7 @@
- ## to start if Vinstallation_directory has the wrong value.
- temacs$(EXEEXT): $(LIBXMENU) $(ALLOBJS) \
- $(lib)/libgnu.a $(EMACSRES)
-- $(CC) $(ALL_CFLAGS) $(TEMACS_LDFLAGS) $(LDFLAGS) \
-+ $(CC) $(ALL_CFLAGS) $(TEMACS_LDFLAGS) $(LIBGNUTLS_LIBS) $(LDFLAGS) \
- -o temacs $(ALLOBJS) $(lib)/libgnu.a $(W32_RES_LINK) $(LIBES)
- $(MKDIR_P) $(etc)
- $(TEMACS_POST_LINK)
diff --git a/editors/emacs-nox11/Makefile b/editors/emacs-nox11/Makefile
index 29342220744e..dec777dcb1ec 100644
--- a/editors/emacs-nox11/Makefile
+++ b/editors/emacs-nox11/Makefile
@@ -3,7 +3,7 @@
PKGNAMESUFFIX= -nox11
-PORTREVISION= 10
+PORTREVISION= 11
OPTIONS_EXCLUDE=GCONF GIF JPEG OTF M17N PNG SVG TIFF SYNC_INPUT GTK2 GTK3 \
SCROLLBARS XFT XIM XPM MAGICK GSETTINGS X11 CANNA \
diff --git a/editors/emacs/Makefile b/editors/emacs/Makefile
index 1924fe6bbca2..08c609230c11 100644
--- a/editors/emacs/Makefile
+++ b/editors/emacs/Makefile
@@ -3,7 +3,7 @@
PORTNAME= emacs
PORTVERSION= ${EMACS_VER}
-PORTREVISION?= 5
+PORTREVISION?= 6
PORTEPOCH= 3
CATEGORIES= editors ipv6
MASTER_SITES= ${MASTER_SITE_GNU}
diff --git a/emulators/qemu-devel/Makefile b/emulators/qemu-devel/Makefile
index d6ef944cb506..77f95229aff2 100644
--- a/emulators/qemu-devel/Makefile
+++ b/emulators/qemu-devel/Makefile
@@ -3,7 +3,7 @@
PORTNAME= qemu
PORTVERSION= 2.0.0
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= emulators
MASTER_SITES= http://wiki.qemu.org/download/:release \
LOCAL/nox:snapshot
diff --git a/emulators/qemu/Makefile b/emulators/qemu/Makefile
index c93f8a78a069..503d1b07752f 100644
--- a/emulators/qemu/Makefile
+++ b/emulators/qemu/Makefile
@@ -3,7 +3,7 @@
PORTNAME= qemu
PORTVERSION= 0.11.1
-PORTREVISION= 13
+PORTREVISION= 14
CATEGORIES= emulators
MASTER_SITES= ${MASTER_SITE_SAVANNAH} \
http://bellard.org/qemu/
diff --git a/emulators/wine-devel/Makefile b/emulators/wine-devel/Makefile
index 8fb82308d79b..2c1766a07290 100644
--- a/emulators/wine-devel/Makefile
+++ b/emulators/wine-devel/Makefile
@@ -3,6 +3,7 @@
PORTNAME= wine
DISTVERSION= 1.7.22
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= emulators
MASTER_SITES= SF/${PORTNAME}/Source \
diff --git a/emulators/wine/Makefile b/emulators/wine/Makefile
index 46a3a6fb1fe5..e8be31203f21 100644
--- a/emulators/wine/Makefile
+++ b/emulators/wine/Makefile
@@ -3,7 +3,7 @@
PORTNAME= wine
DISTVERSION= 1.6.2
-PORTREVISION= 2
+PORTREVISION= 3
PORTEPOCH= 1
CATEGORIES= emulators
MASTER_SITES= SF/${PORTNAME}/Source \
diff --git a/ftp/curl/Makefile b/ftp/curl/Makefile
index f85223a11f45..8def49d531d3 100644
--- a/ftp/curl/Makefile
+++ b/ftp/curl/Makefile
@@ -3,6 +3,7 @@
PORTNAME= curl
PORTVERSION= 7.37.1
+PORTREVISION= 1
CATEGORIES= ftp www
MASTER_SITES= http://curl.haxx.se/download/ \
LOCAL/sunpoet
diff --git a/ftp/filezilla/Makefile b/ftp/filezilla/Makefile
index 5c4c958680cf..e1d0807b81e8 100644
--- a/ftp/filezilla/Makefile
+++ b/ftp/filezilla/Makefile
@@ -3,7 +3,7 @@
PORTNAME= filezilla
PORTVERSION= 3.8.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= ftp
MASTER_SITES= SF/${PORTNAME}/FileZilla_Client/${PORTVERSION}
DISTNAME= FileZilla_${PORTVERSION}_src
diff --git a/ftp/lftp/Makefile b/ftp/lftp/Makefile
index 23ad6d77459c..84b86104720d 100644
--- a/ftp/lftp/Makefile
+++ b/ftp/lftp/Makefile
@@ -3,6 +3,7 @@
PORTNAME= lftp
PORTVERSION= 4.5.3
+PORTREVISION= 1
CATEGORIES= ftp ipv6
MASTER_SITES= http://lftp.yar.ru/ftp/ \
http://lftp.yar.ru/ftp/old/ \
diff --git a/ftp/wget/Makefile b/ftp/wget/Makefile
index a5cfbfdf5dbb..2b873d508184 100644
--- a/ftp/wget/Makefile
+++ b/ftp/wget/Makefile
@@ -3,6 +3,7 @@
PORTNAME= wget
DISTVERSION= 1.15
+PORTREVISION= 1
CATEGORIES= ftp www ipv6
MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= wget
diff --git a/ftp/wput/Makefile b/ftp/wput/Makefile
index c0861676e688..579963891f81 100644
--- a/ftp/wput/Makefile
+++ b/ftp/wput/Makefile
@@ -3,7 +3,7 @@
PORTNAME= wput
PORTVERSION= 0.6.2
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= ftp
MASTER_SITES= SF
diff --git a/games/libggz/Makefile b/games/libggz/Makefile
index 2294e5516ab0..b1ecc524ef5d 100644
--- a/games/libggz/Makefile
+++ b/games/libggz/Makefile
@@ -3,7 +3,7 @@
PORTNAME= libggz
PORTVERSION= ${GGZ_VERSION}
-PORTREVISION= 12
+PORTREVISION= 13
CATEGORIES= games
MAINTAINER= ports@FreeBSD.org
diff --git a/games/macopix/Makefile b/games/macopix/Makefile
index 2bb8ca67fd29..b8e4c0603b25 100644
--- a/games/macopix/Makefile
+++ b/games/macopix/Makefile
@@ -3,7 +3,7 @@
PORTNAME= macopix
PORTVERSION= 1.7.4
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= games
MASTER_SITES= http://rosegray.sakura.ne.jp/macopix/
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${RESTRICTED_FILES}
diff --git a/irc/bitlbee/Makefile b/irc/bitlbee/Makefile
index f32e30550a8b..430d0a535ae0 100644
--- a/irc/bitlbee/Makefile
+++ b/irc/bitlbee/Makefile
@@ -2,6 +2,7 @@
PORTNAME= bitlbee
PORTVERSION= 3.2.2
+PORTREVISION= 1
CATEGORIES= irc
MASTER_SITES= http://get.bitlbee.org/src/ \
${MASTER_SITE_LOCAL}
diff --git a/irc/ctrlproxy/Makefile b/irc/ctrlproxy/Makefile
index b3a839c1dcb8..3ab23462b693 100644
--- a/irc/ctrlproxy/Makefile
+++ b/irc/ctrlproxy/Makefile
@@ -3,7 +3,7 @@
PORTNAME= ctrlproxy
PORTVERSION= 3.0.8
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= irc
MASTER_SITES= http://launchpadlibrarian.net/50016234/ \
LOCAL/ashish/
diff --git a/irc/ctrlproxy/files/patch-src_gnutls.c b/irc/ctrlproxy/files/patch-src_gnutls.c
index 78dc64b7977b..fb2c8fe15faa 100644
--- a/irc/ctrlproxy/files/patch-src_gnutls.c
+++ b/irc/ctrlproxy/files/patch-src_gnutls.c
@@ -1,6 +1,3 @@
-
-$FreeBSD$
-
--- src/gnutls.c.orig
+++ src/gnutls.c
@@ -18,7 +18,6 @@
@@ -11,6 +8,21 @@ $FreeBSD$
#include <gnutls/gnutls.h>
#include <gnutls/x509.h>
+@@ -47,11 +46,11 @@
+ static gboolean
+ verify_certificate (gnutls_session session, const char *hostname, GError **err)
+ {
+- int status;
++ int res, status;
+
+- status = gnutls_certificate_verify_peers (session);
++ res = gnutls_certificate_verify_peers2 (session, &status);
+
+- if (status == GNUTLS_E_NO_CERTIFICATE_FOUND) {
++ if (res < 0 || status == GNUTLS_E_NO_CERTIFICATE_FOUND) {
+ g_set_error (err, SSL_ERROR,
+ SSL_ERROR_CERTIFICATE,
+ "No SSL certificate was sent.");
@@ -452,9 +451,6 @@
static void
_gnutls_init (void)
diff --git a/irc/minbif/Makefile b/irc/minbif/Makefile
index 57133227914a..0c82970d0509 100644
--- a/irc/minbif/Makefile
+++ b/irc/minbif/Makefile
@@ -3,7 +3,7 @@
PORTNAME= minbif
PORTVERSION= 1.0.5
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= irc net-im
MASTER_SITES= https://symlink.me/attachments/download/148/
diff --git a/irc/ngircd/Makefile b/irc/ngircd/Makefile
index a1035a1657fa..888d876b96cd 100644
--- a/irc/ngircd/Makefile
+++ b/irc/ngircd/Makefile
@@ -3,6 +3,7 @@
PORTNAME= ngircd
PORTVERSION= 21.1
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= irc ipv6
MASTER_SITES= http://arthur.barton.de/pub/%SUBDIR%/ \
diff --git a/irc/scrollz/Makefile b/irc/scrollz/Makefile
index e8991d320f06..ecbe90775c0d 100644
--- a/irc/scrollz/Makefile
+++ b/irc/scrollz/Makefile
@@ -3,6 +3,7 @@
PORTNAME= scrollz
PORTVERSION= 2.2.3
+PORTREVISION= 1
CATEGORIES= irc ipv6
MASTER_SITES= http://www.netraam.net/scrollz/download/ \
http://www.scrollz.org/download/
diff --git a/irc/weechat-devel/Makefile b/irc/weechat-devel/Makefile
index d8e6868f8d7c..ba5fd37c2530 100644
--- a/irc/weechat-devel/Makefile
+++ b/irc/weechat-devel/Makefile
@@ -2,7 +2,7 @@
PORTNAME= weechat
PORTVERSION= 20140213
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= irc
MASTER_SITES= http://perturb.me.uk/distfiles/weechat-devel/ \
${MASTER_SITE_LOCAL}
diff --git a/irc/weechat/Makefile b/irc/weechat/Makefile
index 29038aae6bc3..3aa53945c66f 100644
--- a/irc/weechat/Makefile
+++ b/irc/weechat/Makefile
@@ -3,7 +3,7 @@
PORTNAME= weechat
PORTVERSION= 0.4.3
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= irc
MASTER_SITES= http://weechat.org/files/src/ \
http://perturb.me.uk/distfiles/weechat/:mandocs \
diff --git a/japanese/jd/Makefile b/japanese/jd/Makefile
index 8e7bc5959a8c..c7653aef81db 100644
--- a/japanese/jd/Makefile
+++ b/japanese/jd/Makefile
@@ -3,6 +3,7 @@
PORTNAME= jd
PORTVERSION= 2.8.8
+PORTREVISION= 1
CATEGORIES= japanese www
MASTER_SITES= SFJP
MASTER_SITE_SUBDIR= jd4linux/61281
diff --git a/lang/gnustep-base/Makefile b/lang/gnustep-base/Makefile
index 6a1751c48b14..bbcc7a91f114 100644
--- a/lang/gnustep-base/Makefile
+++ b/lang/gnustep-base/Makefile
@@ -3,7 +3,7 @@
PORTNAME= gnustep-base
PORTVERSION= 1.24.6
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= lang devel gnustep
MASTER_SITES= ${MASTER_SITE_GNUSTEP}
MASTER_SITE_SUBDIR= core
diff --git a/mail/anubis/Makefile b/mail/anubis/Makefile
index 27053a3a6ce7..89be871616cf 100644
--- a/mail/anubis/Makefile
+++ b/mail/anubis/Makefile
@@ -2,16 +2,15 @@
# $FreeBSD$
PORTNAME= anubis
-PORTVERSION= 4.1.1
-PORTREVISION= 10
+PORTVERSION= 4.2
CATEGORIES= mail
-MASTER_SITES= ${MASTER_SITE_GNU}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= GNU
MAINTAINER= jhale@FreeBSD.org
COMMENT= Outgoing SMTP mail processor
LICENSE= GPLv3
+LICENSE_FILE= ${WRKSRC}/COPYING
OPTIONS_DEFINE= NLS EXAMPLES GUILE GPGME GNUTLS GSASL \
GDBM MYSQL PGSQL PCRE PAM SOCKS LIBWRAP
@@ -23,11 +22,12 @@ GSASL_DESC= GSASL support (required for databases)
GDBM_DESC= GDBM backend
SOCKS_DESC= SOCKS proxy support
-USES= makeinfo pkgconfig shebangfix
+USES= charsetfix makeinfo pkgconfig shebangfix
+CHARSETFIX_MAKEFILEIN= gnulib.mk
SHEBANG_FILES= contrib/msg2smtp.pl
USE_RC_SUBR= anubis
USE_AUTOTOOLS= aclocal autoheader autoconf automake
-ACLOCAL_ARGS= -I m4 -I am
+ACLOCAL_ARGS= -I m4 -I gint -I am
AUTOMAKE_ARGS= --force --add-missing
INFO= anubis
diff --git a/mail/anubis/distinfo b/mail/anubis/distinfo
index 5a21c9d0aa2b..b4d82e30637c 100644
--- a/mail/anubis/distinfo
+++ b/mail/anubis/distinfo
@@ -1,2 +1,2 @@
-SHA256 (anubis-4.1.1.tar.gz) = 93ef7a2d8bc3b50cd2e228cfe27e296ee14accadf8533bad9b2beee88a96e8fa
-SIZE (anubis-4.1.1.tar.gz) = 1104272
+SHA256 (anubis-4.2.tar.gz) = 5f3a2dd77c5ef52a593428c5b6d0042c1746eb8262c31bde9ee67455f8aad6d6
+SIZE (anubis-4.2.tar.gz) = 1623768
diff --git a/mail/anubis/files/patch-config.h.in b/mail/anubis/files/patch-config.h.in
deleted file mode 100644
index 246471ac1b43..000000000000
--- a/mail/anubis/files/patch-config.h.in
+++ /dev/null
@@ -1,23 +0,0 @@
---- ./config.h.in.orig 2008-12-19 13:30:37.000000000 -0500
-+++ ./config.h.in 2011-02-09 20:52:34.000000000 -0500
-@@ -180,9 +180,6 @@
- /* Define to 1 if you have the `pam' library (-lpam). */
- #undef HAVE_LIBPAM
-
--/* Define to 1 if you have the `pam_misc' library (-lpam_misc). */
--#undef HAVE_LIBPAM_MISC
--
- /* Define to 1 if you have the `pcre' library (-lpcre). */
- #undef HAVE_LIBPCRE
-
-@@ -252,8 +249,8 @@
- /* Define to 1 if you have the <security/pam_appl.h> header file. */
- #undef HAVE_SECURITY_PAM_APPL_H
-
--/* Define to 1 if you have the <security/pam_misc.h> header file. */
--#undef HAVE_SECURITY_PAM_MISC_H
-+/* Define to 1 if you have the <security/openpam.h> header file. */
-+#undef HAVE_SECURITY_OPENPAM_H
-
- /* Define to 1 if you have the `setegid' function. */
- #undef HAVE_SETEGID
diff --git a/mail/anubis/files/patch-configure.ac b/mail/anubis/files/patch-configure.ac
index 0c40e5fe4e4d..8e3b651a964c 100644
--- a/mail/anubis/files/patch-configure.ac
+++ b/mail/anubis/files/patch-configure.ac
@@ -1,27 +1,14 @@
--- ./configure.ac.orig 2008-12-16 11:21:54.000000000 -0500
+++ ./configure.ac 2011-02-09 20:52:34.000000000 -0500
-@@ -77,7 +77,6 @@
+@@ -78,7 +78,6 @@
])
AC_CHECK_LIB(socket, socket)
-AC_CHECK_LIB(nsl, gethostbyaddr)
- AC_SUBST(INCLUDES)
+ AC_SUBST(ADD_INCLUDES)
case $build in
-@@ -143,10 +142,10 @@
- else
- AC_PATH_PROG(GPG, gpg)
- findgpgmedir() { :
-- if test -f "$1/include/gpgme.h"; then
-+ if test -f "$1/include/gpgme/gpgme.h"; then
- gpgmedir=1
- INCLUDES="$INCLUDES -I$1/include"
-- AC_MSG_CHECKING(for $1/include/gpgme.h)
-+ AC_MSG_CHECKING(for $1/include/gpgme/gpgme.h)
- AC_MSG_RESULT([yes])
- return 0
- fi
-@@ -158,7 +157,7 @@
+@@ -137,7 +136,7 @@
if test $gpgmedir; then
AC_DEFINE(HAVE_GPGME_H, 1, [Define to 1 if HAVE_GPGME_H is requested.])
else
@@ -30,15 +17,7 @@
fi
ANUBIS_GPGFILES='$(GPGFILES)'
M4_DEFS="$M4_DEFS -DWITH_GPG"
-@@ -189,6 +188,7 @@
- WITH_MYSQL=no
- WITH_POSTGRES=no
- WITH_GDBM=no
-+WITH_GSASL=no
-
- dnl Use option --with-gsasl to compile GSASL library support.
- MU_CHECK_GSASL(0.2.3, [
-@@ -199,11 +199,21 @@
+@@ -179,11 +178,21 @@
ANUBIS_BIN_ADM='$(adm_bin_programs)'
M4_DEFS="$M4_DEFS -DWITH_GSASL"
@@ -61,17 +40,7 @@
AC_ARG_WITH(mysql,
AC_HELP_STRING([--with-mysql],
-@@ -277,7 +287,8 @@
- if test $with_gnutls = yes; then
- AC_CHECK_HEADERS(gnutls/gnutls.h)
- if test $ac_cv_header_gnutls_gnutls_h != no; then
-- AM_PATH_LIBGNUTLS("1.0.0",
-+ PKG_CHECK_MODULES([LIBGNUTLS],
-+ [gnutls >= 1.0.0],
- [M4_DEFS="$M4_DEFS -DWITH_SSL -DWITH_GNUTLS"
- AC_DEFINE(USE_GNUTLS, 1,
- [Define to 1 if USE_GNUTLS is requested.])],
-@@ -327,8 +338,8 @@
+@@ -285,8 +294,8 @@
[with_pam=no])
if test "$with_pam" = "yes"; then
AC_CHECK_LIB(pam, main,, with_pam=no)
@@ -82,7 +51,7 @@
fi
if test "$with_pam" = "yes"; then
AC_MSG_RESULT([Enabling PAM support...])
-@@ -342,7 +353,6 @@
+@@ -300,7 +309,6 @@
[with_tcp_wrappers=no])
if test "$with_tcp_wrappers" = "yes"; then
AC_CHECK_LIB(wrap, main,, with_tcp_wrappers=no)
diff --git a/mail/anubis/files/patch-src__headers.h b/mail/anubis/files/patch-src__headers.h
index 3e835d0ce897..107cd74d50a5 100644
--- a/mail/anubis/files/patch-src__headers.h
+++ b/mail/anubis/files/patch-src__headers.h
@@ -1,9 +1,9 @@
--- ./src/headers.h.orig 2008-12-16 11:21:54.000000000 -0500
+++ ./src/headers.h 2011-02-09 20:52:34.000000000 -0500
-@@ -51,11 +51,11 @@
- # else
- # error POSIX Regular Expressions are required!
- # endif /* HAVE_REGEX_H and HAVE_REGCOMP */
+@@ -43,11 +43,11 @@
+ # define HAVE_PCRE
+ # endif /* HAVE_PCRE_H or HAVE_PCRE_PCRE_H */
+ # endif /* HAVE_LIBPCRE */
-# if defined(HAVE_LIBPAM) && defined(HAVE_LIBPAM_MISC)
-# if defined(HAVE_SECURITY_PAM_APPL_H) && defined(HAVE_SECURITY_PAM_MISC_H)
+# if defined(HAVE_LIBPAM)
@@ -16,7 +16,7 @@
# if defined(HAVE_LIBWRAP) && defined(HAVE_TCPD_H)
# define USE_LIBWRAP
# endif /* HAVE_LIBWRAP and HAVE_TCPD_H */
-@@ -121,7 +121,7 @@
+@@ -111,7 +111,7 @@
#ifdef HAVE_PAM
# include <security/pam_appl.h>
diff --git a/mail/anubis/pkg-plist b/mail/anubis/pkg-plist
index f6487e0d8ef4..9017250f9db0 100644
--- a/mail/anubis/pkg-plist
+++ b/mail/anubis/pkg-plist
@@ -9,7 +9,10 @@ man/man1/anubis.1.gz
%%GUILE%%share/anubis/rot-13.scm
%%NLS%%share/locale/da/LC_MESSAGES/anubis.mo
%%NLS%%share/locale/de/LC_MESSAGES/anubis.mo
+%%NLS%%share/locale/es/LC_MESSAGES/anubis.mo
+%%NLS%%share/locale/fi/LC_MESSAGES/anubis.mo
%%NLS%%share/locale/fr/LC_MESSAGES/anubis.mo
+%%NLS%%share/locale/hr/LC_MESSAGES/anubis.mo
%%NLS%%share/locale/id/LC_MESSAGES/anubis.mo
%%NLS%%share/locale/it/LC_MESSAGES/anubis.mo
%%NLS%%share/locale/ms/LC_MESSAGES/anubis.mo
@@ -18,8 +21,10 @@ man/man1/anubis.1.gz
%%NLS%%share/locale/pl/LC_MESSAGES/anubis.mo
%%NLS%%share/locale/ro/LC_MESSAGES/anubis.mo
%%NLS%%share/locale/ru/LC_MESSAGES/anubis.mo
+%%NLS%%share/locale/sr/LC_MESSAGES/anubis.mo
%%NLS%%share/locale/sv/LC_MESSAGES/anubis.mo
%%NLS%%share/locale/tr/LC_MESSAGES/anubis.mo
%%NLS%%share/locale/uk/LC_MESSAGES/anubis.mo
%%NLS%%share/locale/vi/LC_MESSAGES/anubis.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/anubis.mo
@dirrm share/anubis
diff --git a/mail/claws-mail/Makefile b/mail/claws-mail/Makefile
index 3f70fb467e21..e9214c8ce715 100644
--- a/mail/claws-mail/Makefile
+++ b/mail/claws-mail/Makefile
@@ -2,6 +2,7 @@
# $FreeBSD$
PORTNAME= claws-mail
+PORTREVISION= 1
CATEGORIES= mail news ipv6
COMMENT= Lightweight and featureful GTK+ based e-mail and news client
diff --git a/mail/courier-imap/Makefile b/mail/courier-imap/Makefile
index d3c7440791b4..8683237fa9b1 100644
--- a/mail/courier-imap/Makefile
+++ b/mail/courier-imap/Makefile
@@ -3,7 +3,7 @@
PORTNAME= courier-imap
PORTVERSION= 4.15
-PORTREVISION= 1
+PORTREVISION= 2
PORTEPOCH= 2
CATEGORIES= mail ipv6
MASTER_SITES= SF/courier/imap/${PORTVERSION}
diff --git a/mail/exim/Makefile b/mail/exim/Makefile
index ae86747dba11..0a738b24bae7 100644
--- a/mail/exim/Makefile
+++ b/mail/exim/Makefile
@@ -3,6 +3,7 @@
PORTNAME= exim
PORTVERSION?= ${EXIM_VERSION}
+PORTREVISION= 1
CATEGORIES= mail ipv6
MASTER_SITES= ${MASTER_SITE_EXIM:S/$/:exim/}
MASTER_SITE_SUBDIR= exim4/:exim
diff --git a/mail/libetpan/Makefile b/mail/libetpan/Makefile
index 5f865624049b..3e2442ad1ecc 100644
--- a/mail/libetpan/Makefile
+++ b/mail/libetpan/Makefile
@@ -3,6 +3,7 @@
PORTNAME= libetpan
PORTVERSION= 1.5
+PORTREVISION= 1
CATEGORIES= mail ipv6
MAINTAINER= pawel@FreeBSD.org
diff --git a/mail/libvmime/Makefile b/mail/libvmime/Makefile
index f0a8aaab4376..8b0f4807c848 100644
--- a/mail/libvmime/Makefile
+++ b/mail/libvmime/Makefile
@@ -2,38 +2,34 @@
# $FreeBSD$
PORTNAME= libvmime
-PORTVERSION= 0.9.1
-PORTREVISION= 8
+PORTVERSION= 0.9.2.s20140721
CATEGORIES= mail
-MASTER_SITES= SF/vmime/vmime/0.9
MAINTAINER= delphij@FreeBSD.org
COMMENT= All-in-one Internet mail library
-LIB_DEPENDS+= libgnutls.so:${PORTSDIR}/security/gnutls
-LIB_DEPENDS+= libgsasl.so:${PORTSDIR}/security/gsasl
+LICENSE= GPLv3
+LICENSE_FILE= ${WRKSRC}/COPYING
-USES= iconv gmake pkgconfig tar:bzip2 libtool
-GNU_CONFIGURE= yes
-USE_LDCONFIG= yes
-
-CFLAGS+= -I${LOCALBASE}/include -D_GLIBCXX__PTHREADS
-CXXFLAGS+= ${CFLAGS}
-LDFLAGS+= -L${LOCALBASE}/lib
+LIB_DEPENDS= libgnutls.so:${PORTSDIR}/security/gnutls \
+ libgsasl.so:${PORTSDIR}/security/gsasl
-.ifndef DEBUG
-CONFIGURE_ARGS+=--disable-debug
-.endif
+USE_GITHUB= yes
+GH_ACCOUNT= kisli
+GH_PROJECT= vmime
+GH_TAGNAME= ${GH_COMMIT}
+GH_COMMIT= 03a0e36
-CONFIGURE_ENV+= EXTRA_CFLAGS="${CFLAGS}" EXTRA_CXXFLAGS="${CXXFLAGS}" \
- LIBGNUTLS_CONFIG="${LOCALBASE}/bin/pkg-config" libgnutls_config_args="gnutls"
-
-DOCSDIR= ${PREFIX}/share/doc/vmime
+USES= cmake:outsource compiler:c++11-lib iconv pkgconfig
+USE_LDCONFIG= yes
-.include <bsd.port.pre.mk>
+CMAKE_ARGS= -DLIB_SUFFIX:STRING="" \
+ -DVMIME_BUILD_SAMPLES:BOOL=NO \
+ -DVMIME_SHARED_PTR_USE_BOOST:BOOL=NO \
+ -DVMIME_SHARED_PTR_USE_CXX:BOOL=YES
-.if ${ARCH} == "sparc64"
-BROKEN= Does not compile on sparc64
-.endif
+post-patch:
+ @${REINPLACE_CMD} 's,$${VMIME_INSTALL_LIBDIR}/pkgconfig,${PREFIX}/libdata/pkgconfig,' \
+ ${WRKSRC}/CMakeLists.txt
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/mail/libvmime/distinfo b/mail/libvmime/distinfo
index ca6f52d965c2..81b9e4fcf4ab 100644
--- a/mail/libvmime/distinfo
+++ b/mail/libvmime/distinfo
@@ -1,2 +1,2 @@
-SHA256 (libvmime-0.9.1.tar.bz2) = 3b66cb76d9bc7da80ef1f271cc29d3a183b5ff8b560ef60e85ff006bffb4d1ae
-SIZE (libvmime-0.9.1.tar.bz2) = 522546
+SHA256 (libvmime-0.9.2.s20140721.tar.gz) = 42e759982bfcc00c9348eba681840788e584cdca344d9342edb1a3f1690a23a0
+SIZE (libvmime-0.9.2.s20140721.tar.gz) = 527233
diff --git a/mail/libvmime/files/patch-cmake__FindIconv.cmake b/mail/libvmime/files/patch-cmake__FindIconv.cmake
new file mode 100644
index 000000000000..280eb3ae293e
--- /dev/null
+++ b/mail/libvmime/files/patch-cmake__FindIconv.cmake
@@ -0,0 +1,11 @@
+--- cmake/FindIconv.cmake.orig 2014-06-30 22:48:42.000000000 +0200
++++ cmake/FindIconv.cmake 2014-07-22 12:50:55.000000000 +0200
+@@ -18,7 +18,7 @@
+ IF(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
+ FIND_LIBRARY(ICONV_LIBRARIES NAMES iconv libiconv libiconv-2 c HINTS "/opt/local/lib")
+ ELSE()
+- FIND_LIBRARY(ICONV_LIBRARIES NAMES iconv libiconv libiconv-2 c)
++ FIND_LIBRARY(ICONV_LIBRARIES NAMES iconv c libiconv libiconv-2)
+ ENDIF()
+
+ IF(ICONV_INCLUDE_DIR AND ICONV_LIBRARIES)
diff --git a/mail/libvmime/files/patch-configure b/mail/libvmime/files/patch-configure
deleted file mode 100644
index ffe4d9c06dbf..000000000000
--- a/mail/libvmime/files/patch-configure
+++ /dev/null
@@ -1,59 +0,0 @@
---- ./configure.orig 2010-11-16 04:56:00.000000000 -0800
-+++ ./configure 2011-05-03 11:24:44.023730993 -0700
-@@ -4120,13 +4120,13 @@
- CFLAGS=$ac_save_CFLAGS
- elif test $ac_cv_prog_cc_g = yes; then
- if test "$GCC" = yes; then
-- CFLAGS="-g -O2"
-+ CFLAGS="-g"
- else
- CFLAGS="-g"
- fi
- else
- if test "$GCC" = yes; then
-- CFLAGS="-O2"
-+ CFLAGS=""
- else
- CFLAGS=
- fi
-@@ -4657,13 +4657,13 @@
- CXXFLAGS=$ac_save_CXXFLAGS
- elif test $ac_cv_prog_cxx_g = yes; then
- if test "$GXX" = yes; then
-- CXXFLAGS="-g -O2"
-+ CXXFLAGS="-g"
- else
- CXXFLAGS="-g"
- fi
- else
- if test "$GXX" = yes; then
-- CXXFLAGS="-O2"
-+ CXXFLAGS=""
- else
- CXXFLAGS=
- fi
-@@ -15610,13 +15610,13 @@
- CFLAGS=$ac_save_CFLAGS
- elif test $ac_cv_prog_cc_g = yes; then
- if test "$GCC" = yes; then
-- CFLAGS="-g -O2"
-+ CFLAGS="-g"
- else
- CFLAGS="-g"
- fi
- else
- if test "$GCC" = yes; then
-- CFLAGS="-O2"
-+ CFLAGS=""
- else
- CFLAGS=
- fi
-@@ -21047,7 +21047,7 @@
- else
- # -O2
- OLD_CXXFLAGS="$CXXFLAGS"
-- CXXFLAGS="$CXXFLAGS -O2"
-+ CXXFLAGS="$CXXFLAGS"
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether cc accepts -O2" >&5
- $as_echo_n "checking whether cc accepts -O2... " >&6; }
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
diff --git a/mail/libvmime/files/patch-src__mailboxField.cpp b/mail/libvmime/files/patch-src__mailboxField.cpp
deleted file mode 100644
index 94d559aa5447..000000000000
--- a/mail/libvmime/files/patch-src__mailboxField.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./src/mailboxField.cpp.orig 2009-09-06 05:10:27.000000000 -0700
-+++ ./src/mailboxField.cpp 2012-03-08 10:49:05.687243933 -0800
-@@ -51,7 +51,7 @@
- // Here, we cannot simply call "m_mailbox.parse()" because it
- // may have more than one address specified (even if this field
- // should contain only one). We are never too much careful...
-- ref <address> parsedAddress = address::parseNext(buffer, position, end, newPosition);
-+ ref <address> parsedAddress = mailbox::parseNext(buffer, position, end, newPosition);
-
- if (parsedAddress)
- {
diff --git a/mail/libvmime/files/patch-src__vmime__platforms__posix__posixHandler.cpp b/mail/libvmime/files/patch-src__vmime__platforms__posix__posixHandler.cpp
new file mode 100644
index 000000000000..a58c51e535a8
--- /dev/null
+++ b/mail/libvmime/files/patch-src__vmime__platforms__posix__posixHandler.cpp
@@ -0,0 +1,21 @@
+--- src/vmime/platforms/posix/posixHandler.cpp.orig 2014-07-22 15:24:26.000000000 +0200
++++ src/vmime/platforms/posix/posixHandler.cpp 2014-07-22 15:59:33.000000000 +0200
+@@ -41,6 +41,7 @@
+ #include <errno.h>
+
+ #include <sys/types.h>
++#include <sys/socket.h>
+ #include <sys/stat.h>
+
+ #if VMIME_HAVE_SYSCALL
+@@ -238,7 +239,9 @@
+ #elif VMIME_HAVE_SYSCALL && VMIME_HAVE_SYSCALL_GETTID
+ return static_cast <unsigned int>(::syscall(SYS_gettid));
+ #else
+- #error We have no implementation of getThreadId() for this platform!
++ long id;
++ ::syscall(SYS_thr_self, &id);
++ return static_cast <unsigned int>(id);
+ #endif
+ }
+
diff --git a/mail/libvmime/files/patch-vmime__base.hpp b/mail/libvmime/files/patch-vmime__base.hpp
deleted file mode 100644
index eae3e285d0d3..000000000000
--- a/mail/libvmime/files/patch-vmime__base.hpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./vmime/base.hpp.orig 2010-02-06 10:12:57.000000000 -0800
-+++ ./vmime/base.hpp 2013-09-05 17:05:39.233608129 -0700
-@@ -252,7 +252,7 @@
- template <class X, class Y>
- ref <X> dynamicCast(ref <Y> y)
- {
-- return y.dynamicCast <X>();
-+ return y. template dynamicCast <X>();
- }
-
- } // vmime
diff --git a/mail/libvmime/files/patch-vmime__utility__smartPtrInt.hpp b/mail/libvmime/files/patch-vmime__utility__smartPtrInt.hpp
deleted file mode 100644
index b91cb20864e0..000000000000
--- a/mail/libvmime/files/patch-vmime__utility__smartPtrInt.hpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./vmime/utility/smartPtrInt.hpp.orig 2009-09-06 05:10:27.000000000 -0700
-+++ ./vmime/utility/smartPtrInt.hpp 2013-09-12 11:22:28.695743913 -0700
-@@ -28,6 +28,8 @@
- #include "vmime/config.hpp"
- #include "vmime/utility/smartPtr.hpp"
-
-+#include <pthread.h>
-+
-
- namespace vmime {
- namespace utility {
diff --git a/mail/libvmime/pkg-plist b/mail/libvmime/pkg-plist
index 4944f6db116f..c3c4475f41da 100644
--- a/mail/libvmime/pkg-plist
+++ b/mail/libvmime/pkg-plist
@@ -8,6 +8,11 @@ include/vmime/bodyPart.hpp
include/vmime/bodyPartAttachment.hpp
include/vmime/charset.hpp
include/vmime/charsetConverter.hpp
+include/vmime/charsetConverterOptions.hpp
+include/vmime/charsetConverter_iconv.hpp
+include/vmime/charsetConverter_icu.hpp
+include/vmime/charsetConverter_idna.hpp
+include/vmime/charsetConverter_win.hpp
include/vmime/component.hpp
include/vmime/config.hpp
include/vmime/constants.hpp
@@ -15,14 +20,21 @@ include/vmime/contentDisposition.hpp
include/vmime/contentDispositionField.hpp
include/vmime/contentHandler.hpp
include/vmime/contentTypeField.hpp
+include/vmime/context.hpp
include/vmime/dateTime.hpp
include/vmime/defaultAttachment.hpp
include/vmime/disposition.hpp
+include/vmime/emailAddress.hpp
include/vmime/emptyContentHandler.hpp
include/vmime/encoding.hpp
include/vmime/exception.hpp
+include/vmime/export-shared.hpp
+include/vmime/export-static.hpp
+include/vmime/export.hpp
include/vmime/fileAttachment.hpp
+include/vmime/fileContentHandler.hpp
include/vmime/generatedMessageAttachment.hpp
+include/vmime/generationContext.hpp
include/vmime/header.hpp
include/vmime/headerField.hpp
include/vmime/headerFieldFactory.hpp
@@ -44,68 +56,104 @@ include/vmime/messageId.hpp
include/vmime/messageIdSequence.hpp
include/vmime/messageParser.hpp
include/vmime/misc/importanceHelper.hpp
+include/vmime/net/defaultTimeoutHandler.hpp
include/vmime/net/events.hpp
+include/vmime/net/fetchAttributes.hpp
include/vmime/net/folder.hpp
+include/vmime/net/folderAttributes.hpp
+include/vmime/net/folderStatus.hpp
+include/vmime/net/imap/IMAPCommand.hpp
include/vmime/net/imap/IMAPConnection.hpp
include/vmime/net/imap/IMAPFolder.hpp
+include/vmime/net/imap/IMAPFolderStatus.hpp
include/vmime/net/imap/IMAPMessage.hpp
+include/vmime/net/imap/IMAPMessagePart.hpp
include/vmime/net/imap/IMAPMessagePartContentHandler.hpp
+include/vmime/net/imap/IMAPMessageStructure.hpp
include/vmime/net/imap/IMAPParser.hpp
-include/vmime/net/imap/IMAPPart.hpp
include/vmime/net/imap/IMAPSStore.hpp
include/vmime/net/imap/IMAPServiceInfos.hpp
include/vmime/net/imap/IMAPStore.hpp
-include/vmime/net/imap/IMAPStructure.hpp
include/vmime/net/imap/IMAPTag.hpp
include/vmime/net/imap/IMAPUtils.hpp
+include/vmime/net/imap/imap.hpp
+include/vmime/net/maildir/maildir.hpp
include/vmime/net/maildir/maildirFolder.hpp
+include/vmime/net/maildir/maildirFolderStatus.hpp
include/vmime/net/maildir/maildirFormat.hpp
include/vmime/net/maildir/maildirMessage.hpp
+include/vmime/net/maildir/maildirMessagePart.hpp
+include/vmime/net/maildir/maildirMessageStructure.hpp
include/vmime/net/maildir/maildirServiceInfos.hpp
include/vmime/net/maildir/maildirStore.hpp
include/vmime/net/maildir/maildirUtils.hpp
include/vmime/net/maildir/format/courierMaildirFormat.hpp
include/vmime/net/maildir/format/kmailMaildirFormat.hpp
include/vmime/net/message.hpp
+include/vmime/net/messageSet.hpp
+include/vmime/net/pop3/POP3Command.hpp
+include/vmime/net/pop3/POP3Connection.hpp
include/vmime/net/pop3/POP3Folder.hpp
+include/vmime/net/pop3/POP3FolderStatus.hpp
include/vmime/net/pop3/POP3Message.hpp
+include/vmime/net/pop3/POP3Response.hpp
include/vmime/net/pop3/POP3SStore.hpp
include/vmime/net/pop3/POP3ServiceInfos.hpp
include/vmime/net/pop3/POP3Store.hpp
include/vmime/net/pop3/POP3Utils.hpp
+include/vmime/net/pop3/pop3.hpp
+include/vmime/net/sendmail/sendmail.hpp
include/vmime/net/sendmail/sendmailServiceInfos.hpp
include/vmime/net/sendmail/sendmailTransport.hpp
include/vmime/net/service.hpp
include/vmime/net/serviceFactory.hpp
include/vmime/net/serviceInfos.hpp
include/vmime/net/session.hpp
+include/vmime/net/smtp/SMTPChunkingOutputStreamAdapter.hpp
+include/vmime/net/smtp/SMTPCommand.hpp
+include/vmime/net/smtp/SMTPCommandSet.hpp
+include/vmime/net/smtp/SMTPConnection.hpp
+include/vmime/net/smtp/SMTPExceptions.hpp
include/vmime/net/smtp/SMTPResponse.hpp
include/vmime/net/smtp/SMTPSTransport.hpp
include/vmime/net/smtp/SMTPServiceInfos.hpp
include/vmime/net/smtp/SMTPTransport.hpp
+include/vmime/net/smtp/smtp.hpp
include/vmime/net/socket.hpp
include/vmime/net/store.hpp
include/vmime/net/timeoutHandler.hpp
+include/vmime/net/tls/TLSProperties.hpp
include/vmime/net/tls/TLSSession.hpp
include/vmime/net/tls/TLSSocket.hpp
include/vmime/net/tls/TLSSecuredConnectionInfos.hpp
+include/vmime/net/tls/gnutls/TLSProperties_GnuTLS.hpp
+include/vmime/net/tls/gnutls/TLSSession_GnuTLS.hpp
+include/vmime/net/tls/gnutls/TLSSocket_GnuTLS.hpp
+include/vmime/net/tls/openssl/OpenSSLInitializer.hpp
+include/vmime/net/tls/openssl/TLSProperties_OpenSSL.hpp
+include/vmime/net/tls/openssl/TLSSession_OpenSSL.hpp
+include/vmime/net/tls/openssl/TLSSocket_OpenSSL.hpp
+include/vmime/net/tracer.hpp
include/vmime/net/transport.hpp
include/vmime/net/connectionInfos.hpp
include/vmime/net/defaultConnectionInfos.hpp
include/vmime/net/securedConnectionInfos.hpp
include/vmime/object.hpp
-include/vmime/options.hpp
include/vmime/parameter.hpp
include/vmime/parameterizedHeaderField.hpp
include/vmime/parsedMessageAttachment.hpp
include/vmime/parserHelpers.hpp
+include/vmime/parsingContext.hpp
include/vmime/path.hpp
include/vmime/plainTextPart.hpp
include/vmime/platform.hpp
include/vmime/platforms/posix/posixChildProcess.hpp
+include/vmime/platforms/posix/posixCriticalSection.hpp
include/vmime/platforms/posix/posixFile.hpp
include/vmime/platforms/posix/posixHandler.hpp
include/vmime/platforms/posix/posixSocket.hpp
+include/vmime/platforms/windows/windowsCodepages.hpp
+include/vmime/platforms/windows/windowsCriticalSection.hpp
include/vmime/platforms/windows/windowsFile.hpp
include/vmime/platforms/windows/windowsHandler.hpp
include/vmime/platforms/windows/windowsSocket.hpp
@@ -117,6 +165,8 @@ include/vmime/security/cert/certificate.hpp
include/vmime/security/cert/certificateChain.hpp
include/vmime/security/cert/certificateVerifier.hpp
include/vmime/security/cert/defaultCertificateVerifier.hpp
+include/vmime/security/cert/gnutls/X509Certificate_GnuTLS.hpp
+include/vmime/security/cert/openssl/X509Certificate_OpenSSL.hpp
include/vmime/security/defaultAuthenticator.hpp
include/vmime/security/digest/md5/md5MessageDigest.hpp
include/vmime/security/digest/messageDigest.hpp
@@ -140,8 +190,8 @@ include/vmime/utility/encoder/binaryEncoder.hpp
include/vmime/utility/encoder/encoder.hpp
include/vmime/utility/encoder/sevenBitEncoder.hpp
include/vmime/utility/encoder/b64Encoder.hpp
-include/vmime/utility/encoder/defaultEncoder.hpp
include/vmime/utility/encoder/encoderFactory.hpp
+include/vmime/utility/encoder/noopEncoder.hpp
include/vmime/utility/encoder/uuEncoder.hpp
include/vmime/utility/encoder/qpEncoder.hpp
include/vmime/utility/encoder/eightBitEncoder.hpp
@@ -149,14 +199,30 @@ include/vmime/utility/childProcess.hpp
include/vmime/utility/datetimeUtils.hpp
include/vmime/utility/file.hpp
include/vmime/utility/filteredStream.hpp
+include/vmime/utility/inputStream.hpp
+include/vmime/utility/inputStreamAdapter.hpp
+include/vmime/utility/inputStreamByteBufferAdapter.hpp
+include/vmime/utility/inputStreamPointerAdapter.hpp
+include/vmime/utility/inputStreamSocketAdapter.hpp
+include/vmime/utility/inputStreamStringAdapter.hpp
+include/vmime/utility/inputStreamStringProxyAdapter.hpp
+include/vmime/utility/outputStream.hpp
+include/vmime/utility/outputStreamAdapter.hpp
+include/vmime/utility/outputStreamByteArrayAdapter.hpp
+include/vmime/utility/outputStreamSocketAdapter.hpp
+include/vmime/utility/outputStreamStringAdapter.hpp
+include/vmime/utility/parserInputStreamAdapter.hpp
include/vmime/utility/path.hpp
include/vmime/utility/progressListener.hpp
include/vmime/utility/random.hpp
-include/vmime/utility/smartPtr.hpp
-include/vmime/utility/smartPtrInt.hpp
+include/vmime/utility/seekableInputStream.hpp
+include/vmime/utility/seekableInputStreamRegionAdapter.hpp
include/vmime/utility/stream.hpp
+include/vmime/utility/streamUtils.hpp
include/vmime/utility/stringProxy.hpp
include/vmime/utility/stringUtils.hpp
+include/vmime/utility/sync/autoLock.hpp
+include/vmime/utility/sync/criticalSection.hpp
include/vmime/utility/url.hpp
include/vmime/utility/urlUtils.hpp
include/vmime/vmime.hpp
@@ -167,24 +233,22 @@ lib/libvmime.so
lib/libvmime.so.0
lib/libvmime.so.0.0.0
libdata/pkgconfig/vmime.pc
-%%DOCSDIR%%/AUTHORS
-%%DOCSDIR%%/COPYING
-%%DOCSDIR%%/ChangeLog
-%%DOCSDIR%%/INSTALL
-%%DOCSDIR%%/NEWS
-%%DOCSDIR%%/README
-@dirrm %%DOCSDIR%%
+@dirrm include/vmime/utility/sync
@dirrm include/vmime/utility/encoder
@dirrm include/vmime/utility
@dirrm include/vmime/security/sasl
@dirrm include/vmime/security/digest/sha1
@dirrm include/vmime/security/digest/md5
@dirrm include/vmime/security/digest
+@dirrm include/vmime/security/cert/openssl
+@dirrm include/vmime/security/cert/gnutls
@dirrm include/vmime/security/cert
@dirrm include/vmime/security
@dirrm include/vmime/platforms/windows
@dirrm include/vmime/platforms/posix
@dirrm include/vmime/platforms
+@dirrm include/vmime/net/tls/openssl
+@dirrm include/vmime/net/tls/gnutls
@dirrm include/vmime/net/tls
@dirrm include/vmime/net/smtp
@dirrm include/vmime/net/sendmail
diff --git a/mail/mpop/Makefile b/mail/mpop/Makefile
index 6e3bf3b5fe80..a2cfdd83a571 100644
--- a/mail/mpop/Makefile
+++ b/mail/mpop/Makefile
@@ -3,6 +3,7 @@
PORTNAME= mpop
PORTVERSION= 1.0.29
+PORTREVISION= 1
CATEGORIES= mail
MASTER_SITES= SF
diff --git a/mail/msmtp/Makefile b/mail/msmtp/Makefile
index 20fcd0dc503b..00e5f342dbdb 100644
--- a/mail/msmtp/Makefile
+++ b/mail/msmtp/Makefile
@@ -3,7 +3,7 @@
PORTNAME= msmtp
PORTVERSION= 1.4.32
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= mail ipv6
MASTER_SITES= SF
diff --git a/mail/nullmailer/Makefile b/mail/nullmailer/Makefile
index 44e4716870d2..044256eb79dd 100644
--- a/mail/nullmailer/Makefile
+++ b/mail/nullmailer/Makefile
@@ -3,6 +3,7 @@
PORTNAME= nullmailer
PORTVERSION= 1.13
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= mail
MASTER_SITES= http://untroubled.org/nullmailer/ \
diff --git a/mail/opendkim/Makefile b/mail/opendkim/Makefile
index cea33e8c33b6..b8c8d1f58eb7 100644
--- a/mail/opendkim/Makefile
+++ b/mail/opendkim/Makefile
@@ -3,6 +3,7 @@
PORTNAME= opendkim
PORTVERSION= 2.9.2
+PORTREVISION= 1
CATEGORIES= mail security
MASTER_SITES= SF
MASTER_SITE_SUBDIR= ${PORTNAME} \
diff --git a/mail/wmbiff/Makefile b/mail/wmbiff/Makefile
index b5ee8dbdb77b..be0659b0a98b 100644
--- a/mail/wmbiff/Makefile
+++ b/mail/wmbiff/Makefile
@@ -3,7 +3,7 @@
PORTNAME= wmbiff
PORTVERSION= 0.4.27
-PORTREVISION= 13
+PORTREVISION= 14
CATEGORIES= mail windowmaker afterstep
MASTER_SITES= SF
diff --git a/mail/xfce4-mailwatch-plugin/Makefile b/mail/xfce4-mailwatch-plugin/Makefile
index 89a44c5f6361..f53339c84e5a 100644
--- a/mail/xfce4-mailwatch-plugin/Makefile
+++ b/mail/xfce4-mailwatch-plugin/Makefile
@@ -3,6 +3,7 @@
PORTNAME= xfce4-mailwatch-plugin
PORTVERSION= 1.2.0
+PORTREVISION= 1
CATEGORIES= mail xfce
MASTER_SITES= ${MASTER_SITE_XFCE}
MASTER_SITE_SUBDIR= src/panel-plugins/${PORTNAME}/${PORTVERSION:R}
diff --git a/multimedia/ffmpeg/Makefile b/multimedia/ffmpeg/Makefile
index 3d0ce7053259..5f54e3117566 100644
--- a/multimedia/ffmpeg/Makefile
+++ b/multimedia/ffmpeg/Makefile
@@ -3,7 +3,7 @@
PORTNAME= ffmpeg
PORTVERSION= 2.2.4
-PORTREVISION= 2
+PORTREVISION= 3
PORTEPOCH= 1
CATEGORIES= multimedia audio ipv6 net
MASTER_SITES= http://ffmpeg.org/releases/
diff --git a/multimedia/libav/Makefile b/multimedia/libav/Makefile
index 254f0f6935b4..12ba60d3250c 100644
--- a/multimedia/libav/Makefile
+++ b/multimedia/libav/Makefile
@@ -2,6 +2,7 @@
PORTNAME= libav
PORTVERSION= 10.2
+PORTREVISION= 1
CATEGORIES= multimedia audio ipv6 net
MASTER_SITES= http://libav.org/releases/
diff --git a/multimedia/vlc/Makefile b/multimedia/vlc/Makefile
index fbb3a76b685d..ed6a359a1bd4 100644
--- a/multimedia/vlc/Makefile
+++ b/multimedia/vlc/Makefile
@@ -3,6 +3,7 @@
PORTNAME= vlc
DISTVERSION= 2.1.5
+PORTREVISION= 1
PORTEPOCH= 4
CATEGORIES= multimedia audio ipv6 net www
MASTER_SITES= http://download.videolan.org/pub/videolan/${PORTNAME}/${DISTVERSION:S/a$//}/ \
@@ -47,7 +48,7 @@ CONFIGURE_ARGS= --enable-avcodec --enable-avformat --enable-dvbpsi \
.if defined(WITH_DEBUG) && !defined(WITHOUT_DEBUG)
CONFIGURE_ARGS+=--enable-debug
.endif
-CPPFLAGS+= -I${LOCALBASE}/include/gnutls3 -I${LOCALBASE}/include
+CPPFLAGS+= -I${LOCALBASE}/include
CFLAGS_i386= -fomit-frame-pointer
OPTIONS_DEFINE= A52 AALIB ASS AVAHI CACA DBUS DCA DIRAC DOCS DVDREAD \
@@ -138,7 +139,7 @@ GME_CONFIGURE_ENV= LIBS_gme="-L${LOCALBASE}/lib -lgme"
GNOMEVFS2_USE= GNOME=gnomevfs2
GNOMEVFS2_CONFIGURE_ENABLE= gnomevfs
-GNUTLS_LIB_DEPENDS= libgnutls.so.28:${PORTSDIR}/security/gnutls3
+GNUTLS_LIB_DEPENDS= libgnutls.so:${PORTSDIR}/security/gnutls
GNUTLS_CONFIGURE_ENABLE=gnutls
GOOM_LIB_DEPENDS= libgoom2.so:${PORTSDIR}/graphics/goom
@@ -327,7 +328,6 @@ WITH_DVD_DEVICE?=/dev/acd0
post-patch:
@${REINPLACE_CMD} \
-e '\|LIBS|s|-lrt||' \
- -e 's|gnutls |gnutls3 |g' \
-e 's|LIBS="-llirc_client|LIBS="$$LIBS_lirc|' \
${WRKSRC}/configure
@${REINPLACE_CMD} -e 's|/dev/cdrom|${WITH_CDROM_DEVICE}|g' \
diff --git a/net-im/finch/Makefile b/net-im/finch/Makefile
index 94e0ce014ca7..525c4ef53cfd 100644
--- a/net-im/finch/Makefile
+++ b/net-im/finch/Makefile
@@ -3,7 +3,7 @@
# $MCom: ports-stable/net-im/gaim-consoleui-devel/Makefile,v 1.2 2006/10/29 18:55:28 marcus Exp $
PORTNAME= finch
-PORTREVISION= 5
+PORTREVISION= 6
MAINTAINER= marcus@FreeBSD.org
COMMENT= Finch multi-protocol messaging client (Console UI)
diff --git a/net-im/gloox/Makefile b/net-im/gloox/Makefile
index 8f39ef88a189..3a5abe21c059 100644
--- a/net-im/gloox/Makefile
+++ b/net-im/gloox/Makefile
@@ -3,7 +3,7 @@
PORTNAME= gloox
PORTVERSION= 1.0.10
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= net-im
MASTER_SITES= http://camaya.net/download/
diff --git a/net-im/jabber.el/Makefile b/net-im/jabber.el/Makefile
index dae02328dc98..ef2b3f9c751d 100644
--- a/net-im/jabber.el/Makefile
+++ b/net-im/jabber.el/Makefile
@@ -3,6 +3,7 @@
PORTNAME= jabber.el
PORTVERSION= 0.8.92
+PORTREVISION= 1
CATEGORIES= net-im elisp
MASTER_SITES= SF/emacs-jabber/emacs-jabber%20beta%20versions/${PORTVERSION}
DISTNAME= emacs-jabber-${PORTVERSION}
diff --git a/net-im/jabber/Makefile b/net-im/jabber/Makefile
index 6c523c0a2326..6e6d3532277a 100644
--- a/net-im/jabber/Makefile
+++ b/net-im/jabber/Makefile
@@ -3,7 +3,7 @@
PORTNAME= jabber
PORTVERSION= 1.6.1.1
-PORTREVISION= 15
+PORTREVISION= 16
PORTEPOCH= 1
CATEGORIES= net-im ipv6
MASTER_SITES= http://download.jabberd.org/jabberd14/%SUBDIR%/
diff --git a/net-im/jabber/files/patch-configure b/net-im/jabber/files/patch-configure
index 89cd51559276..57a16dcd4023 100644
--- a/net-im/jabber/files/patch-configure
+++ b/net-im/jabber/files/patch-configure
@@ -8,6 +8,15 @@
#include <sys/types.h>
#include <sys/socket.h>
#include <netdb.h>
+@@ -21878,7 +21879,7 @@
+ echo "${ECHO_T}yes" >&6; }
+ hasgnutlsextra=yes
+ fi
+-if test $hasgnutls = "yes" ; then
++if test $hasgnutlsextra = "yes" ; then
+ CPPFLAGS="$CPPFLAGS $GNUTLSEXTRA_CFLAGS"
+ LDFLAGS="$LDFLAGS $GNUTLSEXTRA_LIBS"
+
@@ -22554,7 +22555,7 @@
if test "${with_mysql+set}" = set; then
withval=$with_mysql; mysql=$withval
@@ -15,7 +24,7 @@
- mysql=yes
+ mysql=no
fi
-
+
if test "$mysql" != "no"; then
@@ -22778,7 +22779,7 @@
if test "${with_postgresql+set}" = set; then
@@ -24,7 +33,7 @@
- postgresql=yes
+ postgresql=no
fi
-
+
if test "$postgresql" != "no"; then
@@ -22787,8 +22788,8 @@
CPPFLAGS="${CPPFLAGS} -I$postgresql/include"
diff --git a/net-im/jabber/files/patch-jabberd-jabberd.h b/net-im/jabber/files/patch-jabberd-jabberd.h
new file mode 100644
index 000000000000..349e9f50117a
--- /dev/null
+++ b/net-im/jabber/files/patch-jabberd-jabberd.h
@@ -0,0 +1,14 @@
+--- jabberd/jabberd.h.orig
++++ jabberd/jabberd.h
+@@ -103,10 +103,10 @@
+ #include <jabberdlib.h>
+ #include <gnutls/gnutls.h>
+ #include <gnutls/x509.h>
++#include <gnutls/openpgp.h>
+
+ #ifdef HAVE_GNUTLS_EXTRA
+ # include <gnutls/extra.h>
+-# include <gnutls/openpgp.h>
+ #endif
+
+ /** Packet types */
diff --git a/net-im/jabber/files/patch-jabberd-mio_tls.cc b/net-im/jabber/files/patch-jabberd-mio_tls.cc
index 1a945861ceb2..433dd4eba8d7 100644
--- a/net-im/jabber/files/patch-jabberd-mio_tls.cc
+++ b/net-im/jabber/files/patch-jabberd-mio_tls.cc
@@ -59,7 +59,23 @@
return false;
/* XXX we have to delete the structure on shutdown using asn1_delete_structure(&mio_tls_asn1_tree) */
}
-@@ -1684,14 +1666,14 @@
+@@ -1498,7 +1480,6 @@
+ const gnutls_datum_t *cert_list = NULL;
+ unsigned int cert_list_size = 0;
+
+-#ifdef HAVE_GNUTLS_EXTRA
+ // 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 @@
+ // free memory
+ gnutls_openpgp_key_deinit(pgpkey);
+ pool_free(jidpool);
+-#endif
+ return 0;
+ }
+
+@@ -1684,14 +1664,14 @@
/* init subjectAltName_element */
ret = asn1_create_element(mio_tls_asn1_tree, "PKIX1.SubjectAltName", &subjectAltName_element);
if (ret != ASN1_SUCCESS) {
@@ -76,7 +92,7 @@
asn1_delete_structure(&subjectAltName_element);
break;
}
-@@ -1712,7 +1694,7 @@
+@@ -1712,7 +1692,7 @@
break;
}
if (ret != ASN1_SUCCESS) {
@@ -85,7 +101,7 @@
break;
}
-@@ -1732,7 +1714,7 @@
+@@ -1732,7 +1712,7 @@
ret = asn1_read_value(subjectAltName_element, access_string, dNSName, &dNSName_len);
if (ret != ASN1_SUCCESS) {
@@ -94,7 +110,7 @@
break;
}
-@@ -1772,7 +1754,7 @@
+@@ -1772,7 +1752,7 @@
/* get the OID of the otherName */
ret = asn1_read_value(subjectAltName_element, access_string_type, otherNameType, &otherNameType_len);
if (ret != ASN1_SUCCESS) {
@@ -103,7 +119,7 @@
break;
}
-@@ -1785,7 +1767,7 @@
+@@ -1785,7 +1765,7 @@
/* get the value of the otherName */
ret = asn1_read_value(subjectAltName_element, access_string_value, otherNameValue, &otherNameValue_len);
if (ret != ASN1_SUCCESS) {
@@ -112,7 +128,7 @@
break;
}
-@@ -1799,21 +1781,21 @@
+@@ -1799,21 +1779,21 @@
ret = asn1_create_element(mio_tls_asn1_tree, "PKIX1.DirectoryString", &directoryString_element);
if (ret != ASN1_SUCCESS) {
diff --git a/net-im/libpurple/Makefile b/net-im/libpurple/Makefile
index 5ae36fb0e2b7..157a8b497ea7 100644
--- a/net-im/libpurple/Makefile
+++ b/net-im/libpurple/Makefile
@@ -4,7 +4,7 @@
PORTNAME?= libpurple
PORTVERSION= 2.10.9
-PORTREVISION?= 5
+PORTREVISION?= 6
CATEGORIES?= net-im
MASTER_SITES= SF/pidgin/Pidgin/${PORTVERSION}
DISTNAME= pidgin-${PORTVERSION}
diff --git a/net-im/loudmouth/Makefile b/net-im/loudmouth/Makefile
index 6f639767c422..da272bc97ee0 100644
--- a/net-im/loudmouth/Makefile
+++ b/net-im/loudmouth/Makefile
@@ -3,7 +3,7 @@
PORTNAME= loudmouth
PORTVERSION= 1.4.3
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= net-im gnome
MASTER_SITES= GNOME
diff --git a/net-p2p/gtk-gnutella/Makefile b/net-p2p/gtk-gnutella/Makefile
index b1bb2db4640e..8fd190c43c75 100644
--- a/net-p2p/gtk-gnutella/Makefile
+++ b/net-p2p/gtk-gnutella/Makefile
@@ -34,7 +34,7 @@
PORTNAME= gtk-gnutella
PORTVERSION= 1.0.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= net-p2p ipv6
MASTER_SITES= SF
diff --git a/net-p2p/ncdc/Makefile b/net-p2p/ncdc/Makefile
index 4d7c613ba24c..e31ef14c0e0a 100644
--- a/net-p2p/ncdc/Makefile
+++ b/net-p2p/ncdc/Makefile
@@ -3,7 +3,7 @@
PORTNAME= ncdc
PORTVERSION= 1.19.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= net-p2p
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION} \
http://dev.yorhel.nl/download/
diff --git a/net/csync2/Makefile b/net/csync2/Makefile
index 642a56814a1a..86c890b1634d 100644
--- a/net/csync2/Makefile
+++ b/net/csync2/Makefile
@@ -3,7 +3,7 @@
PORTNAME= csync2
PORTVERSION= 1.34
-PORTREVISION= 15
+PORTREVISION= 16
CATEGORIES= net
MASTER_SITES= http://oss.linbit.com/csync2/ \
http://people.freebsd.org/~aaron/distfiles/
diff --git a/net/glib-networking/Makefile b/net/glib-networking/Makefile
index 1ce1b311c699..63331e729f1b 100644
--- a/net/glib-networking/Makefile
+++ b/net/glib-networking/Makefile
@@ -4,7 +4,7 @@
PORTNAME= glib-networking
PORTVERSION= 2.36.2
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= net
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/net/gtk-vnc/Makefile b/net/gtk-vnc/Makefile
index bfbb36e79028..291f76f265d5 100644
--- a/net/gtk-vnc/Makefile
+++ b/net/gtk-vnc/Makefile
@@ -3,7 +3,7 @@
PORTNAME= gtk-vnc
PORTVERSION= 0.3.10
-PORTREVISION= 10
+PORTREVISION= 11
CATEGORIES= net gnome
MASTER_SITES= GNOME
diff --git a/net/libgnetwork/Makefile b/net/libgnetwork/Makefile
index 6717f32f9846..86bd63400057 100644
--- a/net/libgnetwork/Makefile
+++ b/net/libgnetwork/Makefile
@@ -3,7 +3,7 @@
PORTNAME= libgnetwork
PORTVERSION= 0.0.9
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= net gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/net/libvncserver/Makefile b/net/libvncserver/Makefile
index d085070b458b..850e9e05df2d 100644
--- a/net/libvncserver/Makefile
+++ b/net/libvncserver/Makefile
@@ -3,7 +3,7 @@
PORTNAME= libvncserver
PORTVERSION= 0.9.9
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= net devel
MASTER_SITES= SF
DISTNAME= LibVNCServer-${PORTVERSION}
diff --git a/net/morebalance/Makefile b/net/morebalance/Makefile
index f4e7e1f491e8..e90289fac563 100644
--- a/net/morebalance/Makefile
+++ b/net/morebalance/Makefile
@@ -3,7 +3,7 @@
PORTNAME= morebalance
PORTVERSION= 0.4
-PORTREVISION= 11
+PORTREVISION= 12
CATEGORIES= net
MASTER_SITES= http://morebalance.coolprojects.org/
diff --git a/net/net6/Makefile b/net/net6/Makefile
index 957ff9f3a9f3..d1a68f948023 100644
--- a/net/net6/Makefile
+++ b/net/net6/Makefile
@@ -3,7 +3,7 @@
PORTNAME= net6
PORTVERSION= 1.3.14
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= net devel
MASTER_SITES= http://releases.0x539.de/net6/
diff --git a/net/remmina-plugins/Makefile b/net/remmina-plugins/Makefile
index 858d967e149c..bcadf1ca6267 100644
--- a/net/remmina-plugins/Makefile
+++ b/net/remmina-plugins/Makefile
@@ -3,7 +3,7 @@
PORTNAME?= remmina-plugins
PORTVERSION= 1.0.0
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= net gnome
USE_GITHUB= yes
GH_ACCOUNT= FreeRDP
diff --git a/net/samba4/Makefile b/net/samba4/Makefile
index 733daac2d66c..c22c9530aa4a 100644
--- a/net/samba4/Makefile
+++ b/net/samba4/Makefile
@@ -3,7 +3,7 @@
PORTNAME?= ${SAMBA4_BASENAME}4
PORTVERSION?= ${SAMBA4_VERSION}
-PORTREVISION?= 0
+PORTREVISION?= 1
CATEGORIES?= net
MASTER_SITES= ${MASTER_SITE_SAMBA}
MASTER_SITE_SUBDIR= samba/stable samba/rc
diff --git a/net/samba41/Makefile b/net/samba41/Makefile
index 1da6cfea5ecf..6cb324213827 100644
--- a/net/samba41/Makefile
+++ b/net/samba41/Makefile
@@ -3,7 +3,7 @@
PORTNAME?= ${SAMBA4_BASENAME}41
PORTVERSION?= ${SAMBA4_VERSION}
-PORTREVISION?= 0
+PORTREVISION?= 1
CATEGORIES?= net
MASTER_SITES= ${MASTER_SITE_SAMBA}
MASTER_SITE_SUBDIR= samba/stable samba/rc
diff --git a/net/sixxs-aiccu/Makefile b/net/sixxs-aiccu/Makefile
index 6b2bcc5bf4cd..c0725fa5bc02 100644
--- a/net/sixxs-aiccu/Makefile
+++ b/net/sixxs-aiccu/Makefile
@@ -3,7 +3,7 @@
PORTNAME= aiccu
PORTVERSION= 20070115
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= net ipv6
MASTER_SITES= http://www.sixxs.net/archive/sixxs/aiccu/unix/
PKGNAMEPREFIX= sixxs-
diff --git a/net/spserver/Makefile b/net/spserver/Makefile
index 1b7bfc61f57e..b7431aa96f77 100644
--- a/net/spserver/Makefile
+++ b/net/spserver/Makefile
@@ -3,7 +3,7 @@
PORTNAME= spserver
PORTVERSION= 0.9.5
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= net
MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
DISTNAME= ${PORTNAME}-${PORTVERSION}.src
diff --git a/net/tigervnc/Makefile b/net/tigervnc/Makefile
index 45495c0f96d4..14bab201a6c6 100644
--- a/net/tigervnc/Makefile
+++ b/net/tigervnc/Makefile
@@ -3,7 +3,7 @@
PORTNAME= tigervnc
PORTVERSION= 1.3.1
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= net x11-servers
MASTER_SITES= SF:tigervnc
MASTER_SITE_SUBDIR= ${PORTNAME}/${PORTNAME}/${PORTVERSION}/:tigervnc
diff --git a/net/vino/Makefile b/net/vino/Makefile
index 9ec939fcdb9b..c4f37af9fe6e 100644
--- a/net/vino/Makefile
+++ b/net/vino/Makefile
@@ -4,7 +4,7 @@
PORTNAME= vino
PORTVERSION= 2.32.2
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= net gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/net/wireshark/Makefile b/net/wireshark/Makefile
index 9913cb106f71..535dcd9fe3f9 100644
--- a/net/wireshark/Makefile
+++ b/net/wireshark/Makefile
@@ -3,6 +3,7 @@
PORTNAME?= wireshark
PORTVERSION= 1.10.8
+PORTREVISION= 1
CATEGORIES= net ipv6
MASTER_SITES= http://www.wireshark.org/download/src/ \
http://ftp.uni-kl.de/pub/wireshark/src/ \
diff --git a/news/nzbget/Makefile b/news/nzbget/Makefile
index 307e31acbd77..6fe120f948cd 100644
--- a/news/nzbget/Makefile
+++ b/news/nzbget/Makefile
@@ -3,7 +3,7 @@
PORTNAME= nzbget
PORTVERSION= 12.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= news
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-stable/${PORTVERSION}
diff --git a/print/cups-base/Makefile b/print/cups-base/Makefile
index 24eb810735ab..ef3a7604c0b9 100644
--- a/print/cups-base/Makefile
+++ b/print/cups-base/Makefile
@@ -51,7 +51,7 @@ USERS= cups
# UNIQUENAME must be set before bsd.port.pre.mk so OPTIONSFILE can be included
.if defined(CUPS_CLIENT)
-PORTREVISION= 0
+PORTREVISION= 1
LICENSE= LGPL21
CUPS_SUFFIX= -client
OPTIONS_SINGLE= SSL
diff --git a/security/Makefile b/security/Makefile
index ddca476bbede..95c756feee2c 100644
--- a/security/Makefile
+++ b/security/Makefile
@@ -154,7 +154,6 @@
SUBDIR += gnupg
SUBDIR += gnupg1
SUBDIR += gnutls
- SUBDIR += gnutls3
SUBDIR += go.crypto
SUBDIR += goptlib
SUBDIR += gorilla
diff --git a/security/gnomint/Makefile b/security/gnomint/Makefile
index 76a12cc403ad..fce89b2521a4 100644
--- a/security/gnomint/Makefile
+++ b/security/gnomint/Makefile
@@ -3,7 +3,7 @@
PORTNAME= gnomint
PORTVERSION= 1.2.1
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= security
MASTER_SITES= SF
@@ -23,7 +23,8 @@ GNU_CONFIGURE= yes
USES= gmake perl5 pkgconfig readline
USE_GNOME= gconf2 gdkpixbuf2 glib20 gtk20
-CFLAGS:= ${CFLAGS:C/-Werror//}
+CPPFLAGS+= -I${LOCALBASE}/include
+LIBS+= -L${LOCALBASE}/lib
OPTIONS_DEFINE= NLS
OPTIONS_SUB= yes
diff --git a/security/gnomint/files/patch-src__import.c b/security/gnomint/files/patch-src__import.c
new file mode 100644
index 000000000000..9b980148722b
--- /dev/null
+++ b/security/gnomint/files/patch-src__import.c
@@ -0,0 +1,29 @@
+--- src/import.c.orig 2010-05-31 23:01:37.000000000 +0200
++++ src/import.c 2014-07-22 16:11:44.000000000 +0200
+@@ -695,7 +695,7 @@
+
+ // After having all the parts unencrypted, we import all certificates first.
+ for (i=0; i<n_bags; i++) {
+- gnutls_pkcs12_bag * pkcs12_bag = g_array_index (pkcs_bag_array, gnutls_pkcs12_bag_t *, i);
++ gnutls_pkcs12_bag_t * pkcs12_bag = g_array_index (pkcs_bag_array, gnutls_pkcs12_bag_t *, i);
+ guint num_elements_in_bag = gnutls_pkcs12_bag_get_count (*pkcs12_bag);
+
+ for (i=0; i < num_elements_in_bag; i++) {
+@@ -722,7 +722,7 @@
+
+ // Then, we import all PKCS8 private keys.
+ for (i=0; i<n_bags; i++) {
+- gnutls_pkcs12_bag * pkcs12_bag = g_array_index (pkcs_bag_array, gnutls_pkcs12_bag_t *, i);
++ gnutls_pkcs12_bag_t * pkcs12_bag = g_array_index (pkcs_bag_array, gnutls_pkcs12_bag_t *, i);
+ guint num_elements_in_bag = gnutls_pkcs12_bag_get_count (*pkcs12_bag);
+
+ for (i=0; i < num_elements_in_bag; i++) {
+@@ -796,7 +796,7 @@
+ // Then we import the CRLs
+
+ for (i=0; i<n_bags; i++) {
+- gnutls_pkcs12_bag * pkcs12_bag = g_array_index (pkcs_bag_array, gnutls_pkcs12_bag_t *, i);
++ gnutls_pkcs12_bag_t * pkcs12_bag = g_array_index (pkcs_bag_array, gnutls_pkcs12_bag_t *, i);
+ guint num_elements_in_bag = gnutls_pkcs12_bag_get_count (*pkcs12_bag);
+
+ for (i=0; i < num_elements_in_bag; i++) {
diff --git a/security/gnutls/Makefile b/security/gnutls/Makefile
index fae43d4505c2..4df5ade03f0e 100644
--- a/security/gnutls/Makefile
+++ b/security/gnutls/Makefile
@@ -1,95 +1,51 @@
-# Created by: Sergei Kolobov <sergei@kolobov.com>
# $FreeBSD$
PORTNAME= gnutls
-PORTVERSION= 2.12.23
-PORTREVISION= 6
+PORTVERSION= 3.2.15
CATEGORIES= security net
-MASTER_SITES= \
- ftp://ftp.gnutls.org/gcrypt/gnutls/v${PORTVERSION:C/.[0-9]+$//}/ \
- http://www.ring.gr.jp/pub/net/gnupg/gnutls/v${PORTVERSION:C/.[0-9]+$//}/
+MASTER_SITES= GNUPG/gnutls/v3.2
-MAINTAINER= novel@FreeBSD.org
+MAINTAINER= bdrewery@FreeBSD.org
COMMENT= GNU Transport Layer Security library
-LICENSE= GPLv3
+LICENSE= GPLv3 LGPL21
+LICENSE_COMB= multi
+LICENSE_FILE_GPLv3= ${WRKSRC}/COPYING
+LICENSE_FILE_LGPL21= ${WRKSRC}/COPYING.LESSER
LIB_DEPENDS= libnettle.so:${PORTSDIR}/security/nettle \
- libgpg-error.so:${PORTSDIR}/security/libgpg-error \
- libp11-kit.so:${PORTSDIR}/security/p11-kit
+ libp11-kit.so:${PORTSDIR}/security/p11-kit \
+ libidn.so:${PORTSDIR}/dns/libidn \
+ libtasn1.so:${PORTSDIR}/security/libtasn1 \
+ libtspi.so:${PORTSDIR}/security/trousers
-CONFLICTS= gnutls-devel-[0-9]*
-
-USES= gmake iconv libtool:keepla pathfix perl5 pkgconfig shebangfix tar:bzip2
-USE_PERL5= build
-GNU_CONFIGURE= yes
+USES= gmake iconv libtool makeinfo pathfix pkgconfig tar:xz
USE_LDCONFIG= yes
-SHEBANG_FILES= doc/scripts/gdoc doc/scripts/sort2.pl
+GNU_CONFIGURE= yes
+CONFIGURE_ARGS= --disable-guile \
+ --disable-silent-rules \
+ --enable-local-libopts
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
-CONFIGURE_ARGS+= --disable-guile
-CONFIGURE_ARGS_PREFIX= ${STAGEDIR}${PREFIX}
-
-INFO= gnutls
-
-OPTIONS_DEFINE= LIBTASN1 CXX LZO NLS EXAMPLES DOCS
-
-LIBTASN1_DESC= Use system libtasn1 instead of local one
-CXX_DESC= Install C++ library
-LZO_DESC= LZO compression
-
-OPTIONS_DEFAULT= LIBTASN1 CXX
-
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MLIBTASN1}
-LIB_DEPENDS+= libtasn1.so:${PORTSDIR}/security/libtasn1
-.else
-CONFIGURE_ARGS+= --with-included-libtasn1
-.endif
+MAKE_ENV= MAKEINFOFLAGS=--no-split
-.if ${PORT_OPTIONS:MLZO}
-LIB_DEPENDS+= liblzo2.so:${PORTSDIR}/archivers/lzo2
-CONFIGURE_ARGS+= --with-lzo
-.else
-CONFIGURE_ARGS+= --with-lzo=no
-.endif
+OPTIONS_DEFINE= EXAMPLES LIBDANE NLS
+OPTIONS_SUB= yes
-.if ${PORT_OPTIONS:MCXX}
-PLIST_SUB+= CXX=""
-.else
-CONFIGURE_ARGS+= --disable-cxx
-PLIST_SUB+= CXX="@comment "
-.endif
+LIBDANE_DESC= DNSSEC support for DANE (danetool --check)
+LIBDANE_LIB_DEPENDS= libunbound.so:${PORTSDIR}/dns/unbound
+LIBDANE_CONFIGURE_ENABLE= libdane
-.if ${PORT_OPTIONS:MNLS}
-USES+= gettext
-PLIST_SUB+= NLS=""
-.else
-CONFIGURE_ARGS+= --disable-nls
-PLIST_SUB+= NLS="@comment "
-.endif
+NLS_CONFIGURE_ENABLE= nls
+NLS_USES= gettext
-PORTDOCS= AUTHORS NEWS README THANKS
-PORTEXAMPLES= *.c
+INFO= gnutls gnutls-guile
post-patch:
- @${FIND} ${WRKSRC} -name "Makefile.in" -type f |\
- ${XARGS} ${REINPLACE_CMD} -e 's|[$$][(]LTLIBPTHREAD[)]||g'
- @${REINPLACE_CMD} -e 's|/usr/bin/perl|${PREFIX}/bin/perl|g' \
- ${WRKSRC}/doc/doxygen/Doxyfile.in
+ @${RM} ${WRKSRC}/doc/*.info*
post-install:
-.if ${PORT_OPTIONS:MEXAMPLES}
@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
- cd ${WRKSRC} && ${INSTALL_DATA} ${PORTEXAMPLES:C,^,doc/examples/,} \
- ${STAGEDIR}${EXAMPLESDIR}
-.endif
-.if ${PORT_OPTIONS:MDOCS}
- @${MKDIR} ${STAGEDIR}${DOCSDIR}
-.for i in ${PORTDOCS}
- @${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR}
-.endfor
-.endif
+ ${INSTALL_DATA} ${WRKSRC}/doc/examples/*.[ch] ${STAGEDIR}${EXAMPLESDIR}
.include <bsd.port.mk>
diff --git a/security/gnutls/distinfo b/security/gnutls/distinfo
index 90e6550adaed..24ca8ed3bf38 100644
--- a/security/gnutls/distinfo
+++ b/security/gnutls/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnutls-2.12.23.tar.bz2) = dfa67a7e40727eb0913e75f3c44911d5d8cd58d1ead5acfe73dd933fc0d17ed2
-SIZE (gnutls-2.12.23.tar.bz2) = 7279415
+SHA256 (gnutls-3.2.15.tar.xz) = 30bdc7b34b220258f714602cdf0afa1abf0883bf926f35f400c88b1c72ca77b9
+SIZE (gnutls-3.2.15.tar.xz) = 5140200
diff --git a/security/gnutls/files/patch-doc-scripts-gdoc b/security/gnutls/files/patch-doc-scripts-gdoc
deleted file mode 100644
index e5b359c4bbea..000000000000
--- a/security/gnutls/files/patch-doc-scripts-gdoc
+++ /dev/null
@@ -1,612 +0,0 @@
---- doc/scripts/gdoc.orig 2014-01-13 15:08:22.000000000 +0400
-+++ doc/scripts/gdoc 2014-01-13 15:10:10.000000000 +0400
-@@ -7,6 +7,8 @@
- ## Copyright (c) 2001, 2002 Nikos Mavrogiannopoulos
- ## added -tex
- ## Copyright (c) 1998 Michael Zucchi
-+## Copyright (c) 2013 Adam Sampson
-+## made highlighting not depend on hash order, for Perl 5.18
-
- # This program is free software: you can redistribute it and/or modify
- # it under the terms of the GNU General Public License as published by
-@@ -132,57 +134,59 @@
- use POSIX qw(strftime);
-
- # match expressions used to find embedded type information
--$type_constant = "((?<!\")\\\%(\\w+))";
--$type_func = "(\\w+\\(\\))";
--$type_param = "\\\@(\\w+)";
--$type_struct = "\\\#(\\w+)";
--$type_env = "(\\\$\\w+)";
-+$type_constant = "\\\%([A-Za-z0-9_]+)";
-+$type_func = "([A-Za-z0-9_]+\\(\\))";
-+$type_param = '\@([A-Za-z0-9_]+)\s*';
-+$type_struct = "\\\#([A-Za-z0-9_]+)";
-+$type_env = "(\\\$[A-Za-z0-9_]+)";
-
-
- # Output conversion substitutions.
- # One for each output format
-
- # these work fairly well
--%highlights_html = ( $type_constant, "<i>\$2</i>",
-- $type_func, "<b>\$1</b>",
-- $type_struct, "<i>\$1</i>",
-- $type_param, "<tt><b>\$1</b></tt>" );
-+@highlights_html = ( [$type_constant, '"<i>$1</i>"'],
-+ [$type_func, '"<b>$1</b>"'],
-+ [$type_struct, '"<i>$1</i>"'],
-+ [$type_param, '" <tt><b>$1</b></tt> "'] );
- $blankline_html = "<p>";
-
--%highlights_texinfo = ( $type_constant, "\\\@code{\$2}",
-- $type_func, "\\\@code{\$1}",
-- $type_struct, "\\\@code{\$1}",
-- $type_param, "\\\@code{\$1}" );
-+@highlights_texinfo = ( [$type_param, '" \@code{$1} "'],
-+ [$type_constant, '"\@code{$1} "'],
-+ [$type_func, '"\@code{$1} "'],
-+ [$type_struct, '"\@code{$1} "'],
-+ );
- $blankline_texinfo = "";
-
--%highlights_tex = ( $type_constant, "{\\\\it \$2}",
-- $type_func, "{\\\\bf \$1}",
-- $type_struct, "{\\\\it \$1}",
-- $type_param, "{\\\\bf \$1}" );
-+@highlights_tex = ( [$type_param, '" {\\\bf $1} "'],
-+ [$type_constant, '"{\\\it $1}"'],
-+ [$type_func, '"{\\\bf $1}"'],
-+ [$type_struct, '"{\\\it $1}"'],
-+ );
- $blankline_tex = "\\\\";
-
- # sgml, docbook format
--%highlights_sgml = ( $type_constant, "<replaceable class=\"option\">\$2</replaceable>",
-- $type_func, "<function>\$1</function>",
-- $type_struct, "<structname>\$1</structname>",
-- $type_env, "<envar>\$1</envar>",
-- $type_param, "<parameter>\$1</parameter>" );
-+@highlights_sgml = ( [$type_constant, '"<replaceable class=\"option\">$1</replaceable>"'],
-+ [$type_func, '"<function>$1</function>"'],
-+ [$type_struct, '"<structname>$1</structname>"'],
-+ [$type_env, '"<envar>$1</envar>"'],
-+ [$type_param, '" <parameter>$1</parameter> "'] );
- $blankline_sgml = "</para><para>\n";
-
- # these are pretty rough
--%highlights_man = ( $type_constant, "\\\\fB\$2\\\\fP",
-- $type_func, "\\\\fB\$1\\\\fP",
-- $type_struct, "\\\\fB\$1\\\\fP",
-- $type_param, "\\\\fI\$1\\\\fP" );
-+@highlights_man = ( [$type_constant, '"\\\fB$1\\\fP"'],
-+ [$type_func, '"\\\fB$1\\\fP"'],
-+ [$type_struct, '"\\\fB$1\\\fP"'],
-+ [$type_param, '" \\\fI$1\\\fP "'] );
- $blankline_man = "";
-
- # text-mode
--%highlights_text = ( $type_constant, "\$2",
-- $type_func, "\$1",
-- $type_struct, "\$1",
-- $type_param, "\$1" );
-+@highlights_text = ( [$type_constant, '"$1"'],
-+ [$type_func, '"$1"'],
-+ [$type_struct, '"$1"'],
-+ [$type_param, '"$1 "'] );
- $blankline_text = "";
--
-+my $lineprefix = "";
-
- sub usage {
- print "Usage: $0 [ -v ] [ -docbook | -html | -text | -man | -tex | -texinfo -listfunc ]\n";
-@@ -201,7 +205,7 @@
-
- $verbose = 0;
- $output_mode = "man";
--%highlights = %highlights_man;
-+@highlights = @highlights_man;
- $blankline = $blankline_man;
- $modulename = "API Documentation";
- $sourceversion = strftime "%Y-%m-%d", localtime;
-@@ -210,27 +214,27 @@
- $cmd = shift @ARGV;
- if ($cmd eq "-html") {
- $output_mode = "html";
-- %highlights = %highlights_html;
-+ @highlights = @highlights_html;
- $blankline = $blankline_html;
- } elsif ($cmd eq "-man") {
- $output_mode = "man";
-- %highlights = %highlights_man;
-+ @highlights = @highlights_man;
- $blankline = $blankline_man;
- } elsif ($cmd eq "-tex") {
- $output_mode = "tex";
-- %highlights = %highlights_tex;
-+ @highlights = @highlights_tex;
- $blankline = $blankline_tex;
- } elsif ($cmd eq "-texinfo") {
- $output_mode = "texinfo";
-- %highlights = %highlights_texinfo;
-+ @highlights = @highlights_texinfo;
- $blankline = $blankline_texinfo;
- } elsif ($cmd eq "-text") {
- $output_mode = "text";
-- %highlights = %highlights_text;
-+ @highlights = @highlights_text;
- $blankline = $blankline_text;
- } elsif ($cmd eq "-docbook") {
- $output_mode = "sgml";
-- %highlights = %highlights_sgml;
-+ @highlights = @highlights_sgml;
- $blankline = $blankline_sgml;
- } elsif ($cmd eq "-listfunc") {
- $output_mode = "listfunc";
-@@ -270,6 +274,8 @@
- my $name = shift @_;
- my $contents = join "\n", @_;
-
-+ $name = " $name";
-+
- if ($name =~ m/$type_constant/) {
- $name = $1;
- # print STDERR "constant section '$1' = '$contents'\n";
-@@ -280,6 +286,7 @@
- $parameters{$name} = $contents;
- } else {
- # print STDERR "other section '$name' = '$contents'\n";
-+ $name =~ tr/ //d;
- $sections{$name} = $contents;
- push @sectionlist, $name;
- }
-@@ -296,35 +303,15 @@
- # sections => %descriont descriptions
- #
-
--sub repstr {
-- $pattern = shift;
-- $repl = shift;
-- $match1 = shift;
-- $match2 = shift;
-- $match3 = shift;
-- $match4 = shift;
--
-- $output = $repl;
-- $output =~ s,\$1,$match1,g;
-- $output =~ s,\$2,$match2,g;
-- $output =~ s,\$3,$match3,g;
-- $output =~ s,\$4,$match4,g;
--
-- eval "\$return = qq/$output/";
--
--# print "pattern $pattern matched 1=$match1 2=$match2 3=$match3 4=$match4 replace $repl yielded $output interpolated $return\n";
--
-- $return;
--}
--
- sub just_highlight {
- my $contents = join "\n", @_;
- my $line;
- my $ret = "";
-
-- foreach $pattern (keys %highlights) {
--# print "scanning pattern $pattern ($highlights{$pattern})\n";
-- $contents =~ s:$pattern:repstr($pattern, $highlights{$pattern}, $1, $2, $3, $4):gse;
-+ foreach $highlight (@highlights) {
-+ my ($pattern, $replace) = @$highlight;
-+ #print "scanning pattern $pattern ($replace)\n";
-+ $contents =~ s/$pattern/$replace/gees;
- }
- foreach $line (split "\n", $contents) {
- if ($line eq ""){
-@@ -370,13 +357,45 @@
- }
- }
- foreach $section (@{$args{'sectionlist'}}) {
-+ $section =~ s/\@//g;
- print "\n\@strong{$section:} " if $section ne $section_default;
-- $args{'sections'}{$section} =~ s:([{}]):\@\1:gs;
-+ $args{'sections'}{$section} =~ s:([{}]):\@$1:gs;
- output_highlight($args{'sections'}{$section});
- }
- print "\@end deftypefun\n\n";
- }
-
-+sub output_enum_texinfo {
-+ my %args = %{$_[0]};
-+ my ($parameter, $section);
-+ my $count;
-+ my $name = $args{'enum'};
-+ my $param;
-+ my $param2;
-+ my $sec;
-+ my $check;
-+ my $type;
-+
-+ print "\n\@c $name\n";
-+ print "\@table \@code\n";
-+
-+ $check=0;
-+ foreach $parameter (@{$args{'parameterlist'}}) {
-+ $param1 = $parameter;
-+ $param1 =~ s/_/_\@-/g;
-+
-+ $check = 1;
-+ print "\@item ".$param1."\n";
-+# print "\n";
-+
-+ $param2 = $args{'parameters'}{$parameter};
-+ $out = just_highlight($param2);
-+ chomp $out;
-+ print $out . "\n";
-+ }
-+ print "\@end table\n";
-+}
-+
- # output in html
- sub output_html {
- my %args = %{$_[0]};
-@@ -428,7 +447,9 @@
-
- $func =~ s/_/\\_/g;
-
-- print "\n\n\\subsection{". $func . "}\n\\label{" . $args{'function'} . "}\n";
-+ print "\n\n\\begin{function}\n";
-+ print "\\functionTitle{". $func . "}\n";
-+ print "\\index{". $func . "}\n";
-
- $type = $args{'functiontype'};
- $type =~ s/_/\\_/g;
-@@ -451,9 +472,8 @@
- }
- print ")\n";
-
-- print "\n{\\large{Arguments}}\n";
-+ print "\n\\begin{functionArguments}\n";
-
-- print "\\begin{itemize}\n";
- $check=0;
- foreach $parameter (@{$args{'parameterlist'}}) {
- $param1 = $args{'parametertypes'}{$parameter};
-@@ -462,11 +482,12 @@
- $param2 =~ s/_/\\_/g;
-
- $check = 1;
-- print "\\item {\\it ".$param1."} {\\bf ".$param2."}: \n";
-+ print "\\functionArgument {\\it ".$param1."} {\\bf ".$param2."}: \n";
- # print "\n";
-
- $param3 = $args{'parameters'}{$parameter};
-- $param3 =~ s/#([a-zA-Z\_]+)/{\\it \1}/g;
-+ $param3 =~ s/\#([a-zA-Z\_]+)/{\\it $1}/g;
-+ $param3 =~ s/\%([a-zA-Z\_]+)/{\\bf $1}/g;
-
- $out = just_highlight($param3);
- $out =~ s/_/\\_/g;
-@@ -475,31 +496,72 @@
- if ($check==0) {
- print "\\item void\n";
- }
-- print "\\end{itemize}\n";
-+ print "\\end{functionArguments}\n";
-
- foreach $section (@{$args{'sectionlist'}}) {
- $sec = $section;
- $sec =~ s/_/\\_/g;
-- $sec =~ s/#([a-zA-Z\_]+)/{\\it \1}/g;
-+ $sec =~ s/#([a-zA-Z\_]+)/{\\it $1}/g;
-
-- print "\n{\\large{$sec}}\\\\\n";
-- print "\\begin{rmfamily}\n";
-+ print "\n\\begin{function${sec}}\n";
-+ $out = $args{'sections'}{$section};
-
-- $sec = $args{'sections'}{$section};
-- $sec =~ s/\\:/:/g;
-- $sec =~ s/#([a-zA-Z\_]+)/{\\it \1}/g;
-- $sec =~ s/->/\$\\rightarrow\$/g;
-- $sec =~ s/([0-9]+)\^([0-9]+)/\$\{\1\}\^\{\2\}\$/g;
--
-- $out = just_highlight($sec);
-- $out =~ s/_/\\_/g;
-+ $out =~ s/\#([a-zA-Z\_]+)/{\\it $1}/g;
-+ $out =~ s/\%([a-zA-Z\_]+)/{\\bf $1}/g;
-+ $out =~ s/\@([a-zA-Z\_]+)/{\\bf $1}/g;
-+ $out =~ s/_/\\_\\-/g;
-+ $out =~ s/\$/\\\$/g;
-+ $out =~ s/#/\\#/g;
-+ $out =~ s/\n\n/\n/g;
-+ $out =~ s/\\:/:/g;
-+ $out =~ s/\-\>/\$\\rightarrow\$/g;
-+ $out =~ s/([0-9]+)\^([0-9]+)/\$\{$1\}\^\{$2\}\$/g;
-
- print $out;
-- print "\\end{rmfamily}\n";
-+ print "\\end{function${sec}}\n";
- }
-- print "\n";
-+ print "\\end{function}\n\n";
- }
-
-+sub output_enum_tex {
-+ my %args = %{$_[0]};
-+ my ($parameter, $section);
-+ my $count;
-+ my $name = $args{'enum'};
-+ my $param;
-+ my $param2;
-+ my $sec;
-+ my $check;
-+ my $type;
-+
-+ print "\n\n\\begin{enum}\n";
-+ $name =~ s/_/\\_/g;
-+ print "\\enumTitle{". $name . "}\n";
-+ print "\\index{". $name . "}\n";
-+
-+ print "\n\\begin{enumList}\n";
-+
-+ $check=0;
-+ foreach $parameter (@{$args{'parameterlist'}}) {
-+ $param1 = $parameter;
-+ $param1 =~ s/_/\\_\\-/g;
-+
-+ $check = 1;
-+ print "\\enumElement{".$param1."}{";
-+# print "\n";
-+
-+ $param2 = $args{'parameters'}{$parameter};
-+ $param2 =~ s/\#([a-zA-Z\_]+)/{\\it $1}/g;
-+ $param2 =~ s/\%([a-zA-Z\_]+)/{\\bf $1}/g;
-+ $out = just_highlight($param2);
-+ $out =~ s/_/\\_/g;
-+ chomp $out;
-+ print $out . "}\n";
-+ }
-+ print "\\end{enumList}\n";
-+
-+ print "\\end{enum}\n\n";
-+}
-
- # output in sgml DocBook
- sub output_sgml {
-@@ -639,11 +701,14 @@
- if ($args{'bugsto'}) {
- print ".SH \"REPORTING BUGS\"\n";
- print "Report bugs to <". $args{'bugsto'} . ">.\n";
-+ print ".br\n";
-+ print "General guidelines for reporting bugs: http://www.gnu.org/gethelp/\n";
-+ print ".br\n";
- if ($args{'pkgname'}) {
- print $args{'pkgname'} . " home page: " .
- "http://www.gnu.org/software/" . $args{'module'} . "/\n";
- }
-- print "General help using GNU software: http://www.gnu.org/gethelp/\n";
-+ print "\n";
- }
-
- if ($args{'copyright'}) {
-@@ -670,6 +735,10 @@
- print ".B info " . $args{'seeinfo'} . "\n";
- print ".PP\n";
- print "should give you access to the complete manual.\n";
-+ print "As an alternative you may obtain the manual from:\n";
-+ print ".IP\n";
-+ print ".B http://www.gnu.org/software/" . $args{'module'} . "/manual/\n";
-+ print ".PP\n";
- }
- }
-
-@@ -705,6 +774,10 @@
- eval "output_".$output_mode."(\@_);";
- }
-
-+sub output_enum {
-+ eval "output_enum_".$output_mode."(\@_);";
-+}
-+
-
- ##
- # takes a function prototype and spits out all the details
-@@ -744,7 +817,7 @@
- # print STDERR " :> @args\n";
- $type = join " ", @args;
-
-- if ($parameters{$param} eq "" && $param != "void") {
-+ if ((!defined($parameters{$param}) || $parameters{$param} eq "") && $param ne "void") {
- $parameters{$param} = "-- undescribed --";
- print STDERR "warning: $lineno: Function parameter '$param' not described in '$function_name'\n";
- }
-@@ -781,6 +854,56 @@
- }
- }
-
-+sub dump_enum {
-+ my $prototype = shift @_;
-+
-+ if (($prototype =~ m/^\s*typedef\s+enum\s*[a-zA-Z0-9_~:]*\s*\{([\-a-zA-Z0-9_~=,:\s\(\)\<]+)\s*\}\s*([a-zA-Z0-9_]+);.*/)) {
-+# || $prototype =~ m/^\s*enum\s+([a-zA-Z0-9_~:]+).*/) {
-+ $args = $1;
-+ $name = $2;
-+
-+ foreach $arg (split ',', $args) {
-+ # strip leading/trailing spaces
-+ $arg =~ s/^\s*//;
-+ $arg =~ s/\s*$//;
-+ $arg =~ s/([A-Za-z0-9_]+)\s*=.*/$1/g;
-+# print STDERR "SCAN ARG: '$arg'\n";
-+
-+ next if $arg eq '';
-+ if ((!defined($parameters{$arg}) || $parameters{$arg} eq "")) {
-+ $parameters{$arg} = "-- undescribed --";
-+ print STDERR "warning: $lineno: Enumeration parameter '$arg' not described in '$name'\n";
-+ }
-+
-+ push @parameterlist, $arg;
-+
-+# print STDERR "param = '$arg'\n";
-+ }
-+ } else {
-+# print STDERR "warning: $lineno: Cannot understand enumeration: '$prototype'\n";
-+ return;
-+ }
-+
-+ output_enum({'enum' => $name,
-+ 'module' => $modulename,
-+ 'sourceversion' => $sourceversion,
-+ 'include' => $include,
-+ 'includefuncprefix' => $includefuncprefix,
-+ 'bugsto' => $bugsto,
-+ 'pkgname' => $pkgname,
-+ 'copyright' => $copyright,
-+ 'verbatimcopying' => $verbatimcopying,
-+ 'seeinfo' => $seeinfo,
-+ 'functiontype' => $return_type,
-+ 'parameterlist' => \@parameterlist,
-+ 'parameters' => \%parameters,
-+ 'parametertypes' => \%parametertypes,
-+ 'sectionlist' => \@sectionlist,
-+ 'sections' => \%sections,
-+ 'purpose' => $function_purpose
-+ });
-+}
-+
- ######################################################################
- # main
- # states
-@@ -797,7 +920,7 @@
- $doc_end = "\\*/";
- $doc_com = "\\s*\\*\\s*";
- $doc_func = $doc_com."(\\w+):?";
--$doc_sect = $doc_com."([".$doc_special."[:upper:]][\\w ]+):\\s*(.*)";
-+$doc_sect = $doc_com."([".$doc_special."[:upper:]][\\w]+):\\s*(.*)";
- $doc_content = $doc_com."(.*)";
-
- %constants = ();
-@@ -809,6 +932,7 @@
- $contents = "";
- $section_default = "Description"; # default section
- $section = $section_default;
-+$enum = 0;
-
- $lineno = 0;
- foreach $file (@ARGV) {
-@@ -816,18 +940,21 @@
- print STDERR "Error: Cannot open file $file\n";
- next;
- }
-- while (<IN>) {
-+ while ($line = <IN>) {
- $lineno++;
-
- if ($state == 0) {
-- if (/$doc_start/o) {
-+ if ($line =~ /$doc_start/o) {
- $state = 1; # next line is always the function name
-+# print STDERR "XXX: start of doc comment\n";
- }
- } elsif ($state == 1) { # this line is the function name (always)
-- if (/$doc_func/o) {
-+ if ($line =~ /$doc_func/o) {
- $function = $1;
- $state = 2;
-- if (/-\s*(.*)/) {
-+# print STDERR "XXX: start of doc comment, looking for prototype\n";
-+
-+ if ($line =~ /-\s*(.*)/) {
- $function_purpose = $1;
- } else {
- $function_purpose = "";
-@@ -841,11 +968,11 @@
- $state = 0;
- }
- } elsif ($state == 2) { # look for head: lines, and include content
-- if (/$doc_sect/o) {
-+ if ($line =~ /$doc_sect/o) {
- $newsection = $1;
- $newcontents = $2;
-
-- if ($contents ne "") {
-+ if ($contents ne '') {
- dump_section($section, $contents);
- $section = $section_default;
- }
-@@ -855,7 +982,7 @@
- $contents .= "\n";
- }
- $section = $newsection;
-- } elsif (/$doc_end/) {
-+ } elsif ($line =~ /$doc_end/) {
-
- if ($contents ne "") {
- dump_section($section, $contents);
-@@ -863,13 +990,12 @@
- $contents = "";
- }
-
--# print STDERR "end of doc comment, looking for prototype\n";
- $prototype = "";
- $state = 3;
-- } elsif (/$doc_content/) {
-+ } elsif ($line =~ /$doc_content/) {
- # miguel-style comment kludge, look for blank lines after
- # @parameter line to signify start of description
-- if ($1 eq "" && $section =~ m/^@/) {
-+ if ($1 eq '' && $section =~ m/^@/) {
- dump_section($section, $contents);
- $section = $section_default;
- $contents = "";
-@@ -881,13 +1007,16 @@
- print STDERR "warning: $lineno: Bad line: $_";
- }
- } elsif ($state == 3) { # scanning for function { (end of prototype)
-- if (m#\s*/\*\s+MACDOC\s*#io) {
-+ if ($line =~ m#\s*/\*\s+MACDOC\s*#io) {
- # do nothing
- }
-- elsif (/([^\{]*)/) {
-+ elsif ($enum == 1 && $line =~ /(^\s*\{).*/) {
-+ $prototype .= "{";
-+ }
-+ elsif ($line =~ /([^\{]*)/) {
- $prototype .= $1;
- }
-- if (/\{/) {
-+ if ($enum == 0 && $line =~ /\{/) {
- $prototype =~ s@/\*.*?\*/@@gos; # strip comments.
- $prototype =~ s@[\r\n]+@ @gos; # strip newlines/cr's.
- $prototype =~ s@^ +@@gos; # strip leading spaces
-@@ -901,9 +1030,32 @@
- %sections = ();
- @sectionlist = ();
- $prototype = "";
-+ $enum = 0;
-
- $state = 0;
- }
-+ elsif ($enum == 1 && $line =~ /\}/) {
-+ $prototype =~ s@/\*.*?\*/@@gos; # strip comments.
-+ $prototype =~ s@[\r\n]+@ @gos; # strip newlines/cr's.
-+ $prototype =~ s@^ +@@gos; # strip leading spaces
-+ dump_enum($prototype);
-+
-+ $function = "";
-+ %constants = ();
-+ %parameters = ();
-+ %parametertypes = ();
-+ @parameterlist = ();
-+ %sections = ();
-+ @sectionlist = ();
-+ $prototype = "";
-+ $enum = 0;
-+
-+ $state = 0;
-+ }
-+ elsif ($line =~ /([a-zA-Z\s]+)enum(.*)$/) {
-+ $enum = 1;
-+ }
-+
- }
- }
- }
diff --git a/security/gnutls/files/patch-lib-gnutls_cipher.c b/security/gnutls/files/patch-lib-gnutls_cipher.c
deleted file mode 100644
index 700bf4951288..000000000000
--- a/security/gnutls/files/patch-lib-gnutls_cipher.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- lib/gnutls_cipher.c.orig 2013-02-04 12:53:03.000000000 +0400
-+++ lib/gnutls_cipher.c 2013-02-04 12:53:03.000000000 +0400
-@@ -561,6 +561,8 @@
- return GNUTLS_E_DECRYPTION_FAILED;
- }
- pad = ciphertext.data[ciphertext.size - 1]; /* pad */
-+ if (pad+1 > ciphertext.size-hash_size)
-+ pad_failed = GNUTLS_E_DECRYPTION_FAILED;
-
- /* Check the pading bytes (TLS 1.x).
- * Note that we access all 256 bytes of ciphertext for padding check
diff --git a/security/gnutls/files/patch-lib-gnutls_handshake.c b/security/gnutls/files/patch-lib-gnutls_handshake.c
deleted file mode 100644
index 8ecac0686495..000000000000
--- a/security/gnutls/files/patch-lib-gnutls_handshake.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- lib/gnutls_handshake.c.orig 2012-11-03 06:03:47.000000000 -0700
-+++ lib/gnutls_handshake.c 2014-06-04 07:55:49.138570114 -0700
-@@ -1797,7 +1797,7 @@
- DECR_LEN (len, 1);
- session_id_len = data[pos++];
-
-- if (len < session_id_len)
-+ if (len < session_id_len || session_id_len > TLS_MAX_SESSION_ID_SIZE)
- {
- gnutls_assert ();
- return GNUTLS_E_UNSUPPORTED_VERSION_PACKET;
diff --git a/security/gnutls/files/patch-lib__x509__verify.c b/security/gnutls/files/patch-lib__x509__verify.c
deleted file mode 100644
index a092094cd9eb..000000000000
--- a/security/gnutls/files/patch-lib__x509__verify.c
+++ /dev/null
@@ -1,103 +0,0 @@
-CVE-2014-0092
-CVE-2014-1959
-
---- ./lib/x509/verify.c.orig 2012-05-24 11:19:05.000000000 -0500
-+++ ./lib/x509/verify.c 2014-03-04 16:43:13.053087407 -0600
-@@ -141,7 +141,7 @@
- if (result < 0)
- {
- gnutls_assert ();
-- goto cleanup;
-+ goto fail;
- }
-
- result =
-@@ -150,7 +150,7 @@
- if (result < 0)
- {
- gnutls_assert ();
-- goto cleanup;
-+ goto fail;
- }
-
- result =
-@@ -158,7 +158,7 @@
- if (result < 0)
- {
- gnutls_assert ();
-- goto cleanup;
-+ goto fail;
- }
-
- result =
-@@ -166,7 +166,7 @@
- if (result < 0)
- {
- gnutls_assert ();
-- goto cleanup;
-+ goto fail;
- }
-
- /* If the subject certificate is the same as the issuer
-@@ -206,6 +206,7 @@
- else
- gnutls_assert ();
-
-+fail:
- result = 0;
-
- cleanup:
-@@ -330,7 +331,7 @@
- gnutls_datum_t cert_signed_data = { NULL, 0 };
- gnutls_datum_t cert_signature = { NULL, 0 };
- gnutls_x509_crt_t issuer = NULL;
-- int issuer_version, result;
-+ int issuer_version, result = 0;
-
- if (output)
- *output = 0;
-@@ -363,7 +364,7 @@
- if (issuer_version < 0)
- {
- gnutls_assert ();
-- return issuer_version;
-+ return 0;
- }
-
- if (!(flags & GNUTLS_VERIFY_DISABLE_CA_SIGN) &&
-@@ -385,6 +386,7 @@
- if (result < 0)
- {
- gnutls_assert ();
-+ result = 0;
- goto cleanup;
- }
-
-@@ -393,6 +395,7 @@
- if (result < 0)
- {
- gnutls_assert ();
-+ result = 0;
- goto cleanup;
- }
-
-@@ -410,6 +413,7 @@
- else if (result < 0)
- {
- gnutls_assert();
-+ result = 0;
- goto cleanup;
- }
-
-@@ -644,8 +648,10 @@
- /* note that here we disable this V1 CA flag. So that no version 1
- * certificates can exist in a supplied chain.
- */
-- if (!(flags & GNUTLS_VERIFY_ALLOW_ANY_X509_V1_CA_CRT))
-+ if (!(flags & GNUTLS_VERIFY_ALLOW_ANY_X509_V1_CA_CRT)) {
- flags &= ~(GNUTLS_VERIFY_ALLOW_X509_V1_CA_CRT);
-+ flags |= GNUTLS_VERIFY_DO_NOT_ALLOW_X509_V1_CA_CRT;
-+ }
- if ((ret =
- _gnutls_verify_certificate2 (certificate_list[i - 1],
- &certificate_list[i], 1, flags,
diff --git a/security/gnutls/pkg-descr b/security/gnutls/pkg-descr
index 6bd32088a530..25295604a378 100644
--- a/security/gnutls/pkg-descr
+++ b/security/gnutls/pkg-descr
@@ -1,17 +1,8 @@
-GnuTLS is a portable ANSI C based library which implements the TLS 1.0 and
-SSL 3.0 protocols. The library does not include any patented algorithms and
-is available under the GNU Lesser GPL license.
-
-Important features of the GnuTLS library include:
-- Thread safety
-- Support for both TLS 1.0 and SSL 3.0 protocols
-- Support for both X.509 and OpenPGP certificates
-- Support for basic parsing and verification of certificates
-- Support for SRP for TLS authentication
-- Support for TLS Extension mechanism
-- Support for TLS Compression Methods
-
-Additionaly GnuTLS provides an emulation API for the widely used
-OpenSSL library, to ease integration with existing applications.
+GnuTLS is a secure communications library implementing the SSL, TLS and DTLS
+protocols and technologies around them. It provides a simple C language
+application programming interface (API) to access the secure communications
+protocols as well as APIs to parse and write X.509, PKCS #12, OpenPGP and
+other required structures. It is aimed to be portable and efficient with
+focus on security and interoperability.
WWW: http://www.gnutls.org/
diff --git a/security/gnutls/pkg-plist b/security/gnutls/pkg-plist
index 5c69083f7081..69e018bea470 100644
--- a/security/gnutls/pkg-plist
+++ b/security/gnutls/pkg-plist
@@ -1,67 +1,74 @@
bin/certtool
+bin/danetool
bin/gnutls-cli
bin/gnutls-cli-debug
bin/gnutls-serv
+bin/ocsptool
bin/p11tool
bin/psktool
bin/srptool
-info/gnutls-certificate-user-use-case.png
-info/gnutls-client-server-use-case.png
-info/gnutls-extensions_st.png
-info/gnutls-handshake-sequence.png
-info/gnutls-handshake-state.png
-info/gnutls-internals.png
-info/gnutls-layers.png
-info/gnutls-logo.png
-info/gnutls-mod_auth_st.png
-info/gnutls-objects.png
-info/gnutls-pgp.png
-info/gnutls-x509.png
-info/pkcs11-vision.png
+bin/tpmtool
include/gnutls/abstract.h
include/gnutls/compat.h
include/gnutls/crypto.h
-include/gnutls/extra.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/tpm.h
include/gnutls/x509.h
-%%CXX%%include/gnutls/gnutlsxx.h
-%%CXX%%lib/libgnutlsxx.a
-%%CXX%%lib/libgnutlsxx.la
-%%CXX%%lib/libgnutlsxx.so
-%%CXX%%lib/libgnutlsxx.so.27
-%%CXX%%lib/libgnutlsxx.so.27.0.0
-lib/libgnutls-extra.a
-lib/libgnutls-extra.la
-lib/libgnutls-extra.so
-lib/libgnutls-extra.so.26
-lib/libgnutls-extra.so.26.22.6
+include/gnutls/xssl.h
+info/gnutls-client-server-use-case.png
+info/gnutls-handshake-sequence.png
+info/gnutls-handshake-state.png
+info/gnutls-internals.png
+info/gnutls-layers.png
+info/gnutls-logo.png
+info/gnutls-modauth.png
+info/gnutls-pgp.png
+info/gnutls-x509.png
+info/pkcs11-vision.png
+%%LIBDANE%%lib/libgnutls-dane.a
+%%LIBDANE%%lib/libgnutls-dane.so
+%%LIBDANE%%lib/libgnutls-dane.so.0
+%%LIBDANE%%lib/libgnutls-dane.so.0.4.1
lib/libgnutls-openssl.a
-lib/libgnutls-openssl.la
lib/libgnutls-openssl.so
lib/libgnutls-openssl.so.27
-lib/libgnutls-openssl.so.27.0.0
+lib/libgnutls-openssl.so.27.0.2
+lib/libgnutls-xssl.a
+lib/libgnutls-xssl.so
+lib/libgnutls-xssl.so.0
+lib/libgnutls-xssl.so.0.0.0
lib/libgnutls.a
-lib/libgnutls.la
lib/libgnutls.so
-lib/libgnutls.so.26
-lib/libgnutls.so.26.22.6
-libdata/pkgconfig/gnutls-extra.pc
+lib/libgnutls.so.28
+lib/libgnutls.so.28.30.6
+lib/libgnutlsxx.a
+lib/libgnutlsxx.so
+lib/libgnutlsxx.so.28
+lib/libgnutlsxx.so.28.1.0
libdata/pkgconfig/gnutls.pc
man/man1/certtool.1.gz
man/man1/gnutls-cli-debug.1.gz
man/man1/gnutls-cli.1.gz
man/man1/gnutls-serv.1.gz
+man/man1/ocsptool.1.gz
man/man1/p11tool.1.gz
man/man1/psktool.1.gz
man/man1/srptool.1.gz
+man/man1/tpmtool.1.gz
man/man3/gnutls_alert_get.3.gz
man/man3/gnutls_alert_get_name.3.gz
+man/man3/gnutls_alert_get_strname.3.gz
man/man3/gnutls_alert_send.3.gz
man/man3/gnutls_alert_send_appropriate.3.gz
+man/man3/gnutls_alpn_get_selected_protocol.3.gz
+man/man3/gnutls_alpn_set_protocols.3.gz
man/man3/gnutls_anon_allocate_client_credentials.3.gz
man/man3/gnutls_anon_allocate_server_credentials.3.gz
man/man3/gnutls_anon_free_client_credentials.3.gz
@@ -83,16 +90,18 @@ man/man3/gnutls_certificate_free_cas.3.gz
man/man3/gnutls_certificate_free_credentials.3.gz
man/man3/gnutls_certificate_free_crls.3.gz
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_keyring.3.gz
man/man3/gnutls_certificate_get_ours.3.gz
man/man3/gnutls_certificate_get_peers.3.gz
-man/man3/gnutls_certificate_get_x509_cas.3.gz
-man/man3/gnutls_certificate_get_x509_crls.3.gz
+man/man3/gnutls_certificate_get_peers_subkey_id.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_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
man/man3/gnutls_certificate_set_openpgp_key.3.gz
man/man3/gnutls_certificate_set_openpgp_key_file.3.gz
man/man3/gnutls_certificate_set_openpgp_key_file2.3.gz
@@ -101,8 +110,11 @@ man/man3/gnutls_certificate_set_openpgp_key_mem2.3.gz
man/man3/gnutls_certificate_set_openpgp_keyring_file.3.gz
man/man3/gnutls_certificate_set_openpgp_keyring_mem.3.gz
man/man3/gnutls_certificate_set_params_function.3.gz
+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
man/man3/gnutls_certificate_set_verify_limits.3.gz
@@ -111,9 +123,12 @@ man/man3/gnutls_certificate_set_x509_crl_file.3.gz
man/man3/gnutls_certificate_set_x509_crl_mem.3.gz
man/man3/gnutls_certificate_set_x509_key.3.gz
man/man3/gnutls_certificate_set_x509_key_file.3.gz
+man/man3/gnutls_certificate_set_x509_key_file2.3.gz
man/man3/gnutls_certificate_set_x509_key_mem.3.gz
+man/man3/gnutls_certificate_set_x509_key_mem2.3.gz
man/man3/gnutls_certificate_set_x509_simple_pkcs12_file.3.gz
man/man3/gnutls_certificate_set_x509_simple_pkcs12_mem.3.gz
+man/man3/gnutls_certificate_set_x509_system_trust.3.gz
man/man3/gnutls_certificate_set_x509_trust.3.gz
man/man3/gnutls_certificate_set_x509_trust_file.3.gz
man/man3/gnutls_certificate_set_x509_trust_mem.3.gz
@@ -122,9 +137,11 @@ 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_verify_peers.3.gz
+man/man3/gnutls_certificate_verification_status_print.3.gz
man/man3/gnutls_certificate_verify_peers2.3.gz
+man/man3/gnutls_certificate_verify_peers3.3.gz
man/man3/gnutls_check_version.3.gz
+man/man3/gnutls_cipher_add_auth.3.gz
man/man3/gnutls_cipher_decrypt.3.gz
man/man3/gnutls_cipher_decrypt2.3.gz
man/man3/gnutls_cipher_deinit.3.gz
@@ -133,13 +150,17 @@ man/man3/gnutls_cipher_encrypt2.3.gz
man/man3/gnutls_cipher_get.3.gz
man/man3/gnutls_cipher_get_block_size.3.gz
man/man3/gnutls_cipher_get_id.3.gz
+man/man3/gnutls_cipher_get_iv_size.3.gz
man/man3/gnutls_cipher_get_key_size.3.gz
man/man3/gnutls_cipher_get_name.3.gz
+man/man3/gnutls_cipher_get_tag_size.3.gz
man/man3/gnutls_cipher_init.3.gz
man/man3/gnutls_cipher_list.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
man/man3/gnutls_compression_get.3.gz
man/man3/gnutls_compression_get_id.3.gz
man/man3/gnutls_compression_get_name.3.gz
@@ -147,16 +168,9 @@ 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_set.3.gz
-man/man3/gnutls_crypto_bigint_register2.3.gz
-man/man3/gnutls_crypto_cipher_register2.3.gz
-man/man3/gnutls_crypto_digest_register2.3.gz
-man/man3/gnutls_crypto_mac_register2.3.gz
-man/man3/gnutls_crypto_pk_register2.3.gz
-man/man3/gnutls_crypto_rnd_register2.3.gz
-man/man3/gnutls_crypto_single_cipher_register2.3.gz
-man/man3/gnutls_crypto_single_digest_register2.3.gz
-man/man3/gnutls_crypto_single_mac_register2.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
man/man3/gnutls_db_get_ptr.3.gz
man/man3/gnutls_db_remove_session.3.gz
man/man3/gnutls_db_set_cache_expiration.3.gz
@@ -172,6 +186,7 @@ man/man3/gnutls_dh_get_pubkey.3.gz
man/man3/gnutls_dh_get_secret_bits.3.gz
man/man3/gnutls_dh_params_cpy.3.gz
man/man3/gnutls_dh_params_deinit.3.gz
+man/man3/gnutls_dh_params_export2_pkcs3.3.gz
man/man3/gnutls_dh_params_export_pkcs3.3.gz
man/man3/gnutls_dh_params_export_raw.3.gz
man/man3/gnutls_dh_params_generate2.3.gz
@@ -179,32 +194,56 @@ man/man3/gnutls_dh_params_import_pkcs3.3.gz
man/man3/gnutls_dh_params_import_raw.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_list.3.gz
+man/man3/gnutls_dtls_cookie_send.3.gz
+man/man3/gnutls_dtls_cookie_verify.3.gz
+man/man3/gnutls_dtls_get_data_mtu.3.gz
+man/man3/gnutls_dtls_get_mtu.3.gz
+man/man3/gnutls_dtls_get_timeout.3.gz
+man/man3/gnutls_dtls_prestate_set.3.gz
+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_name.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_ext_register.3.gz
-man/man3/gnutls_extra_check_version.3.gz
+man/man3/gnutls_est_record_overhead_size.3.gz
man/man3/gnutls_fingerprint.3.gz
-man/man3/gnutls_free.3.gz
man/man3/gnutls_global_deinit.3.gz
man/man3/gnutls_global_init.3.gz
-man/man3/gnutls_global_init_extra.3.gz
+man/man3/gnutls_global_set_audit_log_function.3.gz
man/man3/gnutls_global_set_log_function.3.gz
man/man3/gnutls_global_set_log_level.3.gz
man/man3/gnutls_global_set_mem_functions.3.gz
man/man3/gnutls_global_set_mutex.3.gz
man/man3/gnutls_global_set_time_function.3.gz
man/man3/gnutls_handshake.3.gz
+man/man3/gnutls_handshake_description_get_name.3.gz
man/man3/gnutls_handshake_get_last_in.3.gz
man/man3/gnutls_handshake_get_last_out.3.gz
+man/man3/gnutls_handshake_set_hook_function.3.gz
man/man3/gnutls_handshake_set_max_packet_length.3.gz
man/man3/gnutls_handshake_set_post_client_hello_function.3.gz
man/man3/gnutls_handshake_set_private_extensions.3.gz
+man/man3/gnutls_handshake_set_random.3.gz
+man/man3/gnutls_handshake_set_timeout.3.gz
man/man3/gnutls_hash.3.gz
man/man3/gnutls_hash_deinit.3.gz
man/man3/gnutls_hash_fast.3.gz
man/man3/gnutls_hash_get_len.3.gz
man/man3/gnutls_hash_init.3.gz
man/man3/gnutls_hash_output.3.gz
+man/man3/gnutls_heartbeat_allowed.3.gz
+man/man3/gnutls_heartbeat_enable.3.gz
+man/man3/gnutls_heartbeat_get_timeout.3.gz
+man/man3/gnutls_heartbeat_ping.3.gz
+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_encode.3.gz
@@ -214,42 +253,62 @@ man/man3/gnutls_hmac_fast.3.gz
man/man3/gnutls_hmac_get_len.3.gz
man/man3/gnutls_hmac_init.3.gz
man/man3/gnutls_hmac_output.3.gz
-man/man3/gnutls_ia_allocate_client_credentials.3.gz
-man/man3/gnutls_ia_allocate_server_credentials.3.gz
-man/man3/gnutls_ia_enable.3.gz
-man/man3/gnutls_ia_endphase_send.3.gz
-man/man3/gnutls_ia_extract_inner_secret.3.gz
-man/man3/gnutls_ia_free_client_credentials.3.gz
-man/man3/gnutls_ia_free_server_credentials.3.gz
-man/man3/gnutls_ia_generate_challenge.3.gz
-man/man3/gnutls_ia_get_client_avp_ptr.3.gz
-man/man3/gnutls_ia_get_server_avp_ptr.3.gz
-man/man3/gnutls_ia_handshake.3.gz
-man/man3/gnutls_ia_handshake_p.3.gz
-man/man3/gnutls_ia_permute_inner_secret.3.gz
-man/man3/gnutls_ia_recv.3.gz
-man/man3/gnutls_ia_send.3.gz
-man/man3/gnutls_ia_set_client_avp_function.3.gz
-man/man3/gnutls_ia_set_client_avp_ptr.3.gz
-man/man3/gnutls_ia_set_server_avp_function.3.gz
-man/man3/gnutls_ia_set_server_avp_ptr.3.gz
-man/man3/gnutls_ia_verify_endphase.3.gz
+man/man3/gnutls_hmac_set_nonce.3.gz
man/man3/gnutls_init.3.gz
+man/man3/gnutls_key_generate.3.gz
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
man/man3/gnutls_mac_get_key_size.3.gz
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_set_priority.3.gz
-man/man3/gnutls_malloc.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
+man/man3/gnutls_ocsp_req_export.3.gz
+man/man3/gnutls_ocsp_req_get_cert_id.3.gz
+man/man3/gnutls_ocsp_req_get_extension.3.gz
+man/man3/gnutls_ocsp_req_get_nonce.3.gz
+man/man3/gnutls_ocsp_req_get_version.3.gz
+man/man3/gnutls_ocsp_req_import.3.gz
+man/man3/gnutls_ocsp_req_init.3.gz
+man/man3/gnutls_ocsp_req_print.3.gz
+man/man3/gnutls_ocsp_req_randomize_nonce.3.gz
+man/man3/gnutls_ocsp_req_set_extension.3.gz
+man/man3/gnutls_ocsp_req_set_nonce.3.gz
+man/man3/gnutls_ocsp_resp_check_crt.3.gz
+man/man3/gnutls_ocsp_resp_deinit.3.gz
+man/man3/gnutls_ocsp_resp_export.3.gz
+man/man3/gnutls_ocsp_resp_get_certs.3.gz
+man/man3/gnutls_ocsp_resp_get_extension.3.gz
+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_response.3.gz
+man/man3/gnutls_ocsp_resp_get_signature.3.gz
+man/man3/gnutls_ocsp_resp_get_signature_algorithm.3.gz
+man/man3/gnutls_ocsp_resp_get_single.3.gz
+man/man3/gnutls_ocsp_resp_get_status.3.gz
+man/man3/gnutls_ocsp_resp_get_version.3.gz
+man/man3/gnutls_ocsp_resp_import.3.gz
+man/man3/gnutls_ocsp_resp_init.3.gz
+man/man3/gnutls_ocsp_resp_print.3.gz
+man/man3/gnutls_ocsp_resp_verify.3.gz
+man/man3/gnutls_ocsp_resp_verify_direct.3.gz
+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_openpgp_crt_check_hostname.3.gz
man/man3/gnutls_openpgp_crt_deinit.3.gz
man/man3/gnutls_openpgp_crt_export.3.gz
+man/man3/gnutls_openpgp_crt_export2.3.gz
man/man3/gnutls_openpgp_crt_get_auth_subkey.3.gz
man/man3/gnutls_openpgp_crt_get_creation_time.3.gz
man/man3/gnutls_openpgp_crt_get_expiration_time.3.gz
@@ -288,6 +347,7 @@ man/man3/gnutls_openpgp_keyring_import.3.gz
man/man3/gnutls_openpgp_keyring_init.3.gz
man/man3/gnutls_openpgp_privkey_deinit.3.gz
man/man3/gnutls_openpgp_privkey_export.3.gz
+man/man3/gnutls_openpgp_privkey_export2.3.gz
man/man3/gnutls_openpgp_privkey_export_dsa_raw.3.gz
man/man3/gnutls_openpgp_privkey_export_rsa_raw.3.gz
man/man3/gnutls_openpgp_privkey_export_subkey_dsa_raw.3.gz
@@ -312,6 +372,12 @@ man/man3/gnutls_openpgp_privkey_set_preferred_key_id.3.gz
man/man3/gnutls_openpgp_privkey_sign_hash.3.gz
man/man3/gnutls_openpgp_send_cert.3.gz
man/man3/gnutls_openpgp_set_recv_key_function.3.gz
+man/man3/gnutls_pcert_deinit.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_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_encode.3.gz
@@ -322,35 +388,49 @@ 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_list.3.gz
+man/man3/gnutls_pk_to_sign.3.gz
man/man3/gnutls_pkcs11_add_provider.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_privkey.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_init.3.gz
man/man3/gnutls_pkcs11_obj_deinit.3.gz
man/man3/gnutls_pkcs11_obj_export.3.gz
+man/man3/gnutls_pkcs11_obj_export2.3.gz
+man/man3/gnutls_pkcs11_obj_export3.3.gz
man/man3/gnutls_pkcs11_obj_export_url.3.gz
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_set_pin_function.3.gz
man/man3/gnutls_pkcs11_privkey_deinit.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_get_info.3.gz
man/man3/gnutls_pkcs11_privkey_get_pk_algorithm.3.gz
man/man3/gnutls_pkcs11_privkey_import_url.3.gz
man/man3/gnutls_pkcs11_privkey_init.3.gz
+man/man3/gnutls_pkcs11_privkey_set_pin_function.3.gz
+man/man3/gnutls_pkcs11_privkey_status.3.gz
+man/man3/gnutls_pkcs11_reinit.3.gz
man/man3/gnutls_pkcs11_set_pin_function.3.gz
man/man3/gnutls_pkcs11_set_token_function.3.gz
man/man3/gnutls_pkcs11_token_get_flags.3.gz
man/man3/gnutls_pkcs11_token_get_info.3.gz
man/man3/gnutls_pkcs11_token_get_mechanism.3.gz
+man/man3/gnutls_pkcs11_token_get_random.3.gz
man/man3/gnutls_pkcs11_token_get_url.3.gz
man/man3/gnutls_pkcs11_token_init.3.gz
man/man3/gnutls_pkcs11_token_set_pin.3.gz
+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_encrypt.3.gz
@@ -367,16 +447,19 @@ man/man3/gnutls_pkcs12_bag_set_friendly_name.3.gz
man/man3/gnutls_pkcs12_bag_set_key_id.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_get_bag.3.gz
man/man3/gnutls_pkcs12_import.3.gz
man/man3/gnutls_pkcs12_init.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_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_crl_count.3.gz
man/man3/gnutls_pkcs7_get_crl_raw.3.gz
man/man3/gnutls_pkcs7_get_crt_count.3.gz
@@ -389,20 +472,40 @@ man/man3/gnutls_pkcs7_set_crt.3.gz
man/man3/gnutls_pkcs7_set_crt_raw.3.gz
man/man3/gnutls_prf.3.gz
man/man3/gnutls_prf_raw.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
man/man3/gnutls_priority_deinit.3.gz
+man/man3/gnutls_priority_ecc_curve_list.3.gz
+man/man3/gnutls_priority_get_cipher_suite_index.3.gz
man/man3/gnutls_priority_init.3.gz
+man/man3/gnutls_priority_kx_list.3.gz
+man/man3/gnutls_priority_mac_list.3.gz
+man/man3/gnutls_priority_protocol_list.3.gz
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_privkey_decrypt_data.3.gz
man/man3/gnutls_privkey_deinit.3.gz
man/man3/gnutls_privkey_get_pk_algorithm.3.gz
man/man3/gnutls_privkey_get_type.3.gz
+man/man3/gnutls_privkey_import_ext.3.gz
+man/man3/gnutls_privkey_import_ext2.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
+man/man3/gnutls_privkey_import_pkcs11_url.3.gz
+man/man3/gnutls_privkey_import_tpm_raw.3.gz
+man/man3/gnutls_privkey_import_tpm_url.3.gz
+man/man3/gnutls_privkey_import_url.3.gz
man/man3/gnutls_privkey_import_x509.3.gz
+man/man3/gnutls_privkey_import_x509_raw.3.gz
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_protocol_get_id.3.gz
man/man3/gnutls_protocol_get_name.3.gz
man/man3/gnutls_protocol_get_version.3.gz
@@ -413,7 +516,6 @@ man/man3/gnutls_psk_allocate_server_credentials.3.gz
man/man3/gnutls_psk_client_get_hint.3.gz
man/man3/gnutls_psk_free_client_credentials.3.gz
man/man3/gnutls_psk_free_server_credentials.3.gz
-man/man3/gnutls_psk_netconf_derive_key.3.gz
man/man3/gnutls_psk_server_get_username.3.gz
man/man3/gnutls_psk_set_client_credentials.3.gz
man/man3/gnutls_psk_set_client_credentials_function.3.gz
@@ -424,36 +526,65 @@ man/man3/gnutls_psk_set_server_credentials_hint.3.gz
man/man3/gnutls_psk_set_server_dh_params.3.gz
man/man3/gnutls_psk_set_server_params_function.3.gz
man/man3/gnutls_pubkey_deinit.3.gz
+man/man3/gnutls_pubkey_encrypt_data.3.gz
man/man3/gnutls_pubkey_export.3.gz
+man/man3/gnutls_pubkey_export2.3.gz
man/man3/gnutls_pubkey_get_key_id.3.gz
man/man3/gnutls_pubkey_get_key_usage.3.gz
+man/man3/gnutls_pubkey_get_openpgp_key_id.3.gz
man/man3/gnutls_pubkey_get_pk_algorithm.3.gz
man/man3/gnutls_pubkey_get_pk_dsa_raw.3.gz
+man/man3/gnutls_pubkey_get_pk_ecc_raw.3.gz
+man/man3/gnutls_pubkey_get_pk_ecc_x962.3.gz
man/man3/gnutls_pubkey_get_pk_rsa_raw.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
+man/man3/gnutls_pubkey_import_ecc_x962.3.gz
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
+man/man3/gnutls_pubkey_import_tpm_url.3.gz
+man/man3/gnutls_pubkey_import_url.3.gz
man/man3/gnutls_pubkey_import_x509.3.gz
+man/man3/gnutls_pubkey_import_x509_crq.3.gz
+man/man3/gnutls_pubkey_import_x509_raw.3.gz
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_random_art.3.gz
+man/man3/gnutls_range_split.3.gz
+man/man3/gnutls_record_can_use_length_hiding.3.gz
+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_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_overhead_size.3.gz
man/man3/gnutls_record_recv.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_register_md5_handler.3.gz
+man/man3/gnutls_record_set_timeout.3.gz
+man/man3/gnutls_record_uncork.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
@@ -471,24 +602,35 @@ 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_force_valid.3.gz
man/man3/gnutls_session_get_data.3.gz
man/man3/gnutls_session_get_data2.3.gz
+man/man3/gnutls_session_get_desc.3.gz
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_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_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_name.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_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
@@ -505,23 +647,50 @@ man/man3/gnutls_srp_set_prime_bits.3.gz
man/man3/gnutls_srp_set_server_credentials_file.3.gz
man/man3/gnutls_srp_set_server_credentials_function.3.gz
man/man3/gnutls_srp_verifier.3.gz
+man/man3/gnutls_srtp_get_keys.3.gz
+man/man3/gnutls_srtp_get_mki.3.gz
+man/man3/gnutls_srtp_get_profile_id.3.gz
+man/man3/gnutls_srtp_get_profile_name.3.gz
+man/man3/gnutls_srtp_get_selected_profile.3.gz
+man/man3/gnutls_srtp_set_mki.3.gz
+man/man3/gnutls_srtp_set_profile.3.gz
+man/man3/gnutls_srtp_set_profile_direct.3.gz
+man/man3/gnutls_store_commitment.3.gz
+man/man3/gnutls_store_pubkey.3.gz
man/man3/gnutls_strerror.3.gz
man/man3/gnutls_strerror_name.3.gz
man/man3/gnutls_supplemental_get_name.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
+man/man3/gnutls_tdb_set_store_func.3.gz
+man/man3/gnutls_tdb_set_verify_func.3.gz
+man/man3/gnutls_tpm_get_registered.3.gz
+man/man3/gnutls_tpm_key_list_deinit.3.gz
+man/man3/gnutls_tpm_key_list_get_url.3.gz
+man/man3/gnutls_tpm_privkey_delete.3.gz
+man/man3/gnutls_tpm_privkey_generate.3.gz
+man/man3/gnutls_transport_get_int.3.gz
+man/man3/gnutls_transport_get_int2.3.gz
man/man3/gnutls_transport_get_ptr.3.gz
man/man3/gnutls_transport_get_ptr2.3.gz
man/man3/gnutls_transport_set_errno.3.gz
man/man3/gnutls_transport_set_errno_function.3.gz
-man/man3/gnutls_transport_set_global_errno.3.gz
-man/man3/gnutls_transport_set_lowat.3.gz
+man/man3/gnutls_transport_set_int.3.gz
+man/man3/gnutls_transport_set_int2.3.gz
man/man3/gnutls_transport_set_ptr.3.gz
man/man3/gnutls_transport_set_ptr2.3.gz
man/man3/gnutls_transport_set_pull_function.3.gz
+man/man3/gnutls_transport_set_pull_timeout_function.3.gz
man/man3/gnutls_transport_set_push_function.3.gz
man/man3/gnutls_transport_set_vec_push_function.3.gz
+man/man3/gnutls_url_is_supported.3.gz
+man/man3/gnutls_verify_stored_pubkey.3.gz
man/man3/gnutls_x509_crl_check_issuer.3.gz
man/man3/gnutls_x509_crl_deinit.3.gz
man/man3/gnutls_x509_crl_export.3.gz
+man/man3/gnutls_x509_crl_export2.3.gz
+man/man3/gnutls_x509_crl_get_authority_key_gn_serial.3.gz
man/man3/gnutls_x509_crl_get_authority_key_id.3.gz
man/man3/gnutls_x509_crl_get_crt_count.3.gz
man/man3/gnutls_x509_crl_get_crt_serial.3.gz
@@ -530,6 +699,7 @@ man/man3/gnutls_x509_crl_get_extension_data.3.gz
man/man3/gnutls_x509_crl_get_extension_info.3.gz
man/man3/gnutls_x509_crl_get_extension_oid.3.gz
man/man3/gnutls_x509_crl_get_issuer_dn.3.gz
+man/man3/gnutls_x509_crl_get_issuer_dn2.3.gz
man/man3/gnutls_x509_crl_get_issuer_dn_by_oid.3.gz
man/man3/gnutls_x509_crl_get_next_update.3.gz
man/man3/gnutls_x509_crl_get_number.3.gz
@@ -540,6 +710,8 @@ man/man3/gnutls_x509_crl_get_this_update.3.gz
man/man3/gnutls_x509_crl_get_version.3.gz
man/man3/gnutls_x509_crl_import.3.gz
man/man3/gnutls_x509_crl_init.3.gz
+man/man3/gnutls_x509_crl_list_import.3.gz
+man/man3/gnutls_x509_crl_list_import2.3.gz
man/man3/gnutls_x509_crl_print.3.gz
man/man3/gnutls_x509_crl_privkey_sign.3.gz
man/man3/gnutls_x509_crl_set_authority_key_id.3.gz
@@ -554,12 +726,14 @@ man/man3/gnutls_x509_crl_sign2.3.gz
man/man3/gnutls_x509_crl_verify.3.gz
man/man3/gnutls_x509_crq_deinit.3.gz
man/man3/gnutls_x509_crq_export.3.gz
+man/man3/gnutls_x509_crq_export2.3.gz
man/man3/gnutls_x509_crq_get_attribute_by_oid.3.gz
man/man3/gnutls_x509_crq_get_attribute_data.3.gz
man/man3/gnutls_x509_crq_get_attribute_info.3.gz
man/man3/gnutls_x509_crq_get_basic_constraints.3.gz
man/man3/gnutls_x509_crq_get_challenge_password.3.gz
man/man3/gnutls_x509_crq_get_dn.3.gz
+man/man3/gnutls_x509_crq_get_dn2.3.gz
man/man3/gnutls_x509_crq_get_dn_by_oid.3.gz
man/man3/gnutls_x509_crq_get_dn_oid.3.gz
man/man3/gnutls_x509_crq_get_extension_by_oid.3.gz
@@ -570,6 +744,7 @@ man/man3/gnutls_x509_crq_get_key_purpose_oid.3.gz
man/man3/gnutls_x509_crq_get_key_rsa_raw.3.gz
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_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
@@ -580,11 +755,13 @@ man/man3/gnutls_x509_crq_privkey_sign.3.gz
man/man3/gnutls_x509_crq_set_attribute_by_oid.3.gz
man/man3/gnutls_x509_crq_set_basic_constraints.3.gz
man/man3/gnutls_x509_crq_set_challenge_password.3.gz
+man/man3/gnutls_x509_crq_set_dn.3.gz
man/man3/gnutls_x509_crq_set_dn_by_oid.3.gz
man/man3/gnutls_x509_crq_set_key.3.gz
man/man3/gnutls_x509_crq_set_key_purpose_oid.3.gz
man/man3/gnutls_x509_crq_set_key_rsa_raw.3.gz
man/man3/gnutls_x509_crq_set_key_usage.3.gz
+man/man3/gnutls_x509_crq_set_private_key_usage_period.3.gz
man/man3/gnutls_x509_crq_set_pubkey.3.gz
man/man3/gnutls_x509_crq_set_subject_alt_name.3.gz
man/man3/gnutls_x509_crq_set_version.3.gz
@@ -597,12 +774,16 @@ man/man3/gnutls_x509_crt_check_revocation.3.gz
man/man3/gnutls_x509_crt_cpy_crl_dist_points.3.gz
man/man3/gnutls_x509_crt_deinit.3.gz
man/man3/gnutls_x509_crt_export.3.gz
+man/man3/gnutls_x509_crt_export2.3.gz
man/man3/gnutls_x509_crt_get_activation_time.3.gz
+man/man3/gnutls_x509_crt_get_authority_info_access.3.gz
+man/man3/gnutls_x509_crt_get_authority_key_gn_serial.3.gz
man/man3/gnutls_x509_crt_get_authority_key_id.3.gz
man/man3/gnutls_x509_crt_get_basic_constraints.3.gz
man/man3/gnutls_x509_crt_get_ca_status.3.gz
man/man3/gnutls_x509_crt_get_crl_dist_points.3.gz
man/man3/gnutls_x509_crt_get_dn.3.gz
+man/man3/gnutls_x509_crt_get_dn2.3.gz
man/man3/gnutls_x509_crt_get_dn_by_oid.3.gz
man/man3/gnutls_x509_crt_get_dn_oid.3.gz
man/man3/gnutls_x509_crt_get_expiration_time.3.gz
@@ -616,6 +797,7 @@ man/man3/gnutls_x509_crt_get_issuer_alt_name.3.gz
man/man3/gnutls_x509_crt_get_issuer_alt_name2.3.gz
man/man3/gnutls_x509_crt_get_issuer_alt_othername_oid.3.gz
man/man3/gnutls_x509_crt_get_issuer_dn.3.gz
+man/man3/gnutls_x509_crt_get_issuer_dn2.3.gz
man/man3/gnutls_x509_crt_get_issuer_dn_by_oid.3.gz
man/man3/gnutls_x509_crt_get_issuer_dn_oid.3.gz
man/man3/gnutls_x509_crt_get_issuer_unique_id.3.gz
@@ -625,7 +807,9 @@ man/man3/gnutls_x509_crt_get_key_usage.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_rsa_raw.3.gz
+man/man3/gnutls_x509_crt_get_policy.3.gz
man/man3/gnutls_x509_crt_get_preferred_hash_algorithm.3.gz
+man/man3/gnutls_x509_crt_get_private_key_usage_period.3.gz
man/man3/gnutls_x509_crt_get_proxy.3.gz
man/man3/gnutls_x509_crt_get_raw_dn.3.gz
man/man3/gnutls_x509_crt_get_raw_issuer_dn.3.gz
@@ -645,11 +829,13 @@ man/man3/gnutls_x509_crt_import_pkcs11.3.gz
man/man3/gnutls_x509_crt_import_pkcs11_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
man/man3/gnutls_x509_crt_list_import_pkcs11.3.gz
man/man3/gnutls_x509_crt_list_verify.3.gz
man/man3/gnutls_x509_crt_print.3.gz
man/man3/gnutls_x509_crt_privkey_sign.3.gz
man/man3/gnutls_x509_crt_set_activation_time.3.gz
+man/man3/gnutls_x509_crt_set_authority_info_access.3.gz
man/man3/gnutls_x509_crt_set_authority_key_id.3.gz
man/man3/gnutls_x509_crt_set_basic_constraints.3.gz
man/man3/gnutls_x509_crt_set_ca_status.3.gz
@@ -657,13 +843,18 @@ man/man3/gnutls_x509_crt_set_crl_dist_points.3.gz
man/man3/gnutls_x509_crt_set_crl_dist_points2.3.gz
man/man3/gnutls_x509_crt_set_crq.3.gz
man/man3/gnutls_x509_crt_set_crq_extensions.3.gz
+man/man3/gnutls_x509_crt_set_dn.3.gz
man/man3/gnutls_x509_crt_set_dn_by_oid.3.gz
man/man3/gnutls_x509_crt_set_expiration_time.3.gz
man/man3/gnutls_x509_crt_set_extension_by_oid.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_key.3.gz
man/man3/gnutls_x509_crt_set_key_purpose_oid.3.gz
man/man3/gnutls_x509_crt_set_key_usage.3.gz
+man/man3/gnutls_x509_crt_set_pin_function.3.gz
+man/man3/gnutls_x509_crt_set_policy.3.gz
+man/man3/gnutls_x509_crt_set_private_key_usage_period.3.gz
man/man3/gnutls_x509_crt_set_proxy.3.gz
man/man3/gnutls_x509_crt_set_proxy_dn.3.gz
man/man3/gnutls_x509_crt_set_pubkey.3.gz
@@ -679,14 +870,20 @@ man/man3/gnutls_x509_crt_verify_data.3.gz
man/man3/gnutls_x509_crt_verify_hash.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_import.3.gz
man/man3/gnutls_x509_dn_init.3.gz
man/man3/gnutls_x509_dn_oid_known.3.gz
+man/man3/gnutls_x509_dn_oid_name.3.gz
+man/man3/gnutls_x509_policy_release.3.gz
man/man3/gnutls_x509_privkey_cpy.3.gz
man/man3/gnutls_x509_privkey_deinit.3.gz
man/man3/gnutls_x509_privkey_export.3.gz
+man/man3/gnutls_x509_privkey_export2.3.gz
+man/man3/gnutls_x509_privkey_export2_pkcs8.3.gz
man/man3/gnutls_x509_privkey_export_dsa_raw.3.gz
+man/man3/gnutls_x509_privkey_export_ecc_raw.3.gz
man/man3/gnutls_x509_privkey_export_pkcs8.3.gz
man/man3/gnutls_x509_privkey_export_rsa_raw.3.gz
man/man3/gnutls_x509_privkey_export_rsa_raw2.3.gz
@@ -694,8 +891,12 @@ man/man3/gnutls_x509_privkey_fix.3.gz
man/man3/gnutls_x509_privkey_generate.3.gz
man/man3/gnutls_x509_privkey_get_key_id.3.gz
man/man3/gnutls_x509_privkey_get_pk_algorithm.3.gz
+man/man3/gnutls_x509_privkey_get_pk_algorithm2.3.gz
man/man3/gnutls_x509_privkey_import.3.gz
+man/man3/gnutls_x509_privkey_import2.3.gz
man/man3/gnutls_x509_privkey_import_dsa_raw.3.gz
+man/man3/gnutls_x509_privkey_import_ecc_raw.3.gz
+man/man3/gnutls_x509_privkey_import_openssl.3.gz
man/man3/gnutls_x509_privkey_import_pkcs8.3.gz
man/man3/gnutls_x509_privkey_import_rsa_raw.3.gz
man/man3/gnutls_x509_privkey_import_rsa_raw2.3.gz
@@ -703,24 +904,80 @@ man/man3/gnutls_x509_privkey_init.3.gz
man/man3/gnutls_x509_privkey_sec_param.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_data.3.gz
+man/man3/gnutls_x509_privkey_verify_params.3.gz
man/man3/gnutls_x509_rdn_get.3.gz
man/man3/gnutls_x509_rdn_get_by_oid.3.gz
man/man3/gnutls_x509_rdn_get_oid.3.gz
-%%NLS%%share/locale/cs/LC_MESSAGES/libgnutls.mo
-%%NLS%%share/locale/de/LC_MESSAGES/libgnutls.mo
-%%NLS%%share/locale/en@boldquot/LC_MESSAGES/libgnutls.mo
-%%NLS%%share/locale/en@quot/LC_MESSAGES/libgnutls.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/libgnutls.mo
-%%NLS%%share/locale/it/LC_MESSAGES/libgnutls.mo
-%%NLS%%share/locale/ms/LC_MESSAGES/libgnutls.mo
-%%NLS%%share/locale/nl/LC_MESSAGES/libgnutls.mo
-%%NLS%%share/locale/pl/LC_MESSAGES/libgnutls.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/libgnutls.mo
-%%NLS%%share/locale/vi/LC_MESSAGES/libgnutls.mo
-%%NLS%%share/locale/zh_CN/LC_MESSAGES/libgnutls.mo
-%%NLS%%@dirrmtry share/locale/en@quot/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/en@quot
-%%NLS%%@dirrmtry share/locale/en@boldquot/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/en@boldquot
+man/man3/gnutls_x509_trust_list_add_cas.3.gz
+man/man3/gnutls_x509_trust_list_add_crls.3.gz
+man/man3/gnutls_x509_trust_list_add_named_crt.3.gz
+man/man3/gnutls_x509_trust_list_add_system_trust.3.gz
+man/man3/gnutls_x509_trust_list_add_trust_file.3.gz
+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_init.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
+man/man3/gnutls_x509_trust_list_verify_crt.3.gz
+man/man3/gnutls_x509_trust_list_verify_named_crt.3.gz
+man/man3/xssl_client_init.3.gz
+man/man3/xssl_cred_deinit.3.gz
+man/man3/xssl_cred_init.3.gz
+man/man3/xssl_deinit.3.gz
+man/man3/xssl_flush.3.gz
+man/man3/xssl_get_session.3.gz
+man/man3/xssl_getdelim.3.gz
+man/man3/xssl_printf.3.gz
+man/man3/xssl_read.3.gz
+man/man3/xssl_server_init.3.gz
+man/man3/xssl_sinit.3.gz
+man/man3/xssl_write.3.gz
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ex-alert.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ex-cert-select-pkcs11.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ex-cert-select.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ex-client-anon.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ex-client-dtls.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ex-client-psk.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ex-client-resume.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ex-client-srp.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ex-client-x509.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ex-client-xssl1.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ex-client-xssl2.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ex-crq.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ex-ocsp-client.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ex-pkcs11-list.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ex-pkcs12.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ex-serv-anon.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ex-serv-dtls.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ex-serv-pgp.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ex-serv-psk.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ex-serv-srp.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ex-serv-x509.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ex-session-info.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ex-verify-ssh.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ex-verify.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ex-x509-info.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/examples.h
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/print-ciphersuites.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tcp.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/udp.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/verify.c
+%%NLS%%share/locale/cs/LC_MESSAGES/gnutls.mo
+%%NLS%%share/locale/de/LC_MESSAGES/gnutls.mo
+%%NLS%%share/locale/en@boldquot/LC_MESSAGES/gnutls.mo
+%%NLS%%share/locale/en@quot/LC_MESSAGES/gnutls.mo
+%%NLS%%share/locale/eo/LC_MESSAGES/gnutls.mo
+%%NLS%%share/locale/fi/LC_MESSAGES/gnutls.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/gnutls.mo
+%%NLS%%share/locale/it/LC_MESSAGES/gnutls.mo
+%%NLS%%share/locale/ms/LC_MESSAGES/gnutls.mo
+%%NLS%%share/locale/nl/LC_MESSAGES/gnutls.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/gnutls.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/gnutls.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/gnutls.mo
+%%NLS%%share/locale/vi/LC_MESSAGES/gnutls.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/gnutls.mo
@dirrm include/gnutls
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
diff --git a/security/gnutls3/Makefile b/security/gnutls3/Makefile
deleted file mode 100644
index 2ea7dedab345..000000000000
--- a/security/gnutls3/Makefile
+++ /dev/null
@@ -1,93 +0,0 @@
-# Created by: William Grzybowski <wg@FreeBSD.org>
-# $FreeBSD$
-
-PORTNAME= gnutls
-PORTVERSION= 3.1.25
-PORTREVISION= 3
-CATEGORIES= security net
-MASTER_SITES= ftp://ftp.gnutls.org/gcrypt/gnutls/v3.1/
-PKGNAMESUFFIX= ${GNUTLS_SUFFIX}
-
-MAINTAINER= bdrewery@FreeBSD.org
-COMMENT= GNU Transport Layer Security library
-
-LIB_DEPENDS= libgpg-error.so:${PORTSDIR}/security/libgpg-error \
- libnettle.so:${PORTSDIR}/security/nettle \
- libp11-kit.so:${PORTSDIR}/security/p11-kit \
- libidn.so:${PORTSDIR}/dns/libidn \
- libtspi.so:${PORTSDIR}/security/trousers
-
-GNUTLS_SUFFIX= 3
-
-USES= gmake iconv libtool:keepla makeinfo pkgconfig tar:xz
-USE_LDCONFIG= ${PREFIX}/lib/gnutls3
-CPPFLAGS+= -I${LOCALBASE}/include -fPIC
-LDFLAGS= -L${LOCALBASE}/lib
-GNU_CONFIGURE= yes
-CONFIGURE_ENV= MAKEINFO="makeinfo --no-split"
-CONFIGURE_ARGS= --program-suffix=${GNUTLS_SUFFIX} \
- --includedir="${PREFIX}/include/gnutls${GNUTLS_SUFFIX}" \
- --libdir="${PREFIX}/lib/gnutls${GNUTLS_SUFFIX}" \
- --disable-guile \
- --disable-nls \
- --disable-silent-rules \
- --disable-hardware-acceleration \
- --enable-local-libopts
-
-DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}${GNUTLS_SUFFIX}
-EXAMPLESDIR= ${PREFIX}/share/examples/${PORTNAME}${GNUTLS_SUFFIX}
-INFO_SUBDIR= gnutls${GNUTLS_SUFFIX}
-
-OPTIONS_DEFINE= CXX DOCS EXAMPLES LIBTASN1 LIBDANE
-OPTIONS_DEFAULT= CXX
-OPTIONS_SUB= yes
-
-LIBTASN1_DESC= Use libtasn1 from ports
-LIBDANE_DESC= DNSSEC support for DANE (danetool3 --check)
-LIBDANE_LIB_DEPENDS= libunbound.so:${PORTSDIR}/dns/unbound
-LIBDANE_CONFIGURE_OFF= --disable-libdane
-
-CXX_CONFIGURE_ENABLE= cxx
-
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MLIBTASN1} || exists(${LOCALBASE}/lib/libtasn1.so.7)
-LIB_DEPENDS+= libtasn1.so:${PORTSDIR}/security/libtasn1
-.else
-CONFIGURE_ARGS+= --with-included-libtasn1
-.endif
-
-PORTDOCS= AUTHORS NEWS README THANKS
-EXAMPLES= doc/examples/*.c
-
-#INFO= gnutls
-
-post-patch:
- @${MV} ${WRKSRC}/libdane/gnutls-dane.pc.in \
- ${WRKSRC}/libdane/gnutls${GNUTLS_SUFFIX}-dane.pc.in
- # Force regenerating as the dist has info-5, but sometimes when
- # regnerating it will decide to only create up to info-4, thus
- # causing plist discrepency. So just rebuild and use --no-split
- @${RM} ${WRKSRC}/doc/gnutls.info*
-
-pre-configure:
- @${CP} ${WRKSRC}/lib/gnutls.pc.in ${WRKSRC}/lib/gnutls${GNUTLS_SUFFIX}.pc.in
- @${REINPLACE_CMD} \
- -e 's,(libdir)/pkgconfig,(prefix)/libdata/pkgconfig,' \
- -e 's,gnutls\.pc,gnutls${GNUTLS_SUFFIX}\.pc,g' \
- -e 's,gnutls-dane\.pc,gnutls${GNUTLS_SUFFIX}-dane\.pc,g' \
- ${WRKSRC}/lib/Makefile.in \
- ${WRKSRC}/libdane/Makefile.in \
- ${WRKSRC}/configure
- @${REINPLACE_CMD} -e 's,(top_builddir)$$,(top_builddir) -I$$(top_builddir)/lib/includes -I$$(top_builddir)/libextra/includes,' \
- ${WRKSRC}/doc/Makefile.in
-
-post-install:
- @${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
- cd ${WRKSRC} && ${INSTALL_DATA} ${EXAMPLES} ${STAGEDIR}${EXAMPLESDIR}
- @${MKDIR} ${STAGEDIR}${DOCSDIR}
-.for i in ${PORTDOCS}
- ${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR}
-.endfor
-
-.include <bsd.port.mk>
diff --git a/security/gnutls3/distinfo b/security/gnutls3/distinfo
deleted file mode 100644
index 254b1d9c5723..000000000000
--- a/security/gnutls3/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (gnutls-3.1.25.tar.xz) = 36c2f85b848eb46235909a893b8c17474325084a705b4f6da3c3594e8b94272e
-SIZE (gnutls-3.1.25.tar.xz) = 5150612
diff --git a/security/gnutls3/pkg-descr b/security/gnutls3/pkg-descr
deleted file mode 100644
index 909076817794..000000000000
--- a/security/gnutls3/pkg-descr
+++ /dev/null
@@ -1,17 +0,0 @@
-GnuTLS is a portable ANSI C based library which implements the TLS 1.0 and
-SSL 3.0 protocols. The library does not include any patented algorithms and
-is available under the GNU Lesser GPL license.
-
-Important features of the GnuTLS library include:
-- Thread safety
-- Support for both TLS 1.0 and SSL 3.0 protocols
-- Support for both X.509 and OpenPGP certificates
-- Support for basic parsing and verification of certificates
-- Support for SRP for TLS authentication
-- Support for TLS Extension mechanism
-- Support for TLS Compression Methods
-
-Additionaly GnuTLS provides an emulation API for the widely used
-OpenSSL library, to ease integration with existing applications.
-
-WWW: http://www.gnutls.org/
diff --git a/security/gnutls3/pkg-plist b/security/gnutls3/pkg-plist
deleted file mode 100644
index 0b3ce3e018d3..000000000000
--- a/security/gnutls3/pkg-plist
+++ /dev/null
@@ -1,943 +0,0 @@
-bin/certtool3
-bin/crywrap3
-bin/danetool3
-bin/gnutls-cli-debug3
-bin/gnutls-cli3
-bin/gnutls-serv3
-bin/ocsptool3
-bin/p11tool3
-bin/psktool3
-bin/srptool3
-bin/tpmtool3
-include/gnutls3/gnutls/abstract.h
-include/gnutls3/gnutls/compat.h
-include/gnutls3/gnutls/crypto.h
-%%LIBDANE%%include/gnutls3/gnutls/dane.h
-include/gnutls3/gnutls/dtls.h
-include/gnutls3/gnutls/gnutls.h
-%%CXX%%include/gnutls3/gnutls/gnutlsxx.h
-include/gnutls3/gnutls/ocsp.h
-include/gnutls3/gnutls/openpgp.h
-include/gnutls3/gnutls/openssl.h
-include/gnutls3/gnutls/pkcs11.h
-include/gnutls3/gnutls/pkcs12.h
-include/gnutls3/gnutls/tpm.h
-include/gnutls3/gnutls/x509.h
-include/gnutls3/gnutls/xssl.h
-info/gnutls3/dir
-info/gnutls3/gnutls-client-server-use-case.png
-info/gnutls3/gnutls-guile.info
-info/gnutls3/gnutls-handshake-sequence.png
-info/gnutls3/gnutls-handshake-state.png
-info/gnutls3/gnutls-internals.png
-info/gnutls3/gnutls-layers.png
-info/gnutls3/gnutls-logo.png
-info/gnutls3/gnutls-modauth.png
-info/gnutls3/gnutls-pgp.png
-info/gnutls3/gnutls-x509.png
-info/gnutls3/gnutls.info
-info/gnutls3/pkcs11-vision.png
-%%LIBDANE%%lib/gnutls3/libgnutls-dane.a
-%%LIBDANE%%lib/gnutls3/libgnutls-dane.la
-%%LIBDANE%%lib/gnutls3/libgnutls-dane.so
-%%LIBDANE%%lib/gnutls3/libgnutls-dane.so.0
-%%LIBDANE%%lib/gnutls3/libgnutls-dane.so.0.4.1
-lib/gnutls3/libgnutls-openssl.a
-lib/gnutls3/libgnutls-openssl.la
-lib/gnutls3/libgnutls-openssl.so
-lib/gnutls3/libgnutls-openssl.so.27
-lib/gnutls3/libgnutls-openssl.so.27.0.2
-lib/gnutls3/libgnutls-xssl.a
-lib/gnutls3/libgnutls-xssl.la
-lib/gnutls3/libgnutls-xssl.so
-lib/gnutls3/libgnutls-xssl.so.0
-lib/gnutls3/libgnutls-xssl.so.0.0.0
-lib/gnutls3/libgnutls.a
-lib/gnutls3/libgnutls.la
-lib/gnutls3/libgnutls.so
-lib/gnutls3/libgnutls.so.28
-lib/gnutls3/libgnutls.so.28.21.5
-%%CXX%%lib/gnutls3/libgnutlsxx.a
-%%CXX%%lib/gnutls3/libgnutlsxx.la
-%%CXX%%lib/gnutls3/libgnutlsxx.so
-%%CXX%%lib/gnutls3/libgnutlsxx.so.28
-%%CXX%%lib/gnutls3/libgnutlsxx.so.28.1.0
-libdata/pkgconfig/gnutls3.pc
-%%LIBDANE%%libdata/pkgconfig/gnutls3-dane.pc
-%%LIBDANE%%man/man1/danetool3.1.gz
-man/man1/certtool3.1.gz
-man/man1/gnutls-cli-debug3.1.gz
-man/man1/gnutls-cli3.1.gz
-man/man1/gnutls-serv3.1.gz
-man/man1/ocsptool3.1.gz
-man/man1/p11tool3.1.gz
-man/man1/psktool3.1.gz
-man/man1/srptool3.1.gz
-man/man1/tpmtool3.1.gz
-man/man3/gnutls_alert_get3.3.gz
-man/man3/gnutls_alert_get_name3.3.gz
-man/man3/gnutls_alert_get_strname3.3.gz
-man/man3/gnutls_alert_send3.3.gz
-man/man3/gnutls_alert_send_appropriate3.3.gz
-man/man3/gnutls_anon_allocate_client_credentials3.3.gz
-man/man3/gnutls_anon_allocate_server_credentials3.3.gz
-man/man3/gnutls_anon_free_client_credentials3.3.gz
-man/man3/gnutls_anon_free_server_credentials3.3.gz
-man/man3/gnutls_anon_set_params_function3.3.gz
-man/man3/gnutls_anon_set_server_dh_params3.3.gz
-man/man3/gnutls_anon_set_server_params_function3.3.gz
-man/man3/gnutls_auth_client_get_type3.3.gz
-man/man3/gnutls_auth_get_type3.3.gz
-man/man3/gnutls_auth_server_get_type3.3.gz
-man/man3/gnutls_bye3.3.gz
-man/man3/gnutls_certificate_activation_time_peers3.3.gz
-man/man3/gnutls_certificate_allocate_credentials3.3.gz
-man/man3/gnutls_certificate_client_get_request_status3.3.gz
-man/man3/gnutls_certificate_expiration_time_peers3.3.gz
-man/man3/gnutls_certificate_free_ca_names3.3.gz
-man/man3/gnutls_certificate_free_cas3.3.gz
-man/man3/gnutls_certificate_free_credentials3.3.gz
-man/man3/gnutls_certificate_free_crls3.3.gz
-man/man3/gnutls_certificate_free_keys3.3.gz
-man/man3/gnutls_certificate_get_issuer3.3.gz
-man/man3/gnutls_certificate_get_ours3.3.gz
-man/man3/gnutls_certificate_get_peers3.3.gz
-man/man3/gnutls_certificate_get_peers_subkey_id3.3.gz
-man/man3/gnutls_certificate_send_x509_rdn_sequence3.3.gz
-man/man3/gnutls_certificate_server_set_request3.3.gz
-man/man3/gnutls_certificate_set_dh_params3.3.gz
-man/man3/gnutls_certificate_set_key3.3.gz
-man/man3/gnutls_certificate_set_ocsp_status_request_file3.3.gz
-man/man3/gnutls_certificate_set_ocsp_status_request_function3.3.gz
-man/man3/gnutls_certificate_set_openpgp_key3.3.gz
-man/man3/gnutls_certificate_set_openpgp_key_file23.3.gz
-man/man3/gnutls_certificate_set_openpgp_key_file3.3.gz
-man/man3/gnutls_certificate_set_openpgp_key_mem23.3.gz
-man/man3/gnutls_certificate_set_openpgp_key_mem3.3.gz
-man/man3/gnutls_certificate_set_openpgp_keyring_file3.3.gz
-man/man3/gnutls_certificate_set_openpgp_keyring_mem3.3.gz
-man/man3/gnutls_certificate_set_params_function3.3.gz
-man/man3/gnutls_certificate_set_pin_function3.3.gz
-man/man3/gnutls_certificate_set_retrieve_function23.3.gz
-man/man3/gnutls_certificate_set_retrieve_function3.3.gz
-man/man3/gnutls_certificate_set_rsa_export_params3.3.gz
-man/man3/gnutls_certificate_set_verify_flags3.3.gz
-man/man3/gnutls_certificate_set_verify_function3.3.gz
-man/man3/gnutls_certificate_set_verify_limits3.3.gz
-man/man3/gnutls_certificate_set_x509_crl3.3.gz
-man/man3/gnutls_certificate_set_x509_crl_file3.3.gz
-man/man3/gnutls_certificate_set_x509_crl_mem3.3.gz
-man/man3/gnutls_certificate_set_x509_key3.3.gz
-man/man3/gnutls_certificate_set_x509_key_file23.3.gz
-man/man3/gnutls_certificate_set_x509_key_file3.3.gz
-man/man3/gnutls_certificate_set_x509_key_mem23.3.gz
-man/man3/gnutls_certificate_set_x509_key_mem3.3.gz
-man/man3/gnutls_certificate_set_x509_simple_pkcs12_file3.3.gz
-man/man3/gnutls_certificate_set_x509_simple_pkcs12_mem3.3.gz
-man/man3/gnutls_certificate_set_x509_system_trust3.3.gz
-man/man3/gnutls_certificate_set_x509_trust3.3.gz
-man/man3/gnutls_certificate_set_x509_trust_file3.3.gz
-man/man3/gnutls_certificate_set_x509_trust_mem3.3.gz
-man/man3/gnutls_certificate_type_get3.3.gz
-man/man3/gnutls_certificate_type_get_id3.3.gz
-man/man3/gnutls_certificate_type_get_name3.3.gz
-man/man3/gnutls_certificate_type_list3.3.gz
-man/man3/gnutls_certificate_type_set_priority3.3.gz
-man/man3/gnutls_certificate_verification_status_print3.3.gz
-man/man3/gnutls_certificate_verify_peers23.3.gz
-man/man3/gnutls_certificate_verify_peers33.3.gz
-man/man3/gnutls_check_version3.3.gz
-man/man3/gnutls_cipher_add_auth3.3.gz
-man/man3/gnutls_cipher_decrypt23.3.gz
-man/man3/gnutls_cipher_decrypt3.3.gz
-man/man3/gnutls_cipher_deinit3.3.gz
-man/man3/gnutls_cipher_encrypt23.3.gz
-man/man3/gnutls_cipher_encrypt3.3.gz
-man/man3/gnutls_cipher_get3.3.gz
-man/man3/gnutls_cipher_get_block_size3.3.gz
-man/man3/gnutls_cipher_get_id3.3.gz
-man/man3/gnutls_cipher_get_key_size3.3.gz
-man/man3/gnutls_cipher_get_name3.3.gz
-man/man3/gnutls_cipher_init3.3.gz
-man/man3/gnutls_cipher_list3.3.gz
-man/man3/gnutls_cipher_set_iv3.3.gz
-man/man3/gnutls_cipher_set_priority3.3.gz
-man/man3/gnutls_cipher_suite_get_name3.3.gz
-man/man3/gnutls_cipher_suite_info3.3.gz
-man/man3/gnutls_cipher_tag3.3.gz
-man/man3/gnutls_compression_get3.3.gz
-man/man3/gnutls_compression_get_id3.3.gz
-man/man3/gnutls_compression_get_name3.3.gz
-man/man3/gnutls_compression_list3.3.gz
-man/man3/gnutls_compression_set_priority3.3.gz
-man/man3/gnutls_credentials_clear3.3.gz
-man/man3/gnutls_credentials_set3.3.gz
-man/man3/gnutls_db_check_entry3.3.gz
-man/man3/gnutls_db_check_entry_time3.3.gz
-man/man3/gnutls_db_get_ptr3.3.gz
-man/man3/gnutls_db_remove_session3.3.gz
-man/man3/gnutls_db_set_cache_expiration3.3.gz
-man/man3/gnutls_db_set_ptr3.3.gz
-man/man3/gnutls_db_set_remove_function3.3.gz
-man/man3/gnutls_db_set_retrieve_function3.3.gz
-man/man3/gnutls_db_set_store_function3.3.gz
-man/man3/gnutls_deinit3.3.gz
-man/man3/gnutls_dh_get_group3.3.gz
-man/man3/gnutls_dh_get_peers_public_bits3.3.gz
-man/man3/gnutls_dh_get_prime_bits3.3.gz
-man/man3/gnutls_dh_get_pubkey3.3.gz
-man/man3/gnutls_dh_get_secret_bits3.3.gz
-man/man3/gnutls_dh_params_cpy3.3.gz
-man/man3/gnutls_dh_params_deinit3.3.gz
-man/man3/gnutls_dh_params_export2_pkcs33.3.gz
-man/man3/gnutls_dh_params_export_pkcs33.3.gz
-man/man3/gnutls_dh_params_export_raw3.3.gz
-man/man3/gnutls_dh_params_generate23.3.gz
-man/man3/gnutls_dh_params_import_pkcs33.3.gz
-man/man3/gnutls_dh_params_import_raw3.3.gz
-man/man3/gnutls_dh_params_init3.3.gz
-man/man3/gnutls_dh_set_prime_bits3.3.gz
-man/man3/gnutls_dtls_cookie_send3.3.gz
-man/man3/gnutls_dtls_cookie_verify3.3.gz
-man/man3/gnutls_dtls_get_data_mtu3.3.gz
-man/man3/gnutls_dtls_get_mtu3.3.gz
-man/man3/gnutls_dtls_get_timeout3.3.gz
-man/man3/gnutls_dtls_prestate_set3.3.gz
-man/man3/gnutls_dtls_set_data_mtu3.3.gz
-man/man3/gnutls_dtls_set_mtu3.3.gz
-man/man3/gnutls_dtls_set_timeouts3.3.gz
-man/man3/gnutls_ecc_curve_get3.3.gz
-man/man3/gnutls_ecc_curve_get_name3.3.gz
-man/man3/gnutls_ecc_curve_get_size3.3.gz
-man/man3/gnutls_ecc_curve_list3.3.gz
-man/man3/gnutls_error_is_fatal3.3.gz
-man/man3/gnutls_error_to_alert3.3.gz
-man/man3/gnutls_fingerprint3.3.gz
-man/man3/gnutls_global_deinit3.3.gz
-man/man3/gnutls_global_init3.3.gz
-man/man3/gnutls_global_set_audit_log_function3.3.gz
-man/man3/gnutls_global_set_log_function3.3.gz
-man/man3/gnutls_global_set_log_level3.3.gz
-man/man3/gnutls_global_set_mem_functions3.3.gz
-man/man3/gnutls_global_set_mutex3.3.gz
-man/man3/gnutls_global_set_time_function3.3.gz
-man/man3/gnutls_handshake3.3.gz
-man/man3/gnutls_handshake_get_last_in3.3.gz
-man/man3/gnutls_handshake_get_last_out3.3.gz
-man/man3/gnutls_handshake_set_max_packet_length3.3.gz
-man/man3/gnutls_handshake_set_post_client_hello_function3.3.gz
-man/man3/gnutls_handshake_set_private_extensions3.3.gz
-man/man3/gnutls_handshake_set_random3.3.gz
-man/man3/gnutls_handshake_set_timeout3.3.gz
-man/man3/gnutls_hash3.3.gz
-man/man3/gnutls_hash_deinit3.3.gz
-man/man3/gnutls_hash_fast3.3.gz
-man/man3/gnutls_hash_get_len3.3.gz
-man/man3/gnutls_hash_init3.3.gz
-man/man3/gnutls_hash_output3.3.gz
-man/man3/gnutls_heartbeat_allowed3.3.gz
-man/man3/gnutls_heartbeat_enable3.3.gz
-man/man3/gnutls_heartbeat_get_timeout3.3.gz
-man/man3/gnutls_heartbeat_ping3.3.gz
-man/man3/gnutls_heartbeat_pong3.3.gz
-man/man3/gnutls_heartbeat_set_timeouts3.3.gz
-man/man3/gnutls_hex2bin3.3.gz
-man/man3/gnutls_hex_decode3.3.gz
-man/man3/gnutls_hex_encode3.3.gz
-man/man3/gnutls_hmac3.3.gz
-man/man3/gnutls_hmac_deinit3.3.gz
-man/man3/gnutls_hmac_fast3.3.gz
-man/man3/gnutls_hmac_get_len3.3.gz
-man/man3/gnutls_hmac_init3.3.gz
-man/man3/gnutls_hmac_output3.3.gz
-man/man3/gnutls_init3.3.gz
-man/man3/gnutls_key_generate3.3.gz
-man/man3/gnutls_kx_get3.3.gz
-man/man3/gnutls_kx_get_id3.3.gz
-man/man3/gnutls_kx_get_name3.3.gz
-man/man3/gnutls_kx_list3.3.gz
-man/man3/gnutls_kx_set_priority3.3.gz
-man/man3/gnutls_load_file3.3.gz
-man/man3/gnutls_mac_get3.3.gz
-man/man3/gnutls_mac_get_id3.3.gz
-man/man3/gnutls_mac_get_key_size3.3.gz
-man/man3/gnutls_mac_get_name3.3.gz
-man/man3/gnutls_mac_list3.3.gz
-man/man3/gnutls_mac_set_priority3.3.gz
-man/man3/gnutls_ocsp_req_add_cert3.3.gz
-man/man3/gnutls_ocsp_req_add_cert_id3.3.gz
-man/man3/gnutls_ocsp_req_deinit3.3.gz
-man/man3/gnutls_ocsp_req_export3.3.gz
-man/man3/gnutls_ocsp_req_get_cert_id3.3.gz
-man/man3/gnutls_ocsp_req_get_extension3.3.gz
-man/man3/gnutls_ocsp_req_get_nonce3.3.gz
-man/man3/gnutls_ocsp_req_get_version3.3.gz
-man/man3/gnutls_ocsp_req_import3.3.gz
-man/man3/gnutls_ocsp_req_init3.3.gz
-man/man3/gnutls_ocsp_req_print3.3.gz
-man/man3/gnutls_ocsp_req_randomize_nonce3.3.gz
-man/man3/gnutls_ocsp_req_set_extension3.3.gz
-man/man3/gnutls_ocsp_req_set_nonce3.3.gz
-man/man3/gnutls_ocsp_resp_check_crt3.3.gz
-man/man3/gnutls_ocsp_resp_deinit3.3.gz
-man/man3/gnutls_ocsp_resp_export3.3.gz
-man/man3/gnutls_ocsp_resp_get_certs3.3.gz
-man/man3/gnutls_ocsp_resp_get_extension3.3.gz
-man/man3/gnutls_ocsp_resp_get_nonce3.3.gz
-man/man3/gnutls_ocsp_resp_get_produced3.3.gz
-man/man3/gnutls_ocsp_resp_get_responder3.3.gz
-man/man3/gnutls_ocsp_resp_get_response3.3.gz
-man/man3/gnutls_ocsp_resp_get_signature3.3.gz
-man/man3/gnutls_ocsp_resp_get_signature_algorithm3.3.gz
-man/man3/gnutls_ocsp_resp_get_single3.3.gz
-man/man3/gnutls_ocsp_resp_get_status3.3.gz
-man/man3/gnutls_ocsp_resp_get_version3.3.gz
-man/man3/gnutls_ocsp_resp_import3.3.gz
-man/man3/gnutls_ocsp_resp_init3.3.gz
-man/man3/gnutls_ocsp_resp_print3.3.gz
-man/man3/gnutls_ocsp_resp_verify3.3.gz
-man/man3/gnutls_ocsp_resp_verify_direct3.3.gz
-man/man3/gnutls_ocsp_status_request_enable_client3.3.gz
-man/man3/gnutls_ocsp_status_request_get3.3.gz
-man/man3/gnutls_ocsp_status_request_is_checked3.3.gz
-man/man3/gnutls_openpgp_crt_check_hostname3.3.gz
-man/man3/gnutls_openpgp_crt_deinit3.3.gz
-man/man3/gnutls_openpgp_crt_export23.3.gz
-man/man3/gnutls_openpgp_crt_export3.3.gz
-man/man3/gnutls_openpgp_crt_get_auth_subkey3.3.gz
-man/man3/gnutls_openpgp_crt_get_creation_time3.3.gz
-man/man3/gnutls_openpgp_crt_get_expiration_time3.3.gz
-man/man3/gnutls_openpgp_crt_get_fingerprint3.3.gz
-man/man3/gnutls_openpgp_crt_get_key_id3.3.gz
-man/man3/gnutls_openpgp_crt_get_key_usage3.3.gz
-man/man3/gnutls_openpgp_crt_get_name3.3.gz
-man/man3/gnutls_openpgp_crt_get_pk_algorithm3.3.gz
-man/man3/gnutls_openpgp_crt_get_pk_dsa_raw3.3.gz
-man/man3/gnutls_openpgp_crt_get_pk_rsa_raw3.3.gz
-man/man3/gnutls_openpgp_crt_get_preferred_key_id3.3.gz
-man/man3/gnutls_openpgp_crt_get_revoked_status3.3.gz
-man/man3/gnutls_openpgp_crt_get_subkey_count3.3.gz
-man/man3/gnutls_openpgp_crt_get_subkey_creation_time3.3.gz
-man/man3/gnutls_openpgp_crt_get_subkey_expiration_time3.3.gz
-man/man3/gnutls_openpgp_crt_get_subkey_fingerprint3.3.gz
-man/man3/gnutls_openpgp_crt_get_subkey_id3.3.gz
-man/man3/gnutls_openpgp_crt_get_subkey_idx3.3.gz
-man/man3/gnutls_openpgp_crt_get_subkey_pk_algorithm3.3.gz
-man/man3/gnutls_openpgp_crt_get_subkey_pk_dsa_raw3.3.gz
-man/man3/gnutls_openpgp_crt_get_subkey_pk_rsa_raw3.3.gz
-man/man3/gnutls_openpgp_crt_get_subkey_revoked_status3.3.gz
-man/man3/gnutls_openpgp_crt_get_subkey_usage3.3.gz
-man/man3/gnutls_openpgp_crt_get_version3.3.gz
-man/man3/gnutls_openpgp_crt_import3.3.gz
-man/man3/gnutls_openpgp_crt_init3.3.gz
-man/man3/gnutls_openpgp_crt_print3.3.gz
-man/man3/gnutls_openpgp_crt_set_preferred_key_id3.3.gz
-man/man3/gnutls_openpgp_crt_verify_ring3.3.gz
-man/man3/gnutls_openpgp_crt_verify_self3.3.gz
-man/man3/gnutls_openpgp_keyring_check_id3.3.gz
-man/man3/gnutls_openpgp_keyring_deinit3.3.gz
-man/man3/gnutls_openpgp_keyring_get_crt3.3.gz
-man/man3/gnutls_openpgp_keyring_get_crt_count3.3.gz
-man/man3/gnutls_openpgp_keyring_import3.3.gz
-man/man3/gnutls_openpgp_keyring_init3.3.gz
-man/man3/gnutls_openpgp_privkey_deinit3.3.gz
-man/man3/gnutls_openpgp_privkey_export23.3.gz
-man/man3/gnutls_openpgp_privkey_export3.3.gz
-man/man3/gnutls_openpgp_privkey_export_dsa_raw3.3.gz
-man/man3/gnutls_openpgp_privkey_export_rsa_raw3.3.gz
-man/man3/gnutls_openpgp_privkey_export_subkey_dsa_raw3.3.gz
-man/man3/gnutls_openpgp_privkey_export_subkey_rsa_raw3.3.gz
-man/man3/gnutls_openpgp_privkey_get_fingerprint3.3.gz
-man/man3/gnutls_openpgp_privkey_get_key_id3.3.gz
-man/man3/gnutls_openpgp_privkey_get_pk_algorithm3.3.gz
-man/man3/gnutls_openpgp_privkey_get_preferred_key_id3.3.gz
-man/man3/gnutls_openpgp_privkey_get_revoked_status3.3.gz
-man/man3/gnutls_openpgp_privkey_get_subkey_count3.3.gz
-man/man3/gnutls_openpgp_privkey_get_subkey_creation_time3.3.gz
-man/man3/gnutls_openpgp_privkey_get_subkey_fingerprint3.3.gz
-man/man3/gnutls_openpgp_privkey_get_subkey_id3.3.gz
-man/man3/gnutls_openpgp_privkey_get_subkey_idx3.3.gz
-man/man3/gnutls_openpgp_privkey_get_subkey_pk_algorithm3.3.gz
-man/man3/gnutls_openpgp_privkey_get_subkey_revoked_status3.3.gz
-man/man3/gnutls_openpgp_privkey_import3.3.gz
-man/man3/gnutls_openpgp_privkey_init3.3.gz
-man/man3/gnutls_openpgp_privkey_sec_param3.3.gz
-man/man3/gnutls_openpgp_privkey_set_preferred_key_id3.3.gz
-man/man3/gnutls_openpgp_privkey_sign_hash3.3.gz
-man/man3/gnutls_openpgp_send_cert3.3.gz
-man/man3/gnutls_openpgp_set_recv_key_function3.3.gz
-man/man3/gnutls_pcert_deinit3.3.gz
-man/man3/gnutls_pcert_import_openpgp3.3.gz
-man/man3/gnutls_pcert_import_openpgp_raw3.3.gz
-man/man3/gnutls_pcert_import_x5093.3.gz
-man/man3/gnutls_pcert_import_x509_raw3.3.gz
-man/man3/gnutls_pcert_list_import_x509_raw3.3.gz
-man/man3/gnutls_pem_base64_decode3.3.gz
-man/man3/gnutls_pem_base64_decode_alloc3.3.gz
-man/man3/gnutls_pem_base64_encode3.3.gz
-man/man3/gnutls_pem_base64_encode_alloc3.3.gz
-man/man3/gnutls_perror3.3.gz
-man/man3/gnutls_pk_algorithm_get_name3.3.gz
-man/man3/gnutls_pk_bits_to_sec_param3.3.gz
-man/man3/gnutls_pk_get_id3.3.gz
-man/man3/gnutls_pk_get_name3.3.gz
-man/man3/gnutls_pk_list3.3.gz
-man/man3/gnutls_pk_to_sign3.3.gz
-man/man3/gnutls_pkcs11_add_provider3.3.gz
-man/man3/gnutls_pkcs11_copy_secret_key3.3.gz
-man/man3/gnutls_pkcs11_copy_x509_crt3.3.gz
-man/man3/gnutls_pkcs11_copy_x509_privkey3.3.gz
-man/man3/gnutls_pkcs11_deinit3.3.gz
-man/man3/gnutls_pkcs11_delete_url3.3.gz
-man/man3/gnutls_pkcs11_get_pin_function3.3.gz
-man/man3/gnutls_pkcs11_init3.3.gz
-man/man3/gnutls_pkcs11_obj_deinit3.3.gz
-man/man3/gnutls_pkcs11_obj_export23.3.gz
-man/man3/gnutls_pkcs11_obj_export3.3.gz
-man/man3/gnutls_pkcs11_obj_export_url3.3.gz
-man/man3/gnutls_pkcs11_obj_get_info3.3.gz
-man/man3/gnutls_pkcs11_obj_get_type3.3.gz
-man/man3/gnutls_pkcs11_obj_import_url3.3.gz
-man/man3/gnutls_pkcs11_obj_init3.3.gz
-man/man3/gnutls_pkcs11_obj_list_import_url23.3.gz
-man/man3/gnutls_pkcs11_obj_list_import_url3.3.gz
-man/man3/gnutls_pkcs11_obj_set_pin_function3.3.gz
-man/man3/gnutls_pkcs11_privkey_deinit3.3.gz
-man/man3/gnutls_pkcs11_privkey_export_url3.3.gz
-man/man3/gnutls_pkcs11_privkey_generate23.3.gz
-man/man3/gnutls_pkcs11_privkey_generate3.3.gz
-man/man3/gnutls_pkcs11_privkey_get_info3.3.gz
-man/man3/gnutls_pkcs11_privkey_get_pk_algorithm3.3.gz
-man/man3/gnutls_pkcs11_privkey_import_url3.3.gz
-man/man3/gnutls_pkcs11_privkey_init3.3.gz
-man/man3/gnutls_pkcs11_privkey_set_pin_function3.3.gz
-man/man3/gnutls_pkcs11_privkey_status3.3.gz
-man/man3/gnutls_pkcs11_reinit3.3.gz
-man/man3/gnutls_pkcs11_set_pin_function3.3.gz
-man/man3/gnutls_pkcs11_set_token_function3.3.gz
-man/man3/gnutls_pkcs11_token_get_flags3.3.gz
-man/man3/gnutls_pkcs11_token_get_info3.3.gz
-man/man3/gnutls_pkcs11_token_get_mechanism3.3.gz
-man/man3/gnutls_pkcs11_token_get_url3.3.gz
-man/man3/gnutls_pkcs11_token_init3.3.gz
-man/man3/gnutls_pkcs11_token_set_pin3.3.gz
-man/man3/gnutls_pkcs11_type_get_name3.3.gz
-man/man3/gnutls_pkcs12_bag_decrypt3.3.gz
-man/man3/gnutls_pkcs12_bag_deinit3.3.gz
-man/man3/gnutls_pkcs12_bag_encrypt3.3.gz
-man/man3/gnutls_pkcs12_bag_get_count3.3.gz
-man/man3/gnutls_pkcs12_bag_get_data3.3.gz
-man/man3/gnutls_pkcs12_bag_get_friendly_name3.3.gz
-man/man3/gnutls_pkcs12_bag_get_key_id3.3.gz
-man/man3/gnutls_pkcs12_bag_get_type3.3.gz
-man/man3/gnutls_pkcs12_bag_init3.3.gz
-man/man3/gnutls_pkcs12_bag_set_crl3.3.gz
-man/man3/gnutls_pkcs12_bag_set_crt3.3.gz
-man/man3/gnutls_pkcs12_bag_set_data3.3.gz
-man/man3/gnutls_pkcs12_bag_set_friendly_name3.3.gz
-man/man3/gnutls_pkcs12_bag_set_key_id3.3.gz
-man/man3/gnutls_pkcs12_deinit3.3.gz
-man/man3/gnutls_pkcs12_export23.3.gz
-man/man3/gnutls_pkcs12_export3.3.gz
-man/man3/gnutls_pkcs12_generate_mac3.3.gz
-man/man3/gnutls_pkcs12_get_bag3.3.gz
-man/man3/gnutls_pkcs12_import3.3.gz
-man/man3/gnutls_pkcs12_init3.3.gz
-man/man3/gnutls_pkcs12_set_bag3.3.gz
-man/man3/gnutls_pkcs12_simple_parse3.3.gz
-man/man3/gnutls_pkcs12_verify_mac3.3.gz
-man/man3/gnutls_pkcs7_deinit3.3.gz
-man/man3/gnutls_pkcs7_delete_crl3.3.gz
-man/man3/gnutls_pkcs7_delete_crt3.3.gz
-man/man3/gnutls_pkcs7_export23.3.gz
-man/man3/gnutls_pkcs7_export3.3.gz
-man/man3/gnutls_pkcs7_get_crl_count3.3.gz
-man/man3/gnutls_pkcs7_get_crl_raw3.3.gz
-man/man3/gnutls_pkcs7_get_crt_count3.3.gz
-man/man3/gnutls_pkcs7_get_crt_raw3.3.gz
-man/man3/gnutls_pkcs7_import3.3.gz
-man/man3/gnutls_pkcs7_init3.3.gz
-man/man3/gnutls_pkcs7_set_crl3.3.gz
-man/man3/gnutls_pkcs7_set_crl_raw3.3.gz
-man/man3/gnutls_pkcs7_set_crt3.3.gz
-man/man3/gnutls_pkcs7_set_crt_raw3.3.gz
-man/man3/gnutls_prf3.3.gz
-man/man3/gnutls_prf_raw3.3.gz
-man/man3/gnutls_priority_certificate_type_list3.3.gz
-man/man3/gnutls_priority_compression_list3.3.gz
-man/man3/gnutls_priority_deinit3.3.gz
-man/man3/gnutls_priority_ecc_curve_list3.3.gz
-man/man3/gnutls_priority_get_cipher_suite_index3.3.gz
-man/man3/gnutls_priority_init3.3.gz
-man/man3/gnutls_priority_protocol_list3.3.gz
-man/man3/gnutls_priority_set3.3.gz
-man/man3/gnutls_priority_set_direct3.3.gz
-man/man3/gnutls_priority_sign_list3.3.gz
-man/man3/gnutls_privkey_decrypt_data3.3.gz
-man/man3/gnutls_privkey_deinit3.3.gz
-man/man3/gnutls_privkey_get_pk_algorithm3.3.gz
-man/man3/gnutls_privkey_get_type3.3.gz
-man/man3/gnutls_privkey_import_ext23.3.gz
-man/man3/gnutls_privkey_import_ext3.3.gz
-man/man3/gnutls_privkey_import_openpgp3.3.gz
-man/man3/gnutls_privkey_import_openpgp_raw3.3.gz
-man/man3/gnutls_privkey_import_pkcs113.3.gz
-man/man3/gnutls_privkey_import_pkcs11_url3.3.gz
-man/man3/gnutls_privkey_import_tpm_raw3.3.gz
-man/man3/gnutls_privkey_import_tpm_url3.3.gz
-man/man3/gnutls_privkey_import_url3.3.gz
-man/man3/gnutls_privkey_import_x5093.3.gz
-man/man3/gnutls_privkey_import_x509_raw3.3.gz
-man/man3/gnutls_privkey_init3.3.gz
-man/man3/gnutls_privkey_set_pin_function3.3.gz
-man/man3/gnutls_privkey_sign_data3.3.gz
-man/man3/gnutls_privkey_sign_hash3.3.gz
-man/man3/gnutls_privkey_sign_raw_data3.3.gz
-man/man3/gnutls_privkey_status3.3.gz
-man/man3/gnutls_protocol_get_id3.3.gz
-man/man3/gnutls_protocol_get_name3.3.gz
-man/man3/gnutls_protocol_get_version3.3.gz
-man/man3/gnutls_protocol_list3.3.gz
-man/man3/gnutls_protocol_set_priority3.3.gz
-man/man3/gnutls_psk_allocate_client_credentials3.3.gz
-man/man3/gnutls_psk_allocate_server_credentials3.3.gz
-man/man3/gnutls_psk_client_get_hint3.3.gz
-man/man3/gnutls_psk_free_client_credentials3.3.gz
-man/man3/gnutls_psk_free_server_credentials3.3.gz
-man/man3/gnutls_psk_server_get_username3.3.gz
-man/man3/gnutls_psk_set_client_credentials3.3.gz
-man/man3/gnutls_psk_set_client_credentials_function3.3.gz
-man/man3/gnutls_psk_set_params_function3.3.gz
-man/man3/gnutls_psk_set_server_credentials_file3.3.gz
-man/man3/gnutls_psk_set_server_credentials_function3.3.gz
-man/man3/gnutls_psk_set_server_credentials_hint3.3.gz
-man/man3/gnutls_psk_set_server_dh_params3.3.gz
-man/man3/gnutls_psk_set_server_params_function3.3.gz
-man/man3/gnutls_pubkey_deinit3.3.gz
-man/man3/gnutls_pubkey_encrypt_data3.3.gz
-man/man3/gnutls_pubkey_export23.3.gz
-man/man3/gnutls_pubkey_export3.3.gz
-man/man3/gnutls_pubkey_get_key_id3.3.gz
-man/man3/gnutls_pubkey_get_key_usage3.3.gz
-man/man3/gnutls_pubkey_get_openpgp_key_id3.3.gz
-man/man3/gnutls_pubkey_get_pk_algorithm3.3.gz
-man/man3/gnutls_pubkey_get_pk_dsa_raw3.3.gz
-man/man3/gnutls_pubkey_get_pk_ecc_raw3.3.gz
-man/man3/gnutls_pubkey_get_pk_ecc_x9623.3.gz
-man/man3/gnutls_pubkey_get_pk_rsa_raw3.3.gz
-man/man3/gnutls_pubkey_get_preferred_hash_algorithm3.3.gz
-man/man3/gnutls_pubkey_get_verify_algorithm3.3.gz
-man/man3/gnutls_pubkey_import3.3.gz
-man/man3/gnutls_pubkey_import_dsa_raw3.3.gz
-man/man3/gnutls_pubkey_import_ecc_raw3.3.gz
-man/man3/gnutls_pubkey_import_ecc_x9623.3.gz
-man/man3/gnutls_pubkey_import_openpgp3.3.gz
-man/man3/gnutls_pubkey_import_openpgp_raw3.3.gz
-man/man3/gnutls_pubkey_import_pkcs113.3.gz
-man/man3/gnutls_pubkey_import_pkcs11_url3.3.gz
-man/man3/gnutls_pubkey_import_privkey3.3.gz
-man/man3/gnutls_pubkey_import_rsa_raw3.3.gz
-man/man3/gnutls_pubkey_import_tpm_raw3.3.gz
-man/man3/gnutls_pubkey_import_tpm_url3.3.gz
-man/man3/gnutls_pubkey_import_url3.3.gz
-man/man3/gnutls_pubkey_import_x5093.3.gz
-man/man3/gnutls_pubkey_import_x509_crq3.3.gz
-man/man3/gnutls_pubkey_import_x509_raw3.3.gz
-man/man3/gnutls_pubkey_init3.3.gz
-man/man3/gnutls_pubkey_print3.3.gz
-man/man3/gnutls_pubkey_set_key_usage3.3.gz
-man/man3/gnutls_pubkey_set_pin_function3.3.gz
-man/man3/gnutls_pubkey_verify_data23.3.gz
-man/man3/gnutls_pubkey_verify_data3.3.gz
-man/man3/gnutls_pubkey_verify_hash23.3.gz
-man/man3/gnutls_pubkey_verify_hash3.3.gz
-man/man3/gnutls_random_art3.3.gz
-man/man3/gnutls_range_split3.3.gz
-man/man3/gnutls_record_can_use_length_hiding3.3.gz
-man/man3/gnutls_record_check_pending3.3.gz
-man/man3/gnutls_record_cork3.3.gz
-man/man3/gnutls_record_disable_padding3.3.gz
-man/man3/gnutls_record_get_direction3.3.gz
-man/man3/gnutls_record_get_discarded3.3.gz
-man/man3/gnutls_record_get_max_size3.3.gz
-man/man3/gnutls_record_recv3.3.gz
-man/man3/gnutls_record_recv_seq3.3.gz
-man/man3/gnutls_record_send3.3.gz
-man/man3/gnutls_record_send_range3.3.gz
-man/man3/gnutls_record_set_max_empty_records3.3.gz
-man/man3/gnutls_record_set_max_size3.3.gz
-man/man3/gnutls_record_set_timeout3.3.gz
-man/man3/gnutls_record_uncork3.3.gz
-man/man3/gnutls_rehandshake3.3.gz
-man/man3/gnutls_rnd3.3.gz
-man/man3/gnutls_rnd_refresh3.3.gz
-man/man3/gnutls_rsa_export_get_modulus_bits3.3.gz
-man/man3/gnutls_rsa_export_get_pubkey3.3.gz
-man/man3/gnutls_rsa_params_cpy3.3.gz
-man/man3/gnutls_rsa_params_deinit3.3.gz
-man/man3/gnutls_rsa_params_export_pkcs13.3.gz
-man/man3/gnutls_rsa_params_export_raw3.3.gz
-man/man3/gnutls_rsa_params_generate23.3.gz
-man/man3/gnutls_rsa_params_import_pkcs13.3.gz
-man/man3/gnutls_rsa_params_import_raw3.3.gz
-man/man3/gnutls_rsa_params_init3.3.gz
-man/man3/gnutls_safe_renegotiation_status3.3.gz
-man/man3/gnutls_sec_param_get_name3.3.gz
-man/man3/gnutls_sec_param_to_pk_bits3.3.gz
-man/man3/gnutls_server_name_get3.3.gz
-man/man3/gnutls_server_name_set3.3.gz
-man/man3/gnutls_session_channel_binding3.3.gz
-man/man3/gnutls_session_enable_compatibility_mode3.3.gz
-man/man3/gnutls_session_force_valid3.3.gz
-man/man3/gnutls_session_get_data23.3.gz
-man/man3/gnutls_session_get_data3.3.gz
-man/man3/gnutls_session_get_desc3.3.gz
-man/man3/gnutls_session_get_id23.3.gz
-man/man3/gnutls_session_get_id3.3.gz
-man/man3/gnutls_session_get_ptr3.3.gz
-man/man3/gnutls_session_get_random3.3.gz
-man/man3/gnutls_session_is_resumed3.3.gz
-man/man3/gnutls_session_resumption_requested3.3.gz
-man/man3/gnutls_session_set_data3.3.gz
-man/man3/gnutls_session_set_premaster3.3.gz
-man/man3/gnutls_session_set_ptr3.3.gz
-man/man3/gnutls_session_ticket_enable_client3.3.gz
-man/man3/gnutls_session_ticket_enable_server3.3.gz
-man/man3/gnutls_session_ticket_key_generate3.3.gz
-man/man3/gnutls_set_default_export_priority3.3.gz
-man/man3/gnutls_set_default_priority3.3.gz
-man/man3/gnutls_sign_algorithm_get3.3.gz
-man/man3/gnutls_sign_algorithm_get_client3.3.gz
-man/man3/gnutls_sign_algorithm_get_requested3.3.gz
-man/man3/gnutls_sign_callback_get3.3.gz
-man/man3/gnutls_sign_callback_set3.3.gz
-man/man3/gnutls_sign_get_hash_algorithm3.3.gz
-man/man3/gnutls_sign_get_id3.3.gz
-man/man3/gnutls_sign_get_name3.3.gz
-man/man3/gnutls_sign_get_pk_algorithm3.3.gz
-man/man3/gnutls_sign_is_secure3.3.gz
-man/man3/gnutls_sign_list3.3.gz
-man/man3/gnutls_srp_allocate_client_credentials3.3.gz
-man/man3/gnutls_srp_allocate_server_credentials3.3.gz
-man/man3/gnutls_srp_base64_decode3.3.gz
-man/man3/gnutls_srp_base64_decode_alloc3.3.gz
-man/man3/gnutls_srp_base64_encode3.3.gz
-man/man3/gnutls_srp_base64_encode_alloc3.3.gz
-man/man3/gnutls_srp_free_client_credentials3.3.gz
-man/man3/gnutls_srp_free_server_credentials3.3.gz
-man/man3/gnutls_srp_server_get_username3.3.gz
-man/man3/gnutls_srp_set_client_credentials3.3.gz
-man/man3/gnutls_srp_set_client_credentials_function3.3.gz
-man/man3/gnutls_srp_set_prime_bits3.3.gz
-man/man3/gnutls_srp_set_server_credentials_file3.3.gz
-man/man3/gnutls_srp_set_server_credentials_function3.3.gz
-man/man3/gnutls_srp_verifier3.3.gz
-man/man3/gnutls_srtp_get_keys3.3.gz
-man/man3/gnutls_srtp_get_mki3.3.gz
-man/man3/gnutls_srtp_get_profile_id3.3.gz
-man/man3/gnutls_srtp_get_profile_name3.3.gz
-man/man3/gnutls_srtp_get_selected_profile3.3.gz
-man/man3/gnutls_srtp_set_mki3.3.gz
-man/man3/gnutls_srtp_set_profile3.3.gz
-man/man3/gnutls_srtp_set_profile_direct3.3.gz
-man/man3/gnutls_store_commitment3.3.gz
-man/man3/gnutls_store_pubkey3.3.gz
-man/man3/gnutls_strerror3.3.gz
-man/man3/gnutls_strerror_name3.3.gz
-man/man3/gnutls_supplemental_get_name3.3.gz
-man/man3/gnutls_tdb_deinit3.3.gz
-man/man3/gnutls_tdb_init3.3.gz
-man/man3/gnutls_tdb_set_store_commitment_func3.3.gz
-man/man3/gnutls_tdb_set_store_func3.3.gz
-man/man3/gnutls_tdb_set_verify_func3.3.gz
-man/man3/gnutls_tpm_get_registered3.3.gz
-man/man3/gnutls_tpm_key_list_deinit3.3.gz
-man/man3/gnutls_tpm_key_list_get_url3.3.gz
-man/man3/gnutls_tpm_privkey_delete3.3.gz
-man/man3/gnutls_tpm_privkey_generate3.3.gz
-man/man3/gnutls_transport_get_int23.3.gz
-man/man3/gnutls_transport_get_int3.3.gz
-man/man3/gnutls_transport_get_ptr23.3.gz
-man/man3/gnutls_transport_get_ptr3.3.gz
-man/man3/gnutls_transport_set_errno3.3.gz
-man/man3/gnutls_transport_set_errno_function3.3.gz
-man/man3/gnutls_transport_set_int23.3.gz
-man/man3/gnutls_transport_set_int3.3.gz
-man/man3/gnutls_transport_set_ptr23.3.gz
-man/man3/gnutls_transport_set_ptr3.3.gz
-man/man3/gnutls_transport_set_pull_function3.3.gz
-man/man3/gnutls_transport_set_pull_timeout_function3.3.gz
-man/man3/gnutls_transport_set_push_function3.3.gz
-man/man3/gnutls_transport_set_vec_push_function3.3.gz
-man/man3/gnutls_url_is_supported3.3.gz
-man/man3/gnutls_verify_stored_pubkey3.3.gz
-man/man3/gnutls_x509_crl_check_issuer3.3.gz
-man/man3/gnutls_x509_crl_deinit3.3.gz
-man/man3/gnutls_x509_crl_export23.3.gz
-man/man3/gnutls_x509_crl_export3.3.gz
-man/man3/gnutls_x509_crl_get_authority_key_gn_serial3.3.gz
-man/man3/gnutls_x509_crl_get_authority_key_id3.3.gz
-man/man3/gnutls_x509_crl_get_crt_count3.3.gz
-man/man3/gnutls_x509_crl_get_crt_serial3.3.gz
-man/man3/gnutls_x509_crl_get_dn_oid3.3.gz
-man/man3/gnutls_x509_crl_get_extension_data3.3.gz
-man/man3/gnutls_x509_crl_get_extension_info3.3.gz
-man/man3/gnutls_x509_crl_get_extension_oid3.3.gz
-man/man3/gnutls_x509_crl_get_issuer_dn23.3.gz
-man/man3/gnutls_x509_crl_get_issuer_dn3.3.gz
-man/man3/gnutls_x509_crl_get_issuer_dn_by_oid3.3.gz
-man/man3/gnutls_x509_crl_get_next_update3.3.gz
-man/man3/gnutls_x509_crl_get_number3.3.gz
-man/man3/gnutls_x509_crl_get_raw_issuer_dn3.3.gz
-man/man3/gnutls_x509_crl_get_signature3.3.gz
-man/man3/gnutls_x509_crl_get_signature_algorithm3.3.gz
-man/man3/gnutls_x509_crl_get_this_update3.3.gz
-man/man3/gnutls_x509_crl_get_version3.3.gz
-man/man3/gnutls_x509_crl_import3.3.gz
-man/man3/gnutls_x509_crl_init3.3.gz
-man/man3/gnutls_x509_crl_list_import23.3.gz
-man/man3/gnutls_x509_crl_list_import3.3.gz
-man/man3/gnutls_x509_crl_print3.3.gz
-man/man3/gnutls_x509_crl_privkey_sign3.3.gz
-man/man3/gnutls_x509_crl_set_authority_key_id3.3.gz
-man/man3/gnutls_x509_crl_set_crt3.3.gz
-man/man3/gnutls_x509_crl_set_crt_serial3.3.gz
-man/man3/gnutls_x509_crl_set_next_update3.3.gz
-man/man3/gnutls_x509_crl_set_number3.3.gz
-man/man3/gnutls_x509_crl_set_this_update3.3.gz
-man/man3/gnutls_x509_crl_set_version3.3.gz
-man/man3/gnutls_x509_crl_sign23.3.gz
-man/man3/gnutls_x509_crl_sign3.3.gz
-man/man3/gnutls_x509_crl_verify3.3.gz
-man/man3/gnutls_x509_crq_deinit3.3.gz
-man/man3/gnutls_x509_crq_export23.3.gz
-man/man3/gnutls_x509_crq_export3.3.gz
-man/man3/gnutls_x509_crq_get_attribute_by_oid3.3.gz
-man/man3/gnutls_x509_crq_get_attribute_data3.3.gz
-man/man3/gnutls_x509_crq_get_attribute_info3.3.gz
-man/man3/gnutls_x509_crq_get_basic_constraints3.3.gz
-man/man3/gnutls_x509_crq_get_challenge_password3.3.gz
-man/man3/gnutls_x509_crq_get_dn23.3.gz
-man/man3/gnutls_x509_crq_get_dn3.3.gz
-man/man3/gnutls_x509_crq_get_dn_by_oid3.3.gz
-man/man3/gnutls_x509_crq_get_dn_oid3.3.gz
-man/man3/gnutls_x509_crq_get_extension_by_oid3.3.gz
-man/man3/gnutls_x509_crq_get_extension_data3.3.gz
-man/man3/gnutls_x509_crq_get_extension_info3.3.gz
-man/man3/gnutls_x509_crq_get_key_id3.3.gz
-man/man3/gnutls_x509_crq_get_key_purpose_oid3.3.gz
-man/man3/gnutls_x509_crq_get_key_rsa_raw3.3.gz
-man/man3/gnutls_x509_crq_get_key_usage3.3.gz
-man/man3/gnutls_x509_crq_get_pk_algorithm3.3.gz
-man/man3/gnutls_x509_crq_get_private_key_usage_period3.3.gz
-man/man3/gnutls_x509_crq_get_subject_alt_name3.3.gz
-man/man3/gnutls_x509_crq_get_subject_alt_othername_oid3.3.gz
-man/man3/gnutls_x509_crq_get_version3.3.gz
-man/man3/gnutls_x509_crq_import3.3.gz
-man/man3/gnutls_x509_crq_init3.3.gz
-man/man3/gnutls_x509_crq_print3.3.gz
-man/man3/gnutls_x509_crq_privkey_sign3.3.gz
-man/man3/gnutls_x509_crq_set_attribute_by_oid3.3.gz
-man/man3/gnutls_x509_crq_set_basic_constraints3.3.gz
-man/man3/gnutls_x509_crq_set_challenge_password3.3.gz
-man/man3/gnutls_x509_crq_set_dn3.3.gz
-man/man3/gnutls_x509_crq_set_dn_by_oid3.3.gz
-man/man3/gnutls_x509_crq_set_key3.3.gz
-man/man3/gnutls_x509_crq_set_key_purpose_oid3.3.gz
-man/man3/gnutls_x509_crq_set_key_rsa_raw3.3.gz
-man/man3/gnutls_x509_crq_set_key_usage3.3.gz
-man/man3/gnutls_x509_crq_set_private_key_usage_period3.3.gz
-man/man3/gnutls_x509_crq_set_pubkey3.3.gz
-man/man3/gnutls_x509_crq_set_subject_alt_name3.3.gz
-man/man3/gnutls_x509_crq_set_version3.3.gz
-man/man3/gnutls_x509_crq_sign23.3.gz
-man/man3/gnutls_x509_crq_sign3.3.gz
-man/man3/gnutls_x509_crq_verify3.3.gz
-man/man3/gnutls_x509_crt_check_hostname3.3.gz
-man/man3/gnutls_x509_crt_check_issuer3.3.gz
-man/man3/gnutls_x509_crt_check_revocation3.3.gz
-man/man3/gnutls_x509_crt_cpy_crl_dist_points3.3.gz
-man/man3/gnutls_x509_crt_deinit3.3.gz
-man/man3/gnutls_x509_crt_export23.3.gz
-man/man3/gnutls_x509_crt_export3.3.gz
-man/man3/gnutls_x509_crt_get_activation_time3.3.gz
-man/man3/gnutls_x509_crt_get_authority_info_access3.3.gz
-man/man3/gnutls_x509_crt_get_authority_key_gn_serial3.3.gz
-man/man3/gnutls_x509_crt_get_authority_key_id3.3.gz
-man/man3/gnutls_x509_crt_get_basic_constraints3.3.gz
-man/man3/gnutls_x509_crt_get_ca_status3.3.gz
-man/man3/gnutls_x509_crt_get_crl_dist_points3.3.gz
-man/man3/gnutls_x509_crt_get_dn23.3.gz
-man/man3/gnutls_x509_crt_get_dn3.3.gz
-man/man3/gnutls_x509_crt_get_dn_by_oid3.3.gz
-man/man3/gnutls_x509_crt_get_dn_oid3.3.gz
-man/man3/gnutls_x509_crt_get_expiration_time3.3.gz
-man/man3/gnutls_x509_crt_get_extension_by_oid3.3.gz
-man/man3/gnutls_x509_crt_get_extension_data3.3.gz
-man/man3/gnutls_x509_crt_get_extension_info3.3.gz
-man/man3/gnutls_x509_crt_get_extension_oid3.3.gz
-man/man3/gnutls_x509_crt_get_fingerprint3.3.gz
-man/man3/gnutls_x509_crt_get_issuer3.3.gz
-man/man3/gnutls_x509_crt_get_issuer_alt_name23.3.gz
-man/man3/gnutls_x509_crt_get_issuer_alt_name3.3.gz
-man/man3/gnutls_x509_crt_get_issuer_alt_othername_oid3.3.gz
-man/man3/gnutls_x509_crt_get_issuer_dn23.3.gz
-man/man3/gnutls_x509_crt_get_issuer_dn3.3.gz
-man/man3/gnutls_x509_crt_get_issuer_dn_by_oid3.3.gz
-man/man3/gnutls_x509_crt_get_issuer_dn_oid3.3.gz
-man/man3/gnutls_x509_crt_get_issuer_unique_id3.3.gz
-man/man3/gnutls_x509_crt_get_key_id3.3.gz
-man/man3/gnutls_x509_crt_get_key_purpose_oid3.3.gz
-man/man3/gnutls_x509_crt_get_key_usage3.3.gz
-man/man3/gnutls_x509_crt_get_pk_algorithm3.3.gz
-man/man3/gnutls_x509_crt_get_pk_dsa_raw3.3.gz
-man/man3/gnutls_x509_crt_get_pk_rsa_raw3.3.gz
-man/man3/gnutls_x509_crt_get_policy3.3.gz
-man/man3/gnutls_x509_crt_get_preferred_hash_algorithm3.3.gz
-man/man3/gnutls_x509_crt_get_private_key_usage_period3.3.gz
-man/man3/gnutls_x509_crt_get_proxy3.3.gz
-man/man3/gnutls_x509_crt_get_raw_dn3.3.gz
-man/man3/gnutls_x509_crt_get_raw_issuer_dn3.3.gz
-man/man3/gnutls_x509_crt_get_serial3.3.gz
-man/man3/gnutls_x509_crt_get_signature3.3.gz
-man/man3/gnutls_x509_crt_get_signature_algorithm3.3.gz
-man/man3/gnutls_x509_crt_get_subject3.3.gz
-man/man3/gnutls_x509_crt_get_subject_alt_name23.3.gz
-man/man3/gnutls_x509_crt_get_subject_alt_name3.3.gz
-man/man3/gnutls_x509_crt_get_subject_alt_othername_oid3.3.gz
-man/man3/gnutls_x509_crt_get_subject_key_id3.3.gz
-man/man3/gnutls_x509_crt_get_subject_unique_id3.3.gz
-man/man3/gnutls_x509_crt_get_verify_algorithm3.3.gz
-man/man3/gnutls_x509_crt_get_version3.3.gz
-man/man3/gnutls_x509_crt_import3.3.gz
-man/man3/gnutls_x509_crt_import_pkcs113.3.gz
-man/man3/gnutls_x509_crt_import_pkcs11_url3.3.gz
-man/man3/gnutls_x509_crt_init3.3.gz
-man/man3/gnutls_x509_crt_list_import23.3.gz
-man/man3/gnutls_x509_crt_list_import3.3.gz
-man/man3/gnutls_x509_crt_list_import_pkcs113.3.gz
-man/man3/gnutls_x509_crt_list_verify3.3.gz
-man/man3/gnutls_x509_crt_print3.3.gz
-man/man3/gnutls_x509_crt_privkey_sign3.3.gz
-man/man3/gnutls_x509_crt_set_activation_time3.3.gz
-man/man3/gnutls_x509_crt_set_authority_info_access3.3.gz
-man/man3/gnutls_x509_crt_set_authority_key_id3.3.gz
-man/man3/gnutls_x509_crt_set_basic_constraints3.3.gz
-man/man3/gnutls_x509_crt_set_ca_status3.3.gz
-man/man3/gnutls_x509_crt_set_crl_dist_points23.3.gz
-man/man3/gnutls_x509_crt_set_crl_dist_points3.3.gz
-man/man3/gnutls_x509_crt_set_crq3.3.gz
-man/man3/gnutls_x509_crt_set_crq_extensions3.3.gz
-man/man3/gnutls_x509_crt_set_dn3.3.gz
-man/man3/gnutls_x509_crt_set_dn_by_oid3.3.gz
-man/man3/gnutls_x509_crt_set_expiration_time3.3.gz
-man/man3/gnutls_x509_crt_set_extension_by_oid3.3.gz
-man/man3/gnutls_x509_crt_set_issuer_dn3.3.gz
-man/man3/gnutls_x509_crt_set_issuer_dn_by_oid3.3.gz
-man/man3/gnutls_x509_crt_set_key3.3.gz
-man/man3/gnutls_x509_crt_set_key_purpose_oid3.3.gz
-man/man3/gnutls_x509_crt_set_key_usage3.3.gz
-man/man3/gnutls_x509_crt_set_pin_function3.3.gz
-man/man3/gnutls_x509_crt_set_policy3.3.gz
-man/man3/gnutls_x509_crt_set_private_key_usage_period3.3.gz
-man/man3/gnutls_x509_crt_set_proxy3.3.gz
-man/man3/gnutls_x509_crt_set_proxy_dn3.3.gz
-man/man3/gnutls_x509_crt_set_pubkey3.3.gz
-man/man3/gnutls_x509_crt_set_serial3.3.gz
-man/man3/gnutls_x509_crt_set_subject_alt_name3.3.gz
-man/man3/gnutls_x509_crt_set_subject_alternative_name3.3.gz
-man/man3/gnutls_x509_crt_set_subject_key_id3.3.gz
-man/man3/gnutls_x509_crt_set_version3.3.gz
-man/man3/gnutls_x509_crt_sign23.3.gz
-man/man3/gnutls_x509_crt_sign3.3.gz
-man/man3/gnutls_x509_crt_verify3.3.gz
-man/man3/gnutls_x509_crt_verify_data3.3.gz
-man/man3/gnutls_x509_crt_verify_hash3.3.gz
-man/man3/gnutls_x509_dn_deinit3.3.gz
-man/man3/gnutls_x509_dn_export23.3.gz
-man/man3/gnutls_x509_dn_export3.3.gz
-man/man3/gnutls_x509_dn_get_rdn_ava3.3.gz
-man/man3/gnutls_x509_dn_import3.3.gz
-man/man3/gnutls_x509_dn_init3.3.gz
-man/man3/gnutls_x509_dn_oid_known3.3.gz
-man/man3/gnutls_x509_dn_oid_name3.3.gz
-man/man3/gnutls_x509_policy_release3.3.gz
-man/man3/gnutls_x509_privkey_cpy3.3.gz
-man/man3/gnutls_x509_privkey_deinit3.3.gz
-man/man3/gnutls_x509_privkey_export23.3.gz
-man/man3/gnutls_x509_privkey_export2_pkcs83.3.gz
-man/man3/gnutls_x509_privkey_export3.3.gz
-man/man3/gnutls_x509_privkey_export_dsa_raw3.3.gz
-man/man3/gnutls_x509_privkey_export_ecc_raw3.3.gz
-man/man3/gnutls_x509_privkey_export_pkcs83.3.gz
-man/man3/gnutls_x509_privkey_export_rsa_raw23.3.gz
-man/man3/gnutls_x509_privkey_export_rsa_raw3.3.gz
-man/man3/gnutls_x509_privkey_fix3.3.gz
-man/man3/gnutls_x509_privkey_generate3.3.gz
-man/man3/gnutls_x509_privkey_get_key_id3.3.gz
-man/man3/gnutls_x509_privkey_get_pk_algorithm23.3.gz
-man/man3/gnutls_x509_privkey_get_pk_algorithm3.3.gz
-man/man3/gnutls_x509_privkey_import23.3.gz
-man/man3/gnutls_x509_privkey_import3.3.gz
-man/man3/gnutls_x509_privkey_import_dsa_raw3.3.gz
-man/man3/gnutls_x509_privkey_import_ecc_raw3.3.gz
-man/man3/gnutls_x509_privkey_import_openssl3.3.gz
-man/man3/gnutls_x509_privkey_import_pkcs83.3.gz
-man/man3/gnutls_x509_privkey_import_rsa_raw23.3.gz
-man/man3/gnutls_x509_privkey_import_rsa_raw3.3.gz
-man/man3/gnutls_x509_privkey_init3.3.gz
-man/man3/gnutls_x509_privkey_sec_param3.3.gz
-man/man3/gnutls_x509_privkey_sign_data3.3.gz
-man/man3/gnutls_x509_privkey_sign_hash3.3.gz
-man/man3/gnutls_x509_privkey_verify_params3.3.gz
-man/man3/gnutls_x509_rdn_get3.3.gz
-man/man3/gnutls_x509_rdn_get_by_oid3.3.gz
-man/man3/gnutls_x509_rdn_get_oid3.3.gz
-man/man3/gnutls_x509_trust_list_add_cas3.3.gz
-man/man3/gnutls_x509_trust_list_add_crls3.3.gz
-man/man3/gnutls_x509_trust_list_add_named_crt3.3.gz
-man/man3/gnutls_x509_trust_list_add_system_trust3.3.gz
-man/man3/gnutls_x509_trust_list_add_trust_file3.3.gz
-man/man3/gnutls_x509_trust_list_add_trust_mem3.3.gz
-man/man3/gnutls_x509_trust_list_deinit3.3.gz
-man/man3/gnutls_x509_trust_list_get_issuer3.3.gz
-man/man3/gnutls_x509_trust_list_init3.3.gz
-man/man3/gnutls_x509_trust_list_remove_cas3.3.gz
-man/man3/gnutls_x509_trust_list_remove_trust_file3.3.gz
-man/man3/gnutls_x509_trust_list_remove_trust_mem3.3.gz
-man/man3/gnutls_x509_trust_list_verify_crt3.3.gz
-man/man3/gnutls_x509_trust_list_verify_named_crt3.3.gz
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ex-alert.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ex-cert-select-pkcs11.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ex-cert-select.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ex-client-anon.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ex-client-dtls.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ex-client-psk.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ex-client-resume.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ex-client-srp.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ex-client-x509.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ex-client-xssl1.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ex-client-xssl2.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ex-crq.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ex-ocsp-client.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ex-pkcs11-list.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ex-pkcs12.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ex-serv-anon.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ex-serv-dtls.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ex-serv-pgp.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ex-serv-psk.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ex-serv-srp.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ex-serv-x509.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ex-session-info.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ex-verify-ssh.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ex-verify.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ex-x509-info.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/print-ciphersuites.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tcp.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/udp.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/verify.c
-%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%
-@dirrmtry lib/gnutls3
-@dirrmtry info/gnutls3
-@dirrmtry include/gnutls3/gnutls
-@dirrmtry include/gnutls3
diff --git a/security/gsasl/Makefile b/security/gsasl/Makefile
index be318af05482..8a2631e9828c 100644
--- a/security/gsasl/Makefile
+++ b/security/gsasl/Makefile
@@ -3,7 +3,7 @@
PORTNAME= gsasl
PORTVERSION= 1.8.0
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= security
MASTER_SITES= GNU
diff --git a/security/libprelude/Makefile b/security/libprelude/Makefile
index 125a1ffd5a51..682b5add84cc 100644
--- a/security/libprelude/Makefile
+++ b/security/libprelude/Makefile
@@ -3,7 +3,7 @@
PORTNAME= libprelude
PORTVERSION= 1.0.1
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= security
MASTER_SITES= https://www.prelude-ids.org/attachments/download/241/
@@ -62,6 +62,9 @@ BROKEN= Does not compile
post-patch:
@${REINPLACE_CMD} -e \
'/^install-data-am:/s|install-data-local||' ${WRKSRC}/docs/api/Makefile.in
+ @${REINPLACE_CMD} '\,gnutls/extra\.h,d' \
+ ${WRKSRC}/prelude-admin/prelude-admin.c \
+ ${WRKSRC}/prelude-admin/server.c
post-install:
${INSTALL_MAN} ${WRKSRC}/docs/manpages/*.1 ${MAN1PREFIX}/man/man1
diff --git a/security/libpreludedb/Makefile b/security/libpreludedb/Makefile
index 99a1c3dc1e8c..c24308058e40 100644
--- a/security/libpreludedb/Makefile
+++ b/security/libpreludedb/Makefile
@@ -3,7 +3,7 @@
PORTNAME= libpreludedb
PORTVERSION= 1.0.1p1
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= security
MASTER_SITES= https://www.prelude-ids.org/attachments/download/287/
diff --git a/security/openconnect/Makefile b/security/openconnect/Makefile
index 76a6c2d6618f..8184a99f704f 100644
--- a/security/openconnect/Makefile
+++ b/security/openconnect/Makefile
@@ -3,7 +3,7 @@
PORTNAME= openconnect
PORTVERSION= 5.03
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= security
MASTER_SITES= ftp://ftp.infradead.org/pub/openconnect/ \
http://mirrors.rit.edu/zi/
@@ -35,9 +35,7 @@ PROXY_CONFIGURE_WITH= libproxy
GNUTLS_DESC= Use GnuTLS instead of OpenSSL(EXPERIMENTAL)
GNUTLS_LIB_DEPENDS= libgnutls.so:${PORTSDIR}/security/gnutls
-GNUTLS_BUILD_DEPENDS= ${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss
-GNUTLS_RUN_DEPENDS= ${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss
-GNUTLS_CONFIGURE_WITH= gnutls system-cafile=${LOCALBASE}/share/certs/ca-root-nss.crt
+GNUTLS_CONFIGURE_WITH= gnutls
GNUTLS_USE_OFF= OPENSSL=yes
post-install:
diff --git a/security/openvas-libnasl/Makefile b/security/openvas-libnasl/Makefile
index 20c9fb4c79ea..a8eef2b1546c 100644
--- a/security/openvas-libnasl/Makefile
+++ b/security/openvas-libnasl/Makefile
@@ -3,7 +3,7 @@
PORTNAME= openvas-libnasl
PORTVERSION= 2.0.1
-PORTREVISION= 11
+PORTREVISION= 12
CATEGORIES= security
MASTER_SITES= http://wald.intevation.org/frs/download.php/561/
diff --git a/security/openvas-libraries/Makefile b/security/openvas-libraries/Makefile
index 3b3ce7699b0c..d9d3925acf2d 100644
--- a/security/openvas-libraries/Makefile
+++ b/security/openvas-libraries/Makefile
@@ -3,7 +3,7 @@
PORTNAME= openvas-libraries
PORTVERSION= 2.0.3
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= security
MASTER_SITES= http://wald.intevation.org/frs/download.php/600/
diff --git a/security/openvas-libraries/files/patch-libopenvas-network.c b/security/openvas-libraries/files/patch-libopenvas-network.c
new file mode 100644
index 000000000000..e1c277b0c006
--- /dev/null
+++ b/security/openvas-libraries/files/patch-libopenvas-network.c
@@ -0,0 +1,11 @@
+--- libopenvas/network.c.orig
++++ libopenvas/network.c
+@@ -771,8 +771,6 @@
+ }
+
+ unblock_socket(fp->fd);
+- /* for non-blocking sockets, gnutls requires a 0 lowat value */
+- gnutls_transport_set_lowat(fp->tls_session, 0);
+
+ gnutls_transport_set_ptr(fp->tls_session, (gnutls_transport_ptr_t) GSIZE_TO_POINTER(fp->fd));
+
diff --git a/security/openvas-plugins/Makefile b/security/openvas-plugins/Makefile
index 3df592101e1c..4cf4c8eef030 100644
--- a/security/openvas-plugins/Makefile
+++ b/security/openvas-plugins/Makefile
@@ -3,7 +3,7 @@
PORTNAME= openvas-plugins
PORTVERSION= 1.0.7
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= security
MASTER_SITES= http://wald.intevation.org/frs/download.php/588/
diff --git a/security/prelude-lml/Makefile b/security/prelude-lml/Makefile
index d53c2e542e99..aceddaabe34d 100644
--- a/security/prelude-lml/Makefile
+++ b/security/prelude-lml/Makefile
@@ -3,7 +3,7 @@
PORTNAME= prelude-lml
PORTVERSION= 1.0.1
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= security
MASTER_SITES= https://www.prelude-ids.org/attachments/download/242/
diff --git a/security/prelude-manager/Makefile b/security/prelude-manager/Makefile
index 310bc1ba27bb..2f4d4843a77a 100644
--- a/security/prelude-manager/Makefile
+++ b/security/prelude-manager/Makefile
@@ -3,7 +3,7 @@
PORTNAME= prelude-manager
PORTVERSION= 1.0.2
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= security
MASTER_SITES= https://www.prelude-ids.org/attachments/download/243/
diff --git a/security/py-gnutls/Makefile b/security/py-gnutls/Makefile
index 517930f220e1..187f832ae31b 100644
--- a/security/py-gnutls/Makefile
+++ b/security/py-gnutls/Makefile
@@ -3,6 +3,7 @@
PORTNAME= gnutls
PORTVERSION= 1.2.5
+PORTREVISION= 1
CATEGORIES= security python
MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
diff --git a/security/shishi/Makefile b/security/shishi/Makefile
index 561807b1fb82..6d64d7cf8eb5 100644
--- a/security/shishi/Makefile
+++ b/security/shishi/Makefile
@@ -2,7 +2,7 @@
PORTNAME= shishi
PORTVERSION= 1.0.2
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= security
MASTER_SITES= GNU
diff --git a/security/xmlsec1/Makefile b/security/xmlsec1/Makefile
index 2d53d6fdfab6..c1c9a94741cf 100644
--- a/security/xmlsec1/Makefile
+++ b/security/xmlsec1/Makefile
@@ -3,6 +3,7 @@
PORTNAME= xmlsec1
PORTVERSION= 1.2.20
+PORTREVISION= 1
CATEGORIES= security
MASTER_SITES= http://www.aleksey.com/xmlsec/download/ \
ftp://ftp.aleksey.com/pub/xmlsec/releases/ \
diff --git a/sysutils/gkrellm2/Makefile b/sysutils/gkrellm2/Makefile
index 7ab024fc8ed9..2a2a98676d84 100644
--- a/sysutils/gkrellm2/Makefile
+++ b/sysutils/gkrellm2/Makefile
@@ -2,7 +2,7 @@
PORTNAME= gkrellm
PORTVERSION= 2.3.5
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= sysutils ipv6
MASTER_SITES= http://members.dslextreme.com/users/billw/gkrellm/ \
${MASTER_SITE_LOCAL}
diff --git a/sysutils/heartbeat/Makefile b/sysutils/heartbeat/Makefile
index 84021aa7c8f7..a4b2767592d6 100644
--- a/sysutils/heartbeat/Makefile
+++ b/sysutils/heartbeat/Makefile
@@ -3,7 +3,7 @@
PORTNAME= heartbeat
PORTVERSION= 2.1.4
-PORTREVISION= 23
+PORTREVISION= 24
CATEGORIES= sysutils
#MASTER_SITES= http://hg.linux-ha.org/lha-2.1/archive/STABLE-2.1.4.tar.bz2
MASTER_SITES= ${MASTER_SITE_LOCAL}
diff --git a/sysutils/heartbeat/files/patch-lib__plugins__quorum__quorumd.c b/sysutils/heartbeat/files/patch-lib__plugins__quorum__quorumd.c
new file mode 100644
index 000000000000..d16768cba841
--- /dev/null
+++ b/sysutils/heartbeat/files/patch-lib__plugins__quorum__quorumd.c
@@ -0,0 +1,32 @@
+--- lib/plugins/quorum/quorumd.c.orig
++++ lib/plugins/quorum/quorumd.c
+@@ -353,15 +353,28 @@
+ unsigned int cert_list_size;
+ const gnutls_datum *cert_list;
+ int ret;
++ int status;
+ gnutls_x509_crt cert;
+
+- ret = gnutls_certificate_verify_peers (session);
++ ret = gnutls_certificate_verify_peers2 (session, &status);
+
+ if (ret < 0)
+ {
+ printf("gnutls_certificate_verify_peers2 returns error.\n");
+ return -1;
+ }
++ if (status & GNUTLS_CERT_INVALID) {
++ printf("The certificate is not trusted.\n");
++ return -1;
++ }
++ if (status & GNUTLS_CERT_SIGNER_NOT_FOUND) {
++ printf("The certificate hasn't got a known issuer.\n");
++ return -1;
++ }
++ if (status & GNUTLS_CERT_REVOKED) {
++ printf("The certificate has been revoked.\n");
++ return -1;
++ }
+ if (gnutls_certificate_type_get (session) != GNUTLS_CRT_X509) {
+ printf("The certificate is not a x.509 cert\n");
+ return -1;
diff --git a/sysutils/heartbeat/files/patch-membership__quorumd__quorumd.c b/sysutils/heartbeat/files/patch-membership__quorumd__quorumd.c
new file mode 100644
index 000000000000..63def34bcfc9
--- /dev/null
+++ b/sysutils/heartbeat/files/patch-membership__quorumd__quorumd.c
@@ -0,0 +1,34 @@
+--- membership/quorumd/quorumd.c.orig
++++ membership/quorumd/quorumd.c
+@@ -476,17 +476,30 @@
+ unsigned int cert_list_size;
+ const gnutls_datum *cert_list;
+ int ret;
++ int status;
+ char dn[MAX_DN_LEN];
+ size_t dn_len = MAX_DN_LEN;
+ gnutls_x509_crt cert;
+
+- ret = gnutls_certificate_verify_peers(session);
++ ret = gnutls_certificate_verify_peers2(session, &status);
+
+ if (ret < 0)
+ {
+ quorum_debug(LOG_DEBUG,"gnutls_certificate_verify_peers2 returns error");
+ return -1;
+ }
++ if (status & GNUTLS_CERT_INVALID) {
++ printf("The certificate is not trusted.\n");
++ return -1;
++ }
++ if (status & GNUTLS_CERT_SIGNER_NOT_FOUND) {
++ printf("The certificate hasn't got a known issuer.\n");
++ return -1;
++ }
++ if (status & GNUTLS_CERT_REVOKED) {
++ printf("The certificate has been revoked.\n");
++ return -1;
++ }
+ if (gnutls_certificate_type_get (session) != GNUTLS_CRT_X509) {
+ quorum_debug(LOG_DEBUG,"The certificate is not a x.509 cert");
+ return -1;
diff --git a/sysutils/heartbeat/files/patch-membership__quorumd__quorumdtest.c b/sysutils/heartbeat/files/patch-membership__quorumd__quorumdtest.c
new file mode 100644
index 000000000000..ddbc2cce3565
--- /dev/null
+++ b/sysutils/heartbeat/files/patch-membership__quorumd__quorumdtest.c
@@ -0,0 +1,29 @@
+--- membership/quorumd/quorumdtest.c.orig
++++ membership/quorumd/quorumdtest.c
+@@ -162,16 +162,16 @@
+ unsigned int cert_list_size;
+ const gnutls_datum *cert_list;
+ int ret;
++ int status;
+ gnutls_x509_crt cert;
+
+- ret = gnutls_certificate_verify_peers (session);
++ ret = gnutls_certificate_verify_peers2 (session, &status);
+
+ if (ret < 0)
+ {
+ printf("gnutls_certificate_verify_peers2 returns error.\n");
+ return -1;
+ }
+-/*
+ if (status & GNUTLS_CERT_INVALID) {
+ printf("The certificate is not trusted.\n");
+ return -1;
+@@ -184,7 +184,6 @@
+ printf("The certificate has been revoked.\n");
+ return -1;
+ }
+-*/
+ if (gnutls_certificate_type_get (session) != GNUTLS_CRT_X509) {
+ printf("The certificate is not a x.509 cert\n");
+ return -1;
diff --git a/sysutils/rsyslog7-devel/Makefile b/sysutils/rsyslog7-devel/Makefile
index a17bbbf0cc3d..5af2fd9cac9f 100644
--- a/sysutils/rsyslog7-devel/Makefile
+++ b/sysutils/rsyslog7-devel/Makefile
@@ -2,7 +2,7 @@
PORTNAME= rsyslog
PORTVERSION= 7.5.8
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= sysutils
MASTER_SITES= http://www.rsyslog.com/files/download/rsyslog/
diff --git a/sysutils/rsyslog7/Makefile b/sysutils/rsyslog7/Makefile
index 5449b7add36d..01e0a1c08585 100644
--- a/sysutils/rsyslog7/Makefile
+++ b/sysutils/rsyslog7/Makefile
@@ -2,7 +2,7 @@
PORTNAME= rsyslog
PORTVERSION= 7.6.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= sysutils
MASTER_SITES= http://www.rsyslog.com/files/download/rsyslog/
diff --git a/sysutils/rsyslog8-devel/Makefile b/sysutils/rsyslog8-devel/Makefile
index ac2d5f2ba2a2..291dc697690b 100644
--- a/sysutils/rsyslog8-devel/Makefile
+++ b/sysutils/rsyslog8-devel/Makefile
@@ -2,7 +2,7 @@
PORTNAME= rsyslog
PORTVERSION= 8.3.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= sysutils
MASTER_SITES= http://www.rsyslog.com/files/download/rsyslog/
diff --git a/sysutils/rsyslog8/Makefile b/sysutils/rsyslog8/Makefile
index e60900a7efdd..4beccf184796 100644
--- a/sysutils/rsyslog8/Makefile
+++ b/sysutils/rsyslog8/Makefile
@@ -2,7 +2,7 @@
PORTNAME= rsyslog
PORTVERSION= 8.2.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= sysutils
MASTER_SITES= http://www.rsyslog.com/files/download/rsyslog/
diff --git a/textproc/iksemel/Makefile b/textproc/iksemel/Makefile
index 35f8fe0d8c22..0bca863b9aff 100644
--- a/textproc/iksemel/Makefile
+++ b/textproc/iksemel/Makefile
@@ -3,7 +3,7 @@
PORTNAME= iksemel
PORTVERSION= 1.4
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= textproc
MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
diff --git a/www/aws/Makefile b/www/aws/Makefile
index 723f7dbdc192..44716fc225dd 100644
--- a/www/aws/Makefile
+++ b/www/aws/Makefile
@@ -3,6 +3,7 @@
PORTNAME= aws
PORTVERSION= 3.2.0.0
+PORTREVISION= 1
CATEGORIES= www
MASTER_SITES= http://downloads.dragonlace.net/src/
@@ -76,8 +77,7 @@ LINK_SSL=
.endif
.if ${PORT_OPTIONS:MGNUTLS}
CONF_ARGS+= SOCKET=gnutls
-CONF_ARGS+= LPATH=${PREFIX}/lib/gnutls3
-LIB_DEPENDS+= libgnutls.so:${PORTSDIR}/security/gnutls3
+LIB_DEPENDS+= libgnutls.so:${PORTSDIR}/security/gnutls
LINK_TLS=
.endif
.if ${PORT_OPTIONS:MNOSSL}
diff --git a/www/gurlchecker/Makefile b/www/gurlchecker/Makefile
index 1bae076ff672..3cbf0cc297c4 100644
--- a/www/gurlchecker/Makefile
+++ b/www/gurlchecker/Makefile
@@ -3,7 +3,7 @@
PORTNAME= gurlchecker
PORTVERSION= 0.10.1
-PORTREVISION= 21
+PORTREVISION= 22
CATEGORIES= www gnome
MASTER_SITES= http://labs.libre-entreprise.org/frs/download.php/%SUBDIR%/
MASTER_SITE_SUBDIR= 547
diff --git a/www/hydra/Makefile b/www/hydra/Makefile
index a12c90bd046d..07608b56ff58 100644
--- a/www/hydra/Makefile
+++ b/www/hydra/Makefile
@@ -3,7 +3,7 @@
PORTNAME= hydra
PORTVERSION= 0.1.8
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= www
MASTER_SITES= http://mirror.inerd.com/FreeBSD/distfiles/${PORTNAME}/ \
ftp://ftp.hellug.gr/pub/software/hydra/
diff --git a/www/libmicrohttpd/Makefile b/www/libmicrohttpd/Makefile
index 180796cceedc..e995a3369c71 100644
--- a/www/libmicrohttpd/Makefile
+++ b/www/libmicrohttpd/Makefile
@@ -3,6 +3,7 @@
PORTNAME= libmicrohttpd
PORTVERSION= 0.9.33
+PORTREVISION= 1
CATEGORIES= www
MASTER_SITES= GNU
diff --git a/www/mod_gnutls/Makefile b/www/mod_gnutls/Makefile
index f5924e4b22e2..977bdb1353ba 100644
--- a/www/mod_gnutls/Makefile
+++ b/www/mod_gnutls/Makefile
@@ -3,7 +3,7 @@
PORTNAME= mod_gnutls
PORTVERSION= 0.5.10
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= www security
MASTER_SITES= http://modgnutls.sourceforge.net/downloads/ \
http://www.outoforder.cc/downloads/mod_gnutls/
diff --git a/www/retawq/Makefile b/www/retawq/Makefile
index 7ffddcae625c..3e02c451e685 100644
--- a/www/retawq/Makefile
+++ b/www/retawq/Makefile
@@ -3,7 +3,7 @@
PORTNAME= retawq
DISTVERSION= 0.2.6c
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= www ipv6
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-0.2.6c
diff --git a/www/tntnet/Makefile b/www/tntnet/Makefile
index f85eacf6c227..56b766608bcc 100644
--- a/www/tntnet/Makefile
+++ b/www/tntnet/Makefile
@@ -3,7 +3,7 @@
PORTNAME= tntnet
PORTVERSION= 2.2.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= www devel
MASTER_SITES= http://www.tntnet.org/download/
diff --git a/www/wwwoffle/Makefile b/www/wwwoffle/Makefile
index 0bc3f5d5904d..52c0ca07dd52 100644
--- a/www/wwwoffle/Makefile
+++ b/www/wwwoffle/Makefile
@@ -2,7 +2,7 @@
PORTNAME= wwwoffle
PORTVERSION= 2.9i
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= www ipv6
MASTER_SITES= http://www.gedanken.org.uk/software/wwwoffle/download/
EXTRACT_SUFX= .tgz
diff --git a/www/xombrero/Makefile b/www/xombrero/Makefile
index 22b16b0e93a7..ade44c06e8cd 100644
--- a/www/xombrero/Makefile
+++ b/www/xombrero/Makefile
@@ -3,6 +3,7 @@
PORTNAME= xombrero
PORTVERSION= 1.6.3
+PORTREVISION= 1
CATEGORIES= www
MASTER_SITES= https://opensource.conformal.com/snapshots/xombrero/
EXTRACT_SUFX= .tgz
diff --git a/x11-toolkits/nucleo/Makefile b/x11-toolkits/nucleo/Makefile
index 566150e51b98..ef86d21b84e3 100644
--- a/x11-toolkits/nucleo/Makefile
+++ b/x11-toolkits/nucleo/Makefile
@@ -3,7 +3,7 @@
PORTNAME= nucleo
PORTVERSION= 0.7.6
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= x11-toolkits
MASTER_SITES= http://insitu.lri.fr/metisse/download/nucleo/