From 98504433138fa1c5202fb1e418dec33c3409acf4b34cd19a72a81a6f83a93694 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Fri, 11 Mar 2016 08:42:20 +0000 Subject: [PATCH 1/8] Accepting request 369804 from home:oertel:branches:network:telephony - add ExcludeArch to follow libosmocore OBS-URL: https://build.opensuse.org/request/show/369804 OBS-URL: https://build.opensuse.org/package/show/network:telephony/libosmo-abis?expand=0&rev=17 --- libosmo-abis.changes | 5 +++++ libosmo-abis.spec | 4 ++++ 2 files changed, 9 insertions(+) diff --git a/libosmo-abis.changes b/libosmo-abis.changes index 1f61d6a..c41ca73 100644 --- a/libosmo-abis.changes +++ b/libosmo-abis.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Mar 11 01:55:24 CET 2016 - ro@suse.de + +- add ExcludeArch to follow libosmocore + ------------------------------------------------------------------- Fri Jan 22 19:08:57 UTC 2016 - jengelh@inai.de diff --git a/libosmo-abis.spec b/libosmo-abis.spec index d58e35d..5c7ae3e 100644 --- a/libosmo-abis.spec +++ b/libosmo-abis.spec @@ -40,6 +40,10 @@ BuildRequires: pkgconfig(libosmocore) >= 0.3.0 BuildRequires: pkgconfig(libosmogsm) >= 0.3.10 BuildRequires: pkgconfig(libosmovty) >= 0.3.0 BuildRequires: pkgconfig(ortp) >= 0.13.1 +# follow arch limitations for libosmocore +# do not try to build for big-endian archs +# as suggested by http://lists.osmocom.org/pipermail/baseband-devel/2015-February/000022.html +ExcludeArch: ppc ppc64 ppc64p7 mips mips64 %sparc s390 s390x %description In GSM, A-bis is a BSS-internal interface link between the BTS and From 031c4e129ccbe35a501af6c822811771c180cc5a9bc23d579a44f31e29a8903d Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Fri, 11 Mar 2016 08:50:51 +0000 Subject: [PATCH 2/8] osc copypac from project:network:telephony package:libosmo-abis revision:16 OBS-URL: https://build.opensuse.org/package/show/network:telephony/libosmo-abis?expand=0&rev=18 --- libosmo-abis.changes | 5 ----- libosmo-abis.spec | 4 ---- 2 files changed, 9 deletions(-) diff --git a/libosmo-abis.changes b/libosmo-abis.changes index c41ca73..1f61d6a 100644 --- a/libosmo-abis.changes +++ b/libosmo-abis.changes @@ -1,8 +1,3 @@ -------------------------------------------------------------------- -Fri Mar 11 01:55:24 CET 2016 - ro@suse.de - -- add ExcludeArch to follow libosmocore - ------------------------------------------------------------------- Fri Jan 22 19:08:57 UTC 2016 - jengelh@inai.de diff --git a/libosmo-abis.spec b/libosmo-abis.spec index 5c7ae3e..d58e35d 100644 --- a/libosmo-abis.spec +++ b/libosmo-abis.spec @@ -40,10 +40,6 @@ BuildRequires: pkgconfig(libosmocore) >= 0.3.0 BuildRequires: pkgconfig(libosmogsm) >= 0.3.10 BuildRequires: pkgconfig(libosmovty) >= 0.3.0 BuildRequires: pkgconfig(ortp) >= 0.13.1 -# follow arch limitations for libosmocore -# do not try to build for big-endian archs -# as suggested by http://lists.osmocom.org/pipermail/baseband-devel/2015-February/000022.html -ExcludeArch: ppc ppc64 ppc64p7 mips mips64 %sparc s390 s390x %description In GSM, A-bis is a BSS-internal interface link between the BTS and From bec69ca7ded537415ba20fb6b7d63c822a3b6837d06cb9163474d4aa967f4f5e Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Fri, 11 Mar 2016 11:00:59 +0000 Subject: [PATCH 3/8] Add _service file OBS-URL: https://build.opensuse.org/package/show/network:telephony/libosmo-abis?expand=0&rev=19 --- _service | 13 +++++++++++++ libosmo-abis-0.3.2.3.tar.xz | 3 --- libosmo-abis.spec | 2 +- 3 files changed, 14 insertions(+), 4 deletions(-) create mode 100644 _service delete mode 100644 libosmo-abis-0.3.2.3.tar.xz diff --git a/_service b/_service new file mode 100644 index 0000000..b6c1e5a --- /dev/null +++ b/_service @@ -0,0 +1,13 @@ + + + git + git://git.osmocom.org/libosmo-abis + v0.3.2 + 0.3.2.@TAG_OFFSET@ + + + *.tar + xz + + + diff --git a/libosmo-abis-0.3.2.3.tar.xz b/libosmo-abis-0.3.2.3.tar.xz deleted file mode 100644 index 51b7fa2..0000000 --- a/libosmo-abis-0.3.2.3.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f2a68b40935e1496f26c51f25850ec662a3b69833facda16b00b058e57bab841 -size 63024 diff --git a/libosmo-abis.spec b/libosmo-abis.spec index d58e35d..f48c76f 100644 --- a/libosmo-abis.spec +++ b/libosmo-abis.spec @@ -17,7 +17,7 @@ Name: libosmo-abis -Version: 0.3.2.3 +Version: 0.3.2.4 Release: 0 Summary: Osmocom library for A-bis interface between BTS and BSC License: AGPL-3.0+ and GPL-2.0+ From e6da7c1e013dde1ea931c799eeee6c23ae6352bb9db56bc97d8dcb17d6ca68a3 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Fri, 11 Mar 2016 11:03:30 +0000 Subject: [PATCH 4/8] OBS-URL: https://build.opensuse.org/package/show/network:telephony/libosmo-abis?expand=0&rev=20 --- libosmo-abis.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libosmo-abis.spec b/libosmo-abis.spec index f48c76f..00936d9 100644 --- a/libosmo-abis.spec +++ b/libosmo-abis.spec @@ -98,7 +98,7 @@ This subpackage contains libraries and header files for developing applications that want to make use of libosmotrau. %prep -%setup -qn %name +%setup -q %patch -P 1 -P 2 -p1 %build From 3afde0d337146a23d05031b3b1247ca5faf99ae10932effe3de7be37ab473887 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Fri, 11 Mar 2016 11:07:54 +0000 Subject: [PATCH 5/8] OBS-URL: https://build.opensuse.org/package/show/network:telephony/libosmo-abis?expand=0&rev=21 --- libosmo-abis-0.3.2.4.tar.xz | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 libosmo-abis-0.3.2.4.tar.xz diff --git a/libosmo-abis-0.3.2.4.tar.xz b/libosmo-abis-0.3.2.4.tar.xz new file mode 100644 index 0000000..2adaf24 --- /dev/null +++ b/libosmo-abis-0.3.2.4.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:06c856d4ccfb8783b4361472cffade47f46f6c05139df3696a1138473bc928fe +size 61164 From f4e33273478cab5330311e6c265348715f2b668408ce19c50b5ca00ce05da063 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Sat, 30 Jul 2016 18:19:56 +0000 Subject: [PATCH 6/8] libosmo-abis-0.3.2.19 OBS-URL: https://build.opensuse.org/package/show/network:telephony/libosmo-abis?expand=0&rev=22 --- libosmo-abis-0.3.2.19.tar.xz | 3 +++ libosmo-abis-0.3.2.4.tar.xz | 3 --- libosmo-abis.changes | 8 ++++++++ libosmo-abis.spec | 4 +++- 4 files changed, 14 insertions(+), 4 deletions(-) create mode 100644 libosmo-abis-0.3.2.19.tar.xz delete mode 100644 libosmo-abis-0.3.2.4.tar.xz diff --git a/libosmo-abis-0.3.2.19.tar.xz b/libosmo-abis-0.3.2.19.tar.xz new file mode 100644 index 0000000..0587be4 --- /dev/null +++ b/libosmo-abis-0.3.2.19.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:22abbe3bbc7abd02d5ba342a48ce6b6c489ee3641023d67f6180a8c5400e8ed0 +size 62296 diff --git a/libosmo-abis-0.3.2.4.tar.xz b/libosmo-abis-0.3.2.4.tar.xz deleted file mode 100644 index 2adaf24..0000000 --- a/libosmo-abis-0.3.2.4.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:06c856d4ccfb8783b4361472cffade47f46f6c05139df3696a1138473bc928fe -size 61164 diff --git a/libosmo-abis.changes b/libosmo-abis.changes index 1f61d6a..16434f4 100644 --- a/libosmo-abis.changes +++ b/libosmo-abis.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Sat Jul 30 17:54:58 UTC 2016 - jengelh@inai.de + +- Update to new upstream snapshot 0.3.2.19 +* ipa driver: make bind address vty configurable +* Do not send RTP to port 0 +* Add defines for FN to SAMPLE conversion + ------------------------------------------------------------------- Fri Jan 22 19:08:57 UTC 2016 - jengelh@inai.de diff --git a/libosmo-abis.spec b/libosmo-abis.spec index 00936d9..1ed64d9 100644 --- a/libosmo-abis.spec +++ b/libosmo-abis.spec @@ -16,8 +16,10 @@ # +%define version_unconverted 0.3.2.19 + Name: libosmo-abis -Version: 0.3.2.4 +Version: 0.3.2.19 Release: 0 Summary: Osmocom library for A-bis interface between BTS and BSC License: AGPL-3.0+ and GPL-2.0+ From 3b26974ac2471c63be614130a1e2faea9e8eabd203a6fd6458dedfbdecf3025b Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Sat, 1 Oct 2016 12:31:05 +0000 Subject: [PATCH 7/8] - Update to new upstream snapshot 0.3.2.24 OBS-URL: https://build.opensuse.org/package/show/network:telephony/libosmo-abis?expand=0&rev=23 --- libosmo-abis-0.3.2.19.tar.xz | 3 --- libosmo-abis-0.3.2.24.tar.xz | 3 +++ libosmo-abis.changes | 6 ++++++ libosmo-abis.spec | 9 +++++---- ortp27.diff | 31 +++++++++++++++++++++++++++++++ osmo-talloc.diff | 24 ++++++++++++------------ 6 files changed, 57 insertions(+), 19 deletions(-) delete mode 100644 libosmo-abis-0.3.2.19.tar.xz create mode 100644 libosmo-abis-0.3.2.24.tar.xz create mode 100644 ortp27.diff diff --git a/libosmo-abis-0.3.2.19.tar.xz b/libosmo-abis-0.3.2.19.tar.xz deleted file mode 100644 index 0587be4..0000000 --- a/libosmo-abis-0.3.2.19.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:22abbe3bbc7abd02d5ba342a48ce6b6c489ee3641023d67f6180a8c5400e8ed0 -size 62296 diff --git a/libosmo-abis-0.3.2.24.tar.xz b/libosmo-abis-0.3.2.24.tar.xz new file mode 100644 index 0000000..502863c --- /dev/null +++ b/libosmo-abis-0.3.2.24.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:578321ce1402835e3c50c65c60cd20edc762cfbe14203fe86426f0d25766fcec +size 62292 diff --git a/libosmo-abis.changes b/libosmo-abis.changes index 16434f4..c12f191 100644 --- a/libosmo-abis.changes +++ b/libosmo-abis.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sat Oct 1 12:30:41 UTC 2016 - jengelh@inai.de + +- Update to new upstream snapshot 0.3.2.24 +- Add ortp27.diff + ------------------------------------------------------------------- Sat Jul 30 17:54:58 UTC 2016 - jengelh@inai.de diff --git a/libosmo-abis.spec b/libosmo-abis.spec index 1ed64d9..cae29c8 100644 --- a/libosmo-abis.spec +++ b/libosmo-abis.spec @@ -16,10 +16,10 @@ # -%define version_unconverted 0.3.2.19 +%define version_unconverted 0.3.2.24 Name: libosmo-abis -Version: 0.3.2.19 +Version: 0.3.2.24 Release: 0 Summary: Osmocom library for A-bis interface between BTS and BSC License: AGPL-3.0+ and GPL-2.0+ @@ -31,6 +31,7 @@ Url: http://openbsc.osmocom.org/trac/wiki/libosmo-abis Source: %name-%version.tar.xz Patch1: osmo-talloc.diff Patch2: 0001-build-resolve-compiler-warnings.patch +Patch3: ortp27.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: autoconf BuildRequires: automake >= 1.6 @@ -41,7 +42,7 @@ BuildRequires: xz BuildRequires: pkgconfig(libosmocore) >= 0.3.0 BuildRequires: pkgconfig(libosmogsm) >= 0.3.10 BuildRequires: pkgconfig(libosmovty) >= 0.3.0 -BuildRequires: pkgconfig(ortp) >= 0.13.1 +BuildRequires: pkgconfig(ortp) >= 0.22 %description In GSM, A-bis is a BSS-internal interface link between the BTS and @@ -101,7 +102,7 @@ applications that want to make use of libosmotrau. %prep %setup -q -%patch -P 1 -P 2 -p1 +%patch -P 1 -P 2 -P 3 -p1 %build echo "%version" >.tarball-version diff --git a/ortp27.diff b/ortp27.diff new file mode 100644 index 0000000..a924979 --- /dev/null +++ b/ortp27.diff @@ -0,0 +1,31 @@ +From: Jan Engelhardt +Date: 2016-10-01 14:30:22.066588957 +0200 + +build: make libosmo-abis build with ortp-0.27 + +--- + src/trau/osmo_ortp.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +Index: libosmo-abis-0.3.2.24/src/trau/osmo_ortp.c +=================================================================== +--- libosmo-abis-0.3.2.24.orig/src/trau/osmo_ortp.c ++++ libosmo-abis-0.3.2.24/src/trau/osmo_ortp.c +@@ -94,7 +94,7 @@ static int ortp_to_osmo_lvl(OrtpLogLevel + return LOGL_ERROR; + } + +-static void my_ortp_logfn(OrtpLogLevel lev, const char *fmt, ++static void my_ortp_logfn(const char *domain, OrtpLogLevel lev, const char *fmt, + va_list args) + { + osmo_vlogp(DLMIB, ortp_to_osmo_lvl(lev), __FILE__, 0, +@@ -271,7 +271,7 @@ void osmo_rtp_init(void *ctx) + tall_rtp_ctx = ctx; + ortp_set_memory_functions(&osmo_ortp_memfn); + ortp_init(); +- ortp_set_log_level_mask(0xffff); ++ ortp_set_log_level_mask(ORTP_LOG_DOMAIN, 0xffff); + ortp_set_log_handler(my_ortp_logfn); + create_payload_types(); + } diff --git a/osmo-talloc.diff b/osmo-talloc.diff index 3a564a8..92f9fe1 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/configure.ac +Index: libosmo-abis-0.3.2.24/configure.ac =================================================================== ---- libosmo-abis.orig/configure.ac -+++ libosmo-abis/configure.ac -@@ -33,6 +33,7 @@ AM_CONFIG_HEADER(config.h) +--- libosmo-abis-0.3.2.24.orig/configure.ac ++++ libosmo-abis-0.3.2.24/configure.ac +@@ -30,6 +30,7 @@ AC_SUBST(SYMBOL_VISIBILITY) + dnl Generate the output + AM_CONFIG_HEADER(config.h) + ++PKG_CHECK_MODULES([TALLOC], [talloc]) PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 0.3.0) PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 0.3.0) PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 0.3.10) -+PKG_CHECK_MODULES([TALLOC], [talloc]) - PKG_CHECK_MODULES([ORTP], [ortp >= 0.13.1], - [ - PKG_CHECK_MODULES([ORTP_VERSION], [ortp >= 0.21], -Index: libosmo-abis/src/Makefile.am +Index: libosmo-abis-0.3.2.24/src/Makefile.am =================================================================== ---- libosmo-abis.orig/src/Makefile.am -+++ libosmo-abis/src/Makefile.am -@@ -6,7 +6,7 @@ TRAU_LIBVERSION=0:0:0 +--- libosmo-abis-0.3.2.24.orig/src/Makefile.am ++++ libosmo-abis-0.3.2.24/src/Makefile.am +@@ -6,7 +6,7 @@ TRAU_LIBVERSION=1:0:0 AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include -I$(top_builddir) AM_CFLAGS= -Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(COVERAGE_CFLAGS) AM_LDFLAGS = $(COVERAGE_LDFLAGS) From a32c3c789e5184765bf2dbff23313869c255db32bb2460c1f8936ab507fa4920 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Sat, 1 Oct 2016 12:33:59 +0000 Subject: [PATCH 8/8] OBS-URL: https://build.opensuse.org/package/show/network:telephony/libosmo-abis?expand=0&rev=24 --- libosmo-abis.changes | 1 + 1 file changed, 1 insertion(+) diff --git a/libosmo-abis.changes b/libosmo-abis.changes index c12f191..716c0b5 100644 --- a/libosmo-abis.changes +++ b/libosmo-abis.changes @@ -2,6 +2,7 @@ Sat Oct 1 12:30:41 UTC 2016 - jengelh@inai.de - Update to new upstream snapshot 0.3.2.24 +* No visible changes - Add ortp27.diff -------------------------------------------------------------------