This is a straightforward update of the ntp port to the current stable release (4.2.4p5, which gives the OpenBSD package the oddlooking version number of 4.2.4p5p0). Most of the patches that were in the port have been integrated into the upstream version, so several files in patches/ are gone. I've attached both a diff and a tarred-up copy of the directory (including CVS dirs) which might be an easier way to examine the changes.
I think it would be reasonable not to package the sntpd program, on the theory that anyone who doesn't have a reason to run the full ntpd will also not have any reason not to use OpenNTPD. However, I've left sntpd in the PLIST for now. Tested on x86_32 (athlon). -- Wim Lewis <w...@hhhh.org>, Seattle, WA, USA. PGP keyID 27F772C1
cvs server: Diffing .
Index: Makefile
===================================================================
RCS file: /cvs/ports/net/ntp/Makefile,v
retrieving revision 1.36
diff -u -b -d -r1.36 Makefile
--- Makefile 1 Jul 2008 16:41:19 -0000 1.36
+++ Makefile 16 Jan 2009 00:38:39 -0000
@@ -3,14 +3,15 @@
COMMENT-main= network time protocol implementation
COMMENT-doc= network time protocol documentation
-NTP_VERSION= 4.2.0a
-DISTNAME= ntp-stable-${NTP_VERSION}-20050303
-PKGNAME-main= ntp-${NTP_VERSION}p5
-PKGNAME-doc= ntp-doc-${NTP_VERSION}p2
+NTP_VERSION= 4.2.4p5
+DISTNAME= ntp-${NTP_VERSION}
+PKGNAME-main= ntp-${NTP_VERSION}p0
+PKGNAME-doc= ntp-doc-${NTP_VERSION}p0
CATEGORIES= net
-MASTER_SITES=
http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/snapshots/ntp-stable/2005/03/ \
- ftp://ftp.udel.edu/pub/ntp/ntp4/snapshots/ntp-stable/2005/03/ \
-
ftp://ftp.cs.umn.edu/ftp00/ftp.udel.edu/pub/ntp/ntp4/snapshots/ntp-stable/2005/03/
+MASTER_SITES= ftp://ftp.udel.edu/pub/ntp/ntp4/ \
+ http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ \
+ ftp://archive.ntp.org/ntp4/ \
+ http://archive.ntp.org/ntp4/
HOMEPAGE= http://www.ntp.org/
@@ -27,15 +28,16 @@
WANTLIB-main= c crypto curses kvm m readline
SEPARATE_BUILD= concurrent
-AUTOCONF_VERSION= 2.58
+AUTOCONF_VERSION= 2.59
CONFIGURE_STYLE= autoconf
-CONFIGURE_ENV= CFLAGS="${CFLAGS} -DHAVE_IPV6"
CONFIGURE_ARGS+= --bindir='${PREFIX}/sbin' \
+ --with-binsubdir=sbin \
--enable-accurate-adjtime --disable-IRIG \
--enable-parse-clocks \
--with-openssl-libdir=/usr/lib \
--with-openssl-incdir=/usr/include \
- --with-crypto=openssl
+ --with-crypto=openssl \
+ --enable-ipv6
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/ntp
Index: distinfo
===================================================================
RCS file: /cvs/ports/net/ntp/distinfo,v
retrieving revision 1.7
diff -u -b -d -r1.7 distinfo
--- distinfo 5 Apr 2007 16:20:12 -0000 1.7
+++ distinfo 16 Jan 2009 00:38:39 -0000
@@ -1,5 +1,4 @@
-MD5 (ntp-stable-4.2.0a-20050303.tar.gz) = ILjQYWtje4WEFH2zmnVDJg==
-RMD160 (ntp-stable-4.2.0a-20050303.tar.gz) = 2MU0DFCmqcgqgld9TCgE0D9/6D0=
-SHA1 (ntp-stable-4.2.0a-20050303.tar.gz) = ejpIn6IwCkB0oRvGm+i9ati2l5o=
-SHA256 (ntp-stable-4.2.0a-20050303.tar.gz) =
VQAchelgerGG67KXoINp51ZxUNWYVYMlX+VgEX0UY5w=
-SIZE (ntp-stable-4.2.0a-20050303.tar.gz) = 2446073
+RMD160 (ntp-4.2.4p5.tar.gz) = 5t6OJksa3FtQnGaFhIMh5FYlkJ0=
+SHA1 (ntp-4.2.4p5.tar.gz) = PF/IfTN6CC/3BYBeGi7kFjRTPLU=
+SHA256 (ntp-4.2.4p5.tar.gz) = dMvqYMxVhsanPYEgiPFaDnfhkcGNR2YQ8/GzUupD3Rg=
+SIZE (ntp-4.2.4p5.tar.gz) = 3461636
cvs server: Diffing files
Index: files/README.OpenBSD
===================================================================
RCS file: /cvs/ports/net/ntp/files/README.OpenBSD,v
retrieving revision 1.2
diff -u -b -d -r1.2 README.OpenBSD
--- files/README.OpenBSD 17 Sep 2007 17:20:44 -0000 1.2
+++ files/README.OpenBSD 16 Jan 2009 00:38:39 -0000
@@ -12,35 +12,35 @@
# Securelevel > 1 does not allow the clock to be set backwards
if [ $securelevel -gt 1 -a X"${xntpdate_flags}" != X"NO" \
- -a -x /usr/local/sbin/ntpdate ]; then
+ -a -x !!PREFIX!!/sbin/ntpdate ]; then
echo -n ' ntpdate'
- /usr/local/sbin/ntpdate -b ${xntpdate_flags} >/dev/null
+ !!PREFIX!!/sbin/ntpdate -b ${xntpdate_flags} >/dev/null
fi
- if [ X"${xntpd}" == X"YES" -a -x /usr/local/sbin/tickadj \
+ if [ X"${xntpd}" == X"YES" -a -x !!PREFIX!!/sbin/tickadj \
-a -e /etc/ntp.conf ]; then
- echo -n ' tickadj'; /usr/local/sbin/tickadj -Aq
+ echo -n ' tickadj'; !!PREFIX!!/sbin/tickadj -Aq
fi
(b) Add the following to /etc/rc.local:
# run ntpdate prior to ntpd
if [ $securelevel -le 1 -a X"${xntpdate_flags}" != X"NO" \
- -a -x /usr/local/sbin/ntpdate ]; then
+ -a -x !!PREFIX!!/sbin/ntpdate ]; then
echo -n ' ntpdate'
- /usr/local/sbin/ntpdate -b ${xntpdate_flags} >/dev/null
+ !!PREFIX!!/sbin/ntpdate -b ${xntpdate_flags} >/dev/null
fi
- if [ X"${xntpd}" == X"YES" -a -x /usr/local/sbin/ntpd \
+ if [ X"${xntpd}" == X"YES" -a -x !!PREFIX!!/sbin/ntpd \
-a -e /etc/ntp.conf ]; then
xntpd_flags="-p /var/run/ntpd.pid"
if [ $securelevel -ge 1 ]; then
xntpd_flags="${xntpd_flags} -x"
fi
- echo -n ' ntpd'; /usr/local/sbin/ntpd ${xntpd_flags}
+ echo -n ' ntpd'; !!PREFIX!!/sbin/ntpd ${xntpd_flags}
fi
- (c) Then, in /etc/rc.conf, set the following variables accordingly.
+ (c) Then, in /etc/rc.conf.local, set the following variables accordingly.
xntpd=YES # change to NO to disable
xntpdate_flags="pool.ntp.org" # set to list of NTP servers
cvs server: Diffing patches
Index: patches/patch-config_h_in
===================================================================
RCS file: /cvs/ports/net/ntp/patches/patch-config_h_in,v
retrieving revision 1.3
diff -u -b -d -r1.3 patch-config_h_in
--- patches/patch-config_h_in 5 Jun 2004 04:54:53 -0000 1.3
+++ patches/patch-config_h_in 16 Jan 2009 00:38:39 -0000
@@ -1,9 +1,9 @@
$OpenBSD: patch-config_h_in,v 1.3 2004/06/05 04:54:53 danh Exp $
---- config.h.in.orig 2003-10-15 05:02:22.000000000 -0400
-+++ config.h.in 2004-06-04 09:10:24.000000000 -0400
-@@ -336,6 +336,9 @@
- /* Define to 1 if you have the `getdtablesize' function. */
- #undef HAVE_GETDTABLESIZE
+--- config.h.in.orig Sun Aug 17 02:17:36 2008
++++ config.h.in Wed Jan 7 23:44:05 2009
+@@ -355,6 +355,9 @@
+ /* Define to 1 if you have the `getifaddrs' function. */
+ #undef HAVE_GETIFADDRS
+/* Define to 1 if you have the `geteuid' function. */
+#undef HAVE_GETEUID
Index: patches/patch-configure_ac
===================================================================
RCS file: patches/patch-configure_ac
diff -N patches/patch-configure_ac
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-configure_ac 16 Jan 2009 00:38:39 -0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- configure.ac.orig Wed Jan 7 23:45:12 2009
++++ configure.ac Wed Jan 7 23:55:55 2009
+@@ -1104,7 +1104,7 @@ esac])
+ case "$host" in
+ *-pc-cygwin*)
+ ;;
+- *) AC_CHECK_FUNCS(getuid)
++ *) AC_CHECK_FUNCS(getuid geteuid)
+ ;;
+ esac
+ AC_CHECK_FUNCS(hstrerror)
cvs server: patches/patch-configure_in was removed, no comparison available
cvs server: patches/patch-include_isc_netaddr_h was removed, no comparison
available
cvs server: patches/patch-include_ntp_stdlib_h was removed, no comparison
available
cvs server: patches/patch-libntp_iosignal_c was removed, no comparison available
cvs server: patches/patch-libntp_ntp_rfc2553_c was removed, no comparison
available
Index: patches/patch-ntpd_ntpd_c
===================================================================
RCS file: /cvs/ports/net/ntp/patches/patch-ntpd_ntpd_c,v
retrieving revision 1.2
diff -u -b -d -r1.2 patch-ntpd_ntpd_c
--- patches/patch-ntpd_ntpd_c 24 Jan 2006 19:58:58 -0000 1.2
+++ patches/patch-ntpd_ntpd_c 16 Jan 2009 00:38:39 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-ntpd_ntpd_c,v 1.2 2006/01/24 19:58:58 sturm Exp $
---- ntpd/ntpd.c.orig Wed Feb 25 06:58:13 2004
-+++ ntpd/ntpd.c Tue Jan 24 20:53:43 2006
-@@ -399,11 +399,16 @@ ntpdmain(
+--- ntpd/ntpd.c.orig Sun Aug 17 01:47:31 2008
++++ ntpd/ntpd.c Wed Jan 7 23:44:08 2009
+@@ -492,11 +492,16 @@ ntpdmain(
}
#endif
@@ -19,12 +19,3 @@
if (uid)
{
msyslog(LOG_ERR, "ntpd: must be run as root, not uid
%ld", (long)uid);
-@@ -881,7 +886,7 @@ getuser:
- } else {
- getgroup:
- if ((gr = getgrnam(group)) != NULL) {
-- sw_gid = pw->pw_gid;
-+ sw_gid = gr->gr_gid;
- } else {
- errno = 0;
- msyslog(LOG_ERR, "Cannot find group
`%s'", group);
cvs server: patches/patch-ntpd_refclock_shm_c was removed, no comparison
available
cvs server: patches/patch-ntpdate_ntpdate_c was removed, no comparison available
cvs server: patches/patch-ntpdc_ntpdc_ops_c was removed, no comparison available
cvs server: Diffing pkg
Index: pkg/PLIST-doc
===================================================================
RCS file: /cvs/ports/net/ntp/pkg/PLIST-doc,v
retrieving revision 1.7
diff -u -b -d -r1.7 PLIST-doc
--- pkg/PLIST-doc 27 Jul 2004 14:39:31 -0000 1.7
+++ pkg/PLIST-doc 16 Jan 2009 00:38:39 -0000
@@ -65,8 +65,6 @@
share/doc/ntp/drivers/driver2.html
share/doc/ntp/drivers/driver20.html
share/doc/ntp/drivers/driver22.html
-share/doc/ntp/drivers/driver23.html
-share/doc/ntp/drivers/driver24.html
share/doc/ntp/drivers/driver26.html
share/doc/ntp/drivers/driver27.html
share/doc/ntp/drivers/driver28.html
@@ -99,7 +97,10 @@
share/doc/ntp/drivers/scripts/
share/doc/ntp/drivers/scripts/footer.txt
share/doc/ntp/drivers/scripts/style.css
+share/doc/ntp/drivers/tf582_4.html
share/doc/ntp/extern.html
+share/doc/ntp/gadget.html
+share/doc/ntp/groups.html
share/doc/ntp/howto.html
share/doc/ntp/icons/
share/doc/ntp/icons/home.gif
@@ -115,10 +116,12 @@
share/doc/ntp/msyslog.html
share/doc/ntp/mx4200data.html
share/doc/ntp/notes.html
+share/doc/ntp/ntp_conf.html
share/doc/ntp/ntpd.html
share/doc/ntp/ntpdate.html
share/doc/ntp/ntpdc.html
share/doc/ntp/ntpdsim.html
+share/doc/ntp/ntpdsim_new.html
share/doc/ntp/ntpq.html
share/doc/ntp/ntptime.html
share/doc/ntp/ntptrace.html
@@ -168,7 +171,7 @@
share/doc/ntp/pic/pogo5.gif
share/doc/ntp/pic/pogo6.gif
share/doc/ntp/pic/pogo8.gif
-share/doc/ntp/pic/pzf509.jpg
+share/doc/ntp/pic/pzf511.jpg
share/doc/ntp/pic/rabbit.gif
share/doc/ntp/pic/radio2.jpg
share/doc/ntp/pic/sheepb.jpg
Index: pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/net/ntp/pkg/PLIST-main,v
retrieving revision 1.1
diff -u -b -d -r1.1 PLIST-main
--- pkg/PLIST-main 24 Nov 2006 21:23:19 -0000 1.1
+++ pkg/PLIST-main 16 Jan 2009 00:38:39 -0000
@@ -1,13 +1,20 @@
@comment $OpenBSD: PLIST-main,v 1.1 2006/11/24 21:23:19 steven Exp $
@pkgpath net/ntp
-sbin/ntp-keygen
+...@man man/man1/ntp-keygen.1
+...@man man/man1/ntpd.1
+...@man man/man1/ntpdc.1
+...@comment man/man1/ntpdsim.1
+...@man man/man1/ntpq.1
+...@man man/man1/sntp.1
+...@bin sbin/ntp-keygen
sbin/ntp-wait
-sbin/ntpd
-sbin/ntpdate
-sbin/ntpdc
-sbin/ntpq
+...@bin sbin/ntpd
+...@bin sbin/ntpdate
+...@bin sbin/ntpdc
+...@bin sbin/ntpq
sbin/ntptrace
-sbin/tickadj
+...@bin sbin/sntp
+...@bin sbin/tickadj
share/examples/ntp/
share/examples/ntp/README
share/examples/ntp/README.OpenBSD
ntp.tar.gz
Description: Tarball of port files + CVS
