From ce2e00ca8b78019e08b4f37b0463d14f1908a0cc Mon Sep 17 00:00:00 2001 From: "Alan T. DeKok" Date: Mon, 18 Nov 2024 07:15:55 -0500 Subject: [PATCH 1/7] use OpenSSL 3.2.3 --- projects/freeradius/Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/projects/freeradius/Dockerfile b/projects/freeradius/Dockerfile index efdf0a48e851..28bce8476169 100644 --- a/projects/freeradius/Dockerfile +++ b/projects/freeradius/Dockerfile @@ -21,9 +21,9 @@ RUN apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys BE18FC5A41 RUN apt-get update RUN apt-get install -y libtalloc-dev libkqueue-dev libunwind-dev -# OpenSSL 1.1 -ARG OPENSSL_VERSION=1.1.1g -ARG OPENSSL_HASH=ddb04774f1e32f0c49751e21b67216ac87852ceb056b75209af2443400636d46 +# OpenSSL 3.2 +ARG OPENSSL_VERSION=3.2.3 +ARG OPENSSL_HASH=52b5f1c6b8022bc5868c308c54fb77705e702d6c6f4594f99a0df216acf46239 RUN set -ex \ && curl -s -O https://www.openssl.org/source/openssl-${OPENSSL_VERSION}.tar.gz \ && echo "${OPENSSL_HASH} openssl-${OPENSSL_VERSION}.tar.gz" | sha256sum -c \ From 3a42192817e9a01b8f73fa8178b88a364c14d5f3 Mon Sep 17 00:00:00 2001 From: "Alan T. DeKok" Date: Mon, 18 Nov 2024 07:49:28 -0500 Subject: [PATCH 2/7] run apt-get update before install --- projects/freeradius/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/freeradius/Dockerfile b/projects/freeradius/Dockerfile index 28bce8476169..e3e9867d6869 100644 --- a/projects/freeradius/Dockerfile +++ b/projects/freeradius/Dockerfile @@ -16,9 +16,9 @@ FROM gcr.io/oss-fuzz-base/base-builder RUN echo "deb http://packages.networkradius.com/extras/ubuntu/focal focal main" > /etc/apt/sources.list.d/networkradius-extras.list +RUN apt-get update RUN apt-get install -y gnupg RUN apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys BE18FC5A41382202 -RUN apt-get update RUN apt-get install -y libtalloc-dev libkqueue-dev libunwind-dev # OpenSSL 3.2 From cb4e34ff468b8fa37f7d70e308dd15c065409d08 Mon Sep 17 00:00:00 2001 From: "Alan T. DeKok" Date: Mon, 18 Nov 2024 07:52:23 -0500 Subject: [PATCH 3/7] update location of OpenSSL --- projects/freeradius/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/freeradius/Dockerfile b/projects/freeradius/Dockerfile index e3e9867d6869..7ddcc1b11a77 100644 --- a/projects/freeradius/Dockerfile +++ b/projects/freeradius/Dockerfile @@ -25,7 +25,7 @@ RUN apt-get install -y libtalloc-dev libkqueue-dev libunwind-dev ARG OPENSSL_VERSION=3.2.3 ARG OPENSSL_HASH=52b5f1c6b8022bc5868c308c54fb77705e702d6c6f4594f99a0df216acf46239 RUN set -ex \ - && curl -s -O https://www.openssl.org/source/openssl-${OPENSSL_VERSION}.tar.gz \ + && curl -s -O https://github.com/openssl/openssl/releases/download/openssl-3.2.3/openssl-3.2.3.tar.gz \ && echo "${OPENSSL_HASH} openssl-${OPENSSL_VERSION}.tar.gz" | sha256sum -c \ && tar -xzf openssl-${OPENSSL_VERSION}.tar.gz \ && cd openssl-${OPENSSL_VERSION} \ From d114c8586d34ae6429dab392e7cc2a77bdbde270 Mon Sep 17 00:00:00 2001 From: Arran Cudbard-Bell Date: Mon, 18 Nov 2024 08:36:22 -0600 Subject: [PATCH 4/7] Variabalise download URL --- projects/freeradius/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/freeradius/Dockerfile b/projects/freeradius/Dockerfile index 7ddcc1b11a77..64467cecc706 100644 --- a/projects/freeradius/Dockerfile +++ b/projects/freeradius/Dockerfile @@ -25,7 +25,7 @@ RUN apt-get install -y libtalloc-dev libkqueue-dev libunwind-dev ARG OPENSSL_VERSION=3.2.3 ARG OPENSSL_HASH=52b5f1c6b8022bc5868c308c54fb77705e702d6c6f4594f99a0df216acf46239 RUN set -ex \ - && curl -s -O https://github.com/openssl/openssl/releases/download/openssl-3.2.3/openssl-3.2.3.tar.gz \ + && curl -s -O https://github.com/openssl/openssl/releases/download/openssl-${OPENSSL_VERSION}/openssl-${OPENSSL_VERSION}.tar.gz \ && echo "${OPENSSL_HASH} openssl-${OPENSSL_VERSION}.tar.gz" | sha256sum -c \ && tar -xzf openssl-${OPENSSL_VERSION}.tar.gz \ && cd openssl-${OPENSSL_VERSION} \ From 07da19c2e716b4eb8aaadcd8c16fc4c017d453ff Mon Sep 17 00:00:00 2001 From: Arran Cudbard-Bell Date: Mon, 18 Nov 2024 11:05:59 -0600 Subject: [PATCH 5/7] Run update twice, once before adding our package definitions and once after --- projects/freeradius/Dockerfile | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/projects/freeradius/Dockerfile b/projects/freeradius/Dockerfile index 64467cecc706..7a23b5937356 100644 --- a/projects/freeradius/Dockerfile +++ b/projects/freeradius/Dockerfile @@ -15,10 +15,15 @@ ################################################################################ FROM gcr.io/oss-fuzz-base/base-builder -RUN echo "deb http://packages.networkradius.com/extras/ubuntu/focal focal main" > /etc/apt/sources.list.d/networkradius-extras.list + +# Run update a first time to get latest package definitions RUN apt-get update +RUN echo "deb http://packages.networkradius.com/extras/ubuntu/focal focal main" > /etc/apt/sources.list.d/networkradius-extras.list RUN apt-get install -y gnupg RUN apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys BE18FC5A41382202 + +# Run update again to update the NR respository +RUN apt-get update RUN apt-get install -y libtalloc-dev libkqueue-dev libunwind-dev # OpenSSL 3.2 From a6d252cb12c4e5477ce32456d71d36cdb1d85107 Mon Sep 17 00:00:00 2001 From: Arran Cudbard-Bell Date: Mon, 18 Nov 2024 11:29:30 -0600 Subject: [PATCH 6/7] Combine update and install steps --- projects/freeradius/Dockerfile | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/projects/freeradius/Dockerfile b/projects/freeradius/Dockerfile index 7a23b5937356..da7df4ad6b6b 100644 --- a/projects/freeradius/Dockerfile +++ b/projects/freeradius/Dockerfile @@ -17,14 +17,12 @@ FROM gcr.io/oss-fuzz-base/base-builder # Run update a first time to get latest package definitions -RUN apt-get update -RUN echo "deb http://packages.networkradius.com/extras/ubuntu/focal focal main" > /etc/apt/sources.list.d/networkradius-extras.list -RUN apt-get install -y gnupg +RUN apt-get update && apt-get install -y gnupg RUN apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys BE18FC5A41382202 +RUN echo "deb http://packages.networkradius.com/extras/ubuntu/focal focal main" > /etc/apt/sources.list.d/networkradius-extras.list # Run update again to update the NR respository -RUN apt-get update -RUN apt-get install -y libtalloc-dev libkqueue-dev libunwind-dev +RUN apt-get update && pt-get install -y libtalloc-dev libkqueue-dev libunwind-dev # OpenSSL 3.2 ARG OPENSSL_VERSION=3.2.3 From ab5b69ae2bcb547d708dbe6bd833ad2a282a4838 Mon Sep 17 00:00:00 2001 From: Arran Cudbard-Bell Date: Mon, 18 Nov 2024 11:38:10 -0600 Subject: [PATCH 7/7] Typo --- projects/freeradius/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/freeradius/Dockerfile b/projects/freeradius/Dockerfile index da7df4ad6b6b..b98b0a86de05 100644 --- a/projects/freeradius/Dockerfile +++ b/projects/freeradius/Dockerfile @@ -22,7 +22,7 @@ RUN apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys BE18FC5A41 RUN echo "deb http://packages.networkradius.com/extras/ubuntu/focal focal main" > /etc/apt/sources.list.d/networkradius-extras.list # Run update again to update the NR respository -RUN apt-get update && pt-get install -y libtalloc-dev libkqueue-dev libunwind-dev +RUN apt-get update && apt-get install -y libtalloc-dev libkqueue-dev libunwind-dev # OpenSSL 3.2 ARG OPENSSL_VERSION=3.2.3