diff --git a/1.1.1.tar.gz b/1.1.1.tar.gz new file mode 100644 index 0000000..97e0ee8 --- /dev/null +++ b/1.1.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d93ba89fe278a04000bdf12578ec67a0f95375ad6594b7d430f10c4cf4b74921 +size 322550 diff --git a/_service b/_service deleted file mode 100644 index 081a478..0000000 --- a/_service +++ /dev/null @@ -1,13 +0,0 @@ - - - git - https://git.osmocom.org/libosmo-abis - 1.0.1 - 1.0.1 - - - *.tar - xz - - - diff --git a/e1dapi.diff b/e1dapi.diff deleted file mode 100644 index 7106c42..0000000 --- a/e1dapi.diff +++ /dev/null @@ -1,41 +0,0 @@ -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-1.0.1.tar.xz b/libosmo-abis-1.0.1.tar.xz deleted file mode 100644 index a720e51..0000000 --- a/libosmo-abis-1.0.1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5653a98d4a6039e4f7a0b0a236c4e95ef5e7cf87a9dac0b2783bbd497b8cc196 -size 279280 diff --git a/libosmo-abis.changes b/libosmo-abis.changes index f1d5772..42fc6d0 100644 --- a/libosmo-abis.changes +++ b/libosmo-abis.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Sun Mar 14 20:35:36 UTC 2021 - Jan Engelhardt + +- Update to release 1.1.1 + * e1_input: Support I.460 timeslot type +- Remove e1dapi.diff + ------------------------------------------------------------------- Sun Sep 6 12:06:23 UTC 2020 - Jan Engelhardt diff --git a/libosmo-abis.spec b/libosmo-abis.spec index ad2fb69..5b9dec9 100644 --- a/libosmo-abis.spec +++ b/libosmo-abis.spec @@ -1,7 +1,7 @@ # # spec file for package libosmo-abis # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,28 +16,25 @@ # -%define version_unconverted 1.0.1 - Name: libosmo-abis -Version: 1.0.1 +Version: 1.1.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 Group: Productivity/Telephony/Utilities URL: https://osmocom.org/projects/libosmo-abis/wiki/Libosmo-abis -Source: %name-%version.tar.xz +Source: https://github.com/osmocom/libosmo-abis/archive/%version.tar.gz Patch1: osmo-talloc.diff -Patch2: e1dapi.diff BuildRequires: automake >= 1.6 BuildRequires: libtool >= 2 BuildRequires: pkgconfig >= 0.20 BuildRequires: xz -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(libosmo-e1d) >= 0.2.0 +BuildRequires: pkgconfig(libosmocodec) >= 1.5.0 +BuildRequires: pkgconfig(libosmocore) >= 1.5.0 +BuildRequires: pkgconfig(libosmogsm) >= 1.5.0 +BuildRequires: pkgconfig(libosmovty) >= 1.5.0 BuildRequires: pkgconfig(ortp) >= 0.22 BuildRequires: pkgconfig(talloc) @@ -46,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 libosmoabis9 +%package -n libosmoabis10 Summary: Osmocom GSM A-bis interface library License: AGPL-3.0-or-later Group: System/Libraries -%description -n libosmoabis9 +%description -n libosmoabis10 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 @@ -65,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: libosmoabis9 = %version +Requires: libosmoabis10 = %version Requires: libosmocore-devel >= 1.4.0 Requires: libosmogsm-devel >= 1.4.0 @@ -125,13 +122,13 @@ if ! %make_build check; then %endif fi -%post -n libosmoabis9 -p /sbin/ldconfig -%postun -n libosmoabis9 -p /sbin/ldconfig +%post -n libosmoabis10 -p /sbin/ldconfig +%postun -n libosmoabis10 -p /sbin/ldconfig %post -n libosmotrau2 -p /sbin/ldconfig %postun -n libosmotrau2 -p /sbin/ldconfig -%files -n libosmoabis9 -%_libdir/libosmoabis.so.9* +%files -n libosmoabis10 +%_libdir/libosmoabis.so.10* %files -n libosmoabis-devel %license COPYING diff --git a/osmo-talloc.diff b/osmo-talloc.diff index 5a879e4..e4f02fd 100644 --- a/osmo-talloc.diff +++ b/osmo-talloc.diff @@ -9,23 +9,23 @@ The source files use talloc, so link to talloc. src/Makefile.am | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) -Index: libosmo-abis-1.0.1/configure.ac +Index: libosmo-abis-1.1.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) +--- libosmo-abis-1.1.1.orig/configure.ac ++++ libosmo-abis-1.1.1/configure.ac +@@ -71,6 +71,7 @@ PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty + PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 1.5.0) + PKG_CHECK_MODULES(LIBOSMOCODEC, libosmocodec >= 1.5.0) PKG_CHECK_MODULES(ORTP, ortp >= 0.22.0) +PKG_CHECK_MODULES([TALLOC], [talloc]) AC_ARG_ENABLE([dahdi], AC_HELP_STRING([--disable-dahdi], -Index: libosmo-abis-1.0.1/src/Makefile.am +Index: libosmo-abis-1.1.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 +--- libosmo-abis-1.1.1.orig/src/Makefile.am ++++ libosmo-abis-1.1.1/src/Makefile.am +@@ -7,7 +7,7 @@ TRAU_LIBVERSION=6:0:4 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) AM_LDFLAGS = $(COVERAGE_LDFLAGS)