diff --git a/debian/changelog b/debian/changelog
index 373cf0c..b40fac0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,25 @@
+openntpd (1:6.2p3-4.2) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Ensure that openntpd is running before restarting it from the if-up.d
+ hook. (Closes: #987321)
+
+ -- Baptiste Beauplat <lyknode@debian.org> Sun, 25 Jul 2021 14:37:54 +0200
+
+openntpd (1:6.2p3-4.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Fix ftbfs with GCC-10. (Closes: #957640)
+
+ -- Sudip Mukherjee <sudipm.mukherjee@gmail.com> Mon, 26 Oct 2020 17:10:47 +0000
+
+openntpd (1:6.2p3-4) unstable; urgency=medium
+
+ * Fix FTBFS on autoconf-1.15. Thanks sanvila@! (Closes: #906497).
+ * Ingest experimental changes on dropping pidfiles at Sid.
+
+ -- Ulises Vitulli <dererk@debian.org> Fri, 17 Aug 2018 18:43:06 -0300
+
openntpd (1:6.2p3-3) experimental; urgency=medium
* Drop pidfile implementation on initscript. This is only used on sysv, since
diff --git a/debian/config/openntpd b/debian/config/openntpd
index 203a4d9..8a0060a 100644
--- a/debian/config/openntpd
+++ b/debian/config/openntpd
@@ -7,4 +7,6 @@ then
exit 0
fi
-invoke-rc.d openntpd force-reload || true
+if pidof -q ntpd; then
+ invoke-rc.d openntpd force-reload || true
+fi
diff --git a/debian/gitlab-ci.yml b/debian/gitlab-ci.yml
index 88ec151..b108d8c 100644
--- a/debian/gitlab-ci.yml
+++ b/debian/gitlab-ci.yml
@@ -15,7 +15,6 @@ image: debian:unstable
build package:
stage: build
- image: registry.salsa.debian.org/salsa-ci-team/images/gbp
artifacts:
expire_in: 180 day
name: "$CI_BUILD_NAME"
@@ -23,25 +22,27 @@ build package:
- ${WORKING_DIR}/
script:
- apt-get update
+ - apt-get install eatmydata -y
- eatmydata apt-get build-dep -y .
+ - eatmydata apt-get install git-buildpackage -y
- gbp pull --ignore-branch
- gbp buildpackage --git-ignore-branch --git-export-dir=${WORKING_DIR} -us -uc
run autopkgtest:
stage: test
- image: registry.salsa.debian.org/salsa-ci-team/images/autopkgtest
script:
- - eatmydata autopkgtest -U ${WORKING_DIR}/*.deb -- null
+ - apt-get update && apt-get install autopkgtest eatmydata -y --no-install-recommends
+ - eatmydata autopkgtest ${WORKING_DIR}/*.deb -- null
run lintian:
stage: test
- image: registry.salsa.debian.org/salsa-ci-team/images/lintian
script:
+ - apt-get update && apt-get install lintian -y --no-install-recommends
- lintian -iI ${WORKING_DIR}/*.changes
run reprotest:
stage: test
- image: registry.salsa.debian.org/salsa-ci-team/images/reprotest
+ image: genericpipeline/reprotest-docker
artifacts:
name: "$CI_BUILD_NAME"
expire_in: 180 day
@@ -49,14 +50,16 @@ run reprotest:
- ./reprotest.log
when: always
script:
- - apt-get update
+ - apt-get update && apt-get install eatmydata -y
- eatmydata apt-get build-dep -y .
- export DEB_BUILD_OPTIONS=nocheck
- eatmydata reprotest . -- null &> reprotest.log
+ tags:
+ - privileged
run piuparts:
stage: test
- image: registry.salsa.debian.org/salsa-ci-team/images/piuparts
+ image: genericpipeline/piuparts-docker
services:
- docker:dind
script:
@@ -67,5 +70,7 @@ run piuparts:
- docker export ${CONTAINER_ID} | tar -C ${CHROOT_PATH} -xf -
- mknod -m 666 ${CHROOT_PATH}/dev/urandom c 1 9
- piuparts --hard-link -e ${CHROOT_PATH} ${WORKING_DIR}/*.deb
+ tags:
+ - privileged
# End of include
#################################### Below starts the local customization ###################################
diff --git a/debian/patches/fix_gcc-10.patch b/debian/patches/fix_gcc-10.patch
new file mode 100644
index 0000000..bb90e41
--- /dev/null
+++ b/debian/patches/fix_gcc-10.patch
@@ -0,0 +1,55 @@
+Description: Fix ftbfs with GCC-10
+
+Ported from https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e1b05d95f42a73c2b5a4f6bd78fa2dc25d81b1bc
+Original Author: Paul B. Henson <henson@acm.org>
+
+Author: Sudip Mukherjee <sudipm.mukherjee@gmail.com>
+Bug-Debian: https://bugs.debian.org/957640
+Forwarded: no
+
+---
+
+--- openntpd-6.2p3.orig/include/sys/types.h
++++ openntpd-6.2p3/include/sys/types.h
+@@ -22,6 +22,10 @@
+ # define __bounded__(x, y, z)
+ #endif
+
++#if !defined(HAVE_ATTRIBUTE__PACKED) && !defined(__packed)
++# define __packed __attribute__((__packed__))
++#endif
++
+ /*
+ * Define BSD-style unsigned bits types for systems that do not have them.
+ */
+--- openntpd-6.2p3.orig/src/ntp_dns.c
++++ openntpd-6.2p3/src/ntp_dns.c
+@@ -33,7 +33,7 @@
+ #include "ntpd.h"
+
+ volatile sig_atomic_t quit_dns = 0;
+-struct imsgbuf *ibuf_dns;
++static struct imsgbuf *ibuf_dns;
+
+ void sighdlr_dns(int);
+ int dns_dispatch_imsg(void);
+--- openntpd-6.2p3.orig/src/parse.c
++++ openntpd-6.2p3/src/parse.c
+@@ -101,7 +101,6 @@ int lgetc(int);
+ int lungetc(int);
+ int findeol(void);
+
+-struct ntpd_conf *conf;
+ struct sockaddr_in query_addr4;
+ struct sockaddr_in6 query_addr6;
+
+--- openntpd-6.2p3.orig/src/parse.y
++++ openntpd-6.2p3/src/parse.y
+@@ -57,7 +57,6 @@ int lgetc(int);
+ int lungetc(int);
+ int findeol(void);
+
+-struct ntpd_conf *conf;
+ struct sockaddr_in query_addr4;
+ struct sockaddr_in6 query_addr6;
+
diff --git a/debian/patches/series b/debian/patches/series
index dcefd78..bba567d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@
02-syslog.patch
03-kfreebsd.patch
04-ntpd-manpage.patch
+fix_gcc-10.patch
diff --git a/debian/rules b/debian/rules
index 36b5fb7..87170de 100755
--- a/debian/rules
+++ b/debian/rules
@@ -25,7 +25,7 @@ endif
ifneq "$(wildcard /usr/share/misc/config.guess)" ""
cp -f /usr/share/misc/config.guess config.guess
endif
- autoconf
+ autoreconf
./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
--prefix=/usr --mandir=\$${prefix}/share/man \
--sysconfdir=/etc/openntpd --with-privsep-user=ntpd \
