Development May 2022

development@lists.ipfire.org

11 participants
84 discussions

[PATCH] boost: Fix rootfile entries that referred to python3.8 instead of 3.10
by Adolf Belka 12 May '22

12 May '22

- In Jan 2022 I updated python from 3.8 to 3.10 but I missed that boost had rootfile entries with python38 in it. - Running a build just now for another package it got flagged up that the rootfile for boost had been changed and the logfile now had the entries with python310 instead of python38 - Not clear why it only flagged this up now but this patch is to correct that error - Running find-dependencies on both the pyton38 and python310 versions of the libraries flagged nothing as being linked to either, so probably lucky with this being missed first time around. - Boost will need to be shipped with a Core Update Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> --- config/rootfiles/common/aarch64/boost | 8 ++++---- config/rootfiles/common/armv6l/boost | 8 ++++---- config/rootfiles/common/x86_64/boost | 8 ++++---- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/config/rootfiles/common/aarch64/boost b/config/rootfiles/common/aarch64/boost index 49ff120ab..015dc1458 100644 --- a/config/rootfiles/common/aarch64/boost +++ b/config/rootfiles/common/aarch64/boost @@ -16250,10 +16250,10 @@ usr/lib/libboost_nowide-a64.so.1.76.0 usr/lib/libboost_prg_exec_monitor-mt-a64.so.1.76.0 #usr/lib/libboost_prg_exec_monitor-a64.so usr/lib/libboost_prg_exec_monitor-a64.so.1.76.0 -#usr/lib/libboost_python38-mt-a64.so -usr/lib/libboost_python38-mt-a64.so.1.76.0 -#usr/lib/libboost_python38-a64.so -usr/lib/libboost_python38-a64.so.1.76.0 +#usr/lib/libboost_python310-mt-a64.so +usr/lib/libboost_python310-mt-a64.so.1.76.0 +#usr/lib/libboost_python310-a64.so +usr/lib/libboost_python310-a64.so.1.76.0 #usr/lib/libboost_random-mt-a64.so usr/lib/libboost_random-mt-a64.so.1.76.0 #usr/lib/libboost_random-a64.so diff --git a/config/rootfiles/common/armv6l/boost b/config/rootfiles/common/armv6l/boost index 80cc4063a..79e9ed3d7 100644 --- a/config/rootfiles/common/armv6l/boost +++ b/config/rootfiles/common/armv6l/boost @@ -16250,10 +16250,10 @@ usr/lib/libboost_nowide-mt-a32.so.1.76.0 usr/lib/libboost_prg_exec_monitor-a32.so.1.76.0 #usr/lib/libboost_prg_exec_monitor-mt-a32.so usr/lib/libboost_prg_exec_monitor-mt-a32.so.1.76.0 -#usr/lib/libboost_python38-a32.so -usr/lib/libboost_python38-a32.so.1.76.0 -#usr/lib/libboost_python38-mt-a32.so -usr/lib/libboost_python38-mt-a32.so.1.76.0 +#usr/lib/libboost_python310-a32.so +usr/lib/libboost_python310-a32.so.1.76.0 +#usr/lib/libboost_python310-mt-a32.so +usr/lib/libboost_python310-mt-a32.so.1.76.0 #usr/lib/libboost_random-a32.so usr/lib/libboost_random-a32.so.1.76.0 #usr/lib/libboost_random-mt-a32.so diff --git a/config/rootfiles/common/x86_64/boost b/config/rootfiles/common/x86_64/boost index 357dc2d1d..77eef1d0b 100644 --- a/config/rootfiles/common/x86_64/boost +++ b/config/rootfiles/common/x86_64/boost @@ -16250,10 +16250,10 @@ usr/lib/libboost_nowide-x64.so.1.76.0 usr/lib/libboost_prg_exec_monitor-mt-x64.so.1.76.0 #usr/lib/libboost_prg_exec_monitor-x64.so usr/lib/libboost_prg_exec_monitor-x64.so.1.76.0 -#usr/lib/libboost_python38-mt-x64.so -usr/lib/libboost_python38-mt-x64.so.1.76.0 -#usr/lib/libboost_python38-x64.so -usr/lib/libboost_python38-x64.so.1.76.0 +#usr/lib/libboost_python310-mt-x64.so +usr/lib/libboost_python310-mt-x64.so.1.76.0 +#usr/lib/libboost_python310-x64.so +usr/lib/libboost_python310-x64.so.1.76.0 #usr/lib/libboost_random-mt-x64.so usr/lib/libboost_random-mt-x64.so.1.76.0 #usr/lib/libboost_random-x64.so -- 2.36.0

