From 86ee77a9fc40757c40570e579e9c612b9cb512ca707243cf1b1b57ade55e2ada Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Fri, 28 Apr 2017 22:34:02 +0000 Subject: [PATCH 1/5] - Update to new upstream snapshot 0.0.6.67 OBS-URL: https://build.opensuse.org/package/show/network:telephony/libosmo-netif?expand=0&rev=16 --- _service | 6 +++--- libosmo-netif-0.0.6.19.tar.xz | 3 --- libosmo-netif-0.0.6.67.tar.xz | 3 +++ libosmo-netif.changes | 9 +++++++++ libosmo-netif.spec | 8 ++++---- osmo-talloc.diff | 34 +++++++++++++++++----------------- 6 files changed, 36 insertions(+), 27 deletions(-) delete mode 100644 libosmo-netif-0.0.6.19.tar.xz create mode 100644 libosmo-netif-0.0.6.67.tar.xz 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.67.tar.xz b/libosmo-netif-0.0.6.67.tar.xz new file mode 100644 index 0000000..26d67d7 --- /dev/null +++ b/libosmo-netif-0.0.6.67.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e7571b30d19ec7624c3cecc58ff53bde8e79ab5493a459919c418832e0a765a2 +size 129060 diff --git a/libosmo-netif.changes b/libosmo-netif.changes index c1a4cd0..3a7e383 100644 --- a/libosmo-netif.changes +++ b/libosmo-netif.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +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..2756394 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,13 +16,13 @@ # -%define version_unconverted 0.0.6.19 +%define version_unconverted 0.0.6.67 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.67 Release: 0 Url: http://openbsc.osmocom.org/trac/ diff --git a/osmo-talloc.diff b/osmo-talloc.diff index 44286c5..f4f9821 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.67/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.67.orig/configure.ac ++++ libosmo-netif-0.0.6.67/configure.ac +@@ -61,6 +61,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_PATH_PROG(DOXYGEN,doxygen,false) +Index: libosmo-netif-0.0.6.67/examples/Makefile.am =================================================================== ---- libosmo-netif.orig/examples/Makefile.am -+++ libosmo-netif/examples/Makefile.am +--- libosmo-netif-0.0.6.67.orig/examples/Makefile.am ++++ libosmo-netif-0.0.6.67/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.67/examples/channel/Makefile.am =================================================================== ---- libosmo-netif.orig/examples/channel/Makefile.am -+++ libosmo-netif/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 @@ -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.67/src/Makefile.am =================================================================== ---- libosmo-netif.orig/src/Makefile.am -+++ libosmo-netif/src/Makefile.am +--- libosmo-netif-0.0.6.67.orig/src/Makefile.am ++++ libosmo-netif-0.0.6.67/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.67/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.67.orig/src/channel/abis/Makefile.am ++++ libosmo-netif-0.0.6.67/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) From 03468cb900aae4042d57c369526cdb0f28bcc76d65c276b6f2657aedb934c84a Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Fri, 28 Apr 2017 23:08:33 +0000 Subject: [PATCH 2/5] new clean from-scratch tarball from git OBS-URL: https://build.opensuse.org/package/show/network:telephony/libosmo-netif?expand=0&rev=17 --- libosmo-netif-0.0.6.67.tar.xz | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libosmo-netif-0.0.6.67.tar.xz b/libosmo-netif-0.0.6.67.tar.xz index 26d67d7..8afc06e 100644 --- a/libosmo-netif-0.0.6.67.tar.xz +++ b/libosmo-netif-0.0.6.67.tar.xz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e7571b30d19ec7624c3cecc58ff53bde8e79ab5493a459919c418832e0a765a2 -size 129060 +oid sha256:a4d81f0e8e237d0d4dd85a9ab182cd07caf4eb8bc523e2ee637eebcf3437e606 +size 129012 From 24daa10258c6f640f18b81764e52eb1418058c8838e926f72c5be1cc586c4fcc Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Fri, 28 Apr 2017 23:26:05 +0000 Subject: [PATCH 3/5] new homepage URLs; drop autoconf (implicit) OBS-URL: https://build.opensuse.org/package/show/network:telephony/libosmo-netif?expand=0&rev=18 --- libosmo-netif.spec | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/libosmo-netif.spec b/libosmo-netif.spec index 2756394..6e463f1 100644 --- a/libosmo-netif.spec +++ b/libosmo-netif.spec @@ -24,12 +24,11 @@ License: GPL-2.0+ Group: Productivity/Telephony/Utilities Version: 0.0.6.67 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 From 1aa7e6cf0f9acfb47b8fa0670dee367468ea1879a5abfe1d9937beb71e0d9c2d Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Fri, 28 Apr 2017 23:56:51 +0000 Subject: [PATCH 4/5] OBS-URL: https://build.opensuse.org/package/show/network:telephony/libosmo-netif?expand=0&rev=19 --- libosmo-netif.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libosmo-netif.spec b/libosmo-netif.spec index 6e463f1..13959b7 100644 --- a/libosmo-netif.spec +++ b/libosmo-netif.spec @@ -32,7 +32,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build 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 From 297142cba45b93927ab5c319a050e9595b00a785198440df2480671708ff0dda Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Mon, 2 Oct 2017 23:06:33 +0000 Subject: [PATCH 5/5] - 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)