diff options
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/openntpd/files/adjtimex-3.9p1.patch | 183 | ||||
| -rw-r--r-- | packages/openntpd/openntpd_3.9p1.bb | 44 |
2 files changed, 227 insertions, 0 deletions
diff --git a/packages/openntpd/files/adjtimex-3.9p1.patch b/packages/openntpd/files/adjtimex-3.9p1.patch new file mode 100644 index 0000000000..b741f9894f --- /dev/null +++ b/packages/openntpd/files/adjtimex-3.9p1.patch @@ -0,0 +1,183 @@ +Index: openntpd-3.9p1/client.c +=================================================================== +--- openntpd-3.9p1.orig/client.c 2006-05-14 07:29:21.000000000 +0200 ++++ openntpd-3.9p1/client.c 2006-09-11 10:12:20.000000000 +0200 +@@ -321,7 +321,7 @@ + priv_adjtime(); + + for (i = 0; i < OFFSET_ARRAY_SIZE; i++) +- if (p->reply[i].rcvd <= p->reply[best].rcvd) ++ /* if (p->reply[i].rcvd <= p->reply[best].rcvd) */ + p->reply[i].good = 0; + + return (0); +Index: openntpd-3.9p1/configure.ac +=================================================================== +--- openntpd-3.9p1.orig/configure.ac 2006-05-14 07:29:23.000000000 +0200 ++++ openntpd-3.9p1/configure.ac 2006-09-11 10:12:20.000000000 +0200 +@@ -617,6 +617,11 @@ + fi + AC_SUBST(mansubdir) + ++AC_ARG_WITH(adjtimex, ++ [ --with-adjtimex Use adjtimex to adjust kernel skew], ++ [ AC_DEFINE(USE_ADJTIMEX, [], [Use adjust skew with adjtimex (experimental)]) ] ++) ++ + # Search for OpenSSL if required. + if test "$ac_cv_func_arc4random" != "yes" && test "x$builtin_arc4random" != "xyes"; then + saved_CPPFLAGS="$CPPFLAGS" +Index: openntpd-3.9p1/defines.h +=================================================================== +--- openntpd-3.9p1.orig/defines.h 2006-05-14 07:29:21.000000000 +0200 ++++ openntpd-3.9p1/defines.h 2006-09-11 10:12:20.000000000 +0200 +@@ -20,6 +20,10 @@ + # define setproctitle(x) + #endif + ++#ifdef USE_ADJTIMEX ++# define adjtime(a,b) (_compat_adjtime((a),(b))) ++#endif ++ + #if !defined(SA_LEN) + # if defined(HAVE_STRUCT_SOCKADDR_SA_LEN) + # define SA_LEN(x) ((x)->sa_len) +Index: openntpd-3.9p1/openbsd-compat/Makefile.in +=================================================================== +--- openntpd-3.9p1.orig/openbsd-compat/Makefile.in 2006-05-14 07:29:19.000000000 +0200 ++++ openntpd-3.9p1/openbsd-compat/Makefile.in 2006-09-11 10:12:56.000000000 +0200 +@@ -9,7 +9,7 @@ + COMPAT= atomicio.o bsd-arc4random.o bsd-misc.o bsd-poll.o \ + bsd-snprintf.o bsd-getifaddrs.o bsd-setresuid.o \ + bsd-setresgid.o fake-rfc2553.o +-PORT= port-qnx.o ++PORT= port-linux.o port-qnx.o + + VPATH=@srcdir@ + CC=@CC@ +Index: openntpd-3.9p1/openbsd-compat/openbsd-compat.h +=================================================================== +--- openntpd-3.9p1.orig/openbsd-compat/openbsd-compat.h 2006-05-14 07:29:19.000000000 +0200 ++++ openntpd-3.9p1/openbsd-compat/openbsd-compat.h 2006-09-11 10:12:20.000000000 +0200 +@@ -46,6 +46,11 @@ + __attribute__((__format__ (printf, 2, 3))); + #endif + ++#ifdef USE_ADJTIMEX ++# include <sys/time.h> ++int _compat_adjtime(const struct timeval *, struct timeval *); ++#endif ++ + #ifndef HAVE_INET_PTON + int inet_pton(int, const char *, void *); + #endif +Index: openntpd-3.9p1/openbsd-compat/port-linux.c +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ openntpd-3.9p1/openbsd-compat/port-linux.c 2006-09-11 10:12:20.000000000 +0200 +@@ -0,0 +1,105 @@ ++/* $Id$ */ ++ ++/* ++ * Copyright (c) 2004 Darren Tucker <dtucker at zip com au> ++ * ++ * Permission to use, copy, modify, and distribute this software for any ++ * purpose with or without fee is hereby granted, provided that the above ++ * copyright notice and this permission notice appear in all copies. ++ * ++ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES ++ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF ++ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ++ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES ++ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ++ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF ++ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ++ */ ++ ++#include "includes.h" ++ ++#ifdef USE_ADJTIMEX ++#include <sys/timex.h> ++#include <errno.h> ++#ifdef adjtime ++# undef adjtime ++#endif ++ ++#include "ntpd.h" ++ ++/* scale factor used by adjtimex freq param. 1 ppm = 65536 */ ++#define ADJTIMEX_FREQ_SCALE 65536 ++ ++/* maximum change to skew per adjustment, in PPM */ ++#define MAX_SKEW_DELTA 5.0 ++ ++int ++_compat_adjtime(const struct timeval *delta, struct timeval *olddelta) ++{ ++ static struct timeval tlast = {0,0}; ++ static double tskew = 0; ++ static int synced = -1; ++ struct timeval tnow, tdelta; ++ double skew = 0, newskew, deltaskew, adjust, interval = 0; ++ struct timex tmx; ++ int result, saved_errno; ++ ++ gettimeofday(&tnow, NULL); ++ adjust = (double)delta->tv_sec; ++ adjust += (double)delta->tv_usec / 1000000; ++ ++ /* Even if the caller doesn't care about the olddelta, we do */ ++ if (olddelta == NULL) ++ olddelta = &tdelta; ++ ++ result = adjtime(delta, olddelta); ++ saved_errno = errno; ++ ++ if (olddelta->tv_sec == 0 && olddelta->tv_usec == 0 && ++ synced != INT_MAX) ++ synced++; ++ else ++ synced = 0; ++ ++ /* ++ * do skew calculations if we have synced ++ */ ++ if (synced == 0 ) { ++ tmx.modes = 0; ++ if (adjtimex(&tmx) == -1) ++ log_warn("adjtimex get failed"); ++ else ++ tskew = (double)tmx.freq / ADJTIMEX_FREQ_SCALE; ++ } else if (synced >= 1) { ++ interval = (double)(tnow.tv_sec - tlast.tv_sec); ++ interval += (double)(tnow.tv_usec - tlast.tv_usec) / 1000000; ++ ++ skew = (adjust * 1000000) / interval; ++ newskew = ((tskew * synced) + skew) / synced; ++ deltaskew = newskew - tskew; ++ ++ if (deltaskew > MAX_SKEW_DELTA) { ++ log_info("skew change %0.3lf exceeds limit", deltaskew); ++ tskew += MAX_SKEW_DELTA; ++ } else if (deltaskew < -MAX_SKEW_DELTA) { ++ log_info("skew change %0.3lf exceeds limit", deltaskew); ++ tskew -= MAX_SKEW_DELTA; ++ } else { ++ tskew = newskew; ++ } ++ ++ /* Adjust the kernel skew. */ ++ tmx.freq = (long)(tskew * ADJTIMEX_FREQ_SCALE); ++ tmx.modes = ADJ_FREQUENCY; ++ if (adjtimex(&tmx) == -1) ++ log_warn("adjtimex set freq failed"); ++ } ++ ++ log_debug("interval %0.3lf skew %0.3lf total skew %0.3lf", interval, ++ skew, tskew); ++ ++ tlast = tnow; ++ errno = saved_errno; ++ return result; ++} ++#endif diff --git a/packages/openntpd/openntpd_3.9p1.bb b/packages/openntpd/openntpd_3.9p1.bb new file mode 100644 index 0000000000..f7dd0beee2 --- /dev/null +++ b/packages/openntpd/openntpd_3.9p1.bb @@ -0,0 +1,44 @@ +DESCRIPTION = "OpenNTPD is a FREE, easy to use implementation of the \ +Network Time Protocol." +HOMEPAGE = "http://www.openntpd.org/" +SECTION = "console/network" +MAINTAINER = "Oyvind Repvik <nail@nslu2-linux.org>" +LICENSE = "BSD" +DEPENDS += "openssl" +DEPENDS = "timezones" +PR = "r0" + +SRC_URI = "http://www.zip.com.au/~dtucker/openntpd/release/openntpd-${PV}.tar.gz \ + file://adjtimex-${PV}.patch;patch=1 \ + file://init" + +S = "${WORKDIR}/openntpd-${PV}" + +inherit autotools update-rc.d + +EXTRA_OECONF += "CFLAGS=-DUSE_ADJTIMEX --disable-strip --prefix=/usr \ + --sysconfdir=/etc --with-privsep-path=/${localstatedir}/shared/empty \ + --with-privsep-user=ntpd \ + --with-builtin-arc4random \ + --without-ssl-dir" + +do_install_prepend() { + install -d ${D}${sysconfdir}/init.d +} +do_install_append() { + install -c -m 755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/openntpd +} + +pkg_postinst () { + [ ! -d ${localstatedir}/shared ] && mkdir -p ${localstatedir}/shared + grep ntpd ${sysconfdir}/passwd || adduser --disabled-password --home=${localstatedir}/shared/empty --ingroup nogroup ntpd + chown root:root ${localstatedir}/shared/empty +} + +pkg_postrm () { + grep ntpd ${sysconfdir}/passwd && deluser ntpd +} + +INITSCRIPT_NAME = "openntpd" + +INITSCRIPT_PARAMS = "defaults" |