* [PR PATCH] New package: maubot-0.2.0
@ 2021-12-02 3:06 TinfoilSubmarine
2021-12-15 13:03 ` [PR PATCH] [Updated] " TinfoilSubmarine
` (8 more replies)
0 siblings, 9 replies; 10+ messages in thread
From: TinfoilSubmarine @ 2021-12-02 3:06 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1213 bytes --]
There is a new 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: 6116 bytes --]
From def8d3ab7d887db5b9a4101133145b8d1c462216 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 fbfd6eeb91c75bff988fe38c74e707310221939b 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 8537d1470df960c9c90c10094e25a9ce0a88d294 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/template | 56 +++++++++++++++++++++++++++++
4 files changed, 69 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/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..daf5f708edd5
--- /dev/null
+++ b/srcpkgs/maubot/files/maubot/run
@@ -0,0 +1,7 @@
+#!/bin/sh
+exec 2>&1
+/usr/bin/alembic -x config=/etc/maubot/config.yaml \
+ -c /usr/share/maubot/alembic.ini upgrade head
+exec chpst -u _maubot:_maubot /usr/bin/python -m maubot \
+ -c /etc/maubot/config.yaml \
+ -b /usr/share/maubot/example-config.yaml
diff --git a/srcpkgs/maubot/template b/srcpkgs/maubot/template
new file mode 100644
index 000000000000..ba9c63e0af30
--- /dev/null
+++ b/srcpkgs/maubot/template
@@ -0,0 +1,56 @@
+# 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_patch() {
+ vsed -i -e 's,sqlite:///maubot.db,sqlite:////var/lib/maubot/maubot.db,' \
+ -e 's,./plugins,/var/lib/maubot/plugins,' \
+ -e 's,./trash,/var/lib/maubot/trash,' \
+ -e 's,./crypto,/var/lib/maubot/crypto,' \
+ -e 's,./maubot.log,/var/log/maubot/maubot.log,' maubot/example-config.yaml
+ vsed -i 's,script_location = alembic,script_location=/usr/lib/maubot/alembic,' alembic.ini
+}
+
+post_install() {
+ vsv maubot
+
+ vmkdir usr/lib/maubot
+ mv ${DESTDIR}/usr/alembic ${DESTDIR}/usr/lib/maubot
+
+ vmkdir etc/maubot
+ cp ${DESTDIR}/usr/example-config.yaml ${DESTDIR}/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
+}
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PR PATCH] [Updated] New package: maubot-0.2.0
2021-12-02 3:06 [PR PATCH] New package: maubot-0.2.0 TinfoilSubmarine
@ 2021-12-15 13:03 ` TinfoilSubmarine
2021-12-17 16:04 ` TinfoilSubmarine
` (7 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: TinfoilSubmarine @ 2021-12-15 13:03 UTC (permalink / raw)
To: ml
[-- 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: 6834 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 cd4e721f6cbb178f35926d307a95248456c9a85b 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/entry_point.patch | 12 +++++
srcpkgs/maubot/template | 56 ++++++++++++++++++++++++
5 files changed, 81 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/entry_point.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/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/template b/srcpkgs/maubot/template
new file mode 100644
index 000000000000..ba9c63e0af30
--- /dev/null
+++ b/srcpkgs/maubot/template
@@ -0,0 +1,56 @@
+# 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_patch() {
+ vsed -i -e 's,sqlite:///maubot.db,sqlite:////var/lib/maubot/maubot.db,' \
+ -e 's,./plugins,/var/lib/maubot/plugins,' \
+ -e 's,./trash,/var/lib/maubot/trash,' \
+ -e 's,./crypto,/var/lib/maubot/crypto,' \
+ -e 's,./maubot.log,/var/log/maubot/maubot.log,' maubot/example-config.yaml
+ vsed -i 's,script_location = alembic,script_location=/usr/lib/maubot/alembic,' alembic.ini
+}
+
+post_install() {
+ vsv maubot
+
+ vmkdir usr/lib/maubot
+ mv ${DESTDIR}/usr/alembic ${DESTDIR}/usr/lib/maubot
+
+ vmkdir etc/maubot
+ cp ${DESTDIR}/usr/example-config.yaml ${DESTDIR}/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
+}
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PR PATCH] [Updated] New package: maubot-0.2.0
2021-12-02 3:06 [PR PATCH] New package: maubot-0.2.0 TinfoilSubmarine
2021-12-15 13:03 ` [PR PATCH] [Updated] " TinfoilSubmarine
@ 2021-12-17 16:04 ` TinfoilSubmarine
2022-03-29 20:01 ` TinfoilSubmarine
` (6 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: TinfoilSubmarine @ 2021-12-17 16:04 UTC (permalink / raw)
To: ml
[-- 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
+}
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PR PATCH] [Updated] New package: maubot-0.2.0
2021-12-02 3:06 [PR PATCH] New package: maubot-0.2.0 TinfoilSubmarine
2021-12-15 13:03 ` [PR PATCH] [Updated] " TinfoilSubmarine
2021-12-17 16:04 ` TinfoilSubmarine
@ 2022-03-29 20:01 ` TinfoilSubmarine
2022-03-31 15:30 ` [PR PATCH] [Updated] New package: maubot-0.3.1 TinfoilSubmarine
` (5 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: TinfoilSubmarine @ 2022-03-29 20:01 UTC (permalink / raw)
To: ml
[-- 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: 11546 bytes --]
From 9414815fd3ba3879b5144001bd94710a97b10f88 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 12 Oct 2021 13:34:46 -0400
Subject: [PATCH 1/5] 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 3ff957c12027de351cd99bbc502c8830ef482724 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Mon, 28 Mar 2022 11:24:05 -0400
Subject: [PATCH 2/5] New package: python3-asyncpg-0.25.0
---
srcpkgs/python3-asyncpg/template | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
create mode 100644 srcpkgs/python3-asyncpg/template
diff --git a/srcpkgs/python3-asyncpg/template b/srcpkgs/python3-asyncpg/template
new file mode 100644
index 000000000000..87016927c142
--- /dev/null
+++ b/srcpkgs/python3-asyncpg/template
@@ -0,0 +1,16 @@
+# Template file for 'python3-asyncpg'
+pkgname=python3-asyncpg
+version=0.25.0
+revision=1
+wrksrc="asyncpg-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+makedepends="python3-devel"
+depends="python3"
+short_desc="Asyncio PostgreSQL driver"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="Apache-2.0"
+homepage="https://github.com/MagicStack/asyncpg"
+distfiles="${PYPI_SITE}/a/asyncpg/asyncpg-${version}.tar.gz"
+checksum=63f8e6a69733b285497c2855464a34de657f2cccd25aeaeeb5071872e9382540
+make_check=no # requires running postgres server on system
From 27230f9e5354ca21db08bae5259845d11488f39b Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Mon, 28 Mar 2022 11:24:19 -0400
Subject: [PATCH 3/5] New package: python3-aiosqlite-0.17.0
---
srcpkgs/python3-aiosqlite/template | 21 +++++++++++++++++++++
1 file changed, 21 insertions(+)
create mode 100644 srcpkgs/python3-aiosqlite/template
diff --git a/srcpkgs/python3-aiosqlite/template b/srcpkgs/python3-aiosqlite/template
new file mode 100644
index 000000000000..723a70999f01
--- /dev/null
+++ b/srcpkgs/python3-aiosqlite/template
@@ -0,0 +1,21 @@
+# Template file for 'python3-aiosqlite'
+pkgname=python3-aiosqlite
+version=0.17.0
+revision=1
+wrksrc="aiosqlite-${version}"
+build_style=python3-pep517
+make_check_target="aiosqlite/tests"
+hostmakedepends="python3-setuptools python3-flit_core
+ python3-typing_extensions"
+depends="python3"
+short_desc="Asyncio bridge to the standard sqlite3 module"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="MIT"
+homepage="https://aiosqlite.omnilib.dev/en/stable/"
+changelog="https://raw.githubusercontent.com/omnilib/aiosqlite/main/CHANGELOG.md"
+distfiles="${PYPI_SITE}/a/aiosqlite/aiosqlite-${version}.tar.gz"
+checksum=f0e6acc24bc4864149267ac82fb46dfb3be4455f99fe21df82609cc6e6baee51
+
+post_install() {
+ vlicense LICENSE
+}
From 812668e3f7bcfe7655c02189e07c1aa951e8ff7c Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Wed, 13 Oct 2021 11:13:45 -0400
Subject: [PATCH 4/5] New package: python3-mautrix-0.15.5
---
srcpkgs/python3-mautrix/template | 23 +++++++++++++++++++++++
1 file changed, 23 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..92766dd564be
--- /dev/null
+++ b/srcpkgs/python3-mautrix/template
@@ -0,0 +1,23 @@
+# Template file for 'python3-mautrix'
+pkgname=python3-mautrix
+version=0.15.5
+revision=1
+wrksrc="mautrix-${version}"
+build_style=python3-module
+make_check_args="--deselect=mautrix/client/state_store/tests/store_test.py::test_basic_updated \
+ --deselect mautrix/client/state_store/tests/store_test.py::test_basic_updated \
+ --deselect mautrix/client/state_store/tests/store_test.py::test_basic_updated \
+ --deselect mautrix/client/state_store/tests/store_test.py::test_updates \
+ --deselect mautrix/client/state_store/tests/store_test.py::test_updates \
+ --deselect mautrix/client/state_store/tests/store_test.py::test_updates"
+hostmakedepends="python3-setuptools"
+depends="python3-aiohttp python3-attrs python3-yarl"
+checkdepends="python3-pytest-asyncio python3-asyncpg python3-SQLAlchemy
+ python3-aiosqlite ${depends}"
+short_desc="Python 3 asyncio Matrix framework"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="MPL-2.0"
+homepage="https://github.com/mautrix/python"
+changelog="https://raw.githubusercontent.com/mautrix/python/master/CHANGELOG.md"
+distfiles="${PYPI_SITE}/m/mautrix/mautrix-${version}.tar.gz"
+checksum=183018640a9910ff1f5c5b2ace9d803e858618f142dc943a54f44710af37496a
From 4f90a1f0f253a6626038c7d27454fe4547c70d0b Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Mon, 28 Mar 2022 11:05:05 -0400
Subject: [PATCH 5/5] New package: maubot-0.3.1
---
srcpkgs/maubot/INSTALL | 5 +++
srcpkgs/maubot/files/maubot/log/run | 1 +
srcpkgs/maubot/files/maubot/run | 5 +++
srcpkgs/maubot/patches/entry_point.patch | 12 ++++++
srcpkgs/maubot/patches/maubot-config.patch | 46 ++++++++++++++++++++++
srcpkgs/maubot/template | 44 +++++++++++++++++++++
6 files changed, 113 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/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..4e487a56631d
--- /dev/null
+++ b/srcpkgs/maubot/files/maubot/run
@@ -0,0 +1,5 @@
+#!/bin/sh
+exec 2>&1
+exec chpst -u _maubot:_maubot maubot \
+ -c /etc/maubot/config.yaml \
+ -b /usr/share/maubot/example-config.yaml
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..ea60675a9c61
--- /dev/null
+++ b/srcpkgs/maubot/patches/maubot-config.patch
@@ -0,0 +1,46 @@
+diff --git a/maubot/example-config.yaml b/maubot/example-config.yaml
+index d157269..bd3bf23 100644
+--- a/maubot/example-config.yaml
++++ b/maubot/example-config.yaml
+@@ -3,7 +3,7 @@
+ # 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
+@@ -19,19 +19,19 @@ database_opts:
+ # Configuration for storing plugin .mbp files
+ 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
+
+ # Configuration for storing plugin databases
+ plugin_databases:
+ # The directory where SQLite plugin databases should be stored.
+- sqlite: ./plugins
++ sqlite: /var/lib/maubot/plugins
+ # The connection URL for plugin databases. If null, all plugins will get SQLite databases.
+ # If set, plugins using the new asyncpg interface will get a Postgres connection instead.
+ # Plugins using the legacy SQLAlchemy interface will always get a SQLite connection.
+@@ -117,7 +117,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..62ce2b9fc4d7
--- /dev/null
+++ b/srcpkgs/maubot/template
@@ -0,0 +1,44 @@
+# Template file for 'maubot'
+pkgname=maubot
+version=0.3.1
+revision=1
+wrksrc="maubot-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-mautrix python3-aiohttp python3-yarl python3-SQLAlchemy
+ python3-asyncpg python3-aiosqlite 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=f2026d1f040e47506a2db59648572bddc5c36c8bc36701b4312b280b3fcbae75
+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
+
+ vinstall maubot/example-config.yaml 644 etc/maubot config.yaml
+
+ vmkdir usr/share/maubot
+ mv ${DESTDIR}/usr/example-config.yaml ${DESTDIR}/usr/share/maubot
+
+ vlicense LICENSE
+}
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PR PATCH] [Updated] New package: maubot-0.3.1
2021-12-02 3:06 [PR PATCH] New package: maubot-0.2.0 TinfoilSubmarine
` (2 preceding siblings ...)
2022-03-29 20:01 ` TinfoilSubmarine
@ 2022-03-31 15:30 ` TinfoilSubmarine
2022-04-12 18:44 ` TinfoilSubmarine
` (4 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: TinfoilSubmarine @ 2022-03-31 15:30 UTC (permalink / raw)
To: ml
[-- 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.3.1
<!-- 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: 11226 bytes --]
From f7516cea7b1f56769794b2bdf9f992c56ba7a823 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 12 Oct 2021 13:34:46 -0400
Subject: [PATCH 1/5] 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 44f0848f00a5197b7a990a764f985ab334e80b94 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Mon, 28 Mar 2022 11:24:05 -0400
Subject: [PATCH 2/5] New package: python3-asyncpg-0.25.0
---
srcpkgs/python3-asyncpg/template | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
create mode 100644 srcpkgs/python3-asyncpg/template
diff --git a/srcpkgs/python3-asyncpg/template b/srcpkgs/python3-asyncpg/template
new file mode 100644
index 000000000000..87016927c142
--- /dev/null
+++ b/srcpkgs/python3-asyncpg/template
@@ -0,0 +1,16 @@
+# Template file for 'python3-asyncpg'
+pkgname=python3-asyncpg
+version=0.25.0
+revision=1
+wrksrc="asyncpg-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+makedepends="python3-devel"
+depends="python3"
+short_desc="Asyncio PostgreSQL driver"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="Apache-2.0"
+homepage="https://github.com/MagicStack/asyncpg"
+distfiles="${PYPI_SITE}/a/asyncpg/asyncpg-${version}.tar.gz"
+checksum=63f8e6a69733b285497c2855464a34de657f2cccd25aeaeeb5071872e9382540
+make_check=no # requires running postgres server on system
From 4e6ec5167cd96602c5f7deab5c1081d841e42320 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Mon, 28 Mar 2022 11:24:19 -0400
Subject: [PATCH 3/5] New package: python3-aiosqlite-0.17.0
---
srcpkgs/python3-aiosqlite/template | 21 +++++++++++++++++++++
1 file changed, 21 insertions(+)
create mode 100644 srcpkgs/python3-aiosqlite/template
diff --git a/srcpkgs/python3-aiosqlite/template b/srcpkgs/python3-aiosqlite/template
new file mode 100644
index 000000000000..723a70999f01
--- /dev/null
+++ b/srcpkgs/python3-aiosqlite/template
@@ -0,0 +1,21 @@
+# Template file for 'python3-aiosqlite'
+pkgname=python3-aiosqlite
+version=0.17.0
+revision=1
+wrksrc="aiosqlite-${version}"
+build_style=python3-pep517
+make_check_target="aiosqlite/tests"
+hostmakedepends="python3-setuptools python3-flit_core
+ python3-typing_extensions"
+depends="python3"
+short_desc="Asyncio bridge to the standard sqlite3 module"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="MIT"
+homepage="https://aiosqlite.omnilib.dev/en/stable/"
+changelog="https://raw.githubusercontent.com/omnilib/aiosqlite/main/CHANGELOG.md"
+distfiles="${PYPI_SITE}/a/aiosqlite/aiosqlite-${version}.tar.gz"
+checksum=f0e6acc24bc4864149267ac82fb46dfb3be4455f99fe21df82609cc6e6baee51
+
+post_install() {
+ vlicense LICENSE
+}
From a53d46528988c3d6b3d43c87bcd85f5676669dd0 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Wed, 13 Oct 2021 11:13:45 -0400
Subject: [PATCH 4/5] New package: python3-mautrix-0.15.6
---
srcpkgs/python3-mautrix/template | 19 +++++++++++++++++++
1 file changed, 19 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..7f62af56089f
--- /dev/null
+++ b/srcpkgs/python3-mautrix/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-mautrix'
+pkgname=python3-mautrix
+version=0.15.6
+revision=1
+wrksrc="mautrix-${version}"
+build_style=python3-module
+make_check_args="--deselect=mautrix/client/state_store/tests/store_test.py::test_basic_updated \
+ --deselect mautrix/client/state_store/tests/store_test.py::test_updates"
+hostmakedepends="python3-setuptools"
+depends="python3-aiohttp python3-attrs python3-yarl"
+checkdepends="python3-pytest-asyncio python3-asyncpg python3-SQLAlchemy
+ python3-aiosqlite ${depends}"
+short_desc="Python 3 asyncio Matrix framework"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="MPL-2.0"
+homepage="https://github.com/mautrix/python"
+changelog="https://raw.githubusercontent.com/mautrix/python/master/CHANGELOG.md"
+distfiles="${PYPI_SITE}/m/mautrix/mautrix-${version}.tar.gz"
+checksum=867f5072c3cd054ff5782ce122c3843b3fc58e1558c633fc65abe74273dcfc59
From 055684f8ae3572c65b07698f1470e802990526f8 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Mon, 28 Mar 2022 11:05:05 -0400
Subject: [PATCH 5/5] New package: maubot-0.3.1
---
srcpkgs/maubot/INSTALL | 5 +++
srcpkgs/maubot/files/maubot/log/run | 1 +
srcpkgs/maubot/files/maubot/run | 5 +++
srcpkgs/maubot/patches/entry_point.patch | 12 ++++++
srcpkgs/maubot/patches/maubot-config.patch | 46 ++++++++++++++++++++++
srcpkgs/maubot/template | 44 +++++++++++++++++++++
6 files changed, 113 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/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..4e487a56631d
--- /dev/null
+++ b/srcpkgs/maubot/files/maubot/run
@@ -0,0 +1,5 @@
+#!/bin/sh
+exec 2>&1
+exec chpst -u _maubot:_maubot maubot \
+ -c /etc/maubot/config.yaml \
+ -b /usr/share/maubot/example-config.yaml
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..ea60675a9c61
--- /dev/null
+++ b/srcpkgs/maubot/patches/maubot-config.patch
@@ -0,0 +1,46 @@
+diff --git a/maubot/example-config.yaml b/maubot/example-config.yaml
+index d157269..bd3bf23 100644
+--- a/maubot/example-config.yaml
++++ b/maubot/example-config.yaml
+@@ -3,7 +3,7 @@
+ # 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
+@@ -19,19 +19,19 @@ database_opts:
+ # Configuration for storing plugin .mbp files
+ 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
+
+ # Configuration for storing plugin databases
+ plugin_databases:
+ # The directory where SQLite plugin databases should be stored.
+- sqlite: ./plugins
++ sqlite: /var/lib/maubot/plugins
+ # The connection URL for plugin databases. If null, all plugins will get SQLite databases.
+ # If set, plugins using the new asyncpg interface will get a Postgres connection instead.
+ # Plugins using the legacy SQLAlchemy interface will always get a SQLite connection.
+@@ -117,7 +117,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..62ce2b9fc4d7
--- /dev/null
+++ b/srcpkgs/maubot/template
@@ -0,0 +1,44 @@
+# Template file for 'maubot'
+pkgname=maubot
+version=0.3.1
+revision=1
+wrksrc="maubot-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-mautrix python3-aiohttp python3-yarl python3-SQLAlchemy
+ python3-asyncpg python3-aiosqlite 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=f2026d1f040e47506a2db59648572bddc5c36c8bc36701b4312b280b3fcbae75
+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
+
+ vinstall maubot/example-config.yaml 644 etc/maubot config.yaml
+
+ vmkdir usr/share/maubot
+ mv ${DESTDIR}/usr/example-config.yaml ${DESTDIR}/usr/share/maubot
+
+ vlicense LICENSE
+}
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PR PATCH] [Updated] New package: maubot-0.3.1
2021-12-02 3:06 [PR PATCH] New package: maubot-0.2.0 TinfoilSubmarine
` (3 preceding siblings ...)
2022-03-31 15:30 ` [PR PATCH] [Updated] New package: maubot-0.3.1 TinfoilSubmarine
@ 2022-04-12 18:44 ` TinfoilSubmarine
2022-07-12 2:15 ` github-actions
` (3 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: TinfoilSubmarine @ 2022-04-12 18:44 UTC (permalink / raw)
To: ml
[-- 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.3.1
<!-- 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: 11226 bytes --]
From 5380071d3ec2473dfd4765bce35e43ab2e5cbe3c Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 12 Oct 2021 13:34:46 -0400
Subject: [PATCH 1/5] 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 d9414ddb7023e977cea342bd24ee753d11980b30 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Mon, 28 Mar 2022 11:24:05 -0400
Subject: [PATCH 2/5] New package: python3-asyncpg-0.25.0
---
srcpkgs/python3-asyncpg/template | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
create mode 100644 srcpkgs/python3-asyncpg/template
diff --git a/srcpkgs/python3-asyncpg/template b/srcpkgs/python3-asyncpg/template
new file mode 100644
index 000000000000..87016927c142
--- /dev/null
+++ b/srcpkgs/python3-asyncpg/template
@@ -0,0 +1,16 @@
+# Template file for 'python3-asyncpg'
+pkgname=python3-asyncpg
+version=0.25.0
+revision=1
+wrksrc="asyncpg-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+makedepends="python3-devel"
+depends="python3"
+short_desc="Asyncio PostgreSQL driver"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="Apache-2.0"
+homepage="https://github.com/MagicStack/asyncpg"
+distfiles="${PYPI_SITE}/a/asyncpg/asyncpg-${version}.tar.gz"
+checksum=63f8e6a69733b285497c2855464a34de657f2cccd25aeaeeb5071872e9382540
+make_check=no # requires running postgres server on system
From 1a0d2b4b1b81b4701046c0c3b4605f17c1eb7fb3 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Mon, 28 Mar 2022 11:24:19 -0400
Subject: [PATCH 3/5] New package: python3-aiosqlite-0.17.0
---
srcpkgs/python3-aiosqlite/template | 21 +++++++++++++++++++++
1 file changed, 21 insertions(+)
create mode 100644 srcpkgs/python3-aiosqlite/template
diff --git a/srcpkgs/python3-aiosqlite/template b/srcpkgs/python3-aiosqlite/template
new file mode 100644
index 000000000000..723a70999f01
--- /dev/null
+++ b/srcpkgs/python3-aiosqlite/template
@@ -0,0 +1,21 @@
+# Template file for 'python3-aiosqlite'
+pkgname=python3-aiosqlite
+version=0.17.0
+revision=1
+wrksrc="aiosqlite-${version}"
+build_style=python3-pep517
+make_check_target="aiosqlite/tests"
+hostmakedepends="python3-setuptools python3-flit_core
+ python3-typing_extensions"
+depends="python3"
+short_desc="Asyncio bridge to the standard sqlite3 module"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="MIT"
+homepage="https://aiosqlite.omnilib.dev/en/stable/"
+changelog="https://raw.githubusercontent.com/omnilib/aiosqlite/main/CHANGELOG.md"
+distfiles="${PYPI_SITE}/a/aiosqlite/aiosqlite-${version}.tar.gz"
+checksum=f0e6acc24bc4864149267ac82fb46dfb3be4455f99fe21df82609cc6e6baee51
+
+post_install() {
+ vlicense LICENSE
+}
From 681ff5baf480e50343f2348b50f0bca9044e75cb Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Wed, 13 Oct 2021 11:13:45 -0400
Subject: [PATCH 4/5] New package: python3-mautrix-0.15.8
---
srcpkgs/python3-mautrix/template | 19 +++++++++++++++++++
1 file changed, 19 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..f2e5137b3748
--- /dev/null
+++ b/srcpkgs/python3-mautrix/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-mautrix'
+pkgname=python3-mautrix
+version=0.15.8
+revision=1
+wrksrc="mautrix-${version}"
+build_style=python3-module
+make_check_args="--deselect=mautrix/client/state_store/tests/store_test.py::test_basic_updated \
+ --deselect mautrix/client/state_store/tests/store_test.py::test_updates"
+hostmakedepends="python3-setuptools"
+depends="python3-aiohttp python3-attrs python3-yarl"
+checkdepends="python3-pytest-asyncio python3-asyncpg python3-SQLAlchemy
+ python3-aiosqlite ${depends}"
+short_desc="Python 3 asyncio Matrix framework"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="MPL-2.0"
+homepage="https://github.com/mautrix/python"
+changelog="https://raw.githubusercontent.com/mautrix/python/master/CHANGELOG.md"
+distfiles="${PYPI_SITE}/m/mautrix/mautrix-${version}.tar.gz"
+checksum=c58761873062aa6a3e72dc0aef9f9b7bde75a743475c1a181b787dbf5087df1a
From 32e0419b86c3ffb01f47c8fc1148802698a0daa7 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Mon, 28 Mar 2022 11:05:05 -0400
Subject: [PATCH 5/5] New package: maubot-0.3.1
---
srcpkgs/maubot/INSTALL | 5 +++
srcpkgs/maubot/files/maubot/log/run | 1 +
srcpkgs/maubot/files/maubot/run | 5 +++
srcpkgs/maubot/patches/entry_point.patch | 12 ++++++
srcpkgs/maubot/patches/maubot-config.patch | 46 ++++++++++++++++++++++
srcpkgs/maubot/template | 44 +++++++++++++++++++++
6 files changed, 113 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/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..4e487a56631d
--- /dev/null
+++ b/srcpkgs/maubot/files/maubot/run
@@ -0,0 +1,5 @@
+#!/bin/sh
+exec 2>&1
+exec chpst -u _maubot:_maubot maubot \
+ -c /etc/maubot/config.yaml \
+ -b /usr/share/maubot/example-config.yaml
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..ea60675a9c61
--- /dev/null
+++ b/srcpkgs/maubot/patches/maubot-config.patch
@@ -0,0 +1,46 @@
+diff --git a/maubot/example-config.yaml b/maubot/example-config.yaml
+index d157269..bd3bf23 100644
+--- a/maubot/example-config.yaml
++++ b/maubot/example-config.yaml
+@@ -3,7 +3,7 @@
+ # 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
+@@ -19,19 +19,19 @@ database_opts:
+ # Configuration for storing plugin .mbp files
+ 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
+
+ # Configuration for storing plugin databases
+ plugin_databases:
+ # The directory where SQLite plugin databases should be stored.
+- sqlite: ./plugins
++ sqlite: /var/lib/maubot/plugins
+ # The connection URL for plugin databases. If null, all plugins will get SQLite databases.
+ # If set, plugins using the new asyncpg interface will get a Postgres connection instead.
+ # Plugins using the legacy SQLAlchemy interface will always get a SQLite connection.
+@@ -117,7 +117,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..62ce2b9fc4d7
--- /dev/null
+++ b/srcpkgs/maubot/template
@@ -0,0 +1,44 @@
+# Template file for 'maubot'
+pkgname=maubot
+version=0.3.1
+revision=1
+wrksrc="maubot-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-mautrix python3-aiohttp python3-yarl python3-SQLAlchemy
+ python3-asyncpg python3-aiosqlite 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=f2026d1f040e47506a2db59648572bddc5c36c8bc36701b4312b280b3fcbae75
+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
+
+ vinstall maubot/example-config.yaml 644 etc/maubot config.yaml
+
+ vmkdir usr/share/maubot
+ mv ${DESTDIR}/usr/example-config.yaml ${DESTDIR}/usr/share/maubot
+
+ vlicense LICENSE
+}
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: New package: maubot-0.3.1
2021-12-02 3:06 [PR PATCH] New package: maubot-0.2.0 TinfoilSubmarine
` (4 preceding siblings ...)
2022-04-12 18:44 ` TinfoilSubmarine
@ 2022-07-12 2:15 ` github-actions
2022-07-20 13:24 ` TinfoilSubmarine
` (2 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: github-actions @ 2022-07-12 2:15 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 305 bytes --]
New comment by github-actions[bot] on void-packages repository
https://github.com/void-linux/void-packages/pull/34342#issuecomment-1181235441
Comment:
Pull Requests become stale 90 days after last activity and are closed 14 days after that. If this pull request is still relevant bump it or assign it.
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: New package: maubot-0.3.1
2021-12-02 3:06 [PR PATCH] New package: maubot-0.2.0 TinfoilSubmarine
` (5 preceding siblings ...)
2022-07-12 2:15 ` github-actions
@ 2022-07-20 13:24 ` TinfoilSubmarine
2022-10-20 2:14 ` github-actions
2022-11-04 2:13 ` [PR PATCH] [Closed]: " github-actions
8 siblings, 0 replies; 10+ messages in thread
From: TinfoilSubmarine @ 2022-07-20 13:24 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 199 bytes --]
New comment by TinfoilSubmarine on void-packages repository
https://github.com/void-linux/void-packages/pull/34342#issuecomment-1190283153
Comment:
I still use this and this is the latest version.
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: New package: maubot-0.3.1
2021-12-02 3:06 [PR PATCH] New package: maubot-0.2.0 TinfoilSubmarine
` (6 preceding siblings ...)
2022-07-20 13:24 ` TinfoilSubmarine
@ 2022-10-20 2:14 ` github-actions
2022-11-04 2:13 ` [PR PATCH] [Closed]: " github-actions
8 siblings, 0 replies; 10+ messages in thread
From: github-actions @ 2022-10-20 2:14 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 305 bytes --]
New comment by github-actions[bot] on void-packages repository
https://github.com/void-linux/void-packages/pull/34342#issuecomment-1284812991
Comment:
Pull Requests become stale 90 days after last activity and are closed 14 days after that. If this pull request is still relevant bump it or assign it.
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PR PATCH] [Closed]: New package: maubot-0.3.1
2021-12-02 3:06 [PR PATCH] New package: maubot-0.2.0 TinfoilSubmarine
` (7 preceding siblings ...)
2022-10-20 2:14 ` github-actions
@ 2022-11-04 2:13 ` github-actions
8 siblings, 0 replies; 10+ messages in thread
From: github-actions @ 2022-11-04 2:13 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1045 bytes --]
There's a closed pull request on the void-packages repository
New package: maubot-0.3.1
https://github.com/void-linux/void-packages/pull/34342
Description:
<!-- 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
-->
^ permalink raw reply [flat|nested] 10+ messages in thread
end of thread, other threads:[~2022-11-04 2:13 UTC | newest]
Thread overview: 10+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-12-02 3:06 [PR PATCH] New package: maubot-0.2.0 TinfoilSubmarine
2021-12-15 13:03 ` [PR PATCH] [Updated] " TinfoilSubmarine
2021-12-17 16:04 ` TinfoilSubmarine
2022-03-29 20:01 ` TinfoilSubmarine
2022-03-31 15:30 ` [PR PATCH] [Updated] New package: maubot-0.3.1 TinfoilSubmarine
2022-04-12 18:44 ` TinfoilSubmarine
2022-07-12 2:15 ` github-actions
2022-07-20 13:24 ` TinfoilSubmarine
2022-10-20 2:14 ` github-actions
2022-11-04 2:13 ` [PR PATCH] [Closed]: " github-actions
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).