tech-pkg archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
RE: openntpd
> From: Thomas Klausner
> Sent: Tuesday, January 13, 2015 12:38 AM
>
> For simple updates, just modify your checked out version and open a PR
> including the 'cvs diff'.
Here's what I came up with. Does this look simple enough to go ahead and
just submit as a PR?
Thanks.
Index: DESCR
===================================================================
RCS file: /cvsroot/pkgsrc/net/openntpd/DESCR,v
retrieving revision 1.2
diff -r1.2 DESCR
1,3c1,3
< OpenNTPd is a free implementation of the Network Time Protocol.
< It provides the ability to sync the local clock to remote NTP servers and
< can act as NTP server itself, redistributing the local clock.
---
> OpenNTPD is a FREE, easy to use implementation of the Network Time
Protocol. It
> provides the ability to sync the local clock to remote NTP servers and can
act
> as NTP server itself, redistributing the local clock.
5,8c5,14
< OpenNTPd is primarily developed by Henning Brauer and Alexander Guy as
part
< of the OpenBSD Project. The portable version is made by Darren Tucker.
< The software and is freely useable and re-useable by everyone under a BSD
< license.
---
> OpenNTPD was primarily developed by Henning Brauer as part of the OpenBSD
> Project and gets released as a base component of OpenBSD every six months.
>
> The portable version is maintained by Brent Cook and is mirrored on Github
and
> available as periodic tarball releases. Contributions are welcome to both
the
> OpenNTPD core and the portable build framework.
>
> The software is freely usable and re-usable by everyone under a BSD
license.
> The OpenBSD project sells CDs, T-Shirts and Posters. Sales of these items
help
> to fund development.
Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/net/openntpd/Makefile,v
retrieving revision 1.34
diff -r1.34 Makefile
3,4c3
< DISTNAME= openntpd-3.9p1
< PKGREVISION= 5
---
> DISTNAME= openntpd-5.7p1
6,9c5,10
< MASTER_SITES= ftp://ftp.openbsd.org/pub/OpenBSD/OpenNTPD/ \
< ftp://ftp3.usa.openbsd.org/pub/OpenBSD/OpenNTPD/ \
< ftp://ftp.belnet.be/packages/openbsd/OpenNTPD/ \
< ftp://ftp.jaist.ac.jp/pub/OpenBSD/OpenNTPD/
---
> MASTER_SITES= http://ftp.openbsd.org/pub/OpenBSD/OpenNTPD/ \
> http://ftp5.usa.openbsd.org/pub/OpenBSD/OpenNTPD/ \
> http://ftp.jaist.ac.jp/pub/OpenBSD/OpenNTPD/ \
> http://mirror.ox.ac.uk/pub/OpenBSD/OpenNTPD/ \
> http://openbsd.cs.fau.de/pub/OpenBSD/OpenNTPD/ \
> http://ftp.ch.openbsd.org/pub/OpenBSD/OpenNTPD/
11c12
< MAINTAINER= pkgsrc-users%NetBSD.org@localhost
---
> MAINTAINER= henson%acm.org@localhost
13a15
> LICENSE= isc
18c20,33
< CONFIGURE_ARGS+= sysconfdir=${PKG_SYSCONFDIR:Q}
---
> CONFIGURE_ARGS+= --localstatedir=${VARBASE}
> CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q}
> CONFIGURE_ARGS+= --with-privsep-path=path=${VARBASE}/chroot/ntpd
>
> SUBST_CLASSES+= ntpd_m
> SUBST_STAGE.ntpd_m= pre-build
> SUBST_FILES.ntpd_m= ntpd.8 ntpctl.8
> SUBST_SED.ntpd_m= -e 's,/var/db/,${VARBASE}/db/openntpd/,g'
> SUBST_SED.ntpd_m+= -e 's,/var/run/,${VARBASE}/run/,g'
>
> SUBST_CLASSES+= ntpd_h
> SUBST_STAGE.ntpd_h= pre-build
> SUBST_FILES.ntpd_h= ntpd.h
> SUBST_SED.ntpd_h= -e 's,/db/ntpd.drift,/db/openntpd/ntpd.drift,g'
36a52
> ln ${DESTDIR}${PREFIX}/sbin/ntpd ${DESTDIR}${PREFIX}/sbin/ntpctl
37a54
> ${INSTALL_MAN} ${WRKSRC}/ntpctl.8
${DESTDIR}${PREFIX}/${PKGMANDIR}/man8/ntpctl.8
41d57
< .include "../../security/openssl/buildlink3.mk"
Index: PLIST
===================================================================
RCS file: /cvsroot/pkgsrc/net/openntpd/PLIST,v
retrieving revision 1.4
diff -r1.4 PLIST
1c1
< @comment $NetBSD: PLIST,v 1.4 2014/03/11 14:05:10 jperkin Exp $
---
> @comment $NetBSD$
2a3
> man/man8/ntpctl.8
3a5
> sbin/ntpctl
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/net/openntpd/distinfo,v
retrieving revision 1.7
diff -r1.7 distinfo
3,5c3,7
< SHA1 (openntpd-3.9p1.tar.gz) = 098a435d02886a9e4d34afb15b15fde795eda1e9
< RMD160 (openntpd-3.9p1.tar.gz) = c348004116c78810daa9451f15abcc26788949a8
< Size (openntpd-3.9p1.tar.gz) = 152700 bytes
---
> SHA1 (openntpd-5.7p1.tar.gz) = 879972965cffbe49196b15e7d1ba680d4ca05baf
> RMD160 (openntpd-5.7p1.tar.gz) = 9b0f2924d82c3b35a1b8ee6064f6927a824917f7
> Size (openntpd-5.7p1.tar.gz) = 400113 bytes
> SHA1 (patch-ntpd.8) = 48d4f5b7c613d6538df522cbb92d7cb15641a69a
> SHA1 (patch-ntpd.c) = caf03e2c75d771efc177e792d8fa1d1631921d1c
Index: files/smf/manifest.xml
===================================================================
RCS file: files/smf/manifest.xml
diff -N files/smf/manifest.xml
0a1,40
> <?xml version='1.0'?>
> <!DOCTYPE service_bundle SYSTEM
'/usr/share/lib/xml/dtd/service_bundle.dtd.1'>
> <service_bundle type='manifest' name='@SMF_NAME@'>
> <service name='@SMF_PREFIX@/@SMF_NAME@' type='service' version='1'>
> <create_default_instance enabled="false" />
> <single_instance />
> <dependency name='filesystem' grouping='require_all'
restart_on='error' type='service'>
> <service_fmri value='svc:/system/filesystem/minimal' />
> </dependency>
> <dependency name='network' grouping='require_any' restart_on='error'
type='service'>
> <service_fmri value='svc:/network/service' />
> </dependency>
> <dependency name='name-services' grouping='optional_all'
restart_on='refresh' type='service'>
> <service_fmri value='svc:/milestone/name-services' />
> </dependency>
> <dependency name='system-log' grouping='optional_all'
restart_on='none' type='service'>
> <service_fmri value='svc:/system/system-log' />
> </dependency>
> <dependency name='config-file' grouping='require_all'
restart_on='refresh' type='path'>
> <service_fmri value='file://@PKG_SYSCONFDIR@/ntpd.conf' />
> </dependency>
> <exec_method name='start' type='method' exec='@PREFIX@/sbin/ntpd -f
@PKG_SYSCONFDIR@/ntpd.conf $(%{startup_set} == true && echo -s)'
timeout_seconds='60' />
> <exec_method name='stop' type='method' exec=':kill'
timeout_seconds='60' />
> <property_group name='startd' type='framework'>
> <propval name='ignore_error' type='astring' value='signal' />
> </property_group>
> <property_group name='application' type='application'>
> <propval name='startup_set' type='boolean' value='true' />
> </property_group>
> <template>
> <common_name>
> <loctext xml:lang='C'>OpenNTPD time server</loctext>
> </common_name>
> <documentation>
> <manpage title='ntpd' section='8' />
> <doc_link name='openntpd.org' uri='http://www.openntpd.org/' />
> </documentation>
> </template>
> </service>
> </service_bundle>
Index: patches/patch-ntpd.8
===================================================================
RCS file: patches/patch-ntpd.8
diff -N patches/patch-ntpd.8
0a1,19
> $NetBSD$
>
> Document SIGUSR1 for systems without SIGINFO; accepted upstream.
>
> --- ntpd.8.orig 2015-01-15 02:52:54.256247648 +0000
> +++ ntpd.8
> @@ -126,7 +126,11 @@ When
> .Pq engine
> receives a
> .Dv SIGINFO
> -signal, it writes its peer and sensor status to
> +signal (or a
> +.Dv SIGUSR1
> +signal on systems without
> +.Dv SIGINFO),
> +it writes its peer and sensor status to
> .Xr syslog 3 .
> .Sh FILES
> .Bl -tag -width "/var/db/ntpd.driftXXX" -compact
Index: patches/patch-ntpd.c
===================================================================
RCS file: patches/patch-ntpd.c
diff -N patches/patch-ntpd.c
0a1,15
> $NetBSD$
>
> Generate a warning if initial time setting fails; accepted upstream.
>
> --- ntpd.c.orig 2015-01-15 02:53:35.895984392 +0000
> +++ ntpd.c
> @@ -242,7 +242,7 @@ main(int argc, char *argv[])
> lconf.settime = 0;
> timeout = INFTIM;
> log_init(lconf.debug);
> - log_debug("no reply received in time, skipping
initial "
> + log_warnx("no reply received in time, skipping
initial "
> "time setting");
> if (!lconf.debug) {
> if (daemon(1, 0))
Home |
Main Index |
Thread Index |
Old Index