[arch-commits] Commit in apcupsd/repos/community-x86_64 (10 files)

Florian Pritz bluewind at archlinux.org
Sun Aug 30 09:42:21 UTC 2020


    Date: Sunday, August 30, 2020 @ 09:42:20
  Author: bluewind
Revision: 692589

archrelease: copy trunk to community-x86_64

Added:
  apcupsd/repos/community-x86_64/PKGBUILD
    (from rev 692588, apcupsd/trunk/PKGBUILD)
  apcupsd/repos/community-x86_64/apcupsd-3.14.4-shutdown.patch
    (from rev 692588, apcupsd/trunk/apcupsd-3.14.4-shutdown.patch)
  apcupsd/repos/community-x86_64/apcupsd-tmpfiles.conf
    (from rev 692588, apcupsd/trunk/apcupsd-tmpfiles.conf)
  apcupsd/repos/community-x86_64/apcupsd.service
    (from rev 692588, apcupsd/trunk/apcupsd.service)
  apcupsd/repos/community-x86_64/apcupsd_shutdown
    (from rev 692588, apcupsd/trunk/apcupsd_shutdown)
Deleted:
  apcupsd/repos/community-x86_64/PKGBUILD
  apcupsd/repos/community-x86_64/apcupsd-3.14.4-shutdown.patch
  apcupsd/repos/community-x86_64/apcupsd-tmpfiles.conf
  apcupsd/repos/community-x86_64/apcupsd.service
  apcupsd/repos/community-x86_64/apcupsd_shutdown

-------------------------------+
 PKGBUILD                      |  145 ++++++++++++++++++++--------------------
 apcupsd-3.14.4-shutdown.patch |   38 +++++-----
 apcupsd-tmpfiles.conf         |    6 -
 apcupsd.service               |   24 +++---
 apcupsd_shutdown              |   18 ++--
 5 files changed, 116 insertions(+), 115 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2020-08-30 09:42:16 UTC (rev 692588)
+++ PKGBUILD	2020-08-30 09:42:20 UTC (rev 692589)
@@ -1,72 +0,0 @@
-# Maintainer: Florian Pritz <bluewind at xinu.at>
-# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
-# Contributor: Todd Musall <tmusall at comcast.net>
-# Contributor: Massimiliano Torromeo <massimiliano.torromeo at gmail.com>
-
-pkgname=apcupsd
-pkgver=3.14.14
-pkgrel=5
-pkgdesc="Power mangement and controlling most of APC's UPS models"
-arch=(x86_64)
-url="http://www.apcupsd.org"
-license=('GPL')
-depends=('gcc-libs' 'systemd-sysvcompat' 'libusb-compat')
-optdepends=('gd: for CGI')
-makedepends=('gd')
-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=(https://downloads.sourceforge.net/apcupsd/$pkgname-$pkgver.tar.gz{,.sig}
-        apcupsd.service
-		apcupsd-3.14.4-shutdown.patch
-		apcupsd_shutdown
-        apcupsd-tmpfiles.conf)
-sha256sums=('db7748559b6b4c3784f9856561ef6ac6199ef7bd019b3edcd7e0a647bf8f9867'
-            'SKIP'
-            '41c79787172299f842e8edf5228d68978a83927264aa245982426b5988a64233'
-            '714468c0fbb07022ab29a58eac142eafd5aec9a0ab21e670266ebe7e760ccaf4'
-            'a5e3a4c3a47d1abdf23b0a7c3832ad5a00e1cab03fe51336a4ee5f236152a60d'
-            'a4474cfcd607c5e9b64e27eec7cbc2b0bcf08c8ea37fd1f0f28e98ac2883fd4f')
-validpgpkeys=(635B9D943945DCA05BE9AB0A24E84804A57B2D90)
-
-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 \
-		--sbindir=/usr/bin \
-		--enable-cgi --enable-usb --enable-net \
-		--with-upstype=usb --with-upscable=usb \
-		--with-serial-dev=/dev/usb/hid/hiddev[0-9] \
-		--disable-gapcmon --enable-modbus-usb
-	make
-}
-
-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"
-	install -Dm755 "$srcdir/apcupsd_shutdown" "$pkgdir/usr/lib/systemd/system-shutdown/apcupsd_shutdown"
-
-	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"
-}

