From f8c2fd7c434163ed43f14b771230930c48c5221c Mon Sep 17 00:00:00 2001 From: bsiegert Date: Tue, 24 Nov 2015 18:25:38 +0000 Subject: Pullup ticket #4861 - requested by taca net/ntp4: build fix Revisions pulled up: - net/ntp4/Makefile 1.89 - net/ntp4/distinfo 1.24 - net/ntp4/patches/patch-aa deleted - net/ntp4/patches/patch-include-ntp__syscall.h 1.1 - net/ntp4/patches/patch-ntpd-ntpd.c 1.1 --- Module Name: pkgsrc Committed By: christos Date: Thu Oct 29 11:23:47 UTC 2015 Added Files: pkgsrc/net/ntp4/patches: patch-include-ntp__syscall.h patch-ntpd-ntpd.c Removed Files: pkgsrc/net/ntp4/patches: patch-aa Log Message: - rename patch-aa to follow not so new anymore convention - apply the "warmup" patch only on linux. should fix the build on netbsd-6 --- Module Name: pkgsrc Committed By: christos Date: Thu Oct 29 11:28:44 UTC 2015 Modified Files: pkgsrc/net/ntp4: Makefile distinfo Log Message: update checksum and bump revision --- net/ntp4/Makefile | 3 ++- net/ntp4/distinfo | 7 +++---- net/ntp4/patches/patch-aa | 19 ------------------- net/ntp4/patches/patch-include-ntp__syscall.h | 19 +++++++++++++++++++ net/ntp4/patches/patch-ntpd-ntpd.c | 17 +++++++++++++++++ 5 files changed, 41 insertions(+), 24 deletions(-) delete mode 100644 net/ntp4/patches/patch-aa create mode 100644 net/ntp4/patches/patch-include-ntp__syscall.h create mode 100644 net/ntp4/patches/patch-ntpd-ntpd.c diff --git a/net/ntp4/Makefile b/net/ntp4/Makefile index 8b560d4fc4b..eb343532f73 100644 --- a/net/ntp4/Makefile +++ b/net/ntp4/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.87.2.1 2015/10/27 19:07:02 bsiegert Exp $ +# $NetBSD: Makefile,v 1.87.2.2 2015/11/24 18:25:38 bsiegert Exp $ # DISTNAME= ntp-4.2.8p4 +PKGREVISION= 1 PKGNAME= ${DISTNAME:S/-dev-/-/} CATEGORIES= net time MASTER_SITES= http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/ diff --git a/net/ntp4/distinfo b/net/ntp4/distinfo index 183725e3856..36fcecbab64 100644 --- a/net/ntp4/distinfo +++ b/net/ntp4/distinfo @@ -1,10 +1,9 @@ -$NetBSD: distinfo,v 1.22.2.1 2015/10/27 19:07:02 bsiegert Exp $ +$NetBSD: distinfo,v 1.22.2.2 2015/11/24 18:25:38 bsiegert Exp $ SHA1 (ntp-4.2.8p4.tar.gz) = a30f61f87b219ab3613def9e27f5c8e91ce38b0a RMD160 (ntp-4.2.8p4.tar.gz) = 94ab0e190f37c55700978a1555473a308e7175e6 SHA512 (ntp-4.2.8p4.tar.gz) = e5ad7b44921e49b5546aa804dc56c320a3a0beb32b0e6fde40c900bf5e3af40b354a0cecc869b4605b59b5ab58219b9940789b50d747e0f5b50b4e73513d9f23 Size (ntp-4.2.8p4.tar.gz) = 7104852 bytes -SHA1 (patch-aa) = b247569339d09a88f2e143e355033ce7635ffe92 -SHA1 (patch-configure) = 21466ffa5d0334957a1a93b2a99087e7edaaa4d5 -SHA1 (patch-sntp_configure) = 38357046af0f0c1aeb8b57bb9c653e330d3feadd +SHA1 (patch-include-ntp__syscall.h) = b247569339d09a88f2e143e355033ce7635ffe92 +SHA1 (patch-ntpd-ntpd.c) = 5a5bf9c8939752e1b3f5d04cea3daabdc34081cf SHA1 (patch-sntp_loc_pkgsrc) = 6e46ffc0cc2afcfdc1d01297cbe04cb80d103575 diff --git a/net/ntp4/patches/patch-aa b/net/ntp4/patches/patch-aa deleted file mode 100644 index bbac1a6ba92..00000000000 --- a/net/ntp4/patches/patch-aa +++ /dev/null @@ -1,19 +0,0 @@ -$NetBSD: patch-aa,v 1.11 2014/01/12 17:01:02 spz Exp $ - ---- include/ntp_syscall.h.orig 2011-03-31 10:03:53.000000000 +0000 -+++ include/ntp_syscall.h -@@ -10,6 +10,14 @@ - # include - #endif - -+#if defined(ADJ_NANO) && !defined(MOD_NANO) -+#define MOD_NANO ADJ_NANO -+#endif -+ -+#if defined(ADJ_TAI) && !defined(MOD_TAI) -+#define MOD_TAI ADJ_TAI -+#endif -+ - #ifndef NTP_SYSCALLS_LIBC - # ifdef NTP_SYSCALLS_STD - # define ntp_adjtime(t) syscall(SYS_ntp_adjtime, (t)) diff --git a/net/ntp4/patches/patch-include-ntp__syscall.h b/net/ntp4/patches/patch-include-ntp__syscall.h new file mode 100644 index 00000000000..2447df1a274 --- /dev/null +++ b/net/ntp4/patches/patch-include-ntp__syscall.h @@ -0,0 +1,19 @@ +$NetBSD: patch-include-ntp__syscall.h,v 1.1.2.2 2015/11/24 18:25:38 bsiegert Exp $ + +--- include/ntp_syscall.h.orig 2011-03-31 10:03:53.000000000 +0000 ++++ include/ntp_syscall.h +@@ -10,6 +10,14 @@ + # include + #endif + ++#if defined(ADJ_NANO) && !defined(MOD_NANO) ++#define MOD_NANO ADJ_NANO ++#endif ++ ++#if defined(ADJ_TAI) && !defined(MOD_TAI) ++#define MOD_TAI ADJ_TAI ++#endif ++ + #ifndef NTP_SYSCALLS_LIBC + # ifdef NTP_SYSCALLS_STD + # define ntp_adjtime(t) syscall(SYS_ntp_adjtime, (t)) diff --git a/net/ntp4/patches/patch-ntpd-ntpd.c b/net/ntp4/patches/patch-ntpd-ntpd.c new file mode 100644 index 00000000000..4700b441486 --- /dev/null +++ b/net/ntp4/patches/patch-ntpd-ntpd.c @@ -0,0 +1,17 @@ +$NetBSD: patch-ntpd-ntpd.c,v 1.1.2.2 2015/11/24 18:25:38 bsiegert Exp $ + +Apply the stupid glibc "warmup" only on linux + +--- ntpd/ntpd.c.orig 2015-10-21 12:14:24.000000000 -0400 ++++ ntpd/ntpd.c 2015-10-29 07:20:41.000000000 -0400 +@@ -32,7 +32,9 @@ + # ifdef HAVE_PTHREAD_H + # include + # endif +-# define NEED_PTHREAD_WARMUP ++# ifdef __linux__ ++# define NEED_PTHREAD_WARMUP ++# endif + #endif + + #ifdef HAVE_UNISTD_H -- cgit v1.2.3