Hello community,

here is the log from the commit of package libosmo-netif for openSUSE:Factory 
checked in at 2019-02-24 17:18:30
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libosmo-netif (Old)
 and      /work/SRC/openSUSE:Factory/.libosmo-netif.new.28833 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "libosmo-netif"

Sun Feb 24 17:18:30 2019 rev:6 rq:678016 version:0.4.0

Changes:
--------
--- /work/SRC/openSUSE:Factory/libosmo-netif/libosmo-netif.changes      
2019-01-05 14:41:43.764512269 +0100
+++ /work/SRC/openSUSE:Factory/.libosmo-netif.new.28833/libosmo-netif.changes   
2019-02-24 17:18:32.804416924 +0100
@@ -1,0 +2,10 @@
+Wed Feb 20 20:55:35 UTC 2019 - Martin Hauke <[email protected]>
+
+- 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
+
+-------------------------------------------------------------------

Old:
----
  libosmo-netif-0.3.0.tar.xz

New:
----
  libosmo-netif-0.4.0.tar.xz

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ libosmo-netif.spec ++++++
--- /var/tmp/diff_new_pack.XJTVJo/_old  2019-02-24 17:18:33.336416829 +0100
+++ /var/tmp/diff_new_pack.XJTVJo/_new  2019-02-24 17:18:33.336416829 +0100
@@ -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:  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

++++++ _service ++++++
--- /var/tmp/diff_new_pack.XJTVJo/_old  2019-02-24 17:18:33.368416824 +0100
+++ /var/tmp/diff_new_pack.XJTVJo/_new  2019-02-24 17:18:33.372416823 +0100
@@ -2,8 +2,8 @@
        <service name="tar_scm" mode="disabled">
                <param name="scm">git</param>
                <param name="url">git://git.osmocom.org/libosmo-netif</param>
-               <param name="revision">0.3.0</param>
-               <param name="versionformat">0.3.0</param>
+               <param name="revision">0.4.0</param>
+               <param name="versionformat">0.4.0</param>
        </service>
        <service name="recompress" mode="disabled">
                <param name="file">*.tar</param>

++++++ libosmo-netif-0.3.0.tar.xz -> libosmo-netif-0.4.0.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/libosmo-netif-0.3.0/configure.ac 
new/libosmo-netif-0.4.0/configure.ac
--- old/libosmo-netif-0.3.0/configure.ac        2018-07-27 18:31:43.000000000 
+0200
+++ new/libosmo-netif-0.4.0/configure.ac        2019-01-20 10:12:46.000000000 
+0100
@@ -82,10 +82,10 @@
 dnl Generate the output
 AM_CONFIG_HEADER(config.h)
 
-PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 0.12.0)
-PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 0.12.0)
+PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.0.0)
+PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 1.0.0)
 dnl FIXME: We depend on libosmoabis by now until we can move LAPD code here
