diff --git a/_service b/_service index 10dab9f..78a23a3 100644 --- a/_service +++ b/_service @@ -2,8 +2,8 @@ git git://git.osmocom.org/libosmo-netif - 0.1.1 - 0.1.1 + 0.3.0 + 0.3.0 *.tar diff --git a/libosmo-netif-0.1.1.tar.xz b/libosmo-netif-0.1.1.tar.xz deleted file mode 100644 index 5b056fb..0000000 --- a/libosmo-netif-0.1.1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b58bc44a75b097a1cfb89b29753428b088db0322d878bdfc6215d0c1b05f83fb -size 130992 diff --git a/libosmo-netif-0.3.0.tar.xz b/libosmo-netif-0.3.0.tar.xz new file mode 100644 index 0000000..44e3a50 --- /dev/null +++ b/libosmo-netif-0.3.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:983cd2a563df6abf98dde943ed33d7909c55541d7adfdeaec3e8fa65bb284761 +size 145328 diff --git a/libosmo-netif.changes b/libosmo-netif.changes index 7e19d7c..afc9420 100644 --- a/libosmo-netif.changes +++ b/libosmo-netif.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Tue Dec 11 00:52:52 UTC 2018 - Jan Engelhardt + +- Update to new upstream release 0.3.0 + * stream: Avoid re-creating and leaking socket when unneeded + * osmo_stream_{cli,srv}_destroy: fix a mem leak on an empty msgb queue + * Add support for flushing and destroying a server-side stream + * jibuf: Add initial implementation of Jitter Buffer + * Remove "channel" layer + ------------------------------------------------------------------- Wed Dec 27 20:38:21 UTC 2017 - jengelh@inai.de diff --git a/libosmo-netif.spec b/libosmo-netif.spec index b9ad63b..bceca1a 100644 --- a/libosmo-netif.spec +++ b/libosmo-netif.spec @@ -1,7 +1,7 @@ # # spec file for package libosmo-netif # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 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 @@ -12,17 +12,17 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # -%define version_unconverted 0.1.1 +%define version_unconverted 0.3.0 Name: libosmo-netif Summary: Osmocom library for muxed audio -License: GPL-2.0+ +License: GPL-2.0-or-later Group: Productivity/Telephony/Utilities -Version: 0.1.1 +Version: 0.3.0 Release: 0 Url: https://osmocom.org/projects/libosmo-netif @@ -34,27 +34,27 @@ BuildRequires: libtool >= 2 BuildRequires: lksctp-tools-devel BuildRequires: pkg-config >= 0.20 BuildRequires: xz -BuildRequires: pkgconfig(libosmoabis) >= 0.0.7 -BuildRequires: pkgconfig(libosmocore) >= 0.10.0 -BuildRequires: pkgconfig(libosmogsm) >= 0.10.0 +BuildRequires: pkgconfig(libosmoabis) >= 0.5.1 +BuildRequires: pkgconfig(libosmocore) >= 0.12.0 +BuildRequires: pkgconfig(libosmogsm) >= 0.12.0 BuildRequires: pkgconfig(talloc) %description Network interface demuxer library for OsmoCom projects. -%package -n libosmonetif4 +%package -n libosmonetif6 Summary: Osmocom library for muxed audio -License: AGPL-3.0+ +License: AGPL-3.0-or-later Group: System/Libraries -%description -n libosmonetif4 +%description -n libosmonetif6 Network interface demuxer library for OsmoCom projects. %package -n libosmonetif-devel Summary: Development files for the Osmocom muxed audio library -License: AGPL-3.0+ +License: AGPL-3.0-or-later Group: Development/Libraries/C and C++ -Requires: libosmonetif4 = %version +Requires: libosmonetif6 = %version %description -n libosmonetif-devel Network interface demuxer library for OsmoCom projects. @@ -84,12 +84,12 @@ if ! make %{?_smp_mflags} check; then # timing issue fi -%post -n libosmonetif4 -p /sbin/ldconfig -%postun -n libosmonetif4 -p /sbin/ldconfig +%post -n libosmonetif6 -p /sbin/ldconfig +%postun -n libosmonetif6 -p /sbin/ldconfig -%files -n libosmonetif4 +%files -n libosmonetif6 %defattr(-,root,root) -%_libdir/libosmonetif.so.4* +%_libdir/libosmonetif.so.6* %files -n libosmonetif-devel %defattr(-,root,root) diff --git a/osmo-talloc.diff b/osmo-talloc.diff index f9928ce..cfbea22 100644 --- a/osmo-talloc.diff +++ b/osmo-talloc.diff @@ -4,37 +4,35 @@ Date: Thu, 2 Oct 2014 23:26:16 +0200 Subject: [PATCH] build: support external libtalloc --- - configure.ac | 1 + - examples/Makefile.am | 30 +++++++++++++++--------------- - examples/channel/Makefile.am | 6 +++--- - src/Makefile.am | 4 ++-- - src/channel/abis/Makefile.am | 4 ++-- - 5 files changed, 23 insertions(+), 22 deletions(-) + configure.ac | 1 + + examples/Makefile.am | 30 +++++++++++++++--------------- + src/Makefile.am | 4 ++-- + 3 files changed, 18 insertions(+), 17 deletions(-) -Index: libosmo-netif-0.1.1/configure.ac +Index: libosmo-netif-0.3.0/configure.ac =================================================================== ---- libosmo-netif-0.1.1.orig/configure.ac -+++ libosmo-netif-0.1.1/configure.ac -@@ -68,6 +68,7 @@ AC_SEARCH_LIBS([sctp_send], [sctp], [ +--- libosmo-netif-0.3.0.orig/configure.ac ++++ libosmo-netif-0.3.0/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 +PKG_CHECK_MODULES([TALLOC], [talloc]) AC_CHECK_HEADERS(dahdi/user.h,,AC_MSG_WARN(DAHDI input driver will not be built)) - AC_ARG_ENABLE(doxygen, -Index: libosmo-netif-0.1.1/examples/Makefile.am + found_pcap=yes +Index: libosmo-netif-0.3.0/examples/Makefile.am =================================================================== ---- libosmo-netif-0.1.1.orig/examples/Makefile.am -+++ libosmo-netif-0.1.1/examples/Makefile.am +--- libosmo-netif-0.3.0.orig/examples/Makefile.am ++++ libosmo-netif-0.3.0/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) +AM_CFLAGS=-Wall -g $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOABIS_CFLAGS) $(COVERAGE_CFLAGS) $(TALLOC_CFLAGS) AM_LDFLAGS = $(COVERAGE_LDFLAGS) - SUBDIRS = channel -@@ -23,54 +23,54 @@ noinst_HEADERS = udp-test.h + noinst_PROGRAMS = ipa-stream-client \ +@@ -21,54 +21,54 @@ noinst_HEADERS = udp-test.h ipa_stream_client_SOURCES = ipa-stream-client.c ipa_stream_client_LDADD = $(top_builddir)/src/libosmonetif.la \ @@ -103,62 +101,22 @@ Index: libosmo-netif-0.1.1/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.1.1/examples/channel/Makefile.am +Index: libosmo-netif-0.3.0/src/Makefile.am =================================================================== ---- libosmo-netif-0.1.1.orig/examples/channel/Makefile.am -+++ libosmo-netif-0.1.1/examples/channel/Makefile.am -@@ -1,5 +1,5 @@ - AM_CPPFLAGS = -I$(top_srcdir)/include --AM_CFLAGS=-Wall -g $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOABIS_CFLAGS) $(COVERAGE_CFLAGS) -+AM_CFLAGS=-Wall -g $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOABIS_CFLAGS) $(COVERAGE_CFLAGS) $(TALLOC_CFLAGS) - AM_LDFLAGS = $(COVERAGE_LDFLAGS) - - noinst_PROGRAMS = abis_ipa_stream_server \ -@@ -7,8 +7,8 @@ noinst_PROGRAMS = abis_ipa_stream_server - - abis_ipa_stream_server_SOURCES = abis_ipa_stream_server.c - abis_ipa_stream_server_LDADD = $(top_builddir)/src/libosmonetif.la \ -- $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) -+ $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(TALLOC_LIBS) - - abis_ipa_stream_client_SOURCES = abis_ipa_stream_client.c - abis_ipa_stream_client_LDADD = $(top_builddir)/src/libosmonetif.la \ -- $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) -+ $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(TALLOC_LIBS) -Index: libosmo-netif-0.1.1/src/Makefile.am -=================================================================== ---- libosmo-netif-0.1.1.orig/src/Makefile.am -+++ libosmo-netif-0.1.1/src/Makefile.am -@@ -3,14 +3,14 @@ - LIBVERSION=4:0:0 +--- libosmo-netif-0.3.0.orig/src/Makefile.am ++++ libosmo-netif-0.3.0/src/Makefile.am +@@ -3,12 +3,12 @@ + LIBVERSION=6:0:0 AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir) -AM_CFLAGS= -fPIC -Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOABIS_CFLAGS) $(COVERAGE_CFLAGS) $(LIBSCTP_CFLAGS) +AM_CFLAGS = -fPIC -Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOABIS_CFLAGS) $(COVERAGE_CFLAGS) $(LIBSCTP_CFLAGS) $(TALLOC_CFLAGS) AM_LDFLAGS = $(COVERAGE_LDFLAGS) - SUBDIRS = channel - lib_LTLIBRARIES = libosmonetif.la --libosmonetif_la_LIBADD = channel/abis/libosmonetif-abis.la $(LIBOSMOCORE_LIBS) $(LIBSCTP_LIBS) -+libosmonetif_la_LIBADD = channel/abis/libosmonetif-abis.la $(LIBOSMOCORE_LIBS) $(LIBSCTP_LIBS) $(TALLOC_LIBS) +-libosmonetif_la_LIBADD = $(LIBOSMOCORE_LIBS) $(LIBSCTP_LIBS) ++libosmonetif_la_LIBADD = $(LIBOSMOCORE_LIBS) $(LIBSCTP_LIBS) $(TALLOC_LIBS) libosmonetif_la_LDFLAGS = -version-info $(LIBVERSION) -no-undefined libosmonetif_la_SOURCES = amr.c \ -Index: libosmo-netif-0.1.1/src/channel/abis/Makefile.am -=================================================================== ---- libosmo-netif-0.1.1.orig/src/channel/abis/Makefile.am -+++ libosmo-netif-0.1.1/src/channel/abis/Makefile.am -@@ -1,9 +1,9 @@ - AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir) --AM_CFLAGS= -fPIC -Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(COVERAGE_CFLAGS) -+AM_CFLAGS = -fPIC -Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(COVERAGE_CFLAGS) $(TALLOC_CFLAGS) - AM_LDFLAGS = $(COVERAGE_LDFLAGS) - - noinst_LTLIBRARIES = libosmonetif-abis.la - - libosmonetif_abis_la_SOURCES = ipa_stream_server.c \ - ipa_stream_client.c --libosmonetif_abis_la_LIBADD = $(LIBOSMOCORE_LIBS) $(LIBOSMOVTY_LIBS) -+libosmonetif_abis_la_LIBADD = $(LIBOSMOCORE_LIBS) $(LIBOSMOVTY_LIBS) $(TALLOC_LIBS)