pool/libosmo-sccp
SHA256
3
0
Fork 2
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 761609 from network:telephony

Browse Source 
- Update to new upstream release 1.2.0

OBS-URL: https://build.opensuse.org/request/show/761609
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libosmo-sccp?expand=0&rev=11
This commit is contained in:
Dominique Leuenberger 2020-01-08 16:55:16 +00:00 committed by Git OBS Bridge
commit 3d5c651e2a
6 changed files with 82 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

81
0001-build-fixes.patch
View File

@ -4,37 +4,38 @@ Date: Mon, 21 Jul 2014 10:13:00 +0200
Subject: [PATCH] build: fixes Subject: [PATCH] build: fixes
Find and use system talloc, do not rely on OSMO's bundled copy. Find and use system talloc, do not rely on OSMO's bundled copy.
Avoid adding .o files into _LDADD, this is nonportable.
Rename libmtp to libosmo-mtp, as libmtp is already used by the Rename libmtp to libosmo-mtp, as libmtp is already used by the
Multimedia Transfer Protocol library. Multimedia Transfer Protocol library.
--- ---
configure.ac | 2 +- configure.ac | 1 +
libosmo-mtp.pc.in | 2 +- libosmo-mtp.pc.in | 2 +-
libosmo-sccp.pc.in | 2 +- libosmo-sccp.pc.in | 2 +-
src/Makefile.am | 20 +++++++++++++++----- src/Makefile.am | 20 +++++++++++++++-----
tests/m2ua/Makefile.am | 2 +- tests/m2ua/Makefile.am | 2 +-
tests/sccp/Makefile.am | 4 ++-- tests/sccp/Makefile.am | 6 +++---
tests/ss7/Makefile.am | 2 -- tests/ss7/Makefile.am | 2 --
tests/xua/Makefile.am | 6 ++---- tests/xua/Makefile.am | 6 ++----
8 files changed, 23 insertions(+), 17 deletions(-) 8 files changed, 24 insertions(+), 17 deletions(-)
Index: libosmo-sccp-0.8.1/configure.ac Index: libosmo-sccp-1.2.0/configure.ac
=================================================================== ===================================================================
--- libosmo-sccp-0.8.1.orig/configure.ac --- libosmo-sccp-1.2.0.orig/configure.ac
+++ libosmo-sccp-0.8.1/configure.ac +++ libosmo-sccp-1.2.0/configure.ac
@@ -30,6 +29,7 @@ if test "x$PKG_CONFIG_INSTALLED" = "xno" @@ -29,6 +29,7 @@ if test "x$PKG_CONFIG_INSTALLED" = "xno"
fi fi
PKG_PROG_PKG_CONFIG([0.20]) PKG_PROG_PKG_CONFIG([0.20])
+PKG_CHECK_MODULES([TALLOC], [talloc]) +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) Index: libosmo-sccp-1.2.0/libosmo-mtp.pc.in
Index: libosmo-sccp-0.8.1/libosmo-mtp.pc.in
=================================================================== ===================================================================
--- libosmo-sccp-0.8.1.orig/libosmo-mtp.pc.in --- libosmo-sccp-1.2.0.orig/libosmo-mtp.pc.in
+++ libosmo-sccp-0.8.1/libosmo-mtp.pc.in +++ libosmo-sccp-1.2.0/libosmo-mtp.pc.in
@@ -6,5 +6,5 @@ includedir=@includedir@ @@ -6,5 +6,5 @@ includedir=@includedir@
Name: Osmo MTP Lib Name: Osmo MTP Lib
Description: Osmo MTP Lib Description: Osmo MTP Lib
@ -42,10 +43,10 @@ Index: libosmo-sccp-0.8.1/libosmo-mtp.pc.in
-Libs: -L${libdir} -lmtp -Libs: -L${libdir} -lmtp
+Libs: -L${libdir} -losmo-mtp +Libs: -L${libdir} -losmo-mtp
Cflags: -I${includedir}/ Cflags: -I${includedir}/
Index: libosmo-sccp-0.8.1/libosmo-sccp.pc.in Index: libosmo-sccp-1.2.0/libosmo-sccp.pc.in
=================================================================== ===================================================================
--- libosmo-sccp-0.8.1.orig/libosmo-sccp.pc.in --- libosmo-sccp-1.2.0.orig/libosmo-sccp.pc.in
+++ libosmo-sccp-0.8.1/libosmo-sccp.pc.in +++ libosmo-sccp-1.2.0/libosmo-sccp.pc.in
@@ -6,5 +6,5 @@ includedir=@includedir@ @@ -6,5 +6,5 @@ includedir=@includedir@
Name: OpenBSC SCCP Lib Name: OpenBSC SCCP Lib
Description: OpenBSC SCCP Lib Description: OpenBSC SCCP Lib
@ -53,10 +54,10 @@ Index: libosmo-sccp-0.8.1/libosmo-sccp.pc.in
-Libs: -L${libdir} -lsccp -Libs: -L${libdir} -lsccp
+Libs: -L${libdir} -losmo-sccp +Libs: -L${libdir} -losmo-sccp
Cflags: -I${includedir}/ Cflags: -I${includedir}/
Index: libosmo-sccp-0.8.1/src/Makefile.am Index: libosmo-sccp-1.2.0/src/Makefile.am
=================================================================== ===================================================================
--- libosmo-sccp-0.8.1.orig/src/Makefile.am --- libosmo-sccp-1.2.0.orig/src/Makefile.am
+++ libosmo-sccp-0.8.1/src/Makefile.am +++ libosmo-sccp-1.2.0/src/Makefile.am
@@ -7,15 +7,21 @@ noinst_HEADERS = sccp_internal.h xua_asp @@ -7,15 +7,21 @@ noinst_HEADERS = sccp_internal.h xua_asp
# Legacy static libs # Legacy static libs
@ -92,37 +93,41 @@ Index: libosmo-sccp-0.8.1/src/Makefile.am
+noinst_LTLIBRARIES = libosmo-sigtran-internal.la +noinst_LTLIBRARIES = libosmo-sigtran-internal.la
+libosmo_sigtran_internal_la_SOURCES = $(libosmo_sigtran_la_SOURCES) +libosmo_sigtran_internal_la_SOURCES = $(libosmo_sigtran_la_SOURCES)
+libosmo_sigtran_internal_la_LIBADD = $(libosmo_sigtran_la_LIBADD) +libosmo_sigtran_internal_la_LIBADD = $(libosmo_sigtran_la_LIBADD)
Index: libosmo-sccp-0.8.1/tests/m2ua/Makefile.am Index: libosmo-sccp-1.2.0/tests/m2ua/Makefile.am
=================================================================== ===================================================================
--- libosmo-sccp-0.8.1.orig/tests/m2ua/Makefile.am --- libosmo-sccp-1.2.0.orig/tests/m2ua/Makefile.am
+++ libosmo-sccp-0.8.1/tests/m2ua/Makefile.am +++ libosmo-sccp-1.2.0/tests/m2ua/Makefile.am
@@ -5,4 +5,4 @@ EXTRA_DIST = m2ua_test.ok @@ -5,4 +5,4 @@ EXTRA_DIST = m2ua_test.ok
noinst_PROGRAMS = m2ua_test noinst_PROGRAMS = m2ua_test
m2ua_test_SOURCES = m2ua_test.c m2ua_test_SOURCES = m2ua_test.c
-m2ua_test_LDADD = $(top_builddir)/src/libxua.a $(LIBOSMOCORE_LIBS) -m2ua_test_LDADD = $(top_builddir)/src/libxua.a $(LIBOSMOCORE_LIBS)
+m2ua_test_LDADD = $(top_builddir)/src/libosmo-xua.la $(LIBOSMOCORE_LIBS) ${TALLOC_LIBS} +m2ua_test_LDADD = $(top_builddir)/src/libosmo-xua.la $(LIBOSMOCORE_LIBS) ${TALLOC_LIBS}
Index: libosmo-sccp-0.8.1/tests/sccp/Makefile.am Index: libosmo-sccp-1.2.0/tests/sccp/Makefile.am
=================================================================== ===================================================================
--- libosmo-sccp-0.8.1.orig/tests/sccp/Makefile.am --- libosmo-sccp-1.2.0.orig/tests/sccp/Makefile.am
+++ libosmo-sccp-0.8.1/tests/sccp/Makefile.am +++ libosmo-sccp-1.2.0/tests/sccp/Makefile.am
@@ -1,4 +1,4 @@ @@ -1,13 +1,13 @@
-AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include -AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include
+AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include ${TALLOC_CFLAGS} +AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include ${TALLOC_CFLAGS}
AM_CFLAGS=-Wall -ggdb3 $(LIBOSMOCORE_CFLAGS) AM_CFLAGS=-Wall -ggdb3 $(LIBOSMOCORE_CFLAGS)
EXTRA_DIST = sccp_test.ok EXTRA_DIST = sccp_test.ok
@@ -6,5 +6,5 @@ EXTRA_DIST = sccp_test.ok
noinst_PROGRAMS = sccp_test noinst_PROGRAMS = sccp_test
sccp_test_SOURCES = sccp_test.c $(top_srcdir)/src/sccp.c -sccp_test_SOURCES = sccp_test.c
-sccp_test_LDADD = $(LIBOSMOCORE_LIBS) +sccp_test_SOURCES = sccp_test.c ${top_srcdir}/src/sccp.c
+sccp_test_LDADD = $(LIBOSMOCORE_LIBS) ${TALLOC_LIBS} sccp_test_LDADD = \
$(LIBOSMOCORE_LIBS) \
- $(top_builddir)/src/sccp.o \
+ ${TALLOC_LIBS} \
$(NULL)
Index: libosmo-sccp-0.8.1/tests/ss7/Makefile.am Index: libosmo-sccp-1.2.0/tests/ss7/Makefile.am
=================================================================== ===================================================================
--- libosmo-sccp-0.8.1.orig/tests/ss7/Makefile.am --- libosmo-sccp-1.2.0.orig/tests/ss7/Makefile.am
+++ libosmo-sccp-0.8.1/tests/ss7/Makefile.am +++ libosmo-sccp-1.2.0/tests/ss7/Makefile.am
@@ -1,7 +1,5 @@ @@ -1,7 +1,5 @@
AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include -Wall AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include -Wall
AM_CFLAGS=-Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOVTY_CFLAGS) AM_CFLAGS=-Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOVTY_CFLAGS)
@ -131,10 +136,10 @@ Index: libosmo-sccp-0.8.1/tests/ss7/Makefile.am
LDADD = $(top_builddir)/src/libosmo-sigtran.la \ LDADD = $(top_builddir)/src/libosmo-sigtran.la \
$(LIBOSMOCORE_LIBS) $(LIBOSMOVTY_LIBS) $(LIBOSMONETIF_LIBS) $(LIBSCTP_LIBS) $(LIBOSMOCORE_LIBS) $(LIBOSMOVTY_LIBS) $(LIBOSMONETIF_LIBS) $(LIBSCTP_LIBS)
Index: libosmo-sccp-0.8.1/tests/xua/Makefile.am Index: libosmo-sccp-1.2.0/tests/xua/Makefile.am
=================================================================== ===================================================================
--- libosmo-sccp-0.8.1.orig/tests/xua/Makefile.am --- libosmo-sccp-1.2.0.orig/tests/xua/Makefile.am
+++ libosmo-sccp-0.8.1/tests/xua/Makefile.am +++ libosmo-sccp-1.2.0/tests/xua/Makefile.am
@@ -1,8 +1,6 @@ @@ -1,8 +1,6 @@
-AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include -Wall -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_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include -Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(LIBOSMONETIF_CFLAGS) $(LIBSCTP_CFLAGS)

