summaryrefslogtreecommitdiff
path: root/system/apcupsd/patches
diff options
context:
space:
mode:
authorRobby Workman <rworkman@slackbuilds.org>2015-08-17 22:52:50 -0500
committerWilly Sudiarto Raharjo <willysr@slackbuilds.org>2015-08-22 23:42:10 +0700
commit390288c14db5332e309e9db2d00a153960feecbc (patch)
tree6ee49280decba170b071e7a9ac9d91a3577e017e /system/apcupsd/patches
parent0b9aa736362fea744c380daf6ddfc3fc3d58335d (diff)
downloadslackbuilds-390288c14db5332e309e9db2d00a153960feecbc.tar.gz
system/apcupsd: Updated for version 3.14.13.
Thanks to Sebastian Arcus, Ben Stern, and Marcos Tadeu for gentle reminders with fixes for the new version :-) Signed-off-by: Robby Workman <rworkman@slackbuilds.org>
Diffstat (limited to 'system/apcupsd/patches')
-rw-r--r--system/apcupsd/patches/create_lockdir_in_init_script.diff10
-rw-r--r--system/apcupsd/patches/fix_lockdir_in_config_file.diff12
-rw-r--r--system/apcupsd/patches/nitpicky-fixes-to-init-script.diff6
3 files changed, 8 insertions, 20 deletions
diff --git a/system/apcupsd/patches/create_lockdir_in_init_script.diff b/system/apcupsd/patches/create_lockdir_in_init_script.diff
index 0640544e53..024ac6d4cb 100644
--- a/system/apcupsd/patches/create_lockdir_in_init_script.diff
+++ b/system/apcupsd/patches/create_lockdir_in_init_script.diff
@@ -1,11 +1,11 @@
-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
+diff -Nur apcupsd-3.14.13.orig/platforms/slackware/apcupsd.in apcupsd-3.14.13/platforms/slackware/apcupsd.in
+--- apcupsd-3.14.13.orig/platforms/slackware/apcupsd.in 2015-01-29 08:13:25.000000000 -0600
++++ apcupsd-3.14.13/platforms/slackware/apcupsd.in 2015-08-17 22:49:30.754638339 -0500
@@ -20,6 +20,7 @@
if [ -f ${APCPID} ]; then
return=" Already running."
else
-+ mkdir -p @LOCKDIR@/subsys
- @sbindir@/apcupsd && touch @LOCKDIR@/subsys/apcupsd \
++ mkdir -p @LOCKDIR@
+ @sbindir@/apcupsd && touch @LOCKDIR@/apcupsd \
|| return=" Failed."
fi
diff --git a/system/apcupsd/patches/fix_lockdir_in_config_file.diff b/system/apcupsd/patches/fix_lockdir_in_config_file.diff
deleted file mode 100644
index 64ee7efa94..0000000000
--- a/system/apcupsd/patches/fix_lockdir_in_config_file.diff
+++ /dev/null
@@ -1,12 +0,0 @@
-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.
--LOCKFILE @LOCKDIR@
-+LOCKFILE @LOCKDIR@/subsys
-
- # SCRIPTDIR <path to script directory>
- # Directory in which apccontrol and event scripts are located.
diff --git a/system/apcupsd/patches/nitpicky-fixes-to-init-script.diff b/system/apcupsd/patches/nitpicky-fixes-to-init-script.diff
index 30f901235e..0ba9058a5a 100644
--- a/system/apcupsd/patches/nitpicky-fixes-to-init-script.diff
+++ b/system/apcupsd/patches/nitpicky-fixes-to-init-script.diff
@@ -1,6 +1,6 @@
-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
+diff -Nur apcupsd-3.14.13.orig/platforms/slackware/apcupsd.in apcupsd-3.14.13/platforms/slackware/apcupsd.in
+--- apcupsd-3.14.13.orig/platforms/slackware/apcupsd.in 2015-08-17 22:51:39.595562965 -0500
++++ apcupsd-3.14.13/platforms/slackware/apcupsd.in 2015-08-17 22:51:34.106608743 -0500
@@ -9,14 +9,14 @@
APCPID=@PIDDIR@/apcupsd.pid
DISTVER="@DISTVER@"