diff --git a/contrib/osmo-iuh.spec.in b/contrib/osmo-iuh.spec.in index f40c3db6..977d35c2 100644 --- a/contrib/osmo-iuh.spec.in +++ b/contrib/osmo-iuh.spec.in @@ -58,17 +58,17 @@ Requires: libosmo-hnbap0 = %{version} %description -n libosmo-hnbap-devel Osmocom code for the Iuh interface (HNBAP, RUA, RANAP) -%package -n libosmo-ranap3 +%package -n libosmo-ranap5 Summary: Shared Library part of libosmo-ranap Group: System/Libraries -%description -n libosmo-ranap3 +%description -n libosmo-ranap5 Osmocom code for the Iuh interface (HNBAP, RUA, RANAP) %package -n libosmo-ranap-devel Summary: Development files for Osmocom RANAP library Group: Development/Libraries/C and C++ -Requires: libosmo-ranap3 = %{version} +Requires: libosmo-ranap5 = %{version} %description -n libosmo-ranap-devel Osmocom code for the Iuh interface (HNBAP, RUA, RANAP) @@ -91,17 +91,17 @@ Requires: libosmo-rua0 = %{version} %description -n libosmo-rua-devel Osmocom code for the Iuh interface (HNBAP, RUA, RANAP) -%package -n libosmo-sabp0 +%package -n libosmo-sabp1 Summary: Shared Library part of libosmo-sabp Group: System/Libraries -%description -n libosmo-sabp0 +%description -n libosmo-sabp1 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} +Requires: libosmo-sabp1 = %{version} %description -n libosmo-sabp-devel Osmocom code for the SABP (service area broadcast protocol) interface @@ -131,12 +131,12 @@ make %{?_smp_mflags} check || (find . -name testsuite.log -exec cat {} +) %post -n libosmo-hnbap0 -p /sbin/ldconfig %postun -n libosmo-hnbap0 -p /sbin/ldconfig -%post -n libosmo-ranap3 -p /sbin/ldconfig -%postun -n libosmo-ranap3 -p /sbin/ldconfig +%post -n libosmo-ranap5 -p /sbin/ldconfig +%postun -n libosmo-ranap5 -p /sbin/ldconfig %post -n libosmo-rua0 -p /sbin/ldconfig %postun -n libosmo-rua0 -p /sbin/ldconfig -%post -n libosmo-sabp0 -p /sbin/ldconfig -%postun -n libosmo-sabp0 -p /sbin/ldconfig +%post -n libosmo-sabp1 -p /sbin/ldconfig +%postun -n libosmo-sabp1 -p /sbin/ldconfig %if 0%{?suse_version} %pre %service_add_pre osmo-hnbgw.service @@ -165,8 +165,8 @@ make %{?_smp_mflags} check || (find . -name testsuite.log -exec cat {} +) %{_libdir}/libosmo-hnbap.so %{_libdir}/pkgconfig/libosmo-hnbap.pc -%files -n libosmo-ranap3 -%{_libdir}/libosmo-ranap.so.3* +%files -n libosmo-ranap5 +%{_libdir}/libosmo-ranap.so.5* %files -n libosmo-ranap-devel %dir %{_includedir}/osmocom/ @@ -185,8 +185,8 @@ make %{?_smp_mflags} check || (find . -name testsuite.log -exec cat {} +) %{_libdir}/libosmo-rua.so %{_libdir}/pkgconfig/libosmo-rua.pc -%files -n libosmo-sabp0 -%{_libdir}/libosmo-sabp.so.0* +%files -n libosmo-sabp1 +%{_libdir}/libosmo-sabp.so.1* %files -n libosmo-sabp-devel %dir %{_includedir}/osmocom/ diff --git a/debian/changelog b/debian/changelog index 62ce1102..bfdcb950 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,40 @@ +osmo-iuh (0.8.0) unstable; urgency=medium + + [ Harald Welte ] + * hnbgw: Add missing break statement + + [ Pau Espin Pedrol ] + * iu_client: Log event sent to upper layer callback + * ranap_iu_tx_release_free(): always trigger RANAP_IU_EVENT_IU_RELEASE as a result + * hnb-test: Fix typo in vty cmd description + * cosmetic: src/ranap/Makefile.am: Drop trailing whitespace + * src/tests/Makefile.am: Drop reference to non-existent RANAP_FILES var + * src/*/Makefile.am: Fix trailing whitespace + * Provide libosmo-hnbap as a public shared library + * Provide libosmo-rua as a public shared library + * move-asn1-header-files.sh: Replace original asn file path in generated asn1 header files + * README.md: Document how to re-generate code from ASN1 files + * hnbgw_rua.c: Use proper type struct + * hnbgw_cn.c: Use proper type struct + * hnb-test: Fix rc var may be used uninitialized + * src/*/Makefile.am: Copy back to srcdir the generated .c files from ASN + * src/*/Makefile.am: Use asn1c -R to avoid generating runtime code + * Update generated .c/.h after using asn1c -R param + * hnbap: Use specific prefix for HNBAP generated code + * hnbap: Drop no longer existing asn1c param -fnative-types + * hnbap: Use asn1c flag -fcompound-names to avoid name collisions with other libs + * rua: Use asn1c flag -fcompound-names to avoid name collisions with other libs + * sabp: Use asn1c flag -fcompound-names to avoid name collisions with other libs + * ranap: Use asn1c flag -fcompound-names to avoid name collisions with other libs + * hnb-test: Fix memleak in hnb_read_cb + + [ Oliver Smith ] + * contrib/osmo-iuh.spec.in: fix header packaging + * contrib/osmo-iuh.spec: fix missing ldconfig lines + * Cosmetic: put asn1c parameters in separate lines + + -- Pau Espin Pedrol Tue, 16 Nov 2021 17:13:09 +0100 + osmo-iuh (0.7.0) unstable; urgency=medium [ Martin Hauke ] diff --git a/debian/control b/debian/control index f89869aa..cceef39d 100644 --- a/debian/control +++ b/debian/control @@ -67,7 +67,7 @@ Multi-Arch: same Depends: libosmo-hnbap0 (= ${binary:Version}), ${misc:Depends} Description: Osmocom code for the Iuh interface (HNBAP, RUA, RANAP) -Package: libosmo-ranap3 +Package: libosmo-ranap5 Section: libs Architecture: any Multi-Arch: same @@ -79,14 +79,14 @@ Package: libosmo-ranap-dbg Section: debug Architecture: any Multi-Arch: same -Depends: libosmo-ranap3 (= ${binary:Version}), ${misc:Depends} +Depends: libosmo-ranap5 (= ${binary:Version}), ${misc:Depends} Description: Osmocom code for the Iuh interface (HNBAP, RUA, RANAP) Package: libosmo-ranap-dev Section: libdevel Architecture: any Multi-Arch: same -Depends: libosmo-ranap3 (= ${binary:Version}), ${misc:Depends} +Depends: libosmo-ranap5 (= ${binary:Version}), ${misc:Depends} Description: Osmocom code for the Iuh interface (HNBAP, RUA, RANAP) Package: libosmo-rua0 @@ -111,7 +111,7 @@ Multi-Arch: same Depends: libosmo-rua0 (= ${binary:Version}), ${misc:Depends} Description: Osmocom code for the Iuh interface (HNBAP, RUA, RANAP) -Package: libosmo-sabp0 +Package: libosmo-sabp1 Section: libs Architecture: any Multi-Arch: same @@ -123,12 +123,12 @@ Package: libosmo-sabp-dbg Section: debug Architecture: any Multi-Arch: same -Depends: libosmo-sabp0 (= ${binary:Version}), ${misc:Depends} +Depends: libosmo-sabp1 (= ${binary:Version}), ${misc:Depends} Description: Osmocom code for the Iuh interface (SABP) Package: libosmo-sabp-dev Section: libdevel Architecture: any Multi-Arch: same -Depends: libosmo-sabp0 (= ${binary:Version}), ${misc:Depends} +Depends: libosmo-sabp1 (= ${binary:Version}), ${misc:Depends} Description: Osmocom code for the Iuh interface (SABP) diff --git a/debian/libosmo-ranap3.install b/debian/libosmo-ranap5.install similarity index 100% rename from debian/libosmo-ranap3.install rename to debian/libosmo-ranap5.install diff --git a/debian/libosmo-sabp0.install b/debian/libosmo-sabp1.install similarity index 100% rename from debian/libosmo-sabp0.install rename to debian/libosmo-sabp1.install diff --git a/debian/rules b/debian/rules index b85b0d2d..9db7204b 100755 --- a/debian/rules +++ b/debian/rules @@ -15,9 +15,9 @@ override_dh_auto_configure: # See https://www.debian.org/doc/manuals/developers-reference/best-pkging-practices.html#bpp-dbg override_dh_strip: dh_strip -plibosmo-hnbap0 --dbg-package=libosmo-hnbap-dbg - dh_strip -plibosmo-ranap3 --dbg-package=libosmo-ranap-dbg + dh_strip -plibosmo-ranap5 --dbg-package=libosmo-ranap-dbg dh_strip -plibosmo-rua0 --dbg-package=libosmo-rua-dbg - dh_strip -plibosmo-sabp0 --dbg-package=libosmo-sabp-dbg + dh_strip -plibosmo-sabp1 --dbg-package=libosmo-sabp-dbg dh_strip -posmo-hnbgw --dbg-package=osmo-hnbgw-dbg # Print test results in case of a failure diff --git a/src/Makefile.am b/src/Makefile.am index 6a8e7f42..b69d65f2 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -62,9 +62,9 @@ AM_CFLAGS = -Wall -I$(top_srcdir)/include -I$(top_builddir)/include \ # build the shared RANAP + SABP library # HNBAP_LIBVERSION=0:0:0 -RANAP_LIBVERSION=4:0:1 +RANAP_LIBVERSION=5:0:0 RUA_LIBVERSION=0:0:0 -SABP_LIBVERSION=0:0:0 +SABP_LIBVERSION=1:0:0 lib_LTLIBRARIES = libosmo-hnbap.la libosmo-ranap.la libosmo-rua.la libosmo-sabp.la libosmo_hnbap_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(HNBAP_LIBVERSION) libosmo_hnbap_la_LIBADD = $(OSMOCORE_LIBS) $(OSMOGSM_LIBS) $(OSMOVTY_LIBS) $(OSMOSIGTRAN_LIBS) \