Copied: apcupsd/repos/community-x86_64/PKGBUILD (from rev 692588, apcupsd/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2020-08-30 09:42:20 UTC (rev 692589)
@@ -0,0 +1,73 @@
+# Maintainer: Florian Pritz <bluewind at xinu.at>
+# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
+# Contributor: Todd Musall <tmusall at comcast.net>
+# Contributor: Massimiliano Torromeo <massimiliano.torromeo at gmail.com>
+
+pkgname=apcupsd
+pkgver=3.14.14
+pkgrel=6
+pkgdesc="Power mangement and controlling most of APC's UPS models"
+arch=(x86_64)
+url="http://www.apcupsd.org"
+license=('GPL')
+depends=('gcc-libs' 'systemd-sysvcompat' 'libusb-compat')
+optdepends=('gd: for CGI')
+makedepends=('gd')
+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=(https://downloads.sourceforge.net/apcupsd/$pkgname-$pkgver.tar.gz{,.sig}
+        apcupsd.service
+		apcupsd-3.14.4-shutdown.patch
+		apcupsd_shutdown
+        apcupsd-tmpfiles.conf)
+sha256sums=('db7748559b6b4c3784f9856561ef6ac6199ef7bd019b3edcd7e0a647bf8f9867'
+            'SKIP'
+            '41c79787172299f842e8edf5228d68978a83927264aa245982426b5988a64233'
+            '714468c0fbb07022ab29a58eac142eafd5aec9a0ab21e670266ebe7e760ccaf4'
+            'a5e3a4c3a47d1abdf23b0a7c3832ad5a00e1cab03fe51336a4ee5f236152a60d'
+            'a4474cfcd607c5e9b64e27eec7cbc2b0bcf08c8ea37fd1f0f28e98ac2883fd4f')
+validpgpkeys=(635B9D943945DCA05BE9AB0A24E84804A57B2D90)
+
+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 \
+		--sbindir=/usr/bin \
+		--enable-cgi --enable-usb --enable-net \
+		--with-upstype=usb --with-upscable=usb \
+		--with-serial-dev=/dev/usb/hid/hiddev[0-9] \
+		--disable-gapcmon --enable-modbus-usb
+	make
+}
+
+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"
+	install -Dm755 "$srcdir/apcupsd_shutdown" "$pkgdir/usr/lib/systemd/system-shutdown/apcupsd_shutdown"
+
+	chmod 755 "$pkgdir"/usr/bin/*
+	mv "$pkgdir/usr/bin/"smtp{,-$pkgname}
+
+	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"
+}

Deleted: apcupsd-3.14.4-shutdown.patch
===================================================================
--- apcupsd-3.14.4-shutdown.patch	2020-08-30 09:42:16 UTC (rev 692588)
+++ apcupsd-3.14.4-shutdown.patch	2020-08-30 09:42:20 UTC (rev 692589)
@@ -1,19 +0,0 @@
-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}

Copied: apcupsd/repos/community-x86_64/apcupsd-3.14.4-shutdown.patch (from rev 692588, apcupsd/trunk/apcupsd-3.14.4-shutdown.patch)
===================================================================
--- apcupsd-3.14.4-shutdown.patch	                        (rev 0)
+++ apcupsd-3.14.4-shutdown.patch	2020-08-30 09:42:20 UTC (rev 692589)
@@ -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}

Deleted: apcupsd-tmpfiles.conf
===================================================================
--- apcupsd-tmpfiles.conf	2020-08-30 09:42:16 UTC (rev 692588)
+++ apcupsd-tmpfiles.conf	2020-08-30 09:42:20 UTC (rev 692589)
@@ -1,3 +0,0 @@
-r /etc/apcupsd/powerfail
-r /etc/nologin
-d /run/apcupsd 0755 root root

Copied: apcupsd/repos/community-x86_64/apcupsd-tmpfiles.conf (from rev 692588, apcupsd/trunk/apcupsd-tmpfiles.conf)
===================================================================
--- apcupsd-tmpfiles.conf	                        (rev 0)
+++ apcupsd-tmpfiles.conf	2020-08-30 09:42:20 UTC (rev 692589)
@@ -0,0 +1,3 @@
+r /etc/apcupsd/powerfail
+r /etc/nologin
+d /run/apcupsd 0755 root root

Deleted: apcupsd.service
===================================================================
--- apcupsd.service	2020-08-30 09:42:16 UTC (rev 692588)
+++ apcupsd.service	2020-08-30 09:42:20 UTC (rev 692589)
@@ -1,12 +0,0 @@
-[Unit]
-Description=APC UPS Power Control Daemon for Linux
-After=syslog.target
-After=network-online.target
-
-[Service]
-ExecStartPre=-/bin/rm -f /etc/apcupsd/powerfail
-ExecStart=/sbin/apcupsd -b -f /etc/apcupsd/apcupsd.conf
-KillMode=process
-
-[Install]
-WantedBy=multi-user.target

Copied: apcupsd/repos/community-x86_64/apcupsd.service (from rev 692588, apcupsd/trunk/apcupsd.service)
===================================================================
--- apcupsd.service	                        (rev 0)
+++ apcupsd.service	2020-08-30 09:42:20 UTC (rev 692589)
@@ -0,0 +1,12 @@
+[Unit]
+Description=APC UPS Power Control Daemon for Linux
+After=syslog.target
+After=network-online.target
+
+[Service]
+ExecStartPre=-/bin/rm -f /etc/apcupsd/powerfail
+ExecStart=/sbin/apcupsd -b -f /etc/apcupsd/apcupsd.conf
+KillMode=process
+
+[Install]
+WantedBy=multi-user.target

Deleted: apcupsd_shutdown
===================================================================
--- apcupsd_shutdown	2020-08-30 09:42:16 UTC (rev 692588)
+++ apcupsd_shutdown	2020-08-30 09:42:20 UTC (rev 692589)
@@ -1,9 +0,0 @@
-#!/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

Copied: apcupsd/repos/community-x86_64/apcupsd_shutdown (from rev 692588, apcupsd/trunk/apcupsd_shutdown)
===================================================================
--- apcupsd_shutdown	                        (rev 0)
+++ apcupsd_shutdown	2020-08-30 09:42:20 UTC (rev 692589)
@@ -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



More information about the arch-commits mailing list