4
_service
View File

@ -2,8 +2,8 @@
<service name="tar_scm" mode="disabled"> <service name="tar_scm" mode="disabled">
<param name="scm">git</param> <param name="scm">git</param>
<param name="url">git://git.osmocom.org/libosmo-sccp</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>
<service name="recompress" mode="disabled"> <service name="recompress" mode="disabled">
<param name="file">*.tar</param> <param name="file">*.tar</param>

3
libosmo-sccp-1.1.0.tar.xz
View File

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

3
libosmo-sccp-1.2.0.tar.xz Normal file
View File

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

19
libosmo-sccp.changes
View File

@ -1,3 +1,22 @@
-------------------------------------------------------------------
Tue Jan 7 11:42:32 UTC 2020 - Jan Engelhardt <jengelh@inai.de>
- Update 0001-build-fixes.patch to build sccp_test with SOURCES,
not LDADD.
-------------------------------------------------------------------
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
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Aug 15 04:44:32 UTC 2019 - Jan Engelhardt <jengelh@inai.de> Thu Aug 15 04:44:32 UTC 2019 - Jan Engelhardt <jengelh@inai.de>

31
libosmo-sccp.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package libosmo-sccp # spec file for package libosmo-sccp
# #
# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2020 SUSE LLC
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -17,13 +17,13 @@
Name: libosmo-sccp Name: libosmo-sccp
Version: 1.1.0 Version: 1.2.0
Release: 0 Release: 0
%define libversion %(echo "%version" | sed 's/\\./_/g') %define libversion %(echo "%version" | sed 's/\\./_/g')
Summary: Osmocom library for the A-bis interface between BTS and BSC Summary: Osmocom library for the A-bis interface between BTS and BSC
License: AGPL-3.0-or-later AND GPL-2.0-or-later License: AGPL-3.0-or-later AND GPL-2.0-or-later
Group: Hardware/Mobile Group: Hardware/Mobile
Url: https://projects.osmocom.org/projects/libosmo-sccp URL: https://projects.osmocom.org/projects/libosmo-sccp
#Git-Clone: git://git.osmocom.org/libosmo-sccp #Git-Clone: git://git.osmocom.org/libosmo-sccp
Source: %name-%version.tar.xz Source: %name-%version.tar.xz
@ -35,10 +35,10 @@ BuildRequires: lksctp-tools-devel
BuildRequires: pkg-config >= 0.20 BuildRequires: pkg-config >= 0.20
BuildRequires: systemd-rpm-macros BuildRequires: systemd-rpm-macros
BuildRequires: xz 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 %description
SCCP is a network layer protocol that provides extended routing, flow SCCP is a network layer protocol that provides extended routing, flow
@ -98,19 +98,19 @@ in SS7 telecommunications networks.
This subpackage contains the development files for the Osmocom SCCP This subpackage contains the development files for the Osmocom SCCP
library. library.
%package -n libosmo-sigtran3 %package -n libosmo-sigtran5
Summary: Osmocom SIGTRAN library Summary: Osmocom SIGTRAN library
License: GPL-2.0-or-later License: GPL-2.0-or-later
Group: System/Libraries Group: System/Libraries
%description -n libosmo-sigtran3 %description -n libosmo-sigtran5
Osmocom implementation of (parts of) SIGTRAN. Osmocom implementation of (parts of) SIGTRAN.
%package -n libosmo-sigtran-devel %package -n libosmo-sigtran-devel
Summary: Development files for the Osmocom sigtran library Summary: Development files for the Osmocom sigtran library
License: GPL-2.0-or-later License: GPL-2.0-or-later
Group: Development/Libraries/C and C++ Group: Development/Libraries/C and C++
Requires: libosmo-sigtran3 = %version Requires: libosmo-sigtran5 = %version
%description -n libosmo-sigtran-devel %description -n libosmo-sigtran-devel
Osmocom implementation of (parts of) SIGTRAN. Osmocom implementation of (parts of) SIGTRAN.
@ -155,8 +155,7 @@ implementation, missing lots of the functionality usually present in
a STP, such as Global Title Routing, Global Title Translation. a STP, such as Global Title Routing, Global Title Translation.
%prep %prep
%setup -q %autosetup -p1
%patch -P 1 -p1
%build %build
echo "%version" >.tarball-version echo "%version" >.tarball-version
@ -187,8 +186,8 @@ fi
%postun -n libosmo-mtp-%libversion -p /sbin/ldconfig %postun -n libosmo-mtp-%libversion -p /sbin/ldconfig
%post -n libosmo-sccp-%libversion -p /sbin/ldconfig %post -n libosmo-sccp-%libversion -p /sbin/ldconfig
%postun -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 %post -n libosmo-xua-%libversion -p /sbin/ldconfig
%postun -n libosmo-xua-%libversion -p /sbin/ldconfig %postun -n libosmo-xua-%libversion -p /sbin/ldconfig
@ -228,9 +227,9 @@ fi
%_libdir/libosmo-sccp.so %_libdir/libosmo-sccp.so
%_libdir/pkgconfig/libosmo-sccp.pc %_libdir/pkgconfig/libosmo-sccp.pc
%files -n libosmo-sigtran3 %files -n libosmo-sigtran5
%defattr(-,root,root) %defattr(-,root,root)
%_libdir/libosmo-sigtran.so.3* %_libdir/libosmo-sigtran.so.5*
%files -n libosmo-sigtran-devel %files -n libosmo-sigtran-devel
%defattr(-,root,root) %defattr(-,root,root)