Fix NSS bundling for Windows clients, do not abort upsmon if SSL was not required (and we failed to set it up)#3429
Open
jimklimov wants to merge 7 commits intonetworkupstools:masterfrom
Open
Conversation
jimklimov
added
packaging
Windows
upsmon
impacts-release-2.8.5
jimklimov
changed the title
upsmon if SSL was not required (and we failed to set it up)upsmon if SSL was not required (and we failed to set it up)
|
A ZIP file with standard source tarball and another tarball with pre-built docs for commit dd0d752 is temporarily available: NUT-tarballs-PR-3429.zip. |
|
❌ Build nut 2.8.5.4673-master failed (commit a7764ea2b9 by @jimklimov) |
…track filenames we already investigated [networkupstools#3420] DRY the loop and avoid cycles. Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
…i_init() but did not require SSL in the first place [networkupstools#3420] Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
… not do this in a loop [networkupstools#3420] Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
…dllldd_with_tools() and dllldd_with_strings() [networkupstools#3420] Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
…here the input EXE/DLL files are [networkupstools#3420] This allows to find libnutprivate*.dll or libupsclient*.dll files we built and installed to EXE bindir, which were otherwise ignored by earlier path discovery tools and/or logic. Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
… found some but not all DLLs via objdump; feed only the names we did not resolve to ldd [networkupstools#3420] Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
…EMPFILE_REC in the outer-most call if we stack them [networkupstools#3420] This should help directory crawlers etc. ignore paths already walked by some previous recursion in this scripted execution. Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
|
✅ Build nut 2.8.5.4678-master completed (commit 614bb81dec by @jimklimov)
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Closes: #3420
nss3.dllbut not referenced from it in a way visible toobjdump,lddand similar tools. Hopefullystrings | grepwould fare better to catch such cases.NoDBmode in NSS builds failed if the library could not load (due to trouble above). Currentlyupsmonaborted the start-up if it could not initialize SSL (also in older releases), but now this happened with runs that did not require the SSL at all.return -1in some failure cases earlier too, so this is not a newly introduced change of behavior. Just there is now more abilities and more error-checking inside.