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

Accepting request 657188 from network:telephony

Browse Source 
- Update to new upstream release 0.10.0

OBS-URL: https://build.opensuse.org/request/show/657188
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libosmo-sccp?expand=0&rev=8
This commit is contained in:
Dominique Leuenberger 2019-01-05 13:41:44 +00:00 committed by Git OBS Bridge
commit ba49268be9
6 changed files with 59 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
0001-build-fixes.patch
View File

@ -8,7 +8,7 @@ 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 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 +++++++++++++++-----
@ -16,32 +16,24 @@ Multimedia Transfer Protocol library.
tests/sccp/Makefile.am | 4 ++-- tests/sccp/Makefile.am | 4 ++--
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, 23 insertions(+), 16 deletions(-)
Index: libosmo-sccp-0.8.1/configure.ac Index: libosmo-sccp-0.10.0/configure.ac
=================================================================== ===================================================================
--- libosmo-sccp-0.8.1.orig/configure.ac --- libosmo-sccp-0.10.0.orig/configure.ac
+++ libosmo-sccp-0.8.1/configure.ac +++ libosmo-sccp-0.10.0/configure.ac
@@ -21,7 +21,6 @@ AC_PROG_MAKE_SET @@ -29,6 +29,7 @@ if test "x$PKG_CONFIG_INSTALLED" = "xno"
AC_PROG_CC
AC_PROG_INSTALL
LT_INIT
-AC_PROG_LIBTOOL
dnl check for pkg-config (explained in detail in libosmocore/configure.ac)
AC_PATH_PROG(PKG_CONFIG_INSTALLED, pkg-config, no)
@@ -30,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 >= 0.10.0) PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 0.12.0)
PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 0.10.0) PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 0.12.0)
PKG_CHECK_MODULES(LIBOSMONETIF, libosmo-netif >= 0.1.0) PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 0.12.0)
Index: libosmo-sccp-0.8.1/libosmo-mtp.pc.in Index: libosmo-sccp-0.10.0/libosmo-mtp.pc.in
=================================================================== ===================================================================
--- libosmo-sccp-0.8.1.orig/libosmo-mtp.pc.in --- libosmo-sccp-0.10.0.orig/libosmo-mtp.pc.in
+++ libosmo-sccp-0.8.1/libosmo-mtp.pc.in +++ libosmo-sccp-0.10.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
@ -49,10 +41,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-0.10.0/libosmo-sccp.pc.in
=================================================================== ===================================================================
--- libosmo-sccp-0.8.1.orig/libosmo-sccp.pc.in --- libosmo-sccp-0.10.0.orig/libosmo-sccp.pc.in
+++ libosmo-sccp-0.8.1/libosmo-sccp.pc.in +++ libosmo-sccp-0.10.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
@ -60,10 +52,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-0.10.0/src/Makefile.am
=================================================================== ===================================================================
--- libosmo-sccp-0.8.1.orig/src/Makefile.am --- libosmo-sccp-0.10.0.orig/src/Makefile.am
+++ libosmo-sccp-0.8.1/src/Makefile.am +++ libosmo-sccp-0.10.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
@ -99,20 +91,20 @@ 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-0.10.0/tests/m2ua/Makefile.am
=================================================================== ===================================================================
--- libosmo-sccp-0.8.1.orig/tests/m2ua/Makefile.am --- libosmo-sccp-0.10.0.orig/tests/m2ua/Makefile.am
+++ libosmo-sccp-0.8.1/tests/m2ua/Makefile.am +++ libosmo-sccp-0.10.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-0.10.0/tests/sccp/Makefile.am
=================================================================== ===================================================================
--- libosmo-sccp-0.8.1.orig/tests/sccp/Makefile.am --- libosmo-sccp-0.10.0.orig/tests/sccp/Makefile.am
+++ libosmo-sccp-0.8.1/tests/sccp/Makefile.am +++ libosmo-sccp-0.10.0/tests/sccp/Makefile.am
@@ -1,4 +1,4 @@ @@ -1,4 +1,4 @@
-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}
@ -126,10 +118,10 @@ Index: libosmo-sccp-0.8.1/tests/sccp/Makefile.am
-sccp_test_LDADD = $(LIBOSMOCORE_LIBS) -sccp_test_LDADD = $(LIBOSMOCORE_LIBS)
+sccp_test_LDADD = $(LIBOSMOCORE_LIBS) ${TALLOC_LIBS} +sccp_test_LDADD = $(LIBOSMOCORE_LIBS) ${TALLOC_LIBS}
Index: libosmo-sccp-0.8.1/tests/ss7/Makefile.am Index: libosmo-sccp-0.10.0/tests/ss7/Makefile.am
=================================================================== ===================================================================
--- libosmo-sccp-0.8.1.orig/tests/ss7/Makefile.am --- libosmo-sccp-0.10.0.orig/tests/ss7/Makefile.am
+++ libosmo-sccp-0.8.1/tests/ss7/Makefile.am +++ libosmo-sccp-0.10.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)
@ -138,10 +130,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-0.10.0/tests/xua/Makefile.am
=================================================================== ===================================================================
--- libosmo-sccp-0.8.1.orig/tests/xua/Makefile.am --- libosmo-sccp-0.10.0.orig/tests/xua/Makefile.am
+++ libosmo-sccp-0.8.1/tests/xua/Makefile.am +++ libosmo-sccp-0.10.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">0.8.1</param> <param name="revision">0.10.0</param>
<param name="versionformat">0.8.1</param> <param name="versionformat">0.10.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-0.10.0.tar.xz Normal file
View File

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

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

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

