Commit Graph

85 Commits

Author SHA1 Message Date
Daniel F. Dickinson b72c739e9e nut: Avoid building docs
Reduce compilation time and complexity by not building documentation
we don't use.

Signed-off-by: Daniel F. Dickinson <cshored@thecshore.com>
2018-08-29 00:17:23 -04:00
Daniel F. Dickinson 39250c08db nut: Drop unnecessary dependency on libwrap
We're using --without-wrap unconditionally anyway, so this legacy
dependency needs to be removed.

Signed-off-by: Daniel F. Dickinson <cshored@thecshore.com>
2018-08-29 00:17:23 -04:00
Daniel F. Dickinson a2f64b3bac nut: Reduce user error with POWERDOWNFLAG
Instead of making POWERDOWNFLAG an uci option the user can
only change it via initscript edits.  This avoids chance for users
to miss the required change to nut-driver when setting an UCI option
for nut-monitor which results in failure to do FSD on the UPS.

Signed-off-by: Daniel F. Dickinson <cshored@thecshore.com>
2018-08-29 00:17:19 -04:00
Daniel F. Dickinson cf446c7c47 nut: Use diff non-privileged user for upsmon
By default use a non-privileged user that is different than
the server or driver (when they are running non-privileged).
This is recommended by upstream.

Signed-off-by: Daniel F. Dickinson <cshored@thecshore.com>
2018-08-29 00:16:34 -04:00
Daniel F. Dickinson 56c1bc51a9 nut: Use 'real' procd for nut-cgi
Even though nut-cgi doesn't run a daemon, using procd triggers
is helpful for updating the generated config file when the
UCI config changes.  So implement this and 'modernize' nut-cgi initscript

Signed-off-by: Daniel F. Dickinson <cshored@thecshore.com>
2018-08-29 00:16:33 -04:00
Daniel F. Dickinson 2fca922cf0 nut: nut-cgi: Add support for upsset
This allows config for setting variables and/or running
commands from the CGI.

Signed-off-by: Daniel F. Dickinson <cshored@thecshore.com>
2018-08-29 00:15:18 -04:00
Daniel F. Dickinson 918a62f919 nut: Make FSD really work
Forced shutdown of the UPS was not actually happening before
due to lack of specific commands doing the shutdown.  This
(and the nut-driver initscript) fix that.

Signed-off-by: Daniel F. Dickinson <cshored@thecshore.com>
2018-08-29 00:15:14 -04:00
Daniel F. Dickinson f6a2a97d2f nut: Use 'real' procd init for nut-monitor
This fully procdifies nut-monitor, which fixes some issues with
very slow restarts (due to /lib/functions/procd.sh using a very
long delay for non-native scripts doing restart) as well as gives
respawning, etc.

Signed-off-by: Daniel F. Dickinson <cshored@thecshore.com>
2018-08-29 00:14:20 -04:00
Daniel F. Dickinson 1cd4dcfa99 nut: Add USB hotplug support
usbhid-ups has the necessary information in the source, so
let's support USB hotplugging out of the box.  Takes advantage of
the procd support now in nut-server initscript.

Signed-off-by: Daniel F. Dickinson <cshored@thecshore.com>
2018-08-29 00:12:53 -04:00
Daniel F. Dickinson ceff68837d nut: Reorganize nut-server to clarify nut-driver
Clarify the different between the common nut-driver portions of
nut-server and the nut-server (upsd) proper.  nut-driver can't
be used without nut-server so there is no compelling reason
to split into a separate package, but the reorganization makes
such a move easier and makes it clear what each bit is for.

While we continue to use a single initscript, it's a properly
procdified one which handles the upsd daemon as a different
instance than the driver instances.  This resolves a race
condition in which upsd and drivers fail to start do to
a degree of interdepedence.

Also properly 'procd'ifies the nut-server initscript.

Signed-off-by: Daniel F. Dickinson <cshored@thecshore.com>
2018-08-29 00:12:53 -04:00
Daniel F. Dickinson 5790053eba nut: Add missing conffiles
We want to include the symlinks to the generated configurations
in conffiles so that if the user replaces them symlinks with
traditional NUT configuration it is preserved across sysupgrade.

