<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/c77c5868b88ad31da35ed9811b82a22422147c53">https://github.com/macports/macports-ports/commit/c77c5868b88ad31da35ed9811b82a22422147c53</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 c77c586 osmocore: update release to 1.0.1 and devel to 89991fdb (20190129)
</span>c77c586 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit c77c5868b88ad31da35ed9811b82a22422147c53
</span>Author: Michael Dickens <michaelld@macports.org>
AuthorDate: Sat Feb 2 09:33:46 2019 -0500
<span style='display:block; white-space:pre;color:#404040;'> osmocore: update release to 1.0.1 and devel to 89991fdb (20190129)
</span>---
science/osmocore/Portfile | 55 +++++++++----------
science/osmocore/files/patch-configure.ac.diff | 4 +-
science/osmocore/files/patch-fix-python.diff | 6 +--
.../files/patch-fix_clock_gettime.release.diff | 62 +++++++++++-----------
.../files/patch-include_osmocom_core_stats.h.diff | 23 --------
5 files changed, 62 insertions(+), 88 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 87f29a9..16f80ca 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;'>@@ -21,15 +21,11 @@ subport osmocore-devel {}
</span> if {${subport} eq ${name}} {
# release
<span style='display:block; white-space:pre;background:#ffe0e0;'>- github.setup osmocom libosmocore 0.12.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 ecbe62d6de2c27d5e3264918d8703f9d49973109 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 b738ae043f838c6d8cb3a6239ba7506ea73dd350078510de8e563511d60a3688 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 1050188
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><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:#e0ffe0;'>+ github.setup osmocom libosmocore 1.0.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 0fa1d4f8cfb7ce7f553768c983f302db8fbf2397 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 a7bd3b00ca473b4479f2796ffd2cf19ffe3734ed974af50550b2146dac7f8c1b \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 1120552
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 0
</span>
# fix 'timer_clockgettime.c' to work with OSs that don't provide
# the function 'clock_gettime' and/or its various options.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -39,11 +35,11 @@ if {${subport} eq ${name}} {
</span> } else {
# devel
<span style='display:block; white-space:pre;background:#ffe0e0;'>- github.setup osmocom libosmocore 4ff41d94ce72afca20f9faaab1ab2f367f1e51aa
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- version 20190128
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 53c4e593290dbf7f0192dcd72f67d2989c28a465 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 be50b5fedcfc3a3c68492ac11f5809cc2d3a421683c784506d5e91a830c430e6 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 1127573
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ github.setup osmocom libosmocore 89991fdb7c01fa42e323577b4026985e580763cf
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 20190129
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 e5c50ad54bf9c49be6460d258832a536b666fe3f \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 51b090fdbb4604b53273a584cc803a8389363da7196d1c853adada35ba1ed033 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 1128131
</span> revision 0
# fix 'timer_clockgettime.c' to work with OSs that don't provide
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -51,11 +47,6 @@ if {${subport} eq ${name}} {
</span>
patchfiles-append patch-fix_clock_gettime.devel.diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # fix #if for GLIBC to work nicely regardless of whether we're
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # using GLIBC or not
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-src_gsm_gsm_utils.c.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> }
depends_build-append \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -70,10 +61,25 @@ depends_lib-append \
</span> port:python27 \
port:talloc
<span style='display:block; white-space:pre;background:#e0ffe0;'>+patch.pre_args -p1
</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:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# update configure.ac to current automake standards
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-configure.ac.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# fix header variable declaration to be "extern" even though it should
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# not technically be necessary.
</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_coding_gsm0503_parity.h.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # fix use of Python2
patchfiles-append patch-fix-python.diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patch.pre_args -p1
</span>
post-patch {
reinplace "s|@PYTHON_EXECUTABLE@|${frameworks_dir}/Python.framework/Versions/2.7/bin/python2.7|g" \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -84,15 +90,6 @@ post-patch {
</span> ${worksrcpath}/utils/conv_gen.py \
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# fix header variable declaration to be "extern" even though it should
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# not technically be necessary.
</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_coding_gsm0503_parity.h.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# update configure.ac to current automake standards
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-configure.ac.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-configure.ac.diff b/science/osmocore/files/patch-configure.ac.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index fb1f245..03b037f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/osmocore/files/patch-configure.ac.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/osmocore/files/patch-configure.ac.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -10,7 +10,7 @@ index 7f2aabd..8cfe69f 100644
</span>
dnl *This* is the root dir, even if an install-sh exists in ../ or ../../
AC_CONFIG_AUX_DIR([.])
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -360,8 +358,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -370,8 +368,7 @@
</span> AC_MSG_RESULT([CFLAGS="$CFLAGS"])
AC_MSG_RESULT([CPPFLAGS="$CPPFLAGS"])
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20,7 +20,7 @@ index 7f2aabd..8cfe69f 100644
</span> libosmocodec.pc
libosmocoding.pc
libosmovty.pc
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -389,4 +386,5 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -399,4 +396,5 @@
</span> Doxyfile.coding
Doxyfile.gb
Doxyfile.ctrl
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/osmocore/files/patch-fix-python.diff b/science/osmocore/files/patch-fix-python.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 0f2aa2e..7a62b6f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/osmocore/files/patch-fix-python.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/osmocore/files/patch-fix-python.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2,7 +2,7 @@ diff --git a/include/Makefile.am b/include/Makefile.am
</span> index 19695d1..6a746b1 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -167,7 +167,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -173,7 +173,7 @@
</span> $(AM_V_GEN)sed -e's/XX/$*/g' $< > $@
osmocom/gsm/gsm0503.h: $(top_srcdir)/utils/conv_gen.py $(top_srcdir)/utils/conv_codes_gsm.py
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -15,7 +15,7 @@ diff --git a/src/gsm/Makefile.am b/src/gsm/Makefile.am
</span> index 29299a6..fe519ae 100644
--- a/src/gsm/Makefile.am
+++ b/src/gsm/Makefile.am
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -48,6 +48,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -49,6 +49,6 @@
</span>
# Convolutional codes generation
gsm0503_conv.c: $(top_srcdir)/utils/conv_gen.py $(top_srcdir)/utils/conv_codes_gsm.py
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27,7 +27,7 @@ diff --git a/tests/Makefile.am b/tests/Makefile.am
</span> index 18d4bb4..6191867 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -302,7 +302,7 @@ $(TESTSUITE): $(srcdir)/testsuite.at $(srcdir)/package.m4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -306,7 +306,7 @@
</span> mv $@.tmp $@
conv/gsm0503_test_vectors.c: $(top_srcdir)/utils/conv_gen.py $(top_srcdir)/utils/conv_codes_gsm.py
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/osmocore/files/patch-fix_clock_gettime.release.diff b/science/osmocore/files/patch-fix_clock_gettime.release.diff
</span><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.release.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/osmocore/files/patch-fix_clock_gettime.release.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-include_osmocom_core_stats.h.diff b/science/osmocore/files/patch-include_osmocom_core_stats.h.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index e9f0bed..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/osmocore/files/patch-include_osmocom_core_stats.h.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,23 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/include/osmocom/core/stats.h b/include/osmocom/core/stats.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index e4d46ba..6546580 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/include/osmocom/core/stats.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/include/osmocom/core/stats.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -24,12 +24,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * @{
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * \file stats.h */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--/* a bit of a crude way to disable building/using this on (bare iron)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- * embedded systems. We cannot use the autoconf-defined HAVE_... macros
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- * here, as that only works at library compile time, not at application
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- * compile time */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#ifdef unix
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <sys/socket.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <arpa/inet.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -141,5 +135,4 @@ int osmo_stats_reporter_send_buffer(struct osmo_stats_reporter *srep);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int osmo_stats_reporter_udp_open(struct osmo_stats_reporter *srep);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int osmo_stats_reporter_udp_close(struct osmo_stats_reporter *srep);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#endif /* unix */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /*! @} */
</span></pre><pre style='margin:0'>
</pre>