lp://staging/nut

Branch merges

This import branch has no branches proposed for merge into it.

No branches dependent on this one.

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

2752. By Arnaud Quette on 2017-11-17

man pages: clarification on polling parameters

Explain difference between pollfreq and pollinterval in usbhid-ups, and
highlight the pollinterval parameter use from ups.conf in nutupsdrv

Closes: https://github.com/networkupstools/nut/issues/476

Signed-off-by: Arnaud Quette <email address hidden>

2751. By Arnaud Quette on 2017-11-17

Merge branch 'master' into eaton_fake_realpower

2750. By Arnaud Quette on 2017-11-17

mge-shut/usbhid-ups: compute Output load for Eaton UPS

When HID data UPS.PowerConverter.Output.ActivePower is not present, compute a
realpower approximation using available data. This is needed for Eaton 5E and
some other units

Closes: https://github.com/networkupstools/nut/issues/484

Signed-off-by: Arnaud Quette <email address hidden>

2749. By Jim Klimov on 2017-10-13

Merge pull request #488 from jimklimov/eaton-pdu-marlin-linewrap

Eaton ePDU Marlin MIB line-wrap

2748. By Charles Lepple <email address hidden> on 2017-10-08

Merge remote-tracking branch 'github/pull/480': C++ improvements

Closes: https://github.com/networkupstools/nut/issues/472

2747. By Spiros Ioannou <email address hidden> on 2017-09-21

phoenixcontact_modbus: fix stale data detection

Also mark driver as DRV_BETA

Source: http://lists.alioth.debian.org/pipermail/nut-upsdev/2017-September/007331.html

2746. By Jim Klimov on 2017-09-09

Merge pull request #428 from jimklimov/fix-docs-ro-resources

Fix docs RO resources and enable cables HTML docs

2745. By Jim Klimov on 2017-08-28

A few small fixes for cleaner codebase and compilations (#466)

* dstate.h : use our timehead.h to have "struct timeval" defined

* eaton-marlin : cosmetic whitespace fixes

* tests/Makefile.am : cppunit should build with C++11

* .travis.yml : make sure to use "docker" env with its gcc-4.8+ for support of C++11 in cppunit tests

2744. By Arnaud Quette <email address hidden> on 2017-08-23

snmp-ups: add support for input.phase.shift (#433)

* snmp-ups: add support for input.phase.shift

ATS can now publish the electrical dephasing between input sources

Signed-off-by: Arnaud Quette <email address hidden>

* Make spellchecker happy about "dephasing"

2743. By Christian Ehrhardt  on 2017-08-23

automake: only pass net-snmp cflags to snmp-ups (#464)

Other than formerly assumed in the makefile cflags can be more than
includes. And some of them need to be in sync in regard to CFLAGS and
LDFLAGS - for example usage of -fPIE.

This conflicts with a current assumption in the makefile "In any case,
CFLAGS are only -I options, so there is no harm".

On a Distribution where PIE is enabled by default, but disabled for
special cases (like net-snmp) the configure detection gets them as:
LIBNETSNMP_CFLAGS = -DNETSNMP_ENABLE_IPV6 -fno-strict-aliasing -g -O2
-fdebug-prefix-map=/build/net-snmp-nlMQSZ/net-snmp-5.7.3+dfsg=.
-specs=/usr/share/dpkg/no-pie-compile.specs -fstack-protector-strong
-Wformat -Werror=format-security -DNETSNMP_USE_INLINE -Ulinux
-Dlinux=linux -D_REENTRANT -D_GNU_SOURCE -DDEBIAN -fwrapv
-fno-strict-aliasing -pipe -I/usr/local/include -D_LARGEFILE_SOURCE
-D_FILE_OFFSET_BITS=64 -I/usr/lib/x86_64-linux-gnu/perl/5.26/CORE
-Wdate-time -D_FORTIFY_SOURCE=2 -I/usr/include
LIBNETSNMP_LIBS = -Wl,-Bsymbolic-functions
-specs=/usr/share/dpkg/no-pie-link.specs -Wl,-z,relro -Wl,-z,now
-L/usr/lib/x86_64-linux-gnu -lnetsnmp -lcrypto -lm

Of importance are:
-specs=/usr/share/dpkg/no-pie-compile.specs
-specs=/usr/share/dpkg/no-pie-link.specs

Now when compiling the non-snmp objects incorrectly get the
"-specs=/usr/share/dpkg/no-pie-compile.specs" due to the assumption
that it is safe to add up all CFLAGS to the global one.

LDFLAGS imported that way are only added to snmp.
snmp_ups_LDADD = $(LDADD_DRIVERS) $(LIBNETSNMP_LIBS)
[...]
snmp-ups$(EXEEXT): $(snmp_ups_OBJECTS) $(snmp_ups_DEPENDENCIES)
$(EXTRA_snmp_ups_DEPENDENCIES)
        @rm -f snmp-ups$(EXEEXT)
        $(AM_V_CCLD)$(LINK) $(snmp_ups_OBJECTS) $(snmp_ups_LDADD)
$(LIBS)

That leads to other (all non snmp_ups) objects in drivers failing to build.
They get the no-pie-compile.specs (incorrect) spec but not the
no-pie-link.specs on the link step.

Some other parts like mge_shut and nutdrv_qx already have custom
CFLAGS/LDFLAGS that are not added to the global CFLAGS. So despite the
commend in the makefile this doesn't seem to be new in general to nut.

I don't want to mess too much with your build system for now as I don't
know many of its implications. So I chose not the full drop of that
global CFLAGS merge, but a minimal patch for now which fixes the issue
described.

Thereby closes #463

Signed-off-by: Christian Ehrhardt <email address hidden>