3 7

Errors during update to Core165 found in '/var/log/httpd/error_log'
by Matthias Fischer 12 May '22

12 May '22

Hi, first: update to Core 165 ran through - no seen errors. Pakfire looked good, system is running with . But after digging deeper in the logs I found some errors that made me ...nervous...: Looking at '/var/log/httpd/error_log' I found a bunch of "tac: write error: Broken pipe", some "Permission denied:"-messages regarding 'pakfire.cgi', some Perl errors and a "Could not open password file: /var/ipfire/auth/users"-error. I wouldn't have noticed if I hadn't take a closer look. In detail: Perl couldn't locate two files - "Net/Ping.pm" and "File/Copy.pm" needed by '/opt/pakfire/lib/functions.pl'. These doesn't exist. Current log file ('/var/log/httpd/error_log') is attached. Nevertheless - system is up and running. WebGui is running. Can anyone confirm? Best, Matthias

5 8

Re: : [PATCH] suricata: Perform ruleset update every 12 hours
by Charles Brown 12 May '22

12 May '22

Hello Stefan and Michael, Per the fcron man page: "The time remaining before next execution is saved every 1800 seconds (to limit damages caused by a crash) and when *fcron* exits after having received a SIGTERM signal, i.e. when systems go down ..." It looks like this is getting written to /var/spool/cron/root on my ipfire box. I assume this takes care of the issue ... but I can't say for sure. On 5/8/2022 11:12 AM, development-request(a)lists.ipfire.org wrote: > 6. Re: [PATCH] suricata: Perform ruleset update every 12 hours. > (Michael Tremer) > > > ---------------------------------------------------------------------- > Message: 6 > Date: Sun, 8 May 2022 17:12:33 +0100 > From: Michael Tremer<michael.tremer(a)ipfire.org> > To: Stefan Schantl<stefan.schantl(a)ipfire.org> > Cc:development@lists.ipfire.org > Subject: Re: [PATCH] suricata: Perform ruleset update every 12 hours. > Message-ID:<1A6869C7-B4B3-4AF7-846E-FFA67AF78C95(a)ipfire.org> > Content-Type: text/plain; charset=utf-8 > > Hello Stefan, > > What happens to firewalls that do not run 24/7? > > Will this job be performed after 12 hours have passed no matter how long? So let?s say I shut down a system for a day, would the job run immediately? > > -Michael > >> On 8 May 2022, at 14:23, Stefan Schantl<stefan.schantl(a)ipfire.org> wrote: >> >> Signed-off-by: Stefan Schantl<stefan.schantl(a)ipfire.org> >> --- >> config/cron/crontab | 4 ++-- >> 1 file changed, 2 insertions(+), 2 deletions(-) >> >> diff --git a/config/cron/crontab b/config/cron/crontab >> index d61d26619..c42104626 100644 >> --- a/config/cron/crontab >> +++ b/config/cron/crontab >> @@ -62,8 +62,8 @@ HOME=/ >> # Update location database >> %hourly,random * [ -f "/var/ipfire/red/active" ] && /usr/local/bin/update-location-database >/dev/null 2>&1 >> >> -# Update surciata rules. >> -%daily,random * [ -f "/var/ipfire/red/active" ] && /usr/local/bin/update-ids-ruleset >/dev/null 2>&1 >> +# Perform a surciata rules update every 12 hours. >> +@ 12h [ -f "/var/ipfire/red/active" ] && /usr/local/bin/update-ids-ruleset >/dev/null 2>&1 >> >> # Retry sending spooled mails regularly >> %hourly * /usr/sbin/dma -q >> -- >> 2.30.2 >>

2 1

make is an addon in IPFire??
by Adolf Belka 12 May '22

12 May '22

