FTY remerge from master as of 2024-03-02 by jimklimov · Pull Request #2275 · networkupstools/nut

jimklimov · 2024-01-23T15:53:15Z

Bump the copy of 42ity fork contents to minimize difference with the master (as they got to differ considerably over the past 2 years of main trunk's evolution). Hopefully this would ease eventual import of features from the fork and facilitate comparisons of intentional differences.

Also letting NUT CI chew it in many more scenarios than I can run locally :)

After all, it is very possible that difftool/mergetool duplicated or ate away some lines (fixed some cases like that which did break local builds soon after initial conflict resolution).

aquette · 2024-01-23T18:35:43Z

Side comment: as you remember, that fork is not used anymore nowadays, with the cons of missing dmf support, and the pros of being 2x aligned upstream (using official Debian 12)

jimklimov · 2024-01-23T19:29:06Z

Yes, but a lot of treasures lurk there waiting to be upstreamed (and feed back to benefit FTY from the other side). I fear the day when I'd have to review the 50k lines of changes though, and extract that into specific features (DMF, nutconf, vanilla packages, etc.) and more so if trying to keep the 3K items of commit trail :D

jimklimov · 2024-01-24T14:53:27Z

@aquette : FWIW, I've hopefully brought nutconf here up to speed, at least in regard to building without warnings and passing the self-test (locally so far, letting NUT CI loose on it now). It is probably behind the modern code in terms of keyword support, but that's iterable if someone were so inclined :)

Also, finally had a sort of bright idea how to avoid those ugly ifdef WITH_...FUNC in all the SNMP mapping and lookup tables, to add explicit NULL initializers for optional fields: made a series of macros to apply these defaults (or set function pointers in a few cases). So the *-mib.c files are now much more readable and somewhat smaller, similar to master-branch code. The next step is to apply similar macros on master to minimize the diff with DMF-capable codebase :)

jimklimov · 2024-01-24T15:29:40Z

Hm, while assigning labels and looking for historic evidence, found the https://github.com/networkupstools/nut/tree/libconf branch among the dozens of loose threads right in this repo. Didn't go that deep into the cellar before :D

At least, this gives me a chance to cleanly PR the feature separately of DMF etc. :)

Cross-referencing to 42ity#161, #6, #18 for completeness :)

jimklimov · 2024-01-25T09:02:22Z

Hm, C++ obsoletions strike again in clang :\

jimklimov · 2024-02-16T00:31:15Z

PR updated with master that separately included the IPSS Unix derived installer #2288, and the updated nutconf effort #2290 among others.

…s first Signed-off-by: Jim Klimov <[email protected]>

…ep-src-docs, avoid sub-makes where we can Signed-off-by: Jim Klimov <[email protected]>

…pared by "git difftool" for comparisons Signed-off-by: Jim Klimov <[email protected]>

…emerge-20240123

Signed-off-by: Jim Klimov <[email protected]>

…rt throttling

… and ExecStartPost to monitor that it was applied, from FTY branch Originates from FTY commits: * 062d186 (Jim Klimov 2018-01-16 13:11:08 +0100) * 0e28cc8 (Jim Klimov 2018-01-16 13:37:39 +0100) * e9a6710 (Jim Klimov 2018-01-16 13:41:52 +0100) Signed-off-by: Jim Klimov <[email protected]>

…artLimitInterval for broader compatibility Should help avoid this warning and unachieved functionality on systemd-229 and older: * systemd[1]: [/lib/systemd/system/nut-driver-enumerator-daemon-activator.service:30] Unknown lvalue 'StartLimitIntervalSec' in section 'Service'

…to FTY-remerge-20240123 Signed-off-by: Jim Klimov <[email protected]>

…om-FTY Bump NUT `master` branch from FTY

Signed-off-by: Jim Klimov <[email protected]>

jimklimov · 2024-03-03T11:30:47Z

Regarding several builds of libssl/libcrypto conflicting on FreeBSD builds...

From warnings analysis summary at https://ci.networkupstools.org/job/nut/job/nut/job/PR-2275/lastBuild/aggregated-analysis/ :