15
libosmo-sccp.changes
View File

@ -1,3 +1,18 @@
-------------------------------------------------------------------
Tue Dec 11 00:47:07 UTC 2018 - Jan Engelhardt <jengelh@inai.de>
- Update to new upstream release 0.10.0
* ipa: Patch DPC/OPC information into SCCP Calling/Called Party
Address
* ipa: Automatically create / destroy route on IPA
connect/disconnect
* ss7: Re-bind xUA server socket after setting new IP
* osmo_ss7: Register 5000 as default port for IPA/SCCPlite
* fix infinite recursion with routing by global title
* fix use after free in osmo_sccp_simple_server_add_clnt()
* fix memleak in ipa_rx_msg_sccp
* fix two memleaks in ipa_rx_msg_sccp()
------------------------------------------------------------------- -------------------------------------------------------------------
Sat Mar 17 16:50:04 UTC 2018 - mardnh@gmx.de Sat Mar 17 16:50:04 UTC 2018 - mardnh@gmx.de

16
libosmo-sccp.spec
View File

@ -12,12 +12,12 @@
# license that conforms to the Open Source Definition (Version 1.9) # license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative. # published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/ # Please submit bugfixes or comments via https://bugs.opensuse.org/
# #
Name: libosmo-sccp Name: libosmo-sccp
Version: 0.8.1 Version: 0.10.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
@ -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.1.0 BuildRequires: pkgconfig(libosmo-netif) >= 0.3.0
BuildRequires: pkgconfig(libosmocore) >= 0.10.0 BuildRequires: pkgconfig(libosmocore) >= 0.12.0
BuildRequires: pkgconfig(libosmogsm) >= 0.10.0 BuildRequires: pkgconfig(libosmogsm) >= 0.12.0
BuildRequires: pkgconfig(libosmovty) >= 0.10.0 BuildRequires: pkgconfig(libosmovty) >= 0.12.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
@ -159,7 +159,8 @@ a STP, such as Global Title Routing, Global Title Translation.
%build %build
echo "%version" >.tarball-version echo "%version" >.tarball-version
autoreconf -fiv autoreconf -fiv
%configure --disable-static --includedir="%_includedir/%name" %configure --disable-static --includedir="%_includedir/%name" \
--docdir="%_defaultdocdir/%name"
make %{?_smp_mflags} make %{?_smp_mflags}
%install %install
@ -248,5 +249,6 @@ fi
%_bindir/osmo-stp %_bindir/osmo-stp
%_sbindir/rcosmo-stp %_sbindir/rcosmo-stp
%_unitdir/osmo-stp.service %_unitdir/osmo-stp.service
%_defaultdocdir/%name/
%changelog %changelog