Skip to content

Commit 40ecd06

Browse files
authored
Merge 714e32f into d96f518
2 parents d96f518 + 714e32f commit 40ecd06

Some content is hidden

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

41 files changed

+3545
-1250
lines changed

COPYING

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
Public License (GPL) version 3, or (at your option) any later version. See
88
"LICENSE-GPL3" in the root of this distribution.
99

10-
The Perl client module (scripts/perl/Nut.pm) is released under the same
10+
The Perl client module (scripts/perl/UPS/Nut.pm) is released under the same
1111
license as Perl itself. That is to say either GPL version 1 or (at your option)
1212
any later version, or the "Artistic License".
1313

NEWS.adoc

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,43 @@ https://github.com/networkupstools/nut/milestone/13
4242
- (expected) CI automation for use of data points in drivers that conform
4343
to patterns defined in link:docs/nut-names.txt[]
4444

45+
- Second-level bullet points listed in this file will now use 4 spaces
46+
(not 3 like before) for easier initial indentation of new entries.
47+
48+
- NUT client libraries:
49+
* Complete support for actions documented in `docs/net-protocol.txt`
50+
was implemented in C++, Python and PERL bindings in-tree, and for Java
51+
in link:https://github.com/networkupstools/jNut[jNut] nearby. Among
52+
other things, all these libraries now support `STARTTLS` and `TRACKING`
53+
to wait for server confirmation of a `SET VAR` or `INSTCMD` request,
54+
and this is tested by the NIT script. [issues #656, #1348, #1349, #1350,
55+
#1613, #1711, PR #3402]
56+
* Enhanced client side of `STARTTLS` dialog to follow up by a simple
57+
query (for protocol version) to verify that handshake succeeded.
58+
This change impacted also the classic C `libupsclient` library.
59+
[issue #3387, PR #3402]
60+
* Updated OpenSSL code paths in the `libupsclient` C library to support
61+
features earlier only available with NSS builds, like specifying the
62+
client certificate+key, optionally with password, and pinning expected
63+
server certificates. For both backends such pinning should now honour
64+
the 'certverify' setting of the `CERTHOST` entry (e.g. not abort the
65+
connection attempt if that number is '0'). [issue #3331]
66+
* Updated SSL support in the `upsd` data server to handle `CERTREQUEST`
67+
(optional validation of clients identified by a certificate) also
68+
when built with OpenSSL, optionally using the `CERTPATH` with a
69+
collection of CA certificates.
70+
Also support `CERTIDENT` to provide a private key password and ensure
71+
that the certificate in `CERTFILE` has an expected subject name as an
72+
exact string, or that its CN or SAN match the provided string as a
73+
standard expression of host name (section 3.5 of RFC 1034) or IP address.
74+
[issue #3331]
75+
* The `libupsclient` API was extended with a `upscli_init2()` method which
76+
allows to pass the `certfile` argument needed for OpenSSL builds. [#3331]
77+
78+
- `upsmon` client updates:
79+
* Introduced support for `CERTFILE` option, so the client can identify
80+
itself to the data server also in OpenSSL builds. [issue #3331]
81+
4582

4683
Release notes for NUT 2.8.5 - what's new since 2.8.4
4784
----------------------------------------------------

appveyor.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ environment:
3333
# https://github.com/marketplace/actions/delete-pr-comments-during-subsequent-ci
3434
notifications:
3535
- provider: GitHubPullRequest
36+
on_build_status_changed: true
3637
template: |
3738
{{#passed}}:white_check_mark:{{/passed}}{{#failed}}:x:{{/failed}} [Build {{&projectName}} {{buildVersion}} {{status}}]({{buildUrl}}) (commit {{commitUrl}} by @{{&commitAuthorUsername}})
3839
* [artifacts{{#failed}} (if any){{/failed}}]({{buildurl}}/artifacts)

clients/Makefile.am

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@ endif WITH_SSL
219219
# for the run-time dynamic linker resolution? For now the shared-library
220220
# builds are "exotic", but it makes sense to deprecate this export in a
221221
# future release.
222-
libupsclient_la_LDFLAGS = -version-info 8:0:1
222+
libupsclient_la_LDFLAGS = -version-info 9:0:2
223223
libupsclient_la_LDFLAGS += -export-symbols-regex '^(upscli_|nut_debug_level)'
224224
#|s_upsdebug|fatalx|fatal_with_errno|xcalloc|xbasename|print_banner_once)'
225225
if HAVE_WINDOWS
@@ -292,7 +292,7 @@ libupsclient-version.h: libupsclient.la
292292
if HAVE_CXX11
293293
# libnutclient version information and build
294294
libnutclient_la_SOURCES = nutclient.h nutclient.cpp
295-
libnutclient_la_LDFLAGS = -version-info 3:0:1
295+
libnutclient_la_LDFLAGS = -version-info 4:0:2
296296
# Needed in not-standalone builds with -DHAVE_NUTCOMMON=1
297297
# which is defined for in-tree CXX builds above:
298298
if ENABLE_SHARED_PRIVATE_LIBS

0 commit comments

Comments
 (0)