nut: Update to version 2.8.0

[people/teissler/ipfire-2.x.git] / lfs / nut

diff --git a/lfs/nut b/lfs/nut
index 2045dce6cb4fcfd1470053a66bf7f420d9bb5774..619918b5b572ebc505fbb660e8470cafd5867713 100644 (file)
--- 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,9 @@
 
 include Config
 
-VER        = 2.7.2
+SUMMARY    = Network UPS Tools Core (Uninterruptible Power Supply Monitoring)
+
+VER        = 2.8.0
 
 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    = 8
+
+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 = 6ad87e9c90920d45846d9c1311e8feeb3c36bfa506d62d938940c00d2fc7f7b30632d079a8ee969db624824ae4fd3e14e41e8acd1eda296e26a3aa340f186b94
 
 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,16 +83,23 @@ $(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
+       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_INITSCRIPT,nut)
+       $(call INSTALL_INITSCRIPTS,$(SERVICES))
 
        install -v -m 644 $(DIR_SRC)/config/backup/includes/nut \
                         /var/ipfire/backup/addons/includes/nut