From 7a82541aeee6cee621c495bffbe4341bb2fe4cf6 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Mon, 1 Dec 2014 13:22:20 +0000
Subject: apcupsd: update to 3.14.12

---
 abs/extra/apcupsd/PKGBUILD              | 37 +++++++++++++++++++++++++--------
 abs/extra/apcupsd/apcupsd-tmpfiles.conf |  3 ++-
 2 files changed, 30 insertions(+), 10 deletions(-)

diff --git a/abs/extra/apcupsd/PKGBUILD b/abs/extra/apcupsd/PKGBUILD
index 31a3cfa..936ae52 100644
--- a/abs/extra/apcupsd/PKGBUILD
+++ b/abs/extra/apcupsd/PKGBUILD
@@ -1,11 +1,12 @@
 # $Id$
+# Maintainer: Florian Pritz <bluewind@xinu.at>
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Maintainer: Todd Musall <tmusall@comcast.net>
-# Maintainer: Massimiliano Torromeo <massimiliano.torromeo@gmail.com>
+# Contributor: Todd Musall <tmusall@comcast.net>
+# Contributor: Massimiliano Torromeo <massimiliano.torromeo@gmail.com>
 
 pkgname=apcupsd
-pkgver=3.14.10
-pkgrel=7
+pkgver=3.14.12
+pkgrel=3
 pkgdesc="Power mangement and controlling most of APC's UPS models"
 arch=(i686 x86_64)
 url="http://www.apcupsd.org"
@@ -16,14 +17,24 @@ optdepends=('gd: for CGI'
             'gconf: for frontend'
             'gtk2: for frontend')
 makedepends=('pkgconfig' 'gd' 'gconf' 'gtk2')
-backup=(etc/apcupsd/apcupsd.conf etc/apcupsd/hosts.conf
-        etc/apcupsd/multimon.conf)
-source=(http://downloads.sourceforge.net/apcupsd/$pkgname-$pkgver.tar.gz
+backup=(etc/apcupsd/apcupsd.conf
+        etc/apcupsd/hosts.conf
+        etc/apcupsd/multimon.conf
+        etc/apcupsd/apcupsd.css
+        etc/apcupsd/changeme
+        etc/apcupsd/commfailure
+        etc/apcupsd/commok
+        etc/apcupsd/offbattery
+        etc/apcupsd/onbattery
+        etc/apcupsd/apccontrol)
+source=(http://downloads.sourceforge.net/apcupsd/$pkgname-$pkgver.tar.gz{,.sig}
         apcupsd.service
         apcupsd-tmpfiles.conf)
-sha256sums=('0707b5ec9916fbde9e44eb8d18037c8d8f75dfd6aeef51aba5487e189eef2032'
+sha256sums=('1b4f703cb19cfdf44daf173dc8394cafd30fee0b30a0c75a7d19db622454a440'
+            'SKIP'
             '145e88863335f077fc354b4d263b15f64af67b45a10ed37c68ebd468181e23f7'
-            'b00cd1a31de70a172698d486583aa79113b99c1bb4b882ab906d0e37504d7f55')
+            'a4474cfcd607c5e9b64e27eec7cbc2b0bcf08c8ea37fd1f0f28e98ac2883fd4f')
+validpgpkeys=(635B9D943945DCA05BE9AB0A24E84804A57B2D90)
 
 build() {
 	cd "$srcdir/$pkgname-$pkgver"
@@ -38,10 +49,18 @@ build() {
 
 package() {
 	cd "$srcdir/$pkgname-$pkgver"
+
 	make DESTDIR="$pkgdir" install
+
+	sed -i 's#^LOCKFILE .*$#LOCKFILE /run/apcupsd#' "$pkgdir/etc/apcupsd/apcupsd.conf"
+
 	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"
+
 	chmod 755 "$pkgdir"/usr/bin/*
+
 	install -dm755 "$pkgdir/usr/lib/$pkgname/cgi-bin"
 	mv "$pkgdir"/etc/apcupsd/*.cgi "$pkgdir/usr/lib/$pkgname/cgi-bin"
+
+	rm -rf "$pkgdir/usr/share/hal"
 }
diff --git a/abs/extra/apcupsd/apcupsd-tmpfiles.conf b/abs/extra/apcupsd/apcupsd-tmpfiles.conf
index 0ceb410..60f8316 100644
--- a/abs/extra/apcupsd/apcupsd-tmpfiles.conf
+++ b/abs/extra/apcupsd/apcupsd-tmpfiles.conf
@@ -1,2 +1,3 @@
 r /etc/apcupsd/powerfail
-r /etc/nologin
\ No newline at end of file
+r /etc/nologin
+d /run/apcupsd 0755 root root
-- 
cgit v0.12

