Remerge master as of 20260210 to FTY #3317
Open
+6,505
−2,400
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…n changing OS user accounts [networkupstools#3193] Signed-off-by: Jim Klimov <[email protected]>
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 <[email protected]>
Required to also test upower_dbus driver. Signed-off-by: Tim Niemueller <[email protected]>
Signed-off-by: Tim Niemueller <[email protected]>
Signed-off-by: Tim Niemueller <[email protected]>
…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 <[email protected]> Co-authored-by: Albert Chu <[email protected]>
…add libglib2.0-dev [networkupstools#3279] Signed-off-by: Jim Klimov <[email protected]>
] Avoid RPM build error like: line 121: Illegal char '-' (0x2d) in: Version: 2.8.5-rc1.12+g3501cd37 Signed-off-by: Jim Klimov <[email protected]>
…bal debug_min from ups.conf also to upsdrvctl tool itself [networkupstools#3276] Signed-off-by: Jim Klimov <[email protected]>
…"exit" it by protocol [networkupstools#3277] Signed-off-by: Jim Klimov <[email protected]>
… if the other side exited [networkupstools#3277] Signed-off-by: Jim Klimov <[email protected]>
…ry_prepare() [networkupstools#3277] Signed-off-by: Jim Klimov <[email protected]>
…top, so upsdrvctl exits when the driver is gone [networkupstools#3277] Signed-off-by: Jim Klimov <[email protected]>
…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 <[email protected]>
…kopt(), prefer it over the blanket signal change for the process; handle EPIPE specially [networkupstools#3277] Signed-off-by: Jim Klimov <[email protected]>
…rvquery_NOSIGPIPE toggle for consumers who might want to handle SIGPIPE themselves [networkupstools#3277] Signed-off-by: Jim Klimov <[email protected]>
…PONG a bit cleaner [networkupstools#3277] Signed-off-by: Jim Klimov <[email protected]>
…p and timeout accounting when the read size remains 0 [networkupstools#3277] Signed-off-by: Jim Klimov <[email protected]>
…sname() failed, try another in case the driver is still starting and we were called too soon [networkupstools#3277] Signed-off-by: Jim Klimov <[email protected]>
…ed socket is detected earlier [networkupstools#3277] Signed-off-by: Jim Klimov <[email protected]>
Signed-off-by: Jim Klimov <[email protected]>
Add missing terms. Signed-off-by: Tim Niemueller <[email protected]>
Apply global `debug_min` from `ups.conf` also to `upsdrvctl` tool
…ut.voltage`, `output.voltage` for e.g. Ugreen US3000 [networkupstools#3281] Signed-off-by: Jim Klimov <[email protected]>
Signed-off-by: air5551 <[email protected]>
Signed-off-by: air5551 <[email protected]>
Signed-off-by: Jim Klimov <[email protected]>
…tworkupstools#3282] Signed-off-by: Jim Klimov <[email protected]>
…ls#3311] Signed-off-by: Jim Klimov <[email protected]>
…here import failed [networkupstools#3310] Signed-off-by: Jim Klimov <[email protected]>
…pport in vupslog(), and cgilogbit_set() for browser-friendly logging in NUT CGI programs [networkupstools#2524] Signed-off-by: Jim Klimov <[email protected]>
…y logging in NUT CGI programs (in developer build and/or command-line runs) [networkupstools#2524] Signed-off-by: Jim Klimov <[email protected]>
…gi [networkupstools#2524] Signed-off-by: Jim Klimov <[email protected]>
…ith flag tokens (no assignment) in the middle, not at end [networkupstools#2524] Signed-off-by: Jim Klimov <[email protected]>
…L-check the template_list/single vars before comparing strings [networkupstools#2524] Signed-off-by: Jim Klimov <[email protected]>
… NUT CGI hosts.conf to constrain the permitted custom HTML template file names to a set that admins intend to use [networkupstools#2524] Signed-off-by: Jim Klimov <[email protected]>
… other errors, use HTML <BR/> tags in the printout (especially if debug is on) [networkupstools#2524] Signed-off-by: Jim Klimov <[email protected]>
…xiting from "nut.exe -N" with Ctrl+C [networkupstools#3312] Signed-off-by: Jim Klimov <[email protected]>
…pstools#3314] Signed-off-by: Jim Klimov <[email protected]>
… layout when we only use dist-tarball pre-built pages [networkupstools#3314] Signed-off-by: Jim Klimov <[email protected]>
… pre-built pages when we have only them and want something installed [networkupstools#3314] NOTE: want_disted_doc_man=yes is set lower in code, hopefully we do reach that part; else have inputs for troubleshooting the recipes. Signed-off-by: Jim Klimov <[email protected]>
…y to touch the artifacts as when we do upon deliberate choice [networkupstools#3314] Signed-off-by: Jim Klimov <[email protected]>
More warnings and docs fix to build under Fedora 43
drivers/upsdrvctl.c: forkexec(): double-quote the WIN32 argv[0] in commandline
…snmp-subdriver-fix Fix hang in gen-snmp-subdriver.sh
…l-trace-symbols Trace symbols from dynamically loaded libraries in `nut-scanner`
Support exiting from `nut.exe -N` with Ctrl+C
Support providing CGI options for alternate template file names
`configure.ac` man-page section magic vs. tarball builds
upsd: chunk the MAXCONN-sized array processing into several smaller "sysmaxconn"-sized polls as needed
jimklimov
added
the
DMF
Signed-off-by: Jim Klimov <[email protected]>
jimklimov
force-pushed
the
FTY-remerge-20260210
branch
from
5db7fb1 to
ab7ddb9
Compare
![github-advanced-security[bot]](https://avatars.githubusercontent.com/in/57789?s=60&v=4){kind=small}
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
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
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
| /* Passed final lt_dlsym() */ | ||
| symbol = NULL; | ||
|
|
||
| if (dl_saved_libname) |
Check notice
Code scanning / CodeQL
Guarded Free Note
|
✅ Build nut 2.8.4.4241-FTY completed (commit 9cdda1b73c by @jimklimov) |
Member
Author
|
GitHub auth engine crashed and denied checkouts :\ |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
7 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Another bump goes by... more recently fixed bugs to resync into the other code base, wannabe into the main trunk.