Drop patch for what became CVE-2020-25692, it was fixed in 2.4.55.

Fixes: CVE-2020-25709, CVE-2020-25710
(cherry picked from commit abbe621)

Fixes an exploitable signed comparison vulnerabilty in the ARMv7 memcpy() and memmove()

https://sourceware.org/bugzilla/show_bug.cgi?id=25620

Contains patches:
2.31-cve-2020-6096.0.patch -> https://sourceware.org/git/?p=glibc.git;a=patch;h=79a4fa341b8a89cb03f84564fd72abaa1a2db394
2.31-cve-2020-6096.1.patch -> https://sourceware.org/git/?p=glibc.git;a=patch;h=beea361050728138b82c57dda0c4810402d342b9

Fixes: CVE-2020-6096

(cherry picked from commit 6f2e993)

(cherry picked from commit de32261)

Asciidoc is severely outdated and is replaced by asciidoctor.
Eliminating asciidoc gets rid of a python2 dependency, see
#101964

(cherry picked from commit bbf96d8)

(cherry picked from commit 6a17829)

The install step for the darwin specific $out/etc/gitconfig file
assumed that $out/etc already existed. This assumption is no longer
true after f5e2ff1 in #103421. This
change makes make sure the directory exists before adding to it.

(cherry picked from commit d686ded)

Fixes an out-of-bounds read when using xmllint with the --htmlout
parameter.

Fixes: CVE-2020-24977
(cherry picked from commit ab61f16)

[staging-20.09] libxml2: fix CVE-2020-24977

[20.09] git: 2.28.0 -> 2.29.2

[staging-20.09] openldap: 2.4.51 -> 2.4.56

It's broken under Python 3, ironically due to the patch we're carrying.
Fix it, and add a test to check it works.

Fixes #93230.

(cherry picked from commit b1f9e9c)

This doesn't do anything. Building with includeEmail = true produces
the same set as includeEmail = false, and the substitute rule removes
a random dictionary index operation.

(cherry picked from commit b28436a)

(cherry picked from commit 17b1bde)

(cherry picked from commit 87f4676)

[20.09] cacert: fix certificate denylist