Skip to content

Commit c293e43

Browse files
jimklimovjimklimov
authored
Merge 5c42be8 into bdc139d 
2 parents bdc139d + 5c42be8 commit c293e43

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+675
-447
lines changed

‎INSTALL.nut.adoc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ ifndef::top_builddir[]
9999
endif::top_builddir[]
100100
//
101101
//
102-
// Address links on GitHub vs docs
102+
// Address links on GitHub vs. docs
103103
// (note: 'env-github' attribute is set on GitHub)
104104
//
105105
// - when generating docs:

‎Jenkinsfile-dynamatrix‎

Lines changed: 21 additions & 21 deletions
Large diffs are not rendered by default.

‎Makefile.am‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -528,13 +528,13 @@ setver:
528528
# Clean the dist tarball and packages
529529
MAINTAINERCLEANFILES_DISTBALL = nut-*.tar.gz
530530
# HP-UX:
531-
MAINTAINERCLEANFILES_PACKAGES = NUT_HPUX_package@[email protected]
531+
MAINTAINERCLEANFILES_PACKAGES = NUT_HPUX_package@[email protected] NUT_HPUX_package-@[email protected]
532532
# AIX as below, and RedHat-compatible (cover binary and source packages):
533533
MAINTAINERCLEANFILES_PACKAGES += nut*rpm
534534
# Debian-compatible (cover binary and source packages):
535535
MAINTAINERCLEANFILES_PACKAGES += nut*deb
536536
# Solaris SVR4 package archives:
537-
MAINTAINERCLEANFILES_PACKAGES += NUT_solaris_*_package@[email protected]
537+
MAINTAINERCLEANFILES_PACKAGES += NUT_solaris_*_package@[email protected] NUT_solaris_*_package-@[email protected]
538538
# Newer Solaris IPS (aka "pkg(5)" format archives)
539539
MAINTAINERCLEANFILES_PACKAGES += *.p5p
540540