Hi All, I just realised that make is defined in IPFire as an addon. Why would anyone need to run make on a firewall. I can understand it being in the build so that packages can be compiled etc but why on the firewall itself? Regards, Adolf.

3 3

[PATCH] logrotate: Update to version 3.19.0
by Adolf Belka 10 May '22

10 May '22

- Update from version 3.18.0 to 3.19.0 - Update of rootfile not required - Removed ./autogen.sh as configure file has been available in the source tarball since version 3.12.3 and has not needed to be generated by autogen.sh - Changelog ## [3.19.0] - 2022-01-07 - continue on `EINTR` in `compressLogFile()` (#430) - enforce stricter parsing of configuration files (#427, #431) - avoid confusing error message in debug mode (#426) - fix `full_write()` on incomplete write (#415) - do not use `alloca()` any more (#412) - do not rotate hard links unless `allowhardlink` is used (#407) - change directory after dropping privileges (#397) - add defence in depth when dropping privileges (#400) - remove invalid configuration on error (#408) - do not open symbolic link log files by accident (#399) - do not write state if state file is `/dev/null` (#395) ## [3.18.1] - 2021-05-21 - fix memory leaks on error-handling paths (#383, #387) - make `renamecopy` and `copytruncate` override each other (#386) - improve error handling in the parser of configuration files (#383) - improve user experience for non-privileged users of logrotate (#372) Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> --- lfs/logrotate | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/lfs/logrotate b/lfs/logrotate index 90fdd1cfa..6516b1df5 100644 --- a/lfs/logrotate +++ b/lfs/logrotate @@ -24,10 +24,10 @@ include Config -VER = 3.18.0 +VER = 3.19.0 THISAPP = logrotate-$(VER) -DL_FILE = logrotate-$(VER).tar.gz +DL_FILE = logrotate-$(VER).tar.xz DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) @@ -42,7 +42,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = 4e78e980f2cc8e4b208c5d64df7ba173b59dbb1913a37f28e867dae71e56d50567c8614c7b9cfc04f6dee7888518b50d302f4935a248428c567d7e42a8dcbaf9 +$(DL_FILE)_BLAKE2 = bb19690ca092905e527f6a0a7915373a65b29d3b50d97456ed31aa9b5b5698b3ae266c8e247a167198dcd8891a7e330f4913dfefa3563e5b2de7a6e0d067a6c3 install : $(TARGET) @@ -71,9 +71,8 @@ $(subst %,%_BLAKE2,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && ./autogen.sh cd $(DIR_APP) && ./configure --prefix=/usr cd $(DIR_APP) && make $(MAKETUNING) -- 2.36.0

1 0

[PATCH] libyang: Update to version 2.0.194
by Adolf Belka 10 May '22

10 May '22

- Update from version 2.0.7 to 2.0.194 - Update of rootfile - Changelog Version 2.0.194 Latest major yanglint improvements minor XPath fixes nested extension handling fixes other minor bugfixes RPM scripts updated Version 2.0.164 Windows support (thanks to @jktjkt) Schema Mount support schema compilation fixes minor schema printer fixes user-ordered list diff bugfix JSON anyxml/anydata format fixed XML parser CDATA support module caching improvements doc improvements many other various bugfixes Version 2.0.112 support for XPath variables minor doxygen improvements LYB format bugfixes many other bugfixes Version 2.0.97 LYB format data length limit of 64kB lifted YANG error-app-tag and error-message improved support XPath * evaluation fix other minor XPath fixes Version 2.0.88 changed compilation to pedantic and use C11 standard major JSON parser fixes LYB format updated and performance improved LYB big-endian fixes opaque node fixes major identity handling fixes schema compilation refactorization and fixes data validation fixes NETCONF RPC filter attribute support many other minor fixes Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> --- config/rootfiles/common/libyang | 4 ++-- lfs/libyang | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/config/rootfiles/common/libyang b/config/rootfiles/common/libyang index f77ef8b70..898160158 100644 --- a/config/rootfiles/common/libyang +++ b/config/rootfiles/common/libyang @@ -25,7 +25,7 @@ #usr/include/libyang/version.h #usr/lib/libyang.so usr/lib/libyang.so.2 -usr/lib/libyang.so.2.1.4 -#usr/lib/pkgconfig +usr/lib/libyang.so.2.20.15 #usr/lib/pkgconfig/libyang.pc #usr/share/man/man1/yanglint.1 +#usr/share/man/man1/yangre.1 diff --git a/lfs/libyang b/lfs/libyang index 5699aea9c..f97cd0742 100644 --- a/lfs/libyang +++ b/lfs/libyang @@ -24,7 +24,7 @@ include Config -VER = 2.0.7 +VER = 2.0.194 THISAPP = libyang-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = a3ad7dc0bcff14ea5fec0221f11efb2ef61efa8b4b3c8ebd6d58f3184cc1f1979c026985c1782d2f2177227a8aae815c6c4fa7063fb19156af78f65740623318 +$(DL_FILE)_BLAKE2 = aa323b39752ac426f35e1ef17ca4a61d726c48916b740511ed03b06b8132747207dd4620842f9730ff1d05f216086310bc1634f393163067c119f5eec0aa91b1 install : $(TARGET) -- 2.36.0

