Upgrade to ntp 4.2.8p15 for Bullseye

Signed-off-by: Saikrishna Arcot <[email protected]>

build_debian.sh

@@ -350,7 +350,8 @@ sudo LANG=C chroot $FILESYSTEM_ROOT bash -c "find /usr/share/i18n/locales/ ! -na
 sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y install \
     picocom \
     systemd \
-    systemd-sysv
+    systemd-sysv \
+    ntp
 
 if [[ $CONFIGURED_ARCH == amd64 ]]; then
     sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y download \

rules/ntp.mk

@@ -1,9 +1,9 @@
 # ntp package
 
-NTP_VERSION = 4.2.8p12+dfsg
+NTP_VERSION = 4.2.8p15+dfsg
 export NTP_VERSION
 
-NTP = ntp_$(NTP_VERSION)-4+deb10u2_$(CONFIGURED_ARCH).deb
+NTP = ntp_$(NTP_VERSION)-1+deb10u2_$(CONFIGURED_ARCH).deb
 $(NTP)_SRC_PATH = $(SRC_PATH)/ntp
 SONIC_MAKE_DEBS += $(NTP)
 SONIC_STRETCH_DEBS += $(NTP)

src/ntp/Makefile

@@ -10,15 +10,15 @@ $(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% :
 
 	# Get ntp release, debian files
 	wget http://deb.debian.org/debian/pool/main/n/ntp/ntp_$(NTP_VERSION).orig.tar.xz
-	wget http://deb.debian.org/debian/pool/main/n/ntp/ntp_$(NTP_VERSION)-4.debian.tar.xz
+	wget http://deb.debian.org/debian/pool/main/n/ntp/ntp_$(NTP_VERSION)-1.debian.tar.xz
 
 	# UnTar ntp release
 	xzcat ntp_$(NTP_VERSION).orig.tar.xz | tar -xvf -
 
-	pushd ./ntp-4.2.8p12
+	pushd ./ntp-4.2.8p15
 
 	# UnTar debian files
-	xzcat ../ntp_$(NTP_VERSION)-4.debian.tar.xz | tar -xvf -
+	xzcat ../ntp_$(NTP_VERSION)-1.debian.tar.xz | tar -xvf -
 
 	# Add the additional patch
 	cp ../patch/bug1970-UNLINK_EXPR_SLIST_empty_list.patch debian/patches/

src/ntp/patch/changelog

@@ -1,10 +1,10 @@
-ntp (1:4.2.8p12+dfsg-4+deb10u2) stretch; urgency=medium
+ntp (1:4.2.8p15+dfsg-1+deb10u2) bullseye; urgency=medium
 
   * Adjust the ENOBUFS syslog level on the Netlink routing to LOG_WARNING.
 
  -- Arun Barboza <[email protected]>  Mon, 09 Sep 2019 10:15:35 -0700
 
-ntp (1:4.2.8p12+dfsg-4+deb10u1) stretch; urgency=medium
+ntp (1:4.2.8p15+dfsg-1+deb10u1) bullseye; urgency=medium
 
   * Apply Bug1970 fix for UNLINK_EXPR_SLIST_empty_list from dev branch.