From d1f5e1573534288b8979d5a39ab1e9b1ba58a6ee7947b6d6beabb7b47ca52cc0 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Tue, 7 Jan 2020 11:52:02 +0000 Subject: [PATCH 1/2] Accepting request 760942 from home:mnhauke:osmocom:CNI-2020-01 - Update to new upstream release 0.6.0 * sabp: Generate C/H files for SABP; create libosmo-sabp * sabp: Add Procedure Codes and IEI constants to CommonDataTypes * sabp: fixup SABP ASN.1 to avoid IOC (which are not supported by our toolchain) * sabp: Initial import of SABP ASN.1 from 3GPP TS 25.419 V11.1.0 (2013-03) * hnbgw: Add libosmoctrl's VTY CTRL command initialization * iu_client: allow to control the notifications - Add subpackage for libosmo-sabp - Update patch: * 0001-iu_client-uses-gprs_msgb.h.patch OBS-URL: https://build.opensuse.org/request/show/760942 OBS-URL: https://build.opensuse.org/package/show/network:telephony/osmo-iuh?expand=0&rev=20 --- 0001-iu_client-uses-gprs_msgb.h.patch | 31 +++++++----------- _service | 4 +-- osmo-iuh-0.5.0.tar.xz | 3 -- osmo-iuh-0.6.0.tar.xz | 3 ++ osmo-iuh.changes | 16 +++++++++ osmo-iuh.spec | 47 ++++++++++++++++++++++----- 6 files changed, 71 insertions(+), 33 deletions(-) delete mode 100644 osmo-iuh-0.5.0.tar.xz create mode 100644 osmo-iuh-0.6.0.tar.xz diff --git a/0001-iu_client-uses-gprs_msgb.h.patch b/0001-iu_client-uses-gprs_msgb.h.patch index cef45a0..4fb1cd6 100644 --- a/0001-iu_client-uses-gprs_msgb.h.patch +++ b/0001-iu_client-uses-gprs_msgb.h.patch @@ -1,16 +1,7 @@ -From: Jan Engelhardt -Date: Tue, 2 Jan 2018 00:21:09 +0100 -Subject: [PATCH] iu_client uses gprs_msgb.h - ---- - configure.ac | 1 + - src/Makefile.am | 5 +++-- - 2 files changed, 4 insertions(+), 2 deletions(-) - -Index: osmo-iuh-0.5.0/configure.ac -=================================================================== ---- osmo-iuh-0.5.0.orig/configure.ac -+++ osmo-iuh-0.5.0/configure.ac +diff --git a/configure.ac b/configure.ac +index 6328975..4e54137 100644 +--- a/configure.ac ++++ b/configure.ac @@ -34,6 +34,7 @@ fi PKG_PROG_PKG_CONFIG([0.20]) @@ -19,13 +10,13 @@ Index: osmo-iuh-0.5.0/configure.ac 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.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 +diff --git a/src/Makefile.am b/src/Makefile.am +index 1c3a64a..a13295b 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -55,9 +55,10 @@ gen_sabp.stamp: $(ASN1_ROOT)/sabp/SABP-PDU-Contents.asn $(ASN1TOSTRUCT) + sabp_decoder.c sabp_encoder.c: gen_sabp.stamp - ranap_decoder.c ranap_encoder.c: gen_ranap.stamp -AM_CFLAGS = -Wall -I$(top_srcdir)/include -I$(top_builddir)/include \ +AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include \ @@ -34,5 +25,5 @@ Index: osmo-iuh-0.5.0/src/Makefile.am + $(OSMONETIF_CFLAGS) $(ASN1C_CFLAGS) $(OSMOSIGTRAN_CFLAGS) $(OSMOGB_CFLAGS) +AM_CFLAGS = -Wall - # build the shared RANAP library + # build the shared RANAP + SABP library # diff --git a/_service b/_service index 3cd6efb..3f09881 100644 --- a/_service +++ b/_service @@ -2,8 +2,8 @@ git git://git.osmocom.org/osmo-iuh - 0.5.0 - 0.5.0 + 0.6.0 + 0.6.0 *.tar diff --git a/osmo-iuh-0.5.0.tar.xz b/osmo-iuh-0.5.0.tar.xz deleted file mode 100644 index 68f8b1c..0000000 --- a/osmo-iuh-0.5.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2dad0193bfbdf774ab80d39ef42d22bbe3cdff8f9eae5fd4f61d04961b8d69d3 -size 10064080 diff --git a/osmo-iuh-0.6.0.tar.xz b/osmo-iuh-0.6.0.tar.xz new file mode 100644 index 0000000..1ca5b9b --- /dev/null +++ b/osmo-iuh-0.6.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:63261745987b15550e29cf9442f2ef395c7fc7c21d0da20c1bf6f20867c5e32d +size 10090496 diff --git a/osmo-iuh.changes b/osmo-iuh.changes index b74b73f..f88ca36 100644 --- a/osmo-iuh.changes +++ b/osmo-iuh.changes @@ -1,3 +1,19 @@ +------------------------------------------------------------------- +Sun Jan 5 10:57:39 UTC 2020 - Martin Hauke + +- Update to new upstream release 0.6.0 + * sabp: Generate C/H files for SABP; create libosmo-sabp + * sabp: Add Procedure Codes and IEI constants to CommonDataTypes + * sabp: fixup SABP ASN.1 to avoid IOC (which are not supported + by our toolchain) + * sabp: Initial import of SABP ASN.1 from 3GPP TS 25.419 V11.1.0 + (2013-03) + * hnbgw: Add libosmoctrl's VTY CTRL command initialization + * iu_client: allow to control the notifications +- Add subpackage for libosmo-sabp +- Update patch: + * 0001-iu_client-uses-gprs_msgb.h.patch + ------------------------------------------------------------------- Thu Aug 15 05:13:01 UTC 2019 - Jan Engelhardt diff --git a/osmo-iuh.spec b/osmo-iuh.spec index dcba69d..17748c9 100644 --- a/osmo-iuh.spec +++ b/osmo-iuh.spec @@ -1,7 +1,7 @@ # # spec file for package osmo-iuh # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,8 +17,8 @@ Name: osmo-iuh -%define lname libosmo-ranap2 -Version: 0.5.0 +%define lname libosmo-ranap3 +Version: 0.6.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 @@ -32,8 +32,8 @@ BuildRequires: automake >= 1.9 BuildRequires: libtool >= 2 BuildRequires: lksctp-tools-devel BuildRequires: pkg-config >= 0.20 -# python2 for asn1tostruct.py -BuildRequires: python2 +# python3 for asn1tostruct.py +BuildRequires: python3 BuildRequires: xz BuildRequires: pkgconfig(libasn1c) >= 0.9.30 BuildRequires: pkgconfig(libosmo-netif) >= 0.3.0 @@ -65,6 +65,25 @@ Osmocom code for the Iuh interface (HNBAP, RUA, RANAP) This subpackage contains libraries and header files for developing applications that want to make use of libosmoranap. +%package -n libosmo-sabp0 +Summary: Shared Library part of libosmo-sabp +Group: System/Libraries + +%description -n libosmo-sabp0 +Osmocom code for the SABP (service area broadcast protocol) interface + +%package -n libosmo-sabp-devel +Summary: Development files for Osmocom SABP library +Group: Development/Libraries/C and C++ +Requires: libosmo-sabp0 = %version + +%description -n libosmo-sabp-devel +Osmocom code for the SABP (service area broadcast protocol) interface + +This subpackage contains libraries and header files for developing +applications that want to make use of libosmo-sabp. + + %prep %autosetup -p1 @@ -93,6 +112,8 @@ fi %post -n %lname -p /sbin/ldconfig %postun -n %lname -p /sbin/ldconfig +%post -n libosmo-sabp0 -p /sbin/ldconfig +%postun -n libosmo-sabp0 -p /sbin/ldconfig %pre %service_add_pre osmo-hnbgw.service %post @@ -114,11 +135,21 @@ fi %_sbindir/rcosmo-hnbgw %files -n %lname -%_libdir/libosmo-ranap.so.2* +%_libdir/libosmo-ranap.so.3* %files -n libosmo-ranap-devel -%_includedir/* +%dir %{_includedir}/osmocom +%_includedir/osmocom/ranap %_libdir/libosmo-ranap.so -%_libdir/pkgconfig/*.pc +%_libdir/pkgconfig/libosmo-ranap.pc + +%files -n libosmo-sabp0 +%_libdir/libosmo-sabp.so.0* + +%files -n libosmo-sabp-devel +%dir %{_includedir}/osmocom +%_includedir/osmocom/sabp +%_libdir/libosmo-sabp.so +%_libdir/pkgconfig/libosmo-sabp.pc %changelog From e3c4a4672e2b76823a55122c601110acefe59e8a42a0c8aa5a9cd960fbd3c404 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Tue, 7 Jan 2020 11:53:49 +0000 Subject: [PATCH 2/2] Description update OBS-URL: https://build.opensuse.org/package/show/network:telephony/osmo-iuh?expand=0&rev=21 --- osmo-iuh.spec | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/osmo-iuh.spec b/osmo-iuh.spec index 17748c9..8c5bb63 100644 --- a/osmo-iuh.spec +++ b/osmo-iuh.spec @@ -1,7 +1,7 @@ # # spec file for package osmo-iuh # -# Copyright (c) 2020 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -66,11 +66,11 @@ This subpackage contains libraries and header files for developing applications that want to make use of libosmoranap. %package -n libosmo-sabp0 -Summary: Shared Library part of libosmo-sabp +Summary: Osmocom Service Area Broadcast Protocol library Group: System/Libraries %description -n libosmo-sabp0 -Osmocom code for the SABP (service area broadcast protocol) interface +Osmocom code for the Service Area Broadcast Protocol interface. %package -n libosmo-sabp-devel Summary: Development files for Osmocom SABP library @@ -78,12 +78,11 @@ Group: Development/Libraries/C and C++ Requires: libosmo-sabp0 = %version %description -n libosmo-sabp-devel -Osmocom code for the SABP (service area broadcast protocol) interface +Osmocom code for the Service Area Broadcast Protocol interface. This subpackage contains libraries and header files for developing applications that want to make use of libosmo-sabp. - %prep %autosetup -p1 @@ -114,12 +113,16 @@ fi %postun -n %lname -p /sbin/ldconfig %post -n libosmo-sabp0 -p /sbin/ldconfig %postun -n libosmo-sabp0 -p /sbin/ldconfig + %pre %service_add_pre osmo-hnbgw.service + %post %service_add_post osmo-hnbgw.service + %preun %service_del_preun osmo-hnbgw.service + %postun %service_del_postun osmo-hnbgw.service