update SDK and build log4j2 hotpatch #1869
Merged
Conversation
This file contains 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
Signed-off-by: Ben Cressey <[email protected]>
Fedora 35 no longer carries the patch to rpm's `find-debuginfo.sh` that explicitly decompresses DWARF, and consequently fails to extract any debuginfo. Work around this by disabling debuginfo compression at link time. Signed-off-by: Ben Cressey <[email protected]>
Fedora 35 runs the rpath check by default, so now we can undefine the macro to prevent it from running. Signed-off-by: Ben Cressey <[email protected]>
|
LGTM, pending testing. |
|
Looks good! |
bcressey
force-pushed
the
log4j2-hotpatch
branch
from
a7ad030
to
9c01c27
Compare
jpculp
approved these changes
Dec 16, 2021
bcressey
force-pushed
the
log4j2-hotpatch
branch
from
9c01c27
to
42d345e
Compare
arnaldo2792
approved these changes
Dec 16, 2021
| Summary: Tool for hot patching log4j2 vulnerabilities | ||
| License: Apache-2.0 | ||
| URL: https://github.com/corretto/%{project} | ||
| Source0: https://github.com/corretto/%{project}/archive/%{version}/%{version}.tar.gz#/%{project}-%{version}.tar.gz |
There was a problem hiding this comment.
Nit: left over comment at the end? Or is this intentional?
There was a problem hiding this comment.
It's intentional; it's a URL fragment that rpm will parse as the file name for use in the %setup macro.
jpculp
approved these changes
Dec 17, 2021
cbgbt
approved these changes
Dec 17, 2021
samuelkarp
reviewed
Dec 17, 2021
packages/log4j2-hotpatch/0001-Log-to-stderr-instead-of-stdout.patch
Outdated
Show resolved
Hide resolved
| } | ||
| } else if (args.length == 1 && ("-h".equals(args[0]) || "-help".equals(args[0]) || "--help".equals(args[0]))) { | ||
| - System.out.println("usage: Log4jHotPatch [<pid> [<pid> ..]]"); | ||
| + System.err.println("usage: Log4jHotPatch [<pid> [<pid> ..]]"); |
There was a problem hiding this comment.
Is it common for -help output to be on stderr?
There was a problem hiding this comment.
It's not. Not sure if there's a good reason for this - @stewartsmith ?
samuelkarp
approved these changes
Dec 17, 2021
Signed-off-by: Ben Cressey <[email protected]>
bcressey
force-pushed
the
log4j2-hotpatch
branch
from
42d345e
to
2f03f0f
Compare
webern
approved these changes
Dec 17, 2021
samuelkarp
approved these changes
Dec 17, 2021
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Issue number:
N/A
Description of changes:
Update SDK to the new release, which includes maven, and use it to build the log4j2 hotpatch.
Testing done:
Built some variants on both architectures, for both architectures.
Additional tests:
aws-ecs-1aws-k8s-1.21Terms of contribution:
By submitting this pull request, I agree that this contribution is dual-licensed under the terms of both the Apache License, version 2.0, and the MIT license.