diff --git a/_service b/_service
index 78a23a3..a95ad54 100644
--- a/_service
+++ b/_service
@@ -2,8 +2,8 @@
git
git://git.osmocom.org/libosmo-netif
- 0.3.0
- 0.3.0
+ 0.4.0
+ 0.4.0
*.tar
diff --git a/libosmo-netif-0.3.0.tar.xz b/libosmo-netif-0.3.0.tar.xz
deleted file mode 100644
index 44e3a50..0000000
--- a/libosmo-netif-0.3.0.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:983cd2a563df6abf98dde943ed33d7909c55541d7adfdeaec3e8fa65bb284761
-size 145328
diff --git a/libosmo-netif-0.4.0.tar.xz b/libosmo-netif-0.4.0.tar.xz
new file mode 100644
index 0000000..5e61ab5
--- /dev/null
+++ b/libosmo-netif-0.4.0.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:78a221ad654697e48b9cd2d5a4dc9ad19ee63f58997865cf7327bf45985e0f3e
+size 145376
diff --git a/libosmo-netif.changes b/libosmo-netif.changes
index afc9420..ea7c2b6 100644
--- a/libosmo-netif.changes
+++ b/libosmo-netif.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Wed Feb 20 20:55:35 UTC 2019 - Martin Hauke
+
+- Update to new upstream release 0.4.0
+ * Bugfix release only.
+ The full changelog is available via
+ http://git.osmocom.org/libosmo-netif/plain/debian/changelog?h=0.4.0
+- Rebase patch
+ * osmo-talloc.diff
+
-------------------------------------------------------------------
Tue Dec 11 00:52:52 UTC 2018 - Jan Engelhardt
diff --git a/libosmo-netif.spec b/libosmo-netif.spec
index bceca1a..c71396c 100644
--- a/libosmo-netif.spec
+++ b/libosmo-netif.spec
@@ -1,7 +1,7 @@
#
# spec file for package libosmo-netif
#
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 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.3.0
+%define version_unconverted 0.4.0
Name: libosmo-netif
Summary: Osmocom library for muxed audio
License: GPL-2.0-or-later
Group: Productivity/Telephony/Utilities
-Version: 0.3.0
+Version: 0.4.0
Release: 0
Url: https://osmocom.org/projects/libosmo-netif
@@ -34,9 +34,9 @@ BuildRequires: libtool >= 2
BuildRequires: lksctp-tools-devel
BuildRequires: pkg-config >= 0.20
BuildRequires: xz
-BuildRequires: pkgconfig(libosmoabis) >= 0.5.1
-BuildRequires: pkgconfig(libosmocore) >= 0.12.0
-BuildRequires: pkgconfig(libosmogsm) >= 0.12.0
+BuildRequires: pkgconfig(libosmoabis) >= 0.6.0
+BuildRequires: pkgconfig(libosmocore) >= 1.0.0
+BuildRequires: pkgconfig(libosmogsm) >= 1.0.0
BuildRequires: pkgconfig(talloc)
%description
diff --git a/osmo-talloc.diff b/osmo-talloc.diff
index cfbea22..424c43e 100644
--- a/osmo-talloc.diff
+++ b/osmo-talloc.diff
@@ -1,18 +1,7 @@
-From 84cb7836dfb9cee206e7d2bd552d4a71fbea4aef Mon Sep 17 00:00:00 2001
-From: Jan Engelhardt
-Date: Thu, 2 Oct 2014 23:26:16 +0200
-Subject: [PATCH] build: support external libtalloc
-
----
- configure.ac | 1 +
- examples/Makefile.am | 30 +++++++++++++++---------------
- src/Makefile.am | 4 ++--
- 3 files changed, 18 insertions(+), 17 deletions(-)
-
-Index: libosmo-netif-0.3.0/configure.ac
-===================================================================
---- libosmo-netif-0.3.0.orig/configure.ac
-+++ libosmo-netif-0.3.0/configure.ac
+diff --git a/configure.ac b/configure.ac
+index 66ec57f..2b714b7 100644
+--- a/configure.ac
++++ b/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
@@ -21,10 +10,10 @@ Index: libosmo-netif-0.3.0/configure.ac
AC_CHECK_HEADERS(dahdi/user.h,,AC_MSG_WARN(DAHDI input driver will not be built))
found_pcap=yes
-Index: libosmo-netif-0.3.0/examples/Makefile.am
-===================================================================
---- libosmo-netif-0.3.0.orig/examples/Makefile.am
-+++ libosmo-netif-0.3.0/examples/Makefile.am
+diff --git a/examples/Makefile.am b/examples/Makefile.am
+index 4125243..8780fba 100644
+--- a/examples/Makefile.am
++++ b/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)
@@ -67,12 +56,12 @@ Index: libosmo-netif-0.3.0/examples/Makefile.am
+ $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(TALLOC_LIBS)
rs232_read_SOURCES = rs232-read.c
--rs232_read_LDADD = $(top_builddir)/src/libosmonetif.la $(LIBOSMOCORE_LIBS)
-+rs232_read_LDADD = $(top_builddir)/src/libosmonetif.la $(LIBOSMOCORE_LIBS) $(TALLOC_LIBS)
+-rs232_read_LDADD = $(top_builddir)/src/libosmonetif.la $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS)
++rs232_read_LDADD = $(top_builddir)/src/libosmonetif.la $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(TALLOC_LIBS)
rs232_write_SOURCES = rs232-write.c
--rs232_write_LDADD = $(top_builddir)/src/libosmonetif.la $(LIBOSMOCORE_LIBS)
-+rs232_write_LDADD = $(top_builddir)/src/libosmonetif.la $(LIBOSMOCORE_LIBS) $(TALLOC_LIBS)
+-rs232_write_LDADD = $(top_builddir)/src/libosmonetif.la $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS)
++rs232_write_LDADD = $(top_builddir)/src/libosmonetif.la $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(TALLOC_LIBS)
rtp_udp_test_client_SOURCES = rtp-udp-test-client.c
rtp_udp_test_client_LDADD = $(top_builddir)/src/libosmonetif.la \
@@ -101,22 +90,16 @@ Index: libosmo-netif-0.3.0/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.3.0/src/Makefile.am
-===================================================================
---- libosmo-netif-0.3.0.orig/src/Makefile.am
-+++ libosmo-netif-0.3.0/src/Makefile.am
-@@ -3,12 +3,12 @@
- LIBVERSION=6:0:0
+diff --git a/src/Makefile.am b/src/Makefile.am
+index d92d0f6..aa3e521 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -3,7 +3,7 @@
+ LIBVERSION=6:1:0
AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)
--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_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_LIBS)
AM_LDFLAGS = $(COVERAGE_LDFLAGS)
lib_LTLIBRARIES = libosmonetif.la
-
--libosmonetif_la_LIBADD = $(LIBOSMOCORE_LIBS) $(LIBSCTP_LIBS)
-+libosmonetif_la_LIBADD = $(LIBOSMOCORE_LIBS) $(LIBSCTP_LIBS) $(TALLOC_LIBS)
- libosmonetif_la_LDFLAGS = -version-info $(LIBVERSION) -no-undefined
-
- libosmonetif_la_SOURCES = amr.c \