libssl.so.111, needed by /usr/local/lib/libneon.so, may conflict with libssl.so.11
libcrypto.so.111, needed by /usr/local/lib/libneon.so, may conflict with libcrypto.so.11
libcrypto.so.111, needed by /usr/local/lib/libnetsnmp.so, may conflict with libcrypto.so.11

Files are indeed differently named and sized:

$ ls -la /usr/lib32/libssl.so.111 /usr/local/lib/libssl.so.11 /usr/local/lib/libssl.so /usr/lib/libssl.so.111 /usr/lib/libssl.so /usr/lib32/libssl.so
lrwxr-xr-x  1 root  wheel      13 Oct 23  2020 /usr/lib/libssl.so -> libssl.so.111
-r--r--r--  1 root  wheel  609520 Oct 23  2020 /usr/lib/libssl.so.111
lrwxr-xr-x  1 root  wheel      13 Oct 23  2020 /usr/lib32/libssl.so -> libssl.so.111
-r--r--r--  1 root  wheel  512604 Oct 23  2020 /usr/lib32/libssl.so.111
lrwxr-xr-x  1 root  wheel      12 Jul  2  2021 /usr/local/lib/libssl.so -> libssl.so.11
-rw-r--r--  1 root  wheel  603904 Jul  2  2021 /usr/local/lib/libssl.so.11

$ file /usr/lib/libssl.so.111 /usr/lib32/libssl.so.111 /usr/local/lib/libssl.so.11
/usr/lib/libssl.so.111:      ELF 64-bit LSB shared object, x86-64, version 1 (FreeBSD), dynamically linked, stripped
/usr/lib32/libssl.so.111:    ELF 32-bit LSB shared object, Intel 80386, version 1 (FreeBSD), dynamically linked, stripped
/usr/local/lib/libssl.so.11: ELF 64-bit LSB shared object, x86-64, version 1 (FreeBSD), dynamically linked, stripped

Why does it not pop out in standard NUT builds (probably DMF recipes hardcode something as a shortcut? or just got a different combo of libs needed together by some binary?)
Is it possible to portably configure detection of library search paths to accommodate the whole chain of used libs or poke exact preferred filenames (e.g. to do use /usr/lib/libssl.so.111 for /usr/local/lib/libneon.so and ignore the nearby /usr/local/lib/libssl.so.11)
Where did /usr/local/lib/libssl.so.11 come from? Why is libneon/libsnmp not in /usr/lib if it wants standard libraries? Is it some curiosity of the build agent and not a systemic distro problem - maybe the core fix is in some consistent use of packages vs. local builds, not in NUT recipes imagining workarounds for sysadmin errors?

jimklimov · 2024-03-03T11:38:11Z

So... it seems that the openssl binary is the only consumer of that library, and the symlink is not needed:

# { find /usr/local . -type f -perm +111 | while read F ; do  ldd $F | grep /usr/local/lib/libssl.so && echo "^^^ $F" ; done ; }  2>/dev/null

        libssl.so.11 => /usr/local/lib/libssl.so.11 (0x8002e1000)
^^^ /usr/local/bin/openssl

However the "local" one is the package-delivered one:

# pkg which /usr/{local/,}lib*/libssl.so*
/usr/local/lib/libssl.so was installed by package openssl-1.1.1k_1,1
/usr/local/lib/libssl.so.11 was installed by package openssl-1.1.1k_1,1
/usr/lib/libssl.so was not found in the database
/usr/lib/libssl.so.111 was not found in the database
/usr/lib32/libssl.so was not found in the database
/usr/lib32/libssl.so.111 was not found in the database

Same as libneon and libnetsnmp, which are packaged and only "local":

# pkg which /usr/{local/,}lib*/libneon.so*
/usr/local/lib/libneon.so was installed by package neon-0.31.2
/usr/local/lib/libneon.so.27 was installed by package neon-0.31.2
/usr/local/lib/libneon.so.27.4.2 was installed by package neon-0.31.2
/usr/lib*/libneon.so* was not found in the database

