Merge commit 'c2356c429d8cfd6c22d694f67b70de62c1bca643' into dora
This commit is contained in:
commit
77bd929be1
|
@ -15,11 +15,11 @@ SRCREV = "bcc4fa827be7f59486ff305d664b42a142025f9b"
|
||||||
|
|
||||||
# odu handling.
|
# odu handling.
|
||||||
BRANCH="v3.2"
|
BRANCH="v3.2"
|
||||||
SRCREV_sysmocom-odu = "dcaeb640fca7524f70f155fd573b72a245a9161e"
|
SRCREV_sysmocom-odu = "3ed283bea6c0be2fa44e3c8298895190c1bd93b5"
|
||||||
BRANCH_sysmocom-odu = "sob-odu/linux-3.2.63"
|
BRANCH_sysmocom-odu = "sob-odu/linux-3.2.63"
|
||||||
LINUX_VERSION_sysmocom-odu = "3.2.63"
|
LINUX_VERSION_sysmocom-odu = "3.2.63"
|
||||||
|
|
||||||
PR = "r40"
|
PR = "r41"
|
||||||
PV = "${LINUX_VERSION}+git${SRCPV}"
|
PV = "${LINUX_VERSION}+git${SRCPV}"
|
||||||
|
|
||||||
SRC_URI = "git://git.sysmocom.de/sysmo-bts/linux.git;protocol=git;branch=${BRANCH} \
|
SRC_URI = "git://git.sysmocom.de/sysmo-bts/linux.git;protocol=git;branch=${BRANCH} \
|
||||||
|
|
|
@ -1,168 +0,0 @@
|
||||||
Fix ntp-keygen build without OpenSSL
|
|
||||||
|
|
||||||
Patch borrowed from Gentoo, originally from upstream
|
|
||||||
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
|
|
||||||
Upstream-Status: Backport
|
|
||||||
|
|
||||||
Upstream commit:
|
|
||||||
http://bk1.ntp.org/ntp-stable/?PAGE=patch&REV=5497b345z5MNTuNvJWuqPSje25NQTg
|
|
||||||
Gentoo bugzilla: https://bugs.gentoo.org/show_bug.cgi?id=533238
|
|
||||||
|
|
||||||
Signed-off-by: Markos Chandras <hwoarang@gentoo.org>
|
|
||||||
Index: ntp-4.2.8/Makefile.am
|
|
||||||
===================================================================
|
|
||||||
--- ntp-4.2.8.orig/Makefile.am
|
|
||||||
+++ ntp-4.2.8/Makefile.am
|
|
||||||
@@ -2,7 +2,10 @@ ACLOCAL_AMFLAGS = -I sntp/m4 -I sntp/lib
|
|
||||||
|
|
||||||
NULL =
|
|
||||||
|
|
||||||
+# moved sntp first to get libtool and libevent built.
|
|
||||||
+
|
|
||||||
SUBDIRS = \
|
|
||||||
+ sntp \
|
|
||||||
scripts \
|
|
||||||
include \
|
|
||||||
libntp \
|
|
||||||
@@ -17,7 +20,6 @@ SUBDIRS = \
|
|
||||||
clockstuff \
|
|
||||||
kernel \
|
|
||||||
util \
|
|
||||||
- sntp \
|
|
||||||
tests \
|
|
||||||
$(NULL)
|
|
||||||
|
|
||||||
@@ -64,7 +66,6 @@ BUILT_SOURCES = \
|
|
||||||
.gcc-warning \
|
|
||||||
'libtool \
|
|
||||||
html/.datecheck \
|
|
||||||
- sntp/built-sources-only \
|
|
||||||
$(srcdir)/COPYRIGHT \
|
|
||||||
$(srcdir)/.checkChangeLog \
|
|
||||||
$(NULL)
|
|
||||||
Index: ntp-4.2.8/configure.ac
|
|
||||||
===================================================================
|
|
||||||
--- ntp-4.2.8.orig/configure.ac
|
|
||||||
+++ ntp-4.2.8/configure.ac
|
|
||||||
@@ -102,7 +102,7 @@ esac
|
|
||||||
enable_nls=no
|
|
||||||
LIBOPTS_CHECK_NOBUILD([sntp/libopts])
|
|
||||||
|
|
||||||
-NTP_ENABLE_LOCAL_LIBEVENT
|
|
||||||
+NTP_LIBEVENT_CHECK_NOBUILD([2], [sntp/libevent])
|
|
||||||
|
|
||||||
NTP_LIBNTP
|
|
||||||
|
|
||||||
@@ -771,6 +771,10 @@ esac
|
|
||||||
|
|
||||||
####
|
|
||||||
|
|
||||||
+AC_CHECK_FUNCS([arc4random_buf])
|
|
||||||
+
|
|
||||||
+####
|
|
||||||
+
|
|
||||||
saved_LIBS="$LIBS"
|
|
||||||
LIBS="$LIBS $LDADD_LIBNTP"
|
|
||||||
AC_CHECK_FUNCS([daemon])
|
|
||||||
Index: ntp-4.2.8/libntp/ntp_crypto_rnd.c
|
|
||||||
===================================================================
|
|
||||||
--- ntp-4.2.8.orig/libntp/ntp_crypto_rnd.c
|
|
||||||
+++ ntp-4.2.8/libntp/ntp_crypto_rnd.c
|
|
||||||
@@ -24,6 +24,21 @@
|
|
||||||
int crypto_rand_init = 0;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
+#ifndef HAVE_ARC4RANDOM_BUF
|
|
||||||
+static void
|
|
||||||
+arc4random_buf(void *buf, size_t nbytes);
|
|
||||||
+
|
|
||||||
+void
|
|
||||||
+evutil_secure_rng_get_bytes(void *buf, size_t nbytes);
|
|
||||||
+
|
|
||||||
+static void
|
|
||||||
+arc4random_buf(void *buf, size_t nbytes)
|
|
||||||
+{
|
|
||||||
+ evutil_secure_rng_get_bytes(buf, nbytes);
|
|
||||||
+ return;
|
|
||||||
+}
|
|
||||||
+#endif
|
|
||||||
+
|
|
||||||
/*
|
|
||||||
* As of late 2014, here's how we plan to provide cryptographic-quality
|
|
||||||
* random numbers:
|
|
||||||
Index: ntp-4.2.8/sntp/configure.ac
|
|
||||||
===================================================================
|
|
||||||
--- ntp-4.2.8.orig/sntp/configure.ac
|
|
||||||
+++ ntp-4.2.8/sntp/configure.ac
|
|
||||||
@@ -97,11 +97,14 @@ esac
|
|
||||||
enable_nls=no
|
|
||||||
LIBOPTS_CHECK
|
|
||||||
|
|
||||||
-AM_COND_IF(
|
|
||||||
- [BUILD_SNTP],
|
|
||||||
- [NTP_LIBEVENT_CHECK],
|
|
||||||
- [NTP_LIBEVENT_CHECK_NOBUILD]
|
|
||||||
-)
|
|
||||||
+# From when we only used libevent for sntp:
|
|
||||||
+#AM_COND_IF(
|
|
||||||
+# [BUILD_SNTP],
|
|
||||||
+# [NTP_LIBEVENT_CHECK],
|
|
||||||
+# [NTP_LIBEVENT_CHECK_NOBUILD]
|
|
||||||
+#)
|
|
||||||
+
|
|
||||||
+NTP_LIBEVENT_CHECK([2])
|
|
||||||
|
|
||||||
# Checks for libraries.
|
|
||||||
|
|
||||||
Index: ntp-4.2.8/sntp/m4/ntp_libevent.m4
|
|
||||||
===================================================================
|
|
||||||
--- ntp-4.2.8.orig/sntp/m4/ntp_libevent.m4
|
|
||||||
+++ ntp-4.2.8/sntp/m4/ntp_libevent.m4
|
|
||||||
@@ -1,4 +1,25 @@
|
|
||||||
-dnl NTP_ENABLE_LOCAL_LIBEVENT -*- Autoconf -*-
|
|
||||||
+# SYNOPSIS -*- Autoconf -*-
|
|
||||||
+#
|
|
||||||
+# NTP_ENABLE_LOCAL_LIBEVENT
|
|
||||||
+# NTP_LIBEVENT_CHECK([MINVERSION [, DIR]])
|
|
||||||
+# NTP_LIBEVENT_CHECK_NOBUILD([MINVERSION [, DIR]])
|
|
||||||
+#
|
|
||||||
+# DESCRIPTION
|
|
||||||
+#
|
|
||||||
+# AUTHOR
|
|
||||||
+#
|
|
||||||
+# Harlan Stenn
|
|
||||||
+#
|
|
||||||
+# LICENSE
|
|
||||||
+#
|
|
||||||
+# This file is Copyright (c) 2014 Network Time Foundation
|
|
||||||
+#
|
|
||||||
+# Copying and distribution of this file, with or without modification, are
|
|
||||||
+# permitted in any medium without royalty provided the copyright notice,
|
|
||||||
+# author attribution and this notice are preserved. This file is offered
|
|
||||||
+# as-is, without any warranty.
|
|
||||||
+
|
|
||||||
+dnl NTP_ENABLE_LOCAL_LIBEVENT
|
|
||||||
dnl
|
|
||||||
dnl Provide only the --enable-local-libevent command-line option.
|
|
||||||
dnl
|
|
||||||
@@ -29,7 +50,7 @@ dnl If NOBUILD is provided as the 3rd ar
|
|
||||||
dnl but DO NOT invoke DIR/configure if we are going to use our bundled
|
|
||||||
dnl version. This may be the case for nested packages.
|
|
||||||
dnl
|
|
||||||
-dnl provide --enable-local-libevent .
|
|
||||||
+dnl provides --enable-local-libevent .
|
|
||||||
dnl
|
|
||||||
dnl Examples:
|
|
||||||
dnl
|
|
||||||
Index: ntp-4.2.8/util/Makefile.am
|
|
||||||
===================================================================
|
|
||||||
--- ntp-4.2.8.orig/util/Makefile.am
|
|
||||||
+++ ntp-4.2.8/util/Makefile.am
|
|
||||||
@@ -19,6 +19,7 @@ AM_LDFLAGS = $(LDFLAGS_NTP)
|
|
||||||
LDADD= ../libntp/libntp.a $(LDADD_LIBNTP) $(LIBM) $(PTHREAD_LIBS)
|
|
||||||
tg2_LDADD= ../libntp/libntp.a $(LDADD_LIBNTP) $(LIBM)
|
|
||||||
ntp_keygen_LDADD = version.o $(LIBOPTS_LDADD) ../libntp/libntp.a
|
|
||||||
+ntp_keygen_LDADD += $(LDADD_LIBEVENT)
|
|
||||||
ntp_keygen_LDADD += $(LDADD_LIBNTP) $(PTHREAD_LIBS) $(LDADD_NTP) $(LIBM)
|
|
||||||
ntp_keygen_SOURCES = ntp-keygen.c ntp-keygen-opts.c ntp-keygen-opts.h
|
|
||||||
|
|
|
@ -2,18 +2,29 @@
|
||||||
# The driftfile must remain in a place specific to this
|
# The driftfile must remain in a place specific to this
|
||||||
# machine - it records the machine specific clock error
|
# machine - it records the machine specific clock error
|
||||||
driftfile /etc/ntp.drift
|
driftfile /etc/ntp.drift
|
||||||
|
|
||||||
# This obtains a random server which will be close
|
# This obtains a random server which will be close
|
||||||
# (in IP terms) to the machine. Add other servers
|
# (in IP terms) to the machine. Add other servers
|
||||||
# as required, or change this.
|
# as required, or change this.
|
||||||
server pool.ntp.org
|
server pool.ntp.org
|
||||||
|
|
||||||
# Using local hardware clock as fallback
|
# Using local hardware clock as fallback
|
||||||
# Disable this when using ntpd -q -g -x as ntpdate or it will sync to itself
|
# Disable this when using ntpd -q -g -x as ntpdate or it will sync to itself
|
||||||
server 127.127.1.0
|
server 127.127.1.0
|
||||||
fudge 127.127.1.0 stratum 14
|
fudge 127.127.1.0 stratum 14
|
||||||
|
|
||||||
|
# GPSD interface for NMEA based time
|
||||||
server 127.127.28.0
|
server 127.127.28.0
|
||||||
fudge 127.127.28.0 refid GPS
|
fudge 127.127.28.0 refid GPS
|
||||||
|
|
||||||
|
# PPS interface to kernel
|
||||||
|
server 127.127.22.0
|
||||||
|
fudge 127.127.22.0 refid PPS
|
||||||
|
|
||||||
# Defining a default security setting, allowing queries but declining
|
# Defining a default security setting, allowing queries but declining
|
||||||
# pretty much everything else
|
# pretty much everything else
|
||||||
restrict default limited kod nomodify notrap nopeer
|
restrict default limited kod nomodify notrap nopeer
|
||||||
|
|
||||||
|
# Be more permissive with localhost
|
||||||
|
restrict 127.0.0.1
|
||||||
|
restrict ::1
|
||||||
|
|
|
@ -6,7 +6,7 @@ or satellite receiver or modem."
|
||||||
HOMEPAGE = "http://support.ntp.org"
|
HOMEPAGE = "http://support.ntp.org"
|
||||||
SECTION = "console/network"
|
SECTION = "console/network"
|
||||||
LICENSE = "NTP"
|
LICENSE = "NTP"
|
||||||
LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=ebe123f74017224947c78d472407c10f"
|
LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=f41fedb22dffefcbfafecc85b0f79cfa"
|
||||||
|
|
||||||
DEPENDS = "libevent"
|
DEPENDS = "libevent"
|
||||||
|
|
||||||
|
@ -21,11 +21,10 @@ SRC_URI = "http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/ntp-${PV}.tar.g
|
||||||
file://sntp.service \
|
file://sntp.service \
|
||||||
file://sntp \
|
file://sntp \
|
||||||
file://ntpd.list \
|
file://ntpd.list \
|
||||||
file://ntp-4.2.8-ntp-keygen-no-openssl.patch \
|
|
||||||
"
|
"
|
||||||
|
|
||||||
SRC_URI[md5sum] = "6972a626be6150db8cfbd0b63d8719e7"
|
SRC_URI[md5sum] = "65d8cdfae4722226fbe29863477641ed"
|
||||||
SRC_URI[sha256sum] = "2e920df8b6a5a410567a73767fa458c00c7f0acec3213e69ed0134414a50d8ee"
|
SRC_URI[sha256sum] = "948274b88f1ed002d867ced6aaefdfd0999668b11285ac2b3a67ff2629d59d88"
|
||||||
|
|
||||||
inherit autotools update-rc.d useradd systemd pkgconfig
|
inherit autotools update-rc.d useradd systemd pkgconfig
|
||||||
|
|
||||||
|
@ -36,6 +35,7 @@ EXTRA_OECONF += "--with-net-snmp-config=no \
|
||||||
ac_cv_header_readline_history_h=no \
|
ac_cv_header_readline_history_h=no \
|
||||||
--with-yielding_select=yes \
|
--with-yielding_select=yes \
|
||||||
--with-locfile=redhat \
|
--with-locfile=redhat \
|
||||||
|
--enable-ATOM \
|
||||||
"
|
"
|
||||||
CFLAGS_append = " -DPTYS_ARE_GETPT -DPTYS_ARE_SEARCHED"
|
CFLAGS_append = " -DPTYS_ARE_GETPT -DPTYS_ARE_SEARCHED"
|
||||||
|
|
Loading…
Reference in New Issue