packaging update

4 files changed, 26 insertions, 38 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c0323d0b279a..b5e6a0076983 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,16 +1,15 @@
 pkgbase = prelockd
-	pkgdesc = prelockd is a daemon that locks memory mapped binaries and libraries in memory to improve system responsiveness under low-memory conditions.
+	pkgdesc = Lock executables, shared libraries in memory to improve responsiveness
 	pkgver = 0.9
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/hakavlad/prelockd
-	install = prelockd.install
 	arch = any
 	license = MIT
 	depends = python
-	conflicts = prelockd
 	backup = etc/prelockd.conf
-	source = prelockd::https://github.com/hakavlad/prelockd/archive/v0.9.tar.gz
-	md5sums = SKIP
+	source = prelockd-0.9.tar.gz::https://github.com/hakavlad/prelockd/archive/v0.9.tar.gz
+	source = prelockd.sysusers.conf
+	sha256sums = bfe11818b987aa44021a47b03a0cd40beaee8552304498d18907652dc035221f
+	sha256sums = 160f934b59f69de6d7915ea2afdc47fa05ec7c08b9577017a6ec1a36d322bc3c
 
 pkgname = prelockd
-
diff --git a/PKGBUILD b/PKGBUILD
index 3c4a2b89778d..10e05cc4b743 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,35 +1,34 @@
-# Maintainer: Librewish <librewish AT gmail.com>
+# Maintainer: Luis Martinez <luis dot martinez at disroot dot org>
+# Contributor: Librewish <librewish AT gmail.com>
 
-_pkgname=prelockd
-pkgname=${_pkgname}
+pkgname=prelockd
 pkgver=0.9
-pkgrel=1
-pkgdesc="prelockd is a daemon that locks memory mapped binaries and libraries in memory to improve system responsiveness under low-memory conditions."
+pkgrel=2
+pkgdesc="Lock executables, shared libraries in memory to improve responsiveness"
 arch=('any')
 url="https://github.com/hakavlad/prelockd"
 license=('MIT')
-source=(
-	"$pkgname::https://github.com/hakavlad/prelockd/archive/v${pkgver}.tar.gz"
-)
-md5sums=('SKIP')
-depends=(
-	'python'
-)
+depends=('python')
+backup=('etc/prelockd.conf')
+source=("$pkgname-$pkgver.tar.gz::$url/archive/v$pkgver.tar.gz"
+        "$pkgname.sysusers.conf")
+sha256sums=('bfe11818b987aa44021a47b03a0cd40beaee8552304498d18907652dc035221f'
+            '160f934b59f69de6d7915ea2afdc47fa05ec7c08b9577017a6ec1a36d322bc3c')
 
-conflicts=("${_pkgname}")
-install=${_pkgname}.install
-backup=(
-	'etc/prelockd.conf'
-)
+prepare() {
+	cd "$pkgname-$pkgver"
+	sed -i '38d;46d' Makefile
+}
 
 package() {
-	cd "${srcdir}/${pkgname}-${pkgver}" || exit 2
+	cd "$pkgname-$pkgver"
 	make \
-		DESTDIR="${pkgdir}" \
+		DESTDIR="$pkgdir" \
 		PREFIX="/usr" \
 		SBINDIR="/usr/bin" \
 		SYSCONFDIR="/etc" \
 		SYSTEMDUNITDIR="/usr/lib/systemd/system" \
-		install
+		base units
 	install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+	install -Dm644 "$srcdir/$pkgname.sysusers.conf" "$pkgdir/usr/lib/sysusers.d/$pkgname.conf"
 }
diff --git a/prelockd.install b/prelockd.install
deleted file mode 100644
index 1c45a158da92..000000000000
--- a/prelockd.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-    id "prelockd" &>/dev/null || useradd -r -M -s /bin/false prelockd
-}
-
-post_upgrade() {
-    id "prelockd" &>/dev/null || useradd -r -M -s /bin/false prelockd
-}
-
-post_remove() {
-    userdel prelockd
-}
diff --git a/prelockd.sysusers.conf b/prelockd.sysusers.conf
new file mode 100644
index 000000000000..44e9f1fae3b6
--- /dev/null
+++ b/prelockd.sysusers.conf
@@ -0,0 +1 @@
+u prelockd - "prelockd system user"