Date: Monday, April 4, 2016 @ 18:52:26 Author: anthraxx Revision: 169453
upgpkg: openntpd 5.9p1-1 Modified: openntpd/trunk/PKGBUILD openntpd/trunk/openntpd.install Deleted: openntpd/trunk/linux-adjtimex.patch ----------------------+ PKGBUILD | 52 +++++++-------- linux-adjtimex.patch | 168 ------------------------------------------------- openntpd.install | 10 -- 3 files changed, 28 insertions(+), 202 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2016-04-04 16:51:56 UTC (rev 169452) +++ PKGBUILD 2016-04-04 16:52:26 UTC (rev 169453) @@ -1,30 +1,31 @@ -# $Id$ -# Maintainer: Vesa Kaihlavirta <[email protected]> +# Maintainer: Levente Polyak <anthraxx[at]archlinux[dot]org> +# Contributor: Vesa Kaihlavirta <[email protected]> # Contributor: Mark Rosenstand <[email protected]> # Contributor: Giorgio Lando <[email protected]> (adjtimex patch) # Contributor: Alexander Rødseth <[email protected]> pkgname=openntpd -pkgver=5.7p4 +pkgver=5.9p1 pkgrel=1 -pkgdesc='Free, easy to use implementation of the Network Time Protocol.' +pkgdesc='Free, easy to use implementation of the Network Time Protocol' url='http://www.openntpd.org/' -arch=('x86_64' 'i686') +arch=('i686' 'x86_64') license=('BSD') depends=('openssl') conflicts=('ntp') backup=('etc/ntpd.conf') -install=$pkgname.install -source=("ftp://ftp.openbsd.org/pub/OpenBSD/OpenNTPD/$pkgname-$pkgver.tar.gz"; - 'openntpd.tmpfiles' - 'openntpd.service') +install=${pkgname}.install +source=(ftp://ftp.openbsd.org/pub/OpenBSD/OpenNTPD/${pkgname}-${pkgver}.tar.gz{,.asc} + openntpd.tmpfiles + openntpd.service) +sha512sums=('227a4d42f43f4abfaa97fb85cf121d3b9a6646259faeda785dbeb3e4a27285a7f95daf96e72135871a31f772895f3b66c10bd628c87e453507ce69102f5e1213' + 'SKIP' + '15ecb1a8673944d73b9675e812b134531cd99ae7e5a62c1415bfd0cc58ab9d86bd4a6342a5f13e3d7d05af6ae7d9fe2cc81c88df1c20dc94e3f5e37b51e05c04' + '21a66f72be71a6dc294ed4d841fb76769d3cd6ae8049fb95117591534bb87afd3bc80a425d5e9ee41b1f107ba440a8c9cf70c5c7d771f4c5c8a0c722813e3dd9') +validpgpkeys=('A1EB079B8D3EB92B4EBD3139663AF51BD5E4D8D5') # Brent Cook <[email protected]> -sha256sums=('a993d95976e375acc0ab1a677fd268f55024477835633c8ae404895046bccb23' - 'fe12841110c3c080519e248988c4b6334f54bd9646b015753c7e15de2a9600c5' - '3239fc6f69d661cd9233233da9e68bebdf7b12888febbc2f2d794742db2d8ed1') - build() { - cd $pkgname-$pkgver + cd ${pkgname}-${pkgver} autoreconf -fi ./configure \ --prefix=/usr \ @@ -31,25 +32,24 @@ --sysconfdir=/etc \ --sbindir=/usr/bin \ --with-privsep-user=ntp \ - --with-privsep-path=/run/openntpd/ \ + --with-privsep-path=/run/openntpd \ + --localstatedir=/var/lib/openntpd \ --with-adjtimex make } package() { - cd "$srcdir/$pkgname-$pkgver" + cd ${pkgname}-${pkgver} - make DESTDIR="$pkgdir" install - install -Dm644 "$srcdir/$pkgname-$pkgver/COPYING" \ - "$pkgdir/usr/share/licenses/$pkgname/COPYING" - sed -i 's/\*/0.0.0.0/' "$pkgdir/etc/ntpd.conf" + make DESTDIR="${pkgdir}" install + sed -i 's/\*/0.0.0.0/' "${pkgdir}/etc/ntpd.conf" - install -d -m700 "$pkgdir/var/lib/ntp" - install -Dm644 "$srcdir/openntpd.tmpfiles" "$pkgdir/usr/lib/tmpfiles.d/openntpd.conf" - install -Dm644 "$srcdir/openntpd.service" "$pkgdir/usr/lib/systemd/system/openntpd.service" + install -Dm 644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING" + install -Dm 644 "${srcdir}/openntpd.tmpfiles" "${pkgdir}/usr/lib/tmpfiles.d/openntpd.conf" + install -Dm 644 "${srcdir}/openntpd.service" "${pkgdir}/usr/lib/systemd/system/openntpd.service" - install -dm755 "$pkgdir/usr/lib/systemd/ntp-units.d" - echo "$pkgname.service" > "$pkgdir/usr/lib/systemd/ntp-units.d/$pkgname.list" + install -dm 755 "${pkgdir}/usr/lib/systemd/ntp-units.d" + echo ${pkgname}.service > "${pkgdir}/usr/lib/systemd/ntp-units.d/${pkgname}.list" } -# vim:set ts=2 sw=2 et: +# vim: ts=2 sw=2 et: Deleted: linux-adjtimex.patch =================================================================== --- linux-adjtimex.patch 2016-04-04 16:51:56 UTC (rev 169452) +++ linux-adjtimex.patch 2016-04-04 16:52:26 UTC (rev 169453) @@ -1,168 +0,0 @@ -Only in openntpd-3.9p1.old: configure -diff -ur --unidirectional-new-file openntpd-3.9p1.old/configure.ac openntpd-3.9p1/configure.ac ---- openntpd-3.9p1.old/configure.ac 2006-05-14 07:29:23.000000000 +0200 -+++ openntpd-3.9p1/configure.ac 2008-02-07 13:13:18.066366142 +0100 -@@ -583,6 +583,11 @@ - [ builtin_arc4random=$withval ] - ) - -+AC_ARG_WITH(adjtimex, -+ [ --with-adjtimex Use adjtimex to adjust kernel skew], -+ [ AC_DEFINE(USE_ADJTIMEX, [], [Use adjust skew with adjtimex (experimental)]) ] -+ ) -+ - AC_ARG_WITH(mantype, - [ --with-mantype=man|cat|doc Set man page type], - [ -diff -ur --unidirectional-new-file openntpd-3.9p1.old/defines.h openntpd-3.9p1/defines.h ---- openntpd-3.9p1.old/defines.h 2006-05-14 07:29:21.000000000 +0200 -+++ openntpd-3.9p1/defines.h 2008-02-07 13:14:34.488711868 +0100 -@@ -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) -Only in openntpd-3.9p1.old: ntpd.0 -Only in openntpd-3.9p1.old: ntpd.conf.0 -diff -ur --unidirectional-new-file openntpd-3.9p1.old/openbsd-compat/Makefile.in openntpd-3.9p1/openbsd-compat/Makefile.in ---- openntpd-3.9p1.old/openbsd-compat/Makefile.in 2006-05-14 07:29:19.000000000 +0200 -+++ openntpd-3.9p1/openbsd-compat/Makefile.in 2008-02-07 13:31:39.499728930 +0100 -@@ -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@ -diff -ur --unidirectional-new-file openntpd-3.9p1.old/openbsd-compat/openbsd-compat.h openntpd-3.9p1/openbsd-compat/openbsd-compat.h ---- openntpd-3.9p1.old/openbsd-compat/openbsd-compat.h 2006-05-14 07:29:19.000000000 +0200 -+++ openntpd-3.9p1/openbsd-compat/openbsd-compat.h 2008-02-07 13:17:00.272366764 +0100 -@@ -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 -diff -ur --unidirectional-new-file openntpd-3.9p1.old/openbsd-compat/port-linux.c openntpd-3.9p1/openbsd-compat/port-linux.c ---- openntpd-3.9p1.old/openbsd-compat/port-linux.c 1970-01-01 01:00:00.000000000 +0100 -+++ openntpd-3.9p1/openbsd-compat/port-linux.c 2008-02-07 13:24:43.800366563 +0100 -@@ -0,0 +1,105 @@ -+ -+ -+/* -+ * 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 Modified: openntpd.install =================================================================== --- openntpd.install 2016-04-04 16:51:56 UTC (rev 169452) +++ openntpd.install 2016-04-04 16:52:26 UTC (rev 169453) @@ -1,15 +1,9 @@ post_install() { getent group ntp &>/dev/null || groupadd -g 87 ntp >/dev/null - getent passwd ntp &>/dev/null || useradd -u 87 -g ntp -d /var/lib/ntp -c 'Network Time Protocol' -s /bin/false ntp >/dev/null + getent passwd ntp &>/dev/null || useradd -u 87 -g ntp -d /var/lib/ntp \ + -c 'Network Time Protocol' -s /usr/bin/nologin ntp >/dev/null systemd-tmpfiles --create openntpd.conf - true } -post_remove() { - getent passwd ntp &>/dev/null && userdel ntp >/dev/null - getent group ntp &>/dev/null && groupdel ntp >/dev/null - true -} - # vim: ts=2 sw=2 et ft=sh
