Update

5 files changed, 63 insertions, 63 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8ef05c8d832c..73c5f61fcb9c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,23 +1,23 @@
 pkgbase = teddit-git
 	pkgdesc = Alternative Reddit front-end focused on privacy
-	pkgver = r581.a9f1374
+	pkgver = r747.799bc83
 	pkgrel = 1
 	url = https://codeberg.org/teddit/teddit
 	arch = any
 	license = AGPL
 	makedepends = git
 	makedepends = npm
-	makedepends = jq
 	depends = nodejs
 	optdepends = redis: works as a cache for Reddit API calls
 	optdepends = ffmpeg: video support
 	provides = teddit
 	conflicts = teddit
-	source = teddit-git::git+https://codeberg.org/teddit/teddit.git#branch=main
+	backup = opt/teddit/config.js
+	source = git+https://codeberg.org/teddit/teddit
 	source = teddit.service
-	source = teddit.sh
-	sha256sums = SKIP
-	sha256sums = c66000c97266726382008e6e7a1b99719931ae87dfd0d239d15bb7c99beec7d1
-	sha256sums = 4ba3bd09a3967176f24e6f6fd44af1251d5531d344c81a23ddfeb6e355a37ae6
+	source = teddit.sysusers
+	sha512sums = SKIP
+	sha512sums = deb1a75aeb56a0d838ccb335da3588148405c285095ea14cf2fbbe35614103379971c5129602170534f0d17c7174a683b4a7352640a336abe5623d3c67fc6a8e
+	sha512sums = 2e4bb29adb1dff9bcb659ac6226ea77dd5c0d819a9ef7e014f3527ca06d7ee1637b9e6f7b6fb745eeb9e31c45dc93c456b2763e66e918bb198e184ae2fcf289c
 
 pkgname = teddit-git
diff --git a/PKGBUILD b/PKGBUILD
index 28e10e52b5af..c6035e240b66 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,67 +1,44 @@
-# Maintainer: INhBQfUQO2eFzulN <281587887a at protonmail dot ch>
+# Maintainer: MGislv <mgislv at ceppo dot xyz>
+# Contributor: INhBQfUQO2eFzulN <281587887a at protonmail dot ch>
 
-_pkgname=teddit
 pkgname=teddit-git
-pkgver=r581.a9f1374
+pkgver=r747.799bc83
 pkgrel=1
-pkgdesc="Alternative Reddit front-end focused on privacy"
+pkgdesc='Alternative Reddit front-end focused on privacy'
 arch=('any')
-url="https://codeberg.org/teddit/teddit"
+url='https://codeberg.org/teddit/teddit'
 license=('AGPL')
 depends=('nodejs')
-makedepends=('git' 'npm' 'jq')
+makedepends=('git' 'npm')
 optdepends=('redis: works as a cache for Reddit API calls'
             'ffmpeg: video support')
