resolve conflict from last import and remove files that are no longer

needed.
This commit is contained in:
danh 2003-02-23 21:32:41 +00:00
parent 521e3fea2b
commit 930cb22e5b
12 changed files with 4 additions and 447 deletions

View File

@ -1,46 +1,6 @@
# $OpenBSD: Makefile,v 1.24 2002/11/19 16:49:03 danh Exp $
# $OpenBSD: Makefile,v 1.25 2003/02/23 21:32:41 danh Exp $
COMMENT= "network time protocol implementation"
COMMENT-doc= "network time protocol documentation"
SUBDIR+= stable
SUBDIR+= devel
VERSION= 4.1.72
DISTNAME= ntp-${VERSION}
PKGNAME= ntp-${VERSION}p2
PKGNAME-doc= ntp-doc-${VERSION}
CATEGORIES= net
MASTER_SITES= ftp://ftp.udel.edu/pub/ntp/ntp4/ \
http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ \
ftp://ftp.cs.umn.edu/mirrors00/ftp.udel.edu/pub/ntp/ntp4/
HOMEPAGE= http://www.ntp.org/
MAINTAINER= Dan Harnett <danh@openbsd.org>
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
MULTI_PACKAGES= -doc
SUBPACKAGE?=
SEPARATE_BUILD= concurrent
AUTOCONF_NEW= Yes
CONFIGURE_STYLE= autoconf
CONFIGURE_ARGS+= --bindir='${PREFIX}/sbin' \
--enable-accurate-adjtime --disable-IRIG \
--with-openssl-libdir=/usr/lib \
--with-openssl-incdir=/usr/include \
--with-crypto=openssl
post-patch:
@touch ${WRKSRC}/aclocal.m4
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/ntp
@cd ${WRKSRC}/html && pax -rw * ${PREFIX}/share/doc/ntp
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/ntp
@cd ${WRKSRC}/conf && pax -rw * ${PREFIX}/share/examples/ntp
@mv ${PREFIX}/sbin/genkeys ${PREFIX}/sbin/ntp-genkeys
.include <bsd.port.mk>
.include <bsd.port.subdir.mk>

View File

@ -1,3 +0,0 @@
MD5 (ntp-4.1.72.tar.gz) = de9ed6a28f4c4ffea932a49db5b745fa
RMD160 (ntp-4.1.72.tar.gz) = 4b3d4e1a11b160845e7b3af3ea1769a59b11e9ab
SHA1 (ntp-4.1.72.tar.gz) = 23609b3f848b53ac84f33ec9005f6735c92c1e3b

View File

@ -1,23 +0,0 @@
$OpenBSD: patch-config_h_in,v 1.1 2002/05/11 20:58:14 danh Exp $
--- config.h.in.orig Mon May 6 15:14:16 2002
+++ config.h.in Mon May 6 15:14:50 2002
@@ -512,6 +512,9 @@
/* Define if you have the `finite' function. */
#undef HAVE_FINITE
+/* Define if you have the `freeifaddrs' function. */
+#undef HAVE_FREEIFADDRS
+
/* Define if you have the `getbootfile' function. */
#undef HAVE_GETBOOTFILE
@@ -520,6 +523,9 @@
/* Define if you have the `getdtablesize' function. */
#undef HAVE_GETDTABLESIZE
+
+/* Define if you have the `getifaddrs' function. */
+#undef HAVE_GETIFADDRS
/* Define if you have the `getrusage' function. */
#undef HAVE_GETRUSAGE

View File

