From patchwork Fri Nov 10 10:59:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adolf Belka X-Patchwork-Id: 7325 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) client-signature ECDSA (secp384r1)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4SRbS02wz5z3x25 for ; Fri, 10 Nov 2023 10:59:28 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) client-signature ECDSA (secp384r1)) (Client CN "mail02.haj.ipfire.org", Issuer "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4SRbRr0Hh3z2Tk; Fri, 10 Nov 2023 10:59:20 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4SRbRq2TCjz33gT; Fri, 10 Nov 2023 10:59:19 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) client-signature ECDSA (secp384r1)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4SRbRm5kFdz2xKQ for ; Fri, 10 Nov 2023 10:59:16 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4SRbRm3Whhz1ql; Fri, 10 Nov 2023 10:59:16 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1699613956; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=VbYLhQ7wwcbcJuTRAak2qzbHSyUxmS7+FNuoL31eHdY=; b=VjRQbe4gI+ocYekVVwm0EcDYHS96l+gJ6FdD8R2v4uAutBWL394Pkxie4ajajQO4mDEJFg qpPoVX9OassRHsAQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1699613956; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=VbYLhQ7wwcbcJuTRAak2qzbHSyUxmS7+FNuoL31eHdY=; b=CMc9vUc9R49621npnZVbBLEc5KQ7j4JW62lLeLI+SI7L1yNos3SyleYXcRMCVhUEXrX5R4 W+mZ8I4+WdKI14X2e8YNZERdBuwrFfbtSYCN2ZUI1lzQB95Bb7+cPVueKlj/FzUcbSnOD9 7IrnC6llCEZMuu0YN1U8KF7r6ONlFwRz+R8CE52shLLLB+u3OhjBZnK3763nI56kIi0jdq vQ3wg+wsdANjhAp0KwporXXx0Kgy6a1urLOtcc3QnMlNJX2myL/hdYrDukCxt35OWwbMbO n926RLTcXB7tSBVoT7ymVNd8Cni8ABIKGtitP5e1Dt7Y0bz0g8efWSCysbP+6g== From: Adolf Belka To: development@lists.ipfire.org Subject: [PATCH] nut: Update to version 2.8.1 Date: Fri, 10 Nov 2023 11:59:00 +0100 Message-ID: <20231110105910.11113-3-adolf.belka@ipfire.org> In-Reply-To: <20231110105910.11113-1-adolf.belka@ipfire.org> References: <20231110105910.11113-1-adolf.belka@ipfire.org> MIME-Version: 1.0 Message-ID-Hash: 5SDQR2FXDBA5S6BEW3HAXX2IVV4OK76Y X-Message-ID-Hash: 5SDQR2FXDBA5S6BEW3HAXX2IVV4OK76Y X-MailFrom: adolf.belka@ipfire.org X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.8 Precedence: list List-Id: IPFire development talk Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: - Update from 2.8.0 to 2.8.1 - Update of rootfile - Disable creating docs i9n configure statement - Changelog is too large to include here (~500 lines). For more details read the NEWS.adoc file in thye source tarball. Signed-off-by: Adolf Belka --- config/rootfiles/packages/nut | 82 +++-------------------------------- lfs/nut | 11 ++--- 2 files changed, 13 insertions(+), 80 deletions(-) diff --git a/config/rootfiles/packages/nut b/config/rootfiles/packages/nut index 3bf9d03a9..1acab9d51 100644 --- a/config/rootfiles/packages/nut +++ b/config/rootfiles/packages/nut @@ -52,6 +52,7 @@ usr/bin/riello_ser usr/bin/riello_usb usr/bin/safenet usr/bin/skel +usr/bin/sms_ser usr/bin/snmp-ups usr/bin/solis usr/bin/tripplite @@ -68,95 +69,26 @@ usr/bin/victronups #usr/lib/libnutclient.la #usr/lib/libnutclient.so usr/lib/libnutclient.so.2 -usr/lib/libnutclient.so.2.0.0 +usr/lib/libnutclient.so.2.0.2 #usr/lib/libnutclientstub.la #usr/lib/libnutclientstub.so usr/lib/libnutclientstub.so.1 -usr/lib/libnutclientstub.so.1.0.0 +usr/lib/libnutclientstub.so.1.0.1 #usr/lib/libnutscan.la #usr/lib/libnutscan.so usr/lib/libnutscan.so.2 -usr/lib/libnutscan.so.2.0.0 +usr/lib/libnutscan.so.2.0.2 #usr/lib/libupsclient.la #usr/lib/libupsclient.so usr/lib/libupsclient.so.6 -usr/lib/libupsclient.so.6.0.0 +usr/lib/libupsclient.so.6.0.1 +#usr/lib/python3.10/site-packages/PyNUT.py +#usr/lib/python3.10/site-packages/test_nutclient.py usr/sbin/upsd usr/sbin/upsdrvctl usr/sbin/upsmon usr/sbin/upssched usr/share/cmdvartab usr/share/driver.list -#usr/share/man/man5/nut.conf.5 -#usr/share/man/man5/ups.conf.5 -#usr/share/man/man5/upsd.conf.5 -#usr/share/man/man5/upsd.users.5 -#usr/share/man/man5/upsmon.conf.5 -#usr/share/man/man5/upssched.conf.5 -#usr/share/man/man8/al175.8 -#usr/share/man/man8/apcsmart-old.8 -#usr/share/man/man8/apcsmart.8 -#usr/share/man/man8/apcupsd-ups.8 -#usr/share/man/man8/bcmxcp.8 -#usr/share/man/man8/bcmxcp_usb.8 -#usr/share/man/man8/belkin.8 -#usr/share/man/man8/belkinunv.8 -#usr/share/man/man8/bestfcom.8 -#usr/share/man/man8/bestfortress.8 -#usr/share/man/man8/bestuferrups.8 -#usr/share/man/man8/bestups.8 -#usr/share/man/man8/blazer_ser.8 -#usr/share/man/man8/blazer_usb.8 -#usr/share/man/man8/clone.8 -#usr/share/man/man8/dummy-ups.8 -#usr/share/man/man8/etapro.8 -#usr/share/man/man8/everups.8 -#usr/share/man/man8/gamatronic.8 -#usr/share/man/man8/genericups.8 -#usr/share/man/man8/isbmex.8 -#usr/share/man/man8/ivtscd.8 -#usr/share/man/man8/liebert-esp2.8 -#usr/share/man/man8/liebert.8 -#usr/share/man/man8/masterguard.8 -#usr/share/man/man8/metasys.8 -#usr/share/man/man8/mge-shut.8 -#usr/share/man/man8/mge-utalk.8 -#usr/share/man/man8/microdowell.8 -#usr/share/man/man8/microsol-apc.8 -#usr/share/man/man8/nut-driver-enumerator.8 -#usr/share/man/man8/nut-recorder.8 -#usr/share/man/man8/nut-scanner.8 -#usr/share/man/man8/nutdrv_atcl_usb.8 -#usr/share/man/man8/nutdrv_qx.8 -#usr/share/man/man8/nutdrv_siemens_sitop.8 -#usr/share/man/man8/nutupsdrv.8 -#usr/share/man/man8/oneac.8 -#usr/share/man/man8/optiups.8 -#usr/share/man/man8/powercom.8 -#usr/share/man/man8/powerpanel.8 -#usr/share/man/man8/rhino.8 -#usr/share/man/man8/richcomm_usb.8 -#usr/share/man/man8/riello_ser.8 -#usr/share/man/man8/riello_usb.8 -#usr/share/man/man8/safenet.8 -#usr/share/man/man8/snmp-ups.8 -#usr/share/man/man8/solis.8 -#usr/share/man/man8/tripplite.8 -#usr/share/man/man8/tripplite_usb.8 -#usr/share/man/man8/tripplitesu.8 -#usr/share/man/man8/upsc.8 -#usr/share/man/man8/upscmd.8 -#usr/share/man/man8/upscode2.8 -#usr/share/man/man8/upsd.8 -#usr/share/man/man8/upsdrvctl.8 -#usr/share/man/man8/upsdrvsvcctl.8 -#usr/share/man/man8/upslog.8 -#usr/share/man/man8/upsmon.8 -#usr/share/man/man8/upsrw.8 -#usr/share/man/man8/upssched.8 -#usr/share/man/man8/usbhid-ups.8 -#usr/share/man/man8/victronups.8 -#usr/share/solaris-init -#usr/share/solaris-init/nut var/ipfire/backup/addons/includes/nut var/state/ups diff --git a/lfs/nut b/lfs/nut index e46c72a1a..ea133b620 100644 --- a/lfs/nut +++ b/lfs/nut @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2018 IPFire Team # +# Copyright (C) 2007-2023 IPFire Team # # # # 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 # @@ -26,7 +26,7 @@ include Config SUMMARY = Network UPS Tools Core (Uninterruptible Power Supply Monitoring) -VER = 2.8.0 +VER = 2.8.1 THISAPP = nut-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -34,7 +34,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = nut -PAK_VER = 10 +PAK_VER = 11 DEPS = @@ -50,7 +50,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = 6ad87e9c90920d45846d9c1311e8feeb3c36bfa506d62d938940c00d2fc7f7b30632d079a8ee969db624824ae4fd3e14e41e8acd1eda296e26a3aa340f186b94 +$(DL_FILE)_BLAKE2 = 370a1759beec6eaae6479b5174762b2bc600ca07543aad531cf74e179d8e000b4b3a8dd111c7556eb4fb545ebf8baee24fbb75f6235d03cefe239ba08f042ea5 install : $(TARGET) @@ -92,7 +92,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) --with-group=nut \ --with-wrap=no \ --with-udev-dir=/etc/udev \ - --disable-static + --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