1 0

[PATCH] suricata: Perform ruleset update every 12 hours.
by Stefan Schantl 08 May '22

08 May '22

Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> --- config/cron/crontab | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/cron/crontab b/config/cron/crontab index d61d26619..c42104626 100644 --- a/config/cron/crontab +++ b/config/cron/crontab @@ -62,8 +62,8 @@ HOME=/ # Update location database %hourly,random * [ -f "/var/ipfire/red/active" ] && /usr/local/bin/update-location-database >/dev/null 2>&1 -# Update surciata rules. -%daily,random * [ -f "/var/ipfire/red/active" ] && /usr/local/bin/update-ids-ruleset >/dev/null 2>&1 +# Perform a surciata rules update every 12 hours. +@ 12h [ -f "/var/ipfire/red/active" ] && /usr/local/bin/update-ids-ruleset >/dev/null 2>&1 # Retry sending spooled mails regularly %hourly * /usr/sbin/dma -q -- 2.30.2

3 2

IDSv4 changes
by Peter Müller 06 May '22

06 May '22

Hello Stefan, better late than never I finally reviewed the IDSv4 changes you made, and installed the latest tarball onto my testing machine. Everything went pretty smooth, with the only exception of this message emitted by the converter script: > [root@maverick ~]# convert-ids-backend-files > 5/4/2022 -- 17:37:00 - <Error> - [ERRCODE: SC_ERR_FOPEN(44)] - Failed to open configuration include file /var/ipfire/suricata/suricata-used-rulesfiles.yaml: No such file or directory While ignoring this message did not cause any harm in my case, could you please confirm that this one is safe to ignore indeed? Afterwards, I toyed around with the IDS CGI, and was unable to break it or cause any unwanted behaviour. Therefore, IDSv4 looks good to me, and I just merged this branch of yours into "next", and added all the necessary changes to Core Update 168 and its updater. It would be great if you could have a look at https://git.ipfire.org/?p=ipfire-2.x.git;a=commit;h=68725035744de0253f19e0b… and drop me a line in case anything is still missing. With regards to Patchwork, I assume https://patchwork.ipfire.org/project/ipfire/list/?series=2729 is superseded by the IDSv4 changes, but https://patchwork.ipfire.org/project/ipfire/patch/20220406192332.4865-1-ste… definitely is not. While I tend to agree with this patch, Michael asked for its rationale, so it would be great if you could reply to his question. Aside from that, many thanks for your contribution. IDSv4 really is an improvement. Thanks, and best regards, Peter Müller

2 1

[PATCHv2] suricata: Do not create silly forward rules.
by Stefan Schantl 06 May '22

06 May '22

