Merge remote-tracking branch 'upstream/master' into FTY as of 20260116

.obs/workflows.yml

@@ -15,8 +15,7 @@ rebuild_master:
         project: home:networkupstools:nut-stable
         package: "%{SCM_REPOSITORY_NAME}"
   filters:
-    event:
-      - push
+    event: push
     branches:
       only:
         - master
@@ -28,5 +27,4 @@ release_tag:
         source_package: "%{SCM_REPOSITORY_NAME}"
         target_project: home:networkupstools:nut-releases
   filters:
-    event:
-      - tag_push
+    event: tag_push

Jenkinsfile-dynamatrix

@@ -1240,17 +1240,19 @@ set | sort -n """
                     ],
                 dynamatrixAxesCommonEnv: [],
                 dynamatrixAxesCommonEnvCartesian: [
-                    ['LANG=C','LC_ALL=C','TZ=UTC', 'BUILD_TYPE=default-all-errors'],
+                    [ ['LANG=C','LC_ALL=C','TZ=UTC', 'BUILD_TYPE=default-all-errors'] ],
                     [ ['BUILD_WARNFATAL=yes','BUILD_WARNOPT=hard'], ['BUILD_WARNFATAL=no','BUILD_WARNOPT=minimal'] ]
                     ],
                 allowedFailure: [
                     dynacfgPipeline.axisCombos_STRICT_C,
+                    // good by now? is in DMF... // dynacfgPipeline.axisCombos_COMPILER_GCC_TOO_OLD,
                     [~/BUILD_WARNOPT=hard/]
                     ],
                 runAllowedFailure: true,
-                mergeMode: [ 'excludeCombos': 'merge', 'dynamatrixAxesCommonEnv': 'replace' ], // NOTE: We might want to replace other fields, but excludeCombos must be merged to filter compiler versions vs language standards as centrally defined!
+                mergeMode: [ 'excludeCombos': 'merge', 'dynamatrixAxesCommonEnv': 'replace' ], // NOTE: We might want to replace other fields, but excludeCombos must be merged to filter compiler versions vs. language standards as centrally defined!
                 excludeCombos: dynacfgPipeline.excludeCombos_DEFAULT_CPPUNIT + [
                     dynacfgPipeline.axisCombos_GNU_C,
+                    // good by now? is in DMF... // dynacfgPipeline.axisCombos_WINDOWS_CROSS,
                     dynacfgPipeline.axisCombos_WINDOWS
                     ]
                 ], body)

Makefile.am

@@ -222,6 +222,7 @@ all-libs-local/include:
 ###           (consume only one of these at a time!)
 ### Delivers: libcommonversion.la (only version methods)
 ### Delivers: libparseconf.la libnutconf.la libnutwincompat.la
+### May deliver: libnutprivate-$(SEMVER)-common-all.la and libnutprivate-$(SEMVER)-common-client.la for dynamic shared-object linking, libcommonversion-private.la (dependency for the above)
 ### Requires-ext: include/nut_version.h
 ### Requires-int: libparseconf.la libcommonclient.la
 all-libs-local/common: all-libs-local/include
@@ -234,18 +235,21 @@ all-libs-local/common: all-libs-local/include
 ### Requires-ext: common/libcommon.la common/libcommonclient.la
 ### Requires-ext: common/libcommonversion.la
 ### Requires-ext: common/libparseconf.la
+### For dynamic builds, alternately LIB-Requires-ext and Requires-ext: libnutprivate-$(SEMVER)-common*.la
 ### Requires-int: libupsclient.la
 all-libs-local/clients: all-libs-local/common
 	+@NUT_VERSION_H_GENERATED=true; export NUT_VERSION_H_GENERATED; \
 	  $(SUBDIR_TGT_RULE)
 
-### Delivers: libdummy.la libdummy_serial.la libdummy_upsdrvquery.la
+### Delivers: libdummy_main.la libdummy_serial.la libdummy_upsdrvquery.la
 ### Delivers: libdummy_mockdrv.la libserial-nutscan.la
 ### LIB-Requires-ext: common/libcommon.la common/libparseconf.la
 ### Requires-ext: common/libcommon.la common/libparseconf.la
 ### Requires-ext: clients/libupsclient.la (dummy-ups only)
-### Requires-int: libdummy.la libdummy_upsdrvquery.la
+### Requires-int: libdummy_main.la libdummy_upsdrvquery.la
 ### Requires-int: libdummy_serial.la
+### For dynamic builds, alternately LIB-Requires-ext and Requires-ext: libnutprivate-$(SEMVER)-common*.la
+### and may deliver: libnutprivate-$(SEMVER)-drivers-common.la and libnutprivate-$(SEMVER)-drivers-serial.la
 all-libs-local/drivers: all-libs-local/common
 	+@NUT_VERSION_H_GENERATED=true; export NUT_VERSION_H_GENERATED; \
 	  $(SUBDIR_TGT_RULE)
@@ -270,6 +274,7 @@ all-libs-local/tools:
 ### LIB-Requires-ext: drivers/libserial-nutscan.la
 ### LIB-Requires-ext: common/libnutwincompat.la common/libcommonstr.la
 ### LIB-Requires-ext: common/libcommonversion.la
+### For dynamic builds, alternately LIB-Requires-ext and Requires-ext: libnutprivate-$(SEMVER)-common*.la
 ### HDR-Requires-ext: clients/libupsclient-version.h
 ### HDR-Requires-ext: nut-scanner/nutscan-snmp.h nut-scanner/nutscan-usb.h
 ###       (generated by nut-scanner-deps/tools aliased as all-libs-local/tools)
@@ -358,7 +363,7 @@ all/clients: all/common all-libs-local/clients
 ### Requires-ext: common/libcommon.la common/libparseconf.la
 ### Requires-ext: common/libcommonversion.la
 ### Requires-ext: clients/libupsclient.la (dummy-ups only)
-### Requires-int: libdummy.la libdummy_upsdrvquery.la
+### Requires-int: libdummy_main.la libdummy_upsdrvquery.la
 ### Requires-int: libdummy_serial.la
 
 # TODO in the future: propagate the knowledge of whether we are building
@@ -528,6 +533,7 @@ DISTCHECK_CONFIGURE_FLAGS = ${DISTCHECK_FLAGS}		\
  --with-systemdsystempresetdir='$${prefix}/usr/lib/systemd/system-preset' \
  --with-systemdshutdowndir='$${prefix}/lib/systemd/system-shutdown' \
  --with-systemdtmpfilesdir='$${prefix}/usr/lib/tmpfiles.d' \
+ --with-systemdsysusersdir='$${prefix}/usr/lib/sysusers.d' \
  --with-augeas-lenses-dir='$${prefix}/usr/share/augeas/lenses'		\
  --with-hotplug-dir='$${prefix}/etc/hotplug'		\
  --with-udev-dir='$${prefix}/etc/udev'			\
@@ -1211,7 +1217,7 @@ distcheck-completeness: dist
 	  && cd "$$am__cwd" \
 	  && echo "  $@	diff $(distdir)-orig-$$$$ $(distdir)-derived-$$$$" \
 	  && diff $(distdir)-orig-$$$$ $(distdir)-derived-$$$$ ; \
-	  } || RES=$?? ;
+	  } || RES=$$? ; \
 	  rm -rf $(distdir)-orig-$$$$ $(distdir)-derived-$$$$ $(distdir) ; \
 	  exit $$RES
 	@echo "SUCCESS: $(distdir) archives are self-reproducing"
@@ -1368,6 +1374,12 @@ else !WITH_SYSTEMD_TMPFILES
 WITH_SYSTEMD_TMPFILES = false
 endif !WITH_SYSTEMD_TMPFILES
 
+if WITH_SYSTEMD_SYSUSERS
+WITH_SYSTEMD_SYSUSERS = true
+else !WITH_SYSTEMD_SYSUSERS
+WITH_SYSTEMD_SYSUSERS = false
+endif !WITH_SYSTEMD_SYSUSERS
+
 if WITH_SYSTEMD_PRESET
 WITH_SYSTEMD_PRESET = true
 else !WITH_SYSTEMD_PRESET
@@ -1519,6 +1531,10 @@ install-as-root:
 				echo "$@: Apply systemd-tmpfiles presets" >&2 ; \
 				$(SYSTEMD_TMPFILES_PROGRAM) --create || exit ; \
 			fi ; \
+			if $(WITH_SYSTEMD_SYSUSERS) ; then \
+				echo "$@: Apply systemd-sysusers presets" >&2 ; \
+				$(SYSTEMD_SYSUSERS_PROGRAM) || exit ; \
+			fi ; \
 			echo "$@: Learn systemd definition changes" >&2 ; \
 			$(SYSTEMD_SYSTEMCTL_PROGRAM) daemon-reload || exit ; \
 			APPLIED_SYSTEMD_PRESET=false ; \