From baefab3e0cbebb4d48cb751f0bbe8b4ab3b10273 Mon Sep 17 00:00:00 2001 From: Torsten Kilias Date: Fri, 13 Nov 2020 11:20:42 +0100 Subject: [PATCH 1/3] Add test for rcurl with sftp and add script to compile libcurl with sftp (not yet used) --- .current_gitmodules | 2 +- .../compile_libcurl3_with_sftp.sh | 22 +++++++++++++++++++ .../flavor_base/testconfig | 2 +- script-languages | 2 +- 4 files changed, 25 insertions(+), 3 deletions(-) create mode 100644 flavors/fancyr-EXASOL-6.1.0/flavor_base/flavor_base_deps/compile_libcurl3_with_sftp.sh diff --git a/.current_gitmodules b/.current_gitmodules index 6b22e142..d0201c7f 100644 --- a/.current_gitmodules +++ b/.current_gitmodules @@ -1 +1 @@ -160000 bedc1580f1870ac78d871e0af1a5e2d989a31a2a 0 script-languages +160000 62099509d0348e3f0033ff2fa28d18274e881f02 0 script-languages diff --git a/flavors/fancyr-EXASOL-6.1.0/flavor_base/flavor_base_deps/compile_libcurl3_with_sftp.sh b/flavors/fancyr-EXASOL-6.1.0/flavor_base/flavor_base_deps/compile_libcurl3_with_sftp.sh new file mode 100644 index 00000000..31c7ea54 --- /dev/null +++ b/flavors/fancyr-EXASOL-6.1.0/flavor_base/flavor_base_deps/compile_libcurl3_with_sftp.sh @@ -0,0 +1,22 @@ +sudo apt-get -y --no-install-recommends install wget build-essential debhelper libssh-dev +sudo apt-get source curl +sudo apt-get build-dep curl + +cd curl-* + +wget https://launchpadlibrarian.net/409184445/ubuntu_libssl.patch +patch < ubuntu_libssl.patch + +sudo dpkg-buildpackage -uc -us +# -us Do not sign the source package. +# -uc Do not sign the .changes file. + +cd .. + +sudo dpkg -i curl_*.deb +sudo dpkg -i libcurl3-*.deb +sudo dpkg -i libcurl3-gnutls_*.deb + +sudo apt-mark hold curl +sudo apt-mark hold libcurl3 +sudo apt-mark hold libcurl3-gnutls diff --git a/flavors/fancyr-EXASOL-6.1.0/flavor_base/testconfig b/flavors/fancyr-EXASOL-6.1.0/flavor_base/testconfig index ef8933e3..c85199c5 100644 --- a/flavors/fancyr-EXASOL-6.1.0/flavor_base/testconfig +++ b/flavors/fancyr-EXASOL-6.1.0/flavor_base/testconfig @@ -1,2 +1,2 @@ generic_language_tests=r -test_folders=r \ No newline at end of file +test_folders=r fancyr-6.1 diff --git a/script-languages b/script-languages index bedc1580..62099509 160000 --- a/script-languages +++ b/script-languages @@ -1 +1 @@ -Subproject commit bedc1580f1870ac78d871e0af1a5e2d989a31a2a +Subproject commit 62099509d0348e3f0033ff2fa28d18274e881f02 From 2b9a7c466d67daed047ee25544480eabbb836147 Mon Sep 17 00:00:00 2001 From: tkilias Date: Fri, 13 Nov 2020 12:29:23 +0000 Subject: [PATCH 2/3] Change flavor_base_deps of fancyr-EXASOL-6.1.0 to build libcurl with libssh support --- .../flavor_base/flavor_base_deps/Dockerfile | 12 ++++++- .../compile_libcurl3_with_sftp.sh | 32 ++++++++++++------- .../packages/apt_get_packages | 3 +- .../flavor_base/flavor_base_deps/sources.list | 14 ++++++++ 4 files changed, 47 insertions(+), 14 deletions(-) create mode 100644 flavors/fancyr-EXASOL-6.1.0/flavor_base/flavor_base_deps/sources.list diff --git a/flavors/fancyr-EXASOL-6.1.0/flavor_base/flavor_base_deps/Dockerfile b/flavors/fancyr-EXASOL-6.1.0/flavor_base/flavor_base_deps/Dockerfile index 1739d6c3..a8f4c0b7 100644 --- a/flavors/fancyr-EXASOL-6.1.0/flavor_base/flavor_base_deps/Dockerfile +++ b/flavors/fancyr-EXASOL-6.1.0/flavor_base/flavor_base_deps/Dockerfile @@ -2,10 +2,20 @@ FROM {{ language_deps }} RUN mkdir -p /build_info/packages/flavor_base_deps COPY flavor_base_deps/packages/apt_get_packages /build_info/packages/flavor_base_deps +COPY flavor_base_deps/compile_libcurl3_with_sftp.sh compile_libcurl3_with_sftp.sh +COPY flavor_base_deps/sources.list /etc/apt/sources.list + +RUN apt-get -y update && \ + bash -x compile_libcurl3_with_sftp.sh && \ + locale-gen en_US.UTF-8 && \ + update-locale LC_ALL=en_US.UTF-8 && \ + apt-get -y clean && \ + apt-get -y autoremove && \ + ldconfig RUN apt-get -y update && \ apt-get -y install $(cat /build_info/packages/flavor_base_deps/apt_get_packages) && \ - locale-gen en_US.UTF-8 && \ + locale-gen en_US.UTF-8 && \ update-locale LC_ALL=en_US.UTF-8 && \ apt-get -y clean && \ apt-get -y autoremove && \ diff --git a/flavors/fancyr-EXASOL-6.1.0/flavor_base/flavor_base_deps/compile_libcurl3_with_sftp.sh b/flavors/fancyr-EXASOL-6.1.0/flavor_base/flavor_base_deps/compile_libcurl3_with_sftp.sh index 31c7ea54..1a74a838 100644 --- a/flavors/fancyr-EXASOL-6.1.0/flavor_base/flavor_base_deps/compile_libcurl3_with_sftp.sh +++ b/flavors/fancyr-EXASOL-6.1.0/flavor_base/flavor_base_deps/compile_libcurl3_with_sftp.sh @@ -1,22 +1,32 @@ -sudo apt-get -y --no-install-recommends install wget build-essential debhelper libssh-dev -sudo apt-get source curl -sudo apt-get build-dep curl +#!/bin/bash + +set -e +set -u +set -o pipefail + +apt-get -y --no-install-recommends install wget build-essential debhelper libssh-dev +apt-get source curl +apt-get build-dep -y --no-install-recommends curl cd curl-* +cat debian/rules + wget https://launchpadlibrarian.net/409184445/ubuntu_libssl.patch -patch < ubuntu_libssl.patch +patch debian/rules < ubuntu_libssl.patch -sudo dpkg-buildpackage -uc -us +dpkg-buildpackage -uc -us -b # -us Do not sign the source package. # -uc Do not sign the .changes file. cd .. -sudo dpkg -i curl_*.deb -sudo dpkg -i libcurl3-*.deb -sudo dpkg -i libcurl3-gnutls_*.deb +dpkg -i curl_*.deb +dpkg -i libcurl3-*.deb +dpkg -i libcurl3-gnutls_*.deb + +apt-mark hold curl +apt-mark hold libcurl3 +apt-mark hold libcurl3-gnutls -sudo apt-mark hold curl -sudo apt-mark hold libcurl3 -sudo apt-mark hold libcurl3-gnutls +curl --v 2>&1 | grep sftp diff --git a/flavors/fancyr-EXASOL-6.1.0/flavor_base/flavor_base_deps/packages/apt_get_packages b/flavors/fancyr-EXASOL-6.1.0/flavor_base/flavor_base_deps/packages/apt_get_packages index 62ceba52..1111dcfd 100644 --- a/flavors/fancyr-EXASOL-6.1.0/flavor_base/flavor_base_deps/packages/apt_get_packages +++ b/flavors/fancyr-EXASOL-6.1.0/flavor_base/flavor_base_deps/packages/apt_get_packages @@ -3,10 +3,9 @@ coreutils locales unzip wget -curl git build-essential openjdk-11-jdk-headless r-base libxml2-dev -libcurl4-openssl-dev \ No newline at end of file +libcurl4-openssl-dev diff --git a/flavors/fancyr-EXASOL-6.1.0/flavor_base/flavor_base_deps/sources.list b/flavors/fancyr-EXASOL-6.1.0/flavor_base/flavor_base_deps/sources.list new file mode 100644 index 00000000..55fc981c --- /dev/null +++ b/flavors/fancyr-EXASOL-6.1.0/flavor_base/flavor_base_deps/sources.list @@ -0,0 +1,14 @@ +deb http://de.archive.ubuntu.com/ubuntu bionic main restricted universe multiverse +deb-src http://de.archive.ubuntu.com/ubuntu bionic main restricted universe multiverse + +deb http://de.archive.ubuntu.com/ubuntu bionic-updates main restricted universe multiverse +deb-src http://de.archive.ubuntu.com/ubuntu bionic-updates main restricted universe multiverse + +deb http://de.archive.ubuntu.com/ubuntu bionic-security main restricted universe multiverse +deb-src http://de.archive.ubuntu.com/ubuntu bionic-security main restricted universe multiverse + +deb http://de.archive.ubuntu.com/ubuntu bionic-backports main restricted universe multiverse +deb-src http://de.archive.ubuntu.com/ubuntu bionic-backports main restricted universe multiverse + +# deb http://archive.canonical.com/ubuntu bionic partner +# deb-src http://archive.canonical.com/ubuntu bionic partner From 784a241c157dc711f11940c2807c4d8179ea2caa Mon Sep 17 00:00:00 2001 From: tkilias Date: Fri, 13 Nov 2020 21:03:04 +0000 Subject: [PATCH 3/3] Fix and activate compile_libcurl3_with_sftp.sh and fix its test --- .current_gitmodules | 2 +- .../flavor_base/flavor_base_deps/Dockerfile | 8 ++- .../compile_libcurl3_with_sftp.sh | 33 +++++++--- .../packages/apt_get_packages | 3 +- .../flavor_base/flavor_base_deps/sources.list | 63 ++++++++++++++----- .../flavor_base_deps/ubuntu_libssl.patch | 11 ++++ script-languages | 2 +- 7 files changed, 93 insertions(+), 29 deletions(-) create mode 100644 flavors/fancyr-EXASOL-6.1.0/flavor_base/flavor_base_deps/ubuntu_libssl.patch diff --git a/.current_gitmodules b/.current_gitmodules index d0201c7f..47f4294e 100644 --- a/.current_gitmodules +++ b/.current_gitmodules @@ -1 +1 @@ -160000 62099509d0348e3f0033ff2fa28d18274e881f02 0 script-languages +160000 4901a819d37b7f1ec40d2a2b784dbcbb6670ef2d 0 script-languages diff --git a/flavors/fancyr-EXASOL-6.1.0/flavor_base/flavor_base_deps/Dockerfile b/flavors/fancyr-EXASOL-6.1.0/flavor_base/flavor_base_deps/Dockerfile index a8f4c0b7..078e7c34 100644 --- a/flavors/fancyr-EXASOL-6.1.0/flavor_base/flavor_base_deps/Dockerfile +++ b/flavors/fancyr-EXASOL-6.1.0/flavor_base/flavor_base_deps/Dockerfile @@ -2,11 +2,13 @@ FROM {{ language_deps }} RUN mkdir -p /build_info/packages/flavor_base_deps COPY flavor_base_deps/packages/apt_get_packages /build_info/packages/flavor_base_deps -COPY flavor_base_deps/compile_libcurl3_with_sftp.sh compile_libcurl3_with_sftp.sh +COPY flavor_base_deps/compile_libcurl3_with_sftp.sh /tmp/compile_libcurl3_with_sftp.sh COPY flavor_base_deps/sources.list /etc/apt/sources.list +COPY flavor_base_deps/ubuntu_libssl.patch /tmp/ubuntu_libssl.patch RUN apt-get -y update && \ - bash -x compile_libcurl3_with_sftp.sh && \ + bash -x /tmp/compile_libcurl3_with_sftp.sh && \ + rm /tmp/compile_libcurl3_with_sftp.sh && \ locale-gen en_US.UTF-8 && \ update-locale LC_ALL=en_US.UTF-8 && \ apt-get -y clean && \ @@ -14,7 +16,7 @@ RUN apt-get -y update && \ ldconfig RUN apt-get -y update && \ - apt-get -y install $(cat /build_info/packages/flavor_base_deps/apt_get_packages) && \ + apt-get -y install --allow-downgrades $(cat /build_info/packages/flavor_base_deps/apt_get_packages) && \ locale-gen en_US.UTF-8 && \ update-locale LC_ALL=en_US.UTF-8 && \ apt-get -y clean && \ diff --git a/flavors/fancyr-EXASOL-6.1.0/flavor_base/flavor_base_deps/compile_libcurl3_with_sftp.sh b/flavors/fancyr-EXASOL-6.1.0/flavor_base/flavor_base_deps/compile_libcurl3_with_sftp.sh index 1a74a838..2d8ecedf 100644 --- a/flavors/fancyr-EXASOL-6.1.0/flavor_base/flavor_base_deps/compile_libcurl3_with_sftp.sh +++ b/flavors/fancyr-EXASOL-6.1.0/flavor_base/flavor_base_deps/compile_libcurl3_with_sftp.sh @@ -4,29 +4,44 @@ set -e set -u set -o pipefail -apt-get -y --no-install-recommends install wget build-essential debhelper libssh-dev + +pushd /tmp +mkdir compile_curl +pushd compile_curl + +apt-get -y --no-install-recommends install wget build-essential debhelper libssh2-1-dev libssh-dev apt-get source curl apt-get build-dep -y --no-install-recommends curl -cd curl-* +pushd curl-* -cat debian/rules - -wget https://launchpadlibrarian.net/409184445/ubuntu_libssl.patch +mv /tmp/ubuntu_libssl.patch ubuntu_libssl.patch patch debian/rules < ubuntu_libssl.patch -dpkg-buildpackage -uc -us -b +DEB_BUILD_OPTIONS=nocheck dpkg-buildpackage -uc -us -b # -us Do not sign the source package. # -uc Do not sign the .changes file. -cd .. +popd + +ls -l *.deb dpkg -i curl_*.deb -dpkg -i libcurl3-*.deb dpkg -i libcurl3-gnutls_*.deb +dpkg -i libcurl3-nss_*.deb +dpkg -i libcurl4_*.deb + +popd + +rm -rf compile_curl apt-mark hold curl apt-mark hold libcurl3 apt-mark hold libcurl3-gnutls +apt-mark hold libcurl3-nss +apt-mark hold libcurl4 + + +apt-get -f install -curl --v 2>&1 | grep sftp +curl --version diff --git a/flavors/fancyr-EXASOL-6.1.0/flavor_base/flavor_base_deps/packages/apt_get_packages b/flavors/fancyr-EXASOL-6.1.0/flavor_base/flavor_base_deps/packages/apt_get_packages index 1111dcfd..3ed6466c 100644 --- a/flavors/fancyr-EXASOL-6.1.0/flavor_base/flavor_base_deps/packages/apt_get_packages +++ b/flavors/fancyr-EXASOL-6.1.0/flavor_base/flavor_base_deps/packages/apt_get_packages @@ -6,6 +6,7 @@ wget git build-essential openjdk-11-jdk-headless -r-base +r-base=3.4.4-1ubuntu1 +r-recommended=3.4.4-1ubuntu1 libxml2-dev libcurl4-openssl-dev diff --git a/flavors/fancyr-EXASOL-6.1.0/flavor_base/flavor_base_deps/sources.list b/flavors/fancyr-EXASOL-6.1.0/flavor_base/flavor_base_deps/sources.list index 55fc981c..0d80f957 100644 --- a/flavors/fancyr-EXASOL-6.1.0/flavor_base/flavor_base_deps/sources.list +++ b/flavors/fancyr-EXASOL-6.1.0/flavor_base/flavor_base_deps/sources.list @@ -1,14 +1,49 @@ -deb http://de.archive.ubuntu.com/ubuntu bionic main restricted universe multiverse -deb-src http://de.archive.ubuntu.com/ubuntu bionic main restricted universe multiverse - -deb http://de.archive.ubuntu.com/ubuntu bionic-updates main restricted universe multiverse -deb-src http://de.archive.ubuntu.com/ubuntu bionic-updates main restricted universe multiverse - -deb http://de.archive.ubuntu.com/ubuntu bionic-security main restricted universe multiverse -deb-src http://de.archive.ubuntu.com/ubuntu bionic-security main restricted universe multiverse - -deb http://de.archive.ubuntu.com/ubuntu bionic-backports main restricted universe multiverse -deb-src http://de.archive.ubuntu.com/ubuntu bionic-backports main restricted universe multiverse - -# deb http://archive.canonical.com/ubuntu bionic partner -# deb-src http://archive.canonical.com/ubuntu bionic partner +# See http://help.ubuntu.com/community/UpgradeNotes for how to upgrade to +# newer versions of the distribution. +deb http://archive.ubuntu.com/ubuntu/ bionic main restricted +deb-src http://archive.ubuntu.com/ubuntu/ bionic main restricted + +## Major bug fix updates produced after the final release of the +## distribution. +deb http://archive.ubuntu.com/ubuntu/ bionic-updates main restricted +deb-src http://archive.ubuntu.com/ubuntu/ bionic-updates main restricted + +## N.B. software from this repository is ENTIRELY UNSUPPORTED by the Ubuntu +## team. Also, please note that software in universe WILL NOT receive any +## review or updates from the Ubuntu security team. +deb http://archive.ubuntu.com/ubuntu/ bionic universe +deb-src http://archive.ubuntu.com/ubuntu/ bionic universe +deb http://archive.ubuntu.com/ubuntu/ bionic-updates universe +deb-src http://archive.ubuntu.com/ubuntu/ bionic-updates universe + +## N.B. software from this repository is ENTIRELY UNSUPPORTED by the Ubuntu +## team, and may not be under a free licence. Please satisfy yourself as to +## your rights to use the software. Also, please note that software in +## multiverse WILL NOT receive any review or updates from the Ubuntu +## security team. +deb http://archive.ubuntu.com/ubuntu/ bionic multiverse +deb-src http://archive.ubuntu.com/ubuntu/ bionic multiverse +deb http://archive.ubuntu.com/ubuntu/ bionic-updates multiverse +deb-src http://archive.ubuntu.com/ubuntu/ bionic-updates multiverse + +## N.B. software from this repository may not have been tested as +## extensively as that contained in the main release, although it includes +## newer versions of some applications which may provide useful features. +## Also, please note that software in backports WILL NOT receive any review +## or updates from the Ubuntu security team. +deb http://archive.ubuntu.com/ubuntu/ bionic-backports main restricted universe multiverse +deb-src http://archive.ubuntu.com/ubuntu/ bionic-backports main restricted universe multiverse + +## Uncomment the following two lines to add software from Canonical's +## 'partner' repository. +## This software is not part of Ubuntu, but is offered by Canonical and the +## respective vendors as a service to Ubuntu users. +# deb http://archive.canonical.com/ubuntu bionic partner +# deb-src http://archive.canonical.com/ubuntu bionic partner + +deb http://security.ubuntu.com/ubuntu/ bionic-security main restricted +deb-src http://security.ubuntu.com/ubuntu/ bionic-security main restricted +deb http://security.ubuntu.com/ubuntu/ bionic-security universe +deb-src http://security.ubuntu.com/ubuntu/ bionic-security universe +deb http://security.ubuntu.com/ubuntu/ bionic-security multiverse +deb-src http://security.ubuntu.com/ubuntu/ bionic-security multiverse diff --git a/flavors/fancyr-EXASOL-6.1.0/flavor_base/flavor_base_deps/ubuntu_libssl.patch b/flavors/fancyr-EXASOL-6.1.0/flavor_base/flavor_base_deps/ubuntu_libssl.patch new file mode 100644 index 00000000..722715c8 --- /dev/null +++ b/flavors/fancyr-EXASOL-6.1.0/flavor_base/flavor_base_deps/ubuntu_libssl.patch @@ -0,0 +1,11 @@ +--- debian/rules 2019-01-31 14:01:23.367996930 +0100 ++++ debian/rules 2019-01-31 13:54:43.762851216 +0100 +@@ -20,7 +20,7 @@ + --with-zsh-functions-dir=/usr/share/zsh/vendor-completions + + ifeq ($(shell dpkg-vendor --derives-from Ubuntu && echo yes),yes) +- CONFIGURE_ARGS += --without-libssh2 ++ CONFIGURE_ARGS += --with-libssh2 --with-libssh + endif + + %: diff --git a/script-languages b/script-languages index 62099509..4901a819 160000 --- a/script-languages +++ b/script-languages @@ -1 +1 @@ -Subproject commit 62099509d0348e3f0033ff2fa28d18274e881f02 +Subproject commit 4901a819d37b7f1ec40d2a2b784dbcbb6670ef2d