# pkg which /usr/{local/,}lib*/libnetsnmp.so*
/usr/local/lib/libnetsnmp.so was installed by package net-snmp-5.9_3,1
/usr/local/lib/libnetsnmp.so.40 was installed by package net-snmp-5.9_3,1
/usr/local/lib/libnetsnmp.so.40.0.0 was installed by package net-snmp-5.9_3,1
/usr/lib*/libnetsnmp.so* was not found in the database

...and use system-provided libssl and libcrypto (note the latter is in /lib):

# ldd /usr/local/lib/libnetsnmp.so /usr/local/lib/libneon.so | grep -E 'libssl|libcrypto'
        libcrypto.so.111 => /lib/libcrypto.so.111 (0x800e00000)
        libssl.so.111 => /usr/lib/libssl.so.111 (0x8006b1000)
        libcrypto.so.111 => /lib/libcrypto.so.111 (0x800e82000)

NUT-wise, the warnings seem (parallel build) to appear in these linkages (only for this branch but not for master):

--- netxml-ups ---
/usr/local/bin/ld: warning: libssl.so.111, needed by /usr/local/lib/libneon.so, may conflict with libssl.so.11
/usr/local/bin/ld: warning: libcrypto.so.111, needed by /usr/local/lib/libneon.so, may conflict with libcrypto.so.11
--- snmp-ups ---
/usr/local/bin/ld: warning: libcrypto.so.111, needed by /usr/local/lib/libnetsnmp.so, may conflict with libcrypto.so.11
--- snmp-ups-dmf ---
/usr/local/bin/ld: warning: libcrypto.so.111, needed by /usr/local/lib/libnetsnmp.so, may conflict with libcrypto.so.11
/usr/local/bin/ld: warning: libssl.so.111, needed by /usr/local/lib/libneon.so, may conflict with libssl.so.11
--- nut-scanner ---
/usr/local/bin/ld: warning: libcrypto.so.111, needed by /usr/local/lib/libnetsnmp.so, may conflict with libcrypto.so.11
--- nutconf ---
/bin/sh ../../libtool  --tag=CXX    --mode=link g++ -I../../include  -I../../include -DWITH_NUTSCANN
ER -I../../tools/nut-scanner  -isystem /usr/local/include -g -O2 -Wno-reserved-identifier -fdiagnost
ics-color=always -Wno-unknown-warning-option -std=gnu++11 -Wno-system-headers -Wall -Wextra -Werror
-O0 -g3 -gdwarf-2   -o nutconf nutconf-nutconf-cli.o ../../common/libcommon.la  ../../common/libnutc
onf.la  ../../tools/nut-scanner/libnutscan.la -lpthread
libtool: link: g++ -I../../include -I../../include -DWITH_NUTSCANNER -I../../tools/nut-scanner -isys
tem /usr/local/include -g -O2 -Wno-reserved-identifier -fdiagnostics-color=always -Wno-unknown-warni
ng-option -std=gnu++11 -Wno-system-headers -Wall -Wextra -Werror -O0 -g3 -gdwarf-2 -o .libs/nutconf
nutconf-nutconf-cli.o  ../../common/.libs/libcommon.a ../../common/.libs/libnutconf.a ../../tools/nu
t-scanner/.libs/libnutscan.so -L/usr/local/lib -L/usr/lib -lrt -lutil -lnetsnmp -lxml2 -lz -llzma /u
sr/local/lib/libltdl.so -llua-5.1 -lm -lssl -lcrypto -lpthread -pthread -Wl,-rpath -Wl,/usr/local/up
s/lib -Wl,-rpath -Wl,/usr/local/lib
/usr/local/bin/ld: warning: libcrypto.so.111, needed by /usr/local/lib/libnetsnmp.so, may conflict with libcrypto.so.11

The command above does include -L/usr/local/lib -L/usr/lib in this order...

In both branch builds, libnetsnmp and libneon details were found via pkg-config, so both claim e.g. checking for Net-SNMP libs... -L/usr/local/lib -lnetsnmp per *.pc file instructions:

