aboutsummaryrefslogtreecommitdiff
path: root/net/nut
Commit message (Collapse)AuthorAge
* nut: update to 2.8.1Paul Doran2023-12-18
| | | | | Signed-off-by: Paul Doran <ruralroots@gmail.com> [remove upstream patch included in 2.8.1]
* treewide: remove AUTORELEASEPaul Fertser2023-04-21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatically compute and substitute current values for all $(AUTORELEASE) instances as this feature is deprecated and shouldn't be used. The following temporary change was made to the core: diff --git a/rules.mk b/rules.mk index 57d7995d4fa8..f16367de87a8 100644 --- a/rules.mk +++ b/rules.mk @@ -429,7 +429,7 @@ endef abi_version_str = $(subst -,,$(subst _,,$(subst .,,$(1)))) COMMITCOUNT = $(if $(DUMP),0,$(call commitcount)) -AUTORELEASE = $(if $(DUMP),0,$(call commitcount,1)) +AUTORELEASE = $(if $(DUMP),0,$(shell sed -i "s/\$$(AUTORELEASE)/$(call commitcount,1)/" $(CURDIR)/Makefile)) all: FORCE: ; And this command used to fix affected packages: for i in $(cd feeds/packages; git grep -l PKG_RELEASE:=.*AUTORELEASE | \ sed 's^.*/\([^/]*\)/Makefile^\1^';); do make package/$i/download done Signed-off-by: Paul Fertser <fercerpav@gmail.com>
* nut: ensure time_t is defined in upsclient.hEneas U de Queiroz2022-09-17
| | | | | | | Use an upstream commit to ensure time_t is defined in upsclient.h, fixing a compile failure in collectd. Signed-off-by: Eneas U de Queiroz <cotequeiroz@gmail.com>
* nut: avoid picking up libi2c dependencyEneas U de Queiroz2022-09-17
| | | | | | | | | Add --without-linux-i2c to configure arguments to avoid using i2c if found in the staging dir. Switch to AUTORELEASE. Signed-off-by: Eneas U de Queiroz <cotequeiroz@gmail.com>
* nut: update to 2.8.0Eric Luehrsen2022-09-10
| | | | | | | | | | -- Release Message Snippet https://networkupstools.org/ -- After a long and windy trip since the last official release v2.7.4 half a dozen years ago ... NUT v2.8.0! ... the new release includes numerous new drivers, sub-drivers, protocols and bug-fixes, with many companies and individuals chipping in with contributions of code. ... Signed-off-by: Eric Luehrsen <ericluehrsen@gmail.com>
* nut: add cable type nut driver configRob J. Epping2022-05-13
| | | | | | | | | | at least driver apcsmart-old (maybe more) allow for specifying the type of cable used. My old UPS does will not function when cable type is not specified. This will add support for configuration option 'cable' Signed-off-by: Rob J. Epping <epping@renf.us>
* nut: fix build on macosSergey V. Lobanov2022-01-31
| | | | | | | | | | | | | | | | | | | | | nut build fails on macos due to: 1. configure script can not use AR env var due to OpenWrt build system provides only executable name (e.g. aarch64-openwrt-linux-musl-gcc-ar) but configure script checks if AR has '/'. As a result, configure script ignores AR env var and uses system `ar` but macos `ar` is not compatible with the objects generated by OpenWrt GCC toolchain. This commit explicitly sets ac_cv_path_AR=$(TARGET_AR) to use OpenWrt toolchain AR. 2. configure script detects if build host is macos and adds macosx_ups driver as a build target, but this driver can not be build with OpenWrt toolchain because OpenWrt is Linux. This commit explicitly disables macosx_ups driver using configure flag --without-macosx_ups Signed-off-by: Sergey V. Lobanov <sergey@lobanov.in>
* nut: refactor upssched uci-defaults scriptPascal Coudurier2022-01-11
| | | | | | | | | Add checks not to overwrite defaultnotify options in the nut-sendmail-notify fashion. Use lists for defaultnotify instead of option. Add check not to overwrite notifycmd if already defined. upssched-cmd script must not be called directly, it is called by the upssched binary with needed arguments. Signed-off-by: Pascal Coudurier <coudu@wanadoo.fr>
* nut: refactor nut-monitor uci config filePascal Coudurier2022-01-11
| | | | | | | | Convert notifyflags options to lists as supported by the init script, so multiple options can be chosen. Add SYSLOG default option to individuals notifyflags instead of deprecated flag 1|0. Add comment for defaultnotify and individuals notifyflags about possible values. Signed-off-by: Pascal Coudurier <coudu@wanadoo.fr>
* nut: fix typo in nut-monitor init scriptPascal Coudurier2022-01-11
| | | | | | This fixes a typo in the nut-monitor init script when building config file from uci config. Signed-off-by: Pascal Coudurier <coudu@wanadoo.fr>
* nut: Add the option to compile Nut NetXML drivers with the Nut package.Seb Belcher2021-09-23
| | | | | | Also modifies the nut-server init script to include options specific to the netxml driver. Signed-off-by: Seb Belcher <sdjbelcher@gmail.com>
* nut: fix compilation with GCC11Rosen Penev2021-07-07
| | | | | | | nut is a C++98 project which does not compile with GCC11's default of C++17. Signed-off-by: Rosen Penev <rosenp@gmail.com>
* nut: fix typo in nutshutdown scriptSven Roederer2021-04-03
| | | | | | | | Even it's only cosmetic and should not affect the function of regular system, fix the name of the IPKG_INSTROOT variable. Typo was added long ago with 8400c9a6ec799. Signed-off-by: Sven Roederer <devel-sven@geroedel.de>
* nut: fix _ handlingRosen Penev2020-09-19
| | | | | | Taken from https://github.com/openwrt/packages/issues/13359 Signed-off-by: Rosen Penev <rosenp@gmail.com>
* treewide: Remove myself as maintainerDaniel F. Dickinson2020-03-20
| | | | | | | | | | Life changes, I'm no longer avaiable to be an sufficiently active OpenWrt developer. Therefore removing myself from maintainer from all packages I maintained in OpenWrt. All the best for those who keep up the good work! Signed-off-by: Daniel F. Dickinson <cshored@thecshore.com>
* nut: fix other/otherflag custom variables in nut-server.initMatt Merhar2020-01-19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows custom config parameters to be added to the generated config files, enabling the original intended functionality per https://openwrt.org/docs/guide-user/services/ups/software.nut. Example usage from /etc/config/nut_server: config driver 'apc' option driver 'snmp-ups' option snmp_version 'v3' option port '172.16.100.5' list other 'secLevel' list other 'secName' list other 'authPassword' list otherflag 'notransferoids' config other 'other_secLevel' option value 'authNoPriv' config other 'other_secName' option value 'some_username' config other 'other_authPassword' option value 'some_password' config other 'otherflag_notransferoids' option value '1' Signed-off-by: Matt Merhar <mattmerhar@protonmail.com>
* nut: update OpenSSL 1.1.0 patchSebastian Kemper2019-11-27
| | | | | | | | Replaces OpenWrt patch with upstream patch. Also removes 0002-Fix-check-for-empty-string.patch as this is included in upstream OpenSSL 1.1.0 patch. Signed-off-by: Sebastian Kemper <sebastian_ml@gmx.net>
* nut: fix CGI setupSebastian Kemper2019-11-27
| | | | | | | | | | | | | | | This commit makes - the libgd dependency (as well as specifying libs and includes) - the configure argument "--with-cgi" dependant on whether the package nut-web-cgi is selected. nut-web-cgi is also added to PKG_CONFIG_DEPENDS. Resolves: #10641 Signed-off-by: Sebastian Kemper <sebastian_ml@gmx.net>
* nut: revert 81e6bb7Sebastian Kemper2019-11-26
| | | | | | | | | | | gdlib pc file doesn't set a version, so "pkg-config --modversion gdlib" returns nothing. Also, the test if test "$?" != "0" -a -n "${GD_VERSION}"; then is wrong as pkg-config wouldn't return != 0 on success. Signed-off-by: Sebastian Kemper <sebastian_ml@gmx.net>
* treewide: Use default PKG_BUILD_DIR when possibleJeffery To2019-10-13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This removes lines that set PKG_BUILD_DIR when the set value is no different from the default value. Specifically, the line is removed if the assigned value is: * $(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION) The default PKG_BUILD_DIR was updated[1] to incorporate BUILD_VARIANT if it is set, so now this is identical to the default value. * $(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_SOURCE_SUBDIR) if PKG_SOURCE_SUBDIR is set to $(PKG_NAME)-$(PKG_VERSION), making it the same as the previous case * $(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) This is the same as the default PKG_BUILD_DIR when there is no BUILD_VARIANT. * $(BUILD_DIR)/[name]-$(PKG_VERSION) where [name] is a string that is identical to PKG_NAME [1]: https://git.openwrt.org/?p=openwrt/openwrt.git;a=commit;h=e545fac8d968864a965edb9e50c6f90940b0a6c9 Signed-off-by: Jeffery To <jeffery.to@gmail.com>
* nut: Switch to pkgconfig for finding libgdRosen Penev2019-09-13
| | | | | | | | nut uses gdlib-config to find libgd, which happens to be deprecated. This switches it to use pkgconfig and allows a fallback to gdlib-config, same as the libusb check. Signed-off-by: Rosen Penev <rosenp@gmail.com>
* treewide: Change .*GPL.*+ licenses to SPDX compatible identifierSven Eckelmann2019-09-10
| | | | | | | | The CONTRIBUTING.md requests an (or multiple) SPDX identifier for GPL licenses. But a lot of packages did use a different, non-SPDX style with a "+" at the end instead of "-or-later". Signed-off-by: Sven Eckelmann <sven@narfation.org>
* nut: Actually do FSD when requiredDaniel F. Dickinson2019-04-28
| | | | | | | | The code was all there but the call do the function containing it was missing, so call the function so that forced (UPS) shutdown occurs on a battery critical or manually requested FSD situation. Signed-off-by: Daniel F. Dickinson <cshored@thecshore.com>
* nut: Fix nutmon issues with initDaniel F. Dickinson2019-04-28
| | | | | | | | | | | | | | | | NUT's upsmon is rather peculiar in that it has a child process that runs as a regular user and a parent process that runs as root (in order to facilitate shutting down the device if needed). procd doesn't deal well with this and doing 'normal' procd stop / restart / etc results in the child process still hanging around but with not parent, which causes undesired behaviour. Therefore, add the use of 'upsmon -c stop' during process shutdown / restart in order to ensure that upsmon is actually fully stopped. Also fixes nut-monitor going into crashloop on network changes (due to trigger that restarted upsmon but failed due to orphan child from before restart). Signed-off-by: Daniel F. Dickinson <cshored@thecshore.com>
* nut: initscripts hotplug: Fix many small semantic issuesDaniel F. Dickinson2019-01-20
| | | | | | | | Small but important tweaks to fix the operation of the nut initscripts and hotplug scripts. All hail shellcheck and proofreading and dogfooding. Signed-off-by: Daniel F. Dickinson <cshored@thecshore.com>
* Merge pull request #7910 from cshoredaniel/pr-nut-fsd-bugHannu Nyman2019-01-13
|\ | | | | nut: Prevent FSD when not specifically requested
| * nut: Prevent FSD when not specifically requestedDaniel F. Dickinson2019-01-08
| | | | | | | | | | | | | | | | | | Under certain circumstances nutshutdown was causing a forced shutdown of the UPS even though killpower was not indicated. Prevent that. Also clarify the logic for powering off server by avoiding && || chains. Signed-off-by: Daniel F. Dickinson <cshored@thecshore.com>
* | nut: Fix procd crashloop no interfacesDaniel F. Dickinson2019-01-07
|/ | | | | | | Fix a crashloop under procd when attempting to bind to any address when no interfaces are yet available. Signed-off-by: Daniel F. Dickinson <cshored@thecshore.com>
* nut: Bump PKG_RELEASEDaniel F. Dickinson2018-12-23
| | | | Signed-off-by: Daniel F. Dickinson <cshored@thecshore.com>
* nut: really run upsd as non-rootDaniel F. Dickinson2018-12-23
| | | | | | | | | | | One local removal was missed in last push of this fix, so in certain circumstances upsd would run as root even when it shouldn't. Fixes f48b060fa752 ("nut: Fix upsd runs as root") Closes: #6697 (properly) Signed-off-by: Daniel F. Dickinson <cshored@thecshore.com>
* nut: Update server config comment 'docs'Daniel F. Dickinson2018-12-23
| | | | | | | Update the commented out settings in /etc/config/nut_server that shows the available sections with their default settings. Signed-off-by: Daniel F. Dickinson <cshored@thecshore.com>
* nut: Fix additional (other) variable handlingDaniel F. Dickinson2018-12-20
| | | | | | | | | | There was a cut & paste error in the handling of 'other' variables (i.e. driver variables not specifically known to the package but which some users may require to be add). There was also a logic error from not switching sufficient after cut & paste. Signed-off-by: Daniel F. Dickinson <cshored@thecshore.com>
* nut: Remove extraneous config readsDaniel F. Dickinson2018-12-20
| | | | | | | | Handling of driver variable defaults, overrides, and additional (other) variables changed and left behind some extraneous config reads (config_get and config_list_foreach). Remove those. Signed-off-by: Daniel F. Dickinson <cshored@thecshore.com>
* nut: alphabetize driver optionsDaniel F. Dickinson2018-12-20
| | | | | | | There are a lot of options; to make development easier alphabetize them. Signed-off-by: Daniel F. Dickinson <cshored@thecshore.com>
* nut: Optionally set serial USB to NUT userDaniel F. Dickinson2018-12-06
| | | | | | | | | When using serial-port based UPSes with NUT, it is handy to be able to configure a USB serial port to have be set tot the NUT runas user, so that NUT can access the serial port automagically. Closes #6997 Signed-off-by: Daniel F. Dickinson <cshored@thecshore.com>
* nut: Fix upsd runs as rootDaniel F. Dickinson2018-12-06
| | | | | | | | | | Closes #6997 - Allows upsd to runas a non-privileged user. If any driver is running as non-privileged user, the last driver's user will be used as the server non-privileged user, otherwise the user specified in config upsd, otherwise nut. Previously the localisation of RUNAS variable was in the wrong locations. Signed-off-by: Daniel F. Dickinson <cshored@thecshore.com>
* nut: Fix a typo in setting a driver parameterDaniel F. Dickinson2018-12-06
| | | | | | synchronous would not get set due to typo. Fixed. Signed-off-by: Daniel F. Dickinson <cshored@thecshore.com>
* nut: Bump PKG_RELEASEDaniel F. Dickinson2018-11-19
| | | | Signed-off-by: Daniel F. Dickinson <cshored@thecshore.com>
* nut: Fix extraneous config_getDaniel F. Dickinson2018-11-19
| | | | | | nut-server initscript had a duplicate config_get statepath, so remove it Signed-off-by: Daniel F. Dickinson <cshored@thecshore.com>
* nut: Fix nut-cgi config creation (startup)Daniel F. Dickinson2018-11-19
| | | | Signed-off-by: Daniel F. Dickinson <cshored@thecshore.com>
* nut: Fix variables for NUT driversDaniel F. Dickinson2018-11-19
| | | | | | | | | Avoid specifying variables that are not specificy set in order to avoid breaking drivers for which those variables do not exist. Closes: #7096. As part of these fixes make sure we have all the variables we need. Closes: #7001. Signed-off-by: Daniel F. Dickinson <cshored@thecshore.com>
* nut: Various startup fixes for monitor and serverDaniel F. Dickinson2018-11-19
| | | | | | | Various path and permissions fixes to properly allow nut-server and nut-monitor to start properly. Signed-off-by: Daniel F. Dickinson <cshored@thecshore.com>
* nut: Build serial drivers by defaultDaniel F. Dickinson2018-11-19
| | | | | | | | Serial drivers don't add much to main NUT and appear to be common, so make it possible for users to use NUT with serial UPS drivers without a custom build. Signed-off-by: Daniel F. Dickinson <cshored@thecshore.com>
* nut: Fix checking for path before it existsDaniel F. Dickinson2018-11-19
| | | | | | | | The mechanism for making sure hotplug doesn't execute during forced shutdown was interfering with initial start of hotplug script due to checking for path that doesn't exist at initial start. This fixes that and closes #6966. Signed-off-by: Daniel F. Dickinson <cshored@thecshore.com>
* nut: Fix undetected UPS hardwareDaniel F. Dickinson2018-11-19
| | | | | | | | Leading zeroes left in ProductId results in some UPS hardware not being matched by the hotplug script lead to bad permissions and driver not starting. Closes: #6966 Signed-off-by: Daniel F. Dickinson <cshored@thecshore.com>
* nut: bump PKG_RELEASEDaniel F. Dickinson2018-08-29
| | | | Signed-off-by: Daniel F. Dickinson <cshored@thecshore.com>
* nut: Remove duplicate/extraneous linesDaniel F. Dickinson2018-08-29
| | | | | | Removes a duplicate directory creation and a stray newline. Signed-off-by: Daniel F. Dickinson <cshored@thecshore.com>
* nut: Makefile: Fix typo in descriptionDaniel F. Dickinson2018-08-29
| | | | | | Cosmetic edit. Signed-off-by: Daniel F. Dickinson <cshored@thecshore.com>
* nut: Use quotes around filenamesDaniel F. Dickinson2018-08-29
| | | | | | | Avoid potential issues with space or other strangeness by quoting filenames through the initscripts. Signed-off-by: Daniel F. Dickinson <cshored@thecshore.com>
* nut: Fix license informationDaniel F. Dickinson2018-08-29
| | | | | | | | | | The source code has multiple licenses so update SPD-X header. NB: The previously unlisted licenses are not applicable to parts actually built in any configuration for OpenWrt, but rather to unused (by us) source code. Signed-off-by: Daniel F. Dickinson <cshored@thecshore.com>
Powered by cgit, Themed by Ted Yin.