From 3cf0b665c8ad8b0febf5410b850b5511645ea027 Mon Sep 17 00:00:00 2001 From: Dave Hart Date: Sat, 24 Feb 2024 04:18:39 +0000 Subject: [PATCH] Work around problem with ntp-dev libevent tearoff Adds libevent to Dockerfile prerequisites to build against the current libevent package rather than the copy bundled with the NTP distribution. Also removes stray newline at end of patch.diff introduced in first attempt --- projects/ntp/Dockerfile | 2 +- projects/ntp/patch.diff | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/ntp/Dockerfile b/projects/ntp/Dockerfile index 40de20c398d7..f34e6cf1b5c8 100644 --- a/projects/ntp/Dockerfile +++ b/projects/ntp/Dockerfile @@ -15,7 +15,7 @@ ################################################################################ FROM gcr.io/oss-fuzz-base/base-builder -RUN apt-get update && apt-get install -y make autoconf automake libtool bison flex rsync lynx +RUN apt-get update && apt-get install -y make autoconf automake libevent libtool bison flex rsync lynx ADD https://www.bitkeeper.org/downloads/7.3.3/bk-7.3.3-x86_64-glibc213-linux.bin bk-7.3.3-x86_64-glibc213-linux.bin RUN chmod +x bk-7.3.3-x86_64-glibc213-linux.bin RUN ./bk-7.3.3-x86_64-glibc213-linux.bin /usr/local/bitkeeper diff --git a/projects/ntp/patch.diff b/projects/ntp/patch.diff index cb4e5df9a720..77b93398d952 100644 --- a/projects/ntp/patch.diff +++ b/projects/ntp/patch.diff @@ -249,4 +249,4 @@ index 0000000..74be306 + fclose(fp); + return 0; +} -+ ++ \ No newline at end of file