# cat /usr/local/libdata/pkgconfig/netsnmp.pc
prefix=/usr/local
exec_prefix=${prefix}
includedir=${prefix}/include
libdir=${exec_prefix}/lib

Name: netsnmp (Net-SNMP)
Description: SNMP (Simple Network Management Protocol) daemon and applications.
URL: http://www.net-snmp.org
Version: 5.9
Cflags: -I${includedir}
Libs: -L${libdir} -lnetsnmp
Libs.private: -L/usr/lib -lm -lkvm -ldevstat -L/lib -L/usr/local/lib    -lcrypto -lelf -lpkg -lssp_nonshared -lregex   -Wl,-R/usr/local/lib/perl5/5.32/mach/CORE

One notable difference of config.log files of the two builds is that DMF version has LIBXML2_LIBS='-L/usr/local/lib -lxml2 -lz -L/usr/lib -llzma -L/usr/lib -lm' which I guess upsets the search path, if it goes before SNMP/NEON macros?..

…t clauses, to ease maintenance and navigation Signed-off-by: Jim Klimov <[email protected]>

…p rules Signed-off-by: Jim Klimov <[email protected]>

jimklimov · 2024-03-03T12:41:24Z

Tested, libxml2 was not the culprit (makes sense, little use for crypto there).

Found that DMF branch also includes this sort of difference:

+
+if WITH_SSL
+  snmp_ups_CFLAGS += $(LIBSSL_CFLAGS)
+  snmp_ups_LDADD += $(LIBSSL_LIBS)
+
+  snmp_ups_dmf_CFLAGS += $(LIBSSL_CFLAGS)
+  snmp_ups_dmf_LDADD += $(LIBSSL_LIBS)
+endif

 # NEON XML/HTTP
 netxml_ups_SOURCES = netxml-ups.c mge-xml.c
 netxml_ups_LDADD = $(LDADD_DRIVERS) $(LIBNEON_LIBS)
+netxml_ups_CFLAGS = $(AM_CFLAGS)
+
+if WITH_SSL
+  netxml_ups_CFLAGS += $(LIBSSL_CFLAGS)
+  netxml_ups_LDADD += $(LIBSSL_LIBS)
+endif

and the link commands in build logs reflect that (snmp-ups build):

STD: ... ../common/libparseconf.la -L/usr/local/lib -lnetsnmp -lm -lpthread
DMF: ... ../common/libparseconf.la -L/usr/local/lib -lnetsnmp -lm  -L/usr/local/lib -lssl -lcrypto -lpthread

(they were built into nut-scanner and inherited into nutconf earlier, in master-branch as well; the DMF difference is about also pulling the "conflicting" libneon and libnetsnmp builds into orbit).

The openssl-1.1.1 libraries are honestly found via pkg-config, so NUT recipes probably should not intrude too rudely with their opinion. Something to solve on the build agent (pkg remove openssl helped; it was added per common docs/config-prereqs.txt suggestions and nothing else depended on it; the system-provided OpenSSL was found and used afterwards, claiming no conflicts). Maybe eventually in distro, if it is not a one-off problem with this somewhat older worker at FreeBSD 12... Just in case, CCing @gdt :)

checking for OpenSSL version via pkg-config... 1.1.1k found
checking for OpenSSL cflags... -I/usr/local/include
checking for OpenSSL ldflags... -L/usr/local/lib -lssl -lcrypto
checking for openssl/ssl.h... yes

