<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/3e3aa8a76c16c5abe558990832b5c93cea29bc54">https://github.com/macports/macports-ports/commit/3e3aa8a76c16c5abe558990832b5c93cea29bc54</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 3e3aa8a osmocore: update release to 1.1.0 and devel to 20190507-1fcdd0d1
</span>3e3aa8a is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 3e3aa8a76c16c5abe558990832b5c93cea29bc54
</span>Author: Michael Dickens <michaelld@macports.org>
AuthorDate: Tue May 7 14:29:02 2019 -0400
<span style='display:block; white-space:pre;color:#404040;'> osmocore: update release to 1.1.0 and devel to 20190507-1fcdd0d1
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Remove patch integrated into release.
</span><span style='display:block; white-space:pre;color:#404040;'> Fixup release patches to apply cleanly.
</span>---
science/osmocore/Portfile | 23 +++++--------
.../osmocore/files/patch-fix-python.release.diff | 4 +--
.../files/patch-fix_clock_gettime.release.diff | 20 +++++------
.../osmocore/files/patch-src_gsm_gsm_utils.c.diff | 39 ----------------------
4 files changed, 21 insertions(+), 65 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 0244bcd..c366ca6 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,10 +21,10 @@ subport osmocore-devel {}
</span> if {${subport} eq ${name}} {
# release
<span style='display:block; white-space:pre;background:#ffe0e0;'>- github.setup osmocom libosmocore 1.0.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 0fa1d4f8cfb7ce7f553768c983f302db8fbf2397 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 a7bd3b00ca473b4479f2796ffd2cf19ffe3734ed974af50550b2146dac7f8c1b \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 1120552
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ github.setup osmocom libosmocore 1.1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 ff487c8ce4cad67ff07486d59acc4460909d6770 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 8ecd54cdca7b295cbfcd36311e5ff84ecf4e6b9ceba42fd57da0a82d94c76d7e \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 1210974
</span> revision 0
# fix 'timer_clockgettime.c' to work with OSs that don't provide
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -36,19 +36,14 @@ if {${subport} eq ${name}} {
</span>
patchfiles-append patch-fix-python.release.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> } else {
# devel
<span style='display:block; white-space:pre;background:#ffe0e0;'>- github.setup osmocom libosmocore 412a4bb6f66382cc6fc37313b46ad27343d4cae6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- version 20190502-[string range ${github.version} 0 7]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 b09ce5dd639ca7fc8c85027f4ed5ec1070de1e27 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 75b5a2a85df6832d40f9dcf656599b323a54e709d30000bcae531953ef034530 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 1206673
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ github.setup osmocom libosmocore 1fcdd0d1b8ab13ea3d70346508a3a61526f717f4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 20190507-[string range ${github.version} 0 7]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 aee8633444ce909daa367ca9bde4f7abae3d919e \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 7e54ed5d2b9813fdb5a3a4808a2eee97513f6cf95f785b5de646341cd362d7a2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 1210960
</span> revision 0
# fix 'timer_clockgettime.c' to work with OSs that don't provide
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/osmocore/files/patch-fix-python.release.diff b/science/osmocore/files/patch-fix-python.release.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 50cf1b1..2b04a34 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/osmocore/files/patch-fix-python.release.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/osmocore/files/patch-fix-python.release.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;'>-@@ -173,7 +173,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -177,7 +177,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;'>@@ -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;'>-@@ -305,7 +305,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -350,7 +350,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 5693f53..614c061 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;'>@@ -5,7 +5,7 @@ index 4a00e69..f01d137 100644
</span> @@ -58,6 +58,12 @@ AC_SUBST(LTLDFLAGS_OSMOCTRL)
dnl checks for header files
AC_HEADER_STDC
<span style='display:block; white-space:pre;background:#ffe0e0;'>- AC_CHECK_HEADERS(execinfo.h sys/select.h sys/socket.h sys/timerfd.h syslog.h ctype.h netinet/tcp.h)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_CHECK_HEADERS(execinfo.h sys/select.h sys/socket.h sys/timerfd.h syslog.h ctype.h netinet/tcp.h netinet/in.h)
</span> +
+dnl check for Mach / Darwin / Mac OS X / macOS specifics
+dnl used in src/timer_clockgettime.c
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -25,7 +25,7 @@ index 4a00e69..f01d137 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 86d8d15..9ef320d 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 17f7d1c..300decb 100644
</span> --- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -1,6 +1,7 @@
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -171,7 +171,7 @@ index ccefe54..b773032 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 2a458c3..c00ee95 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 54ec19c..7882b89 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;'>@@ -236,7 +236,7 @@ index 385b467..d466ddb 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 2bb53ae..c6e0273 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 09021e4..ad1451d 100644
</span> --- a/src/logging.c
+++ b/src/logging.c
@@ -29,7 +29,7 @@
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -314,12 +314,12 @@ 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 b594ca5..31ff66b 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 4e7be35..7002c3a 100644
</span> --- a/src/select.c
+++ b/src/select.c
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -36,7 +36,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <osmocom/core/linuxlist.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -37,7 +37,7 @@
</span> #include <osmocom/core/timer.h>
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <osmocom/core/logging.h>
</span>
-#include "../config.h"
+#include <osmocom/config.h>
<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 4f3b1ca..3485091 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 37fd584..d5ba887 100644
</span> --- a/src/socket.c
+++ b/src/socket.c
@@ -21,7 +21,7 @@
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -493,10 +493,10 @@ index 7b17fd1..e333fd0 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 35d70ac..9394733 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 2d5bcb0..81dd64b 100644
</span> --- a/src/utils.c
+++ b/src/utils.c
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -319,7 +319,7 @@ char *osmo_osmo_hexdump_nospc(const unsigned char *buf, int len)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -407,7 +407,7 @@
</span> __attribute__((weak, alias("osmo_hexdump_nospc")));
#endif
<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>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index d4240ac..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/osmocore/files/patch-src_gsm_gsm_utils.c.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,39 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/src/gsm/gsm_utils.c b/src/gsm/gsm_utils.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 93863eb..2acfdf8 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/src/gsm/gsm_utils.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/src/gsm/gsm_utils.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -100,7 +100,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #if (!EMBEDDED)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* FIXME: this can be removed once we bump glibc requirements to 2.25: */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#if defined(__GLIBC_PREREQ) && __GLIBC_PREREQ(2,25)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifdef __GLIBC_PREREQ
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if __GLIBC_PREREQ(2,25)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #pragma message ("glibc " OSMO_STRINGIFY_VAL(__GLIBC__) "." OSMO_STRINGIFY_VAL(__GLIBC_MINOR__) " random detected")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <sys/random.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #undef USE_GNUTLS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -110,6 +111,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define GRND_NONBLOCK 0x0001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif /* ifndef GRND_NONBLOCK */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif /* if __GLIBC_PREREQ */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif /* ifdef __GLIBC_PREREQ */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif /* !EMBEDDED */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #if (USE_GNUTLS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -447,13 +449,15 @@ int osmo_get_rand_id(uint8_t *out, size_t len)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (len > OSMO_MAX_RAND_ID_LEN)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return -E2BIG;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #if (!EMBEDDED)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#if defined(__GLIBC_PREREQ) && __GLIBC_PREREQ(2,25)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifdef __GLIBC_PREREQ
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if __GLIBC_PREREQ(2,25)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rc = getrandom(out, len, GRND_NONBLOCK);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #elif HAVE_DECL_SYS_GETRANDOM
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #pragma message ("Using direct syscall access for getrandom(): consider upgrading to glibc >= 2.25")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* FIXME: this can be removed once we bump glibc requirements to 2.25: */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rc = syscall(SYS_getrandom, out, len, GRND_NONBLOCK);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif /* !EMBEDDED */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* getrandom() failed entirely: */
</span></pre><pre style='margin:0'>
</pre>