From 8d2eb8ef046216bdc85eaef37b99295050e76698 Mon Sep 17 00:00:00 2001 From: Nils Freydank Date: Sat, 25 May 2024 09:44:23 +0200 Subject: [PATCH] */dendrite, package.mask: Drop masked dendrite Signed-off-by: Nils Freydank --- acct-group/dendrite/dendrite-0.ebuild | 9 -- acct-group/dendrite/metadata.xml | 8 -- acct-user/dendrite/dendrite-0.ebuild | 15 ---- acct-user/dendrite/metadata.xml | 8 -- net-im/dendrite/Manifest | 2 - net-im/dendrite/dendrite-0.13.7.ebuild | 113 ------------------------- net-im/dendrite/files/dendrite.confd | 24 ------ net-im/dendrite/files/dendrite.initd | 53 ------------ net-im/dendrite/files/dendrite.service | 19 ----- net-im/dendrite/metadata.xml | 11 --- profiles/package.mask | 8 -- 11 files changed, 270 deletions(-) delete mode 100644 acct-group/dendrite/dendrite-0.ebuild delete mode 100644 acct-group/dendrite/metadata.xml delete mode 100644 acct-user/dendrite/dendrite-0.ebuild delete mode 100644 acct-user/dendrite/metadata.xml delete mode 100644 net-im/dendrite/Manifest delete mode 100644 net-im/dendrite/dendrite-0.13.7.ebuild delete mode 100644 net-im/dendrite/files/dendrite.confd delete mode 100644 net-im/dendrite/files/dendrite.initd delete mode 100644 net-im/dendrite/files/dendrite.service delete mode 100644 net-im/dendrite/metadata.xml diff --git a/acct-group/dendrite/dendrite-0.ebuild b/acct-group/dendrite/dendrite-0.ebuild deleted file mode 100644 index 42b3773..0000000 --- a/acct-group/dendrite/dendrite-0.ebuild +++ /dev/null @@ -1,9 +0,0 @@ -# Copyright 2020-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="8" - -inherit acct-group - -DESCRIPTION="Group for matrix homerserver dendrite" -ACCT_GROUP_ID=-1 diff --git a/acct-group/dendrite/metadata.xml b/acct-group/dendrite/metadata.xml deleted file mode 100644 index 959f772..0000000 --- a/acct-group/dendrite/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - Nils Freydank - nils.freydank@posteo.de - - diff --git a/acct-user/dendrite/dendrite-0.ebuild b/acct-user/dendrite/dendrite-0.ebuild deleted file mode 100644 index 8684e30..0000000 --- a/acct-user/dendrite/dendrite-0.ebuild +++ /dev/null @@ -1,15 +0,0 @@ -# Copyright 2020-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="8" - -inherit acct-user - -DESCRIPTION="User for matrix homerserver dendrite" -ACCT_USER_ID=-1 -ACCT_USER_GROUPS=( dendrite ) -ACCT_USER_HOME=/var/lib/dendrite -ACCT_USER_HOME_PERMS=0700 -ACCT_USER_SHELL=/sbin/nologin -acct-user_add_deps -SLOT="0" diff --git a/acct-user/dendrite/metadata.xml b/acct-user/dendrite/metadata.xml deleted file mode 100644 index 959f772..0000000 --- a/acct-user/dendrite/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - Nils Freydank - nils.freydank@posteo.de - - diff --git a/net-im/dendrite/Manifest b/net-im/dendrite/Manifest deleted file mode 100644 index 4ea58c3..0000000 --- a/net-im/dendrite/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST dendrite-0.13.7-deps.tar.xz 527834048 BLAKE2B 456f54ddc91993f644a26ab7b4aa7ef79e4161c02990cc296fcf899574d7785b25b63e48057f543ba78dd8b50614a2e0972dd51ff728e65ea17253f1560b8ec9 SHA512 7745ed27a32bbba090fc1d7c9fe66286a7a501bf9820c54515a5031b0eb6793c1b9b998bfee429d44bc677a1c21f263afcf78f3f7eed7a20109eee07f7b87828 -DIST dendrite-0.13.7.tar.gz 1323802 BLAKE2B 8f11228bfb02eaf57a2f14b6f82c557781f2cdad67909064ef5067a3ce08c5ab21bb913bd6b0dcb9da0cedbf4512268bdba212c185fafab7933f48b2f7f1bfd8 SHA512 55a4ae52a9502600911cd26e2ec77e52b5379b913bdb1846963c4dc53a7ca3046ee4beddc315b17e12214fc2ac12b9838a3d8dfbca7dbf2a4db5ff3cc7781228 diff --git a/net-im/dendrite/dendrite-0.13.7.ebuild b/net-im/dendrite/dendrite-0.13.7.ebuild deleted file mode 100644 index b3c7b1d..0000000 --- a/net-im/dendrite/dendrite-0.13.7.ebuild +++ /dev/null @@ -1,113 +0,0 @@ -# Copyright 2022-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="8" -EGO_PN="github.com/matrix-org/dendrite" -inherit go-module systemd -COMMIT_ID="7863a405a5f41acd2e40b40ec288eebe781eac1a" - -DESCRIPTION="Matrix homeserver written in go" -HOMEPAGE="https://matrix.org https://github.com/matrix-org/dendrite" - -if [[ ${PV} == *_p* ]]; then - SRC_URI="https://${EGO_PN}/archive/${COMMIT_ID}.tar.gz -> ${P}.tar.gz" - S="${WORKDIR}/${PN}-${COMMIT_ID}" -else - SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" -fi -# Add the manually vendored tarball. -# 1) Create a tar archive optimized to reproduced by other users or devs. -# 2) Compress the archive using XZ limiting decompression memory for -# pretty constraint systems. -# Use something like: -# GOMODCACHE="${PWD}"/go-mod go mod download -modcacherw -# tar cf $P-deps.tar go-mod \ -# --mtime="1970-01-01" --sort=name --owner=portage --group=portage -# xz -k -9eT0 --memlimit-decompress=256M $P-deps.tar -SRC_URI+=" https://files.holgersson.xyz/gentoo/distfiles/golang-pkg-deps/${P}-deps.tar.xz" - -KEYWORDS="~amd64" -# There are some third-party licenses for test suites -# like non-commercial clauses inside for ccgo / CompCert. -# Restrict test execution until that stuff is sorted out. -RESTRICT="test" - -LICENSE=" - Apache-2.0 - BSD - BSD-2 - CC0-1.0 - ISC - LGPL-3 - MIT - MPL-2.0 - Unlicense - ZLIB -" -SLOT="0" -IUSE="" - -DEPEND="" -RDEPEND=" - acct-user/dendrite - acct-group/dendrite -" -BDEPEND="" - -src_unpack() { - go-module_src_unpack || die -} - -src_compile() { - local mygobuildargs=( - -o bin/ - -trimpath - -ldflags="-s -w" - -mod mod - -v -x - -work - ) - - ego build "${mygobuildargs[@]}" "${S}/cmd/..." -} - -src_test() { - ego test -trimpath -v -x -work "${S}/cmd/..." -} - -src_install() { - # Install files from bin, prefix with 'dendrite' if necessary. - newbin bin/create-account dendrite-create-account - - dobin bin/dendrite-demo-pinecone - dobin bin/dendrite-demo-yggdrasil - dobin bin/dendrite - dobin bin/dendrite-upgrade-tests - - # prefix - newbin bin/furl dendrite-furl - newbin bin/generate-config dendrite-generate-config - newbin bin/generate-keys dendrite-generate-keys - newbin bin/resolve-state dendrite-resolve-state - - # Provide a sample configuration. - dodir "/etc/dendrite" - insinto /etc/dendrite - doins "${S}/dendrite-sample.yaml" - - # Install init scripts for OpenRC - newinitd "${FILESDIR}"/dendrite.initd dendrite - newconfd "${FILESDIR}"/dendrite.confd dendrite - - # Install a systemd unit. - systemd_newunit "${FILESDIR}"/dendrite.service dendrite.service - - keepdir "/var/log/dendrite" - fowners dendrite:dendrite "/var/log/dendrite" -} - -pkg_postinst() { - elog "" - elog "Note that all binaries are prefixed with 'dendrite-'" - elog "- even ones that have no prefix uptream." -} diff --git a/net-im/dendrite/files/dendrite.confd b/net-im/dendrite/files/dendrite.confd deleted file mode 100644 index a762157..0000000 --- a/net-im/dendrite/files/dendrite.confd +++ /dev/null @@ -1,24 +0,0 @@ -# Increase the maximum number of open file descriptors. Set to a higher -# value for larger servers or if joining larger rooms. -rc_ulimit="-n 4096" - -# Specify the network service that corresponds to the "bind" setting -# in your configuration file. For example, if you bind to 127.0.0.1, -# this should be set to "loopback" which provides the loopback interface. -rc_need="loopback" - -# If your configuration of dendrite uses locally running PostgreSQL -# you may want to uncomment the next line -# rc_need="${rc_need} postgresql" - -# If your configuration of dendrite uses locally running kafka -# you may want to uncomment the next line -# rc_need="${rc_need} kafka" - -# If you use nginx as a reverse proxy for your dendrite -# you may want to uncomment the next line -# rc_need="${rc_need} nginx" - -# Additional command-line options. These can be used to set the bind address and port of the monolith server, -# among other things. See `dendrite -help` for a full list. -# DENDRITE_OPTS="-http-bind-address localhost:8008" diff --git a/net-im/dendrite/files/dendrite.initd b/net-im/dendrite/files/dendrite.initd deleted file mode 100644 index 8806a58..0000000 --- a/net-im/dendrite/files/dendrite.initd +++ /dev/null @@ -1,53 +0,0 @@ -#!/sbin/openrc-run - -DENDRITE=${SVCNAME#*.} -: ${DENDRITE_CONFDIR:=${RC_PREFIX%/}/etc/dendrite} - -if [ -n "${DENDRITE}" ] && [ ${SVCNAME} != "dendrite" ]; then -: ${DENDRITE_CONFIG:=${DENDRITE_CONFDIR}/${DENDRITE}.yaml} -: ${DENDRITE_PIDFILE:=${RC_PREFIX%/}/run/dendrite.${DENDRITE}.pid} -: ${DENDRITE_RC_CONFIG:=${RC_PREFIX%/}/etc/conf.d/dendrite.${DENDRITE}} -else -: ${DENDRITE_CONFIG:=${DENDRITE_CONFDIR}/dendrite.yaml} -: ${DENDRITE_PIDFILE:=${RC_PREFIX%/}/run/${SVCNAME}.pid} -: ${DENDRITE_RC_CONFIG:=${RC_PREFIX%/}/etc/conf.d/dendrite} -fi - -command="${RC_PREFIX%/}/usr/bin/dendrite" - -pidfile="${DENDRITE_PIDFILE}" -command_background=true -command_user="dendrite:dendrite" -directory="/var/lib/dendrite" -command_args="${DENDRITE_OPTS} -config ${DENDRITE_CONFIG}" - -checkconfig() { - test -f "${DENDRITE_CONFIG}" || { - echo "\"${DENDRITE_CONFIG}\" does not exist or is not a regular file." >&2 - echo "Please, look at https://github.com/matrix-org/dendrite for instructions" >&2 - echo "on how to configure your dendrite instance, and use" >&2 - echo "\"${DENDRITE_CONFIDR}/dendrite-config-example.yaml\" as an example." >&2 - return 1 - } -} - -start_pre() { - # If this isn't a restart, make sure that the user's config isn't - # busted before we try to start the daemon (this will produce - # better error messages than if we just try to start it blindly). - # - # If, on the other hand, this *is* a restart, then the stop_pre - # action will have ensured that the config is usable and we don't - # need to do that again. - if [ "${RC_CMD}" != "restart" ] ; then - checkconfig || return $? - fi -} - -stop_pre() { - # If this is a restart, check to make sure the user's config - # isn't busted before we stop the running daemon. - if [ "${RC_CMD}" = "restart" ] ; then - checkconfig || return $? - fi -} diff --git a/net-im/dendrite/files/dendrite.service b/net-im/dendrite/files/dendrite.service deleted file mode 100644 index 04c3c93..0000000 --- a/net-im/dendrite/files/dendrite.service +++ /dev/null @@ -1,19 +0,0 @@ -[Unit] -Description=Dendrite Matrix Homeserver -After=syslog.target -After=network.target -After=postgresql.service - -[Service] -Environment=GODEBUG=madvdontneed=1 -RestartSec=2s -Type=simple -User=dendrite -Group=dendrite -ExecStart=/usr/bin/dendrite --config=/etc/dendrite/config.yaml -WorkingDirectory=/var/lib/dendrite/ -Restart=always -LimitNOFILE=65536 - -[Install] -WantedBy=multi-user.target diff --git a/net-im/dendrite/metadata.xml b/net-im/dendrite/metadata.xml deleted file mode 100644 index 48e0f4d..0000000 --- a/net-im/dendrite/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - Nils Freydank - nils.freydank@posteo.de - - - matrix-org/dendrite - - diff --git a/profiles/package.mask b/profiles/package.mask index 186dbba..0657e9b 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -8,11 +8,3 @@ # I don't use that matrix client anymore. # Removal after 2024-05-15. net-im/gomuks - -# Nils Freydank (2024-04-14) -# As app services start to fail and developement stalled -# to some degree I will switch to synapse (or give up). -# Removal after 2024-05-15. -acct-user/dendrite -acct-group/dendrite -net-im/dendrite