https://bz.apache.org/bugzilla/show_bug.cgi?id=67518
Bug ID: 67518
Summary: openssl-msvcrt-1.1.1.patch does not cleanly apply to
1.1.1w
Product: Tomcat Native
Version: 1.2.37
Hardware: All
OS: All
Status: NEW
Severity: normal
Priority: P2
Component: Library
Assignee: dev@tomcat.apache.org
Reporter: micha...@apache.org
Target Milestone: ---
Output of patch on Windows:
c:\Entwicklung\Projekte\tomcat-native\native\deps\src\openssl>"C:\Program
Files\Git\usr\bin\patch.exe" -p0 <
"C:\Entwicklung\Projekte\tomcat-native\native\srclib\openssl\openssl-msvcrt-1.1.1.patch"
(Stripping trailing CRs from patch; use --binary to disable.)
patching file Configurations/10-main.conf
Hunk #1 succeeded at 1294 (offset 26 lines).
(Stripping trailing CRs from patch; use --binary to disable.)
patching file crypto/engine/eng_openssl.c
Hunk #1 succeeded at 9 with fuzz 1.
(Stripping trailing CRs from patch; use --binary to disable.)
patching file crypto/o_time.c
Reversed (or previously applied) patch detected! Assume -R? [n]
Apply anyway? [n] n
Skipping patch.
1 out of 1 hunk ignored -- saving rejects to file crypto/o_time.c.rej
(Stripping trailing CRs from patch; use --binary to disable.)
patching file engines/e_capi.c
(Stripping trailing CRs from patch; use --binary to disable.)
patching file test/testutil/basic_output.c
(Stripping trailing CRs from patch; use --binary to disable.)
patching file e_os.h
Hunk #1 succeeded at 177 (offset 28 lines).
Hunk #2 succeeded at 185 (offset 28 lines).
I guess the patch needs a little rework
--
You are receiving this mail because:
You are the assignee for the bug.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
