Merge remote-tracking branch 'origin/3.6' into 3.7

3 files changed, 45 insertions, 12 deletions

diff --git a/python3-olm/.footprint b/python3-olm/.footprint
index 0ca9d914b..56e7bf205 100644
--- a/python3-olm/.footprint
+++ b/python3-olm/.footprint
@@ -2,10 +2,43 @@ drwxr-xr-x	root/root	usr/
 drwxr-xr-x	root/root	usr/lib/
 drwxr-xr-x	root/root	usr/lib/python3.10/
 drwxr-xr-x	root/root	usr/lib/python3.10/site-packages/
-drwxr-xr-x	root/root	usr/lib/python3.10/site-packages/python_olm-3.2.11-py3.10.egg-info/
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/python_olm-3.2.11-py3.10.egg-info/PKG-INFO
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/python_olm-3.2.11-py3.10.egg-info/SOURCES.txt
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/python_olm-3.2.11-py3.10.egg-info/dependency_links.txt
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/python_olm-3.2.11-py3.10.egg-info/not-zip-safe
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/python_olm-3.2.11-py3.10.egg-info/requires.txt
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/python_olm-3.2.11-py3.10.egg-info/top_level.txt
+-rwxr-xr-x	root/root	usr/lib/python3.10/site-packages/_libolm.abi3.so
+drwxr-xr-x	root/root	usr/lib/python3.10/site-packages/olm/
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/olm/__init__.py
+drwxr-xr-x	root/root	usr/lib/python3.10/site-packages/olm/__pycache__/
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/olm/__pycache__/__init__.cpython-310.opt-1.pyc
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/olm/__pycache__/__init__.cpython-310.pyc
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/olm/__pycache__/__version__.cpython-310.opt-1.pyc
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/olm/__pycache__/__version__.cpython-310.pyc
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/olm/__pycache__/_compat.cpython-310.opt-1.pyc
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/olm/__pycache__/_compat.cpython-310.pyc
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/olm/__pycache__/_finalize.cpython-310.opt-1.pyc
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/olm/__pycache__/_finalize.cpython-310.pyc
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/olm/__pycache__/account.cpython-310.opt-1.pyc
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/olm/__pycache__/account.cpython-310.pyc
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/olm/__pycache__/group_session.cpython-310.opt-1.pyc
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/olm/__pycache__/group_session.cpython-310.pyc
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/olm/__pycache__/pk.cpython-310.opt-1.pyc
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/olm/__pycache__/pk.cpython-310.pyc
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/olm/__pycache__/sas.cpython-310.opt-1.pyc
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/olm/__pycache__/sas.cpython-310.pyc
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/olm/__pycache__/session.cpython-310.opt-1.pyc
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/olm/__pycache__/session.cpython-310.pyc
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/olm/__pycache__/utility.cpython-310.opt-1.pyc
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/olm/__pycache__/utility.cpython-310.pyc
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/olm/__version__.py
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/olm/_compat.py
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/olm/_finalize.py
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/olm/account.py
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/olm/group_session.py
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/olm/pk.py
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/olm/sas.py
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/olm/session.py
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/olm/utility.py
+drwxr-xr-x	root/root	usr/lib/python3.10/site-packages/python_olm-3.2.12-py3.10.egg-info/
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/python_olm-3.2.12-py3.10.egg-info/PKG-INFO
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/python_olm-3.2.12-py3.10.egg-info/SOURCES.txt
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/python_olm-3.2.12-py3.10.egg-info/dependency_links.txt
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/python_olm-3.2.12-py3.10.egg-info/not-zip-safe
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/python_olm-3.2.12-py3.10.egg-info/requires.txt
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/python_olm-3.2.12-py3.10.egg-info/top_level.txt
diff --git a/python3-olm/.signature b/python3-olm/.signature
index 166d3fd53..87288d1c1 100644
--- a/python3-olm/.signature
+++ b/python3-olm/.signature
@@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF395s1Y89pXAO1SeBC7/e0u0iHka/V7m9qaHNEHRianaYj0jmneldVIUXBd8gLojqgzFL5VoUSD3at2AR3RSYtw8=
-SHA256 (Pkgfile) = 1a1793bcb7fac7e4c9e05c21ee7b42f2ca9b8e53fa47ae7784827e241171c3fa
-SHA256 (.footprint) = 0d367d50cab93f7c72e5f019b292d927e03bba8da4f8294a28ffea22418e0275
-SHA256 (olm-3.2.11.tar.bz2) = 648f8d6cc9cf9c3678ad8a6ca4c095928495d1ea22fc928869da85d5abd2191b
+RWSagIOpLGJF37h1LKuJGeu2NAgmD5zdKeV33lUfOTHiglqxaFI8lLabQMRPGVh06z0LXCwLSkmWOp3RurNlMDT0/sOo4il7ggE=
+SHA256 (Pkgfile) = 2172acb05b8a80c465e6f2e42771c0b2264e062a5cea51fdbcc52fb346181925
+SHA256 (.footprint) = 9152ab26ef14fe4b6c91411bed493e9d2e4e4edb7c0e9d590affa54555e4175b
+SHA256 (olm-3.2.12.tar.bz2) = 22b86f5387c3efc93d5298372a5c1d82dcff7e918b819c3017727451c895c9e9
diff --git a/python3-olm/Pkgfile b/python3-olm/Pkgfile
index fae1acc53..e707d02df 100644
--- a/python3-olm/Pkgfile
+++ b/python3-olm/Pkgfile
@@ -4,7 +4,7 @@
 # Depends on: libolm python3-cffi python3-future
 
 name=python3-olm
-version=3.2.11
+version=3.2.12
 release=1
 source=(https://gitlab.matrix.org/matrix-org/olm/-/archive/$version/olm-$version.tar.bz2)