Accepting request 760941 from home:mnhauke:osmocom:CNI-2020-01

- Update to new upstream release 1.2.0
  * ASP FSM: Permit DOWN -> DOWN "transition"
  * xua: Implement traffic mode broadcast
  * osmo_ss7: Add osmo_ss7_asp_find()
  * introduce public enum osmo_ss7_asp_role for ASP/SG/IPSP
  * ss7: Implement AS traffic mode loadshare using round robin ASP
    selection
  * ipa: Fix crash when parsing of received IPA SCCP message fails
  * ipa: Don't send non-SCCP data over IPA/SCCPlite
- Update patch
  * 0001-build-fixes.patch
- Add patch
  * 0002-build-fixes.patch

OBS-URL: https://build.opensuse.org/request/show/760941
OBS-URL: https://build.opensuse.org/package/show/network:telephony/libosmo-sccp?expand=0&rev=35

0001-build-fixes.patch

@@ -26,10 +26,10 @@ Index: libosmo-sccp-0.8.1/configure.ac
  PKG_PROG_PKG_CONFIG([0.20])
  
 +PKG_CHECK_MODULES([TALLOC], [talloc])
- PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.0.0)
+ PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.3.0)
- PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 1.0.0)
+ PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 1.3.0)
- PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 1.0.0)
+ PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 1.3.0)
- PKG_CHECK_MODULES(LIBOSMONETIF, libosmo-netif >= 0.4.0)
+ PKG_CHECK_MODULES(LIBOSMONETIF, libosmo-netif >= 0.6.0)
 
 Index: libosmo-sccp-0.8.1/libosmo-mtp.pc.in
 ===================================================================
@@ -102,23 +102,6 @@ Index: libosmo-sccp-0.8.1/tests/m2ua/Makefile.am
  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-0.8.1/tests/sccp/Makefile.am
-===================================================================
---- libosmo-sccp-0.8.1.orig/tests/sccp/Makefile.am
-+++ libosmo-sccp-0.8.1/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}
- AM_CFLAGS=-Wall -ggdb3 $(LIBOSMOCORE_CFLAGS)
- 
- EXTRA_DIST = sccp_test.ok
-@@ -6,5 +6,5 @@ EXTRA_DIST = sccp_test.ok
- noinst_PROGRAMS = sccp_test
- 
- sccp_test_SOURCES = sccp_test.c $(top_srcdir)/src/sccp.c
--sccp_test_LDADD = $(LIBOSMOCORE_LIBS)
-+sccp_test_LDADD = $(LIBOSMOCORE_LIBS) ${TALLOC_LIBS}
- 
 Index: libosmo-sccp-0.8.1/tests/ss7/Makefile.am
 ===================================================================
 --- libosmo-sccp-0.8.1.orig/tests/ss7/Makefile.am

0002-build-fixes.patch

@@ -0,0 +1,17 @@
+diff --git a/tests/sccp/Makefile.am b/tests/sccp/Makefile.am
+index 85dbe64..ad7ddf3 100644
+--- a/tests/sccp/Makefile.am
++++ b/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}
+ AM_CFLAGS=-Wall -ggdb3 $(LIBOSMOCORE_CFLAGS)
+ 
+ EXTRA_DIST = sccp_test.ok
+@@ -9,5 +9,6 @@ sccp_test_SOURCES = sccp_test.c
+ sccp_test_LDADD = \
+ 	$(LIBOSMOCORE_LIBS) \
+ 	$(top_builddir)/src/sccp.o \
++        ${TALLOC_LIBS} \
+ 	$(NULL)
+ 

_service

@@ -2,8 +2,8 @@
 	<service name="tar_scm" mode="disabled">
 		<param name="scm">git</param>
 		<param name="url">git://git.osmocom.org/libosmo-sccp</param>
-		<param name="revision">1.1.0</param>
+		<param name="revision">1.2.0</param>
-		<param name="versionformat">1.1.0</param>
+		<param name="versionformat">1.2.0</param>
 	</service>
 	<service name="recompress" mode="disabled">
 		<param name="file">*.tar</param>

libosmo-sccp-1.1.0.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:3b788a01024c12a9eb05d840779b08c523c9d9550f9dda59e15b2546360cfbb3
-size 204432

libosmo-sccp-1.2.0.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8f2adbc725abd654585d02088db211227d3905510b5e61e76a33006341b52ca0
+size 210384

libosmo-sccp.changes

