From b889b43350f5884a844f4af4a59a287985d2b58e Mon Sep 17 00:00:00 2001
From: Catena cyber <35799796+catenacyber@users.noreply.github.com>
Date: Tue, 3 Sep 2019 16:52:24 +0200
Subject: [PATCH] Use latest developements for ntp project (#2787)

---
 projects/ntp/Dockerfile | 8 +++++---
 projects/ntp/build.sh   | 3 +--
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/projects/ntp/Dockerfile b/projects/ntp/Dockerfile
index 6b66d899c..d942c8cce 100644
--- a/projects/ntp/Dockerfile
+++ b/projects/ntp/Dockerfile
@@ -17,9 +17,11 @@
 FROM gcr.io/oss-fuzz-base/base-builder
 MAINTAINER security@ntp.org
 RUN apt-get update && apt-get install -y make autoconf automake libtool bison flex rsync lynx
-#TODO use bitkeeper repo from http://bk.ntp.org
-#or wait for update of RUN rsync -a archive.ntp.org::ntp-dev-src ntp-dev-src
-ADD http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-dev/ntp-dev-4.3.99.tar.gz ntp-dev.tar.gz
+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
+RUN ln -s /usr/local/bitkeeper/bk /usr/local/bin/bk
+RUN bk clone http://bk.ntp.org/ntp-dev
 WORKDIR $SRC
 COPY build.sh $SRC/
 COPY patch.diff $SRC/
diff --git a/projects/ntp/build.sh b/projects/ntp/build.sh
index d4a2c03df..f5ffdfbce 100755
--- a/projects/ntp/build.sh
+++ b/projects/ntp/build.sh
@@ -15,8 +15,7 @@
 #
 ################################################################################
 
-tar -xvf ntp-dev.tar.gz
-cd ntp-dev-4.3.99
+cd ntp-dev
 git apply ../patch.diff
 #avoids https://bugs.llvm.org/show_bug.cgi?id=34636
 cp /usr/bin/ld.gold /usr/bin/ld