From 0ab2dac3f9fbd859443453662d7d339a24057d39 Mon Sep 17 00:00:00 2001
From: Jakub Jirutka <jakub@jirutka.cz>
Date: Sun, 5 Mar 2017 23:11:01 +0100
Subject: testing/nut: improve abuild and scripts a bit and rebuild

---
 testing/nut/APKBUILD        | 22 ++++++++--------------
 testing/nut/nut.pre-install |  4 ++--
 testing/nut/upsd.initd      |  4 ++--
 testing/nut/upsmon.initd    |  2 +-
 4 files changed, 13 insertions(+), 19 deletions(-)

(limited to 'testing/nut')

diff --git a/testing/nut/APKBUILD b/testing/nut/APKBUILD
index bf9efaf21d6..bbeb5f7fe08 100644
--- a/testing/nut/APKBUILD
+++ b/testing/nut/APKBUILD
@@ -3,13 +3,13 @@
 # Maintainer: Kozak Ivan <kozak-iv@yandex.ru>
 pkgname=nut
 pkgver=2.7.4
-pkgrel=0
+pkgrel=1
 pkgdesc="Network UPS tools - server"
 url="http://www.networkupstools.org"
 arch="all"
 license="GPL"
-depends_dev="libusb-compat-dev net-snmp-dev neon-dev libtool autoconf automake"
-makedepends="$depends_dev"
+depends_dev="libressl-dev libusb-compat-dev net-snmp-dev neon-dev"
+makedepends="$depends_dev libtool autoconf automake"
 pkgusers="nut"
 pkggroups="nut"
 install="$pkgname.pre-install"
@@ -19,7 +19,7 @@ source="http://www.networkupstools.org/source/2.7/$pkgname-$pkgver.tar.gz
 	upsd.initd
 	upsmon.initd
 	"
-builddir="$srcdir"/$pkgname-$pkgver
+builddir="$srcdir/$pkgname-$pkgver"
 
 build() {
 	cd "$builddir"
@@ -53,7 +53,9 @@ build() {
 }
 
 package() {
+	local i
 	cd "$builddir"
+
 	make DESTDIR="$pkgdir" install || return 1
 	chmod -R 640 "$pkgdir"/etc/nut || return 1
 	chown -R root:nut "$pkgdir"/etc/nut || return 1
@@ -68,15 +70,7 @@ package() {
 	done
 }
 
-md5sums="3ba53656933d7471f95140b32a5b8d5c  nut-2.7.4.tar.gz
-bc62400005fdb77637d6e0002c6aaad6  nut.confd
-a95924ff4895c08e785a2c36c31d2f8e  upsd.initd
-e294774dcacce44c0d5a3abd3af21a92  upsmon.initd"
-sha256sums="980e82918c52d364605c0703a5dcf01f74ad2ef06e3d365949e43b7d406d25a7  nut-2.7.4.tar.gz
-3557d7db3e90f09f350f1651dbe2714ee5317735f3cccfed087462c34f1b55a2  nut.confd
-2a760088f3d73010ccd78277352eb3ea68ddf7e5884570624299833bc7f5d1c4  upsd.initd
-60f9afbe2a69087d10b353e49460aa436d5f307eafbd83f31640a5f83881954f  upsmon.initd"
 sha512sums="320c4aff85d8a370c5eff77d33924fdfc3caf6a250620693cdd5bf3336b3a80d8a207488eee841bcf8b72fbad68fda4c074e63b99c56e7886716fc934122d11a  nut-2.7.4.tar.gz
 de59b3ab84553780874aeb9edf5faaa1fe19144406f58d40e878cc4cf520440d95a57645a6e3fdd84fdec77c6840ab2185b9554a423f7b9b8b6bca4a1795fb78  nut.confd
-d578a4a383d15adb8d285c49e540c2177875a80396816ac70048a3d269d841c8c56c9ddc45b8062572ee899f19061630296f4d28e00c0c72fefdee98802126f8  upsd.initd
-38b14cde133fe940923efdf3d6b4faf6e87c779025ee28143855d0b659c7e6916bbe509599e6310abcbd91a2a85627351eda9e332f8f48317b736d486191176c  upsmon.initd"
+1a4b8ee42eb62b68170ef72e87115ae135905135d5d9bd48e837d18c73229c9da66e53cde4289faa1f4fdc2446195b3047bc1a66ae33bfb14cffb19dac403eb5  upsd.initd
+d80f35af1e8ea2bb0da35af6a9bd2bfbc3b92d0cc0765a4d10d6cdce925225bb8200c7d9d2d77b1e5cc47593198dec3678403358538401f97644c61d8516adfb  upsmon.initd"
diff --git a/testing/nut/nut.pre-install b/testing/nut/nut.pre-install
index f55657454e3..2e3c642ca99 100644
--- a/testing/nut/nut.pre-install
+++ b/testing/nut/nut.pre-install
@@ -1,8 +1,8 @@
 #!/bin/sh
 
 if ! getent passwd nut; then
-    addgroup -S -g 84 nut 2>/dev/null
-    adduser -SDH -u 84 -h /var/run/nut -s /sbin/nologin -g nut nut 2>/dev/null
+	addgroup -S -g 84 nut 2>/dev/null
+	adduser -SDH -u 84 -h /run/nut -s /sbin/nologin -g nut nut 2>/dev/null
 fi
 
 adduser nut uucp 2>/dev/null
diff --git a/testing/nut/upsd.initd b/testing/nut/upsd.initd
index ccfac08fda7..c765c59b87c 100644
--- a/testing/nut/upsd.initd
+++ b/testing/nut/upsd.initd
@@ -1,7 +1,7 @@
 #!/sbin/openrc-run
 
 name=nut-server
-pidfile=/var/run/nut/upsd.pid
+pidfile=/run/nut/upsd.pid
 command=/usr/sbin/upsd
 required_files="/etc/nut/nut.conf /etc/nut/upsd.conf"
 extra_started_commands="reload"
@@ -34,6 +34,6 @@ stop_post() {
 
 reload() {
 	ebegin "Reloading $name"
-	start-stop-daemon --signal HUP --pidfile ${pidfile}
+	start-stop-daemon --signal HUP --pidfile "$pidfile"
 	eend $?
 }
diff --git a/testing/nut/upsmon.initd b/testing/nut/upsmon.initd
index 468e514111a..62adaf22dd7 100644
--- a/testing/nut/upsmon.initd
+++ b/testing/nut/upsmon.initd
@@ -1,7 +1,7 @@
 #!/sbin/openrc-run
 
 name=nut-monitor
-pidfile=/var/run/upsmon.pid
+pidfile=/run/upsmon.pid
 command=/usr/sbin/upsmon
 required_files="/etc/nut/nut.conf /etc/nut/upsmon.conf"
 extra_started_commands="reload"
-- 
cgit v1.2.3