From b3727508e415b9a2524179433f4f2bd2f6d33b4f58d9249ae1c91507ba7cb95c Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Thu, 15 Aug 2019 05:26:30 +0000 Subject: [PATCH] - Update to new upstream release 0.5.0 OBS-URL: https://build.opensuse.org/package/show/network:telephony/osmo-iuh?expand=0&rev=18 --- 0001-iu_client-uses-gprs_msgb.h.patch | 20 +++++++------- _service | 4 +-- damncode.diff | 39 +++++++++++++++++++++++++++ osmo-iuh-0.4.0.tar.xz | 3 --- osmo-iuh-0.5.0.tar.xz | 3 +++ osmo-iuh.changes | 8 ++++++ osmo-iuh.spec | 18 +++++++------ 7 files changed, 72 insertions(+), 23 deletions(-) create mode 100644 damncode.diff delete mode 100644 osmo-iuh-0.4.0.tar.xz create mode 100644 osmo-iuh-0.5.0.tar.xz diff --git a/0001-iu_client-uses-gprs_msgb.h.patch b/0001-iu_client-uses-gprs_msgb.h.patch index 361b260..cef45a0 100644 --- a/0001-iu_client-uses-gprs_msgb.h.patch +++ b/0001-iu_client-uses-gprs_msgb.h.patch @@ -7,22 +7,22 @@ Subject: [PATCH] iu_client uses gprs_msgb.h src/Makefile.am | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) -Index: osmo-iuh-0.3.0/configure.ac +Index: osmo-iuh-0.5.0/configure.ac =================================================================== ---- osmo-iuh-0.3.0.orig/configure.ac -+++ osmo-iuh-0.3.0/configure.ac +--- osmo-iuh-0.5.0.orig/configure.ac ++++ osmo-iuh-0.5.0/configure.ac @@ -34,6 +34,7 @@ fi PKG_PROG_PKG_CONFIG([0.20]) - PKG_CHECK_MODULES(OSMOCORE, libosmocore >= 0.11.0) + PKG_CHECK_MODULES(OSMOCORE, libosmocore >= 0.12.0) +PKG_CHECK_MODULES([OSMOGB], [libosmogb]) - PKG_CHECK_MODULES(OSMOGSM, libosmogsm >= 0.11.0) - PKG_CHECK_MODULES(OSMOVTY, libosmovty >= 0.11.0) - PKG_CHECK_MODULES(OSMOCTRL, libosmoctrl >= 0.11.0) -Index: osmo-iuh-0.3.0/src/Makefile.am + PKG_CHECK_MODULES(OSMOGSM, libosmogsm >= 0.12.0) + PKG_CHECK_MODULES(OSMOVTY, libosmovty >= 0.12.0) + PKG_CHECK_MODULES(OSMOCTRL, libosmoctrl >= 0.12.0) +Index: osmo-iuh-0.5.0/src/Makefile.am =================================================================== ---- osmo-iuh-0.3.0.orig/src/Makefile.am -+++ osmo-iuh-0.3.0/src/Makefile.am +--- osmo-iuh-0.5.0.orig/src/Makefile.am ++++ osmo-iuh-0.5.0/src/Makefile.am @@ -42,9 +42,10 @@ gen_ranap.stamp: $(ASN1_ROOT)/ranap/RANA ranap_decoder.c ranap_encoder.c: gen_ranap.stamp diff --git a/_service b/_service index 03d2af8..3cd6efb 100644 --- a/_service +++ b/_service @@ -2,8 +2,8 @@ git git://git.osmocom.org/osmo-iuh - 0.4.0 - 0.4.0 + 0.5.0 + 0.5.0 *.tar diff --git a/damncode.diff b/damncode.diff new file mode 100644 index 0000000..38d0734 --- /dev/null +++ b/damncode.diff @@ -0,0 +1,39 @@ + +Work around the bad quality of compile testing of the project. + +[ 44s] hnb-test.c: In function 'hnb_test_nas_rx_auth_req': +[ 44s] hnb-test.c:329:3: error: 'return' with no value, in function returning non-void [-Werror=return-type] +[ 44s] 329 | return; +[ 42s] test_common.c:91:1: error: control reaches end of non-void function [-Werror=return-type] +[ 42s] 91 | } + +--- + src/tests/hnb-test.c | 2 +- + src/tests/test_common.c | 1 + + 2 files changed, 2 insertions(+), 1 deletion(-) + +Index: osmo-iuh-0.5.0/src/tests/hnb-test.c +=================================================================== +--- osmo-iuh-0.5.0.orig/src/tests/hnb-test.c ++++ osmo-iuh-0.5.0/src/tests/hnb-test.c +@@ -326,7 +326,7 @@ static int hnb_test_nas_rx_auth_req(stru + + if (len < sizeof(*ar)) { + printf("GSM48 Auth Req does not fit.\n"); +- return; ++ return -1; + } + + printf(" :) Authentication Request :)\n"); +Index: osmo-iuh-0.5.0/src/tests/test_common.c +=================================================================== +--- osmo-iuh-0.5.0.orig/src/tests/test_common.c ++++ osmo-iuh-0.5.0/src/tests/test_common.c +@@ -88,6 +88,7 @@ int test_common_init(void) + + log_set_print_filename(osmo_stderr_target, 0); + log_set_use_color(osmo_stderr_target, 0); ++ return rc; + } + + void test_common_cleanup(void) diff --git a/osmo-iuh-0.4.0.tar.xz b/osmo-iuh-0.4.0.tar.xz deleted file mode 100644 index b5a461a..0000000 --- a/osmo-iuh-0.4.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4e0808883e8a1b756fee0361d0bb7360bbedbf01c7658b4bdde3b2d37337d4ff -size 10055364 diff --git a/osmo-iuh-0.5.0.tar.xz b/osmo-iuh-0.5.0.tar.xz new file mode 100644 index 0000000..68f8b1c --- /dev/null +++ b/osmo-iuh-0.5.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2dad0193bfbdf774ab80d39ef42d22bbe3cdff8f9eae5fd4f61d04961b8d69d3 +size 10064080 diff --git a/osmo-iuh.changes b/osmo-iuh.changes index 0f4634c..b74b73f 100644 --- a/osmo-iuh.changes +++ b/osmo-iuh.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Thu Aug 15 05:13:01 UTC 2019 - Jan Engelhardt + +- Update to new upstream release 0.5.0 + * osmo-hnbgw: reply with RESET ACK when receiving a RESET + * Add VTY reference manual +- Add damncode.diff + ------------------------------------------------------------------- Thu Feb 21 19:39:50 UTC 2019 - Martin Hauke diff --git a/osmo-iuh.spec b/osmo-iuh.spec index 9d16bf1..dcba69d 100644 --- a/osmo-iuh.spec +++ b/osmo-iuh.spec @@ -18,13 +18,15 @@ Name: osmo-iuh %define lname libosmo-ranap2 -Version: 0.4.0 +Version: 0.5.0 Release: 0 Summary: Osmocom code for the Iuh interface (HNBAP, RUA, RANAP) License: AGPL-3.0-or-later AND GPL-2.0-or-later Group: Hardware/Mobile -Url: https://osmocom.org/projects/osmohnbgw/wiki +URL: https://osmocom.org/projects/osmohnbgw/wiki + Source: %name-%version.tar.xz +Patch1: damncode.diff Patch3: 0001-iu_client-uses-gprs_msgb.h.patch BuildRequires: automake >= 1.9 BuildRequires: libtool >= 2 @@ -34,13 +36,13 @@ BuildRequires: pkg-config >= 0.20 BuildRequires: python2 BuildRequires: xz BuildRequires: pkgconfig(libasn1c) >= 0.9.30 -BuildRequires: pkgconfig(libosmo-netif) >= 0.2.0 -BuildRequires: pkgconfig(libosmo-sigtran) >= 0.9.0 -BuildRequires: pkgconfig(libosmocore) >= 0.11.0 -BuildRequires: pkgconfig(libosmoctrl) >= 0.11.0 +BuildRequires: pkgconfig(libosmo-netif) >= 0.3.0 +BuildRequires: pkgconfig(libosmo-sigtran) >= 0.10.0 +BuildRequires: pkgconfig(libosmocore) >= 0.12.0 +BuildRequires: pkgconfig(libosmoctrl) >= 0.12.0 BuildRequires: pkgconfig(libosmogb) -BuildRequires: pkgconfig(libosmogsm) >= 0.11.0 -BuildRequires: pkgconfig(libosmovty) >= 0.11.0 +BuildRequires: pkgconfig(libosmogsm) >= 0.12.0 +BuildRequires: pkgconfig(libosmovty) >= 0.12.0 %description Osmocom code for the Iuh interface (HNBAP, RUA, RANAP)