From 4a8033cce739d4587b6a3547797091aac90f866e Mon Sep 17 00:00:00 2001
From: Dudemanguy <dudemanguy@artixlinux.org>
Date: Thu, 13 May 2021 21:05:52 -0500
Subject: [PATCH] [community-testing] -> [community] 'rspamd-s6-20210512-1'
 move

---
 x86_64/community-testing/PKGBUILD | 20 --------------------
 x86_64/community/PKGBUILD         | 25 +++++++++----------------
 x86_64/community/rspamd.install   |  5 -----
 x86_64/community/rspamd.run       |  2 --
 x86_64/community/rspamd.type      |  1 -
 5 files changed, 9 insertions(+), 44 deletions(-)
 delete mode 100644 x86_64/community-testing/PKGBUILD
 delete mode 100644 x86_64/community/rspamd.install
 delete mode 100644 x86_64/community/rspamd.run
 delete mode 100644 x86_64/community/rspamd.type

diff --git a/x86_64/community-testing/PKGBUILD b/x86_64/community-testing/PKGBUILD
deleted file mode 100644
index 1a47653..0000000
--- a/x86_64/community-testing/PKGBUILD
+++ /dev/null
@@ -1,20 +0,0 @@
-# Maintainer: Dudemanguy <dudemanguy@artixlinux.org> 
-pkgname=rspamd-s6
-pkgver=20210512
-pkgrel=1
-pkgdesc="s6-rc service scripts for rspamd"
-arch=('any')
-url="https://gitea.artixlinux.org/artix/s6-services"
-groups=('s6-galaxy')
-provides=('init-rspamd')
-conflicts=('init-rspamd')
-depends=('rspamd' 's6-base')
-_commit=3cb52daad8645d2afb14e9cd026fc46c5e55fe87
-makedepends=('git')
-source=("git+https://gitea.artixlinux.org/artix/s6-services.git#commit=$_commit")
-sha256sums=('SKIP')
-
-package() {
-    cd "${srcdir}"/s6-services
-    sh install.sh "rspamd" "${pkgdir}"
-}
diff --git a/x86_64/community/PKGBUILD b/x86_64/community/PKGBUILD
index 5799ffd..1a47653 100644
--- a/x86_64/community/PKGBUILD
+++ b/x86_64/community/PKGBUILD
@@ -1,27 +1,20 @@
 # Maintainer: Dudemanguy <dudemanguy@artixlinux.org> 
 pkgname=rspamd-s6
-pkgver=20210506
-pkgrel=2
+pkgver=20210512
+pkgrel=1
 pkgdesc="s6-rc service scripts for rspamd"
 arch=('any')
-url="https://gitea.artixlinux.org/artixlinux/packages-s6"
+url="https://gitea.artixlinux.org/artix/s6-services"
 groups=('s6-galaxy')
 provides=('init-rspamd')
 conflicts=('init-rspamd')
 depends=('rspamd' 's6-base')
-install=rspamd.install
-source=("rspamd.run" "rspamd.type")
-sha256sums=('f90bcc2768acac319b88759e50182650e38e23897d4fc3eba8ced0729ab2c8fa'
-            'd0001a150b83f68f09004c5059045cb76a3f064eed4d42ce072bc3722c118006')
-
-_inst_sv(){
-    for file in run type; do
-        if test -f "$srcdir/$1.$file"; then
-            install -Dm644 "$srcdir/$1.$file" "$pkgdir/etc/s6/sv/$1/$file"
-        fi
-    done
-}
+_commit=3cb52daad8645d2afb14e9cd026fc46c5e55fe87
+makedepends=('git')
+source=("git+https://gitea.artixlinux.org/artix/s6-services.git#commit=$_commit")
+sha256sums=('SKIP')
 
 package() {
-    _inst_sv 'rspamd'
+    cd "${srcdir}"/s6-services
+    sh install.sh "rspamd" "${pkgdir}"
 }
diff --git a/x86_64/community/rspamd.install b/x86_64/community/rspamd.install
deleted file mode 100644
index fdd6514..0000000
--- a/x86_64/community/rspamd.install
+++ /dev/null
@@ -1,5 +0,0 @@
-pre_remove() {
-    if [ -e "/run/service/rspamd" ]; then
-        s6-rc -d change rspamd
-    fi
-}
diff --git a/x86_64/community/rspamd.run b/x86_64/community/rspamd.run
deleted file mode 100644
index 4e7b143..0000000
--- a/x86_64/community/rspamd.run
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/usr/bin/execlineb -P
-s6-setuidgid rspamd exec rspamd -c /etc/rspamd/rspamd.conf -f
diff --git a/x86_64/community/rspamd.type b/x86_64/community/rspamd.type
deleted file mode 100644
index 5883cff..0000000
--- a/x86_64/community/rspamd.type
+++ /dev/null
@@ -1 +0,0 @@
-longrun