Skip to content

Commit 018d913

Browse files
committed
fix: krb5 in el5 hack
1 parent df886d8 commit 018d913

4 files changed

Lines changed: 7 additions & 3 deletions

File tree

compile.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,10 @@ BUILD_RPM() {
122122
SOURCES+=($PERLSRC)
123123
RPMBUILDOPTS+=('--define' "perlver ${PERLVER}" '--define' 'dist .el5')
124124
export CC=gcc44
125+
126+
# Hack: old krb5 fail the test with openssl3.x, but works with openssh
127+
export ac_cv_func_krb5_free_error_message=yes
128+
export ac_cv_func_krb5_get_error_message=yes
125129
fi
126130

127131
# add dist variable if not defined

docker/Dockerfile.centos

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ RUN export CHINA_MIRROR="$CHINA_MIRROR" && \
2222
elif [ "$VERSION_NUM" = "5" ]; then \
2323
yum install -y gcc44; \
2424
fi && \
25-
yum install -y wget autoconf automake gcc make rpm-build setarch pam-devel krb5-devel zlib-devel libXt-devel libX11-devel gtk2-devel && \
25+
yum install -y wget autoconf automake gcc make rpm-build setarch pam-devel krb5-devel zlib-devel libXt-devel libX11-devel gtk2-devel e2fsprogs-devel && \
2626
yum clean all && \
2727
rm -rfv /data/
2828

docker/Dockerfile.centos-stream

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ RUN if [ "$VERSION_NUM" = "8" ]; then \
2828
fi; \
2929
fi && \
3030
yum clean all && yum makecache && \
31-
yum install -y wget autoconf automake gcc make perl rpm-build setarch pam-devel krb5-devel zlib-devel openssl-devel systemd-devel && \
31+
yum install -y wget autoconf automake gcc make perl rpm-build setarch pam-devel krb5-devel zlib-devel openssl-devel systemd-devel e2fsprogs-devel && \
3232
yum clean all
3333

3434
CMD ["./docker/docker_compile.sh"]

docker/Dockerfile.centos5

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ RUN export CHINA_MIRROR="$CHINA_MIRROR" && \
2727
yum install -y gcc44 autoconf automake make rpm-build setarch pam-devel krb5-devel zlib-devel && \
2828
sed 's|]$|-i386]|;s|\$basearch|i386|g' /etc/yum.repos.d/CentOS-Base.repo > /etc/yum.repos.d/CentOS-Base-i386.repo && \
2929
yum makecache && \
30-
yum install -y glibc-devel.i386 libgcc.i386 pam-devel.i386 krb5-devel.i386 zlib-devel.i386 && \
30+
yum install -y glibc-devel.i386 libgcc.i386 pam-devel.i386 krb5-devel.i386 zlib-devel.i386 e2fsprogs-devel.i386 && \
3131
yum clean all
3232

3333
CMD ["./docker/docker_compile.sh"]

0 commit comments

Comments
 (0)