From 68d4ffa8a063ecba5c35027a6ba90790942cf88170d8964c3b398c68ffcb670e Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Sun, 6 Sep 2020 12:56:40 +0000 Subject: [PATCH] - Update to release 1.0.1 OBS-URL: https://build.opensuse.org/package/show/network:telephony/libosmo-abis?expand=0&rev=48 --- _service | 6 ++-- e1dapi.diff | 41 ++++++++++++++++++++++ libosmo-abis-0.8.1.tar.xz | 3 -- libosmo-abis-1.0.1.tar.xz | 3 ++ libosmo-abis.changes | 7 ++++ libosmo-abis.spec | 71 ++++++++++++++++++--------------------- osmo-talloc.diff | 38 ++++++++++----------- 7 files changed, 105 insertions(+), 64 deletions(-) create mode 100644 e1dapi.diff delete mode 100644 libosmo-abis-0.8.1.tar.xz create mode 100644 libosmo-abis-1.0.1.tar.xz diff --git a/_service b/_service index 7bc9a90..081a478 100644 --- a/_service +++ b/_service @@ -1,9 +1,9 @@ git - git://git.osmocom.org/libosmo-abis - 0.8.1 - 0.8.1 + https://git.osmocom.org/libosmo-abis + 1.0.1 + 1.0.1 *.tar diff --git a/e1dapi.diff b/e1dapi.diff new file mode 100644 index 0000000..7106c42 --- /dev/null +++ b/e1dapi.diff @@ -0,0 +1,41 @@ +From: Jan Engelhardt +Date: 2020-09-06 14:55:53.762974707 +0200 + +The latest release of libosmo-e1d has osmo_e1dp_client_ts_open +taking just 5 arguments. + +--- + src/input/e1d.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +Index: libosmo-abis-1.0.1/src/input/e1d.c +=================================================================== +--- libosmo-abis-1.0.1.orig/src/input/e1d.c ++++ libosmo-abis-1.0.1/src/input/e1d.c +@@ -393,7 +393,7 @@ e1d_line_update(struct e1inp_line *line) + } + if (bfd->fd <= 0) { + bfd->fd = osmo_e1dp_client_ts_open(g_e1d, e1d_intf, e1d_line, ts, +- E1DP_TSMODE_HDLCFCS, D_BCHAN_TX_GRAN); ++ E1DP_TSMODE_HDLCFCS); + } + if (bfd->fd < 0) { + LOGPITS(e1i_ts, DLINP, LOGL_ERROR, "Could not open timeslot %d\n", ts); +@@ -423,7 +423,7 @@ e1d_line_update(struct e1inp_line *line) + } + if (bfd->fd <= 0) { + bfd->fd = osmo_e1dp_client_ts_open(g_e1d, e1d_intf, e1d_line, ts, +- E1DP_TSMODE_HDLCFCS, D_BCHAN_TX_GRAN); ++ E1DP_TSMODE_HDLCFCS); + } + if (bfd->fd < 0) { + LOGPITS(e1i_ts, DLINP, LOGL_ERROR, "Could not open timeslot %d\n", ts); +@@ -446,7 +446,7 @@ e1d_line_update(struct e1inp_line *line) + } + if (bfd->fd <= 0) { + bfd->fd = osmo_e1dp_client_ts_open(g_e1d, e1d_intf, e1d_line, ts, +- E1DP_TSMODE_RAW, D_BCHAN_TX_GRAN); ++ E1DP_TSMODE_RAW); + } + if (bfd->fd < 0) { + LOGPITS(e1i_ts, DLINP, LOGL_ERROR, "Could not open timeslot %d\n", ts); diff --git a/libosmo-abis-0.8.1.tar.xz b/libosmo-abis-0.8.1.tar.xz deleted file mode 100644 index 4d6b5db..0000000 --- a/libosmo-abis-0.8.1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6b999a826b02802e55256b7b8431cd6c130bab81aaac2252199af52588f082c4 -size 76864 diff --git a/libosmo-abis-1.0.1.tar.xz b/libosmo-abis-1.0.1.tar.xz new file mode 100644 index 0000000..a720e51 --- /dev/null +++ b/libosmo-abis-1.0.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5653a98d4a6039e4f7a0b0a236c4e95ef5e7cf87a9dac0b2783bbd497b8cc196 +size 279280 diff --git a/libosmo-abis.changes b/libosmo-abis.changes index fe818e4..54694b3 100644 --- a/libosmo-abis.changes +++ b/libosmo-abis.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Sun Sep 6 12:06:23 UTC 2020 - Jan Engelhardt + +- Update to release 1.0.1 + * e1d: Initial osmo-e1d support + * e1_input: Add VTY command to enable PCAP debug output + ------------------------------------------------------------------- Mon Mar 9 20:24:00 UTC 2020 - Martin Hauke diff --git a/libosmo-abis.spec b/libosmo-abis.spec index 9ab41b4..ad2fb69 100644 --- a/libosmo-abis.spec +++ b/libosmo-abis.spec @@ -16,10 +16,10 @@ # -%define version_unconverted 0.8.1 +%define version_unconverted 1.0.1 Name: libosmo-abis -Version: 0.8.1 +Version: 1.0.1 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 @@ -28,15 +28,16 @@ URL: https://osmocom.org/projects/libosmo-abis/wiki/Libosmo-abis Source: %name-%version.tar.xz Patch1: osmo-talloc.diff -BuildRoot: %{_tmppath}/%{name}-%{version}-build +Patch2: e1dapi.diff BuildRequires: automake >= 1.6 -#BuildRequires: dahdi-linux-devel BuildRequires: libtool >= 2 BuildRequires: pkgconfig >= 0.20 BuildRequires: xz -BuildRequires: pkgconfig(libosmocore) >= 1.0.0 -BuildRequires: pkgconfig(libosmogsm) >= 1.0.0 -BuildRequires: pkgconfig(libosmovty) >= 1.0.0 +BuildRequires: pkgconfig(libosmo-e1d) +BuildRequires: pkgconfig(libosmocodec) >= 1.4.0 +BuildRequires: pkgconfig(libosmocore) >= 1.4.0 +BuildRequires: pkgconfig(libosmogsm) >= 1.4.0 +BuildRequires: pkgconfig(libosmovty) >= 1.4.0 BuildRequires: pkgconfig(ortp) >= 0.22 BuildRequires: pkgconfig(talloc) @@ -45,12 +46,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 libosmoabis6 +%package -n libosmoabis9 Summary: Osmocom GSM A-bis interface library License: AGPL-3.0-or-later Group: System/Libraries -%description -n libosmoabis6 +%description -n libosmoabis9 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 @@ -64,9 +65,9 @@ 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: libosmoabis6 = %version -Requires: libosmocore-devel >= 1.0.0 -Requires: libosmogsm-devel >= 1.0.0 +Requires: libosmoabis9 = %version +Requires: libosmocore-devel >= 1.4.0 +Requires: libosmogsm-devel >= 1.4.0 %description -n libosmoabis-devel This library contains common/shared code regarding the GSM A-bis @@ -102,60 +103,52 @@ This subpackage contains libraries and header files for developing applications that want to make use of libosmotrau. %prep -%setup -q -%patch -P 1 -p1 +%autosetup -p1 %build echo "%version" >.tarball-version autoreconf -fiv -%configure \ - --enable-shared \ - --disable-static \ - --disable-dahdi \ - --includedir="%_includedir/%name" -make %{?_smp_mflags} +# bugzilla.opensuse.org/795968 for rationale +%configure --includedir="%_includedir/%name" \ + --enable-shared --disable-static --disable-dahdi --enable-e1d +%make_build %install -b="%buildroot" -make %{?_smp_mflags} install DESTDIR="$b" -find "$b/%_libdir" -type f -name "*.la" -delete +%make_install +find "%buildroot/%_libdir" -type f -name "*.la" -delete %check -if ! make %{?_smp_mflags} check; then +if ! %make_build check; then find . -name testsuite.log -exec cat "{}" "+" %ifarch %ix86 x86_64 exit 1 %endif fi -%post -n libosmoabis6 -p /sbin/ldconfig -%postun -n libosmoabis6 -p /sbin/ldconfig +%post -n libosmoabis9 -p /sbin/ldconfig +%postun -n libosmoabis9 -p /sbin/ldconfig %post -n libosmotrau2 -p /sbin/ldconfig %postun -n libosmotrau2 -p /sbin/ldconfig -%files -n libosmoabis6 -%defattr(-,root,root) -%_libdir/libosmoabis.so.6* +%files -n libosmoabis9 +%_libdir/libosmoabis.so.9* %files -n libosmoabis-devel -%defattr(-,root,root) -%doc COPYING -%dir %_includedir/%name -%dir %_includedir/%name/osmocom +%license COPYING +%dir %_includedir/%name/ +%dir %_includedir/%name/osmocom/ %_includedir/%name/osmocom/abis/ %_libdir/libosmoabis.so %_libdir/pkgconfig/libosmoabis.pc %files -n libosmotrau2 -%defattr(-,root,root) %_libdir/libosmotrau.so.2* %files -n libosmotrau-devel -%defattr(-,root,root) -%doc COPYING -%dir %_includedir/%name -%dir %_includedir/%name/osmocom -%_includedir/%name/osmocom/trau +%license COPYING +%dir %_includedir/%name/ +%dir %_includedir/%name/osmocom/ +%_includedir/%name/osmocom/trau/ %_libdir/libosmotrau.so %_libdir/pkgconfig/libosmotrau.pc diff --git a/osmo-talloc.diff b/osmo-talloc.diff index 819d212..5a879e4 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(-) -diff --git a/configure.ac b/configure.ac -index 35b8328..b962cf6 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -59,6 +59,7 @@ AC_SUBST(SYMBOL_VISIBILITY) - dnl Generate the output - AM_CONFIG_HEADER(config.h) - +Index: libosmo-abis-1.0.1/configure.ac +=================================================================== +--- libosmo-abis-1.0.1.orig/configure.ac ++++ libosmo-abis-1.0.1/configure.ac +@@ -69,6 +69,7 @@ PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty + PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 1.4.0) + PKG_CHECK_MODULES(LIBOSMOCODEC, libosmocodec >= 1.4.0) + PKG_CHECK_MODULES(ORTP, ortp >= 0.22.0) +PKG_CHECK_MODULES([TALLOC], [talloc]) - PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.0.0) - PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 1.0.0) - PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 1.0.0) -diff --git a/src/Makefile.am b/src/Makefile.am -index 3838a5a..0eefd22 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -7,7 +7,7 @@ TRAU_LIBVERSION=4:0:2 + + AC_ARG_ENABLE([dahdi], + AC_HELP_STRING([--disable-dahdi], +Index: libosmo-abis-1.0.1/src/Makefile.am +=================================================================== +--- libosmo-abis-1.0.1.orig/src/Makefile.am ++++ libosmo-abis-1.0.1/src/Makefile.am +@@ -7,7 +7,7 @@ TRAU_LIBVERSION=5:0:3 AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include -I$(top_builddir) - AM_CFLAGS= -Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(LIBOSMOE1D_CFLAGS) $(COVERAGE_CFLAGS) + AM_CFLAGS= -Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(LIBOSMOE1D_CFLAGS) $(LIBOSMOCODEC_CFLAGS) $(COVERAGE_CFLAGS) AM_LDFLAGS = $(COVERAGE_LDFLAGS) --COMMONLIBS = $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(LIBOSMOVTY_LIBS) $(LIBOSMOE1D_LIBS) -+COMMONLIBS = $(TALLOC_LIBS) $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(LIBOSMOVTY_LIBS) $(LIBOSMOE1D_LIBS) +-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