@ -1,21 +0,0 @@
$OpenBSD: patch-configure_in,v 1.2 2002/05/17 15:58:10 danh Exp $
--- configure.in.orig Tue Dec 18 21:00:59 2001
+++ configure.in Mon May 6 15:07:08 2002
@@ -190,10 +190,16 @@ AC_CHECK_LIB(kvm, main) dnl We already
AC_CHECK_LIB(ld, nlist)
AC_CHECK_LIB(mld, nlist)
AC_CHECK_FUNC(gethostent, , AC_CHECK_LIB(nsl, gethostent, , , -lsocket))
+AC_CHECK_FUNCS(getifaddrs freeifaddrs)
AC_CHECK_FUNC(openlog, ,
AC_CHECK_LIB(gen, openlog, ,
AC_CHECK_LIB(syslog, openlog, , , -lsocket)))
-AC_CHECK_LIB(readline, readline)
+AC_CHECK_LIB(readline, readline, [cat >>confdefs.h <<EOF
+#define HAVE_LIBREADLINE 1
+EOF
+
+ LIBS="-lreadline -ltermcap $LIBS"
+], , -ltermcap)
dnl Digital UNIX V4.0 and Solaris 7 have POSIX.1c functions in -lrt
dnl Solaris 2.6 only has -lposix4; in Solaris 7, this is a symlink to -lrt,

View File

