Skip to content

Commit 968fd10

Browse files
authored
Merge pull request #3402 from jimklimov/complete-client-protocol
Complete client bindings for NUT networked protocol
2 parents 02fc493 + a654ba3 commit 968fd10

21 files changed

Lines changed: 2953 additions & 1078 deletions

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: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,20 @@ https://github.com/networkupstools/nut/milestone/13
5959
[issue #3387, PR #3402]
6060

6161

62+
- NUT client libraries:
63+
* Complete support for actions documented in `docs/net-protocol.txt`
64+
was implemented in C++, Python and PERL bindings in-tree, and for Java
65+
in link:https://github.com/networkupstools/jNut[jNut] nearby. Among
66+
other things, all these libraries now support `STARTTLS` and `TRACKING`
67+
to wait for server confirmation of a `SET VAR` or `INSTCMD` request,
68+
and this is tested by the NIT script. [issues #656, #1348, #1349, #1350,
69+
#1613, #1711, PR #3402]
70+
* Enhanced client side of `STARTTLS` dialog to follow up by a simple
71+
query (for protocol version) to verify that handshake succeeded.
72+
This change impacted also the classic C `libupsclient` library.
73+
[issue #3387, PR #3402]
74+
75+
6276
Release notes for NUT 2.8.5 - what's new since 2.8.4
6377
----------------------------------------------------
6478

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)