X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=blobdiff_plain;f=lfs%2Fnut;h=c1f0192743dfa88e8abe58d2e608aee0f8685b0a;hp=e2635050d011df4bac05b9013c01261872fee166;hb=15b1a3e360a277dc7481103f8ddcbf189033e3a6;hpb=ffc22d7264af3a646a91be3403e195adef9c7441

diff --git a/lfs/nut b/lfs/nut
index e2635050d0..c1f0192743 100644
--- a/lfs/nut
+++ b/lfs/nut
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2009  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2007-2018  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        = 2.4.1
+VER        = 2.7.4
 
 THISAPP    = nut-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = nut
-PAK_VER    = 1
+PAK_VER    = 7
 
 DEPS       = ""
 
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 609ebaf2123fc7171d25a6c742dd7d66
+$(DL_FILE)_MD5 = 3ba53656933d7471f95140b32a5b8d5c
 
 install : $(TARGET)
 
@@ -77,8 +77,18 @@ $(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 --sysconfdir=/etc
+	cd $(DIR_APP) && ./configure --prefix=/usr --sysconfdir=/etc/nut \
+			--with-usb --with-user=root --with-group=nut \
+			--with-wrap=no --with-udev-dir=/etc/udev
 	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
+#	sed -i -e "s|ATTR{|SYSFS{|g" /etc/udev/rules.d/52-nut-usbups.rules
+	mkdir -p /var/state/ups
+
+	#install initscripts
+	$(call INSTALL_INITSCRIPT,nut)
+
+	install -v -m 644 $(DIR_SRC)/config/backup/includes/nut \
+			 /var/ipfire/backup/addons/includes/nut
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)