@@ -548,7 +548,7 @@ package: dist
548548
"HP-UX") \
549549
( cd scripts/HP-UX && \
550550
$(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$DESTDIR" package && \
551-
mv NUT_HPUX_package.depot $(abs_top_builddir)/NUT_HPUX_package@[email protected] ) ;; \
551+
mv NUT_HPUX_package.depot $(abs_top_builddir)/NUT_HPUX_package-@[email protected] ) ;; \
552552
"SunOS") \
553553
$(MAKE) $(AM_MAKEFLAGS) && \
554554
$(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$DESTDIR" install && \

‎NEWS.adoc‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -486,6 +486,12 @@ relocated into new `shutdown.default` INSTCMD definitions. [#2670]
486486
and it defaults to `true` allowing for better ordered documents at the cost
487487
of some memory during document generation. [#2510]
488488
489+
- updated man page generation with `configure` script options to specify that
490+
manual sections on the target platform differ from (Linux-based) defaults
491+
hard-coded into page sources; this should allow to simplify NUT packaging
492+
recipe maintenance in distributions (no more updating patches for changed
493+
or added documentation sources).
494+
489495
- lines in first section of NUT configuration report (can optionally remain as
490496
`config.nut_report_feature.log` and be installed into shared documentation
491497
of a NUT package) are now better grouped as miscellaneous features and
@@ -1632,7 +1638,7 @@ refer to this change set (too long in the making) as NUT 2.7.5.
16321638
autoconf-2.70 releases in 2020 (also works with 2.69 which was the
16331639
earlier release since 2012)
16341640
* Dynamic library loading used in certain programs and use-cases improved,
1635-
especially for 64-bit vs 32-bit builds on multiple-bitness OSes
1641+
especially for 64-bit vs. 32-bit builds on multiple-bitness OSes
16361642
* Logging routines like `upsdebugx()` were refactored as macros so there
16371643
is slightly less overhead when logging is disabled [PRs #685 and #1100]
16381644
* Numerous classes of compilation warnings eradicated, many of those being
@@ -1867,7 +1873,7 @@ Release notes for NUT 2.7.2 - what's new since 2.7.1
18671873
* Emerson Network Power Liebert PSI 1440
18681874
* MicroDowell B.Box LP 500
18691875
* Numeric Digital 800 plus
1870-
* OptiUPS VS 575C
1876+
* OptiUPS vs. 575C
18711877
* Tripp Lite SU10KRT3/1X
18721878
18731879
- FreeDesktop Hardware Abstraction Layer (HAL) support was removed.

‎README.adoc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ ifndef::top_builddir[]
9999
endif::top_builddir[]
100100
//
101101
//
102-
// Address links on GitHub vs docs
102+
// Address links on GitHub vs. docs
103103
// (note: 'env-github' attribute is set on GitHub)
104104
//
105105
// - when generating docs:

‎UPGRADING.adoc‎

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,20 @@ Changes from 2.8.2 to 2.8.3
4444
Please use it, it immensely helps with community troubleshooting!
4545
[issue #1949]
4646
47+
- Reference packages prepared by `make package` should now separate the
48+
`PACKAGE_VERSION` from the platform-dependent prefix by a dash character
49+
in the ultimate package file name. Previously they were glued together
50+
for some platform targets (HPUX, Solaris). Solaris SVR4 package file names
51+
should new differentiate `i386` vs. `amd64` and `sparc` vs. `sparcv9`,
52+
depending on `target_cpu` of the build. If you had any scripts relying
53+
on the older pattern, they may have to be updated.
54+
55+
- Updated man page generation with `configure` script options to specify that
56+
manual sections on the target platform differ from (Linux-based) defaults
57+
hard-coded into page sources; this should allow to simplify NUT packaging
58+
recipe maintenance in distributions (no more updating patches for changed
59+
or added documentation sources)
60+
4761
- `upsmon` should now integrate natively with systemd-driven OS sleep events
4862
(built with systemd version 221 or newer "inhibitor interface"), so various
4963
hacks previously packaged into `/usr/lib/systemd/system-sleep/` scripts or
@@ -257,7 +271,7 @@ Changes from 2.8.0 to 2.8.1
257271
- The `upsd.conf` listing of `LISTEN` addresses was previously inverted
258272
(the last listed address was applied first), which was counter-intuitive
259273
and fixed for this release. If user configurations somehow relied on this
260-
order (e.g. to prioritize IPv6 vs IPv4 listeners), configuration changes
274+
order (e.g. to prioritize IPv6 vs. IPv4 listeners), configuration changes
261275
may be needed. [#2012]
262276
263277
- The `upsd` configured to listen on IPv6 addresses should handle only

‎autogen.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ echo "----------------------------------------------------------------------"
175175
echo "Please note that on some systems the routine below can complain that "
176176
echo " > configure.ac: warning: AC_INIT: not a literal: m4_esyscmd_s(...)"
177177
echo "but still does the right thing about PACKAGE_VERSION and PACKAGE_URL settings."
178-
echo "Check if your distro provides an 'autoconf-archive' package anf if it helps."
178+
echo "Check if your distro provides an 'autoconf-archive' package and if it helps."
179179
echo "Please post an issue in NUT bug tracker with platform details if it does not."
180180
echo "----------------------------------------------------------------------"
181181

‎ci_build.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1991,7 +1991,7 @@ default|default-alldrv|default-alldrv:no-distcheck|default-all-errors|default-sp
19911991
done
19921992

19931993
# TODO: Similar loops for other variations like TESTING,
1994-
# MGE SHUT vs other serial protocols...
1994+
# MGE SHUT vs. other serial protocols...
19951995

19961996
if can_clean_check ; then
19971997
echo "=== One final try for optional_maintainer_clean_check:"

‎clients/nutclient.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -295,7 +295,7 @@ void Socket::connect(const std::string& host, uint16_t port)
295295
snprintf(sport, sizeof(sport), "%" PRIuMAX, static_cast<uintmax_t>(port));
296296

297297
memset(&hints, 0, sizeof(hints));
298-
/* TODO? Port IPv4 vs IPv6 detail from upsclient.c */
298+
/* TODO? Port IPv4 vs. IPv6 detail from upsclient.c */
299299
hints.ai_family = AF_UNSPEC;
300300
hints.ai_socktype = SOCK_STREAM;
301301
hints.ai_protocol = IPPROTO_TCP;

‎common/common.c‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -678,9 +678,15 @@ const char *suggest_doc_links(const char *progname, const char *progconf) {
678678
snprintf(buf, sizeof(buf),
679679
"For more information please ");
680680
#if defined(WITH_DOCS) && WITH_DOCS
681+
/* FIXME: Currently all NUT tools and drivers are in same
682+
* man page section for "System Management Programs".
683+
* If this ever changes (e.g. clients like `upsc` can be
684+
* a "User Program" just as well), we may need an extra
685+
method argument here.
686+
*/
681687
snprintfcat(buf, sizeof(buf),
682-
"Read The Fine Manual ('man %s') and/or ",
683-
buf2);
688+
"Read The Fine Manual ('man %s %s') and/or ",
689+
MAN_SECTION_CMD_SYS, buf2);
684690
#endif
685691
snprintfcat(buf, sizeof(buf),
686692
"see\n\t%s/docs/man/%s.html\n",

0 commit comments

Comments
 (0)