diff --git a/_service b/_service index e69b402..36346f2 100644 --- a/_service +++ b/_service @@ -1,12 +1,12 @@ - + git git://git.osmocom.org/libosmo-netif @PARENT_TAG@.@TAG_OFFSET@ - + *.tar xz - + diff --git a/libosmo-netif-0.0.6.19.tar.xz b/libosmo-netif-0.0.6.19.tar.xz deleted file mode 100644 index b7f3186..0000000 --- a/libosmo-netif-0.0.6.19.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:eb7ed88339f5426820f6204b2b9242da334e74a96df433cae0c45287ffbbe27b -size 106216 diff --git a/libosmo-netif-0.0.6.85.tar.xz b/libosmo-netif-0.0.6.85.tar.xz new file mode 100644 index 0000000..ada3b55 --- /dev/null +++ b/libosmo-netif-0.0.6.85.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3b17b84a5e7e02668713e03b32e3c276d7a4de40ca017308f0085ff050d2fb16 +size 129556 diff --git a/libosmo-netif.changes b/libosmo-netif.changes index c1a4cd0..76c6c4b 100644 --- a/libosmo-netif.changes +++ b/libosmo-netif.changes @@ -1,3 +1,19 @@ +------------------------------------------------------------------- +Mon Oct 2 23:04:14 UTC 2017 - jengelh@inai.de + +- Update to new upstream snapshot 0.0.6.85 + * rtp: return offset in osmo_rtp_snprintf() + * somo_stream_srv_fd_cb(): close socket if NODELAY fails + +------------------------------------------------------------------- +Fri Apr 28 21:24:50 UTC 2017 - jengelh@inai.de + +- Update to new upstream snapshot 0.0.6.67 + * Fix potential NULL dereference + * stream: don't crash in _close() when fd is not initialized + * stream: When destroying, make sure to kill reconnect timer + * osmux: Fix delay between RTP packets + ------------------------------------------------------------------- Sun Jul 31 17:59:57 UTC 2016 - jengelh@inai.de diff --git a/libosmo-netif.spec b/libosmo-netif.spec index bf5197c..2c73239 100644 --- a/libosmo-netif.spec +++ b/libosmo-netif.spec @@ -1,7 +1,7 @@ # # spec file for package libosmo-netif # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 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,29 +16,29 @@ # -%define version_unconverted 0.0.6.19 +%define version_unconverted 0.0.6.85 Name: libosmo-netif Summary: Osmocom library for muxed audio -License: AGPL-3.0+ and GPL-2.0+ +License: GPL-2.0+ Group: Productivity/Telephony/Utilities -Version: 0.0.6.19 +Version: 0.0.6.85 Release: 0 -Url: http://openbsc.osmocom.org/trac/ +Url: https://osmocom.org/projects/libosmo-netif Source: %name-%version.tar.xz Patch1: osmo-talloc.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: autoconf BuildRequires: automake BuildRequires: libtool >= 2 BuildRequires: lksctp-tools-devel -BuildRequires: pkg-config +BuildRequires: pkg-config >= 0.20 BuildRequires: xz BuildRequires: pkgconfig(libosmoabis) >= 0.3.2.3 BuildRequires: pkgconfig(libosmocore) >= 0.3.0 BuildRequires: pkgconfig(libosmogsm) >= 0.3.0 BuildRequires: pkgconfig(libosmovty) >= 0.3.0 +BuildRequires: pkgconfig(talloc) %description Network interface demuxer library for OsmoCom projects. diff --git a/osmo-talloc.diff b/osmo-talloc.diff index 44286c5..4ac98a4 100644 --- a/osmo-talloc.diff +++ b/osmo-talloc.diff @@ -11,22 +11,22 @@ Subject: [PATCH] build: support external libtalloc src/channel/abis/Makefile.am | 4 ++-- 5 files changed, 21 insertions(+), 20 deletions(-) -Index: libosmo-netif/configure.ac +Index: libosmo-netif-0.0.6.85/configure.ac =================================================================== ---- libosmo-netif.orig/configure.ac -+++ libosmo-netif/configure.ac -@@ -52,6 +52,7 @@ AC_SEARCH_LIBS([sctp_send], [sctp], [ +--- libosmo-netif-0.0.6.85.orig/configure.ac ++++ libosmo-netif-0.0.6.85/configure.ac +@@ -68,6 +68,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_OUTPUT( -Index: libosmo-netif/examples/Makefile.am + AC_ARG_ENABLE(doxygen, +Index: libosmo-netif-0.0.6.85/examples/Makefile.am =================================================================== ---- libosmo-netif.orig/examples/Makefile.am -+++ libosmo-netif/examples/Makefile.am +--- libosmo-netif-0.0.6.85.orig/examples/Makefile.am ++++ libosmo-netif-0.0.6.85/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) @@ -95,10 +95,10 @@ Index: libosmo-netif/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/examples/channel/Makefile.am +Index: libosmo-netif-0.0.6.85/examples/channel/Makefile.am =================================================================== ---- libosmo-netif.orig/examples/channel/Makefile.am -+++ libosmo-netif/examples/channel/Makefile.am +--- libosmo-netif-0.0.6.85.orig/examples/channel/Makefile.am ++++ libosmo-netif-0.0.6.85/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) @@ -117,10 +117,10 @@ Index: libosmo-netif/examples/channel/Makefile.am abis_ipa_stream_client_LDADD = $(top_builddir)/src/libosmonetif.la \ - $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) + $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(TALLOC_LIBS) -Index: libosmo-netif/src/Makefile.am +Index: libosmo-netif-0.0.6.85/src/Makefile.am =================================================================== ---- libosmo-netif.orig/src/Makefile.am -+++ libosmo-netif/src/Makefile.am +--- libosmo-netif-0.0.6.85.orig/src/Makefile.am ++++ libosmo-netif-0.0.6.85/src/Makefile.am @@ -3,14 +3,14 @@ LIBVERSION=3:0:0 @@ -138,10 +138,10 @@ Index: libosmo-netif/src/Makefile.am libosmonetif_la_LDFLAGS = -version-info $(LIBVERSION) -no-undefined libosmonetif_la_SOURCES = amr.c \ -Index: libosmo-netif/src/channel/abis/Makefile.am +Index: libosmo-netif-0.0.6.85/src/channel/abis/Makefile.am =================================================================== ---- libosmo-netif.orig/src/channel/abis/Makefile.am -+++ libosmo-netif/src/channel/abis/Makefile.am +--- libosmo-netif-0.0.6.85.orig/src/channel/abis/Makefile.am ++++ libosmo-netif-0.0.6.85/src/channel/abis/Makefile.am @@ -1,9 +1,9 @@ AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir) -AM_CFLAGS= -fPIC -Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(COVERAGE_CFLAGS)