Merge remote-tracking branch 'origin/next' into thirteen

[people/pmueller/ipfire-2.x.git] / lfs / apcupsd

diff --git a/lfs/apcupsd b/lfs/apcupsd
index 197d1a4fcf67b8f464850a75106edbac13c21cbc..4e9137b111ed9a2fb74a4e551ac2059095810dcd 100644 (file)
--- a/lfs/apcupsd
+++ b/lfs/apcupsd
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2007-2012  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 3.14.4
+VER        = 3.14.10
 
 THISAPP    = apcupsd-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = apcupsd
-PAK_VER    = 3
+PAK_VER    = 5
 
 DEPS       = ""
 
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 78811129db1a882b9a2b9afd540470b3
+$(DL_FILE)_MD5 = 5928822d855c5cf7ac29655e3e0b8c23
 
 install : $(TARGET)
 
@@ -81,7 +81,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
                                        --with-cgi-bin=/srv/web/ipfire/cgi-bin
        cd $(DIR_APP) && make $(MAKETUNING)
        cd $(DIR_APP) && make install
-       install -v -m755 $(DIR_SRC)/src/initscripts/init.d/apcupsd /etc/init.d/apcupsd
        ln -sf ../init.d/apcupsd /etc/rc.d/rc3.d/S65apcupsd
        ln -sf ../init.d/apcupsd /etc/rc.d/rc0.d/K35apcupsd
        ln -sf ../init.d/apcupsd /etc/rc.d/rc6.d/K35apcupsd