CVS commit: pkgsrc/security/olm

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Thu Nov 30 06:08:51 UTC 2023

Modified Files:
        pkgsrc/security/olm: Makefile distinfo
Added Files:
        pkgsrc/security/olm/patches: patch-CMakeLists.txt

Log Message:
olm: updated to 3.2.16

Changes in `3.2.16 <https://gitlab.matrix.org/matrix-org/olm/tags/3.2.16>`_
===========================================================================

This release includes the following changes since 3.2.15:

* Fix and modernize the Python packaging (thanks to Alfred Wingate)

Changes in `3.2.15 <https://gitlab.matrix.org/matrix-org/olm/tags/3.2.15>`_
===========================================================================

This release includes the following changes since 3.2.14:

* Improvements to Python packaging
  * No longer depend on ``future`` since Python 2 is no longer supported.
  * Improve compatibility with tox 4.
  * Add support for making standalone sdist.
* Improvements to Nix flake (Thanks to Jon Ringer)
  * Improve structure.
  * Enable Darwin builds.
* Typescript type fix.

Changes in `3.2.14 <https://gitlab.matrix.org/matrix-org/olm/tags/3.2.14>`_
===========================================================================

This release includes the following changes since 3.2.13:

* TypeScript type improvements.
* Improvements to Python packaging
* Documentation improvements.

Changes in `3.2.13 <https://gitlab.matrix.org/matrix-org/olm/tags/3.2.13>`_
===========================================================================

This release includes the following changes since 3.2.12:

* Fix compilation with newer versions of emscripten.
  * The npm package is compiled with emscripten 3.1.17 to fix compatibility with
    node 18.
* Add py.typed to Python wheels.
* Some documentation fixes and updates.
* Improve the pkgconfig file.

Changes in `3.2.12 <https://gitlab.matrix.org/matrix-org/olm/tags/3.2.12>`_
===========================================================================

This release includes the following changes since 3.2.11:

* Expose olm_sas_calculate_mac_fixed_base64 in the bindings.
* Allow memory to grow in wasm.  Thanks to benkuly for the suggestion.
* Fix Python type hints.
* Some Python build fixes.
* Initial work on a Nix flake for building and testing.

Changes in `3.2.11 <https://gitlab.matrix.org/matrix-org/olm/tags/3.2.11>`_
===========================================================================

This release includes the following changes since 3.2.10:

* Fix building documentation.  Thanks to Jonas Smedegaard.  The documents
  written in Markdown are now converted to HTML using Pandoc.
* Add methods for getting unpublished fallback key in Objective-C binding.
* Add public pickle/unpickle methods to Java binding.
* Add wrapper for olm_session_describe to Java binding.  Thanks to Alex Baker.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 pkgsrc/security/olm/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/security/olm/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/security/olm/patches/patch-CMakeLists.txt

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/security/olm/Makefile
diff -u pkgsrc/security/olm/Makefile:1.4 pkgsrc/security/olm/Makefile:1.5
--- pkgsrc/security/olm/Makefile:1.4    Mon Jul 25 11:12:28 2022
+++ pkgsrc/security/olm/Makefile        Thu Nov 30 06:08:51 2023
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2022/07/25 11:12:28 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2023/11/30 06:08:51 adam Exp $
 
-DISTNAME=      olm-3.2.10
+DISTNAME=      olm-3.2.16
 CATEGORIES=    security
-MASTER_SITES=  https://gitlab.matrix.org/matrix-org/olm/-/archive/3.2.10/
+MASTER_SITES=  https://gitlab.matrix.org/matrix-org/olm/-/archive/${PKGVERSION_NOREV}/
 EXTRACT_SUFX=  .tar.bz2
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
@@ -10,10 +10,10 @@ HOMEPAGE=   https://gitlab.matrix.org/matr
 COMMENT=       Implementation of the Double Ratchet cryptographic ratchet
 LICENSE=       apache-2.0
 
-USE_CMAKE=     yes
 USE_LANGUAGES= c c++
 USE_TOOLS+=    gmake
 
 PKGCONFIG_OVERRIDE+=   olm.pc.in
 
+.include "../../devel/cmake/build.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/security/olm/distinfo
diff -u pkgsrc/security/olm/distinfo:1.6 pkgsrc/security/olm/distinfo:1.7
--- pkgsrc/security/olm/distinfo:1.6    Mon Apr 25 13:58:46 2022
+++ pkgsrc/security/olm/distinfo        Thu Nov 30 06:08:51 2023
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.6 2022/04/25 13:58:46 tnn Exp $
+$NetBSD: distinfo,v 1.7 2023/11/30 06:08:51 adam Exp $
 
-BLAKE2s (olm-3.2.10.tar.bz2) = 84c6a275ef0dda8371152f198ea0559d2531f51509a152223b148698d1b722c8
-SHA512 (olm-3.2.10.tar.bz2) = 127a81f8585550fb59b922e656b877251fbc96b5b61629a9faaf10b82c88c28f5036de815803c654d9d82c436c75e11dd3b96c6a6cb14d4ae686b24ce3dcff94
-Size (olm-3.2.10.tar.bz2) = 2733952 bytes
+BLAKE2s (olm-3.2.16.tar.bz2) = 137b52fb94d123d1fcc89408b8da1d58e701df76018bdc47b267130405eedcc3
+SHA512 (olm-3.2.16.tar.bz2) = 504ddc91297e7aef99e9b25f73b33bac29716ca33eb333bf1217b719d8862438e2cdaadd88cef3dc84e9f618bcc9eeeaf7e513f2d6909cc4a3d98a5dd79b0581
+Size (olm-3.2.16.tar.bz2) = 2744360 bytes
+SHA1 (patch-CMakeLists.txt) = 6fb95f572476546346ce3e3739185840ffb51dd2
 SHA1 (patch-tests_include_doctest.h) = d0da2f52ce14c454bc644e37fae238fab79e1c10

Added files:

Index: pkgsrc/security/olm/patches/patch-CMakeLists.txt
diff -u /dev/null pkgsrc/security/olm/patches/patch-CMakeLists.txt:1.1
--- /dev/null   Thu Nov 30 06:08:51 2023
+++ pkgsrc/security/olm/patches/patch-CMakeLists.txt    Thu Nov 30 06:08:51 2023
@@ -0,0 +1,15 @@
+$NetBSD: patch-CMakeLists.txt,v 1.1 2023/11/30 06:08:51 adam Exp $
+
+Install pkg-config file also on Darwin.
+
+--- CMakeLists.txt.orig        2023-11-30 06:06:35.518160276 +0000
++++ CMakeLists.txt
+@@ -101,7 +101,7 @@ install(FILES
+     ${CMAKE_CURRENT_SOURCE_DIR}/include/olm/error.h
+     DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/olm)
+ 
+-if (UNIX AND NOT APPLE)
++if (UNIX)
+     install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.pc
+             DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig
+     )