From d8896b2848565169f3224072456f4f8d02d36a27 Mon Sep 17 00:00:00 2001 From: jiashuo Date: Fri, 24 Jun 2022 14:06:25 +0800 Subject: [PATCH 1/3] fix --- rdsn/thirdparty/CMakeLists.txt | 29 +++++++++++++++++++++++++++++ scripts/pack_server.sh | 2 ++ 2 files changed, 31 insertions(+) diff --git a/rdsn/thirdparty/CMakeLists.txt b/rdsn/thirdparty/CMakeLists.txt index f5068bbdbb..0790a48a5e 100644 --- a/rdsn/thirdparty/CMakeLists.txt +++ b/rdsn/thirdparty/CMakeLists.txt @@ -156,6 +156,35 @@ ExternalProject_Add(thrift DEPENDS boost ) +# kerberos +ExternalProject_Add(krb5 + URL ${OSS_URL_PREFIX}/krb5-1.16.1.tar.gz + http://web.mit.edu/kerberos/dist/krb5/1.16/krb5-1.16.1.tar.gz + URL_MD5 848e9b80d6aaaa798e3f3df24b83c407 + CONFIGURE_COMMAND cd src && ./configure --prefix=${TP_OUTPUT} + BUILD_COMMAND cd src && make + INSTALL_COMMAND cd src && make install + BUILD_IN_SOURCE 1 + ) + +# cyrus-sasl +ExternalProject_Add(cyrus-sasl + URL ${OSS_URL_PREFIX}/cyrus-sasl-2.1.27.tar.gz + http://www.cyrusimap.org/releases/cyrus-sasl-2.1.27.tar.gz + URL_MD5 a33820c66e0622222c5aefafa1581083 + CONFIGURE_COMMAND ./configure --prefix=${TP_OUTPUT} + --enable-gssapi=${TP_OUTPUT} + --enable-scram=no + --enable-digest=no + --enable-cram=no + --enable-otp=no + BUILD_COMMAND make + INSTALL_COMMAND make install + BUILD_IN_SOURCE 1 + ) +add_dependencies(cyrus-sasl krb5) + + check_cxx_compiler_flag(-Wformat-overflow COMPILER_SUPPORTS_FORMAT_OVERFLOW) if (COMPILER_SUPPORTS_FORMAT_OVERFLOW) set(ZOOKEEPER_CFLAGS -Wno-error=format-overflow) diff --git a/scripts/pack_server.sh b/scripts/pack_server.sh index dc15852802..ba025c7abf 100755 --- a/scripts/pack_server.sh +++ b/scripts/pack_server.sh @@ -105,6 +105,8 @@ copy_file ./rdsn/thirdparty/output/lib/libPoco*.so.* ${pack}/bin copy_file ./rdsn/thirdparty/output/lib/libtcmalloc_and_profiler.so.4 ${pack}/bin copy_file ./rdsn/thirdparty/output/lib/libboost*.so.1.69.0 ${pack}/bin copy_file ./rdsn/thirdparty/output/lib/libhdfs* ${pack}/bin +copy_file ./rdsn/thirdparty/output/lib/libsasl*.so.* ${pack}/bin +copy_file ./rdsn/thirdparty/output/lib/libcom_err*.so.* ${pack}/bin copy_file ./scripts/sendmail.sh ${pack}/bin copy_file ./src/server/config.ini ${pack}/bin copy_file ./src/server/config.min.ini ${pack}/bin From 70c59300bcf240d8829352a6c9901d21e6f2afef Mon Sep 17 00:00:00 2001 From: jiashuo Date: Fri, 24 Jun 2022 17:00:14 +0800 Subject: [PATCH 2/3] fix --- rdsn/thirdparty/CMakeLists.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/rdsn/thirdparty/CMakeLists.txt b/rdsn/thirdparty/CMakeLists.txt index 0790a48a5e..0625585357 100644 --- a/rdsn/thirdparty/CMakeLists.txt +++ b/rdsn/thirdparty/CMakeLists.txt @@ -182,8 +182,6 @@ ExternalProject_Add(cyrus-sasl INSTALL_COMMAND make install BUILD_IN_SOURCE 1 ) -add_dependencies(cyrus-sasl krb5) - check_cxx_compiler_flag(-Wformat-overflow COMPILER_SUPPORTS_FORMAT_OVERFLOW) if (COMPILER_SUPPORTS_FORMAT_OVERFLOW) @@ -202,6 +200,7 @@ ExternalProject_Add(zookeeper INSTALL_COMMAND "" BUILD_IN_SOURCE 1 ) +add_dependencies(zookeeper cyrus-sasl krb5) ExternalProject_Add(libevent URL ${OSS_URL_PREFIX}/libevent-release-2.1.8-stable.tar.gz From 1ff729038812f60c87f5de3f610bbec26580bc6b Mon Sep 17 00:00:00 2001 From: jiashuo Date: Mon, 4 Jul 2022 15:50:40 +0800 Subject: [PATCH 3/3] fix --- docker/pegasus-build-env/centos7/Dockerfile | 2 -- docker/pegasus-build-env/ubuntu1604/Dockerfile | 2 -- docker/pegasus-build-env/ubuntu1804/Dockerfile | 2 -- docker/pegasus-build-env/ubuntu2004/Dockerfile | 2 -- 4 files changed, 8 deletions(-) diff --git a/docker/pegasus-build-env/centos7/Dockerfile b/docker/pegasus-build-env/centos7/Dockerfile index 8497c65934..beea128ca3 100644 --- a/docker/pegasus-build-env/centos7/Dockerfile +++ b/docker/pegasus-build-env/centos7/Dockerfile @@ -50,8 +50,6 @@ RUN yum -y install centos-release-scl \ lz4-devel \ bison \ flex \ - krb5-devel \ - cyrus-sasl-devel \ patch; \ yum clean all; \ rm -rf /var/cache/yum; diff --git a/docker/pegasus-build-env/ubuntu1604/Dockerfile b/docker/pegasus-build-env/ubuntu1604/Dockerfile index 937ccd3bb9..4497470315 100644 --- a/docker/pegasus-build-env/ubuntu1604/Dockerfile +++ b/docker/pegasus-build-env/ubuntu1604/Dockerfile @@ -49,8 +49,6 @@ RUN apt-get update -y; \ libtool \ libssl-dev \ bison \ - libkrb5-dev \ - libsasl2-dev \ maven \ flex; \ rm -rf /var/lib/apt/lists/* diff --git a/docker/pegasus-build-env/ubuntu1804/Dockerfile b/docker/pegasus-build-env/ubuntu1804/Dockerfile index 96a20f8859..9c6238aab5 100644 --- a/docker/pegasus-build-env/ubuntu1804/Dockerfile +++ b/docker/pegasus-build-env/ubuntu1804/Dockerfile @@ -50,8 +50,6 @@ RUN apt-get update -y; \ libtool \ libssl-dev \ bison \ - libkrb5-dev \ - libsasl2-dev \ maven \ flex; \ rm -rf /var/lib/apt/lists/* diff --git a/docker/pegasus-build-env/ubuntu2004/Dockerfile b/docker/pegasus-build-env/ubuntu2004/Dockerfile index 69401c9403..7457540ab5 100644 --- a/docker/pegasus-build-env/ubuntu2004/Dockerfile +++ b/docker/pegasus-build-env/ubuntu2004/Dockerfile @@ -50,8 +50,6 @@ RUN apt-get update -y; \ libtool \ libssl-dev \ bison \ - libkrb5-dev \ - libsasl2-dev \ maven \ flex; \ rm -rf /var/lib/apt/lists/*