Merge pull request #2623 from jimklimov/issue-2621

docs: finalize re-licensing of `scripts/installer` …

COPYING

@@ -18,6 +18,11 @@
  license as Perl itself. That is to say either GPL version 1 or (at your option)
  any later version, or the "Artistic License".
 
+ The scripts/installer contents were donated to the Network UPS Tools project
+ by Eaton in 2022, including the license change from the one originally used
+ with their software companion to terms of the open-source project (that is,
+ GPL version 2 or newer).
+
  Several fallback implementations for methods absent from standard library of
  an end-user's current build platform are derived from source code available
  under the two-clause BSD license (common/strptime.c, common/strnlen.c)

configure.ac

@@ -314,12 +314,32 @@ htmldir='${prefix}/html'
 htmldocdir='${docdir}/html-doc'
 htmlmandir='${docdir}/html-man'
 pkgconfigdir='${libdir}/pkgconfig'
-auglensdir='/usr/share/augeas/lenses/dist'
-if test ! -d "${auglensdir}"; then
-   auglensdir='/usr/share/augeas/lenses'
-   if test ! -d "${auglensdir}"; then
-      auglensdir=''
-   fi
+
+dnl Detection of augeas lens dirs is a bit troublesome, since
+dnl they (if present) reside in location not controlled by NUT.
+dnl Try detecting based on build parameters, or fall back to
+dnl hard-coded default location (may break e.g. distcheck).
+dnl Note it would not work too well for "/usr/local/ups" :)
+auglensdir='${datarootdir}/augeas/lenses/dist'
+conftemp="${auglensdir}"
+eval conftemp=\"${conftemp}\"
+eval conftemp=\"${conftemp}\"
+
+if test ! -d "${conftemp}"; then
+    auglensdir='${datarootdir}/augeas/lenses'
+    conftemp="${auglensdir}"
+    eval conftemp=\"${conftemp}\"
+    eval conftemp=\"${conftemp}\"
+
+    if test ! -d "${conftemp}"; then
+        auglensdir='/usr/share/augeas/lenses/dist'
+        if test ! -d "${auglensdir}"; then
+            auglensdir='/usr/share/augeas/lenses'
+            if test ! -d "${auglensdir}"; then
+                auglensdir=''
+            fi
+        fi
+    fi
 fi
 
 dnl ### NUT_CHECK_LIBREGEX ### Detect below as part of libusb etc.

docs/acknowledgements.txt

@@ -71,7 +71,9 @@ UPS manufacturers
 
 [[Eaton]]
 * link:http://powerquality.eaton.com[Eaton], has been the main NUT supporter in
-the past, between 2007 and 2011, continuing MGE UPS SYSTEMS efforts.
+the past, between 2007 and 2011, continuing MGE UPS SYSTEMS efforts. In 2022,
+the Eaton NUT-based companion software bundle sources developed (pre-?)2013-2018
+were contributed and re-licensed to become part of NUT.
 As such, Eaton has been:
   - providing extensive technical documents (Eaton protocols library),
   - providing units to developers of NUT and related projects,

docs/nut.dict

@@ -1,4 +1,4 @@
-personal_ws-1.1 en 3214 utf-8
+personal_ws-1.1 en 3215 utf-8
 AAC
 AAS
 ABI

scripts/installer/.gitignore

@@ -0,0 +1 @@
+/common_EN/license.txt

scripts/installer/Makefile.am

@@ -30,6 +30,12 @@ EXTRA_DIST = \
 	solcmn/solaris_init	\
 	solcmn/ipp-os-shutdown.conf.sample
 
+# Originally an Eaton license was used, changed along with donation of sources
+# to NUT project. Having the file name populated helps keep the scripts as is.
+common_EN/license.txt: $(top_srcdir)/LICENSE-GPL2
+	$(MKDIR_P) '$(@D)'
+	cp -pf '$?' '$@'
+
 SPELLCHECK_SRC = README.adoc common/README_ipp-os-shutdown.adoc
 
 nut:
@@ -56,7 +62,7 @@ nut:
 spellcheck spellcheck-interactive spellcheck-sortdict:
 	+$(MAKE) -f $(top_builddir)/docs/Makefile $(AM_MAKEFLAGS) 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 */*-spellchecked
+CLEANFILES = *-spellchecked */*-spellchecked common_EN/license.txt
 
 # Remove "nut" if it is a symlink to the source tree
 clean-local:

scripts/installer/README.adoc

@@ -65,6 +65,7 @@ symbols during dynamic linking), so while this contribution here is
 published "as is", more work would be needed to make it useful in
 modern environments. Helper scripts should be quickly useful though.
 
-Developed (pre-?)2013-2018 by Eaton; contributed to NUT 2022 by Eaton
+Developed (pre-?)2013-2018 by Eaton; contributed to NUT and re-licensed
+under same terms as NUT in 2022 by Eaton.
 
 Maintained since 2024 by Jim Klimov <jimklimov[email protected]>