From b7504275801d19624ea186a265abae7fbb25b54d9eaf6b9a8706aafd15a7e2e0 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Thu, 13 Feb 2025 14:39:42 +0100 Subject: [PATCH] libosmo-abis 2.0.0 --- 1.6.0.tar.gz | 3 --- 2.0.0.tar.gz | 3 +++ libosmo-abis.changes | 12 ++++++++++++ libosmo-abis.spec | 33 +++++++++++++++++---------------- osmo-talloc.diff | 40 ++++++++++++++++++++-------------------- 5 files changed, 52 insertions(+), 39 deletions(-) delete mode 100644 1.6.0.tar.gz create mode 100644 2.0.0.tar.gz diff --git a/1.6.0.tar.gz b/1.6.0.tar.gz deleted file mode 100644 index 8f6fb51..0000000 --- a/1.6.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:43371cd1f205b6d3dafc4e1227455d0c0d81a588e779601e63ec09b7fe97c9f1 -size 356418 diff --git a/2.0.0.tar.gz b/2.0.0.tar.gz new file mode 100644 index 0000000..cea92e4 --- /dev/null +++ b/2.0.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c61e2f05c9a5a6e4e43f395fe8c60db36e7b0bd7becdbaf7e5d4180810b87ba2 +size 378106 diff --git a/libosmo-abis.changes b/libosmo-abis.changes index dc40f9a..7273041 100644 --- a/libosmo-abis.changes +++ b/libosmo-abis.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Thu Feb 13 13:38:37 UTC 2025 - Jan Engelhardt + +- Update to relase 2.0.0 + * trau2rtp/rtp2trau: add CSD & EDATA support + * trau2rtp FR & EFR: fix uninitialized memory bug + * libosmotrau: add CSD RA2 functions + * libosmotrau: implement RAA' encoder/decoder functions + * trau: detect 8k AMR 7.40k frames correctly for decoding + * Drop ipa_proxy + * trau: implement TFO frame encoding/decoding functions + ------------------------------------------------------------------- Sat Oct 26 13:58:23 UTC 2024 - Jan Engelhardt diff --git a/libosmo-abis.spec b/libosmo-abis.spec index c195e43..14455aa 100644 --- a/libosmo-abis.spec +++ b/libosmo-abis.spec @@ -1,7 +1,7 @@ # # spec file for package libosmo-abis # -# Copyright (c) 2024 SUSE LLC +# Copyright (c) 2025 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: libosmo-abis -Version: 1.6.0 +Version: 2.0.0 Release: 0 Summary: Osmocom library for A-bis interface between BTS and BSC License: AGPL-3.0-or-later AND GPL-2.0-or-later @@ -30,10 +30,11 @@ BuildRequires: libtool >= 2 BuildRequires: pkg-config >= 0.20 BuildRequires: xz BuildRequires: pkgconfig(libosmo-e1d) >= 0.7.0 -BuildRequires: pkgconfig(libosmocodec) >= 1.10.0 -BuildRequires: pkgconfig(libosmocore) >= 1.10.0 -BuildRequires: pkgconfig(libosmogsm) >= 1.10.0 -BuildRequires: pkgconfig(libosmovty) >= 1.10.0 +BuildRequires: pkgconfig(libosmocodec) >= 1.11.0 +BuildRequires: pkgconfig(libosmocore) >= 1.11.0 +BuildRequires: pkgconfig(libosmogsm) >= 1.11.0 +BuildRequires: pkgconfig(libosmovty) >= 1.11.0 +BuildRequires: pkgconfig(libosmo-netif) >= 1.6.0 BuildRequires: pkgconfig(ortp) >= 0.22 BuildRequires: pkgconfig(talloc) @@ -42,12 +43,12 @@ In GSM, A-bis is a BSS-internal interface link between the BTS and BSC. This interface allows control of the radio equipment and radio frequency allocation in the BTS. -%package -n libosmoabis13 +%package -n libosmoabis15 Summary: Osmocom GSM A-bis interface library License: AGPL-3.0-or-later Group: System/Libraries -%description -n libosmoabis13 +%description -n libosmoabis15 In the GSM system architecture, A-bis is a Base Station System-internal interface linking the Base Transceiver Stations (BTS) and Base Station Controller (BSC). This interface allows control of @@ -61,7 +62,7 @@ cards, as well as some A-bis/IP dialects. Summary: Development files for the Osmocom GSM A-bis library License: AGPL-3.0-or-later Group: Development/Libraries/C and C++ -Requires: libosmoabis13 = %version +Requires: libosmoabis15 = %version Requires: libosmocore-devel >= 1.4.0 Requires: libosmogsm-devel >= 1.4.0 @@ -73,12 +74,12 @@ cards, as well as some A-bis/IP dialects. This subpackage contains libraries and header files for developing applications that want to make use of libosmoabis. -%package -n libosmotrau10 +%package -n libosmotrau11 Summary: Osmocom GSM TRAU (E1/RTP) library License: GPL-2.0-or-later Group: System/Libraries -%description -n libosmotrau10 +%description -n libosmotrau11 This library implements the Transcoder and Rate Adaptation Unit (TRAU) for GSM systems. The TRAU enables the use of lower rates (32, 16 or 8 kbps) over the @@ -89,7 +90,7 @@ Switching Center (MSC) is designed. Summary: Development files for the Osmocom TRAU (E1/RTP) library License: GPL-2.0-or-later Group: Development/Libraries/C and C++ -Requires: libosmotrau10 = %version-%release +Requires: libosmotrau11 = %version-%release %description -n libosmotrau-devel This library implements the Transcoder and Rate Adaptation Unit @@ -121,10 +122,10 @@ if ! %make_build check; then %endif fi -%ldconfig_scriptlets -n libosmoabis13 -%ldconfig_scriptlets -n libosmotrau10 +%ldconfig_scriptlets -n libosmoabis15 +%ldconfig_scriptlets -n libosmotrau11 -%files -n libosmoabis13 +%files -n libosmoabis15 %_libdir/libosmoabis.so.* %files -n libosmoabis-devel @@ -135,7 +136,7 @@ fi %_libdir/libosmoabis.so %_libdir/pkgconfig/libosmoabis.pc -%files -n libosmotrau10 +%files -n libosmotrau11 %_libdir/libosmotrau.so.* %files -n libosmotrau-devel diff --git a/osmo-talloc.diff b/osmo-talloc.diff index 5917bb7..529fe46 100644 --- a/osmo-talloc.diff +++ b/osmo-talloc.diff @@ -9,28 +9,28 @@ The source files use talloc, so link to talloc. src/Makefile.am | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) -Index: libosmo-abis-1.6.0/configure.ac +Index: libosmo-abis-2.0.0/configure.ac =================================================================== ---- libosmo-abis-1.6.0.orig/configure.ac -+++ libosmo-abis-1.6.0/configure.ac -@@ -70,6 +70,7 @@ PKG_CHECK_MODULES(LIBOSMOCORE, libosmoco - PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 1.10.0) - PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 1.10.0) - PKG_CHECK_MODULES(LIBOSMOCODEC, libosmocodec >= 1.10.0) +--- libosmo-abis-2.0.0.orig/configure.ac ++++ libosmo-abis-2.0.0/configure.ac +@@ -86,6 +86,7 @@ AS_IF([test "x$ENABLE_ORTP" = "xyes"], [ + ]) + AM_CONDITIONAL(ENABLE_ORTP, test "x$ENABLE_ORTP" = "xyes") + AC_SUBST(ENABLE_ORTP) +PKG_CHECK_MODULES([TALLOC], [talloc]) - AC_ARG_ENABLE([ortp], [AS_HELP_STRING([--disable-ortp], [Build without ortp support])], - [ -Index: libosmo-abis-1.6.0/src/Makefile.am + AC_ARG_ENABLE([dahdi], + AC_HELP_STRING([--disable-dahdi], +Index: libosmo-abis-2.0.0/src/Makefile.am =================================================================== ---- libosmo-abis-1.6.0.orig/src/Makefile.am -+++ libosmo-abis-1.6.0/src/Makefile.am -@@ -7,7 +7,7 @@ TRAU_LIBVERSION=10:0:0 - AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include -I$(top_builddir) - AM_CFLAGS= -Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(LIBOSMOE1D_CFLAGS) $(LIBOSMOCODEC_CFLAGS) $(COVERAGE_CFLAGS) +--- libosmo-abis-2.0.0.orig/src/Makefile.am ++++ libosmo-abis-2.0.0/src/Makefile.am +@@ -15,7 +15,7 @@ AM_CFLAGS= -Wall \ + $(COVERAGE_CFLAGS) \ + $(NULL) AM_LDFLAGS = $(COVERAGE_LDFLAGS) --COMMONLIBS = $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(LIBOSMOVTY_LIBS) $(LIBOSMOE1D_LIBS) # libosmocodec not [yet] needed here -+COMMONLIBS = ${TALLOC_LIBS} $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(LIBOSMOVTY_LIBS) $(LIBOSMOE1D_LIBS) # libosmocodec not [yet] needed here - - lib_LTLIBRARIES = libosmoabis.la libosmotrau.la - +-COMMONLIBS = \ ++COMMONLIBS = ${TALLOC_LIBS} \ + $(LIBOSMOCORE_LIBS) \ + $(LIBOSMOGSM_LIBS) \ + $(LIBOSMOVTY_LIBS) \