Skip to content

Remerge master as of 20260210 to FTY#3317

Open
jimklimov wants to merge 237 commits intonetworkupstools:FTYfrom
jimklimov:FTY-remerge-20260210
Open

Remerge master as of 20260210 to FTY#3317
jimklimov wants to merge 237 commits intonetworkupstools:FTYfrom
jimklimov:FTY-remerge-20260210

Conversation

@jimklimov
Copy link
Member

@jimklimov jimklimov commented Feb 11, 2026

Another bump goes by... more recently fixed bugs to resync into the other code base, wannabe into the main trunk.

jimklimov and others added 30 commits January 23, 2026 09:58
@jimklimov
docs/man/nut-ipmipsu.txt: add errata note about possible troubles whe…
c40e440 
…n changing OS user accounts [networkupstools#3193]

Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
@timn
Add UPower driver
1fa967f 
Enables to read UPS data from UPower. This is useful if a UPS
connected to a desktop system should be exposed over the network.
It can also be used to expose laptop batteries.

Signed-off-by: Tim Niemueller <tim@niemueller.de>
@timn
Add libglib2.0-dev to github action builder
f0b2e3e 
Required to also test upower_dbus driver.

Signed-off-by: Tim Niemueller <tim@niemueller.de>
@timn
Address upower driver immediate review comments
83b04d1 
Signed-off-by: Tim Niemueller <tim@niemueller.de>
@timn
Rename upower_dbus driver to nut-upower
a2699f2 
Signed-off-by: Tim Niemueller <tim@niemueller.de>
@jimklimov @chu11
tools/nut-scanner/scan_ipmi.c, drivers/nut-ipmipsu.c: fixed an issue …
6cfa1a6 
…where multiple calls to clean-up crashed the program [networkupstools#3193]

Special thanks to maintainer of libfreeipmi for helping catch it!

Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
Co-authored-by: Albert Chu <chu11@llnl.gov>
@jimklimov
.github/workflows/01-make-dist.yml, .github/workflows/05-codeql.yml: …
18752eb 
…add libglib2.0-dev [networkupstools#3279]

Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
@jimklimov
scripts/obs/_service: survive git tags with a dash [networkupstools#1209
4906090 
]

Avoid RPM build error like:
    line 121: Illegal char '-' (0x2d) in: Version:        2.8.5-rc1.12+g3501cd37

Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
@jimklimov
drivers/upsdrvctl.c, NEWS.adoc, conf/ups.conf.sample, docs: apply glo…
c957880 
…bal debug_min from ups.conf also to upsdrvctl tool itself [networkupstools#3276]

Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
@jimklimov
drivers/upsdrvctl.c: if we fail to stop a driver by signal, retry to …
034cf8b 
…"exit" it by protocol [networkupstools#3277]

Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
@jimklimov
drivers/upsdrvquery.c: protect upsdrvquery_close() from SIGPIPE crash…
ed67ebe 
… if the other side exited [networkupstools#3277]

Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
@jimklimov
drivers/upsdrvquery.{c,h}: separate upsdrvquery_ping() from upsdrvque…
4335c29 
…ry_prepare() [networkupstools#3277]

Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
@jimklimov
drivers/upsdrvctl.c: upsdrvquery_ping() after telling the driver to s…
11f6d9b 
…top, so upsdrvctl exits when the driver is gone [networkupstools#3277]

Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
@jimklimov
drivers/upsdrvquery.c: upsdrvquery_write() use MSG_NOSIGNAL where ava…
1529a10 
…ilable [networkupstools#3277]

Proper NUT daemons intercept SIGPIPE and survive closed connections,
but consumers of upsdrvquery might not, and would crash. If we can,
just return the error (and errno=EPIPE) for the specific call.

Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
@jimklimov
drivers/upsdrvquery.c: upsdrvquery_close(): refactor work with setsoc…
b0479fe 
…kopt(), prefer it over the blanket signal change for the process; handle EPIPE specially [networkupstools#3277]

Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
@jimklimov
drivers/upsdrvquery.{c,h}, UPGRADING.adoc, NEWS.adoc: introduced upsd…
ef33fc0 
…rvquery_NOSIGPIPE toggle for consumers who might want to handle SIGPIPE themselves [networkupstools#3277]

Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
@jimklimov
drivers/upsdrvctl.c: stop_driver(): handle not-hearing from the last …
461151c 
…PONG a bit cleaner [networkupstools#3277]

Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
@jimklimov
drivers/upsdrvquery.c: upsdrvquery_ping(): revise intense reading loo…
18404a7 
…p and timeout accounting when the read size remains 0 [networkupstools#3277]

Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
@jimklimov
drivers/upsdrvctl.c: stop_driver(): if upsdrvquery_connect_drvname_up…
1a06966 
…sname() failed, try another in case the driver is still starting and we were called too soon [networkupstools#3277]

Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
@jimklimov
drivers/upsdrvctl.c: stop_driver(): try shorter PING first, so a clos…
7408a4e 
…ed socket is detected earlier [networkupstools#3277]

Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
@jimklimov
Merge branch 'master' into timn/upower-drv
a6e14ae
@jimklimov
docs/nut.dict: add gio [networkupstools#3279]
c34b4fa 
Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
@timn
Update doc/nut.dict from make spellcheck-interactive
b1a0a85 
Add missing terms.

Signed-off-by: Tim Niemueller <tim@niemueller.de>
@jimklimov
Merge pull request networkupstools#3277 from jimklimov/issue-3276
c49aa0e 
Apply global `debug_min` from `ups.conf` also to `upsdrvctl` tool
@jimklimov
Merge branch 'master' into timn/upower-drv
c3eb81c
@jimklimov
drivers/arduino-hid.c, NEWS.adoc, docs/nut.dict: add ups.load, `inp…
ba4f907 
…ut.voltage`, `output.voltage` for e.g. Ugreen US3000 [networkupstools#3281]

Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
Added Liebert PSI5-800RT120
9ddac6a 
Signed-off-by: air5551 <Air@example.org>
Trying to make CI happy :3
e2b4d2b 
Signed-off-by: air5551 <Air@example.org>
@jimklimov
data/driver.list.in: clean up the markup a bit [networkupstools#3285]
e3a33d5 
Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
@jimklimov
drivers/nutdrv_qx.c: improve debug tracing for main loop skeleton [ne…
976a639 
…tworkupstools#3282]

Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
@jimklimov
Merge pull request networkupstools#3307 from jimklimov/issue-3205
8111ced 
drivers/upsdrvctl.c: forkexec(): double-quote the WIN32 argv[0] in commandline
@jimklimov
Merge pull request networkupstools#3309 from darkglade/darkglade-gen-…
e714ba3 
…snmp-subdriver-fix

Fix hang in gen-snmp-subdriver.sh
@jimklimov
Merge pull request networkupstools#3310 from jimklimov/nutscanner-ltd…
1d1c57d 
…l-trace-symbols

Trace symbols from dynamically loaded libraries in `nut-scanner`
@jimklimov
Merge pull request networkupstools#3313 from jimklimov/issue-3312
43a9336 
Support exiting from `nut.exe -N` with Ctrl+C
@jimklimov
Merge pull request networkupstools#3304 from jimklimov/issue-2524
83b0fda 
Support providing CGI options for alternate template file names
@jimklimov
Merge pull request networkupstools#3315 from jimklimov/issue-3314
cc72213 
`configure.ac` man-page section magic vs. tarball builds
@jimklimov
Merge branch 'master' into issue-3302
7a17b0d
@jimklimov
Merge pull request networkupstools#3303 from jimklimov/issue-3302
3c77d91 
upsd: chunk the MAXCONN-sized array processing into several smaller "sysmaxconn"-sized polls as needed
@jimklimov jimklimov added this to the 2.8.5 milestone Feb 11, 2026
@jimklimov jimklimov added the DMF NUT Data/Dynamic Mapping File/Format/Functionality feature label Feb 11, 2026
@jimklimov
Merge remote-tracking branch 'upstream/master' as of 2026-02-10 into FTY
ab7ddb9 
Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
@jimklimov jimklimov force-pushed the FTY-remerge-20260210 branch from 5db7fb1 to ab7ddb9 Compare February 11, 2026 09:31
github-advanced-security[bot]
github-advanced-security bot found potential problems Feb 11, 2026
View reviewed changes
drivers/bestfortress.c
Comment on lines +393 to +395
boosting = 0; /* FIXME, don't know which bit gets set
* (brownouts are very rare here and
* I can't simulate one) */

Check notice

Code scanning / CodeQL

FIXME comment Note

FIXME comment: , don't know which bit gets set [...]
drivers/dstate.c
Comment on lines +2268 to +2273
} else if ( (v1 && v2 && v3)
|| (v1n && v2n && v3n)
|| (c1 && (c2 || c3))
|| (c2 && (c1 || c3))
|| (c3 && (c1 || c2))
|| v12 || v23 || v31

Check notice

Code scanning / CodeQL

Complex condition Note

Complex condition: too many logical operations in this expression.
drivers/dstate.c
Comment on lines +2280 to +2291
!v12 && !v23 && !v31
&& ( (c0 && !c1 && !c2 && !c3)
|| (v0 && !v1 && !v2 && !v3)
|| (c1 && !c2 && !c3)
|| (!c1 && c2 && !c3)
|| (!c1 && !c2 && c3)
|| (v1 && !v2 && !v3)
|| (!v1 && v2 && !v3)
|| (!v1 && !v2 && v3)
|| (v1n && !v2n && !v3n)
|| (!v1n && v2n && !v3n)
|| (!v1n && !v2n && v3n) )

Check notice

Code scanning / CodeQL

Complex condition Note

Complex condition: too many logical operations in this expression.
tools/nut-scanner/scan_upower.c
/* Passed final lt_dlsym() */
symbol = NULL;

if (dl_saved_libname)

Check notice

Code scanning / CodeQL

Guarded Free Note

unnecessary NULL check before call to
free
Loading
@AppVeyorBot
Copy link

AppVeyorBot commented Feb 11, 2026

✅ Build nut 2.8.4.4241-FTY completed (commit 9cdda1b73c by @jimklimov)

@jimklimov
Copy link
Member Author

jimklimov commented Feb 11, 2026

GitHub auth engine crashed and denied checkouts :\

jimklimov and others added 15 commits February 12, 2026 20:35
@jimklimov
docs/maintainer-guide.txt: move VERSION_FORCED* file preparation (inv…
aa12c17 
…olves git tagging) to after changing committed files

Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
@jimklimov
docs/maintainer-guide.txt: add OBS reference recipes to watch for ver…
45d4d3b 
…sion bump when releasing

Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
@jimklimov
scripts/Windows/build-mingw-nut.sh: add license header
6ee0afd 
Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
@jimklimov
docs/maintainer-guide.txt: GHA file for PyNUTClient was renamed
6ecf771 
Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
@jimklimov
Revert ".obs/workflows.yml: separate project builds with what looks l…
627cecb 
…ike RC tags to use a separate OBS template (tweaked to change the dash into tilde for packaging versions) [networkupstools#1209]"

This reverts commit cced83a:
the currently deployed OBS service does not filter by "tags"... sadly.

Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
@jimklimov
conf/upsstats.html.sample.in: drop duplicate @refresh@ directive [net…
2cd8817 
…workupstools#3316]

Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
@jimklimov
clients/upsstats.c, docs/man/upsstats.html.txt: extend @STATUS@ to in…
eca41b7 
…ject any separators, not only <br/> [networkupstools#3316]

Keep <br/> as legacy default, to work with older upsstats*.html templates.

Closes: networkupstools#2525

Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
@jimklimov
clients/upsstats.c: display_tree(): drop spurious <br> at end of tabl…
f022e6d 
…e data cell [networkupstools#3316]

Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
@jimklimov @dtsecon
common/common.c, include/common.h, drivers/adelsystem_cbi.c, drivers/…
073ce37 
…generic_modbus.c: generalize elapsed_since_timeval() [networkupstools#1938]

Closes: networkupstools#1938

Co-authored-by: Dimitris Economou <dimitris.s.economou@gmail.com>
Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
@jimklimov
Merge pull request networkupstools#3321 from jimklimov/low-hanging-fr…
1ae96a7 
…uits

`common.{c,h}`: generalize `elapsed_since_timeval()` originally from modbus drivers
@jimklimov
Merge pull request networkupstools#3320 from jimklimov/prepare-releas…
b0b3898 
…e-2.8.5-picks

Pick some changes from "prepare release 2.8.5" branch and PR networkupstools#3318
@jimklimov
docs/man/nut.txt: old asciidoc variable "unset" only works with trail…
90ad1dc 
…ing exclamation mark

Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
@jimklimov
docs/images/nut-squared.svg: add a margin-less version of NUT logo
65e838d 
Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
@jimklimov
Merge remote-tracking branch 'upstream/master' into FTY-remerge-20260210
099629a 
Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
@jimklimov
Merge branch 'low-hanging-fruits' into FTY-remerge-20260210
1085215 
Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

DMF NUT Data/Dynamic Mapping File/Format/Functionality feature

Projects

None yet

Milestone

2.8.5

Development

Successfully merging this pull request may close these issues.

7 participants

@jimklimov @AppVeyorBot @timn @Vladdrako @TomZanna @jawz101 @darkglade