[arch-commits] Commit in apcupsd/trunk (4 files)

[Florian Pritz]

    Date: Tuesday, May 29, 2018 @ 18:18:14
  Author: bluewind
Revision: 333185

upgpkg: apcupsd 3.14.14-3

Fix FS#58744 - [apcupsd] Numerous issues in apcupsd. Please merge in fixes found in other Linux distributions.

Added:
  apcupsd/trunk/apcupsd-3.14.4-shutdown.patch
  apcupsd/trunk/apcupsd_shutdown
Modified:
  apcupsd/trunk/PKGBUILD
  apcupsd/trunk/apcupsd.service

-------------------------------+
 PKGBUILD                      |   20 +++++++++++++-------
 apcupsd-3.14.4-shutdown.patch |   19 +++++++++++++++++++
 apcupsd.service               |    8 ++++++--
 apcupsd_shutdown              |    9 +++++++++
 4 files changed, 47 insertions(+), 9 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-05-29 17:27:34 UTC (rev 333184)
+++ PKGBUILD	2018-05-29 18:18:14 UTC (rev 333185)
@@ -6,7 +6,7 @@
 
 pkgname=apcupsd
 pkgver=3.14.14
-pkgrel=2
+pkgrel=3
 pkgdesc="Power mangement and controlling most of APC's UPS models"
 arch=(x86_64)
 url="http://www.apcupsd.org"
@@ -28,17 +28,22 @@
         etc/apcupsd/apccontrol)
 source=(http://downloads.sourceforge.net/apcupsd/$pkgname-$pkgver.tar.gz{,.sig}
         apcupsd.service
+		apcupsd-3.14.4-shutdown.patch
+		apcupsd_shutdown
         apcupsd-tmpfiles.conf)
-sha256sums=('57ecbde01d0448bf8c4dbfe0ad016724ae66ab98adf2de955bf2be553c5d03f9'
+sha256sums=('db7748559b6b4c3784f9856561ef6ac6199ef7bd019b3edcd7e0a647bf8f9867'
             'SKIP'
-            '145e88863335f077fc354b4d263b15f64af67b45a10ed37c68ebd468181e23f7'
+            '41c79787172299f842e8edf5228d68978a83927264aa245982426b5988a64233'
+            '714468c0fbb07022ab29a58eac142eafd5aec9a0ab21e670266ebe7e760ccaf4'
+            'a5e3a4c3a47d1abdf23b0a7c3832ad5a00e1cab03fe51336a4ee5f236152a60d'
             'a4474cfcd607c5e9b64e27eec7cbc2b0bcf08c8ea37fd1f0f28e98ac2883fd4f')
 validpgpkeys=(635B9D943945DCA05BE9AB0A24E84804A57B2D90)
-sha256sums=('db7748559b6b4c3784f9856561ef6ac6199ef7bd019b3edcd7e0a647bf8f9867'
-            'SKIP'
-            '145e88863335f077fc354b4d263b15f64af67b45a10ed37c68ebd468181e23f7'
-            'a4474cfcd607c5e9b64e27eec7cbc2b0bcf08c8ea37fd1f0f28e98ac2883fd4f')
 
+prepare() {
+	cd "$srcdir/$pkgname-$pkgver"
+	patch -p1 -i "$srcdir/apcupsd-3.14.4-shutdown.patch"
+}
+
 build() {
 	cd "$srcdir/$pkgname-$pkgver"
 	./configure --prefix=/usr  --libexecdir=/usr/lib/$pkgname \
@@ -59,6 +64,7 @@
 
 	install -Dm644 "$srcdir/apcupsd.service" "$pkgdir/usr/lib/systemd/system/apcupsd.service"
 	install -Dm644 "$srcdir/apcupsd-tmpfiles.conf" "$pkgdir/usr/lib/tmpfiles.d/apcupsd.conf"
+	install -Dm755 "$srcdir/apcupsd_shutdown" "$pkgdir/usr/lib/systemd/system-shutdown/apcupsd_shutdown"
 
 	chmod 755 "$pkgdir"/usr/bin/*
 

Added: apcupsd-3.14.4-shutdown.patch
===================================================================
--- apcupsd-3.14.4-shutdown.patch	                        (rev 0)
+++ apcupsd-3.14.4-shutdown.patch	2018-05-29 18:18:14 UTC (rev 333185)
@@ -0,0 +1,19 @@
+This is needed to properly halt the machine without powering it down.
+
+See:
+  https://bugzilla.redhat.com/show_bug.cgi?id=348701
+  https://bugzilla.redhat.com/show_bug.cgi?id=1442577
+
+
+diff -up apcupsd-3.14.4/platforms/apccontrol.in.shutdown apcupsd-3.14.4/platforms/apccontrol.in
+--- apcupsd-3.14.4/platforms/apccontrol.in.shutdown	2008-05-28 09:15:47.000000000 +0200
++++ apcupsd-3.14.4/platforms/apccontrol.in	2008-05-28 09:16:04.000000000 +0200
+@@ -104,7 +104,7 @@ case "$1" in
+     ;;
+     doshutdown)
+ 	echo "UPS ${2} initiated Shutdown Sequence" | ${WALL}
+-	${SHUTDOWN} -h now "apcupsd UPS ${2} initiated shutdown"
++	${SHUTDOWN} -h -H now "apcupsd UPS ${2} initiated shutdown"
+     ;;
+     annoyme)
+ 	echo "Power problems with UPS ${2}. Please logoff." | ${WALL}

Modified: apcupsd.service
===================================================================
--- apcupsd.service	2018-05-29 17:27:34 UTC (rev 333184)
+++ apcupsd.service	2018-05-29 18:18:14 UTC (rev 333185)
@@ -1,8 +1,12 @@
 [Unit]
-Description=APC UPS Monitor
+Description=APC UPS Power Control Daemon for Linux
+After=syslog.target
+After=network-online.target
 
 [Service]
-ExecStart=/usr/bin/apcupsd -b
+ExecStartPre=-/bin/rm -f /etc/apcupsd/powerfail
+ExecStart=/sbin/apcupsd -b -f /etc/apcupsd/apcupsd.conf
+KillMode=process
 
 [Install]
 WantedBy=multi-user.target

Added: apcupsd_shutdown
===================================================================
--- apcupsd_shutdown	                        (rev 0)
+++ apcupsd_shutdown	2018-05-29 18:18:14 UTC (rev 333185)
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+# See if this is a powerfail situation.
+if [ -f /etc/apcupsd/powerfail ]; then
+  echo
+  echo "APCUPSD will now power off the UPS"
+  echo
+  /etc/apcupsd/apccontrol killpower
+fi