… "pkg add openssl" in fact [networkupstools#2275] Signed-off-by: Jim Klimov <[email protected]>

…fy the unit description (it does not strictly restart the daemon, can reload if running too) Signed-off-by: Jim Klimov <[email protected]>

…om-FTY-systemd Bump NUT `master` branch from FTY: systemd integration

Signed-off-by: Jim Klimov <[email protected]>

…s to running the ./configure script Signed-off-by: Jim Klimov <[email protected]>

Signed-off-by: Jim Klimov <[email protected]>

…lkp_default(), snmp_info_sentinel and info_lkp_sentinel macros to simplify the codebase [networkupstools#2275] Signed-off-by: Jim Klimov <[email protected]>

jimklimov added DMF NUT Data/Dynamic Mapping File/Format/Functionality feature impacts-release-2.8.1 Issues reported against NUT release 2.8.1 (maybe vanilla or with minor packaging tweaks) labels Jan 23, 2024

jimklimov requested review from aquette and arnaudquette-eaton January 23, 2024 15:53

aquette approved these changes Jan 23, 2024

View reviewed changes

jimklimov force-pushed the FTY-remerge-20240123 branch from 97e475b to 23b0047 Compare January 23, 2024 21:49

jimklimov added the nut-scanner label Jan 24, 2024

jimklimov added the nutconf NUT configuration library and tool label Jan 24, 2024

jimklimov marked this pull request as draft January 24, 2024 19:55

jimklimov force-pushed the FTY-remerge-20240123 branch from 82d3287 to 6233365 Compare January 25, 2024 02:07

jimklimov marked this pull request as ready for review January 25, 2024 02:08

jimklimov force-pushed the FTY-remerge-20240123 branch from 6233365 to 6168ce6 Compare January 25, 2024 16:49

This was referenced Jan 27, 2024

Import libconf/nutconf features #2283

Closed

Some generic codebase/recipe clean-up per recent investigation #2284

Merged

snmp mib2nut wrapper macros #2285

Merged

Eaton: add support for EMP002 on ATS16 NM2 with SNMP #2286

Merged

jimklimov marked this pull request as draft January 29, 2024 13:45

jimklimov marked this pull request as ready for review February 16, 2024 00:28

jimklimov changed the title ~~FTY remerge from master as of 2024-01-23~~ FTY remerge from master as of 2024-02-16 Feb 16, 2024

jimklimov force-pushed the FTY-remerge-20240123 branch 3 times, most recently from 258274d to 7d0b025 Compare February 17, 2024 21:29

jimklimov added 2 commits February 20, 2024 00:11

docs/man/Makefile.am, docs/Makefile.am: make sure that "all" target i…

b614c58

…s first Signed-off-by: Jim Klimov <[email protected]>

docs/man/Makefile.am, docs/Makefile.am: rearrange dependencies on .pr…

7049ac1

…ep-src-docs, avoid sub-makes where we can Signed-off-by: Jim Klimov <[email protected]>

tools/nut-usbinfo.pl: quietly skip editor backup files, and those pre…

00827a6

…pared by "git difftool" for comparisons Signed-off-by: Jim Klimov <[email protected]>

jimklimov mentioned this pull request Mar 2, 2024

Bump NUT master branch from FTY #2345

Merged

jimklimov and others added 4 commits March 2, 2024 16:17

Merge remote-tracking branch 'origin/master-bump-from-FTY' into FTY-r…

3ed4728

…emerge-20240123

tools/nut-scanner/scan_snmp.c: apply comments from FTY branch

a52fa2b

Signed-off-by: Jim Klimov <[email protected]>

nut-driver-enumerator-daemon-activator.service.in : disable quick-sta…

e946480

…rt throttling

jimklimov mentioned this pull request Mar 2, 2024

Bump NUT master branch from FTY: systemd integration #2346

Merged

jimklimov and others added 4 commits March 2, 2024 17:47

Merge remote-tracking branch 'origin/master-bump-from-FTY-systemd' in…

aa2c4af

…to FTY-remerge-20240123 Signed-off-by: Jim Klimov <[email protected]>

Merge pull request networkupstools#2345 from jimklimov/master-bump-fr…

8d29ec1

…om-FTY Bump NUT `master` branch from FTY

README.adoc: update phrasing on DigitalOcean and NUT CI farm

5ff77b1

Signed-off-by: Jim Klimov <[email protected]>

jimklimov added 2 commits March 3, 2024 12:20

scripts/DMF/Makefile.am: annotate automake if/else/endif with relevan…

dcdb934

…t clauses, to ease maintenance and navigation Signed-off-by: Jim Klimov <[email protected]>

common/Makefile.am: move LIBXML2 reference to the end of libnutdmfsnm…

c450b99

…p rules Signed-off-by: Jim Klimov <[email protected]>

jimklimov mentioned this pull request Mar 3, 2024

DMF/FTY: Fix linking of libnutscan.so etc. to NOT pull in the libraries we plan to load dynamically #2349

Open

jimklimov added 7 commits March 3, 2024 13:12

docs/config-prereqs.txt: clarify that FreeBSD likely does not want to…

b4531e3

… "pkg add openssl" in fact [networkupstools#2275] Signed-off-by: Jim Klimov <[email protected]>

docs/config-prereqs.txt: clarify that FreeBSD likely does not want to…

b31fe14

… "pkg add openssl" in fact [networkupstools#2275] Signed-off-by: Jim Klimov <[email protected]>

scripts/systemd/nut-driver-enumerator-daemon-activator.path.in: clari…

0fbe658

…fy the unit description (it does not strictly restart the daemon, can reload if running too) Signed-off-by: Jim Klimov <[email protected]>

Merge pull request networkupstools#2346 from jimklimov/master-bump-fr…

d6062d3

…om-FTY-systemd Bump NUT `master` branch from FTY: systemd integration

Merge remote-tracking branch 'upstream/master' into FTY-remerge-20240123

81a329c

Signed-off-by: Jim Klimov <[email protected]>

autogen.sh: in the end of successful execution, lead interactive user…

a7e1873

…s to running the ./configure script Signed-off-by: Jim Klimov <[email protected]>

Merge remote-tracking branch 'upstream/master' into FTY-remerge-20240123

7c7e304

Signed-off-by: Jim Klimov <[email protected]>

jimklimov merged commit 839287b into networkupstools:FTY Mar 4, 2024

jimklimov deleted the FTY-remerge-20240123 branch March 4, 2024 20:21

jimklimov mentioned this pull request Apr 4, 2024

Upstreaming improvements from 42ity/nut fork #1316

Open

34 tasks

This was referenced Jun 15, 2024

FTY remerge from master as of 2024-06-15 #2472

Merged

Libraries not found (Ubuntu 24.04 Server arm) #2431

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

FTY remerge from master as of 2024-03-02#2275

FTY remerge from master as of 2024-03-02#2275
jimklimov merged 4782 commits intonetworkupstools:FTYfrom
jimklimov:FTY-remerge-20240123

jimklimov commented Jan 23, 2024 •

edited

Loading

Uh oh!

aquette commented Jan 23, 2024 •

edited

Loading

Uh oh!

jimklimov commented Jan 23, 2024

Uh oh!

jimklimov commented Jan 24, 2024 •

edited

Loading

Uh oh!

jimklimov commented Jan 24, 2024 •

edited

Loading

Uh oh!

jimklimov commented Jan 25, 2024

Uh oh!

jimklimov commented Feb 16, 2024

Uh oh!

jimklimov commented Mar 3, 2024

Uh oh!

jimklimov commented Mar 3, 2024 •

edited

Loading

Uh oh!

jimklimov commented Mar 3, 2024 •

edited

Loading

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

Uh oh!

Conversation

jimklimov commented Jan 23, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

aquette commented Jan 23, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

jimklimov commented Jan 23, 2024

Uh oh!

jimklimov commented Jan 24, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

jimklimov commented Jan 24, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

jimklimov commented Jan 25, 2024

Uh oh!

jimklimov commented Feb 16, 2024

Uh oh!

jimklimov commented Mar 3, 2024

Uh oh!

jimklimov commented Mar 3, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

jimklimov commented Mar 3, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

jimklimov commented Jan 23, 2024 •

edited

Loading

aquette commented Jan 23, 2024 •

edited

Loading

jimklimov commented Jan 24, 2024 •

edited

Loading

jimklimov commented Jan 24, 2024 •

edited

Loading

jimklimov commented Mar 3, 2024 •

edited

Loading

jimklimov commented Mar 3, 2024 •

edited

Loading