From 5061d7044558043f581de3d531f04beb449a9ad3 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sun, 11 Aug 2019 15:31:07 +0200
Subject: [PATCH] libosmocore: update to 1.2.0.

---
 common/shlibs                              |  6 +--
 srcpkgs/libosmocore/patches/fix-musl.patch | 43 ----------------------
 srcpkgs/libosmocore/template               |  4 +-
 3 files changed, 5 insertions(+), 48 deletions(-)
 delete mode 100644 srcpkgs/libosmocore/patches/fix-musl.patch

diff --git a/common/shlibs b/common/shlibs
index 011a128d93c..36a868b472a 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1600,12 +1600,12 @@ libplibnet.so.1 plib-1.8.5_1
 libplibpsl.so.1 plib-1.8.5_1
 libplibpw.so.1 plib-1.8.5_1
 libode.so.8 libode-0.16_1
-libosmocore.so.12 libosmocore-1.0.0_1
+libosmocore.so.12 libosmocore-1.2.0_1
 libosmovty.so.4 libosmocore-0.10.2_1
 libosmosim.so.0 libosmocore-0.8.0_1
 libosmocodec.so.0 libosmocore-0.6.6_1
-libosmogsm.so.11 libosmocore-1.0.0_1
-libosmogb.so.6 libosmocore-0.12.1_1
+libosmogsm.so.13 libosmocore-1.2.0_1
+libosmogb.so.9 libosmocore-1.2.0_1
 libosmoctrl.so.0 libosmocore-0.7.0_1
 libgtkglext-x11-1.0.so.0 gtkglext-1.2.0_4
 libgdkglext-x11-1.0.so.0 gtkglext-1.2.0_4
diff --git a/srcpkgs/libosmocore/patches/fix-musl.patch b/srcpkgs/libosmocore/patches/fix-musl.patch
deleted file mode 100644
index c9832e1b643..00000000000
--- a/srcpkgs/libosmocore/patches/fix-musl.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-diff --git a/src/gsm/gsm_utils.c b/src/gsm/gsm_utils.c
-index 02cb3d5..5233b63 100644
---- src/gsm/gsm_utils.c
-+++ src/gsm/gsm_utils.c
-@@ -100,7 +100,8 @@
- 
- #if (!EMBEDDED)
- /* FIXME: this can be removed once we bump glibc requirements to 2.25: */
--#if defined(__GLIBC_PREREQ) && __GLIBC_PREREQ(2,25)
-+#if defined(__GLIBC_PREREQ)
-+#if __GLIBC_PREREQ(2,25)
- #pragma message ("glibc " OSMO_STRINGIFY_VAL(__GLIBC__) "." OSMO_STRINGIFY_VAL(__GLIBC_MINOR__) " random detected")
- #include <sys/random.h>
- #undef USE_GNUTLS
-@@ -109,7 +110,8 @@
- #ifndef GRND_NONBLOCK
- #define GRND_NONBLOCK 0x0001
- #endif /* ifndef GRND_NONBLOCK */
--#endif /* if __GLIBC_PREREQ */
-+#endif /* if defined( __GLIBC_PREREQ) */
-+#endif /* if __GLIB_PREREQ(2,24) */
- #endif /* !EMBEDDED */
- 
- #if (USE_GNUTLS)
-@@ -447,13 +449,15 @@ int osmo_get_rand_id(uint8_t *out, size_t len)
- 	if (len > OSMO_MAX_RAND_ID_LEN)
-                return -E2BIG;
- #if (!EMBEDDED)
--#if defined(__GLIBC_PREREQ) && __GLIBC_PREREQ(2,25)
-+#if defined(__GLIBC_PREREQ)
-+#if __GLIBC_PREREQ(2,25)
- 	rc = getrandom(out, len, GRND_NONBLOCK);
- #elif HAVE_DECL_SYS_GETRANDOM
- #pragma message ("Using direct syscall access for getrandom(): consider upgrading to glibc >= 2.25")
- 	/* FIXME: this can be removed once we bump glibc requirements to 2.25: */
- 	rc = syscall(SYS_getrandom, out, len, GRND_NONBLOCK);
--#endif
-+#endif /* if __GLIBC_PREREQ(2,25) */
-+#endif /* if defined(__GLIBC_PREREQ) */
- #endif /* !EMBEDDED */
- 
- 	/* getrandom() failed entirely: */
-
diff --git a/srcpkgs/libosmocore/template b/srcpkgs/libosmocore/template
index 0bd7875c5c5..bbfab6f4cd2 100644
--- a/srcpkgs/libosmocore/template
+++ b/srcpkgs/libosmocore/template
@@ -1,6 +1,6 @@
 # Template file for 'libosmocore'
 pkgname=libosmocore
-version=1.0.1
+version=1.2.0
 revision=1
 build_style=gnu-configure
 configure_args="--exec-prefix=/usr --libexecdir=/usr/lib
@@ -12,7 +12,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://bb.osmocom.org/trac/wiki/libosmocore"
 distfiles="https://git.osmocom.org/libosmocore/snapshot/libosmocore-${version}.tar.gz"
-checksum=29dcdbec549b64b9c5114fbf8251c8a8dc2f8f390919f0a545139d9373eea09c
+checksum=74b8e0edb2a97eb3665f4004ed7b5c6a42c2e3f5fe29dcd5d474e7c4d1d11888
 
 pre_configure() {
 	autoreconf -i