Date: Thu, 28 Oct 2021 19:57:49 GMT From: Adriaan de Groot <adridg@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 13ead839e671 - main - security/olm: Update to 3.2.6, latest release Message-ID: <202110281957.19SJvn7g062596@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by adridg: URL: https://cgit.FreeBSD.org/ports/commit/?id=13ead839e6716813647a56671c18021099467edf commit 13ead839e6716813647a56671c18021099467edf Author: Adriaan de Groot <adridg@FreeBSD.org> AuthorDate: 2021-10-28 18:00:57 +0000 Commit: Adriaan de Groot <adridg@FreeBSD.org> CommitDate: 2021-10-28 19:57:43 +0000 security/olm: Update to 3.2.6, latest release It looks like I do not have the right bits for portscout here, so didn't get notifications of new versions. Release notes are at: https://gitlab.matrix.org/matrix-org/olm/-/releases#3.2.6 There are many updates. Dependent ports mtxclient (needed a compile- patch) and nheko bumped so they pick this up. --- net-im/mtxclient/Makefile | 1 + net-im/mtxclient/distinfo | 2 +- net-im/mtxclient/files/patch-lib_crypto_client.cpp | 21 +++++++++++++++++++++ net-im/nheko/Makefile | 2 +- security/olm/Makefile | 2 +- security/olm/distinfo | 6 +++--- security/olm/pkg-plist | 5 ++++- 7 files changed, 32 insertions(+), 7 deletions(-) diff --git a/net-im/mtxclient/Makefile b/net-im/mtxclient/Makefile index 635dab7e6c8f..80018d91262a 100644 --- a/net-im/mtxclient/Makefile +++ b/net-im/mtxclient/Makefile @@ -1,6 +1,7 @@ PORTNAME= mtxclient DISTVERSIONPREFIX= v DISTVERSION= 0.5.1 +PORTREVISION= 1 CATEGORIES= net-im MAINTAINER= adridg@FreeBSD.org diff --git a/net-im/mtxclient/distinfo b/net-im/mtxclient/distinfo index 7bbb4be17881..25b6be0ad72a 100644 --- a/net-im/mtxclient/distinfo +++ b/net-im/mtxclient/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1619104012 +TIMESTAMP = 1635443137 SHA256 (Nheko-Reborn-mtxclient-v0.5.1_GH0.tar.gz) = 9478d870296ebe7679c90f563cb798eb3cdd3f9c4578ceea5af75b66f456baaa SIZE (Nheko-Reborn-mtxclient-v0.5.1_GH0.tar.gz) = 582367 diff --git a/net-im/mtxclient/files/patch-lib_crypto_client.cpp b/net-im/mtxclient/files/patch-lib_crypto_client.cpp new file mode 100644 index 000000000000..83412307b762 --- /dev/null +++ b/net-im/mtxclient/files/patch-lib_crypto_client.cpp @@ -0,0 +1,21 @@ +--- lib/crypto/client.cpp.orig 2021-10-28 17:44:28 UTC ++++ lib/crypto/client.cpp +@@ -37,15 +37,15 @@ static const std::array olmErrorStrings{ + + }; + +-OlmErrorCode ++mtx::crypto::OlmErrorCode + olm_exception::ec_from_string(std::string_view error) + { + for (size_t i = 0; i < olmErrorStrings.size(); i++) { + if (olmErrorStrings[i] == error) +- return static_cast<OlmErrorCode>(i); ++ return static_cast<mtx::crypto::OlmErrorCode>(i); + } + +- return OlmErrorCode::UNKNOWN_ERROR; ++ return mtx::crypto::OlmErrorCode::UNKNOWN_ERROR; + } + + void diff --git a/net-im/nheko/Makefile b/net-im/nheko/Makefile index 06a7c0d0cf2e..4e0892baef42 100644 --- a/net-im/nheko/Makefile +++ b/net-im/nheko/Makefile @@ -1,7 +1,7 @@ PORTNAME= nheko DISTVERSIONPREFIX=v DISTVERSION= 0.8.2 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= net-im MAINTAINER= adridg@FreeBSD.org diff --git a/security/olm/Makefile b/security/olm/Makefile index f72e47e787d2..5d67f6577409 100644 --- a/security/olm/Makefile +++ b/security/olm/Makefile @@ -1,6 +1,6 @@ PORTNAME= olm DISTVERSIONPREFIX= -DISTVERSION= 3.1.4 +DISTVERSION= 3.2.6 CATEGORIES= security MASTER_SITES= https://gitlab.matrix.org/matrix-org/olm/-/archive/${DISTVERSION}/ diff --git a/security/olm/distinfo b/security/olm/distinfo index a94f4d273fa8..2d9b8fcc82d6 100644 --- a/security/olm/distinfo +++ b/security/olm/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1577724894 -SHA256 (olm-3.1.4.tar.bz2) = eff513cff8e5c7af657e800a2c2dbbdee5be19ee9ce24c5498a2528c4b5f1dc3 -SIZE (olm-3.1.4.tar.bz2) = 461540 +TIMESTAMP = 1635287119 +SHA256 (olm-3.2.6.tar.bz2) = dcec66507378a1f58fa87a9c4dd5d4d92a830a51ce2dcfd9792871ec25a81197 +SIZE (olm-3.2.6.tar.bz2) = 485416 diff --git a/security/olm/pkg-plist b/security/olm/pkg-plist index d300b55d4686..ded79e0cab61 100644 --- a/security/olm/pkg-plist +++ b/security/olm/pkg-plist @@ -1,5 +1,7 @@ include/olm/inbound_group_session.h +include/olm/error.h include/olm/olm.h +include/olm/olm_export.h include/olm/outbound_group_session.h include/olm/pk.h include/olm/sas.h @@ -9,4 +11,5 @@ lib/cmake/Olm/OlmTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/Olm/OlmTargets.cmake lib/libolm.so lib/libolm.so.3 -lib/libolm.so.3.1.4 +lib/libolm.so.3.2.6 +libdata/pkgconfig/olm.pc
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202110281957.19SJvn7g062596>