Signed-off-by: Daniel F. Dickinson <cshored@thecshore.com>
2018-08-28 15:19:39 -04:00
Daniel F. Dickinson 98fdf16ecb nut: Fix for nut-upsmon without nut-server
nut-monitor failed to create required dir /var/etc/nut, as
well as failing to set appropriate user on the directory and
conf files.  Fixing this closes
https://github.com/openwrt/packages/issues/6644

Signed-off-by: Daniel F. Dickinson <cshored@thecshore.com>
2018-08-02 08:40:12 -04:00
Daniel F. Dickinson b4fe49d2b2 nut: Update my email
Signed-off-by: Daniel F. Dickinson <cshored@thecshore.com>
2018-07-04 23:51:28 -04:00
Eneas U de Queiroz 6543859dab nut: Add PKG_FIXUP:=autoreconf
We need to force this since a *.m4 file is patched.

Signed-off-by: Eneas U de Queiroz <cote2004-github@yahoo.com>
2018-06-13 16:33:47 -03:00
Eneas U de Queiroz 1a9a7cc280 nut: added compatibility with openssl-1.1
Also added a fix in a check for empty string.

Signed-off-by: Eneas U de Queiroz <cote2004-github@yahoo.com>
2018-06-01 12:04:32 -03:00
Karl Palsson 66921d1226 net/nut: Fix typo is serial config option
Fixes: 5503dac806 "Add back serial support"
Reported-by: Znevna on irc
Signed-off-by: Karl Palsson <karlp@tweak.net.au>
2017-09-11 17:19:10 +00:00
Etienne Champetier 4006865ae8 treewide: run "make check FIXUP=1"
fix Makefile chmod (644)
replace MD5SUM with HASH
add PKG_MIRROR_HASH when PKG_SOURCE_PROTO:=git

(PKG_SOURCE_PROTO:=svn tarballs are not reproducible for now)

Signed-off-by: Etienne Champetier <champetier.etienne@gmail.com>
2017-08-29 21:41:14 -07:00
Daniel Dickinson 604f22ee69 net/nut: Ship upsset.conf for nut-cgi
Per user request ship the sample upsset.conf file so that
upsset functionality can be used with nut-cgi

Signed-off-by: Daniel Dickinson <lede@cshore.thecshore.com>
2017-01-11 18:59:15 -05:00
Daniel Dickinson a69c25d5e3 net/nut: Avoid building with libwrap when present
We don't want non-deterministic builds do turn off
libwrap in configure options.

Signed-off-by: Daniel Dickinson <lede@cshore.thecshore.com>
2017-01-11 18:55:32 -05:00
Daniel Dickinson b27c7fd64b net/nut: Make myself maintainer per private mail
Current maintainer (Martin Rowe) offered to hand over
maintership because I'm interested in doing more with
the package than he requires for his own use, so he
felt it made sense for me to maintain the package.
I accepted, hence this commit.

Signed-off-by: Daniel Dickinson <lede@cshore.thecshore.com>
2017-01-11 18:55:19 -05:00
Daniel Dickinson c00d89593e net/nut: Fix '/var/run' world readable warning
Use /var/run/nut as statepath and set appropriate owner
and permissions on /var/run/nut in order to avoid pidfile
for nut being world-readable.

Signed-off-by: Daniel Dickinson <lede@cshore.thecshore.com>
2017-01-11 18:54:51 -05:00
Daniel Dickinson c94e334c4e net-nut: Add UPS notifications via sendmail
Add option to send email notification via sendmail
(or replacement).

Signed-off-by: Daniel Dickinson <lede@cshore.thecshore.com>
2017-01-11 18:54:40 -05:00
Daniel Dickinson 5503dac806 net/nut: Add back serial support
It looks like serial support was accidentally dropped due to missing
pieces on Config.in and Makefile.  Add back serial support by fixing
that.

