powerpanel: update to 1.4.2

4 files changed, 63 insertions, 43 deletions

diff --git a/linhes/powerpanel/.SRCINFO b/linhes/powerpanel/.SRCINFO
index da52b41..25af9a9 100644
--- a/linhes/powerpanel/.SRCINFO
+++ b/linhes/powerpanel/.SRCINFO
@@ -1,27 +1,27 @@
 pkgbase = powerpanel
 	pkgdesc = CyberPower UPS daemon
-	pkgver = 1.4.1
+	pkgver = 1.4.2
 	pkgrel = 3
-	url = https://www.cyberpowersystems.com/product/software/powerpanel-for-linux/
+	url = https://www.cyberpowersystems.com/product/software/power-panel-personal/powerpanel-personal-linux/
 	arch = x86_64
 	arch = i686
-	license = custom:CyberPower
-	depends = libusb
-	depends = openssl-1.1
-	depends = paho-mqtt-c
+	license = LicenseRef-CyberPower
+	options = staticlibs
 	backup = etc/powerpanel/pwrstatd-powerfail.sh
 	backup = etc/powerpanel/pwrstatd-lowbatt.sh
 	backup = etc/powerpanel/pwrstatd-email.sh
 	backup = etc/powerpanel/hibernate.sh
 	backup = etc/powerpanel/shutdown.sh
 	backup = etc/pwrstatd.conf
-	source = pwrstatd.service
 	source = hibernate.sh
 	source = shutdown.sh
-	source = https://dl4jz3rbrsfum.cloudfront.net/software/PPL_64bit_v1.4.1.tar..gz
-	sha256sums = 255e5958346daa9d7c0e96ae3d86095afd3b3ec99880205d15d51b8f20a602df
+	source = pwrstatd.service
 	sha256sums = c710ea7765a24fb469adf601f44c8d3857634336bdfc263434ce86c3d67a4a80
 	sha256sums = 10badc96b0ac990959ddc53d1d1cbba6b904e648b54d0eea085194e48d6a0998
-	sha256sums = 6240dae59202531df91ccf0655cf6c61120fe64dc14642c46579366ed0d8212d
+	sha256sums = 9a9e8d4156351542acc55c74ca37aa34297709ac000dccd9e370c731591e0d2e
+	source_x86_64 = https://dl4jz3rbrsfum.cloudfront.net/software/PPL_64bit_v1.4.2.tar.gz
+	sha256sums_x86_64 = f257af0fcb5c5df8ba2732b1e0a8a427608f6cef9a7c6ce8ed83d2db2078b859
+	source_i686 = https://dl4jz3rbrsfum.cloudfront.net/software/PPL_32bit_v1.4.2.tar.gz
+	sha256sums_i686 = d7ae8ec3c27cb5525fb5cdd840c8e17785294084296b3277f5218d18e97f3f25
 
 pkgname = powerpanel
diff --git a/linhes/powerpanel/.gitignore b/linhes/powerpanel/.gitignore
new file mode 100644
index 0000000..e0cb85a
--- /dev/null
+++ b/linhes/powerpanel/.gitignore
@@ -0,0 +1,7 @@
+*
+!.gitignore
+!.SRCINFO
+!PKGBUILD
+!pwrstatd.service
+!hibernate.sh
+!shutdown.sh
diff --git a/linhes/powerpanel/PKGBUILD b/linhes/powerpanel/PKGBUILD
index 4630553..afd68f9 100644
--- a/linhes/powerpanel/PKGBUILD
+++ b/linhes/powerpanel/PKGBUILD
@@ -1,73 +1,80 @@
-# Maintainer: David Gonzalez <neko.eth0 AT gmail DOT com>
+# Maintainer: 0x2501 <0x2501 [at] sol740.net>
 # Contributor: 10101000 <10101000_proton [at] pm.me>
 # Contributor: Jeff Henson <jeff [at] henson.io>
 # Contributor: Justin Settle <jus10 [at] partlycloudy.org>
 # Contributor: Kyle Keen <keenerd [at] gmail.com>, das-ich <das-ich [at] yandex.ru>
 
 pkgname=powerpanel
