Skip to content

Commit

Permalink
Merge pull request #2144 from jimklimov/issue-2142
Browse files Browse the repository at this point in the history
  • Loading branch information
jimklimov authored Nov 2, 2023
2 parents 31fc81c + d16aebb commit ab55bc0
Show file tree
Hide file tree
Showing 6 changed files with 41 additions and 6 deletions.
2 changes: 2 additions & 0 deletions NEWS.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -400,6 +400,8 @@ as part of https://github.com/networkupstools/nut/issues/1410 solution.
- nutclient C++ library:
* added `listDeviceClients()` and `deviceGetClients(dev)` to `Client`
classes, and `Device::getClients()` to match PyNUT capabilities [#549]
* published artifacts may include a `libnutclientstub` which is an
implementation of a NUT TCP client in C++ with in-memory data store.

- upsclient C library:
* added support for `NUT_QUIET_INIT_SSL` environment variable to hide
Expand Down
15 changes: 15 additions & 0 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -409,6 +409,21 @@ AS_IF([test x"$nut_enable_inplace_runtime" = xyes -a x"${NUT_VERSION_DEPLOYED-}"
eval conftemp=\"${conftemp}\"
LIBDIR="${conftemp}"
AS_CASE(["${CONFIG_FLAGS_DEPLOYED} ${CONFIG_FLAGS}"],
[*--libexecdir=*], [
for F in ${CONFIG_FLAGS_DEPLOYED} ${CONFIG_FLAGS} ; do
case "$F" in
"--libexecdir="*) libexecdir="`echo "$F" | ( IFS='=' read K V ; echo "$V" )`" ;;
esac
done
]
)
conftemp="${libexecdir}"
eval conftemp=\"${conftemp}\"
eval conftemp=\"${conftemp}\"
LIBEXECDIR="${conftemp}"
AS_CASE(["${CONFIG_FLAGS_DEPLOYED} ${CONFIG_FLAGS}"],
[*--with-pkgconfig-dir=*], [
for F in ${CONFIG_FLAGS_DEPLOYED} ${CONFIG_FLAGS} ; do
Expand Down
17 changes: 14 additions & 3 deletions docs/config-prereqs.txt
Original file line number Diff line number Diff line change
Expand Up @@ -499,7 +499,7 @@ Slackware Linux 15
~~~~~~~~~~~~~~~~~~

Another long-term presence in the Linux landscape, and sometimes the baseline
for appliances, the Slackware project recently hit release 15 in 2002, averaging
for appliances, the Slackware project recently hit release 15 in 2022, averaging
two years per major release.

It can be installed e.g. in a VM, using ISO images from the project site; see:
Expand Down Expand Up @@ -611,8 +611,9 @@ are named `*.tgz`) from here, and passed to `installpkg`:
* http://www.slackware.com/~alien/slackbuilds/openjdk11/
* http://www.slackware.com/~alien/slackbuilds/asciidoc/
* http://www.slackware.com/~alien/slackbuilds/cppunit/
* http://www.slackware.com/~alien/slackbuilds/lua/ (5.1 currently) and
http://www.slackware.com/~alien/slackbuilds/lua53/ -- note that LUA is not
* http://www.slackware.com/~alien/slackbuilds/lua/ (5.1 in "stable") and
http://www.slackware.com/~alien/slackbuilds/lua53/ (5.4 in "current"
as of Slackware 15.1 candidate in the works) -- note that LUA is not
needed for the current NUT code base, but may become needed after import
of features from forks

Expand Down Expand Up @@ -643,6 +644,16 @@ a reputable repository: https://sotirov-bg.net/slackpack/ and should cover most
if not all of the dependencies required for NUT building (including PowerMan,
IPMI etc.)

NOTE: If setting up a CI farm agent with builds in RAM disk, keep in mind that
default mount options for `/dev/shm` preclude script execution. Either set up
the agent in a non-standard fashion (to use another work area), or if this is
a dedicated machine -- relax the mount options in `/etc/fstab`. Here is an
example with `noexec` which we *must avoid* for such use-case:
----
:; mount | grep /dev/shm
tmpfs on /dev/shm type tmpfs (rw,nosuid,nodev,noexec,relatime,inode64)
----

FreeBSD 12.2
~~~~~~~~~~~~

Expand Down
2 changes: 1 addition & 1 deletion docs/man/upsmon.txt
Original file line number Diff line number Diff line change
Expand Up @@ -414,7 +414,7 @@ load and don't want some systems to be powered off while others remain
running if the "wall power" returns at the wrong moment as usual, the "FSD"
flag can not be removed from the data server unless its daemon is restarted.
If we do take the first step in critical mode, then we normally intend to go
all the way -- shut down all the servers gracefully, and power down the UPS.
all the way -- shut down all the servers gracefully, and power down the UPS.

Keep in mind that some UPS devices and corresponding drivers would also latch
or otherwise resurface the "FSD" state again even if "wall power" is available,
Expand Down
9 changes: 8 additions & 1 deletion docs/nut.dict
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
personal_ws-1.1 en 3273 utf-8
personal_ws-1.1 en 3280 utf-8
AAC
AAS
ABI
Expand Down Expand Up @@ -2001,6 +2001,7 @@ frontends
fs
fsd
fsr
fstab
ftdi
fuji
fullload
Expand Down Expand Up @@ -2143,6 +2144,7 @@ initscripts
initups
inline
innotech
inode
inplace
installcheck
installpkg
Expand Down Expand Up @@ -2255,6 +2257,7 @@ libneon
libnss
libnut
libnutclient
libnutclientstub
libnutclientsub
libnutconfig
libnutscan
Expand Down Expand Up @@ -2484,7 +2487,9 @@ nnn
noAuthNoPriv
nobody's
nobt
nodev
nodtk
noexec
noflag
nogroup
nohang
Expand All @@ -2501,6 +2506,7 @@ noout
norating
noro
noscanlangid
nosuid
notAfter
notifyme
notifytype
Expand Down Expand Up @@ -2730,6 +2736,7 @@ refactoring
referencenominal
regex
regtype
relatime
releasekeyring
relicensing
remoting
Expand Down
2 changes: 1 addition & 1 deletion lib/libnutclientstub.pc.in
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ statepath=@STATEPATH@
nutuser=@RUN_AS_USER@

Name: libnutclientstub
Description: Stub for UPS monitoring with Network UPS Tools
Description: Stub for UPS monitoring with Network UPS Tools (primarily for C++ tests)
Version: @PACKAGE_VERSION@
Libs: -L${libdir} -lnutclientstub
Cflags: -I${includedir}

0 comments on commit ab55bc0

Please sign in to comment.