Signed-off-by: Daniel Dickinson <lede@cshore.thecshore.com>
2017-01-11 18:54:29 -05:00
Daniel Dickinson c1d26bacdf net/nut: Protect CGI via HTTP Basic Auth
When using uhttpd (the default), protect NUT CGI
via HTTP Basic Auth.

Signed-off-by: Daniel Dickinson <lede@cshore.thecshore.com>
2017-01-11 18:54:16 -05:00
Daniel Dickinson a23c4e85c5 net/nut: Build optional separate packages and ucify
With a LuCI app (of which I have one written) ucification makes
sense (and is in fact needed), so ucify the initscripts.

Also, rather than making selection of things to include an image
a matter of selecting compile-time config options, make optional
things into seperate packages that are built in default builds,
and leave selection of what to include or not up to the user
(e.g. using ImageBuilder, or adding packages via opkg).

Signed-off-by: Daniel Dickinson <lede@cshore.thecshore.com>
2017-01-11 18:53:58 -05:00
Marty R 35c2fa24d8 net/nut: Remove whitespace before conffiles
Closes #2652

Signed-off-by: Martin Rowe <martin.p.rowe@gmail.com>
2016-05-03 11:20:10 +09:00
Marty R a72cb6c955 nut: upstream version bump
Version bump package to latest v2.7.4 code from upstream. No changes needed for packaging.
2016-03-18 22:41:47 -07:00
Marty R 064d84ab90 nut: add dev headers, nut-web-cgi and nut-avahi-service, bugfix
Headers are required by collectd as mentioned in #1801. This is the nut portion based on dwmw2@d636841cd1d1dfab04cb509520c082738ddfb2ea
Happy to merge with 15.05 as per #1803.
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
[martin.p.rowe@gmail.com: condensed InstallDev lines]

Added package nut-web-cgi based on demorfi@7e340f47944ff4a9c49d3b1dc6c1d9d965cd344c. Closes #1614.
Pending signoff by @demorfi
[martin.p.rowe@gmail.com: simplified implementation, no changes to Config.in]

Added package nut-avahi-service similar to other implementations in #618
Bugfix to remove redundant NUT_DRIVER_SERIAL config
Bugfix to make UPSLOG config actually install (requires PKG_RELEASE bump)
Some code tidy-ups
Signed-off-by: Martin Rowe <martin.p.rowe@gmail.com>
2015-10-03 18:11:28 -07:00
Hanson Wong 9fa55147c4 nut: Fix required dependencies. 2015-09-20 22:48:29 +10:00
Marty R d5c824e8bf nut: remove patch for old automake version
tools/automake was updated to 1.15 which removed this bug; patch no longer needed.

Signed-off-by: Martin Rowe <martin.p.rowe@gmail.com>
2015-05-06 20:58:02 -07:00
Marty R b195c1c367 nut: Update to 2.7.3
Updated the package to the latest upstream version.
Removed a patch that was merged upstream.
Bumped copyright notice to 2015.

Signed-off-by: Martin Rowe <martin.p.rowe@gmail.com>
2015-04-28 14:19:38 -07:00
Nicolas Thill 0d93cb8973 nut: force rebuild when config changes
Signed-off-by: Nicolas Thill <nico@openwrt.org>
2014-10-25 09:40:56 +02:00
Marty R 0ecfc499ce nut: Updated (c) notice
Signed-off-by: Martin Rowe <martin.p.rowe@gmail.com>
2014-10-19 09:40:02 -07:00
cyanidium d2e5a9896c Remove placeholder maintainer email address 2014-10-15 22:09:29 -07:00
Marty R d8258c35d5 nut: New package for Network UPS Tools
An older version of nut is in oldpackages. This commit is based on that
package and bumps the version to the latest release along with unifying
the server and client packages. More build options are provided for any
custom configuration but the defaults provide a working client and
server install which only needs a UPS driver. Drivers still build as
individual packages to minimise bloat. SSL support has also been added.

Signed-off-by: Martin Rowe <cyanidium@users.noreply.github.com>
2014-10-15 21:30:25 -07:00