chore(manylinux1): libxcrypt 4.4.17 → 4.4.23

docker/build_scripts/build.sh

@@ -80,25 +80,18 @@ yum -y install \
     yasm \
     ${PYTHON_COMPILE_DEPS}
 
-# Build PERL in order to build OpenSSL. We'll delete this after OpenSSL build.
+# Build PERL in order to build OpenSSL. We'll delete this after OpenSSL and libxcrypt builds.
 build_perl $PERL_ROOT $PERL_HASH
 
 # Build an OpenSSL for both curl and the Pythons. We'll delete this at the end.
 build_openssl $OPENSSL_ROOT $OPENSSL_HASH
 
-# Delete PERL
-rm -rf /opt/perl
-
 # Install curl so we can have TLS 1.2 in this ancient container.
 build_curl $CURL_ROOT $CURL_HASH
 hash -r
 curl --version
 curl-config --features
 
-# Install a git we link against OpenSSL so that we can use TLS 1.2
-build_git $GIT_ROOT $GIT_HASH
-git version
-
 # Install newest autoconf
 build_autoconf $AUTOCONF_ROOT $AUTOCONF_HASH
 autoconf --version
@@ -111,6 +104,16 @@ automake --version
 build_libtool $LIBTOOL_ROOT $LIBTOOL_HASH
 libtool --version
 
+# Install libcrypt.so.1 and libcrypt.so.2
+build_libxcrypt "$LIBXCRYPT_DOWNLOAD_URL" "$LIBXCRYPT_VERSION" "$LIBXCRYPT_HASH"
+
+# Delete PERL now that OpenSSL and libxcrypt are built
+rm -rf /opt/perl
+
+# Install a git we link against OpenSSL so that we can use TLS 1.2
+build_git $GIT_ROOT $GIT_HASH
+git version
+
 # Install a more recent SQLite3
 curl -fsSLO $SQLITE_AUTOCONF_DOWNLOAD_URL/$SQLITE_AUTOCONF_ROOT.tar.gz
 check_sha256sum $SQLITE_AUTOCONF_ROOT.tar.gz $SQLITE_AUTOCONF_HASH
@@ -121,9 +124,6 @@ cd ..
 rm -rf $SQLITE_AUTOCONF_ROOT*
 rm /usr/local/lib/libsqlite3.a
 
-# Install libcrypt.so.1 and libcrypt.so.2
-build_libxcrypt "$LIBXCRYPT_DOWNLOAD_URL" "$LIBXCRYPT_VERSION" "$LIBXCRYPT_HASH"
-
 # Compile the latest Python releases.
 # (In order to have a proper SSL module, Python is compiled
 # against a recent openssl [see env vars above], which is linked

docker/build_scripts/build_env.sh

@@ -4,9 +4,9 @@ PYTHON_DOWNLOAD_URL=https://www.python.org/ftp/python
 # of the form <maj>.<min>.<rev> or <maj>.<min>.<rev>rc<n>
 CPYTHON_VERSIONS="2.7.18 3.5.10 3.6.14 3.7.11 3.8.11 3.9.6"
 
-# perl is needed to build openssl
-PERL_ROOT=perl-5.32.1
-PERL_HASH=03b693901cd8ae807231b1787798cf1f2e0b8a56218d07b7da44f784a7caeb2c
+# perl is needed to build openssl and libxcrypt
+PERL_ROOT=perl-5.34.0
+PERL_HASH=551efc818b968b05216024fb0b727ef2ad4c100f8cb6b43fab615fa78ae5be9a
 PERL_DOWNLOAD_URL=https://www.cpan.org/src/5.0
 
 # openssl version to build, with expected sha256 hash of .tar.gz
@@ -37,8 +37,8 @@ SQLITE_AUTOCONF_ROOT=sqlite-autoconf-3360000
 SQLITE_AUTOCONF_HASH=bd90c3eb96bee996206b83be7065c9ce19aef38c3f4fb53073ada0d0b69bbce3
 SQLITE_AUTOCONF_DOWNLOAD_URL=https://www.sqlite.org/2021
 
-LIBXCRYPT_VERSION=4.4.17
-LIBXCRYPT_HASH=7665168d0409574a03f7b484682e68334764c29c21ca5df438955a381384ca07
+LIBXCRYPT_VERSION=4.4.23
+LIBXCRYPT_HASH=9cbbcb795ed5d121a1613eb0e40c77173b53e15a746796fc7cd7bd71cfd64533
 LIBXCRYPT_DOWNLOAD_URL=https://github.com/besser82/libxcrypt/archive
 
 GIT_ROOT=git-2.32.0

docker/build_scripts/build_utils.sh

@@ -274,16 +274,16 @@ function build_libxcrypt {
     check_sha256sum "v${LIBXCRYPT_VERSION}.tar.gz" "$LIBXCRYPT_HASH"
     tar xfz "v${LIBXCRYPT_VERSION}.tar.gz"
     pushd "libxcrypt-$LIBXCRYPT_VERSION"
-    ./autogen.sh > /dev/null
-    do_standard_install \
+    PATH=/opt/perl/bin:$PATH ./autogen.sh > /dev/null
+    PATH=/opt/perl/bin:$PATH do_standard_install \
         --disable-obsolete-api \
         --enable-hashes=all \
         --disable-werror
     # we also need libcrypt.so.1 with glibc compatibility for system libraries
     # c.f https://github.com/pypa/manylinux/issues/305#issuecomment-625902928
     make clean > /dev/null
     sed -r -i 's/XCRYPT_([0-9.])+/-/g;s/(%chain OW_CRYPT_1.0).*/\1/g' lib/libcrypt.map.in
-    DESTDIR=$(pwd)/so.1 do_standard_install \
+    PATH=/opt/perl/bin:$PATH DESTDIR=$(pwd)/so.1 do_standard_install \
         --disable-xcrypt-compat-files \
         --enable-obsolete-api=glibc \
         --enable-hashes=all \