From 297142cba45b93927ab5c319a050e9595b00a785198440df2480671708ff0dda Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Mon, 2 Oct 2017 23:06:33 +0000 Subject: [PATCH] - Update to new upstream snapshot 0.0.6.85 OBS-URL: https://build.opensuse.org/package/show/network:telephony/libosmo-netif?expand=0&rev=20 --- libosmo-netif-0.0.6.67.tar.xz | 3 --- libosmo-netif-0.0.6.85.tar.xz | 3 +++ libosmo-netif.changes | 7 +++++++ libosmo-netif.spec | 5 +++-- osmo-talloc.diff | 34 +++++++++++++++++----------------- 5 files changed, 30 insertions(+), 22 deletions(-) delete mode 100644 libosmo-netif-0.0.6.67.tar.xz create mode 100644 libosmo-netif-0.0.6.85.tar.xz diff --git a/libosmo-netif-0.0.6.67.tar.xz b/libosmo-netif-0.0.6.67.tar.xz deleted file mode 100644 index 8afc06e..0000000 --- a/libosmo-netif-0.0.6.67.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a4d81f0e8e237d0d4dd85a9ab182cd07caf4eb8bc523e2ee637eebcf3437e606 -size 129012 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 3a7e383..76c6c4b 100644 --- a/libosmo-netif.changes +++ b/libosmo-netif.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +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 diff --git a/libosmo-netif.spec b/libosmo-netif.spec index 13959b7..2c73239 100644 --- a/libosmo-netif.spec +++ b/libosmo-netif.spec @@ -16,13 +16,13 @@ # -%define version_unconverted 0.0.6.67 +%define version_unconverted 0.0.6.85 Name: libosmo-netif Summary: Osmocom library for muxed audio License: GPL-2.0+ Group: Productivity/Telephony/Utilities -Version: 0.0.6.67 +Version: 0.0.6.85 Release: 0 Url: https://osmocom.org/projects/libosmo-netif @@ -38,6 +38,7 @@ 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 f4f9821..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-0.0.6.67/configure.ac +Index: libosmo-netif-0.0.6.85/configure.ac =================================================================== ---- libosmo-netif-0.0.6.67.orig/configure.ac -+++ libosmo-netif-0.0.6.67/configure.ac -@@ -61,6 +61,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_PATH_PROG(DOXYGEN,doxygen,false) -Index: libosmo-netif-0.0.6.67/examples/Makefile.am + AC_ARG_ENABLE(doxygen, +Index: libosmo-netif-0.0.6.85/examples/Makefile.am =================================================================== ---- libosmo-netif-0.0.6.67.orig/examples/Makefile.am -+++ libosmo-netif-0.0.6.67/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-0.0.6.67/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.0.6.67/examples/channel/Makefile.am +Index: libosmo-netif-0.0.6.85/examples/channel/Makefile.am =================================================================== ---- libosmo-netif-0.0.6.67.orig/examples/channel/Makefile.am -+++ libosmo-netif-0.0.6.67/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-0.0.6.67/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-0.0.6.67/src/Makefile.am +Index: libosmo-netif-0.0.6.85/src/Makefile.am =================================================================== ---- libosmo-netif-0.0.6.67.orig/src/Makefile.am -+++ libosmo-netif-0.0.6.67/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-0.0.6.67/src/Makefile.am libosmonetif_la_LDFLAGS = -version-info $(LIBVERSION) -no-undefined libosmonetif_la_SOURCES = amr.c \ -Index: libosmo-netif-0.0.6.67/src/channel/abis/Makefile.am +Index: libosmo-netif-0.0.6.85/src/channel/abis/Makefile.am =================================================================== ---- libosmo-netif-0.0.6.67.orig/src/channel/abis/Makefile.am -+++ libosmo-netif-0.0.6.67/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)