Re: [PR PATCH] [Updated] New package: maubot-0.2.0

[TinfoilSubmarine <TinfoilSubmarine@users.noreply.github.com>]

[-- Attachment #1: Type: text/plain, Size: 1218 bytes --]

There is an updated pull request by TinfoilSubmarine against master on the void-packages repository

https://github.com/TinfoilSubmarine/void-packages maubot
https://github.com/void-linux/void-packages/pull/34342

New package: maubot-0.2.0
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**


#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**


<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!-- 
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/34342.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-maubot-34342.patch --]
[-- Type: text/x-diff, Size: 8996 bytes --]

From 3c0121e4df19507e5104ac175d0411f1f5c91954 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Wed, 13 Oct 2021 11:13:45 -0400
Subject: [PATCH 1/3] New package: python3-mautrix-0.12.5

---
 srcpkgs/python3-mautrix/template | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 srcpkgs/python3-mautrix/template

diff --git a/srcpkgs/python3-mautrix/template b/srcpkgs/python3-mautrix/template
new file mode 100644
index 000000000000..4c71f36d7b05
--- /dev/null
+++ b/srcpkgs/python3-mautrix/template
@@ -0,0 +1,16 @@
+# Template file for 'python3-mautrix'
+pkgname=python3-mautrix
+version=0.12.5
+revision=1
+wrksrc="mautrix-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-aiohttp python3-attrs python3-yarl"
+short_desc="Python 3 asyncio Matrix framework"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="MPL-2.0"
+homepage="https://github.com/mautrix/python"
+distfiles="${PYPI_SITE}/m/mautrix/mautrix-${version}.tar.gz"
+checksum=f7095cc4e5aa85043416fbfc5ca3e03c46800dcebfe3ac1d502e520197cea1ee
+# tests require unpackaged python modules aiosqlite and asyncpg
+make_check=no

From 795e82b3064fa3ce3ad0da9f24c10f53453a25c5 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 12 Oct 2021 13:34:46 -0400
Subject: [PATCH 2/3] New package: python3-questionary-1.10.0

---
 srcpkgs/python3-questionary/template | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 srcpkgs/python3-questionary/template

diff --git a/srcpkgs/python3-questionary/template b/srcpkgs/python3-questionary/template
new file mode 100644
index 000000000000..9e38f9962a06
--- /dev/null
+++ b/srcpkgs/python3-questionary/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-questionary'
+pkgname=python3-questionary
+version=1.10.0
+revision=1
+wrksrc="questionary-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-prompt_toolkit"
+short_desc="Python library to build pretty command line user prompts"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="MIT"
+homepage="https://github.com/tmbo/questionary"
+distfiles="${PYPI_SITE}/q/questionary/questionary-${version}.tar.gz"
+checksum=600d3aefecce26d48d97eee936fdb66e4bc27f934c3ab6dd1e292c4f43946d90
+make_check=no # tests not updated to support Python 3.10 yet
+
+post_install() {
+	vlicense LICENSE
+}

From 7bbbe1c1e42a4afea674abf7c81c36f1f956f0aa Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Mon, 11 Oct 2021 20:04:57 -0400
Subject: [PATCH 3/3] New package: maubot-0.2.0

---
 srcpkgs/maubot/INSTALL                      |  5 +++
 srcpkgs/maubot/files/maubot/log/run         |  1 +
 srcpkgs/maubot/files/maubot/run             |  7 ++++
 srcpkgs/maubot/patches/alembic-config.patch | 13 ++++++
 srcpkgs/maubot/patches/entry_point.patch    | 12 ++++++
 srcpkgs/maubot/patches/maubot-config.patch  | 42 +++++++++++++++++++
 srcpkgs/maubot/template                     | 46 +++++++++++++++++++++
 7 files changed, 126 insertions(+)
 create mode 100644 srcpkgs/maubot/INSTALL
 create mode 120000 srcpkgs/maubot/files/maubot/log/run
 create mode 100755 srcpkgs/maubot/files/maubot/run
 create mode 100644 srcpkgs/maubot/patches/alembic-config.patch
 create mode 100644 srcpkgs/maubot/patches/entry_point.patch
 create mode 100644 srcpkgs/maubot/patches/maubot-config.patch
 create mode 100644 srcpkgs/maubot/template