@@ -1,3 +1,20 @@
+-------------------------------------------------------------------
+Sun Jan  5 10:19:06 UTC 2020 - Martin Hauke <mardnh@gmx.de>
+
+- Update to new upstream release 1.2.0
+  * ASP FSM: Permit DOWN -> DOWN "transition"
+  * xua: Implement traffic mode broadcast
+  * osmo_ss7: Add osmo_ss7_asp_find()
+  * introduce public enum osmo_ss7_asp_role for ASP/SG/IPSP
+  * ss7: Implement AS traffic mode loadshare using round robin ASP
+    selection
+  * ipa: Fix crash when parsing of received IPA SCCP message fails
+  * ipa: Don't send non-SCCP data over IPA/SCCPlite
+- Update patch
+  * 0001-build-fixes.patch
+- Add patch
+  * 0002-build-fixes.patch
+
 -------------------------------------------------------------------
 Thu Aug 15 04:44:32 UTC 2019 - Jan Engelhardt <jengelh@inai.de>
 

libosmo-sccp.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package libosmo-sccp
 #
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 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:        1.1.0
+Version:        1.2.0
 Release:        0
 %define libversion %(echo "%version" | sed 's/\\./_/g')
 Summary:        Osmocom library for the A-bis interface between BTS and BSC
@@ -28,6 +28,7 @@ Url:            https://projects.osmocom.org/projects/libosmo-sccp
 #Git-Clone:	git://git.osmocom.org/libosmo-sccp
 Source:         %name-%version.tar.xz
 Patch1:         0001-build-fixes.patch
+Patch2:         0002-build-fixes.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  automake >= 1.6
 BuildRequires:  libtool >= 2
@@ -35,10 +36,10 @@ BuildRequires:  lksctp-tools-devel
 BuildRequires:  pkg-config >= 0.20
 BuildRequires:  systemd-rpm-macros
 BuildRequires:  xz
-BuildRequires:  pkgconfig(libosmo-netif) >= 0.4.0
+BuildRequires:  pkgconfig(libosmo-netif) >= 0.7.0
-BuildRequires:  pkgconfig(libosmocore) >= 1.0.0
+BuildRequires:  pkgconfig(libosmocore) >= 1.3.0
-BuildRequires:  pkgconfig(libosmogsm) >= 1.0.0
+BuildRequires:  pkgconfig(libosmogsm) >= 1.3.0
-BuildRequires:  pkgconfig(libosmovty) >= 1.0.0
+BuildRequires:  pkgconfig(libosmovty) >= 1.3.0
 
 %description
 SCCP is a network layer protocol that provides extended routing, flow
@@ -98,19 +99,19 @@ in SS7 telecommunications networks.
 This subpackage contains the development files for the Osmocom SCCP
 library.
 
-%package -n libosmo-sigtran3
+%package -n libosmo-sigtran5
 Summary:        Osmocom SIGTRAN library
 License:        GPL-2.0-or-later
 Group:          System/Libraries
 
-%description -n libosmo-sigtran3
+%description -n libosmo-sigtran5
 Osmocom implementation of (parts of) SIGTRAN.
 
 %package -n libosmo-sigtran-devel
 Summary:        Development files for the Osmocom sigtran library
 License:        GPL-2.0-or-later
 Group:          Development/Libraries/C and C++
-Requires:       libosmo-sigtran3 = %version
+Requires:       libosmo-sigtran5 = %version
 
 %description -n libosmo-sigtran-devel
 Osmocom implementation of (parts of) SIGTRAN.
@@ -155,8 +156,7 @@ implementation, missing lots of the functionality usually present in
 a STP, such as Global Title Routing, Global Title Translation.
 
 %prep
-%setup -q
+%autosetup -p1
-%patch -P 1 -p1
 
 %build
 echo "%version" >.tarball-version
@@ -187,8 +187,8 @@ fi
 %postun -n libosmo-mtp-%libversion -p /sbin/ldconfig
 %post   -n libosmo-sccp-%libversion -p /sbin/ldconfig
 %postun -n libosmo-sccp-%libversion -p /sbin/ldconfig
-%post   -n libosmo-sigtran3 -p /sbin/ldconfig
+%post   -n libosmo-sigtran5 -p /sbin/ldconfig
-%postun -n libosmo-sigtran3 -p /sbin/ldconfig
+%postun -n libosmo-sigtran5 -p /sbin/ldconfig
 %post   -n libosmo-xua-%libversion -p /sbin/ldconfig
 %postun -n libosmo-xua-%libversion -p /sbin/ldconfig
 
@@ -228,9 +228,9 @@ fi
 %_libdir/libosmo-sccp.so
 %_libdir/pkgconfig/libosmo-sccp.pc
 
-%files -n libosmo-sigtran3
+%files -n libosmo-sigtran5
 %defattr(-,root,root)
-%_libdir/libosmo-sigtran.so.3*
+%_libdir/libosmo-sigtran.so.5*
 
 %files -n libosmo-sigtran-devel
 %defattr(-,root,root)