@ -1,12 +0,0 @@
$OpenBSD: patch-ntpd_ntp_config_c,v 1.1 2002/11/19 16:49:03 danh Exp $
--- ntpd/ntp_config.c.orig Mon Nov 19 22:08:41 2001
+++ ntpd/ntp_config.c Tue Nov 19 11:32:24 2002
@@ -1796,7 +1796,7 @@ gettokens_netinfo (
for (index = 0; index < namelist.ni_namelist_len; index++) {
char *value = namelist.ni_namelist_val[index];
- if (! (val_list[index] = (char*)malloc(strlen(value+1))))
+ if (! (val_list[index] = (char*)malloc(strlen(value)+1)))
{ msyslog(LOG_ERR, "out of memory while configuring"); break; }
strcpy(val_list[index], value);

View File

@ -1,98 +0,0 @@
$OpenBSD: patch-ntpd_ntp_io_c,v 1.1 2002/05/11 20:58:14 danh Exp $
--- ntpd/ntp_io.c.orig Mon May 6 14:01:35 2002
+++ ntpd/ntp_io.c Mon May 6 14:26:53 2002
@@ -41,7 +41,7 @@
#endif
#include <arpa/inet.h>
-#if _BSDI_VERSION >= 199510
+#if HAVE_GETIFADDRS
# include <ifaddrs.h>
#endif
@@ -204,15 +204,15 @@ create_sockets(
u_int port
)
{
-#if _BSDI_VERSION >= 199510
+#if HAVE_GETIFADDRS
int i, j;
struct ifaddrs *ifaddrs, *ifap;
struct sockaddr_in resmask;
-#if _BSDI_VERSION < 199701
+#if defined(_BSDI_VERSION) && _BSDI_VERSION < 199701
struct ifaddrs *lp;
int num_if;
#endif
-#else /* _BSDI_VERSION >= 199510 */
+#else /* HAVE_GETIFADDRS */
# ifdef STREAMS_TLI
struct strioctl ioc;
# endif /* STREAMS_TLI */
@@ -221,7 +221,7 @@ create_sockets(
struct ifreq ifreq, *ifr;
int n, i, j, vs, size = 0;
struct sockaddr_in resmask;
-#endif /* _BSDI_VERSION >= 199510 */
+#endif /* HAVE_GETIFADDRS */
#ifdef DEBUG
if (debug)
@@ -243,8 +243,18 @@ create_sockets(
inter_list[0].flags = INT_BROADCAST;
any_interface = &inter_list[0];
-#if _BSDI_VERSION >= 199510
-#if _BSDI_VERSION >= 199701
+#if HAVE_GETIFADDRS
+#if defined(_BSDI_VERSION) && _BSDI_VERSION < 199701
+ if (getifaddrs(&ifaddrs, &num_if) < 0)
+ {
+ msyslog(LOG_ERR, "create_sockets: getifaddrs() failed: %m");
+ exit(1);
+ }
+
+ i = 1;
+
+ for (ifap = ifaddrs, lp = ifap + num_if; ifap < lp; ifap++)
+#else
if (getifaddrs(&ifaddrs) < 0)
{
msyslog(LOG_ERR, "getifaddrs: %m");
@@ -252,17 +262,7 @@ create_sockets(
}
i = 1;
for (ifap = ifaddrs; ifap != NULL; ifap = ifap->ifa_next)
-#else
- if (getifaddrs(&ifaddrs, &num_if) < 0)
- {
- msyslog(LOG_ERR, "create_sockets: getifaddrs() failed: %m");
- exit(1);
- }
-
- i = 1;
-
- for (ifap = ifaddrs, lp = ifap + num_if; ifap < lp; ifap++)
-#endif
+#endif /* _BSDI_VERSION */
{
struct sockaddr_in *sin;
@@ -333,7 +333,7 @@ create_sockets(
break;
}
free(ifaddrs);
-#else /* _BSDI_VERSION >= 199510 */
+#else /* HAVE_GETIFADDRS */
# ifdef USE_STREAMS_DEVICE_FOR_IF_CONFIG
if ((vs = open("/dev/ip", O_RDONLY)) < 0)
{
@@ -595,7 +595,7 @@ create_sockets(
break;
}
closesocket(vs);
-#endif /* _BSDI_VERSION >= 199510 */
+#endif /* HAVE_GETIFADDRS */
ninterfaces = i;
maxactivefd = 0;

View File

@ -1,27 +0,0 @@
#!/bin/sh
# $OpenBSD: DEINSTALL,v 1.5 2001/03/24 17:20:36 danh Exp $
#
# ntp de-installation
set -e
PATH="/bin:/usr/bin:/sbin:/usr/sbin"
PREFIX="${PKG_PREFIX:-/usr/local}"
CONFIG_DIR="${SYSCONFDIR}"
CONFIG_FILE="$CONFIG_DIR/ntp.conf"
if [ -f "$CONFIG_FILE" ]; then
echo
echo "+---------------"
echo "| To completely deinstall the $1 package you need to"
echo "| perform this step as root:"
echo "|"
echo "| rm -f $CONFIG_FILE"
echo "|"
echo "| Do not do this if you plan on re-installing $1 at"
echo "| some future time. You may also want to remove any"
echo "| leftover drift files or keys."
echo "+---------------"
echo
fi
exit 0

View File

@ -1,15 +0,0 @@
The Network Time Protocol (NTP) is used to synchronize the
time of a computer client or server to another server or
reference time source, such as a radio or satellite receiver
or modem. It provides accuracies typically within a mil-
lisecond on LANs and up to a few tens of milliseconds on
WANs relative to Coordinated Universal Time (UTC) via a
Global Positioning Service (GPS) receiver, for example. Typ-
ical NTP configurations utilize multiple redundant servers
and diverse network paths in order to achieve high accuracy
and reliability. Some configurations include cryptographic
authentication to prevent accidental or malicious protocol
attacks and some provide automatic server discovery using IP
multicast.
WWW: ${HOMEPAGE}

View File

@ -1,6 +0,0 @@
Complete set of documentation on building and configuring a
NTP server or client. The documentation is in the form of
HTML files suitable for browsing and contains links to addi-
tional documentation at various web sites.
WWW: ${HOMEPAGE}

View File

@ -1,13 +0,0 @@
+---------------
| Several example configuration files can be found in
| ${PREFIX}/share/examples/ntp.
|
| 1) create/update the file ${SYSCONFDIR}/ntp.conf
| 2) restart your system
|
| The system restart is necessary as tickadj is run from
| /etc/rc.securelevel before the system securelevel is
| changed.
+---------------

View File

@ -1,19 +0,0 @@
@comment $OpenBSD: PLIST,v 1.8 2002/07/08 14:48:14 danh Exp $
@pkgcfl xntp3-*
sbin/ntp-genkeys
sbin/ntp-wait
sbin/ntpd
sbin/ntpdate
sbin/ntpdc
sbin/ntpq
sbin/ntptimeset
sbin/ntptrace
sbin/tickadj
share/examples/ntp/README
share/examples/ntp/baldwin.conf
share/examples/ntp/beauregard.conf
share/examples/ntp/grundoon.conf
share/examples/ntp/malarky.conf
share/examples/ntp/pogo.conf
share/examples/ntp/rackety.conf
@dirrm share/examples/ntp

View File

@ -1,166 +0,0 @@
@comment $OpenBSD: PLIST-doc,v 1.4 2001/12/20 21:07:21 danh Exp $
share/doc/ntp/Oncore-SHMEM.htm
share/doc/ntp/accopt.htm
share/doc/ntp/assoc.htm
share/doc/ntp/audio.htm
share/doc/ntp/authopt.htm
share/doc/ntp/biblio.htm
share/doc/ntp/build.htm
share/doc/ntp/clockopt.htm
share/doc/ntp/config.htm
share/doc/ntp/confopt.htm
share/doc/ntp/copyright.htm
share/doc/ntp/debug.htm
share/doc/ntp/driver1.htm
share/doc/ntp/driver10.htm
share/doc/ntp/driver11.htm
share/doc/ntp/driver12.htm
share/doc/ntp/driver16.htm
share/doc/ntp/driver18.htm
share/doc/ntp/driver19.htm
share/doc/ntp/driver2.htm
share/doc/ntp/driver20.htm
share/doc/ntp/driver22.htm
share/doc/ntp/driver23.htm
share/doc/ntp/driver24.htm
share/doc/ntp/driver26.htm
share/doc/ntp/driver27.htm
share/doc/ntp/driver28.htm
share/doc/ntp/driver29.htm
share/doc/ntp/driver3.htm
share/doc/ntp/driver30.htm
share/doc/ntp/driver32.htm
share/doc/ntp/driver33.htm
share/doc/ntp/driver34.htm
share/doc/ntp/driver35.htm
share/doc/ntp/driver36.htm
share/doc/ntp/driver37.htm
share/doc/ntp/driver38.htm
share/doc/ntp/driver39.htm
share/doc/ntp/driver4.htm
share/doc/ntp/driver40.htm
share/doc/ntp/driver5.htm
share/doc/ntp/driver6.htm
share/doc/ntp/driver7.htm
share/doc/ntp/driver8.htm
share/doc/ntp/driver9.htm
share/doc/ntp/exec.htm
share/doc/ntp/extern.htm
share/doc/ntp/gadget.htm
share/doc/ntp/genkeys.htm
share/doc/ntp/hints.htm
share/doc/ntp/hints/a-ux
share/doc/ntp/hints/aix
share/doc/ntp/hints/bsdi
share/doc/ntp/hints/changes
share/doc/ntp/hints/decosf1
share/doc/ntp/hints/decosf2
share/doc/ntp/hints/freebsd
share/doc/ntp/hints/hpux
share/doc/ntp/hints/linux
share/doc/ntp/hints/mpeix
share/doc/ntp/hints/notes-xntp-v3
share/doc/ntp/hints/parse
share/doc/ntp/hints/refclocks
share/doc/ntp/hints/rs6000
share/doc/ntp/hints/sco.htm
share/doc/ntp/hints/sgi
share/doc/ntp/hints/solaris-dosynctodr.html
share/doc/ntp/hints/solaris.html
share/doc/ntp/hints/solaris.xtra.4023118
share/doc/ntp/hints/solaris.xtra.4095849
share/doc/ntp/hints/solaris.xtra.S99ntpd
share/doc/ntp/hints/solaris.xtra.patchfreq
share/doc/ntp/hints/sun4
share/doc/ntp/hints/svr4-dell
share/doc/ntp/hints/svr4_package
share/doc/ntp/hints/todo
share/doc/ntp/hints/vxworks.htm
share/doc/ntp/hints/vxworks.html
share/doc/ntp/hints/winnt.htm
share/doc/ntp/howto.htm
share/doc/ntp/htmlprimer.htm
share/doc/ntp/index.htm
share/doc/ntp/kern.htm
share/doc/ntp/kernpps.htm
share/doc/ntp/ldisc.htm
share/doc/ntp/leap.htm
share/doc/ntp/measure.htm
share/doc/ntp/miscopt.htm
share/doc/ntp/monopt.htm
share/doc/ntp/mx4200data.htm
share/doc/ntp/notes.htm
share/doc/ntp/ntpd.htm
share/doc/ntp/ntpdate.htm
share/doc/ntp/ntpdc.htm
share/doc/ntp/ntpq.htm
share/doc/ntp/ntptime.htm
share/doc/ntp/ntptrace.htm
share/doc/ntp/parsedata.htm
share/doc/ntp/parsenew.htm
share/doc/ntp/patches.htm
share/doc/ntp/pic/9400n.jpg
share/doc/ntp/pic/alice11.gif
share/doc/ntp/pic/alice12.gif
share/doc/ntp/pic/alice13.gif
share/doc/ntp/pic/alice15.gif
share/doc/ntp/pic/alice23.gif
share/doc/ntp/pic/alice31.gif
share/doc/ntp/pic/alice32.gif
share/doc/ntp/pic/alice35.gif
share/doc/ntp/pic/alice38.gif
share/doc/ntp/pic/alice44.gif
share/doc/ntp/pic/alice47.gif
share/doc/ntp/pic/alice51.gif
share/doc/ntp/pic/alice61.gif
share/doc/ntp/pic/barnstable.gif
share/doc/ntp/pic/beaver.gif
share/doc/ntp/pic/boom3.gif
share/doc/ntp/pic/boom3a.gif
share/doc/ntp/pic/boom4.gif
share/doc/ntp/pic/bustardfly.gif
share/doc/ntp/pic/c51.jpg
share/doc/ntp/pic/driver29.gif
share/doc/ntp/pic/fg6021.gif
share/doc/ntp/pic/fg6039.jpg
share/doc/ntp/pic/flatheads.gif
share/doc/ntp/pic/gadget.jpg
share/doc/ntp/pic/gps167.jpg
share/doc/ntp/pic/home.gif
share/doc/ntp/pic/hornraba.gif
share/doc/ntp/pic/igclock.gif
share/doc/ntp/pic/oncore_evalbig.gif
share/doc/ntp/pic/oncore_remoteant.jpg
share/doc/ntp/pic/oncore_utplusbig.gif
share/doc/ntp/pic/oz2.gif
share/doc/ntp/pic/panda.gif
share/doc/ntp/pic/pd_om006.gif
share/doc/ntp/pic/pd_om011.gif
share/doc/ntp/pic/pogo.gif
share/doc/ntp/pic/pogo1a.gif
share/doc/ntp/pic/pogo3a.gif
share/doc/ntp/pic/pogo4.gif
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/rabbit.gif
share/doc/ntp/pic/radio2.jpg
share/doc/ntp/pic/sheepb.jpg
share/doc/ntp/pic/stack1a.jpg
share/doc/ntp/pic/thumbs.db
share/doc/ntp/pic/tonea.gif
share/doc/ntp/pic/wingdorothy.gif
share/doc/ntp/porting.htm
share/doc/ntp/pps.htm
share/doc/ntp/prefer.htm
share/doc/ntp/qth.htm
share/doc/ntp/quick.htm
share/doc/ntp/rdebug.htm
share/doc/ntp/refclock.htm
share/doc/ntp/release.htm
share/doc/ntp/thumbs.db
share/doc/ntp/tickadj.htm
@dirrm share/doc/ntp/pic
@dirrm share/doc/ntp/hints
@dirrm share/doc/ntp