Remerge master branch as of 2026-04-07 and NUT v2.8.5 release into FTY

.github/workflows/00-preclean.yml

@@ -0,0 +1,38 @@
+name: "GHA-00: Pre-clean"
+
+on:
+  push:
+    branches: [ "master", "FTY", "fightwarn", "FTY-obs" ]
+    tags:
+      - v*
+  pull_request_target:
+    # The branches below must be a subset of the branches above
+    # Note that for PRs this runs the copy of workflow in the
+    # target branch (and only then gets some of the permissions
+    # listed below), and identification/naming of PR source vs.
+    # a pushed branch (e.g. master updated by a PR merge) is
+    # tricky.
+    branches: [ "master", "FTY", "fightwarn", "FTY-obs" ]
+  workflow_dispatch:
+    # Allow manually running the action, e.g. if disabled after some quietness in the source
+
+permissions:
+  checks: write
+  contents: write
+  issues: write
+  pull-requests: write
+
+jobs:
+  clean:
+    runs-on: ubuntu-latest
+    steps:
+      - name: pr-deleter
+        if: github.event.pull_request.number > 0
+        uses: maheshrayas/action-pr-comment-delete@v3.0
+        with:
+          github_token: '${{ secrets.GITHUB_TOKEN }}'
+          org:   networkupstools	# '${{context.repo.owner}}'
+          repo:  nut	# '${{context.repo.repo}}'
+          user:  'AppVeyorBot'
+          # user:  'github-actions[bot]' #commented by the userid
+          issue: '${{github.event.number}}'

.github/workflows/01-make-dist.yml

@@ -81,6 +81,19 @@ jobs:
         echo "github.ref='${{ github.ref }}'" || true
         echo "github.ref_name='${{ github.ref_name }}'" || true
 
+    - name: "GHA-01: Create/Update new GH PR comment for future link"
+      if: github.event.pull_request.number > 0
+      continue-on-error: true
+      env:
+        ref: ${{ github.event.pull_request.head.sha || github.sha }}
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      uses: thollander/actions-comment-pull-request@v3
+      with:
+        message: |
+            Preparing a ZIP file with standard source tarball and another tarball with pre-built docs for commit ${{ env.ref }} ...
+        comment-tag: tarball-url
+        github-token: ${{ env.GITHUB_TOKEN }}
+
     # Make build identification more useful (so we use no fallbacks in script)
     - name: Try to get more Git metadata
       run: |
@@ -267,6 +280,21 @@ jobs:
         compression-level: 0
         overwrite: true
 
+    - name: "GHA-01: Create/update new GH PR comment with link"
+      if: github.event.pull_request.number > 0
+      continue-on-error: true
+      env:
+        artifact_name: "NUT-tarballs-${{ steps.subst-github-ref-name.outputs.result }}.zip"
+        artifact_url: ${{ steps.upload_artifact.outputs.artifact-url }}
+        ref: ${{ github.event.pull_request.head.sha || github.sha }}
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      uses: thollander/actions-comment-pull-request@v3
+      with:
+        message: |
+            A ZIP file with standard source tarball and another tarball with pre-built docs for commit ${{ env.ref }} is temporarily available: [${{ env.artifact_name }}](${{ env.artifact_url }}).
+        comment-tag: tarball-url
+        github-token: ${{ env.GITHUB_TOKEN }}
+
     # NOTE: Despite the docs examples, due to GH API changes in Mar 2025
     # this action can no longer update an existing check, only create a
     # new one. Also calls authenticated with "github-actions" GH App may

.github/workflows/08-PyNUTClient.yml

@@ -49,7 +49,7 @@ jobs:
             {  TAG_NAME="$(git describe --tags --match 'v[0-9]*.[0-9]*.[0-9]' --exclude '*-signed' --exclude '*rc*' --exclude '*alpha*' --exclude '*beta*')" \
             || TAG_NAME="$(git describe --tags --exclude '*rc*' --exclude '*alpha*' --exclude '*beta*' --exclude '*Windows*' --exclude '*IPM*')" ; } \
             && test -n "${TAG_NAME}" \
-            || TAG_NAME="2.8.4-`TZ=UTC date +%s`" ;
+            || TAG_NAME="2.8.5-`TZ=UTC date +%s`" ;
         fi >&2 ;
         TAG_NAME="$(echo "$TAG_NAME" | sed -e 's/^v\([0-9]\)/\1/' -e 's,^.*/,,' -e 's/^v//' -e 's/-g.*$//' -e 's/-/./g')" ;
         echo "TAG_NAME=$TAG_NAME" >> $GITHUB_OUTPUT

.gitignore

@@ -15,6 +15,7 @@
 Makefile
 Makefile.in
 tags
+.all.*-generated.timestamp
 
 ## Parent directory only
 /aclocal.m4
@@ -51,6 +52,7 @@ tags
 /VERSION_FORCED
 /VERSION_FORCED_SEMVER
 /install-sh
+/.libs-dev-PATH
 /libtool
 /ltmain.sh
 /missing

AUTHORS

@@ -4,8 +4,9 @@
 # Everyone deserves credit, including those who haven't added any code.
 # Ideas, clues, and helping out on the mailing lists all count too.
 #
-# This is a blatant ripoff of the fields found in the Linux kernel's CREDITS
-# file.  If we need more data, those fields can always be added later.
+# This is a blatant ripoff of the fields found in the CREDITS file of
+# the Linux kernel. If we need more data, those fields can always be
+# added later.
 #
 # N = name, E = email, W = web address, D = description, P = PGP info,
 # S = snailmail address, etc.

Jenkinsfile-dynamatrix

@@ -1457,6 +1457,7 @@ def stageNameFunc_ShellcheckCustom(DynamatrixSingleBuildConfig dsbc) {
 if ( env?.BRANCH_NAME ==~ /.*verbose.*/ )
 {
     dynamatrixGlobalState.enableDebugTrace = true
+	//dynamatrixGlobalState.enableDebugTraceResolver = true
     dynamatrixGlobalState.enableDebugErrors = true
     dynamatrixGlobalState.enableDebugMilestones = true
     dynamatrixGlobalState.enableDebugMilestonesDetails = true