openssl3 @3-3.0.3_0+legacy+universal.darwin_15.i386-x86_64: Failed to patch

[thetrial (alabay)]

I am on El Capitan. I guess this is the problem:

:info:patch Executing:  cd "/opt/local/var/macports/build/_opt_local_var_macports_sources_rsync.macports.org_macports_release_tarballs_ports_devel_openssl3/openssl3/work/openssl-3.0.3" && /usr/bin/patch -p0 < '/opt/local/var/macports/sources/rsync.macports.org/macports/release/tarballs/ports/devel/openssl3/files/patch-fix-i386-atomics.diff'
:debug:patch system:  cd "/opt/local/var/macports/build/_opt_local_var_macports_sources_rsync.macports.org_macports_release_tarballs_ports_devel_openssl3/openssl3/work/openssl-3.0.3" && /usr/bin/patch -p0 < '/opt/local/var/macports/sources/rsync.macports.org/macports/release/tarballs/ports/devel/openssl3/files/patch-fix-i386-atomics.diff'
:info:patch patching file include/openssl/crypto.h.in
:info:patch patching file crypto/init.c
:info:patch Hunk #1 succeeded at 35 with fuzz 1 (offset 1 line).
:info:patch Hunk #2 succeeded at 461 with fuzz 1 (offset 4 lines).
:info:patch patching file crypto/threads_pthread.c
:info:patch Hunk #1 succeeded at 224 with fuzz 1 (offset 12 lines).
:info:patch Hunk #2 succeeded at 250 with fuzz 2 (offset 12 lines).
:info:patch patching file include/openssl/crypto.h.in
:info:patch patching file crypto/threads_pthread.c
:info:patch Hunk #1 FAILED at 212.
:info:patch Hunk #2 FAILED at 238.
:info:patch 2 out of 2 hunks FAILED -- saving rejects to file crypto/threads_pthread.c.rej
:info:patch patching file crypto/threads_pthread.c
:info:patch Hunk #1 FAILED at 216.
:info:patch Hunk #2 FAILED at 241.
:info:patch 2 out of 2 hunks FAILED -- saving rejects to file crypto/threads_pthread.c.rej
:info:patch patching file include/openssl/crypto.h.in
:info:patch patching file crypto/threads_pthread.c
:info:patch Hunk #1 FAILED at 216.
:info:patch Hunk #2 FAILED at 243.
:info:patch 2 out of 2 hunks FAILED -- saving rejects to file crypto/threads_pthread.c.rej
:info:patch Command failed:  cd 

I’m not sure if this could have to do something with the closed ticket #64947.

[neverpanic (Clemens Lang)]

This only affects i386. I don't have a system that can compile i386 universal.

[ryandesign (Ryan Carsten Schmidt)]

The fixed patch is apparently here, buried in this closed PR:

​https://github.com/macports/macports-ports/pull/14498/files#diff-1ff685bc9ed4c8609400caea03dbee92f19e0877779b3a7bc689b5545352078b

[neverpanic (Clemens Lang)]

Please try ​https://github.com/macports/macports-ports/pull/14761. If I don't receive feedback, I'll merge it as is.

[neverpanic (Clemens Lang)]

In 083118007565594d528b21143525f64876642705/macports-ports (master):

openssl3: Drop patches that may no longer be needed

The build fails when compiling for i386 because the patches don't apply.
It seems ​https://github.com/openssl/openssl/pull/18056 with
-DBROKEN_CLANG_ATOMICS fixes this.

There is a patch upstream at
​https://github.com/openssl/openssl/pull/16584, but carrying that
downstream would mean continued downstream maintenance, and since this
only affects a platform I cannot test, it is likely to break again with
the next update.

Closes: #65111