-PKG_CHECK_MODULES(LIBOSMOABIS, libosmoabis >= 0.5.1)
+PKG_CHECK_MODULES(LIBOSMOABIS, libosmoabis >= 0.6.0)
 
 old_LIBS=$LIBS
 AC_SEARCH_LIBS([sctp_send], [sctp], [
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/libosmo-netif-0.3.0/debian/changelog 
new/libosmo-netif-0.4.0/debian/changelog
--- old/libosmo-netif-0.3.0/debian/changelog    2018-07-27 18:31:43.000000000 
+0200
+++ new/libosmo-netif-0.4.0/debian/changelog    2019-01-20 10:12:46.000000000 
+0100
@@ -1,3 +1,22 @@
+libosmo-netif (0.4.0) unstable; urgency=medium
+
+  [ Neels Hofmeyr ]
+  * fix strncpy bug in rs232.c
+  * logging: fix typo in stream.c
+
+  [ Harald Welte ]
+  * Migrate from osmo_ipa_idtag_parse() to ipa_ccm_id_resp_parse()
+  * link libosmo-netif against libosmogsm
+  * debian/rules: Don't overwrite .tarball-version
+
+  [ Pau Espin Pedrol ]
+  * jibuf: fix indentation in line inside conditional clause
+
+  [ Stefan Sperling ]
+  * detect freed connections in osmo_stream_srv_read()
+
+ -- Harald Welte <[email protected]>  Sat, 19 Jan 2019 22:28:01 +0100
+
 libosmo-netif (0.3.0) unstable; urgency=medium
 
   [ Pau Espin Pedrol ]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/libosmo-netif-0.3.0/debian/rules 
new/libosmo-netif-0.4.0/debian/rules
--- old/libosmo-netif-0.3.0/debian/rules        2018-07-27 18:31:43.000000000 
+0200
+++ new/libosmo-netif-0.4.0/debian/rules        2019-01-20 10:12:46.000000000 
+0100
@@ -15,17 +15,13 @@
 override_dh_strip:
        dh_strip --dbg-package=libosmo-netif-dbg
 
-override_dh_autoreconf:
-       echo $(VERSION) > .tarball-version
-       dh_autoreconf
-
 override_dh_install:
        sed -i "/dependency_libs/ s/'.*'/''/" `find . -name '*.la'`
        dh_install
 
 override_dh_clean:
        dh_clean
-       rm -f tests/package.m4 tests/testsuite .version .tarball-version
+       rm -f tests/package.m4 tests/testsuite .version
 
 override_dh_auto_test:
        dh_auto_test || (find . -name testsuite.log -exec cat {} \; ; false)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/libosmo-netif-0.3.0/examples/Makefile.am 
new/libosmo-netif-0.4.0/examples/Makefile.am
--- old/libosmo-netif-0.3.0/examples/Makefile.am        2018-07-27 
18:31:43.000000000 +0200
+++ new/libosmo-netif-0.4.0/examples/Makefile.am        2019-01-20 
10:12:46.000000000 +0100
@@ -46,10 +46,10 @@
                      $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_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) 
$(LIBOSMOGSM_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) 
$(LIBOSMOGSM_LIBS)
 
 rtp_udp_test_client_SOURCES = rtp-udp-test-client.c
 rtp_udp_test_client_LDADD = $(top_builddir)/src/libosmonetif.la \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/libosmo-netif-0.3.0/include/osmocom/netif/ipa.h 
new/libosmo-netif-0.4.0/include/osmocom/netif/ipa.h
--- old/libosmo-netif-0.3.0/include/osmocom/netif/ipa.h 2018-07-27 
18:31:43.000000000 +0200
+++ new/libosmo-netif-0.4.0/include/osmocom/netif/ipa.h 2019-01-20 
10:12:46.000000000 +0100
@@ -27,7 +27,6 @@
 struct tlv_parsed;
 
 int osmo_ipa_rcvmsg_base(struct msgb *msg, struct osmo_fd *bfd, int server);
-int osmo_ipa_idtag_parse(struct tlv_parsed *dec, unsigned char *buf, int len);
 int osmo_ipa_parse_unitid(const char *str, struct ipaccess_unit *unit_data);
 
 int ipaccess_send_pong(int fd);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/libosmo-netif-0.3.0/src/Makefile.am 
new/libosmo-netif-0.4.0/src/Makefile.am
--- old/libosmo-netif-0.3.0/src/Makefile.am     2018-07-27 18:31:43.000000000 
+0200
+++ new/libosmo-netif-0.4.0/src/Makefile.am     2019-01-20 10:12:46.000000000 
+0100
@@ -1,14 +1,14 @@
 # This is _NOT_ the library release version, it's an API version.
 # Please read Chapter 6 "Library interface versions" of the libtool 
documentation before making any modification
-LIBVERSION=6:0:0
+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) $(LIBOSMOGSM_CFLAGS) 
$(LIBOSMOABIS_CFLAGS) $(COVERAGE_CFLAGS) $(LIBSCTP_CFLAGS)
 AM_LDFLAGS = $(COVERAGE_LDFLAGS)
 
 lib_LTLIBRARIES = libosmonetif.la
 
-libosmonetif_la_LIBADD = $(LIBOSMOCORE_LIBS) $(LIBSCTP_LIBS)
+libosmonetif_la_LIBADD = $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(LIBSCTP_LIBS)
 libosmonetif_la_LDFLAGS = -version-info $(LIBVERSION) -no-undefined
 
 libosmonetif_la_SOURCES = amr.c                        \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/libosmo-netif-0.3.0/src/ipa.c 
