X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Fnut;h=c0b7c57e8a2f2d18f404ef6efec6eb857dc6578b;hb=f3557f76cf7524341b078d1003f0ef60e0e50433;hp=e2635050d011df4bac05b9013c01261872fee166;hpb=ccab85aeed5c60d63f59e9c72e2c910232d58498;p=people%2Fpmueller%2Fipfire-2.x.git

diff --git a/lfs/nut b/lfs/nut
index e2635050d0..c0b7c57e8a 100644
--- a/lfs/nut
+++ b/lfs/nut
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 2.4.1
+VER        = 2.4.3
 
 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    = 2
 
 DEPS       = ""
 
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 609ebaf2123fc7171d25a6c742dd7d66
+$(DL_FILE)_MD5 = 6f893b61b07915e7a139324fa3f79121
 
 install : $(TARGET)
 
@@ -77,8 +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 --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 -v -m 644 $(DIR_SRC)/config/backup/includes/nut \
+			 /var/ipfire/backup/addons/includes/nut
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)