0.3.4.3314.g9eb0784f

3 files changed, 47 insertions, 66 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 165493215662..f441e8a0a9c8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,25 +1,21 @@
 pkgbase = conduwuit-git
-	pkgdesc = A very cool, featureful fork of the Conduit matrix server
-	pkgver = 0.3.1.3213.g42e35671
+	pkgdesc = a very cool, featureful fork of Conduit matrix server
+	pkgver = 0.3.4.3314.g9eb0784f
 	pkgrel = 1
-	epoch = 1
 	url = https://github.com/girlbossceo/conduwuit
-	arch = x86_64
-	arch = armv6h
-	arch = armv7h
-	arch = aarch64
-	license = Apache
+	arch = any
+	license = Apache-2.0
 	makedepends = rust
 	makedepends = cargo
 	makedepends = git
 	makedepends = clang
 	depends = gcc-libs
+	depends = glibc
+	depends = liburing
 	provides = conduwuit
 	options = !lto
-	backup = etc/conduwuit/conduwuit.toml
-	source = conduwuit::git+https://github.com/girlbossceo/conduwuit.git
-	source = conduwuit.service
-	sha256sums = SKIP
-	sha256sums = 94a643d2731bbd4279c14baa83a9e417cbe7b6ec9522a035f12fe3718274069c
+	backup = etc/conduwuit.toml
+	source = git+https://github.com/girlbossceo/conduwuit
+	sha512sums = SKIP
 
 pkgname = conduwuit-git
diff --git a/PKGBUILD b/PKGBUILD
index 0479eb34d9ad..af55dab114f9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,62 +1,49 @@
-# Maintainer: Bjoern Franke <bjo+aur@schafweide.org>
-# Contributor: Till Faelligen <tfaelligen at gmail dot com>
-pkgname='conduwuit-git'
-_pkgname='conduwuit'
-epoch=1
-pkgver=0.3.1.3213.g42e35671
+# Maintainer: Vladislav Minakov <v@minakov.pro>
+
+pkgname=conduwuit-git
+pkgdesc="a very cool, featureful fork of Conduit matrix server"
+url="https://github.com/girlbossceo/conduwuit"
+license=("Apache-2.0")
+arch=("any")
+pkgver=0.3.4.3314.g9eb0784f
 pkgrel=1
-arch=('x86_64' 'armv6h' 'armv7h' 'aarch64')
-url='https://github.com/girlbossceo/conduwuit'
-pkgdesc='A very cool, featureful fork of the Conduit matrix server'
-license=('Apache')
-depends=('gcc-libs')
-makedepends=('rust' 'cargo' 'git' 'clang')
-provides=('conduwuit')
-source=(
-  "$_pkgname::git+https://github.com/girlbossceo/conduwuit.git"
-  "$_pkgname.service"
-)
-backup=(
-  'etc/conduwuit/conduwuit.toml'
-)
-sha256sums=('SKIP'
-            '94a643d2731bbd4279c14baa83a9e417cbe7b6ec9522a035f12fe3718274069c')
-options=(!lto) # lto breaks linking with vendored dependencies (ring, zstd, rocksdb) due to unresolved symbols
-
-prepare() {
-  cd "$_pkgname"
-
-  export RUSTUP_TOOLCHAIN=stable
-  cargo fetch --locked --target "$(rustc -vV | sed -n 's/host: //p')"
-}
+makedepends=("rust" "cargo" "git" "clang")
+depends=("gcc-libs" "glibc" "liburing")
+source=("git+https://github.com/girlbossceo/conduwuit")
+sha512sums=('SKIP')
+provides=("conduwuit")
+options=(!lto)
+backup=("etc/conduwuit.toml")
 
 pkgver() {
-  cd $_pkgname/
-  echo "$(grep '^version =' Cargo.toml|head -n1|cut -d\" -f2|cut -d\- -f1).$(git rev-list --count HEAD).g$(git rev-parse --short HEAD)"
+	cd conduwuit
+	echo "$(grep '^version =' Cargo.toml|head -n1|cut -d\" -f2|cut -d\- -f1).$(git rev-list --count HEAD).g$(git rev-parse --short HEAD)"
 }
 
-check() {
-  cd "$_pkgname"
+prepare() {
+	cd "${srcdir}/conduwuit"
+	export RUSTUP_TOOLCHAIN=stable
+	cargo fetch --locked --target "$CARCH-unknown-linux-gnu"
+	export CONDUWUIT_VERSION_EXTRA=$(git rev-parse --short HEAD)
+}
 
-  export RUSTUP_TOOLCHAIN=stable
-  cargo test --frozen
+build() {
+	cd "${srcdir}/conduwuit"
+	export RUSTUP_TOOLCHAIN=stable
+	export CARGO_TARGET_DIR=target
+	cargo build --release --frozen --locked
 }
 
-build(){
-  cd "$_pkgname"
-  export RUSTUP_TOOLCHAIN=stable
-  export CARGO_TARGET_DIR=target
-  export CONDUWUIT_VERSION_EXTRA=$(git rev-parse --short HEAD)
-  cargo build --frozen --release
+check() {
+	cd "${srcdir}/conduwuit"
+	export RUSTUP_TOOLCHAIN=stable
+	cargo test --release --frozen --locked --all-features
 }
 
 package() {
-  install -Dm644 "$_pkgname.service" "$pkgdir/usr/lib/systemd/system/conduwuit.service"
-
-  cd "$_pkgname"
-  install -D -m755 target/release/conduit "$pkgdir/usr/bin/conduwuit"
-  install -D -m0644 conduwuit-example.toml "$pkgdir/etc/conduwuit/conduwuit.toml"
-  install -D -m0644 conduwuit-example.toml "$pkgdir/usr/share/doc/conduwuit/conduwuit-example.toml"
+	install -Dm755 "${srcdir}/conduwuit/target/release/conduit" "${pkgdir}/usr/bin/conduwuit"
+	install -Dm644 "${srcdir}/conduwuit/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+	install -Dm644 "${srcdir}/conduwuit/conduwuit-example.toml" "${pkgdir}/etc/conduwuit.toml"
+	install -Dm644 "${srcdir}/conduwuit.service" "$pkgdir/usr/lib/systemd/system/conduwuit.service"
 }
 
-# vim: set et ts=2:
diff --git a/conduwuit.service b/conduwuit.service
index edde1a7ce51f..ba09f4b6d8b6 100644
--- a/conduwuit.service
+++ b/conduwuit.service
@@ -1,11 +1,9 @@
 [Unit]
 Description=conduwuit Matrix homeserver
-After=network-online.target
+After=network.target
 
 [Service]
 DynamicUser=yes
-User=_conduwuit
-Group=_conduwuit
 Type=notify
 
 AmbientCapabilities=
@@ -44,7 +42,7 @@ StateDirectory=matrix-conduit
 RuntimeDirectory=conduwuit
 RuntimeDirectoryMode=0750
 
-Environment="CONDUIT_CONFIG=/etc/conduwuit/conduwuit.toml"
+Environment="CONDUIT_CONFIG=/etc/conduwuit.toml"
 
 ExecStart=/usr/bin/conduwuit
 Restart=on-failure