diff options
| author | Robby Workman <rworkman@slackbuilds.org> | 2014-04-02 01:08:38 +0700 |
|---|---|---|
| committer | Willy Sudiarto Raharjo <willysr@slackbuilds.org> | 2014-04-07 14:43:48 +0700 |
| commit | 07a78ff4a0a26235630cb78f931ce18ac94551a8 (patch) | |
| tree | 5d473cc4455335590a7f94383acb39577c0ce8ea /system/apcupsd/patches | |
| parent | 78ee30de20073bb054727c4141a903ee6600a6c7 (diff) | |
| download | slackbuilds-07a78ff4a0a26235630cb78f931ce18ac94551a8.tar.gz | |
system/apcupsd: Updated for version 3.14.12.
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
Diffstat (limited to 'system/apcupsd/patches')
3 files changed, 36 insertions, 7 deletions
diff --git a/system/apcupsd/patches/create_lockdir_in_init_script.diff b/system/apcupsd/patches/create_lockdir_in_init_script.diff index 06d158fb91..0640544e53 100644 --- a/system/apcupsd/patches/create_lockdir_in_init_script.diff +++ b/system/apcupsd/patches/create_lockdir_in_init_script.diff @@ -1,6 +1,6 @@ -diff -Nur apcupsd-3.14.10.orig/platforms/slackware/apcupsd.in apcupsd-3.14.10/platforms/slackware/apcupsd.in ---- apcupsd-3.14.10.orig/platforms/slackware/apcupsd.in 2005-03-03 11:18:09.000000000 -0600 -+++ apcupsd-3.14.10/platforms/slackware/apcupsd.in 2012-09-07 21:31:27.347857464 -0500 +diff -Nur apcupsd-3.14.12.orig/platforms/slackware/apcupsd.in apcupsd-3.14.12/platforms/slackware/apcupsd.in +--- apcupsd-3.14.12.orig/platforms/slackware/apcupsd.in 2005-03-03 11:18:09.000000000 -0600 ++++ apcupsd-3.14.12/platforms/slackware/apcupsd.in 2014-04-01 13:53:23.113153628 -0500 @@ -20,6 +20,7 @@ if [ -f ${APCPID} ]; then return=" Already running." diff --git a/system/apcupsd/patches/fix_lockdir_in_config_file.diff b/system/apcupsd/patches/fix_lockdir_in_config_file.diff index d260abd579..64ee7efa94 100644 --- a/system/apcupsd/patches/fix_lockdir_in_config_file.diff +++ b/system/apcupsd/patches/fix_lockdir_in_config_file.diff @@ -1,7 +1,7 @@ -diff -Nur apcupsd-3.14.10.orig/platforms/etc/apcupsd.conf.in apcupsd-3.14.10/platforms/etc/apcupsd.conf.in ---- apcupsd-3.14.10.orig/platforms/etc/apcupsd.conf.in 2011-05-19 17:55:25.000000000 -0500 -+++ apcupsd-3.14.10/platforms/etc/apcupsd.conf.in 2013-05-15 12:44:25.497885953 -0500 -@@ -90,7 +90,7 @@ +diff -Nur apcupsd-3.14.12.orig/platforms/etc/apcupsd.conf.in apcupsd-3.14.12/platforms/etc/apcupsd.conf.in +--- apcupsd-3.14.12.orig/platforms/etc/apcupsd.conf.in 2013-08-05 09:05:17.000000000 -0500 ++++ apcupsd-3.14.12/platforms/etc/apcupsd.conf.in 2014-04-01 13:54:06.786690735 -0500 +@@ -93,7 +93,7 @@ # LOCKFILE <path to lockfile> # Path for device lock file. Not used on Win32. diff --git a/system/apcupsd/patches/nitpicky-fixes-to-init-script.diff b/system/apcupsd/patches/nitpicky-fixes-to-init-script.diff new file mode 100644 index 0000000000..30f901235e --- /dev/null +++ b/system/apcupsd/patches/nitpicky-fixes-to-init-script.diff @@ -0,0 +1,29 @@ +diff -Nur apcupsd-3.14.12.orig/platforms/slackware/apcupsd.in apcupsd-3.14.12/platforms/slackware/apcupsd.in +--- apcupsd-3.14.12.orig/platforms/slackware/apcupsd.in 2014-04-01 13:54:37.822360814 -0500 ++++ apcupsd-3.14.12/platforms/slackware/apcupsd.in 2014-04-01 13:56:22.722239781 -0500 +@@ -9,14 +9,14 @@ + APCPID=@PIDDIR@/apcupsd.pid + DISTVER="@DISTVER@" + +-return=" Done." ++return="" + + + case "$1" in + start) + rm -f @PWRFAILDIR@/powerfail + rm -f @nologdir@/nologin +- echo -n "Starting apcupsd power management.." ++ echo -n "Starting apcupsd power management: /sbin/apcupsd" + if [ -f ${APCPID} ]; then + return=" Already running." + else +@@ -30,7 +30,7 @@ + stop) + echo -n "Stopping apcupsd power management.." + if [ -f ${APCPID} ]; then +- THEPID=`cat ${APCPID}` ++ THEPID=$(cat ${APCPID}) + kill ${THEPID} || return=" Failed." + rm -f ${APCPID} + else |