diff --git a/_service b/_service
index a95ad54..2bd2c9d 100644
--- a/_service
+++ b/_service
@@ -2,8 +2,8 @@
git
git://git.osmocom.org/libosmo-netif
- 0.4.0
- 0.4.0
+ 0.6.0
+ 0.6.0
*.tar
diff --git a/libosmo-netif-0.4.0.tar.xz b/libosmo-netif-0.4.0.tar.xz
deleted file mode 100644
index 5e61ab5..0000000
--- a/libosmo-netif-0.4.0.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:78a221ad654697e48b9cd2d5a4dc9ad19ee63f58997865cf7327bf45985e0f3e
-size 145376
diff --git a/libosmo-netif-0.6.0.tar.xz b/libosmo-netif-0.6.0.tar.xz
new file mode 100644
index 0000000..9ae69f8
--- /dev/null
+++ b/libosmo-netif-0.6.0.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ea6ec38bb4b0d9dad6c3ec566e6d044313c4323222a3ecd2c4f5d96b04a65e56
+size 153280
diff --git a/libosmo-netif.changes b/libosmo-netif.changes
index ea7c2b6..5a34a40 100644
--- a/libosmo-netif.changes
+++ b/libosmo-netif.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Thu Aug 15 04:32:14 UTC 2019 - Jan Engelhardt
+
+- Update to new upstream release 0.6.0
+ * osmux: Extend osmux_out_handle and add new API to set
+ rtp payload_type
+
-------------------------------------------------------------------
Wed Feb 20 20:55:35 UTC 2019 - Martin Hauke
diff --git a/libosmo-netif.spec b/libosmo-netif.spec
index c71396c..b956078 100644
--- a/libosmo-netif.spec
+++ b/libosmo-netif.spec
@@ -16,13 +16,13 @@
#
-%define version_unconverted 0.4.0
+%define version_unconverted 0.6.0
Name: libosmo-netif
Summary: Osmocom library for muxed audio
License: GPL-2.0-or-later
Group: Productivity/Telephony/Utilities
-Version: 0.4.0
+Version: 0.6.0
Release: 0
Url: https://osmocom.org/projects/libosmo-netif
@@ -42,19 +42,19 @@ BuildRequires: pkgconfig(talloc)
%description
Network interface demuxer library for OsmoCom projects.
-%package -n libosmonetif6
+%package -n libosmonetif8
Summary: Osmocom library for muxed audio
License: AGPL-3.0-or-later
Group: System/Libraries
-%description -n libosmonetif6
+%description -n libosmonetif8
Network interface demuxer library for OsmoCom projects.
%package -n libosmonetif-devel
Summary: Development files for the Osmocom muxed audio library
License: AGPL-3.0-or-later
Group: Development/Libraries/C and C++
-Requires: libosmonetif6 = %version
+Requires: libosmonetif8 = %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 libosmonetif6 -p /sbin/ldconfig
-%postun -n libosmonetif6 -p /sbin/ldconfig
+%post -n libosmonetif8 -p /sbin/ldconfig
+%postun -n libosmonetif8 -p /sbin/ldconfig
-%files -n libosmonetif6
+%files -n libosmonetif8
%defattr(-,root,root)
-%_libdir/libosmonetif.so.6*
+%_libdir/libosmonetif.so.8*
%files -n libosmonetif-devel
%defattr(-,root,root)
diff --git a/osmo-talloc.diff b/osmo-talloc.diff
index 424c43e..6717de7 100644
--- a/osmo-talloc.diff
+++ b/osmo-talloc.diff
@@ -1,7 +1,13 @@
-diff --git a/configure.ac b/configure.ac
-index 66ec57f..2b714b7 100644
---- a/configure.ac
-+++ b/configure.ac
+---
+ configure.ac | 1 +
+ examples/Makefile.am | 30 +++++++++++++++---------------
+ src/Makefile.am | 2 +-
+ 3 files changed, 17 insertions(+), 16 deletions(-)
+
+Index: libosmo-netif-0.6.0/configure.ac
+===================================================================
+--- libosmo-netif-0.6.0.orig/configure.ac
++++ libosmo-netif-0.6.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
@@ -10,10 +16,10 @@ index 66ec57f..2b714b7 100644
AC_CHECK_HEADERS(dahdi/user.h,,AC_MSG_WARN(DAHDI input driver will not be built))
found_pcap=yes
-diff --git a/examples/Makefile.am b/examples/Makefile.am
-index 4125243..8780fba 100644
---- a/examples/Makefile.am
-+++ b/examples/Makefile.am
+Index: libosmo-netif-0.6.0/examples/Makefile.am
+===================================================================
+--- libosmo-netif-0.6.0.orig/examples/Makefile.am
++++ libosmo-netif-0.6.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)
@@ -90,12 +96,12 @@ index 4125243..8780fba 100644
osmux_test_output_LDADD = $(top_builddir)/src/libosmonetif.la \
- $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS)
+ $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(TALLOC_LIBS)
-diff --git a/src/Makefile.am b/src/Makefile.am
-index d92d0f6..aa3e521 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
+Index: libosmo-netif-0.6.0/src/Makefile.am
+===================================================================
+--- libosmo-netif-0.6.0.orig/src/Makefile.am
++++ libosmo-netif-0.6.0/src/Makefile.am
@@ -3,7 +3,7 @@
- LIBVERSION=6:1:0
+ LIBVERSION=8: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)