diff --git a/0001-build-fixes.patch b/0001-build-fixes.patch
index 189c817..d3e1f02 100644
--- a/0001-build-fixes.patch
+++ b/0001-build-fixes.patch
@@ -3,38 +3,45 @@ From: Jan Engelhardt <jengelh@inai.de>
Date: Mon, 21 Jul 2014 10:13:00 +0200
Subject: [PATCH] build: fixes
-Require osmogsm in configure.ac, because source code depends on it.
+AC_PROG_LIBTOOL is the same as LT_INIT.
Find and use system talloc, do not rely on OSMO's bundled copy.
Rename libmtp to libosmo-mtp, as libmtp is already used by the
Multimedia Transfer Protocol library.
---
- configure.ac | 3 ++-
+ configure.ac | 2 +-
libosmo-mtp.pc.in | 2 +-
libosmo-sccp.pc.in | 2 +-
- src/Makefile.am | 14 +++++++++-----
+ src/Makefile.am | 22 ++++++++++++++++------
tests/m2ua/Makefile.am | 2 +-
tests/sccp/Makefile.am | 4 ++--
- 6 files changed, 16 insertions(+), 11 deletions(-)
+ tests/ss7/Makefile.am | 2 --
+ tests/xua/Makefile.am | 6 ++----
+ 8 files changed, 24 insertions(+), 18 deletions(-)
-Index: libosmo-sccp/configure.ac
+Index: libosmo-sccp-0.7.0.208/configure.ac
===================================================================
---- libosmo-sccp.orig/configure.ac
-+++ libosmo-sccp/configure.ac
-@@ -14,8 +14,9 @@ AC_PROG_MAKE_SET
+--- libosmo-sccp-0.7.0.208.orig/configure.ac
++++ libosmo-sccp-0.7.0.208/configure.ac
+@@ -17,7 +17,6 @@ AC_PROG_MAKE_SET
AC_PROG_CC
AC_PROG_INSTALL
LT_INIT
-AC_PROG_LIBTOOL
-+PKG_CHECK_MODULES([LIBOSMOGSM], [libosmogsm])
+ dnl check for pkg-config (explained in detail in libosmocore/configure.ac)
+ AC_PATH_PROG(PKG_CONFIG_INSTALLED, pkg-config, no)
+@@ -26,6 +25,7 @@ if test "x$PKG_CONFIG_INSTALLED" = "xno"
+ fi
+ PKG_PROG_PKG_CONFIG([0.20])
+
+PKG_CHECK_MODULES([TALLOC], [talloc])
PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 0.3.0)
+ PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 0.3.0)
PKG_CHECK_MODULES(LIBOSMONETIF, libosmo-netif >= 0.0.6)
-
-Index: libosmo-sccp/libosmo-mtp.pc.in
+Index: libosmo-sccp-0.7.0.208/libosmo-mtp.pc.in
===================================================================
---- libosmo-sccp.orig/libosmo-mtp.pc.in
-+++ libosmo-sccp/libosmo-mtp.pc.in
+--- libosmo-sccp-0.7.0.208.orig/libosmo-mtp.pc.in
++++ libosmo-sccp-0.7.0.208/libosmo-mtp.pc.in
@@ -6,5 +6,5 @@ includedir=@includedir@
Name: Osmo MTP Lib
Description: Osmo MTP Lib
@@ -42,10 +49,10 @@ Index: libosmo-sccp/libosmo-mtp.pc.in
-Libs: -L${libdir} -lmtp
+Libs: -L${libdir} -losmo-mtp
Cflags: -I${includedir}/
-Index: libosmo-sccp/libosmo-sccp.pc.in
+Index: libosmo-sccp-0.7.0.208/libosmo-sccp.pc.in
===================================================================
---- libosmo-sccp.orig/libosmo-sccp.pc.in
-+++ libosmo-sccp/libosmo-sccp.pc.in
+--- libosmo-sccp-0.7.0.208.orig/libosmo-sccp.pc.in
++++ libosmo-sccp-0.7.0.208/libosmo-sccp.pc.in
@@ -6,5 +6,5 @@ includedir=@includedir@
Name: OpenBSC SCCP Lib
Description: OpenBSC SCCP Lib
@@ -53,11 +60,11 @@ Index: libosmo-sccp/libosmo-sccp.pc.in
-Libs: -L${libdir} -lsccp
+Libs: -L${libdir} -losmo-sccp
Cflags: -I${includedir}/
-Index: libosmo-sccp/src/Makefile.am
+Index: libosmo-sccp-0.7.0.208/src/Makefile.am
===================================================================
---- libosmo-sccp.orig/src/Makefile.am
-+++ libosmo-sccp/src/Makefile.am
-@@ -4,15 +4,19 @@ AM_CFLAGS=-Wall $(LIBOSMOCORE_CFLAGS) $(
+--- libosmo-sccp-0.7.0.208.orig/src/Makefile.am
++++ libosmo-sccp-0.7.0.208/src/Makefile.am
+@@ -6,15 +6,21 @@ noinst_HEADERS = sccp_internal.h xua_asp
# Legacy static libs
sccpdir = $(libdir)
@@ -76,26 +83,38 @@ Index: libosmo-sccp/src/Makefile.am
-libxua_a_CPPFLAGS = $(AM_CPPFLAGS) -DDUMMY -UDUMMY
+libosmo_xua_la_CPPFLAGS = ${AM_CPPFLAGS} -DDUMMY -UDUMMY
+
++libosmo_sccp_la_LIBADD = $(TALLOC_LIBS) $(LIBOSMOCORE_LIBS)
+libosmo_sccp_la_LDFLAGS = -release ${PACKAGE_VERSION}
+libosmo_mtp_la_LDFLAGS = -release ${PACKAGE_VERSION}
++libosmo_xua_la_LIBADD = $(TALLOC_LIBS) $(LIBOSMOCORE_LIBS)
+libosmo_xua_la_LDFLAGS = -release ${PACKAGE_VERSION}
# New shared lib
-Index: libosmo-sccp/tests/m2ua/Makefile.am
+@@ -32,4 +38,8 @@ libosmo_sigtran_la_SOURCES = sccp_sap.c
+ osmo_ss7.c osmo_ss7_hmrt.c xua_asp_fsm.c xua_as_fsm.c \
+ osmo_ss7_vty.c sccp_vty.c ipa.c
+ libosmo_sigtran_la_LDFLAGS = -version-info $(LIBVERSION) -no-undefined -export-symbols-regex '^osmo_'
+-libosmo_sigtran_la_LIBADD = $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(LIBOSMONETIF_LIBS) $(LIBSCTP_LIBS)
++libosmo_sigtran_la_LIBADD = $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(LIBOSMONETIF_LIBS) $(LIBSCTP_LIBS) $(LIBOSMOVTY_LIBS)
++
++noinst_LTLIBRARIES = libosmo-sigtran-internal.la
++libosmo_sigtran_internal_la_SOURCES = $(libosmo_sigtran_la_SOURCES)
++libosmo_sigtran_internal_la_LIBADD = $(libosmo_sigtran_la_LIBADD)
+Index: libosmo-sccp-0.7.0.208/tests/m2ua/Makefile.am
===================================================================
---- libosmo-sccp.orig/tests/m2ua/Makefile.am
-+++ libosmo-sccp/tests/m2ua/Makefile.am
+--- libosmo-sccp-0.7.0.208.orig/tests/m2ua/Makefile.am
++++ libosmo-sccp-0.7.0.208/tests/m2ua/Makefile.am
@@ -5,4 +5,4 @@ EXTRA_DIST = m2ua_test.ok
noinst_PROGRAMS = m2ua_test
m2ua_test_SOURCES = m2ua_test.c
-m2ua_test_LDADD = $(top_builddir)/src/libxua.a $(LIBOSMOCORE_LIBS)
+m2ua_test_LDADD = $(top_builddir)/src/libosmo-xua.la $(LIBOSMOCORE_LIBS) ${TALLOC_LIBS}
-Index: libosmo-sccp/tests/sccp/Makefile.am
+Index: libosmo-sccp-0.7.0.208/tests/sccp/Makefile.am
===================================================================
---- libosmo-sccp.orig/tests/sccp/Makefile.am
-+++ libosmo-sccp/tests/sccp/Makefile.am
+--- libosmo-sccp-0.7.0.208.orig/tests/sccp/Makefile.am
++++ libosmo-sccp-0.7.0.208/tests/sccp/Makefile.am
@@ -1,4 +1,4 @@
-AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include
+AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include ${TALLOC_CFLAGS}
@@ -109,3 +128,30 @@ Index: libosmo-sccp/tests/sccp/Makefile.am
-sccp_test_LDADD = $(LIBOSMOCORE_LIBS)
+sccp_test_LDADD = $(LIBOSMOCORE_LIBS) ${TALLOC_LIBS}
+Index: libosmo-sccp-0.7.0.208/tests/ss7/Makefile.am
+===================================================================
+--- libosmo-sccp-0.7.0.208.orig/tests/ss7/Makefile.am
++++ libosmo-sccp-0.7.0.208/tests/ss7/Makefile.am
+@@ -1,7 +1,5 @@
+ AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include -Wall
+ AM_CFLAGS=-Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOVTY_CFLAGS)
+-
+-AM_LDFLAGS = -static
+ LDADD = $(top_builddir)/src/libosmo-sigtran.la \
+ $(LIBOSMOCORE_LIBS) $(LIBOSMOVTY_LIBS) $(LIBOSMONETIF_LIBS) $(LIBSCTP_LIBS)
+
+Index: libosmo-sccp-0.7.0.208/tests/xua/Makefile.am
+===================================================================
+--- libosmo-sccp-0.7.0.208.orig/tests/xua/Makefile.am
++++ libosmo-sccp-0.7.0.208/tests/xua/Makefile.am
+@@ -1,8 +1,6 @@
+-AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include -Wall
++AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include -Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(LIBOSMONETIF_CFLAGS) $(LIBSCTP_CFLAGS)
+ AM_CFLAGS=-Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOVTY_CFLAGS)
+-
+-AM_LDFLAGS = -static
+-LDADD = $(top_builddir)/src/libosmo-sigtran.la \
++LDADD = $(top_builddir)/src/libosmo-xua.la $(top_builddir)/src/libosmo-sigtran-internal.la \
+ $(LIBOSMOCORE_LIBS) $(LIBOSMOVTY_LIBS) $(LIBOSMONETIF_LIBS) $(LIBSCTP_LIBS)
+
+ EXTRA_DIST = xua_test.ok
diff --git a/_service b/_service
index 51f40a5..dd1bc20 100644
--- a/_service
+++ b/_service
@@ -1,13 +1,14 @@
<services>
- <service name="tar_scm" mode="localonly">
+ <service name="tar_scm" mode="disabled">
<param name="scm">git</param>
<param name="url">git://git.osmocom.org/libosmo-sccp</param>
<param name="revision">master</param>
+ <param name="parent-tag">0.7.0</param>
<param name="versionformat">@PARENT_TAG@.@TAG_OFFSET@</param>
</service>
- <service name="recompress" mode="localonly">
+ <service name="recompress" mode="disabled">
<param name="file">*.tar</param>
<param name="compression">xz</param>
</service>
- <service name="set_version" mode="localonly"/>
+ <service name="set_version" mode="disabled"/>
</services>
diff --git a/libosmo-sccp-0.7.0.13.tar.xz b/libosmo-sccp-0.7.0.13.tar.xz
deleted file mode 100644
index a73fb30..0000000
--- a/libosmo-sccp-0.7.0.13.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e8233cd0b3e8dafdfd257b3d96de1297c81ab673333248a584dc56e4b9fdb198
-size 43736
diff --git a/libosmo-sccp-0.7.0.208.tar.xz b/libosmo-sccp-0.7.0.208.tar.xz
new file mode 100644
index 0000000..2566fbc
--- /dev/null
+++ b/libosmo-sccp-0.7.0.208.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8e25066b5acf06c79e5661394ff2de486f444549b52e8672a1ffba237f2fb11c
+size 155112
diff --git a/libosmo-sccp.changes b/libosmo-sccp.changes
index 77c4de6..9926193 100644
--- a/libosmo-sccp.changes
+++ b/libosmo-sccp.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Fri Apr 28 22:48:03 UTC 2017 - jengelh@inai.de
+
+- Update to new upstream snapshot 0.7.0.208
+ * Add new 'osmo_ss7' SS7 core code with M3UA, ASP/AS FSM, ...
+ * Add SCCP <-> SUA message transcoding routines
+ * Add tests for xUA code + SCCP/SUA transcoding
+ * Add new SCCP implementation
+ * Add M3UA RKM (routing key management) support, SGW side only
+ * SCCP: Add VTY interface for SCCP
+
-------------------------------------------------------------------
Fri Jan 22 18:33:36 UTC 2016 - jengelh@inai.de
diff --git a/libosmo-sccp.spec b/libosmo-sccp.spec
index 26c368c..bbc8abb 100644
--- a/libosmo-sccp.spec
+++ b/libosmo-sccp.spec
@@ -1,7 +1,7 @@
#
# spec file for package libosmo-sccp
#
-# 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
@@ -17,7 +17,7 @@
Name: libosmo-sccp
-Version: 0.7.0.13
+Version: 0.7.0.208
Release: 0
Summary: Osmocom library for the A-bis interface between BTS and BSC
License: AGPL-3.0+ and GPL-2.0+
@@ -28,51 +28,29 @@ Url: http://openbsc.osmocom.org/
Source: %name-%version.tar.xz
Patch1: 0001-build-fixes.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-BuildRequires: autoconf
BuildRequires: automake >= 1.6
-BuildRequires: libtool
+BuildRequires: libtool >= 2
BuildRequires: lksctp-tools-devel
-BuildRequires: pkg-config
+BuildRequires: pkg-config >= 0.20
BuildRequires: xz
BuildRequires: pkgconfig(libosmo-netif) >= 0.0.6.1
BuildRequires: pkgconfig(libosmocore) >= 0.9.0.45
-BuildRequires: pkgconfig(libosmogsm)
-BuildRequires: pkgconfig(libosmovty)
+BuildRequires: pkgconfig(libosmogsm) >= 0.9.5
+BuildRequires: pkgconfig(libosmovty) >= 0.3.0
BuildRequires: pkgconfig(talloc)
%description
-Osmocom library for the A-bis interface between BTS and BSC.
+SCCP is a network layer protocol that provides extended routing, flow
+control, segmentation, connection-orientation, and error correction
+facilities in Signaling System 7 telecommunications networks. SCCP is
+heavily used in cellular networks such as GSM.
-%package -n libosmo-xua-0_7_0
-Summary: Osmocom Message Transfer Part 2 User Adaptation library
-License: AGPL-3.0+
-Group: System/Libraries
-
-%description -n libosmo-xua-0_7_0
-M2UA (RFC 3331) provides an SCTP (RFC 3873) adaptation layer for the
-seamless backhaul of MTP Level 2 user messages and service interface
-across an IP network.
-
-%package -n libosmo-xua-devel
-Summary: Development files for the Osmocom M2UA library
-License: AGPL-3.0+
-Group: Development/Libraries/C and C++
-Requires: libosmo-sigtran-devel = %version
-Requires: libosmo-xua-0_7_0 = %version
-
-%description -n libosmo-xua-devel
-M2UA provides an SCTP adaptation layer for MTP level 2 user messages
-and service interface across an IP network.
-
-This subpackage contains the development files for the Osmocom M2UA
-library.
-
-%package -n libosmo-mtp-0_7_0
+%package -n libosmo-mtp-0_7_0_208
Summary: Osmocom Message Transfer Part library
License: GPL-2.0+
Group: System/Libraries
-%description -n libosmo-mtp-0_7_0
+%description -n libosmo-mtp-0_7_0_208
The Message Transfer Part (MTP) is part of the Signaling System 7
(SS7) used for communication in Public Switched Telephone Networks.
MTP is responsible for reliable, unduplicated and in-sequence
@@ -82,7 +60,7 @@ transport of SS7 messages between communication partners.
Summary: Development files for the Osmocom MTP library
License: GPL-2.0+
Group: Development/Libraries/C and C++
-Requires: libosmo-mtp-0_7_0 = %version
+Requires: libosmo-mtp-0_7_0_208 = %version
%description -n libosmo-mtp-devel
MTP is part of SS7 used for communication in Public Switched
@@ -91,12 +69,12 @@ Telephone Networks.
This subpackage contains the development files for the Osmocom MTP
library.
-%package -n libosmo-sccp-0_7_0
+%package -n libosmo-sccp-0_7_0_208
Summary: Osmocom Signalling Connection Control Part library
License: GPL-2.0+
Group: System/Libraries
-%description -n libosmo-sccp-0_7_0
+%description -n libosmo-sccp-0_7_0_208
The Signalling Connection Control Part (SCCP) is a network layer
protocol that provides extended routing, flow control, segmentation,
connection-orientation, and error correction facilities in Signaling
@@ -107,7 +85,7 @@ MTP for basic routing and error detection.
Summary: Development files for the Osmocom SCCP library
License: GPL-2.0+
Group: Development/Libraries/C and C++
-Requires: libosmo-sccp-0_7_0 = %version
+Requires: libosmo-sccp-0_7_0_208 = %version
%description -n libosmo-sccp-devel
SCCP is a network layer protocol that provides routing, flow control,
@@ -119,7 +97,7 @@ library.
%package -n libosmo-sigtran0
Summary: Osmocom SIGTRAN library
-License: AGPL-3.0+
+License: GPL-2.0+
Group: System/Libraries
%description -n libosmo-sigtran0
@@ -127,11 +105,39 @@ Osmocom implementation of (parts of) SIGTRAN.
%package -n libosmo-sigtran-devel
Summary: Development files for the Osmocom sigtran library
-License: AGPL-3.0+
+License: GPL-2.0+
Group: Development/Libraries/C and C++
Requires: libosmo-sigtran0 = %version
%description -n libosmo-sigtran-devel
+Osmocom implementation of (parts of) SIGTRAN.
+
+This subpackage contains the development files for the Osmocom
+SIGTRAN library.
+
+%package -n libosmo-xua-0_7_0_208
+Summary: Osmocom Message Transfer Part 2 User Adaptation library
+License: GPL-2.0+
+Group: System/Libraries
+
+%description -n libosmo-xua-0_7_0_208
+M2UA (RFC 3331) provides an SCTP (RFC 3873) adaptation layer for the
+seamless backhaul of MTP Level 2 user messages and service interface
+across an IP network.
+
+%package -n libosmo-xua-devel
+Summary: Development files for the Osmocom M2UA library
+License: GPL-2.0+
+Group: Development/Libraries/C and C++
+Requires: libosmo-sigtran-devel = %version
+Requires: libosmo-xua-0_7_0_208 = %version
+
+%description -n libosmo-xua-devel
+M2UA provides an SCTP adaptation layer for MTP level 2 user messages
+and service interface across an IP network.
+
+This subpackage contains the development files for the Osmocom M2UA
+library.
%prep
%setup -q
@@ -151,22 +157,16 @@ find "$b/%_libdir" -type f -name "*.la" -delete
%check
make %{?_smp_mflags} check
-%post -n libosmo-xua-0_7_0 -p /sbin/ldconfig
-%postun -n libosmo-xua-0_7_0 -p /sbin/ldconfig
-%post -n libosmo-mtp-0_7_0 -p /sbin/ldconfig
-%postun -n libosmo-mtp-0_7_0 -p /sbin/ldconfig
-%post -n libosmo-sccp-0_7_0 -p /sbin/ldconfig
-%postun -n libosmo-sccp-0_7_0 -p /sbin/ldconfig
+%post -n libosmo-mtp-0_7_0_208 -p /sbin/ldconfig
+%postun -n libosmo-mtp-0_7_0_208 -p /sbin/ldconfig
+%post -n libosmo-sccp-0_7_0_208 -p /sbin/ldconfig
+%postun -n libosmo-sccp-0_7_0_208 -p /sbin/ldconfig
+%post -n libosmo-sigtran0 -p /sbin/ldconfig
+%postun -n libosmo-sigtran0 -p /sbin/ldconfig
+%post -n libosmo-xua-0_7_0_208 -p /sbin/ldconfig
+%postun -n libosmo-xua-0_7_0_208 -p /sbin/ldconfig
-%files -n libosmo-xua-0_7_0
-%defattr(-,root,root)
-%_libdir/libosmo-xua-%version.so
-
-%files -n libosmo-xua-devel
-%defattr(-,root,root)
-%_libdir/libosmo-xua.so
-
-%files -n libosmo-mtp-0_7_0
+%files -n libosmo-mtp-0_7_0_208
%defattr(-,root,root)
%_libdir/libosmo-mtp-%version.so
@@ -178,13 +178,14 @@ make %{?_smp_mflags} check
%_libdir/libosmo-mtp.so
%_libdir/pkgconfig/libosmo-mtp.pc
-%files -n libosmo-sccp-0_7_0
+%files -n libosmo-sccp-0_7_0_208
%defattr(-,root,root)
%_libdir/libosmo-sccp.so
%_libdir/libosmo-sccp-%version.so
%files -n libosmo-sccp-devel
%defattr(-,root,root)
+%_bindir/osmo-stp
%dir %_includedir/%name
%dir %_includedir/%name/osmocom
%_includedir/%name/osmocom/sccp/
@@ -202,4 +203,13 @@ make %{?_smp_mflags} check
%_libdir/libosmo-sigtran.so
%_libdir/pkgconfig/libosmo-sigtran.pc
+%files -n libosmo-xua-0_7_0_208
+%defattr(-,root,root)
+%_libdir/libosmo-xua-%version.so
+
+%files -n libosmo-xua-devel
+%defattr(-,root,root)
+%_libdir/libosmo-xua.so
+%_libdir/pkgconfig/libosmo-xua.pc
+
%changelog