X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=blobdiff_plain;f=lfs%2Fapcupsd;h=ce36c3c6f112c847c843d6ad9b01c75f7a6df2e9;hp=6d6fc913d58c56a07f4b27712908be19cfc30c81;hb=ebfb8996930ec1e3b4f7d09208d2ab60a8f30603;hpb=92a0762c33e471def9bcdefefa6b906279fb996f

diff --git a/lfs/apcupsd b/lfs/apcupsd
index 6d6fc913d5..ce36c3c6f1 100644
--- 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-2016  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.14
 
 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    = 2
+PAK_VER    = 6
 
 DEPS       = ""
 
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 78811129db1a882b9a2b9afd540470b3
+$(DL_FILE)_MD5 = cc8f5ced77f38906a274787acb9bc980
 
 install : $(TARGET)
 
@@ -77,10 +77,14 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-	cd $(DIR_APP) && ./configure --prefix=/usr --enable-usb
+	cd $(DIR_APP) && ./configure --prefix=/usr --enable-usb --enable-cgi \
+					--with-cgi-bin=/srv/web/ipfire/cgi-bin
 	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
-	install -v -m755 $(DIR_SRC)/config/apcupsd/apcupsd /etc/init.d/apcupsd
+
+	#install initscripts
+	$(call INSTALL_INITSCRIPT,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