X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=blobdiff_plain;f=lfs%2Fnut;h=1502c63cb893975bf6889156b46b3af4f4161f65;hp=c64c5a26b53087f5a06038447c68e519d4b40ff1;hb=HEAD;hpb=c10ef4bd39e3b25918067da15ba68ee76e252cf4

diff --git a/lfs/nut b/lfs/nut
index c64c5a26b5..ea133b6209 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-2023  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,9 @@
 
 include Config
 
-VER        = 2.7.2
+SUMMARY    = Network UPS Tools Core (Uninterruptible Power Supply Monitoring)
+
+VER        = 2.8.1
 
 THISAPP    = nut-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -32,9 +34,13 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = nut
-PAK_VER    = 5
+PAK_VER    = 11
+
+DEPS       =
+
+SERVICES   = nut
 
-DEPS       = ""
+CXXFLAGS  += -std=c++11
 
 ###############################################################################
 # Top-level Rules
@@ -44,7 +50,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = c3568b42e058cfc385b46d25140dced4
+$(DL_FILE)_BLAKE2 = 370a1759beec6eaae6479b5174762b2bc600ca07543aad531cf74e179d8e000b4b3a8dd111c7556eb4fb545ebf8baee24fbb75f6235d03cefe239ba08f042ea5
 
 install : $(TARGET)
 
@@ -52,13 +58,13 @@ check : $(patsubst %,$(DIR_CHK)/%,$(objects))
 
 download :$(patsubst %,$(DIR_DL)/%,$(objects))
 
-md5 : $(subst %,%_MD5,$(objects))
+b2 : $(subst %,%_BLAKE2,$(objects))
 
-dist: 
+dist:
 	@$(PAK)
 
 ###############################################################################
-# Downloading, checking, md5sum
+# Downloading, checking, b2sum
 ###############################################################################
 
 $(patsubst %,$(DIR_CHK)/%,$(objects)) :
@@ -67,8 +73,8 @@ $(patsubst %,$(DIR_CHK)/%,$(objects)) :
 $(patsubst %,$(DIR_DL)/%,$(objects)) :
 	@$(LOAD)
 
-$(subst %,%_MD5,$(objects)) :
-	@$(MD5)
+$(subst %,%_BLAKE2,$(objects)) :
+	@$(B2SUM)
 
 ###############################################################################
 # Installation Details
@@ -77,13 +83,25 @@ $(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/nut \
-			--with-usb --with-user=root --with-group=nut \
-			--with-wrap=no --with-udev-dir=/etc/udev
-	cd $(DIR_APP) && make
+	$(UPDATE_AUTOMAKE)
+	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 \
+			            --disable-static \
+			            --without-docs
+	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
+	mkdir -p /var/state/ups
+
+	#install initscripts
+	$(call INSTALL_INITSCRIPTS,$(SERVICES))
+
 	install -v -m 644 $(DIR_SRC)/config/backup/includes/nut \
 			 /var/ipfire/backup/addons/includes/nut
 	@rm -rf $(DIR_APP)