-provides=("$_pkgname")
-conflicts=("$_pkgname")
-source=("$pkgname::git+$url.git#branch=main"
-  "teddit.service"
-  "teddit.sh")
-sha256sums=('SKIP'
-    'c66000c97266726382008e6e7a1b99719931ae87dfd0d239d15bb7c99beec7d1'
-    '4ba3bd09a3967176f24e6f6fd44af1251d5531d344c81a23ddfeb6e355a37ae6')
+provides=('teddit')
+conflicts=('teddit')
+backup=('opt/teddit/config.js')
+source=("git+$url"
+        'teddit.service'
+        'teddit.sysusers')
+sha512sums=('SKIP'
+            'deb1a75aeb56a0d838ccb335da3588148405c285095ea14cf2fbbe35614103379971c5129602170534f0d17c7174a683b4a7352640a336abe5623d3c67fc6a8e'
+            '2e4bb29adb1dff9bcb659ac6226ea77dd5c0d819a9ef7e014f3527ca06d7ee1637b9e6f7b6fb745eeb9e31c45dc93c456b2763e66e918bb198e184ae2fcf289c')
 
 pkgver() {
-  cd "$pkgname"
-  (
-    set -o pipefail
-    git describe --long 2>/dev/null | sed 's/\([^-]*-g\)/r\1/;s/-/./g' ||
-      printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
-  )
-}
-
-build() {
-  cd "${srcdir}/${pkgname}"
-  npm install --no-optional
+	cd teddit
+	printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
 }
 
 package() {
-  install -D -m644 teddit.service -t "$pkgdir/usr/lib/systemd/system"
-
-  # Use a wrapper script as an entry point
-  install -D -m755 teddit.sh "$pkgdir/usr/bin/teddit"
-  cd "${srcdir}/${pkgname}"
-  install -d "${pkgdir}/opt/${_pkgname}"
-  cp -a * "${pkgdir}/opt/${_pkgname}"
-  cp "${pkgdir}/opt/${_pkgname}/config.js.template" "${pkgdir}/opt/${_pkgname}/config.js"
-
-  # npm gives ownership of ALL FILES to build user
-  # https://bugs.archlinux.org/task/63396
-  chown -R root:root "${pkgdir}"
+	cd teddit
+	npm install --no-optional --cache "$srcdir/npm-cache"
 
-  # Remove references to $pkgdir/$srcdir
-  find "$pkgdir" -type f -name package.json -print0 | xargs -0 sed -i "/_where/d"
+	install -d "$pkgdir/opt/teddit"
+	cp -a * "$pkgdir/opt/teddit"
 
-  local tmppackage="$(mktemp)"
-  local pkgjson="$pkgdir/opt/$_pkgname/package.json"
-  jq '.|=with_entries(select(.key|test("_.+")|not))' "$pkgjson" >"$tmppackage"
-  mv "$tmppackage" "$pkgjson"
-  chmod 644 "$pkgjson"
+	# npm gives ownership of ALL FILES to build user
+	# https://bugs.archlinux.org/task/63396
+	chown -R root:root "$pkgdir"
 
-  find "$pkgdir" -type f -name package.json | while read pkgjson; do
-    local tmppackage="$(mktemp)"
-    jq 'del(.man)' "$pkgjson" >"$tmppackage"
-    mv "$tmppackage" "$pkgjson"
-    chmod 644 "$pkgjson"
-  done
+	install -Dm644 "$srcdir/teddit.service" -t "$pkgdir/usr/lib/systemd/system"
+	install -Dm644 "$srcdir/teddit.sysusers" "$pkgdir/usr/lib/sysusers.d/teddit.conf"
+	install -Dm644 config.js.template "$pkgdir/opt/teddit/config.js"
 }
diff --git a/teddit.service b/teddit.service
index 73bbfc48d738..a5c6feb52234 100644
--- a/teddit.service
+++ b/teddit.service
@@ -1,9 +1,35 @@
 [Unit]
 Description=Teddit Daemon
-After=network.service
+After=network.target
+After=redis.service
 
 [Service]
-ExecStart=/usr/bin/teddit
+User=teddit
+Group=teddit
+Type=simple
+WorkingDirectory=/opt/teddit
+Restart=always
+RestartSec=2s
+ReadWritePaths=/opt/teddit
+ExecStart=/usr/bin/node app.js
+PrivateTmp=true
+CapabilityBoundingSet=
+NoNewPrivileges=true
+LockPersonality=true
+PrivateDevices=true
+ProtectClock=true
+ProtectControlGroups=true
+ProtectHome=true
+ProtectHostname=true
+ProtectKernelLogs=true
+ProtectKernelModules=true
+ProtectKernelTunables=true
+ProtectProc=noaccess
+ProtectSystem=strict
+RestrictNamespaces=true
+RestrictRealtime=true
+RestrictSUIDSGID=true
+SystemCallArchitectures=native
 
 [Install]
 WantedBy=multi-user.target
diff --git a/teddit.sh b/teddit.sh
deleted file mode 100644
index fe1a0104dd6e..000000000000
--- a/teddit.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/bash
-
-cd /opt/teddit/ &&
-    exec node app.js
diff --git a/teddit.sysusers b/teddit.sysusers
new file mode 100644
index 000000000000..9c792893e555
--- /dev/null
+++ b/teddit.sysusers
@@ -0,0 +1 @@
+u teddit - "Teddit daemon user"