Skip to content

Conversation

@jimklimov
Copy link
Member

Catch up with development in upstream NUT v2.8.5 (to be) cycle.

jimklimov and others added 30 commits October 24, 2025 12:54
…me now expected by scripts/python/module/Makefile.am [networkupstools#3130]

Signed-off-by: Jim Klimov <[email protected]>
…et specifically for this script

Signed-off-by: Jim Klimov <[email protected]>
…ided one) as explicit interpreter [networkupstools#3130]

CircleCI does see the correct shebang and the script as executable,
but apparently tries to call it as a shell script and fails.
Maybe /Users/distiller/.pyenv/shims/python3.13 is broken though?..
Or we hit NixOS/nixpkgs#65351 ?

Signed-off-by: Jim Klimov <[email protected]>
CI: upstream OBS recipes from FTY branch
…for now, and expand workflows for PRs, master iterations and tag releases [networkupstools#1209]

Signed-off-by: Jim Klimov <[email protected]>
…d, fall back to the other value we had in mind [networkupstools#3136]

In libusb1.c also fix printout of rdlen variables from %d to %PRIi32

Signed-off-by: Jim Klimov <[email protected]>
…dog instead of long quietness when shutting down [networkupstools#3003]

Signed-off-by: Jim Klimov <[email protected]>
…fferent features are supported

Signed-off-by: Jim Klimov <[email protected]>
…E_EXTEND_TIMEOUT` option and relevant variables [networkupstools#3003]

Signed-off-by: Jim Klimov <[email protected]>
…protect from systemd or similar framework killing us by timeout [networkupstools#3033]

Signed-off-by: Jim Klimov <[email protected]>
…MD_DAEMON_TIMEOUT_STOP_UPSMON substitution [networkupstools#3003]

Signed-off-by: Jim Klimov <[email protected]>
…ext_device" now that we have a loop and "continue" to try another rdlen [networkupstools#3136]

Signed-off-by: Jim Klimov <[email protected]>
docs/man/nutdrv_qx.txt: Fix the formatting of VOLTRONIC-AXPERT UNITS
Add SNMP info for ups.realpower for Cyberpower UPS
@jimklimov jimklimov added this to the 2.8.5 milestone Nov 25, 2025
@jimklimov jimklimov added the DMF NUT Data/Dynamic Mapping File/Format/Functionality feature label Nov 25, 2025
@jimklimov jimklimov changed the base branch from master to FTY November 25, 2025 08:04
… script syntax with backticks and double-quotes; convert to use TOUPPER/TOLOWER detected methods [networkupstools#3196]

Signed-off-by: Jim Klimov <[email protected]>
…d double-quotes; single-quote Make variable expansions into shell [networkupstools#3196]

Signed-off-by: Jim Klimov <[email protected]>
…her "snmp-ups-dmf" or "snmp-ups-old" depending on binary build type [networkupstools#3101]

Signed-off-by: Jim Klimov <[email protected]>
@AppVeyorBot
Copy link

@jimklimov
Copy link
Member Author

Now the remaining difference between FTY and master branches seems to be all about the DMF feature (and maybe a few miniscule differences like #2476).

@AppVeyorBot
Copy link

Build nut 2.8.4.3806-FTY failed (commit 3f365ba0a5 by @jimklimov)

@jimklimov jimklimov force-pushed the FTY-remerge-20251125 branch from 4c091e5 to 9ef9f92 Compare November 25, 2025 23:26
@AppVeyorBot
Copy link

…rades or non-disruptive tests" from "Prerequisites for building NUT on different OSes" as the two chapters are closely coupled

Signed-off-by: Jim Klimov <[email protected]>
@jimklimov jimklimov merged commit b65a804 into networkupstools:FTY Nov 30, 2025
30 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

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

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants