jengelh/libosmo-sccp
SHA256
1
0
Fork 0
forked from pool/libosmo-sccp
Code Pull Requests Activity

Accepting request 1121720 from network:telephony

Browse Source 
- Update to release 1.8.1

OBS-URL: https://build.opensuse.org/request/show/1121720
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libosmo-sccp?expand=0&rev=20
This commit is contained in:
Ana Guerrero 2023-11-02 19:21:52 +00:00 committed by Git OBS Bridge
commit 0a21de0c2a
6 changed files with 84 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

107
0001-build-fixes.patch
View File

@ -15,27 +15,27 @@ Multimedia Transfer Protocol library.
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 | 6 +++--- tests/sccp/Makefile.am | 7 ++++---
tests/ss7/Makefile.am | 2 -- tests/ss7/Makefile.am | 2 +-
tests/xua/Makefile.am | 6 ++---- tests/xua/Makefile.am | 7 ++++---
8 files changed, 24 insertions(+), 17 deletions(-) 8 files changed, 28 insertions(+), 15 deletions(-)
Index: libosmo-sccp-1.7.0/configure.ac Index: libosmo-sccp-1.8.1/configure.ac
=================================================================== ===================================================================
--- libosmo-sccp-1.7.0.orig/configure.ac --- libosmo-sccp-1.8.1.orig/configure.ac
+++ libosmo-sccp-1.7.0/configure.ac +++ libosmo-sccp-1.8.1/configure.ac
@@ -36,6 +36,7 @@ if test "x$PKG_CONFIG_INSTALLED" = "xno" @@ -51,6 +51,7 @@ AC_SEARCH_LIBS([sctp_recvmsg], [sctp], [
fi ], [
PKG_PROG_PKG_CONFIG([0.20]) AC_MSG_ERROR([sctp_recvmsg not found in searched libs])])
LIBS=$old_LIBS
+PKG_CHECK_MODULES([TALLOC], [talloc]) +PKG_CHECK_MODULES([TALLOC], [talloc])
PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.8.0)
PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 1.8.0) AC_ARG_ENABLE(sanitize,
PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 1.8.0) [AS_HELP_STRING(
Index: libosmo-sccp-1.7.0/libosmo-mtp.pc.in Index: libosmo-sccp-1.8.1/libosmo-mtp.pc.in
=================================================================== ===================================================================
--- libosmo-sccp-1.7.0.orig/libosmo-mtp.pc.in --- libosmo-sccp-1.8.1.orig/libosmo-mtp.pc.in
+++ libosmo-sccp-1.7.0/libosmo-mtp.pc.in +++ libosmo-sccp-1.8.1/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
@ -43,10 +43,10 @@ Index: libosmo-sccp-1.7.0/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-1.7.0/libosmo-sccp.pc.in Index: libosmo-sccp-1.8.1/libosmo-sccp.pc.in
=================================================================== ===================================================================
--- libosmo-sccp-1.7.0.orig/libosmo-sccp.pc.in --- libosmo-sccp-1.8.1.orig/libosmo-sccp.pc.in
+++ libosmo-sccp-1.7.0/libosmo-sccp.pc.in +++ libosmo-sccp-1.8.1/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
@ -54,10 +54,10 @@ Index: libosmo-sccp-1.7.0/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-1.7.0/src/Makefile.am Index: libosmo-sccp-1.8.1/src/Makefile.am
=================================================================== ===================================================================
--- libosmo-sccp-1.7.0.orig/src/Makefile.am --- libosmo-sccp-1.8.1.orig/src/Makefile.am
+++ libosmo-sccp-1.7.0/src/Makefile.am +++ libosmo-sccp-1.8.1/src/Makefile.am
@@ -7,15 +7,21 @@ noinst_HEADERS = sccp_internal.h ss7_int @@ -7,15 +7,21 @@ noinst_HEADERS = sccp_internal.h ss7_int
# Legacy static libs # Legacy static libs
@ -85,7 +85,7 @@ Index: libosmo-sccp-1.7.0/src/Makefile.am
# New shared lib # New shared lib
@@ -36,3 +42,7 @@ libosmo_sigtran_la_SOURCES = sccp_sap.c @@ -37,3 +43,7 @@ libosmo_sigtran_la_SOURCES = sccp_sap.c
libosmo_sigtran_la_LDFLAGS = -version-info $(LIBVERSION) -no-undefined -export-symbols-regex '^osmo_' libosmo_sigtran_la_LDFLAGS = -version-info $(LIBVERSION) -no-undefined -export-symbols-regex '^osmo_'
libosmo_sigtran_la_LIBADD = $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(LIBOSMOVTY_LIBS) \ libosmo_sigtran_la_LIBADD = $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(LIBOSMOVTY_LIBS) \
$(LIBOSMONETIF_LIBS) $(LIBSCTP_LIBS) $(LIBOSMONETIF_LIBS) $(LIBSCTP_LIBS)
@ -93,24 +93,26 @@ Index: libosmo-sccp-1.7.0/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-1.7.0/tests/m2ua/Makefile.am Index: libosmo-sccp-1.8.1/tests/m2ua/Makefile.am
=================================================================== ===================================================================
--- libosmo-sccp-1.7.0.orig/tests/m2ua/Makefile.am --- libosmo-sccp-1.8.1.orig/tests/m2ua/Makefile.am
+++ libosmo-sccp-1.7.0/tests/m2ua/Makefile.am +++ libosmo-sccp-1.8.1/tests/m2ua/Makefile.am
@@ -5,4 +5,4 @@ EXTRA_DIST = m2ua_test.ok @@ -6,4 +6,4 @@ EXTRA_DIST = m2ua_test.ok
check_PROGRAMS = m2ua_test check_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-1.7.0/tests/sccp/Makefile.am Index: libosmo-sccp-1.8.1/tests/sccp/Makefile.am
=================================================================== ===================================================================
--- libosmo-sccp-1.7.0.orig/tests/sccp/Makefile.am --- libosmo-sccp-1.8.1.orig/tests/sccp/Makefile.am
+++ libosmo-sccp-1.7.0/tests/sccp/Makefile.am +++ libosmo-sccp-1.8.1/tests/sccp/Makefile.am
@@ -1,13 +1,13 @@ @@ -1,14 +1,15 @@
-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_CFLAGS=-Wall -ggdb3 $(LIBOSMOCORE_CFLAGS)
AM_CFLAGS=-Wall -ggdb3 $(LIBOSMOCORE_CFLAGS) +AM_CFLAGS=-Wall -ggdb3
+AM_CPPFLAGS += $(LIBOSMOCORE_CFLAGS) ${TALLOC_CFLAGS}
AM_LDFLAGS = -no-install
EXTRA_DIST = sccp_test.ok EXTRA_DIST = sccp_test.ok
@ -124,29 +126,32 @@ Index: libosmo-sccp-1.7.0/tests/sccp/Makefile.am
+ ${TALLOC_LIBS} \ + ${TALLOC_LIBS} \
$(NULL) $(NULL)
Index: libosmo-sccp-1.7.0/tests/ss7/Makefile.am Index: libosmo-sccp-1.8.1/tests/ss7/Makefile.am
=================================================================== ===================================================================
--- libosmo-sccp-1.7.0.orig/tests/ss7/Makefile.am --- libosmo-sccp-1.8.1.orig/tests/ss7/Makefile.am
+++ libosmo-sccp-1.7.0/tests/ss7/Makefile.am +++ libosmo-sccp-1.8.1/tests/ss7/Makefile.am
@@ -1,7 +1,5 @@ @@ -1,7 +1,7 @@
AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include -Wall AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include
AM_CFLAGS=-Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOVTY_CFLAGS) AM_CFLAGS=-Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOVTY_CFLAGS)
-
-AM_LDFLAGS = -static -AM_LDFLAGS = -static -no-install
+AM_LDFLAGS = -no-install
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-1.7.0/tests/xua/Makefile.am Index: libosmo-sccp-1.8.1/tests/xua/Makefile.am
=================================================================== ===================================================================
--- libosmo-sccp-1.7.0.orig/tests/xua/Makefile.am --- libosmo-sccp-1.8.1.orig/tests/xua/Makefile.am
+++ libosmo-sccp-1.7.0/tests/xua/Makefile.am +++ libosmo-sccp-1.8.1/tests/xua/Makefile.am
@@ -1,8 +1,6 @@ @@ -1,8 +1,9 @@
-AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include -Wall AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include
+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_CFLAGS=-Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOVTY_CFLAGS) +AM_CFLAGS=-Wall
- +AM_CPPFLAGS += $(LIBOSMOCORE_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(LIBOSMONETIF_CFLAGS) $(LIBSCTP_CFLAGS)
-AM_LDFLAGS = -static
-AM_LDFLAGS = -static -no-install
-LDADD = $(top_builddir)/src/libosmo-sigtran.la \ -LDADD = $(top_builddir)/src/libosmo-sigtran.la \
+AM_LDFLAGS = -no-install
+LDADD = $(top_builddir)/src/libosmo-xua.la $(top_builddir)/src/libosmo-sigtran-internal.la \ +LDADD = $(top_builddir)/src/libosmo-xua.la $(top_builddir)/src/libosmo-sigtran-internal.la \
$(LIBOSMOCORE_LIBS) $(LIBOSMOVTY_LIBS) $(LIBOSMONETIF_LIBS) $(LIBSCTP_LIBS) $(LIBOSMOCORE_LIBS) $(LIBOSMOVTY_LIBS) $(LIBOSMONETIF_LIBS) $(LIBSCTP_LIBS)

3
1.7.0.tar.gz
View File

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

3
1.8.1.tar.gz Normal file
View File

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

10
harden_osmo-stp.service.patch
View File

@ -2,12 +2,12 @@
contrib/systemd/osmo-stp.service | 13 +++++++++++++ contrib/systemd/osmo-stp.service | 13 +++++++++++++
1 file changed, 13 insertions(+) 1 file changed, 13 insertions(+)
Index: libosmo-sccp-1.7.0/contrib/systemd/osmo-stp.service Index: libosmo-sccp-1.8.1/contrib/systemd/osmo-stp.service
=================================================================== ===================================================================
--- libosmo-sccp-1.7.0.orig/contrib/systemd/osmo-stp.service --- libosmo-sccp-1.8.1.orig/contrib/systemd/osmo-stp.service
+++ libosmo-sccp-1.7.0/contrib/systemd/osmo-stp.service +++ libosmo-sccp-1.8.1/contrib/systemd/osmo-stp.service
@@ -3,6 +3,19 @@ Description=Osmocom STP (Signal Transfer @@ -5,6 +5,19 @@ After=network-online.target
Documentation=https://osmocom.org/projects/osmo-stp/wiki Wants=network-online.target
[Service] [Service]
+# added automatically, for details please see +# added automatically, for details please see

8
libosmo-sccp.changes
View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Wed Nov 1 18:54:01 UTC 2023 - Jan Engelhardt <jengelh@inai.de>
- Update to release 1.8.1
* SCCP: implement variable limit on Optional Data
(CR,CC,CREF,RLSD)
* Allow configuring per-ASP SCTP INIT parameters
------------------------------------------------------------------- -------------------------------------------------------------------
Thu May 18 11:31:13 UTC 2023 - Jan Engelhardt <jengelh@inai.de> Thu May 18 11:31:13 UTC 2023 - Jan Engelhardt <jengelh@inai.de>

24
libosmo-sccp.spec
View File

@ -17,7 +17,7 @@
Name: libosmo-sccp Name: libosmo-sccp
Version: 1.7.0 Version: 1.8.1
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
@ -33,10 +33,10 @@ BuildRequires: libtool >= 2
BuildRequires: lksctp-tools-devel BuildRequires: lksctp-tools-devel
BuildRequires: pkg-config >= 0.20 BuildRequires: pkg-config >= 0.20
BuildRequires: systemd-rpm-macros BuildRequires: systemd-rpm-macros
BuildRequires: pkgconfig(libosmo-netif) >= 1.3.0 BuildRequires: pkgconfig(libosmo-netif) >= 1.4.0
BuildRequires: pkgconfig(libosmocore) >= 1.8.0 BuildRequires: pkgconfig(libosmocore) >= 1.9.0
BuildRequires: pkgconfig(libosmogsm) >= 1.8.0 BuildRequires: pkgconfig(libosmogsm) >= 1.9.0
BuildRequires: pkgconfig(libosmovty) >= 1.8.0 BuildRequires: pkgconfig(libosmovty) >= 1.9.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
@ -96,19 +96,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-sigtran7 %package -n libosmo-sigtran9
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-sigtran7 %description -n libosmo-sigtran9
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-sigtran7 = %version Requires: libosmo-sigtran9 = %version
%description -n libosmo-sigtran-devel %description -n libosmo-sigtran-devel
Osmocom implementation of (parts of) SIGTRAN. Osmocom implementation of (parts of) SIGTRAN.
@ -184,8 +184,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-sigtran7 -p /sbin/ldconfig %post -n libosmo-sigtran9 -p /sbin/ldconfig
%postun -n libosmo-sigtran7 -p /sbin/ldconfig %postun -n libosmo-sigtran9 -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
@ -221,8 +221,8 @@ fi
%_libdir/libosmo-sccp.so %_libdir/libosmo-sccp.so
%_libdir/pkgconfig/libosmo-sccp.pc %_libdir/pkgconfig/libosmo-sccp.pc
%files -n libosmo-sigtran7 %files -n libosmo-sigtran9
%_libdir/libosmo-sigtran.so.7* %_libdir/libosmo-sigtran.so.*
%files -n libosmo-sigtran-devel %files -n libosmo-sigtran-devel
%dir %_includedir/%name/ %dir %_includedir/%name/