Merge remote-tracking branch 'upstream/master' as of 2025-12-22 into FTY

Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>

Author: jimklimov

NEWS.adoc

@@ -303,6 +303,10 @@ several `FSD` notifications into one executed action. [PR #3097]
      provided 'confargs' etc.) [#3140]
    * Added configure script options for 'libregex' tuning, just so it is on par
      with our other optional dependencies. [#3140]
+   * Changed `--enable-extapi-enphase` to not default to `auto` and then get
+     installed on every system capable of using it; this is a niche capability
+     for users of specific devices via a cloud portal. [follow-up to PR #2813
+     for issue #2807]
 
  - Fixed CI recipes for PyPI publication of PyNUT(Client) module to also
    include the source distribution (was posted for NUT v2.8.1 and v2.8.2

configure.ac

@@ -7173,7 +7173,7 @@ nut_with_extapi_enphase="no"
 NUT_ARG_ENABLE([extapi-enphase], [(yes|no|auto)], [Enable installation of integration script for External API: Enphase Monitor], [no])
 
 AS_CASE([${nut_enable_extapi_enphase}],
-	[yes|""], [nut_enable_extapi_enphase="auto"],
+	[""], [nut_enable_extapi_enphase="yes"],
 	[auto|no], [],
 		[AC_MSG_ERROR([Unexpected argument for --enable-extapi-enphase=${nut_enable_extapi_enphase}])]
 )

docs/configure.txt

@@ -1285,3 +1285,13 @@ If system doesn't have `pkg-config` or it fails to provides hints for
 some of the settings that are needed to set it up properly and the
 build in defaults are not right, you can specify the correct values
 for your system here.
+
+External API integrations
+~~~~~~~~~~~~~~~~~~~~~~~~~
+
+	--enable-extapi-enphase
+
+For users of Enphase solar inverters and the Enlighten portal to monitor
+them in the cloud, this option adds a service and script to poll the portal
+and feed the information into the NUT linkman:dummy-ups[8] driver to see it
+as any other device.

docs/nut.dict

@@ -1,4 +1,4 @@
-personal_ws-1.1 en 3649 utf-8
+personal_ws-1.1 en 3652 utf-8
 AAC
 AAS
 ABI
@@ -1028,6 +1028,7 @@ Powervar
 Powervar's
 Powerwell
 Prachi
+Preinstall
 Prereqs
 PresentStatus
 Priv
@@ -2020,6 +2021,7 @@ drvpath
 drwxr
 drwxrwx
 ds
+dsc
 dsi
 dsr
 dsssl
@@ -2921,6 +2923,7 @@ pragma
 pragmas
 pre
 preLaunchTask
+preinstallimage
 prepend
 prepended
 preprocess

scripts/obs/.gitignore

@@ -0,0 +1 @@
+_preinstallimage

scripts/obs/Makefile.am

@@ -96,6 +96,57 @@ EXTRA_DIST += \
 
 SPELLCHECK_SRC = README.adoc
 
+# Produce an OBS preinstallimage recipe file from our SPEC and DSC resources,
+# to speed up PR and stable branch iteration builds (output of this processing
+# should be stored as a sibling OBS project "preinstallimage-nut" in the OBS
+# server). Note that syntax for "one-of-options" installation accepted by deb
+# and rpm tooling differs: for DEB we need to list them without parentheses
+# and without spaces around the pipe character. Parentheses around version
+# constraints seem to be confusing, but spaces around comparison operators
+# seem to be optional, at least for the recipe syntax parser.
+# You can debug stacks of calls here by adding `| tee -a /dev/stderr \` layers
+_preinstallimage: nut.spec nut.dsc Makefile
+	@echo "  GENERATE-RECIPE	$@" ; \
+	 (echo 'Name: preinstallimage-@PACKAGE_NAME@' ; \
+	  echo '### Start of "if RPM"'; \
+	  echo '%if 0%{?rhel_version} || 0%{?rhel} || 0%{?sle_version} || 0%{?suse_version} || 0%{?centos_version} || 0%{?centos} || 0%{?fedora_version} || 0%{?fedora} || 0%{?opensuse_version}' ; \
+		cat nut.spec \
+		| $(EGREP) '(% *(if|else|endif|define)|Requires:|Ignore:|Prefer:)' \
+		| $(EGREP) -v '(%{name} = %{version}|%{_s*bindir}/|python-base)' \
+		| $(SED) -e 's/^Requires:/BuildRequires:/' ; \
+	  echo '%endif' ; \
+	  echo '### End of "if RPM"'; \
+	  echo '# ---- blank ----'; \
+	  echo '### Start of "if DEB"'; \
+	  echo '%if 0%{?debian_version} || 0%{?debian} || 0%{?ubuntu_version} || 0%{?ubuntu}'; \
+		awk ' \
+		  /^Build-Depends(-Indep)?:/ { \
+		    inBD=1; \
+		    sub(/^Build-Depends(-Indep)?:[[:space:]]*/, ""); \
+		    buf = (buf ? buf "," : "") $$0; \
+		    next; \
+		  }; \
+		  inBD && /^[[:space:]]+/ { \
+		    buf = buf " " $$0; \
+		    next; \
+		  }; \
+		  inBD { inBD=0; next; }; \
+		  END { print buf }; \
+		' nut.dsc \
+		| $(SED) \
+		-e 's/[[:space:]]*//g' \
+		-e 's/,/\n/g' \
+		-e 's/(\([^)][^)]*\)\(>\|<\|=\|>=\|<=\|==\|!=\)\([^)][^)]*\))/\1\2\3/g' \
+		-e 's/\[[^]]*\]//g' \
+		-e 's/<[^>]*>//g' \
+		-e 's/:any\|:native//g' \
+		| $(GREP) -v '^\$$' \
+		| awk 'NF { printf "BuildRequires: %s\n", $$0 }'; \
+	  echo '%endif' ; \
+	  echo '### End of "if DEB"'; \
+	 ) > '$@'.tmp && [ -s '$@'.tmp ] && mv -f '$@'.tmp '$@'
+
+
 # NOTE: Due to portability, we do not use a GNU percent-wildcard extension.
 # We also have to export some variables that may be tainted by relative
 # paths when parsing the other makefile (e.g. MKDIR_P that may be defined
@@ -117,5 +168,6 @@ spellcheck spellcheck-interactive spellcheck-sortdict:
 	+$(MAKE) $(AM_MAKEFLAGS) -f $(top_builddir)/docs/Makefile MKDIR_P="$(MKDIR_P)" builddir="$(builddir)" srcdir="$(srcdir)" top_builddir="$(top_builddir)" top_srcdir="$(top_srcdir)" SPELLCHECK_SRC="$(SPELLCHECK_SRC)" SPELLCHECK_SRCDIR="$(srcdir)" SPELLCHECK_BUILDDIR="$(builddir)" $@
 
 CLEANFILES = *-spellchecked
+CLEANFILES += _preinstallimage
 
 MAINTAINERCLEANFILES = Makefile.in .dirstamp

scripts/obs/README.adoc

@@ -48,6 +48,19 @@ For some historical and/or practical details see:
 
 * https://github.com/networkupstools/nut/issues/1209
 
+== Preinstall images
+
+OBS builds can be sped up by use of `preinstallimage` recipes seen in the
+sibling or "upstream" build dependency repositories for a built project,
+if such image contains a subset of the packages that the current build
+aims to use.
+
+TODO: Document actually getting PR builds to see such prepared images.
+
+A recipe can be generated from current `nut.spec` and `nut.dsc` files
+via `make _preinstallimage` and uploaded into a dedicated package near
+the `nut` package in an OBS project.
+
 == Other notes
 
 The recipe files themselves would likely cross-pollinate with popular

scripts/upsdrvsvcctl/nut-driver-enumerator.sh.in

@@ -810,7 +810,7 @@ smf_registerInstance() {
         drivers=*|*,drivers=*)
             OTHERLIST="`upsconf_list_dev_drv_socket_checksum`" || OTHERLIST=""
             # Not double-quoting here to iterate the string tokens:
-            for DEPDRV in `echo "${_MED}" | $SED -e 's/^\(.*,d\|d\)rivers=//' -e 's/,/ /g'` ; do
+            for DEPDRV in `echo "${_MED}" | $SED -e 's/^drivers=//' -e 's/^.*,drivers=//' -e 's/,/ /g'` ; do
                 case "${DEPDRV}" in
                     *-*) # May be "drivername-upsname", where either sub-string
                          # may have dashes inside too; try to find the right one:
@@ -1096,7 +1096,7 @@ systemd_registerInstance() {
         drivers=*|*,drivers=*)
             OTHERLIST="`upsconf_list_dev_drv_socket_checksum`" || OTHERLIST=""
             # Not double-quoting here to iterate the string tokens:
-            for DEPDRV in `echo "${_MED}" | $SED -e 's/^\(.*,d\|d\)rivers=//' -e 's/,/ /g'` ; do
+            for DEPDRV in `echo "${_MED}" | $SED 's/^drivers=//' -e 's/^.*,drivers=//' -e 's/,/ /g'` ; do
                 case "${DEPDRV}" in
                     *-*) # May be "drivername-upsname", where either sub-string
                          # may have dashes inside too; try to find the right one: