aboutsummaryrefslogtreecommitdiffstats
path: root/security
diff options
context:
space:
mode:
Diffstat (limited to 'security')
-rw-r--r--security/Makefile2
-rw-r--r--security/acmed/Makefile2
-rw-r--r--security/afl++/Makefile54
-rw-r--r--security/afl++/distinfo6
-rw-r--r--security/afl++/pkg-plist55
-rw-r--r--security/cargo-audit/Makefile1
-rw-r--r--security/cloak/Makefile2
-rw-r--r--security/fswatch/Makefile2
-rw-r--r--security/i2pd/Makefile3
-rw-r--r--security/i2pd/distinfo6
-rw-r--r--security/keybase/Makefile2
-rw-r--r--security/keybase/distinfo6
-rw-r--r--security/libfido2/Makefile3
-rw-r--r--security/libfido2/files/patch-man-CMakeLists.txt11
-rw-r--r--security/libfido2/pkg-plist330
-rw-r--r--security/plasma5-kscreenlocker/distinfo6
-rw-r--r--security/plasma5-ksshaskpass/distinfo6
-rw-r--r--security/plasma5-kwallet-pam/distinfo6
-rw-r--r--security/py-keyring/Makefile9
-rw-r--r--security/py-keyring/distinfo6
-rw-r--r--security/rubygem-devise-two-factor30-rails60/Makefile30
-rw-r--r--security/rubygem-devise-two-factor30-rails60/distinfo3
-rw-r--r--security/rubygem-devise-two-factor30-rails60/files/patch-gemspec11
-rw-r--r--security/rubygem-devise-two-factor30-rails60/pkg-descr3
-rw-r--r--security/rubygem-doorkeeper-openid_connect/Makefile8
-rw-r--r--security/rubygem-doorkeeper-openid_connect/distinfo6
-rw-r--r--security/rubygem-doorkeeper/Makefile3
-rw-r--r--security/rubygem-doorkeeper43/Makefile25
-rw-r--r--security/rubygem-doorkeeper43/distinfo3
-rw-r--r--security/rubygem-doorkeeper43/pkg-descr4
-rw-r--r--security/rubygem-googleauth/Makefile4
-rw-r--r--security/rubygem-googleauth/distinfo6
-rw-r--r--security/rubygem-signet/Makefile4
-rw-r--r--security/rubygem-signet/distinfo6
-rw-r--r--security/suricata/Makefile1
-rw-r--r--security/suricata5/Makefile2
-rw-r--r--security/vuxml/vuln.xml52
37 files changed, 355 insertions, 334 deletions
diff --git a/security/Makefile b/security/Makefile
index 5f3553499728..13ec39d2039b 100644
--- a/security/Makefile
+++ b/security/Makefile
@@ -1044,13 +1044,13 @@
SUBDIR += rubygem-devise-two-factor
SUBDIR += rubygem-devise-two-factor-rails5
SUBDIR += rubygem-devise-two-factor30-rails52
+ SUBDIR += rubygem-devise-two-factor30-rails60
SUBDIR += rubygem-devise_pam_authenticatable2
SUBDIR += rubygem-digest-crc
SUBDIR += rubygem-doorkeeper
SUBDIR += rubygem-doorkeeper-openid_connect
SUBDIR += rubygem-doorkeeper-rails5
SUBDIR += rubygem-doorkeeper-rails50
- SUBDIR += rubygem-doorkeeper43
SUBDIR += rubygem-ed25519
SUBDIR += rubygem-encryptor
SUBDIR += rubygem-ezcrypto
diff --git a/security/acmed/Makefile b/security/acmed/Makefile
index 87fc09af0728..1af30a2358bb 100644
--- a/security/acmed/Makefile
+++ b/security/acmed/Makefile
@@ -3,7 +3,7 @@
PORTNAME= acmed
DISTVERSIONPREFIX= v
DISTVERSION= 0.6.0
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= security
MAINTAINER= greg@unrelenting.technology
diff --git a/security/afl++/Makefile b/security/afl++/Makefile
index 27546104b659..67b6740038d2 100644
--- a/security/afl++/Makefile
+++ b/security/afl++/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= afl
-PORTVERSION= 2.60c
-PORTREVISION= 1
+PORTVERSION= 2.61c
CATEGORIES= security
PKGNAMESUFFIX= ++
@@ -13,32 +12,38 @@ COMMENT= Fast instrumented fuzzer
LICENSE= APACHE20
LICENSE_FILE= ${WRKSRC}/docs/COPYING
-# In theory afl supports non-x86 architectures with the LLVM plugin.
-# This has only been run tested on aarch64 so far.
ONLY_FOR_ARCHS= aarch64 amd64 i386 powerpc64
ONLY_FOR_ARCHS_REASON= uses x86-only instrumentation or requires complete LLVM support
+TEST_DEPENDS= bash:shells/bash
+
USES= gmake tar:tgz
USE_GITHUB= yes
GH_ACCOUNT= vanhauser-thc
GH_PROJECT= AFLplusplus
MAKE_ARGS= STRIP_CMD="${STRIP_CMD}"
-ALL_TARGET= all libdislocator libtokencap
+ALL_TARGET= all libtokencap
INSTALL_TARGET= install-strip
TEST_TARGET= test_build
CONFLICTS_INSTALL= afl
-OPTIONS_DEFINE= DEBUG DOCS EXAMPLES GCC LLVM PYTHON
-OPTIONS_DEFAULT= GCC LLVM PYTHON
+OPTIONS_DEFINE= DEBUG DOCS EXAMPLES GCC LIBDISLOCATOR LLVM PYTHON
+OPTIONS_DEFAULT= GCC LIBDISLOCATOR LLVM PYTHON
+
+# libdislocator fails to build on FreeBSD 11.x
+# error: typedef redefinition with different types ('struct max_align_t' vs '__max_align_t')
+OPTIONS_EXCLUDE_FreeBSD_11= LIBDISLOCATOR
+
# On non-x86 architectures LLVM is mandatory
-OPTIONS_SLAVE= ${ARCH:Namd64:Ni386:S/${ARCH}/LLVM/}
-OPTIONS_SUB= yes
+OPTIONS_SLAVE= ${ARCH:Namd64:Ni386:S/${ARCH}/LLVM/}
+OPTIONS_SUB= yes
-GCC_DESC= Build GCC plugin and afl-gcc-fast
-LLVM_DESC= LLVM-based instrumentation
-PYTHON_DESC= Python mutators support
+GCC_DESC= Build GCC plugin and afl-gcc-fast
+LIBDISLOCATOR_DESC= Abusive allocator for uncovering heap-related bugs
+LLVM_DESC= LLVM-based instrumentation
+PYTHON_DESC= Python mutators support
GCC_BUILD_DEPENDS= gcc${GCC_DEFAULT}>0:lang/gcc${GCC_DEFAULT}
GCC_RUN_DEPENDS= gcc${GCC_DEFAULT}>0:lang/gcc${GCC_DEFAULT}
@@ -47,6 +52,8 @@ GCC_MAKE_ARGS= GCC=gcc${GCC_DEFAULT:S/-devel$//} \
GCC_ALL_TARGET= gcc_plugin
GCC_TEST_TARGET= test_gcc_plugin
+LIBDISLOCATOR_ALL_TARGET= libdislocator
+
LLVM_BUILD_DEPENDS= clang${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT}
LLVM_RUN_DEPENDS= clang${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT}
LLVM_MAKE_ARGS= CC=clang${LLVM_DEFAULT} \
@@ -89,12 +96,6 @@ post-patch:
@${REINPLACE_CMD} '/export AFL_CC/d' ${WRKSRC}/test/test.sh
@${ECHO_CMD} "include ${FILESDIR}/Makefile.extra" >> ${WRKSRC}/Makefile
-post-patch-GCC-on:
- @${REINPLACE_CMD} \
- -e 's|"gcc"|"gcc${GCC_DEFAULT:S/-devel$//}"|g' \
- -e 's|"g\+\+"|"g\+\+${GCC_DEFAULT:S/-devel$//}"|g' \
- ${WRKSRC}/gcc_plugin/afl-gcc-fast.c
-
post-patch-LLVM-on:
@${REINPLACE_CMD} \
-e 's|"clang"|"clang${LLVM_DEFAULT}"|g' \
@@ -102,18 +103,23 @@ post-patch-LLVM-on:
${WRKSRC}/llvm_mode/afl-clang-fast.c
post-install:
- @${MKDIR} ${STAGEDIR}${DOCSDIR}/libdislocator \
- ${STAGEDIR}${DOCSDIR}/libtokencap
- ${INSTALL_MAN} ${WRKSRC}/libdislocator/README.dislocator.md \
- ${STAGEDIR}${DOCSDIR}/libdislocator
- ${INSTALL_MAN} ${WRKSRC}/libtokencap/README.tokencap.md \
+ @${MKDIR} ${STAGEDIR}${DOCSDIR}/libtokencap
+ ${INSTALL_MAN} ${WRKSRC}/libtokencap/README.md \
${STAGEDIR}${DOCSDIR}/libtokencap
+ @cd ${STAGEDIR}${PREFIX} && \
+ ${FIND} lib/afl -name 'argvfuzz*.so' -or -name 'socketfuzz*.so' \
+ >> ${TMPPLIST}
post-install-GCC-on:
@${MKDIR} ${STAGEDIR}${DOCSDIR}/gcc_plugin
${INSTALL_MAN} ${WRKSRC}/gcc_plugin/README.* \
${STAGEDIR}${DOCSDIR}/gcc_plugin
+post-install-LIBDISLOCATOR-on:
+ @${MKDIR} ${STAGEDIR}${DOCSDIR}/libdislocator
+ ${INSTALL_MAN} ${WRKSRC}/libdislocator/README.md \
+ ${STAGEDIR}${DOCSDIR}/libdislocator
+
post-install-LLVM-on:
${MKDIR} ${STAGEDIR}${DOCSDIR}/llvm_mode
${INSTALL_MAN} ${WRKSRC}/llvm_mode/README.* \
@@ -121,7 +127,7 @@ post-install-LLVM-on:
post-install-PYTHON-on:
@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/python_mutators
- @cd ${WRKSRC} && \
+ @cd ${WRKSRC}/examples && \
${COPYTREE_SHARE} python_mutators ${STAGEDIR}${EXAMPLESDIR}
post-test:
diff --git a/security/afl++/distinfo b/security/afl++/distinfo
index 9d28d49801bf..97ebab00aaca 100644
--- a/security/afl++/distinfo
+++ b/security/afl++/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1577798797
-SHA256 (vanhauser-thc-AFLplusplus-2.60c_GH0.tar.gz) = 8b82c585c255f87536a7aef76da635d72675d75674dfc017dfe2e0d8d8bf397b
-SIZE (vanhauser-thc-AFLplusplus-2.60c_GH0.tar.gz) = 1215299
+TIMESTAMP = 1582579005
+SHA256 (vanhauser-thc-AFLplusplus-2.61c_GH0.tar.gz) = b7559811f4182d7f9cc80d4f70742b51fd58b2e11522db72fd044e6f80f760db
+SIZE (vanhauser-thc-AFLplusplus-2.61c_GH0.tar.gz) = 1268094
diff --git a/security/afl++/pkg-plist b/security/afl++/pkg-plist
index 464de6cc0705..adec0ae21529 100644
--- a/security/afl++/pkg-plist
+++ b/security/afl++/pkg-plist
@@ -6,6 +6,7 @@ bin/afl-analyze
%%GCC%%bin/afl-g++-fast
%%GCC%%bin/afl-gcc-fast
bin/afl-cmin
+bin/afl-cmin.bash
bin/afl-fuzz
%%X86%%bin/afl-g++
%%X86%%bin/afl-gcc
@@ -22,20 +23,19 @@ bin/afl-whatsup
%%X86%%%%LLVM%%lib/afl/afl-llvm-rt-32.o
%%LLVM%%lib/afl/afl-llvm-rt-64.o
%%LLVM%%lib/afl/afl-llvm-rt.o
-%%X86%%lib/afl/argvfuzz32.so
-lib/afl/argvfuzz64.so
%%X86%%lib/afl/as
%%LLVM%%lib/afl/compare-transform-pass.so
-lib/afl/libdislocator.so
+%%LIBDISLOCATOR%%lib/afl/libdislocator.so
lib/afl/libtokencap.so
%%LLVM%%lib/afl/libLLVMInsTrim.so
-%%X86%%lib/afl/socketfuzz32.so
-lib/afl/socketfuzz64.so
%%LLVM%%lib/afl/split-compares-pass.so
%%LLVM%%lib/afl/split-switches-pass.so
+man/man8/afl-analyze.8.gz
+man/man8/afl-as.8.gz
%%LLVM%%man/man8/afl-clang-fast.8.gz
%%LLVM%%man/man8/afl-clang-fast++.8.gz
man/man8/afl-cmin.8.gz
+man/man8/afl-cmin.bash.8.gz
man/man8/afl-fuzz.8.gz
%%GCC%%man/man8/afl-g++-fast.8.gz
%%GCC%%man/man8/afl-gcc-fast.8.gz
@@ -47,7 +47,6 @@ man/man8/afl-system-config.8.gz
man/man8/afl-tmin.8.gz
man/man8/afl-whatsup.8.gz
%%DATADIR%%/README.md
-%%DATADIR%%/README.testcases
%%DATADIR%%/archives/common/ar/small_archive.a
%%DATADIR%%/archives/common/bzip2/small_archive.bz2
%%DATADIR%%/archives/common/cab/small_archive.cab
@@ -99,31 +98,37 @@ man/man8/afl-whatsup.8.gz
%%DATADIR%%/tiff.dict
%%DATADIR%%/webp.dict
%%DATADIR%%/xml.dict
-%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
-%%PORTDOCS%%%%DOCSDIR%%/QuickStartGuide.txt
+%%PORTDOCS%%%%DOCSDIR%%/Changelog.md
+%%PORTDOCS%%%%DOCSDIR%%/INSTALL.md
+%%PORTDOCS%%%%DOCSDIR%%/PATCHES.md
+%%PORTDOCS%%%%DOCSDIR%%/QuickStartGuide.md
+%%PORTDOCS%%%%DOCSDIR%%/README.MOpt.md
%%PORTDOCS%%%%DOCSDIR%%/README.md
-%%PORTDOCS%%%%DOCSDIR%%/binaryonly_fuzzing.txt
-%%PORTDOCS%%%%DOCSDIR%%/custom_mutator.txt
-%%PORTDOCS%%%%DOCSDIR%%/env_variables.txt
-%%GCC%%%%PORTDOCS%%%%DOCSDIR%%/gcc_plugin/README.gcc.md
+%%PORTDOCS%%%%DOCSDIR%%/README.radamsa.md
+%%PORTDOCS%%%%DOCSDIR%%/binaryonly_fuzzing.md
+%%PORTDOCS%%%%DOCSDIR%%/custom_mutator.md
+%%PORTDOCS%%%%DOCSDIR%%/env_variables.md
+%%GCC%%%%PORTDOCS%%%%DOCSDIR%%/gcc_plugin/README.md
%%GCC%%%%PORTDOCS%%%%DOCSDIR%%/gcc_plugin/README.whitelist.md
-%%PORTDOCS%%%%DOCSDIR%%/historical_notes.txt
-%%PORTDOCS%%%%DOCSDIR%%/libdislocator/README.dislocator.md
-%%PORTDOCS%%%%DOCSDIR%%/libtokencap/README.tokencap.md
-%%PORTDOCS%%%%DOCSDIR%%/life_pro_tips.txt
-%%LLVM%%%%PORTDOCS%%%%DOCSDIR%%/llvm_mode/README.md
+%%PORTDOCS%%%%DOCSDIR%%/historical_notes.md
+%%PORTDOCS%%%%DOCSDIR%%/ideas.md
+%%LIBDISLOCATOR%%%%PORTDOCS%%%%DOCSDIR%%/libdislocator/README.md
+%%PORTDOCS%%%%DOCSDIR%%/libtokencap/README.md
+%%PORTDOCS%%%%DOCSDIR%%/life_pro_tips.md
+%%LLVM%%%%PORTDOCS%%%%DOCSDIR%%/llvm_mode/README.cmplog.md
%%LLVM%%%%PORTDOCS%%%%DOCSDIR%%/llvm_mode/README.instrim.md
%%LLVM%%%%PORTDOCS%%%%DOCSDIR%%/llvm_mode/README.laf-intel.md
+%%LLVM%%%%PORTDOCS%%%%DOCSDIR%%/llvm_mode/README.md
%%LLVM%%%%PORTDOCS%%%%DOCSDIR%%/llvm_mode/README.neverzero.md
%%LLVM%%%%PORTDOCS%%%%DOCSDIR%%/llvm_mode/README.whitelist.md
-%%PORTDOCS%%%%DOCSDIR%%/notes_for_asan.txt
-%%PORTDOCS%%%%DOCSDIR%%/parallel_fuzzing.txt
-%%PORTDOCS%%%%DOCSDIR%%/perf_tips.txt
-%%PORTDOCS%%%%DOCSDIR%%/power_schedules.txt
-%%PORTDOCS%%%%DOCSDIR%%/python_mutators.txt
-%%PORTDOCS%%%%DOCSDIR%%/sister_projects.txt
-%%PORTDOCS%%%%DOCSDIR%%/status_screen.txt
-%%PORTDOCS%%%%DOCSDIR%%/technical_details.txt
+%%PORTDOCS%%%%DOCSDIR%%/notes_for_asan.md
+%%PORTDOCS%%%%DOCSDIR%%/parallel_fuzzing.md
+%%PORTDOCS%%%%DOCSDIR%%/perf_tips.md
+%%PORTDOCS%%%%DOCSDIR%%/power_schedules.md
+%%PYTHON%%%%PORTDOCS%%%%DOCSDIR%%/python_mutators.md
+%%PORTDOCS%%%%DOCSDIR%%/sister_projects.md
+%%PORTDOCS%%%%DOCSDIR%%/status_screen.md
+%%PORTDOCS%%%%DOCSDIR%%/technical_details.md
%%PYTHON%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/python_mutators/README
%%PYTHON%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/python_mutators/XmlMutatorMin.py
%%PYTHON%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/python_mutators/common.py
diff --git a/security/cargo-audit/Makefile b/security/cargo-audit/Makefile
index 27e747537b43..93023b72f8b9 100644
--- a/security/cargo-audit/Makefile
+++ b/security/cargo-audit/Makefile
@@ -3,6 +3,7 @@
PORTNAME= cargo-audit
DISTVERSIONPREFIX= v
DISTVERSION= 0.11.2
+PORTREVISION= 1
CATEGORIES= security
MAINTAINER= tobik@FreeBSD.org
diff --git a/security/cloak/Makefile b/security/cloak/Makefile
index 8da99a0e53d9..ae0a41c1ac6c 100644
--- a/security/cloak/Makefile
+++ b/security/cloak/Makefile
@@ -3,7 +3,7 @@
PORTNAME= cloak
DISTVERSIONPREFIX= v
DISTVERSION= 0.2.0
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= security
MAINTAINER= tobik@FreeBSD.org
diff --git a/security/fswatch/Makefile b/security/fswatch/Makefile
index e86e59738adc..c5120c8d6fc7 100644
--- a/security/fswatch/Makefile
+++ b/security/fswatch/Makefile
@@ -18,7 +18,7 @@ CONFIGURE_ARGS= --prefix=${PREFIX} \
--enable-stflags
GNU_CONFIGURE= yes
-PORTSCOUT= ignore:0.02.04beta
+PORTSCOUT= ignore:1
post-patch:
@${REINPLACE_CMD} '/INSTALL/ s|prefix)|DESTDIR)$$(&|' \
diff --git a/security/i2pd/Makefile b/security/i2pd/Makefile
index ca8aa0c870ed..aa7932c6a87f 100644
--- a/security/i2pd/Makefile
+++ b/security/i2pd/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= i2pd
-PORTVERSION= 2.29.0
-PORTREVISION= 1
+PORTVERSION= 2.30.0
CATEGORIES= security net-p2p
MAINTAINER= amdmi3@FreeBSD.org
diff --git a/security/i2pd/distinfo b/security/i2pd/distinfo
index c42cc86b3cca..91cf9cbe36b0 100644
--- a/security/i2pd/distinfo
+++ b/security/i2pd/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1572276026
-SHA256 (PurpleI2P-i2pd-2.29.0_GH0.tar.gz) = fd0474c33b411593b9dc8197f3799d37d68455c11a9ee3994ec993a96388ec06
-SIZE (PurpleI2P-i2pd-2.29.0_GH0.tar.gz) = 1079654
+TIMESTAMP = 1582665211
+SHA256 (PurpleI2P-i2pd-2.30.0_GH0.tar.gz) = 25915cbd33a9f53c89ddf7fbd68fccc5ffc89ab40d4445ccc813da74fae154f2
+SIZE (PurpleI2P-i2pd-2.30.0_GH0.tar.gz) = 1087411
diff --git a/security/keybase/Makefile b/security/keybase/Makefile
index 749c03cf2824..52ce4cc58d7c 100644
--- a/security/keybase/Makefile
+++ b/security/keybase/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= keybase
-PORTVERSION= 5.2.0
+PORTVERSION= 5.2.1
DISTVERSIONPREFIX= v
CATEGORIES= security
diff --git a/security/keybase/distinfo b/security/keybase/distinfo
index afb42874c1f1..22ec56d0fb85 100644
--- a/security/keybase/distinfo
+++ b/security/keybase/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1580562257
-SHA256 (keybase-client-v5.2.0_GH0.tar.gz) = fa3a9e64532122f587847a19082a291b5964a4ce75f4f18dc20f1eae6c147e8d
-SIZE (keybase-client-v5.2.0_GH0.tar.gz) = 66392531
+TIMESTAMP = 1582733355
+SHA256 (keybase-client-v5.2.1_GH0.tar.gz) = 209860c9b8c8e7d24b93b53afa2865aea543c2b83a3110f822d54b569f4deffe
+SIZE (keybase-client-v5.2.1_GH0.tar.gz) = 66391887
diff --git a/security/libfido2/Makefile b/security/libfido2/Makefile
index 8ce06c2f0216..0e45a237ad09 100644
--- a/security/libfido2/Makefile
+++ b/security/libfido2/Makefile
@@ -3,6 +3,7 @@
PORTNAME= libfido2
PORTVERSION= 1.3.1
+PORTREVISION= 1
CATEGORIES= security
MASTER_SITES= https://developers.yubico.com/libfido2/Releases/
@@ -20,6 +21,8 @@ USES= cmake compiler pkgconfig ssl
CFLAGS+= -D_WITH_GETLINE -DUSE_HIDAPI
LDFLAGS+= -lcrypto -lusbhid
+PLIST_SUB= PORTVERSION=${PORTVERSION}
+
OPTIONS_DEFINE= DOCS
.include <bsd.port.pre.mk>
diff --git a/security/libfido2/files/patch-man-CMakeLists.txt b/security/libfido2/files/patch-man-CMakeLists.txt
new file mode 100644
index 000000000000..15156da471bd
--- /dev/null
+++ b/security/libfido2/files/patch-man-CMakeLists.txt
@@ -0,0 +1,11 @@
+--- man/CMakeLists.txt.orig 2020-02-19 17:21:59 UTC
++++ man/CMakeLists.txt
+@@ -5,7 +5,7 @@
+ find_program(MANDOC_PATH mandoc)
+ message(STATUS "MANDOC_PATH: ${MANDOC_PATH}")
+
+-if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
++if(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD" OR CMAKE_SYSTEM_NAME STREQUAL "Linux")
+ find_program(GZIP_PATH gzip)
+ message(STATUS "GZIP_PATH: ${GZIP_PATH}")
+ endif()
diff --git a/security/libfido2/pkg-plist b/security/libfido2/pkg-plist
index 945920d2182c..aaf55039766e 100644
--- a/security/libfido2/pkg-plist
+++ b/security/libfido2/pkg-plist
@@ -12,172 +12,8 @@ include/fido/rs256.h
lib/libfido2.a
lib/libfido2.so
lib/libfido2.so.1
-lib/libfido2.so.1.3.1
+lib/libfido2.so.%%PORTVERSION%%
libdata/pkgconfig/libfido2.pc
-man/man1/fido2-assert.1.gz
-man/man1/fido2-cred.1.gz
-man/man1/fido2-token.1.gz
-man/man3/eddsa_pk_free.3.gz
-man/man3/eddsa_pk_from_ptr.3.gz
-man/man3/eddsa_pk_new.3.gz
-man/man3/eddsa_pk_to_EVP_PKEY.3.gz
-man/man3/es256_pk_free.3.gz
-man/man3/es256_pk_from_EC_KEY.3.gz
-man/man3/es256_pk_from_ptr.3.gz
-man/man3/es256_pk_new.3.gz
-man/man3/es256_pk_to_EVP_PKEY.3.gz
-man/man3/fido_assert_allow_cred.3.gz
-man/man3/fido_assert_authdata_len.3.gz
-man/man3/fido_assert_authdata_ptr.3.gz
-man/man3/fido_assert_clientdata_hash_len.3.gz
-man/man3/fido_assert_clientdata_hash_ptr.3.gz
-man/man3/fido_assert_count.3.gz
-man/man3/fido_assert_free.3.gz
-man/man3/fido_assert_hmac_secret_len.3.gz
-man/man3/fido_assert_hmac_secret_ptr.3.gz
-man/man3/fido_assert_new.3.gz
-man/man3/fido_assert_set_authdata.3.gz
-man/man3/fido_assert_set_clientdata_hash.3.gz
-man/man3/fido_assert_set_count.3.gz
-man/man3/fido_assert_set_extensions.3.gz
-man/man3/fido_assert_set_hmac_salt.3.gz
-man/man3/fido_assert_set_rp.3.gz
-man/man3/fido_assert_set_sig.3.gz
-man/man3/fido_assert_set_up.3.gz
-man/man3/fido_assert_set_uv.3.gz
-man/man3/fido_assert_sig_len.3.gz
-man/man3/fido_assert_sig_ptr.3.gz
-man/man3/fido_assert_sigcount.3.gz
-man/man3/fido_assert_user_display_name.3.gz
-man/man3/fido_assert_user_icon.3.gz
-man/man3/fido_assert_user_id_len.3.gz
-man/man3/fido_assert_user_id_ptr.3.gz
-man/man3/fido_assert_user_name.3.gz
-man/man3/fido_assert_verify.3.gz
-man/man3/fido_bio_dev_enroll_begin.3.gz
-man/man3/fido_bio_dev_enroll_cancel.3.gz
-man/man3/fido_bio_dev_enroll_continue.3.gz
-man/man3/fido_bio_dev_enroll_remove.3.gz
-man/man3/fido_bio_dev_get_info.3.gz
-man/man3/fido_bio_dev_get_template_array.3.gz
-man/man3/fido_bio_dev_set_template_name.3.gz
-man/man3/fido_bio_enroll_free.3.gz
-man/man3/fido_bio_enroll_last_status.3.gz
-man/man3/fido_bio_enroll_new.3.gz
-man/man3/fido_bio_enroll_remaining_samples.3.gz
-man/man3/fido_bio_info_free.3.gz
-man/man3/fido_bio_info_max_samples.3.gz
-man/man3/fido_bio_info_new.3.gz
-man/man3/fido_bio_info_type.3.gz
-man/man3/fido_bio_template.3.gz
-man/man3/fido_bio_template_array_count.3.gz
-man/man3/fido_bio_template_array_free.3.gz
-man/man3/fido_bio_template_array_new.3.gz
-man/man3/fido_bio_template_free.3.gz
-man/man3/fido_bio_template_id_len.3.gz
-man/man3/fido_bio_template_id_ptr.3.gz
-man/man3/fido_bio_template_name.3.gz
-man/man3/fido_bio_template_new.3.gz
-man/man3/fido_bio_template_set_id.3.gz
-man/man3/fido_bio_template_set_name.3.gz
-man/man3/fido_cbor_info_aaguid_len.3.gz
-man/man3/fido_cbor_info_aaguid_ptr.3.gz
-man/man3/fido_cbor_info_extensions_len.3.gz
-man/man3/fido_cbor_info_extensions_ptr.3.gz
-man/man3/fido_cbor_info_free.3.gz
-man/man3/fido_cbor_info_maxmsgsiz.3.gz
-man/man3/fido_cbor_info_new.3.gz
-man/man3/fido_cbor_info_options_len.3.gz
-man/man3/fido_cbor_info_options_name_ptr.3.gz
-man/man3/fido_cbor_info_options_value_ptr.3.gz
-man/man3/fido_cbor_info_protocols_len.3.gz
-man/man3/fido_cbor_info_protocols_ptr.3.gz
-man/man3/fido_cbor_info_versions_len.3.gz
-man/man3/fido_cbor_info_versions_ptr.3.gz
-man/man3/fido_cred_authdata_len.3.gz
-man/man3/fido_cred_authdata_ptr.3.gz
-man/man3/fido_cred_clientdata_hash_len.3.gz
-man/man3/fido_cred_clientdata_hash_ptr.3.gz
-man/man3/fido_cred_exclude.3.gz
-man/man3/fido_cred_fmt.3.gz
-man/man3/fido_cred_free.3.gz
-man/man3/fido_cred_id_len.3.gz
-man/man3/fido_cred_id_ptr.3.gz
-man/man3/fido_cred_new.3.gz
-man/man3/fido_cred_pubkey_len.3.gz
-man/man3/fido_cred_pubkey_ptr.3.gz
-man/man3/fido_cred_set_authdata.3.gz
-man/man3/fido_cred_set_authdata_raw.3.gz
-man/man3/fido_cred_set_clientdata_hash.3.gz
-man/man3/fido_cred_set_extensions.3.gz
-man/man3/fido_cred_set_fmt.3.gz
-man/man3/fido_cred_set_rk.3.gz
-man/man3/fido_cred_set_rp.3.gz
-man/man3/fido_cred_set_sig.3.gz
-man/man3/fido_cred_set_type.3.gz
-man/man3/fido_cred_set_user.3.gz
-man/man3/fido_cred_set_uv.3.gz
-man/man3/fido_cred_set_x509.3.gz
-man/man3/fido_cred_sig_len.3.gz
-man/man3/fido_cred_sig_ptr.3.gz
-man/man3/fido_cred_verify.3.gz
-man/man3/fido_cred_x5c_len.3.gz
-man/man3/fido_cred_x5c_ptr.3.gz
-man/man3/fido_credman_del_dev_rk.3.gz
-man/man3/fido_credman_get_dev_metadata.3.gz
-man/man3/fido_credman_get_dev_rk.3.gz
-man/man3/fido_credman_get_dev_rp.3.gz
-man/man3/fido_credman_metadata_free.3.gz
-man/man3/fido_credman_metadata_new.3.gz
-man/man3/fido_credman_rk.3.gz
-man/man3/fido_credman_rk_count.3.gz
-man/man3/fido_credman_rk_existing.3.gz
-man/man3/fido_credman_rk_free.3.gz
-man/man3/fido_credman_rk_new.3.gz
-man/man3/fido_credman_rk_remaining.3.gz
-man/man3/fido_credman_rp_count.3.gz
-man/man3/fido_credman_rp_free.3.gz
-man/man3/fido_credman_rp_id.3.gz
-man/man3/fido_credman_rp_id_hash_len.3.gz
-man/man3/fido_credman_rp_id_hash_ptr.3.gz
-man/man3/fido_credman_rp_name.3.gz
-man/man3/fido_credman_rp_new.3.gz
-man/man3/fido_dev_build.3.gz
-man/man3/fido_dev_cancel.3.gz
-man/man3/fido_dev_close.3.gz
-man/man3/fido_dev_flags.3.gz
-man/man3/fido_dev_force_fido2.3.gz
-man/man3/fido_dev_force_u2f.3.gz
-man/man3/fido_dev_free.3.gz
-man/man3/fido_dev_get_assert.3.gz
-man/man3/fido_dev_get_cbor_info.3.gz
-man/man3/fido_dev_get_retry_count.3.gz
-man/man3/fido_dev_info_free.3.gz
-man/man3/fido_dev_info_manifest.3.gz
-man/man3/fido_dev_info_manufacturer_string.3.gz
-man/man3/fido_dev_info_new.3.gz
-man/man3/fido_dev_info_path.3.gz
-man/man3/fido_dev_info_product.3.gz
-man/man3/fido_dev_info_product_string.3.gz
-man/man3/fido_dev_info_ptr.3.gz
-man/man3/fido_dev_info_vendor.3.gz
-man/man3/fido_dev_is_fido2.3.gz
-man/man3/fido_dev_major.3.gz
-man/man3/fido_dev_make_cred.3.gz
-man/man3/fido_dev_minor.3.gz
-man/man3/fido_dev_new.3.gz
-man/man3/fido_dev_open.3.gz
-man/man3/fido_dev_protocol.3.gz
-man/man3/fido_dev_reset.3.gz
-man/man3/fido_dev_set_io_functions.3.gz
-man/man3/fido_dev_set_pin.3.gz
-man/man3/fido_init.3.gz
-man/man3/fido_strerr.3.gz
-man/man3/rs256_pk_free.3.gz
-man/man3/rs256_pk_from_RSA.3.gz
-man/man3/rs256_pk_from_ptr.3.gz
-man/man3/rs256_pk_new.3.gz
-man/man3/rs256_pk_to_EVP_PKEY.3.gz
%%PORTDOCS%%%%DOCSDIR%%/eddsa_pk_free.html
%%PORTDOCS%%%%DOCSDIR%%/eddsa_pk_from_ptr.html
%%PORTDOCS%%%%DOCSDIR%%/eddsa_pk_new.html
@@ -343,3 +179,167 @@ man/man3/rs256_pk_to_EVP_PKEY.3.gz
%%PORTDOCS%%%%DOCSDIR%%/rs256_pk_new.html
%%PORTDOCS%%%%DOCSDIR%%/rs256_pk_to_EVP_PKEY.html
%%PORTDOCS%%%%DOCSDIR%%/style.css
+share/man/man1/fido2-assert.1.gz
+share/man/man1/fido2-cred.1.gz
+share/man/man1/fido2-token.1.gz
+share/man/man3/eddsa_pk_free.3.gz
+share/man/man3/eddsa_pk_from_ptr.3.gz
+share/man/man3/eddsa_pk_new.3.gz
+share/man/man3/eddsa_pk_to_EVP_PKEY.3.gz
+share/man/man3/es256_pk_free.3.gz
+share/man/man3/es256_pk_from_EC_KEY.3.gz
+share/man/man3/es256_pk_from_ptr.3.gz
+share/man/man3/es256_pk_new.3.gz
+share/man/man3/es256_pk_to_EVP_PKEY.3.gz
+share/man/man3/fido_assert_allow_cred.3.gz
+share/man/man3/fido_assert_authdata_len.3.gz
+share/man/man3/fido_assert_authdata_ptr.3.gz
+share/man/man3/fido_assert_clientdata_hash_len.3.gz
+share/man/man3/fido_assert_clientdata_hash_ptr.3.gz
+share/man/man3/fido_assert_count.3.gz
+share/man/man3/fido_assert_free.3.gz
+share/man/man3/fido_assert_hmac_secret_len.3.gz
+share/man/man3/fido_assert_hmac_secret_ptr.3.gz
+share/man/man3/fido_assert_new.3.gz
+share/man/man3/fido_assert_set_authdata.3.gz
+share/man/man3/fido_assert_set_clientdata_hash.3.gz
+share/man/man3/fido_assert_set_count.3.gz
+share/man/man3/fido_assert_set_extensions.3.gz
+share/man/man3/fido_assert_set_hmac_salt.3.gz
+share/man/man3/fido_assert_set_rp.3.gz
+share/man/man3/fido_assert_set_sig.3.gz
+share/man/man3/fido_assert_set_up.3.gz
+share/man/man3/fido_assert_set_uv.3.gz
+share/man/man3/fido_assert_sig_len.3.gz
+share/man/man3/fido_assert_sig_ptr.3.gz
+share/man/man3/fido_assert_sigcount.3.gz
+share/man/man3/fido_assert_user_display_name.3.gz
+share/man/man3/fido_assert_user_icon.3.gz
+share/man/man3/fido_assert_user_id_len.3.gz
+share/man/man3/fido_assert_user_id_ptr.3.gz
+share/man/man3/fido_assert_user_name.3.gz
+share/man/man3/fido_assert_verify.3.gz
+share/man/man3/fido_bio_dev_enroll_begin.3.gz
+share/man/man3/fido_bio_dev_enroll_cancel.3.gz
+share/man/man3/fido_bio_dev_enroll_continue.3.gz
+share/man/man3/fido_bio_dev_enroll_remove.3.gz
+share/man/man3/fido_bio_dev_get_info.3.gz
+share/man/man3/fido_bio_dev_get_template_array.3.gz
+share/man/man3/fido_bio_dev_set_template_name.3.gz
+share/man/man3/fido_bio_enroll_free.3.gz
+share/man/man3/fido_bio_enroll_last_status.3.gz
+share/man/man3/fido_bio_enroll_new.3.gz
+share/man/man3/fido_bio_enroll_remaining_samples.3.gz
+share/man/man3/fido_bio_info_free.3.gz
+share/man/man3/fido_bio_info_max_samples.3.gz
+share/man/man3/fido_bio_info_new.3.gz
+share/man/man3/fido_bio_info_type.3.gz
+share/man/man3/fido_bio_template.3.gz
+share/man/man3/fido_bio_template_array_count.3.gz
+share/man/man3/fido_bio_template_array_free.3.gz
+share/man/man3/fido_bio_template_array_new.3.gz
+share/man/man3/fido_bio_template_free.3.gz
+share/man/man3/fido_bio_template_id_len.3.gz
+share/man/man3/fido_bio_template_id_ptr.3.gz
+share/man/man3/fido_bio_template_name.3.gz
+share/man/man3/fido_bio_template_new.3.gz
+share/man/man3/fido_bio_template_set_id.3.gz
+share/man/man3/fido_bio_template_set_name.3.gz
+share/man/man3/fido_cbor_info_aaguid_len.3.gz
+share/man/man3/fido_cbor_info_aaguid_ptr.3.gz
+share/man/man3/fido_cbor_info_extensions_len.3.gz
+share/man/man3/fido_cbor_info_extensions_ptr.3.gz
+share/man/man3/fido_cbor_info_free.3.gz
+share/man/man3/fido_cbor_info_maxmsgsiz.3.gz
+share/man/man3/fido_cbor_info_new.3.gz
+share/man/man3/fido_cbor_info_options_len.3.gz
+share/man/man3/fido_cbor_info_options_name_ptr.3.gz
+share/man/man3/fido_cbor_info_options_value_ptr.3.gz
+share/man/man3/fido_cbor_info_protocols_len.3.gz
+share/man/man3/fido_cbor_info_protocols_ptr.3.gz
+share/man/man3/fido_cbor_info_versions_len.3.gz
+share/man/man3/fido_cbor_info_versions_ptr.3.gz
+share/man/man3/fido_cred_authdata_len.3.gz
+share/man/man3/fido_cred_authdata_ptr.3.gz
+share/man/man3/fido_cred_clientdata_hash_len.3.gz
+share/man/man3/fido_cred_clientdata_hash_ptr.3.gz
+share/man/man3/fido_cred_exclude.3.gz
+share/man/man3/fido_cred_fmt.3.gz
+share/man/man3/fido_cred_free.3.gz
+share/man/man3/fido_cred_id_len.3.gz
+share/man/man3/fido_cred_id_ptr.3.gz
+share/man/man3/fido_cred_new.3.gz
+share/man/man3/fido_cred_pubkey_len.3.gz
+share/man/man3/fido_cred_pubkey_ptr.3.gz
+share/man/man3/fido_cred_set_authdata.3.gz
+share/man/man3/fido_cred_set_authdata_raw.3.gz
+share/man/man3/fido_cred_set_clientdata_hash.3.gz
+share/man/man3/fido_cred_set_extensions.3.gz
+share/man/man3/fido_cred_set_fmt.3.gz
+share/man/man3/fido_cred_set_rk.3.gz
+share/man/man3/fido_cred_set_rp.3.gz
+share/man/man3/fido_cred_set_sig.3.gz
+share/man/man3/fido_cred_set_type.3.gz
+share/man/man3/fido_cred_set_user.3.gz
+share/man/man3/fido_cred_set_uv.3.gz
+share/man/man3/fido_cred_set_x509.3.gz
+share/man/man3/fido_cred_sig_len.3.gz
+share/man/man3/fido_cred_sig_ptr.3.gz
+share/man/man3/fido_cred_verify.3.gz
+share/man/man3/fido_cred_x5c_len.3.gz
+share/man/man3/fido_cred_x5c_ptr.3.gz
+share/man/man3/fido_credman_del_dev_rk.3.gz
+share/man/man3/fido_credman_get_dev_metadata.3.gz
+share/man/man3/fido_credman_get_dev_rk.3.gz
+share/man/man3/fido_credman_get_dev_rp.3.gz
+share/man/man3/fido_credman_metadata_free.3.gz
+share/man/man3/fido_credman_metadata_new.3.gz
+share/man/man3/fido_credman_rk.3.gz
+share/man/man3/fido_credman_rk_count.3.gz
+share/man/man3/fido_credman_rk_existing.3.gz
+share/man/man3/fido_credman_rk_free.3.gz
+share/man/man3/fido_credman_rk_new.3.gz
+share/man/man3/fido_credman_rk_remaining.3.gz
+share/man/man3/fido_credman_rp_count.3.gz
+share/man/man3/fido_credman_rp_free.3.gz
+share/man/man3/fido_credman_rp_id.3.gz
+share/man/man3/fido_credman_rp_id_hash_len.3.gz
+share/man/man3/fido_credman_rp_id_hash_ptr.3.gz
+share/man/man3/fido_credman_rp_name.3.gz
+share/man/man3/fido_credman_rp_new.3.gz
+share/man/man3/fido_dev_build.3.gz
+share/man/man3/fido_dev_cancel.3.gz
+share/man/man3/fido_dev_close.3.gz
+share/man/man3/fido_dev_flags.3.gz
+share/man/man3/fido_dev_force_fido2.3.gz
+share/man/man3/fido_dev_force_u2f.3.gz
+share/man/man3/fido_dev_free.3.gz
+share/man/man3/fido_dev_get_assert.3.gz
+share/man/man3/fido_dev_get_cbor_info.3.gz
+share/man/man3/fido_dev_get_retry_count.3.gz
+share/man/man3/fido_dev_info_free.3.gz
+share/man/man3/fido_dev_info_manifest.3.gz
+share/man/man3/fido_dev_info_manufacturer_string.3.gz
+share/man/man3/fido_dev_info_new.3.gz
+share/man/man3/fido_dev_info_path.3.gz
+share/man/man3/fido_dev_info_product.3.gz
+share/man/man3/fido_dev_info_product_string.3.gz
+share/man/man3/fido_dev_info_ptr.3.gz
+share/man/man3/fido_dev_info_vendor.3.gz
+share/man/man3/fido_dev_is_fido2.3.gz
+share/man/man3/fido_dev_major.3.gz
+share/man/man3/fido_dev_make_cred.3.gz
+share/man/man3/fido_dev_minor.3.gz
+share/man/man3/fido_dev_new.3.gz
+share/man/man3/fido_dev_open.3.gz
+share/man/man3/fido_dev_protocol.3.gz
+share/man/man3/fido_dev_reset.3.gz
+share/man/man3/fido_dev_set_io_functions.3.gz
+share/man/man3/fido_dev_set_pin.3.gz
+share/man/man3/fido_init.3.gz
+share/man/man3/fido_strerr.3.gz
+share/man/man3/rs256_pk_free.3.gz
+share/man/man3/rs256_pk_from_RSA.3.gz
+share/man/man3/rs256_pk_from_ptr.3.gz
+share/man/man3/rs256_pk_new.3.gz
+share/man/man3/rs256_pk_to_EVP_PKEY.3.gz
diff --git a/security/plasma5-kscreenlocker/distinfo b/security/plasma5-kscreenlocker/distinfo
index 0809b9a8afcc..8f68c47f7bff 100644
--- a/security/plasma5-kscreenlocker/distinfo
+++ b/security/plasma5-kscreenlocker/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1582120736
-SHA256 (KDE/plasma/5.18.1/kscreenlocker-5.18.1.tar.xz) = 4b9d4bbb075aa749f83cc74f520c37aa81b2752db5f74f0a50c80cbc824d72e3
-SIZE (KDE/plasma/5.18.1/kscreenlocker-5.18.1.tar.xz) = 125136
+TIMESTAMP = 1582695465
+SHA256 (KDE/plasma/5.18.2/kscreenlocker-5.18.2.tar.xz) = 691828d4526d707ac38cf1c2782a08d21d34bfdb766cf9d885ee78c9be40cda3
+SIZE (KDE/plasma/5.18.2/kscreenlocker-5.18.2.tar.xz) = 125148
diff --git a/security/plasma5-ksshaskpass/distinfo b/security/plasma5-ksshaskpass/distinfo
index e830f99dbec7..05a890a29b3c 100644
--- a/security/plasma5-ksshaskpass/distinfo
+++ b/security/plasma5-ksshaskpass/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1582120737
-SHA256 (KDE/plasma/5.18.1/ksshaskpass-5.18.1.tar.xz) = dccc4bc93d7691024e77b4217e7fd811b4324437409779412990d5d5425f25a2
-SIZE (KDE/plasma/5.18.1/ksshaskpass-5.18.1.tar.xz) = 22232
+TIMESTAMP = 1582695466
+SHA256 (KDE/plasma/5.18.2/ksshaskpass-5.18.2.tar.xz) = d3456e02a3779e66907459319dffb780e3e780e3bbfdcc686b2dfb7d81caf74f
+SIZE (KDE/plasma/5.18.2/ksshaskpass-5.18.2.tar.xz) = 22204
diff --git a/security/plasma5-kwallet-pam/distinfo b/security/plasma5-kwallet-pam/distinfo
index ce784d61e2ce..d752aa3e0489 100644
--- a/security/plasma5-kwallet-pam/distinfo
+++ b/security/plasma5-kwallet-pam/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1582120737
-SHA256 (KDE/plasma/5.18.1/kwallet-pam-5.18.1.tar.xz) = dafced390651e8c5f9572a9def3cdfbab003a32b1ced2711be31b41ab44d9e11
-SIZE (KDE/plasma/5.18.1/kwallet-pam-5.18.1.tar.xz) = 19836
+TIMESTAMP = 1582695470
+SHA256 (KDE/plasma/5.18.2/kwallet-pam-5.18.2.tar.xz) = ad9396368fe1709e9e8cde5b0c47d665178226e397f265ef0bfe2303298ee57d
+SIZE (KDE/plasma/5.18.2/kwallet-pam-5.18.2.tar.xz) = 19836
diff --git a/security/py-keyring/Makefile b/security/py-keyring/Makefile
index 469a7cf8fd7c..0b6786913d13 100644
--- a/security/py-keyring/Makefile
+++ b/security/py-keyring/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= keyring
-DISTVERSION= 12.0.1
-PORTREVISION= 1
+PORTVERSION= 18.0.1
CATEGORIES= security python
MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
@@ -13,8 +12,8 @@ COMMENT= Store and access your passwords safely
LICENSE= PSFL
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>=1.15.1:devel/py-setuptools_scm@${PY_FLAVOR}
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}entrypoints>=0.2.3:devel/py-entrypoints@${PY_FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>=1.15.0:devel/py-setuptools_scm@${PY_FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}entrypoints>=0:devel/py-entrypoints@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist concurrent distutils
@@ -28,6 +27,6 @@ SECRET_SERVICE_DESC= Install SecretStorage to support the SecretService backend
DBUS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dbus>0:devel/py-dbus@${PY_FLAVOR}
KEYRINGS_ALT_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}keyrings.alt>0:security/py-keyrings.alt@${PY_FLAVOR}
-SECRET_SERVICE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}SecretStorage>=1.0.0:security/py-SecretStorage@${PY_FLAVOR}
+SECRET_SERVICE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}SecretStorage>0:security/py-SecretStorage@${PY_FLAVOR}
.include <bsd.port.mk>
diff --git a/security/py-keyring/distinfo b/security/py-keyring/distinfo
index 61c5858da1f3..91b73d44a89f 100644
--- a/security/py-keyring/distinfo
+++ b/security/py-keyring/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1523172793
-SHA256 (keyring-12.0.1.tar.gz) = 846c9c709ee1203bac5444abec19b5228f4601377686f33cba672aa0ba313abd
-SIZE (keyring-12.0.1.tar.gz) = 41430
+TIMESTAMP = 1581445427
+SHA256 (keyring-18.0.1.tar.gz) = 67d6cc0132bd77922725fae9f18366bb314fd8f95ff4d323a4df41890a96a838
+SIZE (keyring-18.0.1.tar.gz) = 48559
diff --git a/security/rubygem-devise-two-factor30-rails60/Makefile b/security/rubygem-devise-two-factor30-rails60/Makefile
new file mode 100644
index 000000000000..0c633ceac376
--- /dev/null
+++ b/security/rubygem-devise-two-factor30-rails60/Makefile
@@ -0,0 +1,30 @@
+# Created by: Torsten Zuhlsdorff <ports@toco-domains.de>
+# $FreeBSD$
+
+PORTNAME= devise-two-factor
+# 3.0.3 does not work with newer rails version, so downgrade here
+PORTVERSION= 3.0.0
+CATEGORIES= security rubygems
+MASTER_SITES= RG
+PKGNAMESUFFIX= 30-rails60
+
+MAINTAINER= mfechner@FreeBSD.org
+COMMENT= Barebones two-factor authentication with Devise
+
+LICENSE= MIT
+LICENSE_FILE= ${WRKSRC}/LICENSE
+
+RUN_DEPENDS= rubygem-activesupport60>=0:devel/rubygem-activesupport60 \
+ rubygem-attr_encrypted>=1.3<4:security/rubygem-attr_encrypted \
+ rubygem-devise-rails60>=4.0<5:devel/rubygem-devise-rails60 \
+ rubygem-railties60>=0:www/rubygem-railties60 \
+ rubygem-rotp>=2.0:devel/rubygem-rotp
+
+USES= gem
+USE_RUBY= yes
+
+NO_ARCH= yes
+
+PORTSCOUT= limit:^3\.0\.0
+
+.include <bsd.port.mk>
diff --git a/security/rubygem-devise-two-factor30-rails60/distinfo b/security/rubygem-devise-two-factor30-rails60/distinfo
new file mode 100644
index 000000000000..2c8ba61090dc
--- /dev/null
+++ b/security/rubygem-devise-two-factor30-rails60/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1582625078
+SHA256 (rubygem/devise-two-factor-3.0.0.gem) = fa116fcd6e0a94d5a0581e230a9ac286eee8c17299d54e36ad443d5a346f74de
+SIZE (rubygem/devise-two-factor-3.0.0.gem) = 27648
diff --git a/security/rubygem-devise-two-factor30-rails60/files/patch-gemspec b/security/rubygem-devise-two-factor30-rails60/files/patch-gemspec
new file mode 100644
index 000000000000..33b2f7571c11
--- /dev/null
+++ b/security/rubygem-devise-two-factor30-rails60/files/patch-gemspec
@@ -0,0 +1,11 @@
+--- devise-two-factor.gemspec.orig 2016-12-31 23:56:23 UTC
++++ devise-two-factor.gemspec
+@@ -28,7 +28,7 @@ Gem::Specification.new do |s|
+ s.add_runtime_dependency(%q<activesupport>.freeze, [">= 0"])
+ s.add_runtime_dependency(%q<attr_encrypted>.freeze, ["!= 2", "< 4", ">= 1.3"])
+ s.add_runtime_dependency(%q<devise>.freeze, ["~> 4.0"])
+- s.add_runtime_dependency(%q<rotp>.freeze, ["~> 2.0"])
++ s.add_runtime_dependency(%q<rotp>.freeze, [">= 2.0"])
+ s.add_development_dependency(%q<activemodel>.freeze, [">= 0"])
+ s.add_development_dependency(%q<bundler>.freeze, ["> 1.0"])
+ s.add_development_dependency(%q<rspec>.freeze, ["> 3"])
diff --git a/security/rubygem-devise-two-factor30-rails60/pkg-descr b/security/rubygem-devise-two-factor30-rails60/pkg-descr
new file mode 100644
index 000000000000..314c84f06bb5
--- /dev/null
+++ b/security/rubygem-devise-two-factor30-rails60/pkg-descr
@@ -0,0 +1,3 @@
+Barebones two-factor authentication with Devise
+
+WWW: https://github.com/tinfoil/devise-two-factor
diff --git a/security/rubygem-doorkeeper-openid_connect/Makefile b/security/rubygem-doorkeeper-openid_connect/Makefile
index 9d31d172b92b..f76d011a0688 100644
--- a/security/rubygem-doorkeeper-openid_connect/Makefile
+++ b/security/rubygem-doorkeeper-openid_connect/Makefile
@@ -1,8 +1,8 @@
# $FreeBSD$
PORTNAME= doorkeeper-openid_connect
-PORTVERSION= 1.5.3
-PORTREVISION= 1
+PORTVERSION= 1.6.3
+PORTREVISION= 0
CATEGORIES= security rubygems
MASTER_SITES= RG
@@ -12,8 +12,8 @@ COMMENT= OpenID Connect extension for Doorkeeper
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE.txt
-RUN_DEPENDS= rubygem-doorkeeper43>=4.3:security/rubygem-doorkeeper43 \
- rubygem-json-jwt>=1.6:www/rubygem-json-jwt
+RUN_DEPENDS= rubygem-doorkeeper>=5.0<5.2:security/rubygem-doorkeeper \
+ rubygem-json-jwt>=1.6<2:www/rubygem-json-jwt
USES= gem
USE_RUBY= yes
diff --git a/security/rubygem-doorkeeper-openid_connect/distinfo b/security/rubygem-doorkeeper-openid_connect/distinfo
index 77c884f30da8..f9233c2f7a76 100644
--- a/security/rubygem-doorkeeper-openid_connect/distinfo
+++ b/security/rubygem-doorkeeper-openid_connect/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1547983049
-SHA256 (rubygem/doorkeeper-openid_connect-1.5.3.gem) = df1f9b2c6181e7c265794d96db87ea371d27d9eb9ca055314c09957b7cc13ffa
-SIZE (rubygem/doorkeeper-openid_connect-1.5.3.gem) = 22528
+TIMESTAMP = 1582614151
+SHA256 (rubygem/doorkeeper-openid_connect-1.6.3.gem) = dc7911190b0c6e5be38b13eb20442455a197c2e6589f160b891aacc45b0894e1
+SIZE (rubygem/doorkeeper-openid_connect-1.6.3.gem) = 23552
diff --git a/security/rubygem-doorkeeper/Makefile b/security/rubygem-doorkeeper/Makefile
index 294241f3ec65..0d56705a1459 100644
--- a/security/rubygem-doorkeeper/Makefile
+++ b/security/rubygem-doorkeeper/Makefile
@@ -2,6 +2,7 @@
PORTNAME= doorkeeper
PORTVERSION= 5.0.2
+PORTREVISION= 1
CATEGORIES= security rubygems
MASTER_SITES= RG
@@ -11,7 +12,7 @@ COMMENT= Doorkeeper is an OAuth 2 provider for Rails and Grape
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/MIT-LICENSE
-RUN_DEPENDS= rubygem-railties4>=4.2:www/rubygem-railties4
+RUN_DEPENDS= rubygem-railties60>=4.2:www/rubygem-railties60
USES= gem
USE_RUBY= yes
diff --git a/security/rubygem-doorkeeper43/Makefile b/security/rubygem-doorkeeper43/Makefile
deleted file mode 100644
index f29e558ce3d8..000000000000
--- a/security/rubygem-doorkeeper43/Makefile
+++ /dev/null
@@ -1,25 +0,0 @@
-# $FreeBSD$
-
-PORTNAME= doorkeeper
-PORTVERSION= 4.3.2
-PORTREVISION= 3
-CATEGORIES= security rubygems
-MASTER_SITES= RG
-PKGNAMESUFFIX= 43
-
-MAINTAINER= mfechner@FreeBSD.org
-COMMENT= Doorkeeper is an OAuth 2 provider for Rails and Grape
-
-LICENSE= MIT
-LICENSE_FILE= ${WRKSRC}/MIT-LICENSE
-
-RUN_DEPENDS= rubygem-railties52>=4.2:www/rubygem-railties52
-
-USES= gem
-USE_RUBY= yes
-
-NO_ARCH= yes
-
-PORTSCOUT= limit:^4\.3\.
-
-.include <bsd.port.mk>
diff --git a/security/rubygem-doorkeeper43/distinfo b/security/rubygem-doorkeeper43/distinfo
deleted file mode 100644
index b617d83aded6..000000000000
--- a/security/rubygem-doorkeeper43/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1522398991
-SHA256 (rubygem/doorkeeper-4.3.2.gem) = 3f9fa31a499bbae1f5228a78484cfe816dbaa391f47790eba6628181e2005908
-SIZE (rubygem/doorkeeper-4.3.2.gem) = 117760
diff --git a/security/rubygem-doorkeeper43/pkg-descr b/security/rubygem-doorkeeper43/pkg-descr
deleted file mode 100644
index 05c77e09e5d2..000000000000
--- a/security/rubygem-doorkeeper43/pkg-descr
+++ /dev/null
@@ -1,4 +0,0 @@
-Doorkeeper is a Ruby gem that makes it easy to introduce OAuth 2
-provider functionality to a Rails or Grape application.
-
-WWW: https://github.com/doorkeeper-gem/doorkeeper
diff --git a/security/rubygem-googleauth/Makefile b/security/rubygem-googleauth/Makefile
index f95a806a5522..8100ca5c4c73 100644
--- a/security/rubygem-googleauth/Makefile
+++ b/security/rubygem-googleauth/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= googleauth
-PORTVERSION= 0.10.0
+PORTVERSION= 0.11.0
CATEGORIES= security rubygems
MASTER_SITES= RG
@@ -12,7 +12,7 @@ COMMENT= Google Auth Library for Ruby
LICENSE= APACHE20
LICENSE_FILE= ${WRKSRC}/COPYING
-RUN_DEPENDS= rubygem-faraday>=0.12<1:www/rubygem-faraday \
+RUN_DEPENDS= rubygem-faraday>=0.17.3<2.0:www/rubygem-faraday \
rubygem-jwt>=1.4<3.0:www/rubygem-jwt \
rubygem-memoist>=0.16<1:devel/rubygem-memoist \
rubygem-multi_json>=1.11<2:devel/rubygem-multi_json \
diff --git a/security/rubygem-googleauth/distinfo b/security/rubygem-googleauth/distinfo
index 5fabd5269bb6..2d356a101967 100644
--- a/security/rubygem-googleauth/distinfo
+++ b/security/rubygem-googleauth/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1572437490
-SHA256 (rubygem/googleauth-0.10.0.gem) = 3c0ee9f2dca7bfc162ea6a87ec596362f515cc1be470e0473faf587a0280d3b6
-SIZE (rubygem/googleauth-0.10.0.gem) = 50176
+TIMESTAMP = 1582642175
+SHA256 (rubygem/googleauth-0.11.0.gem) = 6936f287cdd00841d7b455dd70c110403daef43193b0cd33bd1c503f2535185d
+SIZE (rubygem/googleauth-0.11.0.gem) = 52224
diff --git a/security/rubygem-signet/Makefile b/security/rubygem-signet/Makefile
index 15616697557a..e93397294a45 100644
--- a/security/rubygem-signet/Makefile
+++ b/security/rubygem-signet/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= signet
-PORTVERSION= 0.12.0
+PORTVERSION= 0.13.0
CATEGORIES= security rubygems
MASTER_SITES= RG
@@ -13,7 +13,7 @@ LICENSE= APACHE20
LICENSE_FILE= ${WRKSRC}/LICENSE
RUN_DEPENDS= rubygem-addressable>=2.3<3:www/rubygem-addressable \
- rubygem-faraday>=0.9<1:www/rubygem-faraday \
+ rubygem-faraday>=0.17.3<2.0:www/rubygem-faraday \
rubygem-jwt>=1.5<3.0:www/rubygem-jwt \
rubygem-multi_json>=1.10<2:devel/rubygem-multi_json
diff --git a/security/rubygem-signet/distinfo b/security/rubygem-signet/distinfo
index 7ed6e3e1dc32..265d6c57f21b 100644
--- a/security/rubygem-signet/distinfo
+++ b/security/rubygem-signet/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1571484017
-SHA256 (rubygem/signet-0.12.0.gem) = adf182e6ccd71e87bacfadb835f3b031490c6f1bfbbd7964c9b7e7e724cd0bd5
-SIZE (rubygem/signet-0.12.0.gem) = 58880
+TIMESTAMP = 1582642177
+SHA256 (rubygem/signet-0.13.0.gem) = 980bd382798240c80c80409a4fbff894e1e4e87d6d9c8b769af42648f0acb76b
+SIZE (rubygem/signet-0.13.0.gem) = 58880
diff --git a/security/suricata/Makefile b/security/suricata/Makefile
index dc1f47bd3f50..fa62306f7b51 100644
--- a/security/suricata/Makefile
+++ b/security/suricata/Makefile
@@ -3,6 +3,7 @@
PORTNAME= suricata
DISTVERSION= 5.0.2
+PORTREVISION= 1
CATEGORIES= security
MASTER_SITES= https://www.openinfosecfoundation.org/download/
diff --git a/security/suricata5/Makefile b/security/suricata5/Makefile
index a346e2d78155..d77922b9fe9e 100644
--- a/security/suricata5/Makefile
+++ b/security/suricata5/Makefile
@@ -3,7 +3,7 @@
PORTNAME= suricata
DISTVERSION= 5.0.0-rc1
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= security
MASTER_SITES= https://www.openinfosecfoundation.org/download/
PKGNAMESUFFIX= 5
diff --git a/security/vuxml/vuln.xml b/security/vuxml/vuln.xml
index c9abd15bbe9c..08c269c499b2 100644
--- a/security/vuxml/vuln.xml
+++ b/security/vuxml/vuln.xml
@@ -58,59 +58,39 @@ Notes:
* Do not forget port variants (linux-f10-libxml2, libxml2, etc.)
-->
<vuxml xmlns="http://www.vuxml.org/apps/vuxml-1">
- <vuln vid="40c75597-574a-11ea-bff8-c85b76ce9b5a">
+ <vuln vid="f0683976-5779-11ea-8a77-1c872ccb1e42">
<topic>OpenSMTPd -- LPE and RCE in OpenSMTPD's default install</topic>
<affects>
<package>
<name>opensmtpd</name>
- <range><lt>6.6.5,1</lt></range>
- </package>
- </affects>
- <description>
- <body xmlns="http://www.w3.org/1999/xhtml">
- <p>Qualys reports:</p>
- <blockquote cite="https://www.openwall.com/lists/oss-security/2020/02/24/5">
- <p>.</p>
- </blockquote>
- </body>
- </description>
- <references>
- <url>https://www.openwall.com/lists/oss-security/2020/02/24/5</url>
- <cvename>CVE-2020-8794</cvename>
- </references>
- <dates>
- <discovery>2020-02-24</discovery>
- <entry>2020-02-24</entry>
- </dates>
- </vuln>
-
- <vuln vid="76f1ce19-5749-11ea-bff8-c85b76ce9b5a">
- <topic>OpenSMTPd -- Local information disclosure</topic>
- <affects>
- <package>
- <name>opensmtpd</name>
<range><lt>6.6.4,1</lt></range>
</package>
</affects>
<description>
<body xmlns="http://www.w3.org/1999/xhtml">
- <p>Qualys reports:</p>
- <blockquote cite="https://www.openwall.com/lists/oss-security/2020/02/24/4">
- <p>We discovered a minor vulnerability in OpenSMTPD, OpenBSD's mail server:
-an unprivileged local attacker can read the first line of an arbitrary
-file (for example, root's password hash in /etc/master.passwd) or the
-entire contents of another user's file (if this file and
-/var/spool/smtpd/ are on the same filesystem).</p>
+ <p>OpenSMTPD developers reports:</p>
+ <blockquote cite="https://opensmtpd.org/security.html">
+ <p>An out of bounds read in smtpd allows an attacker to inject arbitrary
+ commands into the envelope file which are then executed as root.
+ Separately, missing privilege revocation in smtpctl allows arbitrary
+ commands to be run with the _smtpq group.</p>
+ <p>An unprivileged local attacker can read the first line of an arbitrary
+ file (for example, root's password hash in /etc/master.passwd) or the
+ entire contents of another user's file (if this file and
+ /var/spool/smtpd/ are on the same filesystem).</p>
</blockquote>
</body>
</description>
<references>
- <url>https://www.openwall.com/lists/oss-security/2020/02/24/4</url>
<cvename>CVE-2020-8793</cvename>
+ <url>https://www.openwall.com/lists/oss-security/2020/02/24/4</url>
+ <cvename>CVE-2020-8794</cvename>
+ <url>https://www.openwall.com/lists/oss-security/2020/02/24/5</url>
</references>
<dates>
- <discovery>2020-02-24</discovery>
+ <discovery>2020-02-22</discovery>
<entry>2020-02-24</entry>
+ <modified>2020-02-27</modified>
</dates>
</vuln>