Merge Failed.

This change or one of its cross-repo dependencies was unable to be automatically merged with the current state of its repository. Please rebase the change and upload a new patchset.

This fails to merge because it conflicts with the OpenSSL commit. We will need to switch to OpenSSL 1.1 anyway. However, in the meantime, rawhide still has OpenSSL 1.1, so this should build fine on the CI if rebased.

See https://src.fedoraproject.org/rpms/python2.7/pull-request/16

Rebased.

Thanks. Note that I'd rather merge in the OpenSSL thing sooner, as it replaces the changelog entry, but not necessarily if it takes too much time to get it working.

Build succeeded.

• rpm-linter : FAILURE in 3m 18s (non-voting)
• check-for-arches : SUCCESS in 1m 15s
• rpm-scratch-build : SUCCESS in 31m 24s
• rpm-scratch-build-s390x : SUCCESS in 27m 40s (non-voting)
• rpm-scratch-build-ppc64le : SUCCESS in 38m 11s (non-voting)
• rpm-scratch-build-i686 : SUCCESS in 34m 58s (non-voting)
• rpm-scratch-build-armv7hl : SUCCESS in 1h 25m 37s (non-voting)
• rpm-scratch-build-aarch64 : SUCCESS in 51m 23s (non-voting)
• rpm-rpminspect : SUCCESS in 11m 29s (non-voting)
• check-for-tests : SUCCESS in 43s
• check-for-fmf-tests : SUCCESS in 1m 12s
• rpm-install-test : SKIPPED
• rpm-test : SUCCESS in 5m 50s
• rpm-tmt-test : SKIPPED

Added one more patch for CVE-2021-3737 - verification provided in the same PR upstream. I've managed to build this in mock with downgraded openssl to 1.1.

Build failed. More information on how to proceed and troubleshoot errors available at https://fedoraproject.org/wiki/Zuul-based-ci

• rpm-linter : SKIPPED (non-voting)
• check-for-arches : SUCCESS in 1m 15s
• rpm-scratch-build : FAILURE in 48m 25s
• rpm-scratch-build-s390x : FAILURE in 34m 27s (non-voting)
• rpm-scratch-build-ppc64le : FAILURE in 43m 38s (non-voting)
• rpm-scratch-build-i686 : FAILURE in 53m 30s (non-voting)
• rpm-scratch-build-armv7hl : FAILURE in 1h 10m 49s (non-voting)
• rpm-scratch-build-aarch64 : FAILURE in 1h 09m 34s (non-voting)
• rpm-rpminspect : SKIPPED (non-voting)
• check-for-tests : SKIPPED
• check-for-fmf-tests : SKIPPED
• rpm-install-test : SKIPPED
• rpm-test : SKIPPED
• rpm-tmt-test : SKIPPED

I've rebased this PR and accidentally pushed it to rawhide, because the branch here is also named rawhide :/

I've pushed an empty commit here to start the CI before I build the accidentally pushed thing.

In the meantime, I've opened F35 and F34 backports.

https://src.fedoraproject.org/rpms/python2.7/pull-request/19
https://src.fedoraproject.org/rpms/python2.7/pull-request/20

And F33: https://src.fedoraproject.org/rpms/python2.7/pull-request/21