system/apcupsd: Updated for version 3.14.12.

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
This commit is contained in:
Robby Workman 2014-04-02 01:08:38 +07:00 committed by Willy Sudiarto Raharjo
parent 78ee30de20
commit 07a78ff4a0
5 changed files with 47 additions and 16 deletions

View file

@ -2,7 +2,7 @@
# Slackware build script for apcupsd
# Copyright 2006-2013 Robby Workman Northport, AL, USA
# Copyright 2006-2014 Robby Workman Northport, AL, USA
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@ -26,8 +26,8 @@
# * added log rotation
PRGNAM=apcupsd
VERSION=${VERSION:-3.14.10}
BUILD=${BUILD:-4}
VERSION=${VERSION:-3.14.12}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
@ -79,6 +79,9 @@ 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
# Fixup up a couple of nitpicks in the init script
patch -p1 < $CWD/patches/nitpicky-fixes-to-init-script.diff
# The "--disable-install-distdir" is important - don't remove it.
# If you enable the distribution-specific install, then apcupsd will attempt
# to patch the /etc/rc.d/rc.6 script on your system. This may be acceptable
@ -117,7 +120,7 @@ CXXFLAGS="$SLKCFLAGS -DNETSNMP_NO_LEGACY_DEFINITIONS=1" \
make
make install DESTDIR=$PKG
find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
| cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
find $PKG/usr/man -type f -exec gzip -9 {} \;
@ -141,8 +144,7 @@ done
rm -rf $PKG/usr/share/hal
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
cp -a \
COPYING ChangeLog DISCLAIMER Developers INSTALL ReleaseNotes \
cp -a COPYING ChangeLog DISCLAIMER Developers INSTALL ReleaseNotes \
VERIFYING examples doc/* $CWD/README.SLACKWARE $CWD/$PRGNAM.SlackBuild \
$PKG/usr/doc/$PRGNAM-$VERSION
find $PKG/usr/doc/$PRGNAM-$VERSION -type f -exec chmod 644 {} \;

View file

@ -1,8 +1,8 @@
PRGNAM="apcupsd"
VERSION="3.14.10"
VERSION="3.14.12"
HOMEPAGE="http://www.apcupsd.org"
DOWNLOAD="http://downloads.sourceforge.net/apcupsd/apcupsd-3.14.10.tar.gz"
MD5SUM="5928822d855c5cf7ac29655e3e0b8c23"
DOWNLOAD="http://downloads.sourceforge.net/apcupsd/apcupsd-3.14.12.tar.gz"
MD5SUM="08bf201acea6b4dd69cf2fb0eecfd55e"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""

View file

@ -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."

View file

@ -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.

View file

@ -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