Skip to content

Commit 7f822f0

Browse files
authored
chore: libxcrypt 4.4.17 → 4.4.23 (#1156)
changelog: https://github.com/besser82/libxcrypt/blob/v4.4.23/NEWS
1 parent 1f0eec4 commit 7f822f0

File tree

2 files changed

+29
-2
lines changed

2 files changed

+29
-2
lines changed

docker/Dockerfile

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,9 +60,12 @@ RUN export PATCHELF_VERSION=0.12 && \
6060
manylinux-entrypoint /build_scripts/install-patchelf.sh
6161

6262
COPY build_scripts/install-libxcrypt.sh /build_scripts/
63-
RUN export LIBXCRYPT_VERSION=4.4.17 && \
64-
export LIBXCRYPT_HASH=7665168d0409574a03f7b484682e68334764c29c21ca5df438955a381384ca07 && \
63+
RUN export LIBXCRYPT_VERSION=4.4.23 && \
64+
export LIBXCRYPT_HASH=9cbbcb795ed5d121a1613eb0e40c77173b53e15a746796fc7cd7bd71cfd64533 && \
6565
export LIBXCRYPT_DOWNLOAD_URL=https://github.com/besser82/libxcrypt/archive && \
66+
export PERL_ROOT=perl-5.34.0 && \
67+
export PERL_HASH=551efc818b968b05216024fb0b727ef2ad4c100f8cb6b43fab615fa78ae5be9a && \
68+
export PERL_DOWNLOAD_URL=https://www.cpan.org/src/5.0 && \
6669
manylinux-entrypoint /build_scripts/install-libxcrypt.sh
6770

6871

docker/build_scripts/install-libxcrypt.sh

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,25 @@ MY_DIR=$(dirname "${BASH_SOURCE[0]}")
1010
# Get build utilities
1111
source $MY_DIR/build_utils.sh
1212

13+
# We need perl 5.14+
14+
if ! perl -e 'use 5.14.0' &> /dev/null; then
15+
check_var ${PERL_ROOT}
16+
check_var ${PERL_HASH}
17+
check_var ${PERL_DOWNLOAD_URL}
18+
fetch_source ${PERL_ROOT}.tar.gz ${PERL_DOWNLOAD_URL}
19+
check_sha256sum "${PERL_ROOT}.tar.gz" "${PERL_HASH}"
20+
21+
tar -xzf ${PERL_ROOT}.tar.gz
22+
pushd ${PERL_ROOT}
23+
./Configure -des -Dprefix=/tmp/perl-libxcrypt > /dev/null
24+
make -j$(nproc) > /dev/null
25+
make install > /dev/null
26+
popd
27+
28+
rm -rf ${PERL_ROOT}.tar.gz ${PERL_ROOT}
29+
export PATH=/tmp/perl-libxcrypt/bin:${PATH}
30+
fi
31+
1332
# Install libcrypt.so.1 and libcrypt.so.2
1433
check_var ${LIBXCRYPT_VERSION}
1534
check_var ${LIBXCRYPT_HASH}
@@ -50,3 +69,8 @@ rm -rf /manylinux-rootfs
5069
rm -rf /usr/include/crypt.h
5170
find /lib* /usr/lib* \( -name 'libcrypt.a' -o -name 'libcrypt.so' -o -name 'libcrypt.so.*' -o -name 'libcrypt-2.*.so' \) -delete
5271
ldconfig
72+
73+
# Remove temp Perl
74+
if [ -d /tmp/perl-libxcrypt ]; then
75+
rm -rf /tmp/perl-libxcrypt
76+
fi

0 commit comments

Comments
 (0)