diff --git a/TODO-RELEASE b/TODO-RELEASE index 0ca91142..d0852fc9 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -7,5 +7,3 @@ # If any interfaces have been added since the last public release: c:r:a + 1. # If any interfaces have been removed or changed since the last public release: c:r:0. #library what description / commit summary line -libosmo-ranap API/ABI change deprecate ranap_cn_rx_{cl,co}_decode, use ranap_cn_rx_{cl,co}_decode2 instead -all API change rename duplicate generated defines from asn1tostruct diff --git a/configure.ac b/configure.ac index 9ca8e8fc..55966597 100644 --- a/configure.ac +++ b/configure.ac @@ -42,12 +42,12 @@ if test "x$PKG_CONFIG_INSTALLED" = "xno"; then fi PKG_PROG_PKG_CONFIG([0.20]) -PKG_CHECK_MODULES(OSMOCORE, libosmocore >= 1.7.0) -PKG_CHECK_MODULES(OSMOGSM, libosmogsm >= 1.7.0) -PKG_CHECK_MODULES(OSMOVTY, libosmovty >= 1.7.0) -PKG_CHECK_MODULES(OSMOCTRL, libosmoctrl >= 1.7.0) -PKG_CHECK_MODULES(OSMONETIF, libosmo-netif >= 1.2.0) -PKG_CHECK_MODULES(OSMOSIGTRAN, libosmo-sigtran >= 1.6.0) +PKG_CHECK_MODULES(OSMOCORE, libosmocore >= 1.8.0) +PKG_CHECK_MODULES(OSMOGSM, libosmogsm >= 1.8.0) +PKG_CHECK_MODULES(OSMOVTY, libosmovty >= 1.8.0) +PKG_CHECK_MODULES(OSMOCTRL, libosmoctrl >= 1.8.0) +PKG_CHECK_MODULES(OSMONETIF, libosmo-netif >= 1.3.0) +PKG_CHECK_MODULES(OSMOSIGTRAN, libosmo-sigtran >= 1.7.0) PKG_CHECK_MODULES(ASN1C, libasn1c >= 0.9.30) AC_CONFIG_MACRO_DIR([m4]) diff --git a/contrib/osmo-iuh.spec.in b/contrib/osmo-iuh.spec.in index 4e5a67f9..c6ecd8e9 100644 --- a/contrib/osmo-iuh.spec.in +++ b/contrib/osmo-iuh.spec.in @@ -28,13 +28,13 @@ BuildRequires: pkgconfig >= 0.20 # python3 for asn1tostruct.py BuildRequires: python3 BuildRequires: pkgconfig(libasn1c) >= 0.9.30 -BuildRequires: pkgconfig(libosmo-netif) >= 1.2.0 -BuildRequires: pkgconfig(libosmo-sigtran) >= 1.6.0 -BuildRequires: pkgconfig(libosmocore) >= 1.7.0 -BuildRequires: pkgconfig(libosmoctrl) >= 1.7.0 -BuildRequires: pkgconfig(libosmogb) >= 1.7.0 -BuildRequires: pkgconfig(libosmogsm) >= 1.7.0 -BuildRequires: pkgconfig(libosmovty) >= 1.7.0 +BuildRequires: pkgconfig(libosmo-netif) >= 1.3.0 +BuildRequires: pkgconfig(libosmo-sigtran) >= 1.7.0 +BuildRequires: pkgconfig(libosmocore) >= 1.8.0 +BuildRequires: pkgconfig(libosmoctrl) >= 1.8.0 +BuildRequires: pkgconfig(libosmogb) >= 1.8.0 +BuildRequires: pkgconfig(libosmogsm) >= 1.8.0 +BuildRequires: pkgconfig(libosmovty) >= 1.8.0 %description Osmocom code for the Iuh interface (HNBAP, RUA, RANAP) @@ -54,17 +54,17 @@ Requires: libosmo-hnbap0 = %{version} %description -n libosmo-hnbap-devel Osmocom code for the Iuh interface (HNBAP, RUA, RANAP) -%package -n libosmo-ranap5 +%package -n libosmo-ranap7 Summary: Shared Library part of libosmo-ranap Group: System/Libraries -%description -n libosmo-ranap5 +%description -n libosmo-ranap7 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-ranap5 = %{version} +Requires: libosmo-ranap7 = %{version} %description -n libosmo-ranap-devel Osmocom code for the Iuh interface (HNBAP, RUA, RANAP) @@ -126,8 +126,8 @@ 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-ranap5 -p /sbin/ldconfig -%postun -n libosmo-ranap5 -p /sbin/ldconfig +%post -n libosmo-ranap7 -p /sbin/ldconfig +%postun -n libosmo-ranap7 -p /sbin/ldconfig %post -n libosmo-rua0 -p /sbin/ldconfig %postun -n libosmo-rua0 -p /sbin/ldconfig %post -n libosmo-sabp1 -p /sbin/ldconfig @@ -147,8 +147,8 @@ make %{?_smp_mflags} check || (find . -name testsuite.log -exec cat {} +) %{_libdir}/libosmo-hnbap.so %{_libdir}/pkgconfig/libosmo-hnbap.pc -%files -n libosmo-ranap5 -%{_libdir}/libosmo-ranap.so.5* +%files -n libosmo-ranap7 +%{_libdir}/libosmo-ranap.so.7* %files -n libosmo-ranap-devel %dir %{_includedir}/osmocom/ diff --git a/debian/changelog b/debian/changelog index 85fb9262..e078277a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,27 @@ +osmo-iuh (1.4.0) unstable; urgency=medium + + [ Vadim Yanitskiy ] + * libosmo-rua: fix copy-pasted -version-info: {HNBAP->RUA}_LIBVERSION + * libosmo-{hnbap,ranap,rua,sabp}: add -no-undefined to *_la_LDFLAGS + + [ Oliver Smith ] + * move-asn1-header-files: error for wrong asn1c + * asn1: fix visibility warnings from generated code + * tests/hnb-test-rua: add missing include + * tests/test-hnbap: add missing include + * tests/test-ranap: fix missing (void **) cast + * ranap_common_cn: remove unused ctx args + * ranap_common_cn: rename ctx -> priv + * tests/hnb-test-rua: fix incompat pointer type + * test-hnbap: fix defined but not used error + * hnbap_common: hnbap_cause_str: handle nothing val + * asn1tostruct: fix defines getting redefined + * contrib/jenkins.sh: use --enable-werror + * asn1tostruct: don't use f-strings + * contrib/jenkins.sh: werror with WITH_MANUALS too + + -- Pau Espin Pedrol Tue, 07 Feb 2023 16:39:24 +0100 + osmo-iuh (1.3.0) unstable; urgency=medium [ Philipp Maier ] diff --git a/debian/control b/debian/control index 8e994a68..e2f95434 100644 --- a/debian/control +++ b/debian/control @@ -11,10 +11,10 @@ Build-Depends: debhelper (>=9), git, libasn1c-dev, libsctp-dev, - libosmocore-dev (>= 1.7.0), - libosmo-netif-dev (>= 1.2.0), - libosmo-sigtran-dev (>= 1.6.0), - osmo-gsm-manuals-dev (>= 1.3.0), + libosmocore-dev (>= 1.8.0), + libosmo-netif-dev (>= 1.3.0), + libosmo-sigtran-dev (>= 1.7.0), + osmo-gsm-manuals-dev (>= 1.4.0), python3 Standards-Version: 3.9.8 Vcs-Git: https://gitea.osmocom.org/cellular-infrastructure/osmo-iuh @@ -43,7 +43,7 @@ Multi-Arch: same Depends: libosmo-hnbap0 (= ${binary:Version}), ${misc:Depends} Description: Osmocom code for the Iuh interface (HNBAP, RUA, RANAP) -Package: libosmo-ranap5 +Package: libosmo-ranap7 Section: libs Architecture: any Multi-Arch: same @@ -55,14 +55,14 @@ Package: libosmo-ranap-dbg Section: debug Architecture: any Multi-Arch: same -Depends: libosmo-ranap5 (= ${binary:Version}), ${misc:Depends} +Depends: libosmo-ranap7 (= ${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-ranap5 (= ${binary:Version}), ${misc:Depends} +Depends: libosmo-ranap7 (= ${binary:Version}), ${misc:Depends} Description: Osmocom code for the Iuh interface (HNBAP, RUA, RANAP) Package: libosmo-rua0 diff --git a/debian/libosmo-ranap5.install b/debian/libosmo-ranap7.install similarity index 100% rename from debian/libosmo-ranap5.install rename to debian/libosmo-ranap7.install diff --git a/debian/rules b/debian/rules index aa1ed322..a1b7e187 100755 --- a/debian/rules +++ b/debian/rules @@ -11,7 +11,7 @@ VERSION := $(shell echo '$(DEBVERS)' | sed -e 's/[+-].*//' -e 's/~//g') # 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-ranap5 --dbg-package=libosmo-ranap-dbg + dh_strip -plibosmo-ranap7 --dbg-package=libosmo-ranap-dbg dh_strip -plibosmo-rua0 --dbg-package=libosmo-rua-dbg dh_strip -plibosmo-sabp1 --dbg-package=libosmo-sabp-dbg diff --git a/src/Makefile.am b/src/Makefile.am index 9e447e63..d2172215 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -61,10 +61,10 @@ AM_CFLAGS = -Wall -I$(top_srcdir)/include -I$(top_builddir)/include \ # build the shared RANAP + SABP library # -HNBAP_LIBVERSION=0:0:0 -RANAP_LIBVERSION=6:0:1 -RUA_LIBVERSION=0:0:0 -SABP_LIBVERSION=1:0:0 +HNBAP_LIBVERSION=1:0:1 +RANAP_LIBVERSION=7:0:0 +RUA_LIBVERSION=1:0:1 +SABP_LIBVERSION=2:0:1 lib_LTLIBRARIES = libosmo-hnbap.la libosmo-ranap.la libosmo-rua.la libosmo-sabp.la libosmo_hnbap_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(HNBAP_LIBVERSION) -no-undefined libosmo_hnbap_la_LIBADD = $(OSMOCORE_LIBS) $(OSMOGSM_LIBS) $(OSMOVTY_LIBS) $(OSMOSIGTRAN_LIBS) \