new/libosmo-netif-0.4.0/src/ipa.c
--- old/libosmo-netif-0.3.0/src/ipa.c   2018-07-27 18:31:43.000000000 +0200
+++ new/libosmo-netif-0.4.0/src/ipa.c   2019-01-20 10:12:46.000000000 +0100
@@ -130,35 +130,6 @@
        return 0;
 }
 
-int osmo_ipa_idtag_parse(struct tlv_parsed *dec, unsigned char *buf, int len)
-{
-       uint8_t t_len;
-       uint8_t t_tag;
-       uint8_t *cur = buf;
-
-       memset(dec, 0, sizeof(*dec));
-
-       while (len >= 2) {
-               len -= 2;
-               t_len = *cur++;
-               t_tag = *cur++;
-
-               if (t_len > len + 1) {
-                       LOGP(DLMI, LOGL_ERROR, "The tag does not fit: %d\n", 
t_len);
-                       return -EINVAL;
-               }
-
-               DEBUGPC(DLMI, "%s='%s' ", ipaccess_idtag_name(t_tag), cur);
-
-               dec->lv[t_tag].len = t_len;
-               dec->lv[t_tag].val = cur;
-
-               cur += t_len;
-               len -= t_len;
-       }
-       return 0;
-}
-
 int osmo_ipa_parse_unitid(const char *str, struct ipaccess_unit *unit_data)
 {
        unsigned long ul;
@@ -368,8 +339,7 @@
 
        DEBUGP(DLINP, "ID_RESP\n");
        /* parse tags, search for Unit ID */
-       ret = osmo_ipa_idtag_parse(&tlvp, (uint8_t *)msg->l2h + 2,
-                                       msgb_l2len(msg)-2);
+       ret = ipa_ccm_id_resp_parse(&tlvp, (const uint8_t *)msg->l2h + 1, 
msgb_l2len(msg)-1);
        if (ret < 0) {
                LOGP(DLINP, LOGL_ERROR, "IPA response message "
                        "with malformed TLVs\n");
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/libosmo-netif-0.3.0/src/jibuf.c 
new/libosmo-netif-0.4.0/src/jibuf.c
--- old/libosmo-netif-0.3.0/src/jibuf.c 2018-07-27 18:31:43.000000000 +0200
+++ new/libosmo-netif-0.4.0/src/jibuf.c 2019-01-20 10:12:46.000000000 +0100
@@ -322,7 +322,7 @@
        struct msgb *msg, *tmp;
        osmo_timer_del(&jb->timer);
        llist_for_each_entry_safe(msg, tmp, &jb->msg_list, list)
-       dequeue_msg(jb, msg);
+               dequeue_msg(jb, msg);
 
        talloc_free(jb);
 }
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/libosmo-netif-0.3.0/src/rs232.c 
new/libosmo-netif-0.4.0/src/rs232.c
--- old/libosmo-netif-0.3.0/src/rs232.c 2018-07-27 18:31:43.000000000 +0200
+++ new/libosmo-netif-0.4.0/src/rs232.c 2019-01-20 10:12:46.000000000 +0100
@@ -141,8 +141,7 @@
 
 void osmo_rs232_set_serial_port(struct osmo_rs232 *r, char *serial_port)
 {
-       strncpy(r->cfg.serial_port, serial_port, PATH_MAX);
-       r->cfg.serial_port[PATH_MAX-1] = '\0';
+       osmo_strlcpy(r->cfg.serial_port, serial_port, PATH_MAX);
 }
 
 void osmo_rs232_set_baudrate(struct osmo_rs232 *r, int baudrate)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/libosmo-netif-0.3.0/src/stream.c 
new/libosmo-netif-0.4.0/src/stream.c
--- old/libosmo-netif-0.3.0/src/stream.c        2018-07-27 18:31:43.000000000 
+0200
+++ new/libosmo-netif-0.4.0/src/stream.c        2019-01-20 10:12:46.000000000 
+0100
@@ -91,7 +91,7 @@
                        &event, sizeof(event));
 
        if (rc < 0)
