[trunk] -> [community-staging] 'znc-s6-20210511-1' add

trunk/PKGBUILD

@@ -1,35 +1,21 @@
 # Maintainer: Dudemanguy <dudemanguy@artixlinux.org>
 # Contributor: Nathan Owens <ndowens@artixlinux.org> 
 pkgname=znc-s6
-pkgver=20210506
+pkgver=20210511
 pkgrel=1
 pkgdesc="s6-rc service scripts for znc"
 arch=('any')
-url="https://gitea.artixlinux.org/artixlinux/packages-s6"
+url="https://gitea.artixlinux.org/artix/s6-services"
 groups=('s6-galaxy')
 provides=('init-znc')
 conflicts=('init-znc')
 depends=('znc' 's6-base')
-install=znc.install
-backup=('etc/s6/sv/znc-log/conf')
-source=("znc-srv."{type,run,producer-for}
-        "znc-log."{type,run,conf,pipeline-name,consumer-for,notification-fd})
-b2sums=('d64d49cff4f8f99eb08cf0a31d20f5b6908fabfcc055feab7d5b260bbdae4a39fc5e7be8d91a0d8f97ffe6da2d3924c4c3fa91be18130bc144fdd42a8e63de85'
-        '2b61b40a161d3ba5f0efdbc8a1774ac883781ecfe27fac620491a12d588e5b99a40f109dfe13e53f892f5cd21be8188c39c763cc3620623caf8db2e1c9a3bcd9'
-        '1e150baf8a89d8741a3f8b026d53d21c71a1f61e9f5f382129161617ed1935d148845b6e319ef48bbe24b5dbe6fb740a59d2c61d5424efdb2b3fde19e4e1d84d'
-        'd64d49cff4f8f99eb08cf0a31d20f5b6908fabfcc055feab7d5b260bbdae4a39fc5e7be8d91a0d8f97ffe6da2d3924c4c3fa91be18130bc144fdd42a8e63de85'
-        '5ae3b996e0a43e479cb31eafd526a3bfb5a3aa4a1ef4d0ba98605c0ef28237a58ed6b3b7d25a2bb09ece4b7d38a0f45676d64f49db5342c8d0d9635f78b0db14'
-        '2a517d2f5dc7ddbfb2e24054c863167044f2ac414cc636f60d86b6373592ab6e960d42a8ef5c0058b186099a92b5b98915753f9b80220aed9003e7beb987ef05'
-        '94bdce7257d4295c0f5007c561ec225dddbb9328830de494530f04080a2acc6c9972969e3594ec63f8c6a96f894fd74063135d689e33f4ecab5901cc4f66c0ab'
-        '2244dfedd18317f11b7fe7cb243fac82c4230434de242418c951f42daa6ce9c72f10d42cb788fe735e735a10a3c539064a369a915ccf9ce1d1203a798d302219'
-        'dfb4f0a38f1ba4731ab1e568b7ec45fa2977d1661b5d1b3a7bb79d49b900d7849a78ef67af65243b357d8a209f379e6f026f86efdce430256f6fadc8ce2b0a49')
+makedepends=('git')
+backup=('etc/s6/config/znc.conf')
+source=("git+https://gitea.artixlinux.org/artix/s6-services.git")
+sha256sums=('SKIP')
 
 package() {
-  for _srv in znc-srv.{type,run,producer-for}; do
-    install -Dm644 "$_srv" "$pkgdir"/etc/s6/sv/znc-srv/${_srv/znc-srv./}
-  done
-  
-  for _log in znc-log.{type,run,consumer-for,notification-fd,pipeline-name,conf}; do
-    install -Dm644 "$_log" "$pkgdir"/etc/s6/sv/znc-log/${_log/znc-log./}
-  done
+    cd "${srcdir}"/s6-services
+    sh install.sh "znc" "${pkgdir}"
 }

trunk/znc-log.conf

@@ -1,2 +0,0 @@
-# This configures the directives used for s6-log in the log service.
-DIRECTIVES="n3 s2000000 T"

trunk/znc-log.consumer-for

@@ -1 +0,0 @@
-znc-srv

trunk/znc-log.notification-fd

@@ -1 +0,0 @@
-3

trunk/znc-log.pipeline-name

@@ -1 +0,0 @@
-znc

trunk/znc-log.run

@@ -1,5 +0,0 @@
-#!/usr/bin/execlineb -P
-foreground { if -n -t { test -d /var/log/znc } install -d -m 0755 -o s6log -g s6log /var/log/znc }
-envfile /etc/s6/sv/znc-log/conf
-importas -sCiu DIRECTIVES DIRECTIVES
-s6-setuidgid s6log exec -c s6-log -d3 -b -- ${DIRECTIVES} /var/log/znc

trunk/znc-log.type

@@ -1 +0,0 @@
-longrun

trunk/znc-srv.producer-for

@@ -1 +0,0 @@
-znc-log

trunk/znc-srv.run

@@ -1,3 +0,0 @@
-#!/usr/bin/execlineb -P
-fdmove -c 2 1
-s6-setuidgid znc exec znc -f -d /var/lib/znc

trunk/znc-srv.type

@@ -1 +0,0 @@
-longrun

trunk/znc.install

@@ -1,10 +0,0 @@
-pre_remove() {
-    if [ -e "/run/service/znc-srv" ]; then
-        s6-rc -d change znc
-    fi
-}
-
-post_remove() {
-    rm -rf /etc/s6/sv/znc-log
-    rm -rf /etc/s6/sv/znc-srv
-}

x86_64/community-staging/PKGBUILD

@@ -0,0 +1,21 @@
+# Maintainer: Dudemanguy <dudemanguy@artixlinux.org>
+# Contributor: Nathan Owens <ndowens@artixlinux.org> 
+pkgname=znc-s6
+pkgver=20210511
+pkgrel=1
+pkgdesc="s6-rc service scripts for znc"
+arch=('any')
+url="https://gitea.artixlinux.org/artix/s6-services"
+groups=('s6-galaxy')
+provides=('init-znc')
+conflicts=('init-znc')
+depends=('znc' 's6-base')
+makedepends=('git')
+backup=('etc/s6/config/znc.conf')
+source=("git+https://gitea.artixlinux.org/artix/s6-services.git")
+sha256sums=('SKIP')
+
+package() {
+    cd "${srcdir}"/s6-services
+    sh install.sh "znc" "${pkgdir}"
+}