-pkgver=1.4.1
+pkgver=1.4.2
 pkgrel=3
 pkgdesc="CyberPower UPS daemon"
 arch=("x86_64" "i686")
-url="https://www.cyberpowersystems.com/product/software/powerpanel-for-linux/"
-license=("custom:CyberPower")
-depends=('libusb' 'openssl-1.1' 'paho-mqtt-c')
+url="https://www.cyberpowersystems.com/product/software/power-panel-personal/powerpanel-personal-linux/"
+license=("LicenseRef-CyberPower")
+options=('staticlibs')
 backup=(etc/powerpanel/pwrstatd-{powerfail,lowbatt,email}.sh
         etc/powerpanel/{hibernate,shutdown}.sh
         etc/pwrstatd.conf)
-
-source=('pwrstatd.service'
-        'hibernate.sh'
-        'shutdown.sh')
-sha256sums=('255e5958346daa9d7c0e96ae3d86095afd3b3ec99880205d15d51b8f20a602df'
-            'c710ea7765a24fb469adf601f44c8d3857634336bdfc263434ce86c3d67a4a80'
+source=('hibernate.sh'
+        'shutdown.sh'
+        'pwrstatd.service')
+source_x86_64=("https://dl4jz3rbrsfum.cloudfront.net/software/PPL_64bit_v${pkgver}.tar.gz")
+source_i686=("https://dl4jz3rbrsfum.cloudfront.net/software/PPL_32bit_v${pkgver}.tar.gz")
+sha256sums=('c710ea7765a24fb469adf601f44c8d3857634336bdfc263434ce86c3d67a4a80'
             '10badc96b0ac990959ddc53d1d1cbba6b904e648b54d0eea085194e48d6a0998'
-            '6240dae59202531df91ccf0655cf6c61120fe64dc14642c46579366ed0d8212d')
-
-if [[ $CARCH = 'x86_64' ]]; then
-  # Filename has two dots at the source
-  source+=("https://dl4jz3rbrsfum.cloudfront.net/software/PPL_64bit_v${pkgver}.tar..gz")
-fi
-
-if [[ $CARCH = 'i686' ]]; then
-  source+=("https://dl4jz3rbrsfum.cloudfront.net/software/PPL_32bit_v${pkgver}.tar.gz")
-fi
+            '9a9e8d4156351542acc55c74ca37aa34297709ac000dccd9e370c731591e0d2e')
+sha256sums_x86_64=('f257af0fcb5c5df8ba2732b1e0a8a427608f6cef9a7c6ce8ed83d2db2078b859')
+sha256sums_i686=('d7ae8ec3c27cb5525fb5cdd840c8e17785294084296b3277f5218d18e97f3f25')
 
 package() {
   cd "${srcdir}/$pkgname-$pkgver"
 
   # PowerPanel for Linux client program
-  install -Dm755 bin/pwrstat "${pkgdir}/usr/bin/pwrstat"
-
+  install -g power -Dm750 bin/pwrstat "${pkgdir}/usr/bin/pwrstat"
+  
   # PowerPanel for Linux daemon program
-  install -Dm755 bin/pwrstatd "${pkgdir}/usr/bin/pwrstatd"
+  install -Dm700 bin/pwrstatd "${pkgdir}/usr/bin/pwrstatd"
+
+  # json-c shared library
+  install -Dm644 lib/libjson-c.so.5.1.0 "${pkgdir}/usr/local/lib/powerpanel/libjson-c.so.5.1.0"
+  ln -s libjson-c.so.5.1.0 "${pkgdir}/usr/local/lib/powerpanel/libjson-c.so.5"
+  
+  # paho-mqtt-c shared library
+  install -Dm644 lib/libpaho-mqtt3cs.so.1.3.1 "${pkgdir}/usr/local/lib/powerpanel/libpaho-mqtt3cs.so.1.3.1"
+  ln -s libpaho-mqtt3cs.so.1.3.1 "${pkgdir}/usr/local/lib/powerpanel/libpaho-mqtt3cs.so.1"
+
+  # crypto shared library
+  install -Dm644 lib/libcrypto.so.1.1 "${pkgdir}/usr/local/lib/powerpanel/libcrypto.so.1.1"
+
+  # ssl shared library
+  install -Dm644 lib/libssl.so.1.1 "${pkgdir}/usr/local/lib/powerpanel/libssl.so.1.1"
 
   # PowerPanel for Linux daemon configuration
-  install -Dm600 conf/pwrstatd.conf "${pkgdir}/etc/pwrstatd.conf"
+  install -Dm644 conf/pwrstatd.conf "${pkgdir}/etc/pwrstatd.conf"
   sed -e 's#/etc#/etc/powerpanel#' -i "${pkgdir}/etc/pwrstatd.conf"
 
   # Script command for event of power failure
-  install -Dm755 script/pwrstatd-powerfail.sh "${pkgdir}/etc/powerpanel/pwrstatd-powerfail.sh"
+  install -Dm700 script/pwrstatd-powerfail.sh "${pkgdir}/etc/powerpanel/pwrstatd-powerfail.sh"
   sed -e 's#/etc#/etc/powerpanel#' -i "${pkgdir}/etc/powerpanel/pwrstatd-powerfail.sh"
 
   # Script command for event of battery low
-  install -Dm755 script/pwrstatd-lowbatt.sh "${pkgdir}/etc/powerpanel/pwrstatd-lowbatt.sh"
+  install -Dm700 script/pwrstatd-lowbatt.sh "${pkgdir}/etc/powerpanel/pwrstatd-lowbatt.sh"
   sed -e 's#/etc#/etc/powerpanel#' -i "${pkgdir}/etc/powerpanel/pwrstatd-lowbatt.sh"
 
   # Script command for e-mail notification
-  install -Dm755 script/pwrstatd-email.sh "${pkgdir}/etc/powerpanel/pwrstatd-email.sh"
+  install -Dm700 script/pwrstatd-email.sh "${pkgdir}/etc/powerpanel/pwrstatd-email.sh"
 
   # Script for hibernate support
-  install -Dm755 "${srcdir}/hibernate.sh" "${pkgdir}/etc/powerpanel/hibernate.sh"
+  install -Dm700 "${srcdir}/hibernate.sh" "${pkgdir}/etc/powerpanel/hibernate.sh"
   ln -s powerpanel/hibernate.sh "${pkgdir}/etc/hibernate.sh"
 
   # Script for shutdown support
-  install -Dm755 "${srcdir}/shutdown.sh" "${pkgdir}/etc/powerpanel/shutdown.sh"
+  install -Dm700 "${srcdir}/shutdown.sh" "${pkgdir}/etc/powerpanel/shutdown.sh"
   ln -s powerpanel/shutdown.sh "${pkgdir}/etc/shutdown.sh"
 
   # Systemd unit
   install -Dm644 "${srcdir}/pwrstatd.service" "${pkgdir}/usr/lib/systemd/system/pwrstatd.service"
-
+  
   # PowerPanel for Linux client man-page
   install -Dm644 doc/pwrstat.8 "${pkgdir}/usr/share/man/man8/pwrstat.8"
 
diff --git a/linhes/powerpanel/pwrstatd.service b/linhes/powerpanel/pwrstatd.service
index 222f4e5..138593a 100644..100755
--- a/linhes/powerpanel/pwrstatd.service
+++ b/linhes/powerpanel/pwrstatd.service
@@ -1,10 +1,16 @@
 [Unit]
-Description=PowerPanel for Linux software can be used with most CyberPower UPS products.
+Description=The monitor UPS software.
+After=network.target network-online.target nss-lookup.target
 
 [Service]
+User=root
 Group=power
 UMask=0002
-ExecStart=/usr/bin/pwrstatd
+Type=simple
+ExecStart=/usr/sbin/pwrstatd
+Restart=always
+RestartSec=2
 
 [Install]
 WantedBy=multi-user.target
+