<pre style='margin:0'>
Michael Dickens (michaelld) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/ad932e77ce43719ff4ca240cbf32b1cf9e7db890">https://github.com/macports/macports-ports/commit/ad932e77ce43719ff4ca240cbf32b1cf9e7db890</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new ad932e7 osmocore-devel: update to 45f89c93 (20190103)
</span>ad932e7 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit ad932e77ce43719ff4ca240cbf32b1cf9e7db890
</span>Author: Michael Dickens <michaelld@macports.org>
AuthorDate: Tue Jan 8 15:05:06 2019 -0500
<span style='display:block; white-space:pre;color:#404040;'> osmocore-devel: update to 45f89c93 (20190103)
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Fix patches to work on both release and devel.
</span><span style='display:block; white-space:pre;color:#404040;'> Fix "revision" usage throughout.
</span>---
science/osmocore/Portfile | 41 ++++++++------
...ime.diff => patch-fix_clock_gettime.devel.diff} | 62 +++++++++++-----------
...e.diff => patch-fix_clock_gettime.release.diff} | 0
.../osmocore/files/patch-src_gsm_gsm_utils.c.diff | 39 ++++++++++++++
4 files changed, 96 insertions(+), 46 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/osmocore/Portfile b/science/osmocore/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 0fc6543..6243bb0 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/osmocore/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/osmocore/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,7 +5,6 @@ PortGroup github 1.0
</span> PortGroup legacysupport 1.0
name osmocore
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span> maintainers {michaelld @michaelld} openmaintainer
description ${name} provides a set of C-language libraries that form the core infrastructure of many Osmocom Open Source Mobile Communications projects.
long_description ${description}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -26,15 +25,36 @@ if {${subport} eq ${name}} {
</span> checksums rmd160 ecbe62d6de2c27d5e3264918d8703f9d49973109 \
sha256 b738ae043f838c6d8cb3a6239ba7506ea73dd350078510de8e563511d60a3688 \
size 1050188
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # fix stats.h to work within MacPorts
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-include_osmocom_core_stats.h.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # fix 'timer_clockgettime.c' to work with OSs that don't provide
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # the function 'clock_gettime' and/or its various options.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-fix_clock_gettime.release.diff
</span>
} else {
# devel
<span style='display:block; white-space:pre;background:#ffe0e0;'>- github.setup osmocom libosmocore a66de71f8e8614cff7edc85fe979420716e5672c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- version 20181123
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 2a844a4ef79b0971f875b1c3f5b1cf63df92bda1 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 99e04b9505c28b6444389e05aa66accc6ce5536c9e4d415e0ccef52b0d4c4174 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 1080574
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ github.setup osmocom libosmocore 45f89c938dcd5fce0bcaeee2e88c3ad7247277a0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 20190103
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 73eb12e41c5af2fb6b1e8208d159048e602bd040 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 14636299380dbaf276f22b8aec9856b4106327de694aa008c318ac3893df7470 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 1100499
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # fix 'timer_clockgettime.c' to work with OSs that don't provide
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # the function 'clock_gettime' and/or its various options.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-fix_clock_gettime.devel.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # fix #if for GLIBC to work nicely regardless of whether we're
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # using GLIBC or not
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-src_gsm_gsm_utils.c.diff
</span>
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -64,10 +84,6 @@ post-patch {
</span> ${worksrcpath}/utils/conv_gen.py \
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# fix stats.h to work within MacPorts
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-include_osmocom_core_stats.h.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # fix header variable declaration to be "extern" even though it should
# not technically be necessary.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -77,11 +93,6 @@ patchfiles-append patch-include_osmocom_coding_gsm0503_parity.h.diff
</span>
patchfiles-append patch-configure.ac.diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# fix 'timer_clockgettime.c' to work with OSs that don't provide
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# the function 'clock_gettime' and/or its various options.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-fix_clock_gettime.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # use autotools to get ready to configure
pre-configure {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/osmocore/files/patch-fix_clock_gettime.diff b/science/osmocore/files/patch-fix_clock_gettime.devel.diff
</span>similarity index 92%
copy from science/osmocore/files/patch-fix_clock_gettime.diff
copy to science/osmocore/files/patch-fix_clock_gettime.devel.diff
<span style='display:block; white-space:pre;color:#808080;'>index f780b6a..5693f53 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/osmocore/files/patch-fix_clock_gettime.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/osmocore/files/patch-fix_clock_gettime.devel.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,8 +1,8 @@
</span> diff --git a/configure.ac b/configure.ac
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index c5d1236..559d14a 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 4a00e69..f01d137 100644
</span> --- a/configure.ac
+++ b/configure.ac
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -56,6 +56,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -58,6 +58,12 @@ AC_SUBST(LTLDFLAGS_OSMOCTRL)
</span> dnl checks for header files
AC_HEADER_STDC
AC_CHECK_HEADERS(execinfo.h sys/select.h sys/socket.h sys/timerfd.h syslog.h ctype.h netinet/tcp.h)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -15,7 +15,7 @@ index c5d1236..559d14a 100644
</span> # for src/conv.c
AC_FUNC_ALLOCA
AC_SEARCH_LIBS([dlopen], [dl dld], [LIBRARY_DLOPEN="$LIBS";LIBS=""])
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -117,7 +123,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -123,7 +129,7 @@ AC_DEFUN([CHECK_TM_INCLUDES_TM_GMTOFF], [
</span> CHECK_TM_INCLUDES_TM_GMTOFF
dnl Generate the output
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -25,7 +25,7 @@ index c5d1236..559d14a 100644
</span> PKG_CHECK_MODULES(TALLOC, [talloc >= 2.0.1])
diff --git a/include/Makefile.am b/include/Makefile.am
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index d5fa802..54e3836 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 86d8d15..9ef320d 100644
</span> --- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -1,6 +1,7 @@
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -37,13 +37,13 @@ index d5fa802..54e3836 100644
</span> osmocom/codec/codec.h \
osmocom/codec/gsm610_bits.h \
diff --git a/include/osmocom/core/timer.h b/include/osmocom/core/timer.h
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index caf4c67..00f73ee 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 1979766..88c750d 100644
</span> --- a/include/osmocom/core/timer.h
+++ b/include/osmocom/core/timer.h
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -45,6 +45,12 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -46,6 +46,12 @@
</span> #include <osmocom/core/linuxlist.h>
#include <osmocom/core/linuxrbtree.h>
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <osmocom/core/timer_compat.h>
</span> +#include <osmocom/config.h>
+
+/* define this only if not already */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -119,7 +119,7 @@ index 5ac3c16..22a1fe0 100644
</span> #include <emmintrin.h>
#include <tmmintrin.h>
diff --git a/src/ctrl/control_if.c b/src/ctrl/control_if.c
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index 07de0d4..8870abf 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 0209f3b..c6fe503 100644
</span> --- a/src/ctrl/control_if.c
+++ b/src/ctrl/control_if.c
@@ -26,7 +26,7 @@
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -132,7 +132,7 @@ index 07de0d4..8870abf 100644
</span> #include <errno.h>
#include <inttypes.h>
diff --git a/src/gsm/auth_core.c b/src/gsm/auth_core.c
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index f171ed4..52acd51 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 9e750a0..0e4644d 100644
</span> --- a/src/gsm/auth_core.c
+++ b/src/gsm/auth_core.c
@@ -20,7 +20,7 @@
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -158,7 +158,7 @@ index 7f2b1a5..11daf0a 100644
</span> #include <errno.h>
#include <stdint.h>
diff --git a/src/gsm/gsm0411_utils.c b/src/gsm/gsm0411_utils.c
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index 53d37a4..2b6b32d 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index ccefe54..b773032 100644
</span> --- a/src/gsm/gsm0411_utils.c
+++ b/src/gsm/gsm0411_utils.c
@@ -27,7 +27,7 @@
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -171,7 +171,7 @@ index 53d37a4..2b6b32d 100644
</span> #include <time.h>
#include <string.h>
diff --git a/src/gsm/gsm0808_utils.c b/src/gsm/gsm0808_utils.c
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index 93e6074..692ea4e 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 2a458c3..c00ee95 100644
</span> --- a/src/gsm/gsm0808_utils.c
+++ b/src/gsm/gsm0808_utils.c
@@ -19,7 +19,7 @@
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -184,7 +184,7 @@ index 93e6074..692ea4e 100644
</span> #include <osmocom/core/utils.h>
#include <osmocom/core/msgb.h>
diff --git a/src/gsm/gsm_utils.c b/src/gsm/gsm_utils.c
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index 5d8c834..de834bb 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 02cb3d5..93863eb 100644
</span> --- a/src/gsm/gsm_utils.c
+++ b/src/gsm/gsm_utils.c
@@ -96,7 +96,7 @@
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -194,10 +194,10 @@ index 5d8c834..de834bb 100644
</span> -#include "../../config.h"
+#include <osmocom/config.h>
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if (!EMBEDDED)
</span> /* FIXME: this can be removed once we bump glibc requirements to 2.25: */
<span style='display:block; white-space:pre;background:#ffe0e0;'>- #if defined(__GLIBC__) && (__GLIBC__ >= 2) && (__GLIBC_MINOR__ >= 25)
</span> diff --git a/src/gsm/ipa.c b/src/gsm/ipa.c
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index e00e2d0..f586e5f 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index d423c26..4150e34 100644
</span> --- a/src/gsm/ipa.c
+++ b/src/gsm/ipa.c
@@ -24,7 +24,7 @@
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -210,7 +210,7 @@ index e00e2d0..f586e5f 100644
</span> #include <unistd.h>
#include <stdint.h>
diff --git a/src/gsm/mncc.c b/src/gsm/mncc.c
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index fa4726c..a96e6bc 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 938cf9a..417f332 100644
</span> --- a/src/gsm/mncc.c
+++ b/src/gsm/mncc.c
@@ -20,7 +20,7 @@
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -223,7 +223,7 @@ index fa4726c..a96e6bc 100644
</span> #ifdef HAVE_SYS_SOCKET_H
diff --git a/src/gsmtap_util.c b/src/gsmtap_util.c
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index b21c690..a311b14 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 385b467..d466ddb 100644
</span> --- a/src/gsmtap_util.c
+++ b/src/gsmtap_util.c
@@ -23,7 +23,7 @@
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -236,7 +236,7 @@ index b21c690..a311b14 100644
</span> #include <osmocom/core/gsmtap_util.h>
#include <osmocom/core/logging.h>
diff --git a/src/logging.c b/src/logging.c
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index 147b1fb..40aa3b6 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 2bb53ae..c6e0273 100644
</span> --- a/src/logging.c
+++ b/src/logging.c
@@ -29,7 +29,7 @@
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -249,7 +249,7 @@ index 147b1fb..40aa3b6 100644
</span> #include <stdarg.h>
#include <stdlib.h>
diff --git a/src/logging_gsmtap.c b/src/logging_gsmtap.c
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index f17f292..10f60c8 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 98d2aad..78666f1 100644
</span> --- a/src/logging_gsmtap.c
+++ b/src/logging_gsmtap.c
@@ -31,7 +31,7 @@
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -275,7 +275,7 @@ index f980689..9d9c254 100644
</span> #ifdef HAVE_SYSLOG_H
diff --git a/src/macaddr.c b/src/macaddr.c
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index afa7c93..dfdceb2 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index de9d07a..83b1c2b 100644
</span> --- a/src/macaddr.c
+++ b/src/macaddr.c
@@ -28,7 +28,7 @@
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -288,7 +288,7 @@ index afa7c93..dfdceb2 100644
</span> #include <stdint.h>
#include <string.h>
diff --git a/src/panic.c b/src/panic.c
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index a08f89f..49096ef 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 072f458..716bee7 100644
</span> --- a/src/panic.c
+++ b/src/panic.c
@@ -31,7 +31,7 @@
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -314,7 +314,7 @@ index 40de4f8..071061e 100644
</span> #if HAVE_DLFCN_H
diff --git a/src/select.c b/src/select.c
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index 1c62e01..2d3ae49 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index b594ca5..31ff66b 100644
</span> --- a/src/select.c
+++ b/src/select.c
@@ -36,7 +36,7 @@
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -340,7 +340,7 @@ index 2639bf8..15d2eed 100644
</span> #include <stdint.h>
#include <stdio.h>
diff --git a/src/socket.c b/src/socket.c
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index 0378970..13139db 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 4f3b1ca..3485091 100644
</span> --- a/src/socket.c
+++ b/src/socket.c
@@ -21,7 +21,7 @@
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -366,7 +366,7 @@ index b5adbf2..84fd626 100644
</span>
#include <osmocom/core/byteswap.h>
diff --git a/src/stats_statsd.c b/src/stats_statsd.c
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index c11c013..9c7e3bc 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index c3f739e..db6f76b 100644
</span> --- a/src/stats_statsd.c
+++ b/src/stats_statsd.c
@@ -25,7 +25,7 @@
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -379,7 +379,7 @@ index c11c013..9c7e3bc 100644
</span>
#include <osmocom/core/stats.h>
diff --git a/src/timer_clockgettime.c b/src/timer_clockgettime.c
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index 8d9760c..5ba2028 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 7b17fd1..e333fd0 100644
</span> --- a/src/timer_clockgettime.c
+++ b/src/timer_clockgettime.c
@@ -52,8 +52,100 @@
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -483,7 +483,7 @@ index 8d9760c..5ba2028 100644
</span> /*! An internal structure to handle overriden time for each clock type. */
struct fakeclock {
bool override;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -102,7 +194,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -102,7 +194,7 @@ int osmo_clock_gettime(clockid_t clk_id, struct timespec *tp)
</span> {
struct fakeclock* c = clkid_to_fakeclock(clk_id);
if (!c || !c->override)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -493,10 +493,10 @@ index 8d9760c..5ba2028 100644
</span> *tp = c->time;
return 0;
diff --git a/src/utils.c b/src/utils.c
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index 109aac0..4833ee5 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 35d70ac..9394733 100644
</span> --- a/src/utils.c
+++ b/src/utils.c
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -278,7 +278,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -319,7 +319,7 @@ char *osmo_osmo_hexdump_nospc(const unsigned char *buf, int len)
</span> __attribute__((weak, alias("osmo_hexdump_nospc")));
#endif
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -506,7 +506,7 @@ index 109aac0..4833ee5 100644
</span> #include <ctype.h>
/*! Convert an entire string to lower case
diff --git a/src/vty/fsm_vty.c b/src/vty/fsm_vty.c
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index 8628d15..dda45de 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 9bde241..0f17127 100644
</span> --- a/src/vty/fsm_vty.c
+++ b/src/vty/fsm_vty.c
@@ -23,7 +23,7 @@
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -519,7 +519,7 @@ index 8628d15..dda45de 100644
</span> #include <osmocom/vty/command.h>
#include <osmocom/vty/buffer.h>
diff --git a/src/vty/logging_vty.c b/src/vty/logging_vty.c
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index 09d207a..5b9fb22 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index f3e1419..43b3bcb 100644
</span> --- a/src/vty/logging_vty.c
+++ b/src/vty/logging_vty.c
@@ -24,7 +24,7 @@
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -532,7 +532,7 @@ index 09d207a..5b9fb22 100644
</span> #include <osmocom/core/talloc.h>
#include <osmocom/core/logging.h>
diff --git a/src/vty/stats_vty.c b/src/vty/stats_vty.c
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index faa136d..7736847 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index c911087..7c45e8b 100644
</span> --- a/src/vty/stats_vty.c
+++ b/src/vty/stats_vty.c
@@ -25,7 +25,7 @@
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -545,7 +545,7 @@ index faa136d..7736847 100644
</span> #include <osmocom/vty/command.h>
#include <osmocom/vty/buffer.h>
diff --git a/tests/socket/socket_test.c b/tests/socket/socket_test.c
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index 11ef8da..a10bfd3 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 37e0281..8447ac1 100644
</span> --- a/tests/socket/socket_test.c
+++ b/tests/socket/socket_test.c
@@ -33,7 +33,7 @@
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/osmocore/files/patch-fix_clock_gettime.diff b/science/osmocore/files/patch-fix_clock_gettime.release.diff
</span>similarity index 100%
rename from science/osmocore/files/patch-fix_clock_gettime.diff
rename to science/osmocore/files/patch-fix_clock_gettime.release.diff
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/osmocore/files/patch-src_gsm_gsm_utils.c.diff b/science/osmocore/files/patch-src_gsm_gsm_utils.c.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..d4240ac
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/osmocore/files/patch-src_gsm_gsm_utils.c.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,39 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/gsm/gsm_utils.c b/src/gsm/gsm_utils.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 93863eb..2acfdf8 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/src/gsm/gsm_utils.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/src/gsm/gsm_utils.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -100,7 +100,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if (!EMBEDDED)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* FIXME: this can be removed once we bump glibc requirements to 2.25: */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if defined(__GLIBC_PREREQ) && __GLIBC_PREREQ(2,25)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef __GLIBC_PREREQ
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if __GLIBC_PREREQ(2,25)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #pragma message ("glibc " OSMO_STRINGIFY_VAL(__GLIBC__) "." OSMO_STRINGIFY_VAL(__GLIBC_MINOR__) " random detected")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <sys/random.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #undef USE_GNUTLS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -110,6 +111,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define GRND_NONBLOCK 0x0001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif /* ifndef GRND_NONBLOCK */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif /* if __GLIBC_PREREQ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif /* ifdef __GLIBC_PREREQ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif /* !EMBEDDED */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if (USE_GNUTLS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -447,13 +449,15 @@ int osmo_get_rand_id(uint8_t *out, size_t len)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (len > OSMO_MAX_RAND_ID_LEN)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return -E2BIG;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if (!EMBEDDED)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if defined(__GLIBC_PREREQ) && __GLIBC_PREREQ(2,25)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef __GLIBC_PREREQ
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if __GLIBC_PREREQ(2,25)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rc = getrandom(out, len, GRND_NONBLOCK);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #elif HAVE_DECL_SYS_GETRANDOM
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #pragma message ("Using direct syscall access for getrandom(): consider upgrading to glibc >= 2.25")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* FIXME: this can be removed once we bump glibc requirements to 2.25: */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rc = syscall(SYS_getrandom, out, len, GRND_NONBLOCK);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif /* !EMBEDDED */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* getrandom() failed entirely: */
</span></pre><pre style='margin:0'>
</pre>