diff options
| -rw-r--r-- | net/chrony/Makefile | 16 | ||||
| -rw-r--r-- | net/chrony/PLIST | 6 | ||||
| -rw-r--r-- | net/chrony/distinfo | 18 | ||||
| -rw-r--r-- | net/chrony/patches/patch-Makefile.in | 42 | ||||
| -rw-r--r-- | net/chrony/patches/patch-conf.c | 15 | ||||
| -rw-r--r-- | net/chrony/patches/patch-doc_Makefile.in | 25 | ||||
| -rw-r--r-- | net/chrony/patches/patch-examples_chrony.conf.example3 | 65 | ||||
| -rw-r--r-- | net/chrony/patches/patch-examples_chrony.keys.example | 14 | ||||
| -rw-r--r-- | net/chrony/patches/patch-ntp__io.c | 24 |
9 files changed, 115 insertions, 110 deletions
diff --git a/net/chrony/Makefile b/net/chrony/Makefile index bd9a9720a9c..6b78d932175 100644 --- a/net/chrony/Makefile +++ b/net/chrony/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.35 2018/07/04 13:40:27 jperkin Exp $ +# $NetBSD: Makefile,v 1.36 2018/10/01 15:53:58 nia Exp $ -DISTNAME= chrony-1.31.1 -PKGREVISION= 4 +DISTNAME= chrony-3.4 CATEGORIES= net MASTER_SITES= http://download.tuxfamily.org/chrony/ @@ -17,12 +16,13 @@ CONFIGURE_ARGS+= --prefix=${PREFIX} CONFIGURE_ARGS+= --mandir=${PREFIX}/${PKGMANDIR} CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} CONFIGURE_ARGS+= --localstatedir=${VARBASE} +CONFIGURE_ARGS+= --with-pidfile=${VARBASE}/run/chronyd.pid AUTO_MKDIRS= yes OWN_DIRS= ${VARBASE}/lib/chrony EGDIR= ${PREFIX}/share/examples/chrony -EGFILES= chrony.conf.example chrony.keys.example +EGFILES= chrony.conf.example3 chrony.keys.example RCD_SCRIPTS= chronyd SUBST_CLASSES+= paths @@ -32,10 +32,10 @@ SUBST_SED.paths+= -e 's,@VARBASE@,${VARBASE},g' SUBST_STAGE.paths= pre-configure post-install: - set -e; for file in ${EGFILES}; do \ - ${INSTALL_DATA} "${WRKSRC}/examples/$${file}" \ - "${DESTDIR}${EGDIR}/$${file}"; \ - done + ${INSTALL_DATA} "${WRKSRC}/examples/chrony.conf.example3" \ + "${DESTDIR}${EGDIR}/chrony.conf.example"; + ${INSTALL_DATA} "${WRKSRC}/examples/chrony.keys.example" \ + "${DESTDIR}${EGDIR}/chrony.keys.example"; .include "../../mk/readline.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/net/chrony/PLIST b/net/chrony/PLIST index da9e58d9bba..6fe1ee6b4e1 100644 --- a/net/chrony/PLIST +++ b/net/chrony/PLIST @@ -1,12 +1,8 @@ -@comment $NetBSD: PLIST,v 1.6 2014/03/11 14:05:07 jperkin Exp $ +@comment $NetBSD: PLIST,v 1.7 2018/10/01 15:53:58 nia Exp $ bin/chronyc -man/man1/chrony.1 man/man1/chronyc.1 man/man5/chrony.conf.5 man/man8/chronyd.8 sbin/chronyd -share/doc/chrony/COPYING -share/doc/chrony/README -share/doc/chrony/chrony.txt share/examples/chrony/chrony.conf.example share/examples/chrony/chrony.keys.example diff --git a/net/chrony/distinfo b/net/chrony/distinfo index c6af04d8c66..e0967a656d6 100644 --- a/net/chrony/distinfo +++ b/net/chrony/distinfo @@ -1,11 +1,9 @@ -$NetBSD: distinfo,v 1.11 2015/11/04 00:34:55 agc Exp $ +$NetBSD: distinfo,v 1.12 2018/10/01 15:53:58 nia Exp $ -SHA1 (chrony-1.31.1.tar.gz) = 8e92871e164dad89b315a5dda99d94ff7b31770a -RMD160 (chrony-1.31.1.tar.gz) = 7dd53fb95c1ecf30099bb580adeccd1a808c4dff -SHA512 (chrony-1.31.1.tar.gz) = c64b0bfc52f091994774927900a12075afce876a1df66c0fc4ea8ad2b72cee189e044f886594e61b8aafb7d3ecf161a290aeff37bfd7da9d416f21b3213de2a4 -Size (chrony-1.31.1.tar.gz) = 395797 bytes -SHA1 (patch-Makefile.in) = 28abbbf1cfd037f018a92c3827642e749fd8768a -SHA1 (patch-conf.c) = df47df974995f9f947b731a4812fb7633fd874a4 -SHA1 (patch-examples_chrony.conf.example) = ed17d749b1e4ad1c168da7a0393ef35a5e68aac0 -SHA1 (patch-examples_chrony.keys.example) = 5be7672dc40a1a1cb4451db05a4318185ef4f4d2 -SHA1 (patch-ntp__io.c) = edd1b5cf49fc24d3bfed128cd686b17633335a4d +SHA1 (chrony-3.4.tar.gz) = fa41e595e7041a9deda76a69e970a023091474f6 +RMD160 (chrony-3.4.tar.gz) = 6accfb0b4ff50675f1f2a12d2d3560077b82aeab +SHA512 (chrony-3.4.tar.gz) = 4fbb0311c8d363a87edd6f5d1be3d8554da169f260ba23c1ad9e8c567808258c6fd7513ba630d6fa27453ecfd81f0ece0e26d5ee2f98ca47fbc9887181a36918 +Size (chrony-3.4.tar.gz) = 453056 bytes +SHA1 (patch-Makefile.in) = 42ebfcdbce472a173890571625efc4fef583d5b6 +SHA1 (patch-doc_Makefile.in) = 8e9902690ff431fd47429d53346faf2ac8f1b923 +SHA1 (patch-examples_chrony.conf.example3) = 9566820e1db21435580f134cefc0bcb94d619dda diff --git a/net/chrony/patches/patch-Makefile.in b/net/chrony/patches/patch-Makefile.in index cc6d03713e2..77dbad90275 100644 --- a/net/chrony/patches/patch-Makefile.in +++ b/net/chrony/patches/patch-Makefile.in @@ -1,21 +1,16 @@ -$NetBSD: patch-Makefile.in,v 1.1 2015/04/13 10:03:21 hannken Exp $ +$NetBSD: patch-Makefile.in,v 1.2 2018/10/01 15:53:58 nia Exp $ Adapt install target for pkgsrc. ---- Makefile.in.orig 2015-04-07 14:35:16.000000000 +0000 +--- Makefile.in.orig 2018-09-19 14:38:15.000000000 +0000 +++ Makefile.in -@@ -96,35 +96,15 @@ getdate : +@@ -86,16 +86,8 @@ getdate : # seem to vary between systems. - install: chronyd chronyc chrony.txt + install: chronyd chronyc - [ -d $(DESTDIR)$(SYSCONFDIR) ] || mkdir -p $(DESTDIR)$(SYSCONFDIR) - [ -d $(DESTDIR)$(SBINDIR) ] || mkdir -p $(DESTDIR)$(SBINDIR) - [ -d $(DESTDIR)$(BINDIR) ] || mkdir -p $(DESTDIR)$(BINDIR) -- [ -d $(DESTDIR)$(DOCDIR) ] || mkdir -p $(DESTDIR)$(DOCDIR) -- [ -d $(DESTDIR)$(MANDIR)/man1 ] || mkdir -p $(DESTDIR)$(MANDIR)/man1 -- [ -d $(DESTDIR)$(MANDIR)/man5 ] || mkdir -p $(DESTDIR)$(MANDIR)/man5 -- [ -d $(DESTDIR)$(MANDIR)/man8 ] || mkdir -p $(DESTDIR)$(MANDIR)/man8 -- [ -d $(DESTDIR)$(DOCDIR) ] || mkdir -p $(DESTDIR)$(DOCDIR) - [ -d $(DESTDIR)$(CHRONYVARDIR) ] || mkdir -p $(DESTDIR)$(CHRONYVARDIR) - if [ -f $(DESTDIR)$(SBINDIR)/chronyd ]; then rm -f $(DESTDIR)$(SBINDIR)/chronyd ; fi - if [ -f $(DESTDIR)$(BINDIR)/chronyc ]; then rm -f $(DESTDIR)$(BINDIR)/chronyc ; fi @@ -23,29 +18,8 @@ Adapt install target for pkgsrc. - chmod 755 $(DESTDIR)$(SBINDIR)/chronyd - cp chronyc $(DESTDIR)$(BINDIR)/chronyc - chmod 755 $(DESTDIR)$(BINDIR)/chronyc -- cp chrony.txt $(DESTDIR)$(DOCDIR)/chrony.txt -- chmod 644 $(DESTDIR)$(DOCDIR)/chrony.txt -- cp COPYING $(DESTDIR)$(DOCDIR)/COPYING -- chmod 644 $(DESTDIR)$(DOCDIR)/COPYING -- cp README $(DESTDIR)$(DOCDIR)/README -- chmod 644 $(DESTDIR)$(DOCDIR)/README -- cp chrony.1 $(DESTDIR)$(MANDIR)/man1 -- chmod 644 $(DESTDIR)$(MANDIR)/man1/chrony.1 -- cp chronyc.1 $(DESTDIR)$(MANDIR)/man1 -- chmod 644 $(DESTDIR)$(MANDIR)/man1/chronyc.1 -- cp chronyd.8 $(DESTDIR)$(MANDIR)/man8 -- chmod 644 $(DESTDIR)$(MANDIR)/man8/chronyd.8 -- cp chrony.conf.5 $(DESTDIR)$(MANDIR)/man5 -- chmod 644 $(DESTDIR)$(MANDIR)/man5/chrony.conf.5 -+ $(BSD_INSTALL_PROGRAM) chronyd $(DESTDIR)$(SBINDIR) -+ $(BSD_INSTALL_PROGRAM) chronyc $(DESTDIR)$(BINDIR) -+ $(BSD_INSTALL_DATA) chrony.txt $(DESTDIR)$(DOCDIR) -+ $(BSD_INSTALL_DATA) COPYING $(DESTDIR)$(DOCDIR) -+ $(BSD_INSTALL_DATA) README $(DESTDIR)$(DOCDIR) -+ $(BSD_INSTALL_MAN) chrony.1 $(DESTDIR)$(MANDIR)/man1 -+ $(BSD_INSTALL_MAN) chronyc.1 $(DESTDIR)$(MANDIR)/man1 -+ $(BSD_INSTALL_MAN) chronyd.8 $(DESTDIR)$(MANDIR)/man8/chronyd.8 -+ $(BSD_INSTALL_MAN) chrony.conf.5 $(DESTDIR)$(MANDIR)/man5/chrony.conf.5 ++ $(BSD_INSTALL_PROGRAM) chronyd $(DESTDIR)$(SBINDIR)/chronyd ++ $(BSD_INSTALL_PROGRAM) chronyc $(DESTDIR)$(BINDIR)/chronyc + $(MAKE) -C doc install - %.o : %.c - $(CC) $(CFLAGS) $(CPPFLAGS) -c $< + docs : diff --git a/net/chrony/patches/patch-conf.c b/net/chrony/patches/patch-conf.c deleted file mode 100644 index 3f69b4daaf6..00000000000 --- a/net/chrony/patches/patch-conf.c +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-conf.c,v 1.1 2015/04/13 10:03:21 hannken Exp $ - -Prepare for SUBST, not processed by configure. - ---- conf.c.orig 2013-08-08 13:58:07.000000000 +0000 -+++ conf.c -@@ -197,7 +197,7 @@ static IPAddr bind_cmd_address4, bind_cm - - /* Filename to use for storing pid of running chronyd, to prevent multiple - * chronyds being started. */ --static char *pidfile = "/var/run/chronyd.pid"; -+static char *pidfile = "@VARBASE@/run/chronyd.pid"; - - /* Temperature sensor, update interval and compensation coefficients */ - static char *tempcomp_file = NULL; diff --git a/net/chrony/patches/patch-doc_Makefile.in b/net/chrony/patches/patch-doc_Makefile.in new file mode 100644 index 00000000000..6c1cda7feb1 --- /dev/null +++ b/net/chrony/patches/patch-doc_Makefile.in @@ -0,0 +1,25 @@ +$NetBSD: patch-doc_Makefile.in,v 1.1 2018/10/01 15:53:58 nia Exp $ + +Adapt install target for pkgsrc. + +--- doc/Makefile.in.orig 2018-09-19 14:38:15.000000000 +0000 ++++ doc/Makefile.in +@@ -50,15 +50,9 @@ docs: man html + $(HTML_TO_TXT) < $< > $@ + + install: $(MAN_FILES) +- [ -d $(DESTDIR)$(MANDIR)/man1 ] || mkdir -p $(DESTDIR)$(MANDIR)/man1 +- [ -d $(DESTDIR)$(MANDIR)/man5 ] || mkdir -p $(DESTDIR)$(MANDIR)/man5 +- [ -d $(DESTDIR)$(MANDIR)/man8 ] || mkdir -p $(DESTDIR)$(MANDIR)/man8 +- cp chronyc.man $(DESTDIR)$(MANDIR)/man1/chronyc.1 +- chmod 644 $(DESTDIR)$(MANDIR)/man1/chronyc.1 +- cp chronyd.man $(DESTDIR)$(MANDIR)/man8/chronyd.8 +- chmod 644 $(DESTDIR)$(MANDIR)/man8/chronyd.8 +- cp chrony.conf.man $(DESTDIR)$(MANDIR)/man5/chrony.conf.5 +- chmod 644 $(DESTDIR)$(MANDIR)/man5/chrony.conf.5 ++ $(BSD_INSTALL_MAN) chronyc.man $(DESTDIR)$(MANDIR)/man1/chronyc.1 ++ $(BSD_INSTALL_MAN) chronyd.man $(DESTDIR)$(MANDIR)/man8/chronyd.8 ++ $(BSD_INSTALL_MAN) chrony.conf.man $(DESTDIR)$(MANDIR)/man5/chrony.conf.5 + + install-docs: $(HTML_FILES) + [ -d $(DESTDIR)$(DOCDIR) ] || mkdir -p $(DESTDIR)$(DOCDIR) diff --git a/net/chrony/patches/patch-examples_chrony.conf.example3 b/net/chrony/patches/patch-examples_chrony.conf.example3 new file mode 100644 index 00000000000..eaa1e4c4ad3 --- /dev/null +++ b/net/chrony/patches/patch-examples_chrony.conf.example3 @@ -0,0 +1,65 @@ +$NetBSD: patch-examples_chrony.conf.example3,v 1.1 2018/10/01 15:53:58 nia Exp $ + +Prepare for SUBST, not processed by configure. + +--- examples/chrony.conf.example3.orig 2018-09-19 14:38:15.000000000 +0000 ++++ examples/chrony.conf.example3 +@@ -1,7 +1,7 @@ + ####################################################################### + # + # This is an example chrony configuration file. You should copy it to +-# /etc/chrony.conf after uncommenting and editing the options that you ++# @PKG_SYSCONFDIR@/chrony.conf after uncommenting and editing the options that you + # want to enable. The more obscure options are not included. Refer + # to the documentation for these. + # +@@ -65,12 +65,12 @@ + # immediately so that it doesn't gain or lose any more time. You + # generally want this, so it is uncommented. + +-driftfile /var/lib/chrony/drift ++driftfile @VARBASE@/lib/chrony/drift + + # If you want to enable NTP authentication with symmetric keys, you will need + # to uncomment the following line and edit the file to set up the keys. + +-! keyfile /etc/chrony.keys ++! keyfile @PKG_SYSCONFDIR@/chrony.keys + + # chronyd can save the measurement history for the servers to files when + # it it exits. This is useful in 2 situations: +@@ -88,14 +88,14 @@ driftfile /var/lib/chrony/drift + # Enable these two options to use this. + + ! dumponexit +-! dumpdir /var/lib/chrony ++! dumpdir @VARBASE@/lib/chrony + + # chronyd writes its process ID to a file. If you try to start a second + # copy of chronyd, it will detect that the process named in the file is + # still running and bail out. If you want to change the path to the PID + # file, uncomment this line and edit it. The default path is shown. + +-! pidfile /var/run/chrony/chronyd.pid ++! pidfile @VARBASE@/run/chrony/chronyd.pid + + # If the system timezone database is kept up to date and includes the + # right/UTC timezone, chronyd can use it to determine the current +@@ -124,7 +124,7 @@ driftfile /var/lib/chrony/drift + # produce some graphs of your system's timekeeping performance, or you + # need help in debugging a problem. + +-! logdir /var/log/chrony ++! logdir @VARBASE@/log/chrony + ! log measurements statistics tracking + + # If you have real time clock support enabled (see below), you might want +@@ -259,7 +259,7 @@ driftfile /var/lib/chrony/drift + # You need to have 'enhanced RTC support' compiled into your Linux + # kernel. (Note, these options apply only to Linux.) + +-! rtcfile /var/lib/chrony/rtc ++! rtcfile @VARBASE@/lib/chrony/rtc + + # Your RTC can be set to keep Universal Coordinated Time (UTC) or local + # time. (Local time means UTC +/- the effect of your timezone.) If you diff --git a/net/chrony/patches/patch-examples_chrony.keys.example b/net/chrony/patches/patch-examples_chrony.keys.example deleted file mode 100644 index 27ff10aec3c..00000000000 --- a/net/chrony/patches/patch-examples_chrony.keys.example +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-examples_chrony.keys.example,v 1.1 2015/04/13 10:03:21 hannken Exp $ - -Prepare for SUBST, not processed by configure. - ---- examples/chrony.keys.example.orig 2015-04-07 14:35:16.000000000 +0000 -+++ examples/chrony.keys.example -@@ -1,6 +1,6 @@ - ####################################################################### - # --# This is an example chrony keys file. You should copy it to /etc/chrony.keys -+# This is an example chrony keys file. You should copy it to @PKG_SYSCONFDIR@/chrony.keys - # after editing it to set up the key(s) you want to use. It should be readable - # only by root or the user chronyd drops the root privileges to. In most - # situations, you will require a single key (the 'commandkey') so that you can diff --git a/net/chrony/patches/patch-ntp__io.c b/net/chrony/patches/patch-ntp__io.c deleted file mode 100644 index 0f33ef74c43..00000000000 --- a/net/chrony/patches/patch-ntp__io.c +++ /dev/null @@ -1,24 +0,0 @@ -$NetBSD: patch-ntp__io.c,v 1.2 2015/04/13 10:03:21 hannken Exp $ - -Don't use IP_PKTINFO on NetBSD. - ---- ntp_io.c.orig 2015-04-07 14:35:16.000000000 +0000 -+++ ntp_io.c -@@ -506,7 +506,7 @@ read_from_socket(void *anything) - local_addr.sock_fd = sock_fd; - - for (cmsg = CMSG_FIRSTHDR(&msg); cmsg; cmsg = CMSG_NXTHDR(&msg, cmsg)) { --#ifdef IP_PKTINFO -+#if defined(IP_PKTINFO) && !defined(__NetBSD__) - if (cmsg->cmsg_level == IPPROTO_IP && cmsg->cmsg_type == IP_PKTINFO) { - struct in_pktinfo ipi; - -@@ -623,7 +623,7 @@ send_packet(void *packet, int packetlen, - msg.msg_flags = 0; - cmsglen = 0; - --#ifdef IP_PKTINFO -+#if defined(IP_PKTINFO) && !defined(__NetBSD__) - if (local_addr->ip_addr.family == IPADDR_INET4) { - struct cmsghdr *cmsg; - struct in_pktinfo *ipi; |