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

join 0001 and 0002 back again

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/network:telephony/libosmo-sccp?expand=0&rev=36
This commit is contained in:
Jan Engelhardt 2020-01-07 11:35:37 +00:00 committed by Git OBS Bridge
parent 1db04193b6
commit 5ef7300407
4 changed files with 44 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
0001-build-fixes.patch
View File

@ -7,21 +7,21 @@ 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 +++++++++++++++-----
tests/m2ua/Makefile.am | 2 +- tests/m2ua/Makefile.am | 2 +-
tests/sccp/Makefile.am | 4 ++-- tests/sccp/Makefile.am | 3 ++-
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(+), 15 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])
@ -29,12 +29,10 @@ Index: libosmo-sccp-0.8.1/configure.ac
PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.3.0) PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.3.0)
PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 1.3.0) PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 1.3.0)
PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 1.3.0) PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 1.3.0)
PKG_CHECK_MODULES(LIBOSMONETIF, libosmo-netif >= 0.6.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 +40,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 +51,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,20 +90,37 @@ 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/ss7/Makefile.am Index: libosmo-sccp-1.2.0/tests/sccp/Makefile.am
=================================================================== ===================================================================
--- libosmo-sccp-0.8.1.orig/tests/ss7/Makefile.am --- libosmo-sccp-1.2.0.orig/tests/sccp/Makefile.am
+++ libosmo-sccp-0.8.1/tests/ss7/Makefile.am +++ libosmo-sccp-1.2.0/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)
Index: libosmo-sccp-1.2.0/tests/ss7/Makefile.am
===================================================================
--- libosmo-sccp-1.2.0.orig/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)
@ -114,10 +129,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)

17
0002-build-fixes.patch
View File

@ -1,17 +0,0 @@
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)

4
libosmo-sccp.changes
View File

@ -10,10 +10,6 @@ Sun Jan 5 10:19:06 UTC 2020 - Martin Hauke <mardnh@gmx.de>
selection selection
* ipa: Fix crash when parsing of received IPA SCCP message fails * ipa: Fix crash when parsing of received IPA SCCP message fails
* ipa: Don't send non-SCCP data over IPA/SCCPlite * 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> Thu Aug 15 04:44:32 UTC 2019 - Jan Engelhardt <jengelh@inai.de>

4
libosmo-sccp.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package libosmo-sccp # spec file for package libosmo-sccp
# #
# Copyright (c) 2020 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
@ -23,7 +23,7 @@ Release: 0
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