aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--network/openntpd/openntpd.SlackBuild10
-rw-r--r--network/openntpd/openntpd.info6
-rw-r--r--network/openntpd/patches/02-ntpd_8_clean.diff13
-rw-r--r--network/openntpd/patches/02-ntpd_conf_5_clean.diff12
-rw-r--r--network/openntpd/rc.openntpd2
5 files changed, 15 insertions, 28 deletions
diff --git a/network/openntpd/openntpd.SlackBuild b/network/openntpd/openntpd.SlackBuild
index b0ac787752a9d..07347afb530fc 100644
--- a/network/openntpd/openntpd.SlackBuild
+++ b/network/openntpd/openntpd.SlackBuild
@@ -2,7 +2,7 @@
# Slackware build script for openntpd
-# Copyright (c) 2015 LEVAI Daniel
+# Copyright (c) 2015-2018 LEVAI Daniel
# All rights reserved.
#
# * Redistribution and use in source and binary forms, with or without
@@ -26,13 +26,13 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=openntpd
-VERSION=${VERSION:-5.7p4}
+VERSION=${VERSION:-6.2p3}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
- i?86) ARCH=i486 ;;
+ i?86) ARCH=i586 ;;
arm*) ARCH=arm ;;
*) ARCH=$( uname -m ) ;;
esac
@@ -43,8 +43,8 @@ TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM
OUTPUT=${OUTPUT:-/tmp}
-if [ "$ARCH" = "i486" ]; then
- SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+ SLKCFLAGS="-O2 -march=i586 -mtune=i686"
LIBDIRSUFFIX=""
elif [ "$ARCH" = "i686" ]; then
SLKCFLAGS="-O2 -march=i686 -mtune=i686"
diff --git a/network/openntpd/openntpd.info b/network/openntpd/openntpd.info
index 2895bb1795717..d341aada7346b 100644
--- a/network/openntpd/openntpd.info
+++ b/network/openntpd/openntpd.info
@@ -1,8 +1,8 @@
PRGNAM="openntpd"
-VERSION="5.7p4"
+VERSION="6.2p3"
HOMEPAGE="http://www.openntpd.org/portable.html"
-DOWNLOAD="http://ftp.OpenBSD.org/pub/OpenBSD/OpenNTPD/openntpd-5.7p4.tar.gz"
-MD5SUM="9d818a143fbc5d830203fa2f4b4c6a2a"
+DOWNLOAD="http://ftp.OpenBSD.org/pub/OpenBSD/OpenNTPD/openntpd-6.2p3.tar.gz"
+MD5SUM="5b67827f8ce7e24f38c895787036658d"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
diff --git a/network/openntpd/patches/02-ntpd_8_clean.diff b/network/openntpd/patches/02-ntpd_8_clean.diff
index 0c655cd186d12..8e999afdec534 100644
--- a/network/openntpd/patches/02-ntpd_8_clean.diff
+++ b/network/openntpd/patches/02-ntpd_8_clean.diff
@@ -1,15 +1,14 @@
---- a/src/ntpd.8.orig 2015-01-20 03:30:41.000000000 +0100
-+++ b/src/ntpd.8 2015-01-20 10:53:39.970163740 +0100
-@@ -99,19 +99,6 @@ adjusts the clock frequency using the
+--- a/src/ntpd.8.orig 2017-10-30 09:57:40.000000000 +0100
++++ b/src/ntpd.8 2017-10-30 16:40:00.501570572 +0100
+@@ -102,18 +102,6 @@ adjusts the clock frequency using the
.Xr adjfreq 2
system call to compensate for systematic drift.
.Pp
-.Nm
--is usually started at boot time, and can be enabled by
--setting
+-is started at boot time by default via
-.Va ntpd_flags
-in
--.Pa /etc/rc.conf.local .
+-.Pa /etc/rc.conf .
-See
-.Xr rc 8
-and
@@ -20,7 +19,7 @@
When
.Nm
starts up, it reads settings from its configuration file,
-@@ -148,8 +135,6 @@ Socket file for communication with
+@@ -138,8 +126,6 @@ Socket file for communication with
.Xr adjtime 2 ,
.Xr ntpd.conf 5 ,
.Xr ntpctl 8 ,
diff --git a/network/openntpd/patches/02-ntpd_conf_5_clean.diff b/network/openntpd/patches/02-ntpd_conf_5_clean.diff
deleted file mode 100644
index e3eecabf212f4..0000000000000
--- a/network/openntpd/patches/02-ntpd_conf_5_clean.diff
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/src/ntpd.conf.5.orig 2015-01-08 11:35:23.671118459 +0100
-+++ b/src/ntpd.conf.5 2015-01-08 11:36:10.673989819 +0100
-@@ -196,9 +196,3 @@ The
- .Nm
- file format first appeared in
- .Ox 3.6 .
--.Sh CAVEATS
--When using different
--.Cm rtable
--options,
--.Xr ntpd 8
--must be started in rtable 0.
diff --git a/network/openntpd/rc.openntpd b/network/openntpd/rc.openntpd
index 52206765cf270..55d082b0fb14c 100644
--- a/network/openntpd/rc.openntpd
+++ b/network/openntpd/rc.openntpd
@@ -10,7 +10,7 @@
openntpd_start() {
if [ -x ${BIN} ]; then
echo "Starting openntpd daemon: ${BIN}"
- ${BIN} -p /var/run/openntpd.pid
+ ${BIN} -p /var/run/openntpd.pid &
fi
}