summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Olbrich <m.olbrich@pengutronix.de>2013-04-14 11:58:01 +0200
committerMichael Olbrich <m.olbrich@pengutronix.de>2013-04-14 11:58:04 +0200
commit9a142d4e0eca14ed2cf8dc6291d7255adfc3b0e3 (patch)
tree212cbb09dd32297e2c570f78d9dcecaf5e928994
parentbb10d6e1f03bf0aa535b4875f937d1b4479fc5ab (diff)
downloadptxdist-9a142d4e0eca14ed2cf8dc6291d7255adfc3b0e3.tar.gz
ptxdist-9a142d4e0eca14ed2cf8dc6291d7255adfc3b0e3.tar.xz
openntpd: version bump 3.7p1 -> 3.9p1
fix dependencies and cleanup while at it. Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
-rw-r--r--rules/openntpd.in1
-rw-r--r--rules/openntpd.make19
2 files changed, 7 insertions, 13 deletions
diff --git a/rules/openntpd.in b/rules/openntpd.in
index 44c79731f..174feaa73 100644
--- a/rules/openntpd.in
+++ b/rules/openntpd.in
@@ -6,6 +6,7 @@ menuconfig OPENNTPD
tristate
prompt "openntpd "
select ROOTFS_VAR_RUN
+ select OPENSSL if OPENNTPD_ARC4RANDOM
depends on !BUSYBOX_NTPD || ALLYES
help
This will install the BSD Open NTPD Daemon
diff --git a/rules/openntpd.make b/rules/openntpd.make
index f8e51be9a..9246d9941 100644
--- a/rules/openntpd.make
+++ b/rules/openntpd.make
@@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_OPENNTPD) += openntpd
#
# Paths and names
#
-OPENNTPD_VERSION := 3.7p1
-OPENNTPD_MD5 := 10ed8eefd760e5819efcf3277b118f47
+OPENNTPD_VERSION := 3.9p1
+OPENNTPD_MD5 := afc34175f38d08867c1403d9008600b3
OPENNTPD := openntpd-$(OPENNTPD_VERSION)
OPENNTPD_SUFFIX := tar.gz
OPENNTPD_URL := http://ftp.eu.openbsd.org/pub/OpenBSD/OpenNTPD/$(OPENNTPD).$(OPENNTPD_SUFFIX)
@@ -28,22 +28,15 @@ OPENNTPD_DIR := $(BUILDDIR)/$(OPENNTPD)
# Prepare
# ----------------------------------------------------------------------------
-OPENNTPD_PATH := PATH=$(CROSS_PATH)
-OPENNTPD_ENV := $(CROSS_ENV)
-
#
# autoconf
#
-OPENNTPD_AUTOCONF := \
+OPENNTPD_CONF_TOOL := autoconf
+OPENNTPD_CONF_OPT := \
$(CROSS_AUTOCONF_USR) \
--with-privsep-user=ntp \
- --with-privsep-path=/var/run/ntp
-
-ifdef PTXCONF_OPENNTPD_ARC4RANDOM
-OPENNTPD_AUTOCONF += --with-builtin-arc4random
-else
-OPENNTPD_AUTOCONF += --without-builtin-arc4random
-endif
+ --with-privsep-path=/var/run/ntp \
+ --$(call ptx/wwo, PTXCONF_OPENNTPD_ARC4RANDOM)-builtin-arc4random
# ----------------------------------------------------------------------------
# Target-Install