Skip creating forward rules if the input and the output device are the same. Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> --- src/initscripts/system/suricata | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/initscripts/system/suricata b/src/initscripts/system/suricata index 5ede405ce..79c105c23 100644 --- a/src/initscripts/system/suricata +++ b/src/initscripts/system/suricata @@ -171,6 +171,11 @@ function generate_fw_rules { # Create rules which are required to handle forwarded traffic. for enabled_ips_zone_forward in "${enabled_ips_zones[@]}"; do + # Skip loop iteration if both zones are the same. + if [ "$enabled_ips_zone" == "$enabled_ips_zone_forward" ]; then + continue + fi + # Check if the whetelist file is not empty. if [ -s "$WHITELIST_FILE" ]; then # Create rules to handle whitelisted hosts. -- 2.30.2

2 2

[PATCH] nut: Update to version 2.8.0
by Adolf Belka 05 May '22

05 May '22

- Update from version 2.7.4 to 2.8.0 - 2.7.4 was released in 2016 and since then not a lot of progress was made with it but since the start of 2022 new work on nut has ocurred culminating in this release - Update of rootfile - Ran find-dependencies on the old libraries due to the sobump to confirm that nothing else than nut used them, which was the case. - Changelog After a long and windy trip since the last official release v2.7.4 half a dozen years ago, we the community, contributors and maintainers are proud to announce at last the general availability of NUT v2.8.0! As always, the new release includes numerous new drivers, sub-drivers, protocols and bug-fixes, with many companies and individuals chipping in with contributions of code.Thanks to everyone involved in making this happen, inspiring the changes, and providing the open-source friendly infrastructure. This release also culminates a significant effort in improvements of NUT QA and CI, and as a result -- in codebase quality and portability across a decade or two of recent platforms, third-party tools and other dependencies. As a side effect, public API (in headers and libraries) has changed a bit, hence a new semantic "minor" number is claimed for this major body of work. During this time, the https://networkupstools.org/ web site has changed to a rolling-release model to serve current information to match the evolving codebase. There are now special Sub-sites for historic releases to keep documentation snapshots relevant for users of packages which are typically based on official NUT releases. We recognize that NUT is an important piece of infrastructure which gets built into all sorts of devices, projects and operating systems -- some of which the team never heard of until they pop up in a question, and others we haven't heard of for years -- so we take a seriously omnivorous stance towards covering many versions and implementations of compiler suites, C/C++ revisions, make programs, shell and other scripted language interpreters, OSes and CPUs, and other similar variables tamed with our new NUT CI farm test matrix dynamically driven by currently registered build agents and their declared capabilities. Sections in the NEWS and UPGRADING files about changes since last release are several pages long, so would not all be repeated here. A few important highlights for distribution packagers and custom builders follow, however: NUT now supports more i2c and modbus devices, as well as libusb-1.0 support as an alternative to earlier libusb-0.1 (so new dependency-based categories of packages for drivers may be due); NUT Python modules and scripts (e.g. NUT-Monitor variants) should work with python-2.7 and with python-3.x, so covering historic distro releases as well as new ones (and so your distro can deliver one or both, probably in several packages with different dependencies in the latter case); NUT provides revised reference systemd and SMF service unit definitions, including support of drivers wrapped into individual service instances with varying dependencies based on different media required (networked stack, USB stack, etc.), and many daemons include -F option for running "in foreground" to avoid extra forking after one already done by a service framework - you may want to use those in your packaged deliverables; NUT newly provides the "nut-driver-enumerator" script and service, which allows it to follow edition of ups.conf and dynamically define+(re)start and stop+undefine service instances for drivers - there are several ways it can be integrated for different use-cases; There are several new configuration keywords and CLI options - so while new NUT builds should work with old configs and scripts, the opposite is not necessarily true (old binaries may reject configurations taking advantage of new features); There are several new protocol keywords - but old and new NUT daemons (data server and clients) should be able to communicate both ways; It is assumed that API/ABI changes may require third-party NUT clients (library consumers of libnutclient, libupsclient, libnutscan... -- their version info was bumped accordingly) to get rebuilt, in order to work with the new NUT release in a stable fashion; The dummy-ups driver used in automated testing now processes *.dev filename patterns once and does not loop, like it still does for *.seq and other files (by default); USB code is now more strict about logical minimum/maximum ranges for data reported from devices, and some devices were already found to make mistakes - so there is also a mechanism for turning a blind eye to known issues and fix-up such report descriptors to produce intended sane values; New documentation page docs/config-prereqs.txt highlights packaged dependencies installable on a large range of platforms to build as much of NUT as possible (incidentally, ones NUT CI farm uses to test every iteration); Finally, we hope that NUT codebase might be able to cater for everyone "out of the box" (it also simplifies local builds from GitHub sources on any systems, for troubleshooting and checking pre-release enhancements): if you as a packager have to apply patches for your distribution, give it a thought -- whether they address a common issue best solved upstream once and behave similarly for everyone (and conversely, if your platform can do with existing solutions already tracked in the NUT version du-jour). PRs welcome! Or at least Wiki entries to list all the distro efforts for cross-pollination Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> --- config/rootfiles/packages/nut | 36 +++++++++++++++++++++-------------- lfs/nut | 18 ++++++++++++------ 2 files changed, 34 insertions(+), 20 deletions(-) diff --git a/config/rootfiles/packages/nut b/config/rootfiles/packages/nut index b01381d74..3bf9d03a9 100644 --- a/config/rootfiles/packages/nut +++ b/config/rootfiles/packages/nut @@ -5,6 +5,7 @@ etc/nut/upsd.conf.sample etc/nut/upsd.users.sample etc/nut/upsmon.conf.sample etc/nut/upssched.conf.sample +etc/rc.d/init.d/nut etc/udev/rules.d/62-nut-usbups.rules usr/bin/al175 usr/bin/apcsmart @@ -36,10 +37,11 @@ usr/bin/metasys usr/bin/mge-shut usr/bin/mge-utalk usr/bin/microdowell +usr/bin/microsol-apc usr/bin/nut-scanner usr/bin/nutdrv_atcl_usb usr/bin/nutdrv_qx -usr/bin/oldmge-shut +usr/bin/nutdrv_siemens-sitop usr/bin/oneac usr/bin/optiups usr/bin/powercom @@ -63,21 +65,22 @@ usr/bin/upsrw usr/bin/upssched-cmd usr/bin/usbhid-ups usr/bin/victronups -#usr/lib/libnutclient.a #usr/lib/libnutclient.la -usr/lib/libnutclient.so -usr/lib/libnutclient.so.0 -usr/lib/libnutclient.so.0.0.0 -#usr/lib/libnutscan.a +#usr/lib/libnutclient.so +usr/lib/libnutclient.so.2 +usr/lib/libnutclient.so.2.0.0 +#usr/lib/libnutclientstub.la +#usr/lib/libnutclientstub.so +usr/lib/libnutclientstub.so.1 +usr/lib/libnutclientstub.so.1.0.0 #usr/lib/libnutscan.la -usr/lib/libnutscan.so -usr/lib/libnutscan.so.1 -usr/lib/libnutscan.so.1.0.0 -#usr/lib/libupsclient.a +#usr/lib/libnutscan.so +usr/lib/libnutscan.so.2 +usr/lib/libnutscan.so.2.0.0 #usr/lib/libupsclient.la -usr/lib/libupsclient.so -usr/lib/libupsclient.so.4 -usr/lib/libupsclient.so.4.0.0 +#usr/lib/libupsclient.so +usr/lib/libupsclient.so.6 +usr/lib/libupsclient.so.6.0.0 usr/sbin/upsd usr/sbin/upsdrvctl usr/sbin/upsmon @@ -119,10 +122,13 @@ usr/share/driver.list #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 @@ -143,12 +149,14 @@ usr/share/driver.list #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 -etc/rc.d/init.d/nut diff --git a/lfs/nut b/lfs/nut index cd0af7ec5..619918b5b 100644 --- a/lfs/nut +++ b/lfs/nut @@ -26,7 +26,7 @@ include Config SUMMARY = Network UPS Tools Core (Uninterruptible Power Supply Monitoring) -VER = 2.7.4 +VER = 2.8.0 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 = 7 +PAK_VER = 8 DEPS = @@ -50,7 +50,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = 367c687efd739150898a14c700d5fddbe22bf926522923e1842011ec49b67d6638620500c4eda50291feb474cc6eef39fff63764cb3e0fad5898abee981f8308 +$(DL_FILE)_BLAKE2 = 6ad87e9c90920d45846d9c1311e8feeb3c36bfa506d62d938940c00d2fc7f7b30632d079a8ee969db624824ae4fd3e14e41e8acd1eda296e26a3aa340f186b94 install : $(TARGET) @@ -84,9 +84,15 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) $(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 + 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 -- 2.36.0

2 1

← Newer
1
2
3
4
5
6
7
8
9
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

Development May 2022