diff --git a/_service b/_service index 36346f2..10dab9f 100644 --- a/_service +++ b/_service @@ -2,7 +2,8 @@ git git://git.osmocom.org/libosmo-netif - @PARENT_TAG@.@TAG_OFFSET@ + 0.1.1 + 0.1.1 *.tar diff --git a/libosmo-netif-0.0.6.85.tar.xz b/libosmo-netif-0.0.6.85.tar.xz deleted file mode 100644 index ada3b55..0000000 --- a/libosmo-netif-0.0.6.85.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3b17b84a5e7e02668713e03b32e3c276d7a4de40ca017308f0085ff050d2fb16 -size 129556 diff --git a/libosmo-netif-0.1.1.tar.xz b/libosmo-netif-0.1.1.tar.xz new file mode 100644 index 0000000..5b056fb --- /dev/null +++ b/libosmo-netif-0.1.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b58bc44a75b097a1cfb89b29753428b088db0322d878bdfc6215d0c1b05f83fb +size 130992 diff --git a/libosmo-netif.changes b/libosmo-netif.changes index 76c6c4b..7e19d7c 100644 --- a/libosmo-netif.changes +++ b/libosmo-netif.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Wed Dec 27 20:38:21 UTC 2017 - jengelh@inai.de + +- Update to new upstream release 0.1.1 + * cosmetic: relax UDP length check + * cosmetic: print textual error from recv() + * osmux_snprintf: Support different types of Osmux frames + ------------------------------------------------------------------- Mon Oct 2 23:04:14 UTC 2017 - jengelh@inai.de diff --git a/libosmo-netif.spec b/libosmo-netif.spec index 2c73239..b9ad63b 100644 --- a/libosmo-netif.spec +++ b/libosmo-netif.spec @@ -16,13 +16,13 @@ # -%define version_unconverted 0.0.6.85 +%define version_unconverted 0.1.1 Name: libosmo-netif Summary: Osmocom library for muxed audio License: GPL-2.0+ Group: Productivity/Telephony/Utilities -Version: 0.0.6.85 +Version: 0.1.1 Release: 0 Url: https://osmocom.org/projects/libosmo-netif @@ -34,28 +34,27 @@ BuildRequires: libtool >= 2 BuildRequires: lksctp-tools-devel 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(libosmoabis) >= 0.0.7 +BuildRequires: pkgconfig(libosmocore) >= 0.10.0 +BuildRequires: pkgconfig(libosmogsm) >= 0.10.0 BuildRequires: pkgconfig(talloc) %description Network interface demuxer library for OsmoCom projects. -%package -n libosmonetif3 +%package -n libosmonetif4 Summary: Osmocom library for muxed audio License: AGPL-3.0+ Group: System/Libraries -%description -n libosmonetif3 +%description -n libosmonetif4 Network interface demuxer library for OsmoCom projects. %package -n libosmonetif-devel Summary: Development files for the Osmocom muxed audio library License: AGPL-3.0+ Group: Development/Libraries/C and C++ -Requires: libosmonetif3 = %version +Requires: libosmonetif4 = %version %description -n libosmonetif-devel Network interface demuxer library for OsmoCom projects. @@ -85,12 +84,12 @@ if ! make %{?_smp_mflags} check; then # timing issue fi -%post -n libosmonetif3 -p /sbin/ldconfig -%postun -n libosmonetif3 -p /sbin/ldconfig +%post -n libosmonetif4 -p /sbin/ldconfig +%postun -n libosmonetif4 -p /sbin/ldconfig -%files -n libosmonetif3 +%files -n libosmonetif4 %defattr(-,root,root) -%_libdir/libosmonetif.so.3* +%_libdir/libosmonetif.so.4* %files -n libosmonetif-devel %defattr(-,root,root) diff --git a/osmo-talloc.diff b/osmo-talloc.diff index 4ac98a4..f9928ce 100644 --- a/osmo-talloc.diff +++ b/osmo-talloc.diff @@ -5,16 +5,16 @@ Subject: [PATCH] build: support external libtalloc --- configure.ac | 1 + - examples/Makefile.am | 26 +++++++++++++------------- + examples/Makefile.am | 30 +++++++++++++++--------------- examples/channel/Makefile.am | 6 +++--- src/Makefile.am | 4 ++-- src/channel/abis/Makefile.am | 4 ++-- - 5 files changed, 21 insertions(+), 20 deletions(-) + 5 files changed, 23 insertions(+), 22 deletions(-) -Index: libosmo-netif-0.0.6.85/configure.ac +Index: libosmo-netif-0.1.1/configure.ac =================================================================== ---- libosmo-netif-0.0.6.85.orig/configure.ac -+++ libosmo-netif-0.0.6.85/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], [ AC_MSG_ERROR([sctp_send not found in searched libs])]) LIBS=$old_LIBS @@ -23,10 +23,10 @@ Index: libosmo-netif-0.0.6.85/configure.ac AC_CHECK_HEADERS(dahdi/user.h,,AC_MSG_WARN(DAHDI input driver will not be built)) AC_ARG_ENABLE(doxygen, -Index: libosmo-netif-0.0.6.85/examples/Makefile.am +Index: libosmo-netif-0.1.1/examples/Makefile.am =================================================================== ---- libosmo-netif-0.0.6.85.orig/examples/Makefile.am -+++ libosmo-netif-0.0.6.85/examples/Makefile.am +--- libosmo-netif-0.1.1.orig/examples/Makefile.am ++++ libosmo-netif-0.1.1/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) @@ -34,7 +34,7 @@ Index: libosmo-netif-0.0.6.85/examples/Makefile.am AM_LDFLAGS = $(COVERAGE_LDFLAGS) SUBDIRS = channel -@@ -19,48 +19,48 @@ noinst_PROGRAMS = ipa-stream-client \ +@@ -23,54 +23,54 @@ noinst_HEADERS = udp-test.h ipa_stream_client_SOURCES = ipa-stream-client.c ipa_stream_client_LDADD = $(top_builddir)/src/libosmonetif.la \ @@ -86,6 +86,14 @@ Index: libosmo-netif-0.0.6.85/examples/Makefile.am - $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) + $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(TALLOC_LIBS) + udp_test_client_SOURCES = udp-test-client.c +-udp_test_client_LDADD = $(top_builddir)/src/libosmonetif.la $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) ++udp_test_client_LDADD = $(top_builddir)/src/libosmonetif.la $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(TALLOC_LIBS) + + udp_test_server_SOURCES = udp-test-server.c +-udp_test_server_LDADD = $(top_builddir)/src/libosmonetif.la $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) ++udp_test_server_LDADD = $(top_builddir)/src/libosmonetif.la $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(TALLOC_LIBS) + osmux_test_input_SOURCES = osmux-test-input.c osmux_test_input_LDADD = $(top_builddir)/src/libosmonetif.la \ - $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) @@ -95,10 +103,10 @@ Index: libosmo-netif-0.0.6.85/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.85/examples/channel/Makefile.am +Index: libosmo-netif-0.1.1/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 +--- 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) @@ -117,40 +125,40 @@ Index: libosmo-netif-0.0.6.85/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.85/src/Makefile.am +Index: libosmo-netif-0.1.1/src/Makefile.am =================================================================== ---- libosmo-netif-0.0.6.85.orig/src/Makefile.am -+++ libosmo-netif-0.0.6.85/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=3:0:0 + LIBVERSION=4:0:0 AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir) --AM_CFLAGS= -fPIC -Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOABIS_CFLAGS) $(COVERAGE_CFLAGS) $(LIBSCTP_CFLAGS) -+AM_CFLAGS= -fPIC -Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOABIS_CFLAGS) $(COVERAGE_CFLAGS) $(LIBSCTP_CFLAGS) $(TALLOC_CFLAGS) +-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) $(LIBOSMOGSM_LIBS) $(LIBSCTP_LIBS) -+libosmonetif_la_LIBADD = channel/abis/libosmonetif-abis.la $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(LIBSCTP_LIBS) $(TALLOC_LIBS) +-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_LDFLAGS = -version-info $(LIBVERSION) -no-undefined libosmonetif_la_SOURCES = amr.c \ -Index: libosmo-netif-0.0.6.85/src/channel/abis/Makefile.am +Index: libosmo-netif-0.1.1/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 +--- 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) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(COVERAGE_CFLAGS) -+AM_CFLAGS= -fPIC -Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(COVERAGE_CFLAGS) $(TALLOC_CFLAGS) +-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) $(LIBOSMOGSM_LIBS) $(LIBOSMOVTY_LIBS) -+libosmonetif_abis_la_LIBADD = $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(LIBOSMOVTY_LIBS) $(TALLOC_LIBS) +-libosmonetif_abis_la_LIBADD = $(LIBOSMOCORE_LIBS) $(LIBOSMOVTY_LIBS) ++libosmonetif_abis_la_LIBADD = $(LIBOSMOCORE_LIBS) $(LIBOSMOVTY_LIBS) $(TALLOC_LIBS)