aboutsummaryrefslogtreecommitdiff
path: root/security
diff options
context:
space:
mode:
authorTijl Coosemans <tijl@FreeBSD.org>2016-03-27 14:57:59 +0000
committerTijl Coosemans <tijl@FreeBSD.org>2016-03-27 14:57:59 +0000
commit6bc6f3a9e07f4647594e7ad34d21cff7b6cd3418 (patch)
tree95ab4f85bf7bf8cb530a6cecc47ac36a30dcab4b /security
parent37e8aaec0258c9c628ea0ecb9fd1f26a00577d4b (diff)
downloadports-6bc6f3a9e07f4647594e7ad34d21cff7b6cd3418.tar.gz
ports-6bc6f3a9e07f4647594e7ad34d21cff7b6cd3418.zip
Notes
Diffstat (limited to 'security')
-rw-r--r--security/gnomint/Makefile2
-rw-r--r--security/gnupg/Makefile2
-rw-r--r--security/gnutls/Makefile26
-rw-r--r--security/gnutls/distinfo4
-rw-r--r--security/gnutls/files/patch-configure18
-rw-r--r--security/gnutls/files/patch-lib-tpm.c10
-rw-r--r--security/gnutls/files/patch-lib__x509__rfc2818_hostname.c10
-rw-r--r--security/gnutls/pkg-plist175
-rw-r--r--security/gsasl/Makefile2
-rw-r--r--security/hs-gnutls/Makefile1
-rw-r--r--security/libprelude/Makefile66
-rw-r--r--security/libprelude/distinfo4
-rw-r--r--security/libprelude/files/patch-src__include__prelude-plugin.h13
-rw-r--r--security/libprelude/pkg-descr16
-rw-r--r--security/libprelude/pkg-plist72
-rw-r--r--security/libpreludedb/Makefile53
-rw-r--r--security/libpreludedb/distinfo4
-rw-r--r--security/libpreludedb/files/patch-Makefile.in13
-rw-r--r--security/libpreludedb/pkg-descr12
-rw-r--r--security/libpreludedb/pkg-plist35
-rw-r--r--security/openconnect/Makefile1
-rw-r--r--security/openvas-cli/Makefile1
-rw-r--r--security/openvas-libraries/Makefile1
-rw-r--r--security/openvas-manager/Makefile1
-rw-r--r--security/py-gnutls/Makefile1
-rw-r--r--security/shishi/Makefile2
-rw-r--r--security/suricata/Makefile2
-rw-r--r--security/xmlsec1/Makefile2
28 files changed, 321 insertions, 228 deletions
diff --git a/security/gnomint/Makefile b/security/gnomint/Makefile
index c78693e4461f..4a84239180c8 100644
--- a/security/gnomint/Makefile
+++ b/security/gnomint/Makefile
@@ -3,7 +3,7 @@
PORTNAME= gnomint
PORTVERSION= 1.2.1
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= security
MASTER_SITES= SF
diff --git a/security/gnupg/Makefile b/security/gnupg/Makefile
index 88a17b1bbfe2..d6f086b654bb 100644
--- a/security/gnupg/Makefile
+++ b/security/gnupg/Makefile
@@ -2,7 +2,7 @@
PORTNAME= gnupg
PORTVERSION= 2.1.11
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= security
MASTER_SITES= GNUPG
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${DISTNAME}${EXTRACT_SUFX}.sig
diff --git a/security/gnutls/Makefile b/security/gnutls/Makefile
index ca51b38308a3..36e3481fb87a 100644
--- a/security/gnutls/Makefile
+++ b/security/gnutls/Makefile
@@ -1,10 +1,9 @@
# $FreeBSD$
PORTNAME= gnutls
-PORTVERSION= 3.3.17.1
-PORTREVISION= 3
+PORTVERSION= 3.4.10
CATEGORIES= security net
-MASTER_SITES= GNUPG/gnutls/v${PORTVERSION:R:R}
+MASTER_SITES= GNUPG/gnutls/v${PORTVERSION:R}
MAINTAINER= tijl@FreeBSD.org
COMMENT= GNU Transport Layer Security library
@@ -27,22 +26,26 @@ CONFIGURE_ARGS= --disable-guile \
--enable-local-libopts \
ac_cv_type_max_align_t=yes
CPPFLAGS+= -I${LOCALBASE}/include
-LDFLAGS+= -L${LOCALBASE}/lib
+LIBS+= -L${LOCALBASE}/lib
MAKE_ENV= MAKEINFOFLAGS=--no-split
+INSTALL_TARGET= install-strip
CPE_VENDOR= gnu
-OPTIONS_DEFINE= CRYWRAP EXAMPLES LIBDANE NLS P11KIT TPM ZLIB
-OPTIONS_DEFAULT= CRYWRAP P11KIT TPM ZLIB
+OPTIONS_DEFINE= CRYWRAP DANE EXAMPLES IDN NLS P11KIT TPM ZLIB
+OPTIONS_DEFAULT= CRYWRAP IDN P11KIT TPM ZLIB
OPTIONS_SUB= yes
CRYWRAP_DESC= Enable Crywrap TLS proxy service
-CRYWRAP_LIB_DEPENDS= libidn.so:${PORTSDIR}/dns/libidn
+CRYWRAP_IMPLIES= IDN
CRYWRAP_CONFIGURE_ENABLE= crywrap
-LIBDANE_DESC= DNSSEC support for DANE (danetool --check)
-LIBDANE_LIB_DEPENDS= libunbound.so:${PORTSDIR}/dns/unbound
-LIBDANE_CONFIGURE_ENABLE= libdane
+DANE_DESC= Certificate verification via DNSSEC
+DANE_LIB_DEPENDS= libunbound.so:${PORTSDIR}/dns/unbound
+DANE_CONFIGURE_ENABLE= libdane
+
+IDN_CONFIGURE_WITH= idn
+IDN_LIB_DEPENDS= libidn.so:${PORTSDIR}/dns/libidn
NLS_CONFIGURE_ENABLE= nls
NLS_USES= gettext
@@ -61,12 +64,9 @@ INFO= gnutls gnutls-guile
post-patch:
@${RM} ${WRKSRC}/doc/*.info*
- ${SED} -i '' -e 's|^+_NORETURN_H|_NORETURN_H|' \
- ${WRKSRC}/src/libopts/Makefile.in
post-install:
@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
${INSTALL_DATA} ${WRKSRC}/doc/examples/*.[ch] ${STAGEDIR}${EXAMPLESDIR}
- ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libgnutls*.so.*
.include <bsd.port.mk>
diff --git a/security/gnutls/distinfo b/security/gnutls/distinfo
index e7475c0a74ad..bf2f8427d62a 100644
--- a/security/gnutls/distinfo
+++ b/security/gnutls/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnutls-3.3.17.1.tar.xz) = b40f158030a92f450a07b20300a3996710ca19800848d9f6fd62493170c5bbb4
-SIZE (gnutls-3.3.17.1.tar.xz) = 6339588
+SHA256 (gnutls-3.4.10.tar.xz) = 6a32c2b4acbd33ff7eefcbd1357009da04c94c60146ef61320b6c076b1bdf59f
+SIZE (gnutls-3.4.10.tar.xz) = 6645892
diff --git a/security/gnutls/files/patch-configure b/security/gnutls/files/patch-configure
new file mode 100644
index 000000000000..b2d839d195d3
--- /dev/null
+++ b/security/gnutls/files/patch-configure
@@ -0,0 +1,18 @@
+--- configure.orig 2016-03-03 07:52:15 UTC
++++ configure
+@@ -47228,6 +47228,7 @@ fi
+ $as_echo "$enable_dane" >&6; }
+
+ if test "$enable_dane" != "no"; then
++ oldlibs="$LIBS"
+ LIBS="$oldlibs -lunbound"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for unbound library" >&5
+ $as_echo_n "checking for unbound library... " >&6; }
+@@ -47444,6 +47445,7 @@ else
+ fi
+
+ if test "$with_tpm" != "no"; then
++ oldlibs="$LIBS"
+ LIBS="$oldlibs -ltspi"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tss library" >&5
+ $as_echo_n "checking for tss library... " >&6; }
diff --git a/security/gnutls/files/patch-lib-tpm.c b/security/gnutls/files/patch-lib-tpm.c
new file mode 100644
index 000000000000..72057bfd6654
--- /dev/null
+++ b/security/gnutls/files/patch-lib-tpm.c
@@ -0,0 +1,10 @@
+--- lib/tpm.c.orig 2015-09-26 12:02:10 UTC
++++ lib/tpm.c
+@@ -71,7 +71,6 @@ typedef TSS_RESULT (*Tspi_DecodeBER_TssB
+ typedef TSS_RESULT (*Tspi_Context_LoadKeyByBlob_func)(TSS_HCONTEXT, TSS_HKEY, UINT32, BYTE*, TSS_HKEY*);
+ typedef TSS_RESULT (*Tspi_Policy_AssignToObject_func)(TSS_HPOLICY, TSS_HOBJECT);
+ typedef TSS_RESULT (*Tspi_GetAttribData_func)(TSS_HOBJECT, TSS_FLAG, TSS_FLAG, UINT32*, BYTE**);
+-typedef TSS_RESULT (*Tspi_Context_GetTpmObject_func)(TSS_HCONTEXT, TSS_HTPM*);
+ typedef TSS_RESULT (*Tspi_TPM_StirRandom_func)(TSS_HTPM, UINT32, BYTE*);
+ typedef TSS_RESULT (*Tspi_SetAttribUint32_func)(TSS_HOBJECT, TSS_FLAG, TSS_FLAG, UINT32);
+ typedef TSS_RESULT (*Tspi_EncodeDER_TssBlob_func)(UINT32, BYTE*, UINT32, UINT32*, BYTE*);
diff --git a/security/gnutls/files/patch-lib__x509__rfc2818_hostname.c b/security/gnutls/files/patch-lib__x509__rfc2818_hostname.c
deleted file mode 100644
index 7e5aa4e0aa09..000000000000
--- a/security/gnutls/files/patch-lib__x509__rfc2818_hostname.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- lib/x509/rfc2818_hostname.c.orig 2014-10-02 13:35:09.427374817 -0500
-+++ lib/x509/rfc2818_hostname.c 2014-10-02 13:35:33.657427866 -0500
-@@ -19,6 +19,7 @@
- *
- */
-
-+#include <netinet/in.h>
- #include <gnutls_int.h>
- #include <gnutls_str.h>
- #include <x509_int.h>
diff --git a/security/gnutls/pkg-plist b/security/gnutls/pkg-plist
index 0b4a35655863..914b4a056aa4 100644
--- a/security/gnutls/pkg-plist
+++ b/security/gnutls/pkg-plist
@@ -1,5 +1,5 @@
bin/certtool
-%%LIBDANE%%bin/danetool
+%%DANE%%bin/danetool
bin/gnutls-cli
bin/gnutls-cli-debug
bin/gnutls-serv
@@ -11,19 +11,21 @@ bin/srptool
include/gnutls/abstract.h
include/gnutls/compat.h
include/gnutls/crypto.h
-%%LIBDANE%%include/gnutls/dane.h
+%%DANE%%include/gnutls/dane.h
include/gnutls/dtls.h
include/gnutls/gnutls.h
include/gnutls/gnutlsxx.h
include/gnutls/ocsp.h
include/gnutls/openpgp.h
-include/gnutls/openssl.h
include/gnutls/pkcs11.h
include/gnutls/pkcs12.h
+include/gnutls/pkcs7.h
include/gnutls/self-test.h
+include/gnutls/system-keys.h
include/gnutls/tpm.h
-include/gnutls/x509.h
+include/gnutls/urls.h
include/gnutls/x509-ext.h
+include/gnutls/x509.h
info/gnutls-client-server-use-case.png
info/gnutls-handshake-sequence.png
info/gnutls-handshake-state.png
@@ -34,22 +36,19 @@ info/gnutls-modauth.png
info/gnutls-pgp.png
info/gnutls-x509.png
info/pkcs11-vision.png
-%%LIBDANE%%lib/libgnutls-dane.so
-%%LIBDANE%%lib/libgnutls-dane.so.0
-%%LIBDANE%%lib/libgnutls-dane.so.0.5.0
-lib/libgnutls-openssl.so
-lib/libgnutls-openssl.so.27
-lib/libgnutls-openssl.so.27.0.2
+%%DANE%%lib/libgnutls-dane.so
+%%DANE%%lib/libgnutls-dane.so.0
+%%DANE%%lib/libgnutls-dane.so.0.4.1
lib/libgnutls.so
-lib/libgnutls.so.28
-lib/libgnutls.so.28.41.9
+lib/libgnutls.so.30
+lib/libgnutls.so.30.6.2
lib/libgnutlsxx.so
lib/libgnutlsxx.so.28
lib/libgnutlsxx.so.28.1.0
libdata/pkgconfig/gnutls.pc
-%%LIBDANE%%libdata/pkgconfig/gnutls-dane.pc
+%%DANE%%libdata/pkgconfig/gnutls-dane.pc
man/man1/certtool.1.gz
-%%LIBDANE%%man/man1/danetool.1.gz
+%%DANE%%man/man1/danetool.1.gz
man/man1/gnutls-cli-debug.1.gz
man/man1/gnutls-cli.1.gz
man/man1/gnutls-serv.1.gz
@@ -58,6 +57,10 @@ man/man1/p11tool.1.gz
man/man1/psktool.1.gz
man/man1/srptool.1.gz
man/man1/tpmtool.1.gz
+man/man3/gnutls_aead_cipher_decrypt.3.gz
+man/man3/gnutls_aead_cipher_deinit.3.gz
+man/man3/gnutls_aead_cipher_encrypt.3.gz
+man/man3/gnutls_aead_cipher_init.3.gz
man/man3/gnutls_alert_get.3.gz
man/man3/gnutls_alert_get_name.3.gz
man/man3/gnutls_alert_get_strname.3.gz
@@ -75,11 +78,11 @@ man/man3/gnutls_anon_set_server_params_function.3.gz
man/man3/gnutls_auth_client_get_type.3.gz
man/man3/gnutls_auth_get_type.3.gz
man/man3/gnutls_auth_server_get_type.3.gz
+man/man3/gnutls_buffer_append_data.3.gz
man/man3/gnutls_bye.3.gz
man/man3/gnutls_certificate_activation_time_peers.3.gz
man/man3/gnutls_certificate_allocate_credentials.3.gz
man/man3/gnutls_certificate_client_get_request_status.3.gz
-man/man3/gnutls_certificate_client_set_retrieve_function.3.gz
man/man3/gnutls_certificate_expiration_time_peers.3.gz
man/man3/gnutls_certificate_free_ca_names.3.gz
man/man3/gnutls_certificate_free_cas.3.gz
@@ -88,13 +91,19 @@ man/man3/gnutls_certificate_free_crls.3.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_crt.3.gz
+man/man3/gnutls_certificate_get_openpgp_key.3.gz
man/man3/gnutls_certificate_get_ours.3.gz
man/man3/gnutls_certificate_get_peers.3.gz
man/man3/gnutls_certificate_get_peers_subkey_id.3.gz
+man/man3/gnutls_certificate_get_trust_list.3.gz
+man/man3/gnutls_certificate_get_verify_flags.3.gz
+man/man3/gnutls_certificate_get_x509_crt.3.gz
+man/man3/gnutls_certificate_get_x509_key.3.gz
man/man3/gnutls_certificate_send_x509_rdn_sequence.3.gz
man/man3/gnutls_certificate_server_set_request.3.gz
-man/man3/gnutls_certificate_server_set_retrieve_function.3.gz
man/man3/gnutls_certificate_set_dh_params.3.gz
+man/man3/gnutls_certificate_set_flags.3.gz
man/man3/gnutls_certificate_set_key.3.gz
man/man3/gnutls_certificate_set_ocsp_status_request_file.3.gz
man/man3/gnutls_certificate_set_ocsp_status_request_function.3.gz
@@ -109,7 +118,6 @@ man/man3/gnutls_certificate_set_params_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
@@ -133,7 +141,6 @@ man/man3/gnutls_certificate_type_get.3.gz
man/man3/gnutls_certificate_type_get_id.3.gz
man/man3/gnutls_certificate_type_get_name.3.gz
man/man3/gnutls_certificate_type_list.3.gz
-man/man3/gnutls_certificate_type_set_priority.3.gz
man/man3/gnutls_certificate_verification_status_print.3.gz
man/man3/gnutls_certificate_verify_peers.3.gz
man/man3/gnutls_certificate_verify_peers2.3.gz
@@ -156,7 +163,6 @@ man/man3/gnutls_cipher_init.3.gz
man/man3/gnutls_cipher_list.3.gz
man/man3/gnutls_cipher_self_test.3.gz
man/man3/gnutls_cipher_set_iv.3.gz
-man/man3/gnutls_cipher_set_priority.3.gz
man/man3/gnutls_cipher_suite_get_name.3.gz
man/man3/gnutls_cipher_suite_info.3.gz
man/man3/gnutls_cipher_tag.3.gz
@@ -164,10 +170,13 @@ man/man3/gnutls_compression_get.3.gz
man/man3/gnutls_compression_get_id.3.gz
man/man3/gnutls_compression_get_name.3.gz
man/man3/gnutls_compression_list.3.gz
-man/man3/gnutls_compression_set_priority.3.gz
man/man3/gnutls_credentials_clear.3.gz
man/man3/gnutls_credentials_get.3.gz
man/man3/gnutls_credentials_set.3.gz
+man/man3/gnutls_crypto_register_aead_cipher.3.gz
+man/man3/gnutls_crypto_register_cipher.3.gz
+man/man3/gnutls_crypto_register_digest.3.gz
+man/man3/gnutls_crypto_register_mac.3.gz
man/man3/gnutls_db_check_entry.3.gz
man/man3/gnutls_db_check_entry_time.3.gz
man/man3/gnutls_db_get_default_cache_expiration.3.gz
@@ -192,10 +201,12 @@ man/man3/gnutls_dh_params_export_raw.3.gz
man/man3/gnutls_dh_params_generate2.3.gz
man/man3/gnutls_dh_params_import_pkcs3.3.gz
man/man3/gnutls_dh_params_import_raw.3.gz
+man/man3/gnutls_dh_params_import_raw2.3.gz
man/man3/gnutls_dh_params_init.3.gz
man/man3/gnutls_dh_set_prime_bits.3.gz
man/man3/gnutls_digest_get_id.3.gz
man/man3/gnutls_digest_get_name.3.gz
+man/man3/gnutls_digest_get_oid.3.gz
man/man3/gnutls_digest_list.3.gz
man/man3/gnutls_digest_self_test.3.gz
man/man3/gnutls_dtls_cookie_send.3.gz
@@ -208,12 +219,17 @@ man/man3/gnutls_dtls_set_data_mtu.3.gz
man/man3/gnutls_dtls_set_mtu.3.gz
man/man3/gnutls_dtls_set_timeouts.3.gz
man/man3/gnutls_ecc_curve_get.3.gz
+man/man3/gnutls_ecc_curve_get_id.3.gz
man/man3/gnutls_ecc_curve_get_name.3.gz
+man/man3/gnutls_ecc_curve_get_oid.3.gz
man/man3/gnutls_ecc_curve_get_size.3.gz
man/man3/gnutls_ecc_curve_list.3.gz
man/man3/gnutls_error_is_fatal.3.gz
man/man3/gnutls_error_to_alert.3.gz
man/man3/gnutls_est_record_overhead_size.3.gz
+man/man3/gnutls_ext_get_data.3.gz
+man/man3/gnutls_ext_register.3.gz
+man/man3/gnutls_ext_set_data.3.gz
man/man3/gnutls_fingerprint.3.gz
man/man3/gnutls_fips140_mode_enabled.3.gz
man/man3/gnutls_global_deinit.3.gz
@@ -248,7 +264,9 @@ man/man3/gnutls_heartbeat_pong.3.gz
man/man3/gnutls_heartbeat_set_timeouts.3.gz
man/man3/gnutls_hex2bin.3.gz
man/man3/gnutls_hex_decode.3.gz
+man/man3/gnutls_hex_decode2.3.gz
man/man3/gnutls_hex_encode.3.gz
+man/man3/gnutls_hex_encode2.3.gz
man/man3/gnutls_hmac.3.gz
man/man3/gnutls_hmac_deinit.3.gz
man/man3/gnutls_hmac_fast.3.gz
@@ -262,7 +280,6 @@ man/man3/gnutls_kx_get.3.gz
man/man3/gnutls_kx_get_id.3.gz
man/man3/gnutls_kx_get_name.3.gz
man/man3/gnutls_kx_list.3.gz
-man/man3/gnutls_kx_set_priority.3.gz
man/man3/gnutls_load_file.3.gz
man/man3/gnutls_mac_get.3.gz
man/man3/gnutls_mac_get_id.3.gz
@@ -271,7 +288,8 @@ man/man3/gnutls_mac_get_name.3.gz
man/man3/gnutls_mac_get_nonce_size.3.gz
man/man3/gnutls_mac_list.3.gz
man/man3/gnutls_mac_self_test.3.gz
-man/man3/gnutls_mac_set_priority.3.gz
+man/man3/gnutls_memcmp.3.gz
+man/man3/gnutls_memset.3.gz
man/man3/gnutls_ocsp_req_add_cert.3.gz
man/man3/gnutls_ocsp_req_add_cert_id.3.gz
man/man3/gnutls_ocsp_req_deinit.3.gz
@@ -294,6 +312,7 @@ man/man3/gnutls_ocsp_resp_get_extension.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_responder_raw_id.3.gz
man/man3/gnutls_ocsp_resp_get_response.3.gz
man/man3/gnutls_ocsp_resp_get_signature.3.gz
man/man3/gnutls_ocsp_resp_get_signature_algorithm.3.gz
@@ -308,6 +327,11 @@ man/man3/gnutls_ocsp_resp_verify_direct.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_oid_to_digest.3.gz
+man/man3/gnutls_oid_to_ecc_curve.3.gz
+man/man3/gnutls_oid_to_pk.3.gz
+man/man3/gnutls_oid_to_sign.3.gz
+man/man3/gnutls_openpgp_crt_check_email.3.gz
man/man3/gnutls_openpgp_crt_check_hostname.3.gz
man/man3/gnutls_openpgp_crt_check_hostname2.3.gz
man/man3/gnutls_openpgp_crt_deinit.3.gz
@@ -379,32 +403,42 @@ man/man3/gnutls_openpgp_set_recv_key_function.3.gz
man/man3/gnutls_packet_deinit.3.gz
man/man3/gnutls_packet_get.3.gz
man/man3/gnutls_pcert_deinit.3.gz
+man/man3/gnutls_pcert_export_openpgp.3.gz
+man/man3/gnutls_pcert_export_x509.3.gz
man/man3/gnutls_pcert_import_openpgp.3.gz
man/man3/gnutls_pcert_import_openpgp_raw.3.gz
man/man3/gnutls_pcert_import_x509.3.gz
+man/man3/gnutls_pcert_import_x509_list.3.gz
man/man3/gnutls_pcert_import_x509_raw.3.gz
man/man3/gnutls_pcert_list_import_x509_raw.3.gz
man/man3/gnutls_pem_base64_decode.3.gz
-man/man3/gnutls_pem_base64_decode_alloc.3.gz
+man/man3/gnutls_pem_base64_decode2.3.gz
man/man3/gnutls_pem_base64_encode.3.gz
-man/man3/gnutls_pem_base64_encode_alloc.3.gz
+man/man3/gnutls_pem_base64_encode2.3.gz
man/man3/gnutls_perror.3.gz
man/man3/gnutls_pk_algorithm_get_name.3.gz
man/man3/gnutls_pk_bits_to_sec_param.3.gz
man/man3/gnutls_pk_get_id.3.gz
man/man3/gnutls_pk_get_name.3.gz
+man/man3/gnutls_pk_get_oid.3.gz
man/man3/gnutls_pk_list.3.gz
man/man3/gnutls_pk_self_test.3.gz
man/man3/gnutls_pk_to_sign.3.gz
man/man3/gnutls_pkcs11_add_provider.3.gz
+man/man3/gnutls_pkcs11_copy_attached_extension.3.gz
+man/man3/gnutls_pkcs11_copy_pubkey.3.gz
man/man3/gnutls_pkcs11_copy_secret_key.3.gz
man/man3/gnutls_pkcs11_copy_x509_crt.3.gz
+man/man3/gnutls_pkcs11_copy_x509_crt2.3.gz
man/man3/gnutls_pkcs11_copy_x509_privkey.3.gz
+man/man3/gnutls_pkcs11_copy_x509_privkey2.3.gz
man/man3/gnutls_pkcs11_crt_is_known.3.gz
man/man3/gnutls_pkcs11_deinit.3.gz
man/man3/gnutls_pkcs11_delete_url.3.gz
man/man3/gnutls_pkcs11_get_pin_function.3.gz
man/man3/gnutls_pkcs11_get_raw_issuer.3.gz
+man/man3/gnutls_pkcs11_get_raw_issuer_by_dn.3.gz
+man/man3/gnutls_pkcs11_get_raw_issuer_by_subject_key_id.3.gz
man/man3/gnutls_pkcs11_init.3.gz
man/man3/gnutls_pkcs11_obj_deinit.3.gz
man/man3/gnutls_pkcs11_obj_export.3.gz
@@ -418,14 +452,17 @@ man/man3/gnutls_pkcs11_obj_get_info.3.gz
man/man3/gnutls_pkcs11_obj_get_type.3.gz
man/man3/gnutls_pkcs11_obj_import_url.3.gz
man/man3/gnutls_pkcs11_obj_init.3.gz
-man/man3/gnutls_pkcs11_obj_list_import_url.3.gz
-man/man3/gnutls_pkcs11_obj_list_import_url2.3.gz
+man/man3/gnutls_pkcs11_obj_list_import_url3.3.gz
+man/man3/gnutls_pkcs11_obj_list_import_url4.3.gz
+man/man3/gnutls_pkcs11_obj_set_info.3.gz
man/man3/gnutls_pkcs11_obj_set_pin_function.3.gz
+man/man3/gnutls_pkcs11_privkey_cpy.3.gz
man/man3/gnutls_pkcs11_privkey_deinit.3.gz
man/man3/gnutls_pkcs11_privkey_export_pubkey.3.gz
man/man3/gnutls_pkcs11_privkey_export_url.3.gz
man/man3/gnutls_pkcs11_privkey_generate.3.gz
man/man3/gnutls_pkcs11_privkey_generate2.3.gz
+man/man3/gnutls_pkcs11_privkey_generate3.3.gz
man/man3/gnutls_pkcs11_privkey_get_info.3.gz
man/man3/gnutls_pkcs11_privkey_get_pk_algorithm.3.gz
man/man3/gnutls_pkcs11_privkey_import_url.3.gz
@@ -445,6 +482,7 @@ man/man3/gnutls_pkcs11_token_set_pin.3.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_enc_info.3.gz
man/man3/gnutls_pkcs12_bag_encrypt.3.gz
man/man3/gnutls_pkcs12_bag_get_count.3.gz
man/man3/gnutls_pkcs12_bag_get_data.3.gz
@@ -457,33 +495,53 @@ man/man3/gnutls_pkcs12_bag_set_crt.3.gz
man/man3/gnutls_pkcs12_bag_set_data.3.gz
man/man3/gnutls_pkcs12_bag_set_friendly_name.3.gz
man/man3/gnutls_pkcs12_bag_set_key_id.3.gz
+man/man3/gnutls_pkcs12_bag_set_privkey.3.gz
man/man3/gnutls_pkcs12_deinit.3.gz
man/man3/gnutls_pkcs12_export.3.gz
man/man3/gnutls_pkcs12_export2.3.gz
man/man3/gnutls_pkcs12_generate_mac.3.gz
+man/man3/gnutls_pkcs12_generate_mac2.3.gz
man/man3/gnutls_pkcs12_get_bag.3.gz
man/man3/gnutls_pkcs12_import.3.gz
man/man3/gnutls_pkcs12_init.3.gz
+man/man3/gnutls_pkcs12_mac_info.3.gz
man/man3/gnutls_pkcs12_set_bag.3.gz
man/man3/gnutls_pkcs12_simple_parse.3.gz
man/man3/gnutls_pkcs12_verify_mac.3.gz
+man/man3/gnutls_pkcs7_add_attr.3.gz
+man/man3/gnutls_pkcs7_attrs_deinit.3.gz
man/man3/gnutls_pkcs7_deinit.3.gz
man/man3/gnutls_pkcs7_delete_crl.3.gz
man/man3/gnutls_pkcs7_delete_crt.3.gz
man/man3/gnutls_pkcs7_export.3.gz
man/man3/gnutls_pkcs7_export2.3.gz
+man/man3/gnutls_pkcs7_get_attr.3.gz
man/man3/gnutls_pkcs7_get_crl_count.3.gz
man/man3/gnutls_pkcs7_get_crl_raw.3.gz
+man/man3/gnutls_pkcs7_get_crl_raw2.3.gz
man/man3/gnutls_pkcs7_get_crt_count.3.gz
man/man3/gnutls_pkcs7_get_crt_raw.3.gz
+man/man3/gnutls_pkcs7_get_crt_raw2.3.gz
+man/man3/gnutls_pkcs7_get_embedded_data.3.gz
+man/man3/gnutls_pkcs7_get_signature_count.3.gz
+man/man3/gnutls_pkcs7_get_signature_info.3.gz
man/man3/gnutls_pkcs7_import.3.gz
man/man3/gnutls_pkcs7_init.3.gz
+man/man3/gnutls_pkcs7_print.3.gz
man/man3/gnutls_pkcs7_set_crl.3.gz
man/man3/gnutls_pkcs7_set_crl_raw.3.gz
man/man3/gnutls_pkcs7_set_crt.3.gz
man/man3/gnutls_pkcs7_set_crt_raw.3.gz
+man/man3/gnutls_pkcs7_sign.3.gz
+man/man3/gnutls_pkcs7_signature_info_deinit.3.gz
+man/man3/gnutls_pkcs7_verify.3.gz
+man/man3/gnutls_pkcs7_verify_direct.3.gz
+man/man3/gnutls_pkcs8_info.3.gz
+man/man3/gnutls_pkcs_schema_get_name.3.gz
+man/man3/gnutls_pkcs_schema_get_oid.3.gz
man/man3/gnutls_prf.3.gz
man/man3/gnutls_prf_raw.3.gz
+man/man3/gnutls_prf_rfc5705.3.gz
man/man3/gnutls_priority_certificate_type_list.3.gz
man/man3/gnutls_priority_cipher_list.3.gz
man/man3/gnutls_priority_compression_list.3.gz
@@ -497,11 +555,15 @@ man/man3/gnutls_priority_protocol_list.3.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_priority_string_list.3.gz
man/man3/gnutls_privkey_decrypt_data.3.gz
man/man3/gnutls_privkey_deinit.3.gz
man/man3/gnutls_privkey_export_dsa_raw.3.gz
man/man3/gnutls_privkey_export_ecc_raw.3.gz
+man/man3/gnutls_privkey_export_openpgp.3.gz
+man/man3/gnutls_privkey_export_pkcs11.3.gz
man/man3/gnutls_privkey_export_rsa_raw.3.gz
+man/man3/gnutls_privkey_export_x509.3.gz
man/man3/gnutls_privkey_generate.3.gz
man/man3/gnutls_privkey_get_pk_algorithm.3.gz
man/man3/gnutls_privkey_get_type.3.gz
@@ -509,6 +571,7 @@ man/man3/gnutls_privkey_import_dsa_raw.3.gz
man/man3/gnutls_privkey_import_ecc_raw.3.gz
man/man3/gnutls_privkey_import_ext.3.gz
man/man3/gnutls_privkey_import_ext2.3.gz
+man/man3/gnutls_privkey_import_ext3.3.gz
man/man3/gnutls_privkey_import_openpgp.3.gz
man/man3/gnutls_privkey_import_openpgp_raw.3.gz
man/man3/gnutls_privkey_import_pkcs11.3.gz
@@ -523,14 +586,12 @@ man/man3/gnutls_privkey_init.3.gz
man/man3/gnutls_privkey_set_pin_function.3.gz
man/man3/gnutls_privkey_sign_data.3.gz
man/man3/gnutls_privkey_sign_hash.3.gz
-man/man3/gnutls_privkey_sign_raw_data.3.gz
man/man3/gnutls_privkey_status.3.gz
man/man3/gnutls_privkey_verify_params.3.gz
man/man3/gnutls_protocol_get_id.3.gz
man/man3/gnutls_protocol_get_name.3.gz
man/man3/gnutls_protocol_get_version.3.gz
man/man3/gnutls_protocol_list.3.gz
-man/man3/gnutls_protocol_set_priority.3.gz
man/man3/gnutls_psk_allocate_client_credentials.3.gz
man/man3/gnutls_psk_allocate_server_credentials.3.gz
man/man3/gnutls_psk_client_get_hint.3.gz
@@ -558,7 +619,6 @@ man/man3/gnutls_pubkey_get_key_usage.3.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_preferred_hash_algorithm.3.gz
-man/man3/gnutls_pubkey_get_verify_algorithm.3.gz
man/man3/gnutls_pubkey_import.3.gz
man/man3/gnutls_pubkey_import_dsa_raw.3.gz
man/man3/gnutls_pubkey_import_ecc_raw.3.gz
@@ -566,7 +626,6 @@ man/man3/gnutls_pubkey_import_ecc_x962.3.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
@@ -579,9 +638,7 @@ man/man3/gnutls_pubkey_init.3.gz
man/man3/gnutls_pubkey_print.3.gz
man/man3/gnutls_pubkey_set_key_usage.3.gz
man/man3/gnutls_pubkey_set_pin_function.3.gz
-man/man3/gnutls_pubkey_verify_data.3.gz
man/man3/gnutls_pubkey_verify_data2.3.gz
-man/man3/gnutls_pubkey_verify_hash.3.gz
man/man3/gnutls_pubkey_verify_hash2.3.gz
man/man3/gnutls_pubkey_verify_params.3.gz
man/man3/gnutls_random_art.3.gz
@@ -591,32 +648,25 @@ man/man3/gnutls_record_check_corked.3.gz
man/man3/gnutls_record_check_pending.3.gz
man/man3/gnutls_record_cork.3.gz
man/man3/gnutls_record_disable_padding.3.gz
+man/man3/gnutls_record_discard_queued.3.gz
man/man3/gnutls_record_get_direction.3.gz
man/man3/gnutls_record_get_discarded.3.gz
man/man3/gnutls_record_get_max_size.3.gz
+man/man3/gnutls_record_get_state.3.gz
man/man3/gnutls_record_overhead_size.3.gz
man/man3/gnutls_record_recv.3.gz
man/man3/gnutls_record_recv_packet.3.gz
man/man3/gnutls_record_recv_seq.3.gz
man/man3/gnutls_record_send.3.gz
man/man3/gnutls_record_send_range.3.gz
-man/man3/gnutls_record_set_max_empty_records.3.gz
man/man3/gnutls_record_set_max_size.3.gz
+man/man3/gnutls_record_set_state.3.gz
man/man3/gnutls_record_set_timeout.3.gz
man/man3/gnutls_record_uncork.3.gz
+man/man3/gnutls_register_custom_url.3.gz
man/man3/gnutls_rehandshake.3.gz
man/man3/gnutls_rnd.3.gz
man/man3/gnutls_rnd_refresh.3.gz
-man/man3/gnutls_rsa_export_get_modulus_bits.3.gz
-man/man3/gnutls_rsa_export_get_pubkey.3.gz
-man/man3/gnutls_rsa_params_cpy.3.gz
-man/man3/gnutls_rsa_params_deinit.3.gz
-man/man3/gnutls_rsa_params_export_pkcs1.3.gz
-man/man3/gnutls_rsa_params_export_raw.3.gz
-man/man3/gnutls_rsa_params_generate2.3.gz
-man/man3/gnutls_rsa_params_import_pkcs1.3.gz
-man/man3/gnutls_rsa_params_import_raw.3.gz
-man/man3/gnutls_rsa_params_init.3.gz
man/man3/gnutls_safe_renegotiation_status.3.gz
man/man3/gnutls_sec_param_get_name.3.gz
man/man3/gnutls_sec_param_to_pk_bits.3.gz
@@ -625,6 +675,8 @@ man/man3/gnutls_server_name_get.3.gz
man/man3/gnutls_server_name_set.3.gz
man/man3/gnutls_session_channel_binding.3.gz
man/man3/gnutls_session_enable_compatibility_mode.3.gz
+man/man3/gnutls_session_etm_status.3.gz
+man/man3/gnutls_session_ext_master_secret_status.3.gz
man/man3/gnutls_session_force_valid.3.gz
man/man3/gnutls_session_get_data.3.gz
man/man3/gnutls_session_get_data2.3.gz
@@ -633,34 +685,36 @@ man/man3/gnutls_session_get_id.3.gz
man/man3/gnutls_session_get_id2.3.gz
man/man3/gnutls_session_get_ptr.3.gz
man/man3/gnutls_session_get_random.3.gz
+man/man3/gnutls_session_get_verify_cert_status.3.gz
man/man3/gnutls_session_is_resumed.3.gz
man/man3/gnutls_session_resumption_requested.3.gz
man/man3/gnutls_session_set_data.3.gz
man/man3/gnutls_session_set_id.3.gz
man/man3/gnutls_session_set_premaster.3.gz
man/man3/gnutls_session_set_ptr.3.gz
+man/man3/gnutls_session_set_verify_cert.3.gz
+man/man3/gnutls_session_set_verify_cert2.3.gz
+man/man3/gnutls_session_set_verify_function.3.gz
man/man3/gnutls_session_ticket_enable_client.3.gz
man/man3/gnutls_session_ticket_enable_server.3.gz
man/man3/gnutls_session_ticket_key_generate.3.gz
-man/man3/gnutls_set_default_export_priority.3.gz
man/man3/gnutls_set_default_priority.3.gz
man/man3/gnutls_sign_algorithm_get.3.gz
man/man3/gnutls_sign_algorithm_get_client.3.gz
man/man3/gnutls_sign_algorithm_get_requested.3.gz
-man/man3/gnutls_sign_callback_get.3.gz
-man/man3/gnutls_sign_callback_set.3.gz
man/man3/gnutls_sign_get_hash_algorithm.3.gz
man/man3/gnutls_sign_get_id.3.gz
man/man3/gnutls_sign_get_name.3.gz
+man/man3/gnutls_sign_get_oid.3.gz
man/man3/gnutls_sign_get_pk_algorithm.3.gz
man/man3/gnutls_sign_is_secure.3.gz
man/man3/gnutls_sign_list.3.gz
man/man3/gnutls_srp_allocate_client_credentials.3.gz
man/man3/gnutls_srp_allocate_server_credentials.3.gz
man/man3/gnutls_srp_base64_decode.3.gz
-man/man3/gnutls_srp_base64_decode_alloc.3.gz
+man/man3/gnutls_srp_base64_decode2.3.gz
man/man3/gnutls_srp_base64_encode.3.gz
-man/man3/gnutls_srp_base64_encode_alloc.3.gz
+man/man3/gnutls_srp_base64_encode2.3.gz
man/man3/gnutls_srp_free_client_credentials.3.gz
man/man3/gnutls_srp_free_server_credentials.3.gz
man/man3/gnutls_srp_server_get_username.3.gz
@@ -688,6 +742,14 @@ man/man3/gnutls_subject_alt_names_get.3.gz
man/man3/gnutls_subject_alt_names_init.3.gz
man/man3/gnutls_subject_alt_names_set.3.gz
man/man3/gnutls_supplemental_get_name.3.gz
+man/man3/gnutls_supplemental_recv.3.gz
+man/man3/gnutls_supplemental_register.3.gz
+man/man3/gnutls_supplemental_send.3.gz
+man/man3/gnutls_system_key_add_x509.3.gz
+man/man3/gnutls_system_key_delete.3.gz
+man/man3/gnutls_system_key_iter_deinit.3.gz
+man/man3/gnutls_system_key_iter_get_info.3.gz
+man/man3/gnutls_system_recv_timeout.3.gz
man/man3/gnutls_tdb_deinit.3.gz
man/man3/gnutls_tdb_init.3.gz
man/man3/gnutls_tdb_set_store_commitment_func.3.gz
@@ -792,6 +854,7 @@ man/man3/gnutls_x509_crq_get_key_rsa_raw.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_signature_algorithm.3.gz
man/man3/gnutls_x509_crq_get_subject_alt_name.3.gz
man/man3/gnutls_x509_crq_get_subject_alt_othername_oid.3.gz
man/man3/gnutls_x509_crq_get_version.3.gz
@@ -815,6 +878,7 @@ man/man3/gnutls_x509_crq_set_version.3.gz
man/man3/gnutls_x509_crq_sign.3.gz
man/man3/gnutls_x509_crq_sign2.3.gz
man/man3/gnutls_x509_crq_verify.3.gz
+man/man3/gnutls_x509_crt_check_email.3.gz
man/man3/gnutls_x509_crt_check_hostname.3.gz
man/man3/gnutls_x509_crt_check_hostname2.3.gz
man/man3/gnutls_x509_crt_check_issuer.3.gz
@@ -857,6 +921,7 @@ man/man3/gnutls_x509_crt_get_key_usage.3.gz
man/man3/gnutls_x509_crt_get_name_constraints.3.gz
man/man3/gnutls_x509_crt_get_pk_algorithm.3.gz
man/man3/gnutls_x509_crt_get_pk_dsa_raw.3.gz
+man/man3/gnutls_x509_crt_get_pk_ecc_raw.3.gz
man/man3/gnutls_x509_crt_get_pk_rsa_raw.3.gz
man/man3/gnutls_x509_crt_get_policy.3.gz
man/man3/gnutls_x509_crt_get_preferred_hash_algorithm.3.gz
@@ -873,11 +938,10 @@ man/man3/gnutls_x509_crt_get_subject_alt_name2.3.gz
man/man3/gnutls_x509_crt_get_subject_alt_othername_oid.3.gz
man/man3/gnutls_x509_crt_get_subject_key_id.3.gz
man/man3/gnutls_x509_crt_get_subject_unique_id.3.gz
-man/man3/gnutls_x509_crt_get_verify_algorithm.3.gz
man/man3/gnutls_x509_crt_get_version.3.gz
man/man3/gnutls_x509_crt_import.3.gz
man/man3/gnutls_x509_crt_import_pkcs11.3.gz
-man/man3/gnutls_x509_crt_import_pkcs11_url.3.gz
+man/man3/gnutls_x509_crt_import_url.3.gz
man/man3/gnutls_x509_crt_init.3.gz
man/man3/gnutls_x509_crt_list_import.3.gz
man/man3/gnutls_x509_crt_list_import2.3.gz
@@ -901,6 +965,7 @@ man/man3/gnutls_x509_crt_set_extension_by_oid.3.gz
man/man3/gnutls_x509_crt_set_issuer_alt_name.3.gz
man/man3/gnutls_x509_crt_set_issuer_dn.3.gz
man/man3/gnutls_x509_crt_set_issuer_dn_by_oid.3.gz
+man/man3/gnutls_x509_crt_set_issuer_unique_id.3.gz
man/man3/gnutls_x509_crt_set_key.3.gz
man/man3/gnutls_x509_crt_set_key_purpose_oid.3.gz
man/man3/gnutls_x509_crt_set_key_usage.3.gz
@@ -915,16 +980,17 @@ man/man3/gnutls_x509_crt_set_serial.3.gz
man/man3/gnutls_x509_crt_set_subject_alt_name.3.gz
man/man3/gnutls_x509_crt_set_subject_alternative_name.3.gz
man/man3/gnutls_x509_crt_set_subject_key_id.3.gz
+man/man3/gnutls_x509_crt_set_subject_unique_id.3.gz
man/man3/gnutls_x509_crt_set_version.3.gz
man/man3/gnutls_x509_crt_sign.3.gz
man/man3/gnutls_x509_crt_sign2.3.gz
man/man3/gnutls_x509_crt_verify.3.gz
-man/man3/gnutls_x509_crt_verify_data.3.gz
-man/man3/gnutls_x509_crt_verify_hash.3.gz
+man/man3/gnutls_x509_crt_verify_data2.3.gz
man/man3/gnutls_x509_dn_deinit.3.gz
man/man3/gnutls_x509_dn_export.3.gz
man/man3/gnutls_x509_dn_export2.3.gz
man/man3/gnutls_x509_dn_get_rdn_ava.3.gz
+man/man3/gnutls_x509_dn_get_str.3.gz
man/man3/gnutls_x509_dn_import.3.gz
man/man3/gnutls_x509_dn_init.3.gz
man/man3/gnutls_x509_dn_oid_known.3.gz
@@ -998,6 +1064,7 @@ man/man3/gnutls_x509_privkey_import_rsa_raw.3.gz
man/man3/gnutls_x509_privkey_import_rsa_raw2.3.gz
man/man3/gnutls_x509_privkey_init.3.gz
man/man3/gnutls_x509_privkey_sec_param.3.gz
+man/man3/gnutls_x509_privkey_set_pin_function.3.gz
man/man3/gnutls_x509_privkey_sign_data.3.gz
man/man3/gnutls_x509_privkey_sign_hash.3.gz
man/man3/gnutls_x509_privkey_verify_params.3.gz
@@ -1013,7 +1080,11 @@ man/man3/gnutls_x509_trust_list_add_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_get_issuer_by_dn.3.gz
+man/man3/gnutls_x509_trust_list_get_issuer_by_subject_key_id.3.gz
man/man3/gnutls_x509_trust_list_init.3.gz
+man/man3/gnutls_x509_trust_list_iter_deinit.3.gz
+man/man3/gnutls_x509_trust_list_iter_get_ca.3.gz
man/man3/gnutls_x509_trust_list_remove_cas.3.gz
man/man3/gnutls_x509_trust_list_remove_trust_file.3.gz
man/man3/gnutls_x509_trust_list_remove_trust_mem.3.gz
diff --git a/security/gsasl/Makefile b/security/gsasl/Makefile
index be464c955cef..f2a873210054 100644
--- a/security/gsasl/Makefile
+++ b/security/gsasl/Makefile
@@ -3,7 +3,7 @@
PORTNAME= gsasl
PORTVERSION= 1.8.0
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= security
MASTER_SITES= GNU
diff --git a/security/hs-gnutls/Makefile b/security/hs-gnutls/Makefile
index 32f0f72aaa90..3717fb81d74c 100644
--- a/security/hs-gnutls/Makefile
+++ b/security/hs-gnutls/Makefile
@@ -2,6 +2,7 @@
PORTNAME= gnutls
PORTVERSION= 0.2
+PORTREVISION= 1
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/security/libprelude/Makefile b/security/libprelude/Makefile
index 832c42a56574..650f1a9ec5a7 100644
--- a/security/libprelude/Makefile
+++ b/security/libprelude/Makefile
@@ -2,75 +2,47 @@
# $FreeBSD$
PORTNAME= libprelude
-PORTVERSION= 1.0.1
-PORTREVISION= 9
+PORTVERSION= 1.2.6
CATEGORIES= security
-MASTER_SITES= http://www.prelude-ids.org/attachments/download/241/
+MASTER_SITES= http://www.prelude-siem.org/attachments/download/410/
MAINTAINER= koobs@FreeBSD.org
-COMMENT= Framework library for Prelude NIDS
+COMMENT= Sensor support library from Prelude SIEM
-LICENSE= GPLv2
-LICENSE_FILE= ${WRKSRC}/LICENSE.README
+LICENSE= GPLv2+
+LICENSE_FILE= ${WRKSRC}/COPYING
LIB_DEPENDS= libltdl.so:${PORTSDIR}/devel/libltdl \
- libgmp.so:${PORTSDIR}/math/gmp \
libgnutls.so:${PORTSDIR}/security/gnutls \
- libgcrypt.so:${PORTSDIR}/security/libgcrypt \
- libgpg-error.so:${PORTSDIR}/security/libgpg-error \
- libnettle.so:${PORTSDIR}/security/nettle \
- libp11-kit.so:${PORTSDIR}/security/p11-kit
-
-BROKEN_sparc64= does not compile
+ libgcrypt.so:${PORTSDIR}/security/libgcrypt
OPTIONS_DEFINE= DOCS PERL PYTHON
OPTIONS_SUB= yes
-USES= charsetfix gettext gmake iconv libtool pathfix pkgconfig
+USES= charsetfix gettext-runtime gmake iconv libtool pathfix pkgconfig
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
-CONFIGURE_ARGS= --enable-static \
- --localstatedir=/var \
- --enable-gtk-doc=no \
- --with-html-dir=${PREFIX}/share/doc
-
+CONFIGURE_ARGS= --without-lua \
+ --without-python3 \
+ --without-swig \
+ --without-valgrind \
+ ac_cv_path_RUBY=
CPPFLAGS+= -I${LOCALBASE}/include
-LDFLAGS+= -L${LOCALBASE}/lib
+LIBS+= -L${LOCALBASE}/lib
INSTALL_TARGET= install-strip
ETCDIR= ${PREFIX}/etc/prelude
-PORTDOCS= *
-PERL_CONFIGURE_WITH= perl
+PERL_CONFIGURE_WITH= perl=${PERL}
PERL_USES= perl5
-PYTHON_CONFIGURE_WITH= python
-PYTHON_USES= python
-
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MPYTHON}
-PLIST_SUB+= PYTHON_VER="${PYTHON_VER}" VERSION="${PORTVERSION}"
-.endif
-
-.include <bsd.port.pre.mk>
-
-post-patch:
- @${REINPLACE_CMD} '\,gnutls/extra\.h,d' \
- ${WRKSRC}/prelude-admin/prelude-admin.c \
- ${WRKSRC}/prelude-admin/server.c
+PYTHON_CONFIGURE_WITH= python2=${PYTHON_CMD}
+PYTHON_USES= python:2.7
+PYTHON_PLIST_SUB= VERSION="${PORTVERSION}"
post-install:
- ${INSTALL_MAN} ${WRKSRC}/docs/manpages/*.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
-
.for f in client.conf global.conf idmef-client.conf tls.conf
- ${INSTALL_DATA} ${WRKSRC}/${f} \
+ ${MV} ${STAGEDIR}${ETCDIR}/default/${f} \
${STAGEDIR}${ETCDIR}/default/${f}.sample
- ${RM} ${STAGEDIR}${ETCDIR}/default/${f} # Remove files install-data-local installs
.endfor
-.if ${PORT_OPTIONS:MDOCS}
- @${MKDIR} ${STAGEDIR}${DOCSDIR}
- ${INSTALL_DATA} ${WRKSRC}/docs/api/html/* ${STAGEDIR}${DOCSDIR}
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/security/libprelude/distinfo b/security/libprelude/distinfo
index 69e225563e8b..3e9bf168cdf9 100644
--- a/security/libprelude/distinfo
+++ b/security/libprelude/distinfo
@@ -1,2 +1,2 @@
-SHA256 (libprelude-1.0.1.tar.gz) = 852d981e7d23e49ec25a96a7f54c19a7ee72cd786a0d02c43a27e3e770d5cb6b
-SIZE (libprelude-1.0.1.tar.gz) = 2791973
+SHA256 (libprelude-1.2.6.tar.gz) = 37541fc6c0593da09410d74b3801cdc672344bdfd711f689157fd41eac06c9c7
+SIZE (libprelude-1.2.6.tar.gz) = 2926210
diff --git a/security/libprelude/files/patch-src__include__prelude-plugin.h b/security/libprelude/files/patch-src__include__prelude-plugin.h
deleted file mode 100644
index be59c1f7ac4d..000000000000
--- a/security/libprelude/files/patch-src__include__prelude-plugin.h
+++ /dev/null
@@ -1,13 +0,0 @@
---- src/include/prelude-plugin.h.orig 2012-06-02 00:12:30.000000000 +0900
-+++ src/include/prelude-plugin.h 2012-09-11 15:46:33.000000000 +0900
-@@ -61,9 +61,9 @@
- */
- #ifdef PRELUDE_APPLICATION_USE_LIBTOOL2
- # define lt_preloaded_symbols lt__PROGRAM__LTX_preloaded_symbols
--#endif
-
- extern const void *lt_preloaded_symbols[];
-+#endif
-
- #define PRELUDE_PLUGIN_SET_PRELOADED_SYMBOLS() \
- prelude_plugin_set_preloaded_symbols(lt_preloaded_symbols)
diff --git a/security/libprelude/pkg-descr b/security/libprelude/pkg-descr
index 5d58775683e6..dbaa74427df8 100644
--- a/security/libprelude/pkg-descr
+++ b/security/libprelude/pkg-descr
@@ -1,7 +1,13 @@
-Prelude is a new innovative hybrid Intrusion Detection system designed
-to be very modular, distributed, rock solid and fast.
+Prelude is a Universal "Security Information & Event Management" (SIEM)
+system. Prelude collects, normalizes, sorts, aggregates, correlates and
+reports all security-related events.
-This library provides a number of features to sensors, including
-communication with the manager.
+As well as being capable of recovering any type of log (system logs, syslog,
+flat files, etc.), Prelude benefits from a native support with a number of
+systems dedicated to enriching information even further (snort, samhain,
+ossec, auditd, etc.).
-WWW: http://www.prelude-ids.org/
+This library provides functionality for sensors (connection with a manager,
+handling sensor-exported options,...).
+
+WWW: https://www.prelude-siem.org/
diff --git a/security/libprelude/pkg-plist b/security/libprelude/pkg-plist
index efa2959ffd65..742ca4fbbfbf 100644
--- a/security/libprelude/pkg-plist
+++ b/security/libprelude/pkg-plist
@@ -11,6 +11,7 @@ include/libprelude/idmef.h
include/libprelude/idmef.hxx
include/libprelude/idmef-additional-data.h
include/libprelude/idmef-class.h
+include/libprelude/idmef-class.hxx
include/libprelude/idmef-criteria.h
include/libprelude/idmef-criteria.hxx
include/libprelude/idmef-criterion-value.h
@@ -20,6 +21,7 @@ include/libprelude/idmef-message-id.h
include/libprelude/idmef-message-print.h
include/libprelude/idmef-message-read.h
include/libprelude/idmef-message-write.h
+include/libprelude/idmef-object.h
include/libprelude/idmef-path.h
include/libprelude/idmef-path.hxx
include/libprelude/idmef-time.h
@@ -54,6 +56,7 @@ include/libprelude/prelude-linked-object.h
include/libprelude/prelude-list.h
include/libprelude/prelude-log.h
include/libprelude/prelude-log.hxx
+include/libprelude/prelude-macros.h
include/libprelude/prelude-message-id.h
include/libprelude/prelude-msg.h
include/libprelude/prelude-msgbuf.h
@@ -63,26 +66,69 @@ include/libprelude/prelude-plugin.h
include/libprelude/prelude-string.h
include/libprelude/prelude-thread.h
include/libprelude/prelude-timer.h
-lib/libprelude.a
lib/libprelude.so
-lib/libprelude.so.2
-lib/libprelude.so.2.19.1
-lib/libpreludecpp.a
+lib/libprelude.so.23
+lib/libprelude.so.23.1.0
lib/libpreludecpp.so
-lib/libpreludecpp.so.0
-lib/libpreludecpp.so.0.3.0
-man/man1/prelude-admin.1.gz
+lib/libpreludecpp.so.8
+lib/libpreludecpp.so.8.0.0
%%PERL%%%%SITE_ARCH%%/Prelude.pm
%%PERL%%%%SITE_ARCH%%/auto/Prelude/Prelude.so
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/PreludeEasy-%%VERSION%%-py%%PYTHON_VER%%.egg-info
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/PreludeEasy.py
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/PreludeEasy.pyc
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/_PreludeEasy.so
%%PYTHON%%%%PYTHON_SITELIBDIR%%/_prelude.so
%%PYTHON%%%%PYTHON_SITELIBDIR%%/prelude-%%VERSION%%-py%%PYTHON_VER%%.egg-info
%%PYTHON%%%%PYTHON_SITELIBDIR%%/prelude.py
%%PYTHON%%%%PYTHON_SITELIBDIR%%/prelude.pyc
libdata/pkgconfig/libprelude.pc
+man/man1/prelude-admin.1.gz
share/aclocal/libprelude.m4
-@dir %%ETCDIR%%/profile
-@dir(root,wheel,711) /var/spool/prelude
+%%PORTDOCS%%share/gtk-doc/html/libprelude/api-index-full.html
+%%PORTDOCS%%share/gtk-doc/html/libprelude/ch01.html
+%%PORTDOCS%%share/gtk-doc/html/libprelude/deprecated-api-index.html
+%%PORTDOCS%%share/gtk-doc/html/libprelude/home.png
+%%PORTDOCS%%share/gtk-doc/html/libprelude/index.html
+%%PORTDOCS%%share/gtk-doc/html/libprelude/index.sgml
+%%PORTDOCS%%share/gtk-doc/html/libprelude/left.png
+%%PORTDOCS%%share/gtk-doc/html/libprelude/libprelude-idmef-additional-data.html
+%%PORTDOCS%%share/gtk-doc/html/libprelude/libprelude-idmef-criteria.html
+%%PORTDOCS%%share/gtk-doc/html/libprelude/libprelude-idmef-criterion-value.html
+%%PORTDOCS%%share/gtk-doc/html/libprelude/libprelude-idmef-data.html
+%%PORTDOCS%%share/gtk-doc/html/libprelude/libprelude-idmef-message-print.html
+%%PORTDOCS%%share/gtk-doc/html/libprelude/libprelude-idmef-message-read.html
+%%PORTDOCS%%share/gtk-doc/html/libprelude/libprelude-idmef-message-write.html
+%%PORTDOCS%%share/gtk-doc/html/libprelude/libprelude-idmef-path.html
+%%PORTDOCS%%share/gtk-doc/html/libprelude/libprelude-idmef-time.html
+%%PORTDOCS%%share/gtk-doc/html/libprelude/libprelude-idmef-tree-wrap.html
+%%PORTDOCS%%share/gtk-doc/html/libprelude/libprelude-idmef-value.html
+%%PORTDOCS%%share/gtk-doc/html/libprelude/libprelude-prelude-async.html
+%%PORTDOCS%%share/gtk-doc/html/libprelude/libprelude-prelude-client-profile.html
+%%PORTDOCS%%share/gtk-doc/html/libprelude/libprelude-prelude-client.html
+%%PORTDOCS%%share/gtk-doc/html/libprelude/libprelude-prelude-connection-pool.html
+%%PORTDOCS%%share/gtk-doc/html/libprelude/libprelude-prelude-connection.html
+%%PORTDOCS%%share/gtk-doc/html/libprelude/libprelude-prelude-error.html
+%%PORTDOCS%%share/gtk-doc/html/libprelude/libprelude-prelude-failover.html
+%%PORTDOCS%%share/gtk-doc/html/libprelude/libprelude-prelude-hash.html
+%%PORTDOCS%%share/gtk-doc/html/libprelude/libprelude-prelude-ident.html
+%%PORTDOCS%%share/gtk-doc/html/libprelude/libprelude-prelude-inttypes.html
+%%PORTDOCS%%share/gtk-doc/html/libprelude/libprelude-prelude-io.html
+%%PORTDOCS%%share/gtk-doc/html/libprelude/libprelude-prelude-linked-object.html
+%%PORTDOCS%%share/gtk-doc/html/libprelude/libprelude-prelude-list.html
+%%PORTDOCS%%share/gtk-doc/html/libprelude/libprelude-prelude-log.html
+%%PORTDOCS%%share/gtk-doc/html/libprelude/libprelude-prelude-msg.html
+%%PORTDOCS%%share/gtk-doc/html/libprelude/libprelude-prelude-msgbuf.html
+%%PORTDOCS%%share/gtk-doc/html/libprelude/libprelude-prelude-option-wide.html
+%%PORTDOCS%%share/gtk-doc/html/libprelude/libprelude-prelude-option.html
+%%PORTDOCS%%share/gtk-doc/html/libprelude/libprelude-prelude-plugin.html
+%%PORTDOCS%%share/gtk-doc/html/libprelude/libprelude-prelude-string.html
+%%PORTDOCS%%share/gtk-doc/html/libprelude/libprelude-prelude-timer.html
+%%PORTDOCS%%share/gtk-doc/html/libprelude/libprelude-prelude.html
+%%PORTDOCS%%share/gtk-doc/html/libprelude/libprelude.devhelp
+%%PORTDOCS%%share/gtk-doc/html/libprelude/libprelude.devhelp2
+%%PORTDOCS%%share/gtk-doc/html/libprelude/object-tree.html
+%%PORTDOCS%%share/gtk-doc/html/libprelude/right.png
+%%PORTDOCS%%share/gtk-doc/html/libprelude/style.css
+%%PORTDOCS%%share/gtk-doc/html/libprelude/up.png
+%%DATADIR%%/swig/libpreludecpp.i
+%%PERL%%%%DATADIR%%/swig/perl/libpreludecpp-perl.i
+%%PYTHON%%%%DATADIR%%/swig/python/libpreludecpp-python.i
+@dir(,,711) %%ETCDIR%%/profile
+@dir(,,711) /var/spool/prelude
diff --git a/security/libpreludedb/Makefile b/security/libpreludedb/Makefile
index c6859dbe6f74..c6014ec82dcf 100644
--- a/security/libpreludedb/Makefile
+++ b/security/libpreludedb/Makefile
@@ -2,36 +2,26 @@
# $FreeBSD$
PORTNAME= libpreludedb
-PORTVERSION= 1.0.1p1
-PORTREVISION= 10
+PORTVERSION= 1.2.6
CATEGORIES= security
-MASTER_SITES= https://www.prelude-ids.org/attachments/download/287/
+MASTER_SITES= http://www.prelude-siem.org/attachments/download/408/
MAINTAINER= ports@FreeBSD.org
-COMMENT= Framework library for access to Prelude NIDS database
+COMMENT= Library to access Prelude IDMEF database
LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
-LIB_DEPENDS= libltdl.so:${PORTSDIR}/devel/libltdl \
- libgmp.so:${PORTSDIR}/math/gmp \
- libgnutls.so:${PORTSDIR}/security/gnutls \
- libgcrypt.so:${PORTSDIR}/security/libgcrypt \
- libgpg-error.so:${PORTSDIR}/security/libgpg-error \
- libprelude.so:${PORTSDIR}/security/libprelude \
- libnettle.so:${PORTSDIR}/security/nettle \
- libp11-kit.so:${PORTSDIR}/security/p11-kit
+LIB_DEPENDS= libprelude.so:${PORTSDIR}/security/libprelude
-USES= gettext gmake iconv libtool
+USES= gmake libtool
GNU_CONFIGURE= yes
-CONFIGURE_ARGS= --enable-gtk-doc=no \
- --with-html-dir=${PREFIX}/share/doc
+CONFIGURE_ARGS= --without-swig \
+ --without-python3
INSTALL_TARGET= install-strip
USE_LDCONFIG= yes
-PORTDOCS= *
-
-OPTIONS_DEFINE= DOCS PERL PYTHON
+OPTIONS_DEFINE= DOCS PYTHON
OPTIONS_MULTI= DB
OPTIONS_MULTI_DB= MYSQL PGSQL SQLITE
OPTIONS_DEFAULT= MYSQL
@@ -40,35 +30,14 @@ OPTIONS_SUB= yes
MYSQL_DESC= MySQL plugin
MYSQL_USE= mysql=yes
MYSQL_CONFIGURE_WITH= mysql
-PERL_DESC= Perl bindings
-PERL_USES= perl5
-PERL_USE= perl5=build,run
-PERL_CONFIGURE_WITH= perl
PGSQL_DESC= PostgreSQL plugin
PGSQL_USES= pgsql
PGSQL_CONFIGURE_WITH= postgresql
-PYTHON_USES= python
-PYTHON_CONFIGURE_WITH= python
-PYTHON_PLIST_SUB= PYTHON_VER="${PYTHON_VER}"
+PYTHON_USES= python:2.7
+PYTHON_CONFIGURE_WITH= python2=${PYTHON_CMD}
+PYTHON_PLIST_SUB= VERSION=${PORTVERSION}
SQLITE_DESC= SQLite3 plugin
SQLITE_USE= sqlite=yes
SQLITE_CONFIGURE_WITH= sqlite3
-post-install:
- ${INSTALL_MAN} ${WRKSRC}/docs/manpages/*.1 \
- ${STAGEDIR}${MAN1PREFIX}/man/man1
-
-post-install-DOCS-on:
- @${MKDIR} ${STAGEDIR}${DOCSDIR}
- ${INSTALL_DATA} ${WRKSRC}/docs/api/html/* \
- ${STAGEDIR}${DOCSDIR}
-
-post-install-PERL-on:
- @${FIND} ${STAGEDIR}${PREFIX}/lib/perl5 \
- -name "*.so" | ${XARGS} ${STRIP_CMD}
-
-post-install-PYTHON-on:
- @${FIND} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR} \
- -name "*.so" | ${XARGS} ${STRIP_CMD}
-
.include <bsd.port.mk>
diff --git a/security/libpreludedb/distinfo b/security/libpreludedb/distinfo
index 7ba7d4e4bbdd..a0d5a3832e97 100644
--- a/security/libpreludedb/distinfo
+++ b/security/libpreludedb/distinfo
@@ -1,2 +1,2 @@
-SHA256 (libpreludedb-1.0.1p1.tar.gz) = c62a30d2d96bea4188328124a85a53e2aa1e6effebe15c83dd4440248e0f4f61
-SIZE (libpreludedb-1.0.1p1.tar.gz) = 939675
+SHA256 (libpreludedb-1.2.6.tar.gz) = e855358b90811132c5e2e9fecf168eedee3c2bda03cd8eb4ae34a6e31f1540b1
+SIZE (libpreludedb-1.2.6.tar.gz) = 1230637
diff --git a/security/libpreludedb/files/patch-Makefile.in b/security/libpreludedb/files/patch-Makefile.in
deleted file mode 100644
index b6afaaac580f..000000000000
--- a/security/libpreludedb/files/patch-Makefile.in
+++ /dev/null
@@ -1,13 +0,0 @@
---- Makefile.in.orig 2009-07-15 13:49:18.000000000 +0600
-+++ Makefile.in 2009-09-04 10:56:03.000000000 +0600
-@@ -645,9 +645,8 @@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- ACLOCAL_AMFLAGS = -I m4 -I libmissing/m4
--DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc
- EXTRA_DIST = LICENSE.README HACKING.README
--SUBDIRS = m4 libmissing src plugins bindings docs
-+SUBDIRS = m4 libmissing src plugins bindings
- MAINTAINERCLEANFILES = \
- $(srcdir)/INSTALL \
- $(srcdir)/aclocal.m4 \
diff --git a/security/libpreludedb/pkg-descr b/security/libpreludedb/pkg-descr
index 65056eb8cfe3..4aa12dcc7c97 100644
--- a/security/libpreludedb/pkg-descr
+++ b/security/libpreludedb/pkg-descr
@@ -1,6 +1,12 @@
-Prelude is a new innovative hybrid Intrusion Detection system designed
-to be very modular, distributed, rock solid and fast.
+Prelude is a Universal "Security Information & Event Management" (SIEM)
+system. Prelude collects, normalizes, sorts, aggregates, correlates and
+reports all security-related events.
+
+As well as being capable of recovering any type of log (system logs, syslog,
+flat files, etc.), Prelude benefits from a native support with a number of
+systems dedicated to enriching information even further (snort, samhain,
+ossec, auditd, etc.).
This library provides a framework for easy access to the Prelude database.
-WWW: http://www.prelude-ids.org/
+WWW: https://www.prelude-siem.org/
diff --git a/security/libpreludedb/pkg-plist b/security/libpreludedb/pkg-plist
index 20e3b83fded4..fe1566b53ef7 100644
--- a/security/libpreludedb/pkg-plist
+++ b/security/libpreludedb/pkg-plist
@@ -1,28 +1,53 @@
bin/libpreludedb-config
bin/preludedb-admin
include/libpreludedb/preludedb.h
+include/libpreludedb/preludedb.hxx
include/libpreludedb/preludedb-error.h
+include/libpreludedb/preludedb-error.hxx
include/libpreludedb/preludedb-path-selection.h
include/libpreludedb/preludedb-plugin-format.h
include/libpreludedb/preludedb-plugin-sql.h
include/libpreludedb/preludedb-sql-settings.h
include/libpreludedb/preludedb-sql.h
+include/libpreludedb/preludedb-sql.hxx
include/libpreludedb/preludedb-version.h
lib/libpreludedb.so
-lib/libpreludedb.so.0
-lib/libpreludedb.so.0.4.10
+lib/libpreludedb.so.7
+lib/libpreludedb.so.7.0.0
+lib/libpreludedbcpp.so
+lib/libpreludedbcpp.so.2
+lib/libpreludedbcpp.so.2.0.0
lib/libpreludedb/plugins/formats/classic.so
%%MYSQL%%lib/libpreludedb/plugins/sql/mysql.so
%%PGSQL%%lib/libpreludedb/plugins/sql/pgsql.so
%%SQLITE%%lib/libpreludedb/plugins/sql/sqlite3.so
-%%PERL%%%%SITE_ARCH%%/PreludeDB.pm
-%%PERL%%%%SITE_ARCH%%/auto/PreludeDB/PreludeDB.so
%%PYTHON%%%%PYTHON_SITELIBDIR%%/_preludedb.so
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/preludedb-0.0.0-py%%PYTHON_VER%%.egg-info
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/preludedb-%%VERSION%%-py%%PYTHON_VER%%.egg-info
%%PYTHON%%%%PYTHON_SITELIBDIR%%/preludedb.py
%%PYTHON%%%%PYTHON_SITELIBDIR%%/preludedb.pyc
man/man1/preludedb-admin.1.gz
share/aclocal/libpreludedb.m4
+%%PORTDOCS%%share/gtk-doc/html/libpreludedb/api-index-full.html
+%%PORTDOCS%%share/gtk-doc/html/libpreludedb/ch01.html
+%%PORTDOCS%%share/gtk-doc/html/libpreludedb/deprecated-api-index.html
+%%PORTDOCS%%share/gtk-doc/html/libpreludedb/home.png
+%%PORTDOCS%%share/gtk-doc/html/libpreludedb/index.html
+%%PORTDOCS%%share/gtk-doc/html/libpreludedb/index.sgml
+%%PORTDOCS%%share/gtk-doc/html/libpreludedb/left.png
+%%PORTDOCS%%share/gtk-doc/html/libpreludedb/libpreludedb-preludedb-error.html
+%%PORTDOCS%%share/gtk-doc/html/libpreludedb/libpreludedb-preludedb-path-selection.html
+%%PORTDOCS%%share/gtk-doc/html/libpreludedb/libpreludedb-preludedb-plugin-format.html
+%%PORTDOCS%%share/gtk-doc/html/libpreludedb/libpreludedb-preludedb-plugin-sql.html
+%%PORTDOCS%%share/gtk-doc/html/libpreludedb/libpreludedb-preludedb-sql-settings.html
+%%PORTDOCS%%share/gtk-doc/html/libpreludedb/libpreludedb-preludedb-sql.html
+%%PORTDOCS%%share/gtk-doc/html/libpreludedb/libpreludedb-preludedb-version.html
+%%PORTDOCS%%share/gtk-doc/html/libpreludedb/libpreludedb-preludedb.html
+%%PORTDOCS%%share/gtk-doc/html/libpreludedb/libpreludedb.devhelp
+%%PORTDOCS%%share/gtk-doc/html/libpreludedb/libpreludedb.devhelp2
+%%PORTDOCS%%share/gtk-doc/html/libpreludedb/object-tree.html
+%%PORTDOCS%%share/gtk-doc/html/libpreludedb/right.png
+%%PORTDOCS%%share/gtk-doc/html/libpreludedb/style.css
+%%PORTDOCS%%share/gtk-doc/html/libpreludedb/up.png
%%DATADIR%%/classic/mysql-update-14-1.sql
%%DATADIR%%/classic/mysql-update-14-2.sql
%%DATADIR%%/classic/mysql-update-14-3.sql
diff --git a/security/openconnect/Makefile b/security/openconnect/Makefile
index 36864a68b611..9004ad56bb2d 100644
--- a/security/openconnect/Makefile
+++ b/security/openconnect/Makefile
@@ -3,6 +3,7 @@
PORTNAME= openconnect
PORTVERSION= 7.06
+PORTREVISION= 1
CATEGORIES= security
MASTER_SITES= ftp://ftp.infradead.org/pub/openconnect/ \
http://mirrors.rit.edu/zi/
diff --git a/security/openvas-cli/Makefile b/security/openvas-cli/Makefile
index ee8745808fc0..d23402b11292 100644
--- a/security/openvas-cli/Makefile
+++ b/security/openvas-cli/Makefile
@@ -2,6 +2,7 @@
PORTNAME= openvas-cli
PORTVERSION= 1.4.3
+PORTREVISION= 1
CATEGORIES= security
MASTER_SITES= http://wald.intevation.org/frs/download.php/2209/
diff --git a/security/openvas-libraries/Makefile b/security/openvas-libraries/Makefile
index 76de9c3b8f87..def0180058e8 100644
--- a/security/openvas-libraries/Makefile
+++ b/security/openvas-libraries/Makefile
@@ -3,6 +3,7 @@
PORTNAME= openvas-libraries
PORTVERSION= 8.0.7
+PORTREVISION= 1
CATEGORIES= security
MASTER_SITES= http://wald.intevation.org/frs/download.php/2291/
diff --git a/security/openvas-manager/Makefile b/security/openvas-manager/Makefile
index 9d1ba10018e6..107f4ceda275 100644
--- a/security/openvas-manager/Makefile
+++ b/security/openvas-manager/Makefile
@@ -2,6 +2,7 @@
PORTNAME= openvas-manager
PORTVERSION= 6.0.8
+PORTREVISION= 1
CATEGORIES= security
MASTER_SITES= http://wald.intevation.org/frs/download.php/2295/
diff --git a/security/py-gnutls/Makefile b/security/py-gnutls/Makefile
index f4187ac61a20..b2e1a9ff5163 100644
--- a/security/py-gnutls/Makefile
+++ b/security/py-gnutls/Makefile
@@ -3,6 +3,7 @@
PORTNAME= gnutls
PORTVERSION= 2.0.1
+PORTREVISION= 1
CATEGORIES= security python
MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
diff --git a/security/shishi/Makefile b/security/shishi/Makefile
index c467cc7ae003..8000eb457e0f 100644
--- a/security/shishi/Makefile
+++ b/security/shishi/Makefile
@@ -2,7 +2,7 @@
PORTNAME= shishi
PORTVERSION= 1.0.2
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= security
MASTER_SITES= GNU
diff --git a/security/suricata/Makefile b/security/suricata/Makefile
index a00e8ea158e7..edeebcf92dac 100644
--- a/security/suricata/Makefile
+++ b/security/suricata/Makefile
@@ -3,7 +3,7 @@
PORTNAME= suricata
PORTVERSION= 3.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= security
MASTER_SITES= http://www.openinfosecfoundation.org/download/
diff --git a/security/xmlsec1/Makefile b/security/xmlsec1/Makefile
index afd6b04b31cd..bd5939726c52 100644
--- a/security/xmlsec1/Makefile
+++ b/security/xmlsec1/Makefile
@@ -3,7 +3,7 @@
PORTNAME= xmlsec1
PORTVERSION= 1.2.20
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= security
MASTER_SITES= http://www.aleksey.com/xmlsec/download/ \
ftp://ftp.aleksey.com/pub/xmlsec/releases/ \