From 8d9efcf92ca4d7a282f540035276e5cbb77201cf4970a72ab05ae47d2931a0c8 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Tue, 7 Jan 2020 11:33:01 +0000 Subject: [PATCH] Accepting request 760940 from home:mnhauke:osmocom:CNI-2020-01 - Update to new upstream release 0.7.0 * libosmo-netif.pc.in: Append -lsctp to Libs.private * stream: osmo_stream_cli: Support setting multiple addr * stream: osmo_stream_srv_link: Support setting multiple addr * stream: Fix scheduling of queued messages during connecting state * stream: Introduce API osmo_stream_cli_is_connected - Update patch * osmo-talloc.diff OBS-URL: https://build.opensuse.org/request/show/760940 OBS-URL: https://build.opensuse.org/package/show/network:telephony/libosmo-netif?expand=0&rev=30 --- _service | 4 ++-- libosmo-netif-0.6.0.tar.xz | 3 --- libosmo-netif-0.7.0.tar.xz | 3 +++ libosmo-netif.changes | 12 ++++++++++++ libosmo-netif.spec | 10 +++++----- osmo-talloc.diff | 32 +++++++++++++------------------- 6 files changed, 35 insertions(+), 29 deletions(-) delete mode 100644 libosmo-netif-0.6.0.tar.xz create mode 100644 libosmo-netif-0.7.0.tar.xz diff --git a/_service b/_service index 2bd2c9d..140bdd0 100644 --- a/_service +++ b/_service @@ -2,8 +2,8 @@ git git://git.osmocom.org/libosmo-netif - 0.6.0 - 0.6.0 + 0.7.0 + 0.7.0 *.tar diff --git a/libosmo-netif-0.6.0.tar.xz b/libosmo-netif-0.6.0.tar.xz deleted file mode 100644 index 9ae69f8..0000000 --- a/libosmo-netif-0.6.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ea6ec38bb4b0d9dad6c3ec566e6d044313c4323222a3ecd2c4f5d96b04a65e56 -size 153280 diff --git a/libosmo-netif-0.7.0.tar.xz b/libosmo-netif-0.7.0.tar.xz new file mode 100644 index 0000000..1733473 --- /dev/null +++ b/libosmo-netif-0.7.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8b30bdf598e0f21d6fc469c7aae4ae127d013ecf73f2a56b37e03284500c8dfe +size 161256 diff --git a/libosmo-netif.changes b/libosmo-netif.changes index 5a34a40..8628ed7 100644 --- a/libosmo-netif.changes +++ b/libosmo-netif.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Sun Jan 5 10:49:20 UTC 2020 - Martin Hauke + +- Update to new upstream release 0.7.0 + * libosmo-netif.pc.in: Append -lsctp to Libs.private + * stream: osmo_stream_cli: Support setting multiple addr + * stream: osmo_stream_srv_link: Support setting multiple addr + * stream: Fix scheduling of queued messages during connecting state + * stream: Introduce API osmo_stream_cli_is_connected +- Update patch + * osmo-talloc.diff + ------------------------------------------------------------------- Thu Aug 15 04:32:14 UTC 2019 - Jan Engelhardt diff --git a/libosmo-netif.spec b/libosmo-netif.spec index b956078..d05466b 100644 --- a/libosmo-netif.spec +++ b/libosmo-netif.spec @@ -1,7 +1,7 @@ # # spec file for package libosmo-netif # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,13 +16,13 @@ # -%define version_unconverted 0.6.0 +%define version_unconverted 0.7.0 Name: libosmo-netif Summary: Osmocom library for muxed audio License: GPL-2.0-or-later Group: Productivity/Telephony/Utilities -Version: 0.6.0 +Version: 0.7.0 Release: 0 Url: https://osmocom.org/projects/libosmo-netif @@ -35,8 +35,8 @@ BuildRequires: lksctp-tools-devel BuildRequires: pkg-config >= 0.20 BuildRequires: xz BuildRequires: pkgconfig(libosmoabis) >= 0.6.0 -BuildRequires: pkgconfig(libosmocore) >= 1.0.0 -BuildRequires: pkgconfig(libosmogsm) >= 1.0.0 +BuildRequires: pkgconfig(libosmocore) >= 1.3.0 +BuildRequires: pkgconfig(libosmogsm) >= 1.3.0 BuildRequires: pkgconfig(talloc) %description diff --git a/osmo-talloc.diff b/osmo-talloc.diff index 6717de7..b228b6a 100644 --- a/osmo-talloc.diff +++ b/osmo-talloc.diff @@ -1,13 +1,7 @@ ---- - configure.ac | 1 + - examples/Makefile.am | 30 +++++++++++++++--------------- - src/Makefile.am | 2 +- - 3 files changed, 17 insertions(+), 16 deletions(-) - -Index: libosmo-netif-0.6.0/configure.ac -=================================================================== ---- libosmo-netif-0.6.0.orig/configure.ac -+++ libosmo-netif-0.6.0/configure.ac +diff --git a/configure.ac b/configure.ac +index 7af10ec..619f4ad 100644 +--- a/configure.ac ++++ b/configure.ac @@ -98,6 +98,7 @@ AC_SEARCH_LIBS([sctp_send], [sctp], [ AC_MSG_ERROR([sctp_send not found in searched libs])]) LIBS=$old_LIBS @@ -16,10 +10,10 @@ Index: libosmo-netif-0.6.0/configure.ac AC_CHECK_HEADERS(dahdi/user.h,,AC_MSG_WARN(DAHDI input driver will not be built)) found_pcap=yes -Index: libosmo-netif-0.6.0/examples/Makefile.am -=================================================================== ---- libosmo-netif-0.6.0.orig/examples/Makefile.am -+++ libosmo-netif-0.6.0/examples/Makefile.am +diff --git a/examples/Makefile.am b/examples/Makefile.am +index 4125243..8780fba 100644 +--- a/examples/Makefile.am ++++ b/examples/Makefile.am @@ -1,5 +1,5 @@ AM_CPPFLAGS = -I$(top_srcdir)/include -AM_CFLAGS=-Wall -g $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOABIS_CFLAGS) $(COVERAGE_CFLAGS) @@ -96,12 +90,12 @@ Index: libosmo-netif-0.6.0/examples/Makefile.am osmux_test_output_LDADD = $(top_builddir)/src/libosmonetif.la \ - $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) + $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(TALLOC_LIBS) -Index: libosmo-netif-0.6.0/src/Makefile.am -=================================================================== ---- libosmo-netif-0.6.0.orig/src/Makefile.am -+++ libosmo-netif-0.6.0/src/Makefile.am +diff --git a/src/Makefile.am b/src/Makefile.am +index 64fd1d4..3da783f 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am @@ -3,7 +3,7 @@ - LIBVERSION=8:0:0 + LIBVERSION=9:0:1 AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir) -AM_CFLAGS= -fPIC -Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOABIS_CFLAGS) $(COVERAGE_CFLAGS) $(LIBSCTP_CFLAGS)