Received: from mail.netbsd.org (mail.netbsd.org [199.233.217.200]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mail.NetBSD.org", Issuer "mail.NetBSD.org CA" (not verified)) by mollari.NetBSD.org (Postfix) with ESMTPS id 45B361A923A for ; Wed, 7 Oct 2020 09:09:41 +0000 (UTC) Received: by mail.netbsd.org (Postfix, from userid 605) id CDE8784DD2; Wed, 7 Oct 2020 09:09:40 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 5448A84DCF for ; Wed, 7 Oct 2020 09:09:40 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id m9SudpZSerU7 for ; Wed, 7 Oct 2020 09:09:39 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 931ED84DC1 for ; Wed, 7 Oct 2020 09:09:39 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 8C8F5FB28; Wed, 7 Oct 2020 09:09:39 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1602061779192040" MIME-Version: 1.0 Date: Wed, 7 Oct 2020 09:09:39 +0000 From: "Sijmen J. Mulder" Subject: CVS commit: pkgsrc/net/ntp4 To: pkgsrc-changes@NetBSD.org Reply-To: sjmulder@netbsd.org X-Mailer: log_accum Message-Id: <20201007090939.8C8F5FB28@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1602061779192040 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: sjmulder Date: Wed Oct 7 09:09:39 UTC 2020 Modified Files: pkgsrc/net/ntp4: distinfo pkgsrc/net/ntp4/patches: patch-ntpd_refclock__wwvb.c patch-sntp_libopts_autoopts.h Log Message: net/ntp4: Fix Linux build To generate a diff of this commit: cvs rdiff -u -r1.32 -r1.33 pkgsrc/net/ntp4/distinfo cvs rdiff -u -r1.1 -r1.2 pkgsrc/net/ntp4/patches/patch-ntpd_refclock__wwvb.c \ pkgsrc/net/ntp4/patches/patch-sntp_libopts_autoopts.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1602061779192040 Content-Disposition: inline Content-Length: 4230 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/net/ntp4/distinfo diff -u pkgsrc/net/ntp4/distinfo:1.32 pkgsrc/net/ntp4/distinfo:1.33 --- pkgsrc/net/ntp4/distinfo:1.32 Sat Aug 15 02:09:25 2020 +++ pkgsrc/net/ntp4/distinfo Wed Oct 7 09:09:39 2020 @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.32 2020/08/15 02:09:25 tnn Exp $ +$NetBSD: distinfo,v 1.33 2020/10/07 09:09:39 sjmulder Exp $ SHA1 (ntp-4.2.8p15.tar.gz) = e34e5b6f48c3ed1bbcfb03080dec1b8f91e19381 RMD160 (ntp-4.2.8p15.tar.gz) = 4653211d8c258a4a9edf1b2445a77223330176a2 @@ -27,13 +27,13 @@ SHA1 (patch-ntpd_refclock__jupiter.c) = SHA1 (patch-ntpd_refclock__neoclock4x.c) = 66c38ba21572cb8804a39766f3b32d1b65cb0946 SHA1 (patch-ntpd_refclock__oncore.c) = d93efa11cadc37fd9e600f80f2cbf0280be969c6 SHA1 (patch-ntpd_refclock__ulink.c) = 55003f758fd71621db60ffad8a1880588098389e -SHA1 (patch-ntpd_refclock__wwvb.c) = e1a7fc80df6dba9595788a8b8c56729619048ee4 +SHA1 (patch-ntpd_refclock__wwvb.c) = 3a8003bcd94f74a4e1914054d5d30751feb97825 SHA1 (patch-ntpdate_ntpdate.c) = 17e2534ab7a54e5af16059ca8c02c9995d79d83c SHA1 (patch-ntpdc_Makefile.in) = 6afaf915ee8c6b244f94d3733545231e69dfd14d SHA1 (patch-ntpq_ntpq.c) = 0776827a712e2f6636b9d322ae7445d184f3709f SHA1 (patch-sntp_libevent_build-aux_config.guess) = 5f5fff42d04daef5fcbba2bc09b015fb4489ca59 SHA1 (patch-sntp_libevent_build-aux_config.sub) = 178e8b39138e49db7702c4bb84fe92550d14a978 -SHA1 (patch-sntp_libopts_autoopts.h) = d4cbaa31df97e04f3637349a3d5eb1addfa847db +SHA1 (patch-sntp_libopts_autoopts.h) = 9f46171eb6982d1ee57b70286e9436aef763554d SHA1 (patch-sntp_libopts_enum.c) = 7d6624ed84a6ea6f85b4de4c37480041a7603252 SHA1 (patch-sntp_libopts_usage.c) = ec77942c98965c13de625b930db3458d5b81d28b SHA1 (patch-sntp_loc_pkgsrc) = 6e46ffc0cc2afcfdc1d01297cbe04cb80d103575 Index: pkgsrc/net/ntp4/patches/patch-ntpd_refclock__wwvb.c diff -u pkgsrc/net/ntp4/patches/patch-ntpd_refclock__wwvb.c:1.1 pkgsrc/net/ntp4/patches/patch-ntpd_refclock__wwvb.c:1.2 --- pkgsrc/net/ntp4/patches/patch-ntpd_refclock__wwvb.c:1.1 Sun Jun 21 15:10:47 2020 +++ pkgsrc/net/ntp4/patches/patch-ntpd_refclock__wwvb.c Wed Oct 7 09:09:39 2020 @@ -1,16 +1,15 @@ -$NetBSD: patch-ntpd_refclock__wwvb.c,v 1.1 2020/06/21 15:10:47 taca Exp $ +$NetBSD: patch-ntpd_refclock__wwvb.c,v 1.2 2020/10/07 09:09:39 sjmulder Exp $ -* Changes from NetBSD base. +* Changes from NetBSD base w/ Linux fix --- ntpd/refclock_wwvb.c.orig 2014-12-30 00:29:38.000000000 +0000 +++ ntpd/refclock_wwvb.c -@@ -154,7 +154,8 @@ static void wwvb_control (int, const str +@@ -154,7 +154,7 @@ static void wwvb_control (int, const str struct refclockstat *, struct peer *); #define WWVB_CONTROL wwvb_control #else -#define WWVB_CONTROL noentry -+#define WWVB_CONTROL (void)(*) -+noentry ++#define WWVB_CONTROL (void*)noentry #endif /* HAVE_PPSAPI */ /* Index: pkgsrc/net/ntp4/patches/patch-sntp_libopts_autoopts.h diff -u pkgsrc/net/ntp4/patches/patch-sntp_libopts_autoopts.h:1.1 pkgsrc/net/ntp4/patches/patch-sntp_libopts_autoopts.h:1.2 --- pkgsrc/net/ntp4/patches/patch-sntp_libopts_autoopts.h:1.1 Sun Jun 21 15:10:47 2020 +++ pkgsrc/net/ntp4/patches/patch-sntp_libopts_autoopts.h Wed Oct 7 09:09:39 2020 @@ -1,22 +1,29 @@ -$NetBSD: patch-sntp_libopts_autoopts.h,v 1.1 2020/06/21 15:10:47 taca Exp $ +$NetBSD: patch-sntp_libopts_autoopts.h,v 1.2 2020/10/07 09:09:39 sjmulder Exp $ * Changes from NetBSD base. +* Compat for noreturn on old compilers --- sntp/libopts/autoopts.h.orig 2015-04-26 18:43:14.000000000 +0000 +++ sntp/libopts/autoopts.h -@@ -32,7 +32,11 @@ +@@ -32,7 +32,16 @@ #ifndef AUTOGEN_AUTOOPTS_H #define AUTOGEN_AUTOOPTS_H -+#if 0 - #include +-#include ++ ++#if __STDC_VERSION__-0 >= 201112L ++# include ++#elif defined(__GNUC__) ++# define noreturn __attribute__((noreturn)) ++#elif defined(__NetBSD__) ++# define noreturn __dead +#else -+#define noreturn __dead ++# define noreturn +#endif #define AO_NAME_LIMIT 127 #define AO_NAME_SIZE ((size_t)(AO_NAME_LIMIT + 1)) -@@ -452,7 +456,7 @@ typedef enum { AOFLAG_TABLE } ao_flags_t +@@ -452,7 +461,7 @@ typedef enum { AOFLAG_TABLE } ao_flags_t #undef _aof_ static char const zNil[] = ""; --_----------=_1602061779192040--