16:40 Cy Schubert (cy) 

sysutils/nut-devel: Update to the latest networkupstools/nut github commit

Now that muliple UPS support has been accepted and merged into our
upstream's mainline, revert the nut-devl part of 2c6ac43b0d95 and
9c4a120c36bf, and pull in the latest nut commit on GH.

    c18825c

20:10 Cy Schubert (cy) 

sysutils/nut*: Remove unneeded headers

Remove headers used in the first attempt. Removing them reduces some
namespace pollution and has no nother effect on the resulting package.

    2c6ac43

18:04 Cy Schubert (cy) 

sysutils/nut*: Add upslog support for multiple UPSs

upslog is a utility that logs UPS status at regular intervals, specified
by the -i option. Unfortunately upslog supports only on UPS. For sites
that need to monitor multiple UPSs the options are to cobble an rc script
for each or doctor up the nut_upslog.in script to support cloning of the
script. Unfortunately an rc script capable of being cloned would become
the source of more PRs and would require significanly more tehcnical
documentation that by itself might become confusing for the average
system administrator.

Therefore a new -m option is added to support multiple UPSs using the
same invocation of upslog. The patch parses a new -m option and using a
single connection to upsd, queries it for stats about multiple UPSs.

An rc.conf exemple of how to use this new feature:
nut_upslog_flags="-p /var/db/nut/upslog.pid -m ups1@localhost,/var/log/nut\
/ups1.log -m ups2@localhost,/var/log/nut/ups2.log"

PR:		265963
Reported by:	vvd@unislabs.com

    9c4a120

01:11 Cy Schubert (cy) 

Revert "sysutils/nut*: Add upslog support for multiple UPSs"

upslog is failing to make multiple connections to upsd resulting
in some UPSs logging and others not. This is likely some bug
in upsd's socket handling.

Even though this patch worked for me locally it did not for the
person reporting the problem.

A better approach would be to use select() instead.

PR:	265963

This reverts commit dec4ecc3afecab035a4d4fa59c35093d9f53ffd5.

    dc2f6b9

21:16 Cy Schubert (cy) 

sysutils/nut*: Add upslog support for multiple UPSs

upslog is a utility that logs UPS status at regular intervals, specified
by the -i option. Unfortunately upslog supports only on UPS. For sites
that need to monitor multiple UPSs the options are to cobble an rc script
for each or doctor up the nut_upslog.in script to support cloning of the
script. Unfortunately an rc script capable of being cloned would become
the source of more PRs and would require significanly more tehcnical
documentation that by itself might become confusing for the average
system administrator.

Therefore a new -m option is added to support multiple UPSs using the
same invocation of upslog. The patch parses a -m option and forks
almost immediately following the getopt(3) invokation to monitor each
individual UPS using a separate upslog process. This is not ideal but

(Only the first 15 lines of the commit message are shown above )

    dec4ecc