diff --git a/srcpkgs/maubot/INSTALL b/srcpkgs/maubot/INSTALL
new file mode 100644
index 000000000000..d25382425381
--- /dev/null
+++ b/srcpkgs/maubot/INSTALL
@@ -0,0 +1,5 @@
+case "${ACTION}" in
+post)
+	chown _maubot:_maubot etc/maubot/config.yaml
+	;;
+esac
diff --git a/srcpkgs/maubot/files/maubot/log/run b/srcpkgs/maubot/files/maubot/log/run
new file mode 120000
index 000000000000..3a5b4a586051
--- /dev/null
+++ b/srcpkgs/maubot/files/maubot/log/run
@@ -0,0 +1 @@
+/usr/bin/vlogger
\ No newline at end of file
diff --git a/srcpkgs/maubot/files/maubot/run b/srcpkgs/maubot/files/maubot/run
new file mode 100755
index 000000000000..ff890facc6fa
--- /dev/null
+++ b/srcpkgs/maubot/files/maubot/run
@@ -0,0 +1,7 @@
+#!/bin/sh
+exec 2>&1
+chpst -u _maubot:_maubot /usr/bin/alembic -x config=/etc/maubot/config.yaml \
+	-c /usr/share/maubot/alembic.ini upgrade head
+exec chpst -u _maubot:_maubot /usr/bin/maubot \
+	-c /etc/maubot/config.yaml \
+	-b /usr/share/maubot/example-config.yaml
diff --git a/srcpkgs/maubot/patches/alembic-config.patch b/srcpkgs/maubot/patches/alembic-config.patch
new file mode 100644
index 000000000000..e373ba9f8d51
--- /dev/null
+++ b/srcpkgs/maubot/patches/alembic-config.patch
@@ -0,0 +1,13 @@
+diff --git a/alembic.ini b/alembic.ini
+index 0d78e89..e47d871 100644
+--- a/alembic.ini
++++ b/alembic.ini
+@@ -2,7 +2,7 @@
+ 
+ [alembic]
+ # path to migration scripts
+-script_location = alembic
++script_location=/usr/lib/maubot/alembic
+ 
+ # template used to generate migration files
+ # file_template = %%(rev)s_%%(slug)s
diff --git a/srcpkgs/maubot/patches/entry_point.patch b/srcpkgs/maubot/patches/entry_point.patch
new file mode 100644
index 000000000000..885569317b2a
--- /dev/null
+++ b/srcpkgs/maubot/patches/entry_point.patch
@@ -0,0 +1,12 @@
+diff --git a/setup.py b/setup.py
+index eca1e05..0ae93d0 100644
+--- a/setup.py
++++ b/setup.py
+@@ -55,6 +55,7 @@ setuptools.setup(
+     entry_points="""
+         [console_scripts]
+         mbc=maubot.cli:app
++        maubot=maubot.__main__:main
+     """,
+     data_files=[
+         (".", ["maubot/example-config.yaml", "alembic.ini"]),
diff --git a/srcpkgs/maubot/patches/maubot-config.patch b/srcpkgs/maubot/patches/maubot-config.patch
new file mode 100644
index 000000000000..47a4202b5e6c
--- /dev/null
+++ b/srcpkgs/maubot/patches/maubot-config.patch
@@ -0,0 +1,42 @@
+diff --git a/maubot/example-config.yaml b/maubot/example-config.yaml
+index 0f82e12..7f8f2be 100644
+--- a/maubot/example-config.yaml
++++ b/maubot/example-config.yaml
+@@ -3,23 +3,23 @@
+ # Format examples:
+ #   SQLite:   sqlite:///filename.db
+ #   Postgres: postgresql://username:password@hostname/dbname
+-database: sqlite:///maubot.db
++database: sqlite:////var/lib/maubot/maubot.db
+ 
+ # Separate database URL for the crypto database. "default" means use the same database as above.
+ crypto_database: default
+ 
+ plugin_directories:
+     # The directory where uploaded new plugins should be stored.
+-    upload: ./plugins
++    upload: /var/lib/maubot/plugins
+     # The directories from which plugins should be loaded.
+     # Duplicate plugin IDs will be moved to the trash.
+     load:
+-    - ./plugins
++    - /var/lib/maubot/plugins
+     # The directory where old plugin versions and conflicting plugins should be moved.
+     # Set to "delete" to delete files immediately.
+-    trash: ./trash
++    trash: /var/lib/maubot/trash
+     # The directory where plugin databases should be stored.
+-    db: ./plugins
++    db: /var/lib/maubot/plugins
+ 
+ server:
+     # The IP and port to listen to.
+@@ -89,7 +89,7 @@ logging:
+         file:
+             class: logging.handlers.RotatingFileHandler
+             formatter: normal
+-            filename: ./maubot.log
++            filename: /var/log/maubot/maubot.log
+             maxBytes: 10485760
+             backupCount: 10
+         console:
diff --git a/srcpkgs/maubot/template b/srcpkgs/maubot/template
new file mode 100644
index 000000000000..24d26c2b9eca
--- /dev/null
+++ b/srcpkgs/maubot/template
@@ -0,0 +1,46 @@
+# Template file for 'maubot'
+pkgname=maubot
+version=0.2.0
+revision=1
+wrksrc="maubot-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-mautrix python3-aiohttp python3-yarl python3-SQLAlchemy
+ python3-alembic python3-commonmark python3-ruamel.yaml python3-attrs
+ python3-bcrypt python3-packaging python3-click python3-colorama
+ python3-questionary python3-Jinja2"
+short_desc="Plugin-based Matrix bot system"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="AGPL-3.0-or-later"
+homepage="https://github.com/maubot/maubot"
+distfiles="${PYPI_SITE}/m/maubot/maubot-${version}.tar.gz"
+checksum=1c7a99bbbefbe4cbdf4a69034736e837119180acaa270a095cc19981f7ce9bfb
+make_check=no # no tests specified
+
+conf_files="/etc/maubot/config.yaml"
+
+system_accounts="_maubot"
+_maubot_homedir="/var/lib/maubot"
+
+make_dirs="
+	/var/lib/maubot 0700 _maubot _maubot
+	/var/lib/maubot/plugins 0700 _maubot _maubot
+	/var/lib/maubot/trash 0700 _maubot _maubot
+	/var/lib/maubot/crypto 0700 _maubot _maubot
+	/var/log/maubot 0700 _maubot _maubot
+"
+
+post_install() {
+	vsv maubot
+
+	vmkdir usr/lib/maubot
+	mv ${DESTDIR}/usr/alembic ${DESTDIR}/usr/lib/maubot
+
+	vinstall maubot/example-config.yaml 644 etc/maubot config.yaml
+
+	vmkdir usr/share/maubot
+	mv ${DESTDIR}/usr/alembic.ini ${DESTDIR}/usr/share/maubot
+	mv ${DESTDIR}/usr/example-config.yaml ${DESTDIR}/usr/share/maubot
+
+	vlicense LICENSE
+}