diff options
| author | Robby Workman <rworkman@slackbuilds.org> | 2013-05-15 13:11:49 -0500 |
|---|---|---|
| committer | Robby Workman <rworkman@slackbuilds.org> | 2013-06-04 00:09:20 -0500 |
| commit | 699843a16912442788d9c2b762ba049d50af7ecb (patch) | |
| tree | 9e33d8715a807e5952c544c5b3f880e0b5ab8906 | |
| parent | 39e0617de045f99fb245b6c0006b53e1f5f62ac9 (diff) | |
system/apcupsd: Fix lockdir definition and usage
Signed-off-by: Robby Workman <rworkman@slackbuilds.org>
| -rw-r--r-- | system/apcupsd/apcupsd.SlackBuild | 12 | ||||
| -rw-r--r-- | system/apcupsd/patches/create_lockdir_in_init_script.diff (renamed from system/apcupsd/create_lockdir_in_init_script.diff) | 0 | ||||
| -rw-r--r-- | system/apcupsd/patches/fix_lockdir_in_config_file.diff | 12 |
3 files changed, 21 insertions, 3 deletions
diff --git a/system/apcupsd/apcupsd.SlackBuild b/system/apcupsd/apcupsd.SlackBuild index 95cbc123bec7..0e1993fb86c2 100644 --- a/system/apcupsd/apcupsd.SlackBuild +++ b/system/apcupsd/apcupsd.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for apcupsd -# Copyright 2006-2012 Robby Workman Northport, AL, USA +# Copyright 2006-2013 Robby Workman Northport, AL, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -27,7 +27,7 @@ PRGNAM=apcupsd VERSION=${VERSION:-3.14.10} -BUILD=${BUILD:-2} +BUILD=${BUILD:-3} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then @@ -70,7 +70,10 @@ chmod -R a-s,u+w,go+r-w . # Create /var/lock/subsys in the init script (rc.apcupsd) # These days, /var/lock may be on a tmpfs, so we can't assume the dir is there -patch -p1 < $CWD/create_lockdir_in_init_script.diff +patch -p1 < $CWD/patches/create_lockdir_in_init_script.diff + +# Use /var/lock/subsys as the LOCKDIR in apcupsd.conf +patch -p1 < $CWD/patches/fix_lockdir_in_config_file.diff # The "--disable-install-distdir" is important - don't remove it. # If you enable the distribution-specific install, then apcupsd will attempt @@ -129,6 +132,9 @@ for i in apccontrol apcupsd.conf apcupsd.css changeme commfailure \ mv $PKG/etc/apcupsd/$i $PKG/etc/apcupsd/$i.new; done +# Remove obsolete HAL stuff +rm -rf $PKG/usr/share/hal + mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a \ COPYING ChangeLog DISCLAIMER Developers INSTALL ReleaseNotes \ diff --git a/system/apcupsd/create_lockdir_in_init_script.diff b/system/apcupsd/patches/create_lockdir_in_init_script.diff index 06d158fb91e9..06d158fb91e9 100644 --- a/system/apcupsd/create_lockdir_in_init_script.diff +++ b/system/apcupsd/patches/create_lockdir_in_init_script.diff diff --git a/system/apcupsd/patches/fix_lockdir_in_config_file.diff b/system/apcupsd/patches/fix_lockdir_in_config_file.diff new file mode 100644 index 000000000000..d260abd57980 --- /dev/null +++ b/system/apcupsd/patches/fix_lockdir_in_config_file.diff @@ -0,0 +1,12 @@ +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 @@ + + # 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. |