-               LOGP(DLINP, LOGL_ERROR, "coudldn't activate SCTP events "
+               LOGP(DLINP, LOGL_ERROR, "couldn't activate SCTP events "
                     "on FD %u\n", fd);
        return rc;
 #else
@@ -784,19 +784,21 @@
        int                             flags;
 };
 
-static void osmo_stream_srv_read(struct osmo_stream_srv *conn)
+static int osmo_stream_srv_read(struct osmo_stream_srv *conn)
 {
+       int rc = 0;
+
        LOGP(DLINP, LOGL_DEBUG, "message received\n");
 
        if (conn->flags & OSMO_STREAM_SRV_F_FLUSH_DESTROY) {
                LOGP(DLINP, LOGL_DEBUG, "Connection is being flushed and 
closed; ignoring received message\n");
-               return;
+               return 0;
        }
 
        if (conn->cb)
-               conn->cb(conn);
+               rc = conn->cb(conn);
 
-       return;
+       return rc;
 }
 
 static void osmo_stream_srv_write(struct osmo_stream_srv *conn)
@@ -845,14 +847,15 @@
 static int osmo_stream_srv_cb(struct osmo_fd *ofd, unsigned int what)
 {
        struct osmo_stream_srv *conn = ofd->data;
+       int rc = 0;
 
        LOGP(DLINP, LOGL_DEBUG, "connected read/write\n");
        if (what & BSC_FD_READ)
-               osmo_stream_srv_read(conn);
-       if (what & BSC_FD_WRITE)
+               rc = osmo_stream_srv_read(conn);
+       if (rc != -EBADF && (what & BSC_FD_WRITE))
                osmo_stream_srv_write(conn);
 
-       return 0;
+       return rc;
 }
 
 /*! \brief Create a Stream Server inside the specified link
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/libosmo-netif-0.3.0/tests/Makefile.am 
new/libosmo-netif-0.4.0/tests/Makefile.am
--- old/libosmo-netif-0.3.0/tests/Makefile.am   2018-07-27 18:31:43.000000000 
+0200
+++ new/libosmo-netif-0.4.0/tests/Makefile.am   2019-01-20 10:12:46.000000000 
+0100
@@ -5,13 +5,13 @@
 check_HEADERS =
 
 osmux_osmux_test_SOURCES = osmux/osmux_test.c
-osmux_osmux_test_LDADD = $(LIBOSMOCORE_LIBS) 
$(top_builddir)/src/libosmonetif.la
+osmux_osmux_test_LDADD = $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) 
$(top_builddir)/src/libosmonetif.la
 
 osmux_osmux_test2_SOURCES = osmux/osmux_test2.c
-osmux_osmux_test2_LDADD = $(LIBOSMOCORE_LIBS) 
$(top_builddir)/src/libosmonetif.la
+osmux_osmux_test2_LDADD = $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) 
$(top_builddir)/src/libosmonetif.la
 
 jibuf_jibuf_test_SOURCES = jibuf/jibuf_test.c
-jibuf_jibuf_test_LDADD = $(LIBOSMOCORE_LIBS) 
$(top_builddir)/src/libosmonetif.la
+jibuf_jibuf_test_LDADD = $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) 
$(top_builddir)/src/libosmonetif.la
 
 if HAVE_PCAP
 check_PROGRAMS += jibuf/jibuf_tool
@@ -31,6 +31,7 @@
 
 jibuf_jibuf_tool_LDADD = \
        $(LIBOSMOCORE_LIBS) \
+       $(LIBOSMOGSM_LIBS) \
        $(top_builddir)/src/libosmonetif.la \
        -lpcap
 endif

++++++ osmo-talloc.diff ++++++
--- /var/tmp/diff_new_pack.XJTVJo/_old  2019-02-24 17:18:33.456416808 +0100
+++ /var/tmp/diff_new_pack.XJTVJo/_new  2019-02-24 17:18:33.456416808 +0100
@@ -1,18 +1,7 @@
-From 84cb7836dfb9cee206e7d2bd552d4a71fbea4aef Mon Sep 17 00:00:00 2001
-From: Jan Engelhardt <[email protected]>
-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 @@
  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 @@
 +                    $(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 @@
  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                       \


Reply via email to