Control: tags 957640 + patch Control: tags 957640 + pending -- Dear maintainer,
I've prepared an NMU for openntpd (versioned as 1:6.2p3-4.1) and uploaded it to DELAYED/2. Please feel free to tell me if I should cancel it. -- Regards Sudip diff -Nru openntpd-6.2p3/debian/changelog openntpd-6.2p3/debian/changelog --- openntpd-6.2p3/debian/changelog 2018-08-17 22:43:06.000000000 +0100 +++ openntpd-6.2p3/debian/changelog 2020-10-26 17:10:47.000000000 +0000 @@ -1,3 +1,10 @@ +openntpd (1:6.2p3-4.1) unstable; urgency=medium + + * Non-maintainer upload. + * Fix ftbfs with GCC-10. (Closes: #957640) + + -- Sudip Mukherjee <sudipm.mukher...@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). diff -Nru openntpd-6.2p3/debian/patches/fix_gcc-10.patch openntpd-6.2p3/debian/patches/fix_gcc-10.patch --- openntpd-6.2p3/debian/patches/fix_gcc-10.patch 1970-01-01 01:00:00.000000000 +0100 +++ openntpd-6.2p3/debian/patches/fix_gcc-10.patch 2020-10-26 16:23:34.000000000 +0000 @@ -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 <hen...@acm.org> + +Author: Sudip Mukherjee <sudipm.mukher...@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 -Nru openntpd-6.2p3/debian/patches/series openntpd-6.2p3/debian/patches/series --- openntpd-6.2p3/debian/patches/series 2017-06-12 15:46:01.000000000 +0100 +++ openntpd-6.2p3/debian/patches/series 2020-10-26 16:16:59.000000000 +0000 @@ -2,3 +2,4 @@ 02-syslog.patch 03-kfreebsd.patch 04-ntpd-manpage.patch +fix_gcc-10.patch
