From 54d371e8132cc01ab7c6478bed5c44e2e9129dacbc82281fc98d2dc23b9f8d93 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Thu, 18 May 2023 11:32:20 +0000 Subject: [PATCH] - Update to release 1.7.0 OBS-URL: https://build.opensuse.org/package/show/network:telephony/libosmo-sccp?expand=0&rev=52 --- 0001-build-fixes.patch | 54 +++++++++++++++++------------------ 1.6.0.tar.gz | 3 -- 1.7.0.tar.gz | 3 ++ harden_osmo-stp.service.patch | 12 +++++--- libosmo-sccp.changes | 6 ++++ libosmo-sccp.spec | 13 ++++----- 6 files changed, 50 insertions(+), 41 deletions(-) delete mode 100644 1.6.0.tar.gz create mode 100644 1.7.0.tar.gz diff --git a/0001-build-fixes.patch b/0001-build-fixes.patch index 41f32c9..bc502a7 100644 --- a/0001-build-fixes.patch +++ b/0001-build-fixes.patch @@ -20,22 +20,22 @@ Multimedia Transfer Protocol library. tests/xua/Makefile.am | 6 ++---- 8 files changed, 24 insertions(+), 17 deletions(-) -Index: libosmo-sccp-1.6.0/configure.ac +Index: libosmo-sccp-1.7.0/configure.ac =================================================================== ---- libosmo-sccp-1.6.0.orig/configure.ac -+++ libosmo-sccp-1.6.0/configure.ac +--- libosmo-sccp-1.7.0.orig/configure.ac ++++ libosmo-sccp-1.7.0/configure.ac @@ -36,6 +36,7 @@ if test "x$PKG_CONFIG_INSTALLED" = "xno" fi PKG_PROG_PKG_CONFIG([0.20]) +PKG_CHECK_MODULES([TALLOC], [talloc]) - PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.7.0) - PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 1.7.0) - PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 1.7.0) -Index: libosmo-sccp-1.6.0/libosmo-mtp.pc.in + PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.8.0) + PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 1.8.0) + PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 1.8.0) +Index: libosmo-sccp-1.7.0/libosmo-mtp.pc.in =================================================================== ---- libosmo-sccp-1.6.0.orig/libosmo-mtp.pc.in -+++ libosmo-sccp-1.6.0/libosmo-mtp.pc.in +--- libosmo-sccp-1.7.0.orig/libosmo-mtp.pc.in ++++ libosmo-sccp-1.7.0/libosmo-mtp.pc.in @@ -6,5 +6,5 @@ includedir=@includedir@ Name: Osmo MTP Lib Description: Osmo MTP Lib @@ -43,10 +43,10 @@ Index: libosmo-sccp-1.6.0/libosmo-mtp.pc.in -Libs: -L${libdir} -lmtp +Libs: -L${libdir} -losmo-mtp Cflags: -I${includedir}/ -Index: libosmo-sccp-1.6.0/libosmo-sccp.pc.in +Index: libosmo-sccp-1.7.0/libosmo-sccp.pc.in =================================================================== ---- libosmo-sccp-1.6.0.orig/libosmo-sccp.pc.in -+++ libosmo-sccp-1.6.0/libosmo-sccp.pc.in +--- libosmo-sccp-1.7.0.orig/libosmo-sccp.pc.in ++++ libosmo-sccp-1.7.0/libosmo-sccp.pc.in @@ -6,5 +6,5 @@ includedir=@includedir@ Name: OpenBSC SCCP Lib Description: OpenBSC SCCP Lib @@ -54,10 +54,10 @@ Index: libosmo-sccp-1.6.0/libosmo-sccp.pc.in -Libs: -L${libdir} -lsccp +Libs: -L${libdir} -losmo-sccp Cflags: -I${includedir}/ -Index: libosmo-sccp-1.6.0/src/Makefile.am +Index: libosmo-sccp-1.7.0/src/Makefile.am =================================================================== ---- libosmo-sccp-1.6.0.orig/src/Makefile.am -+++ libosmo-sccp-1.6.0/src/Makefile.am +--- libosmo-sccp-1.7.0.orig/src/Makefile.am ++++ libosmo-sccp-1.7.0/src/Makefile.am @@ -7,15 +7,21 @@ noinst_HEADERS = sccp_internal.h ss7_int # Legacy static libs @@ -93,20 +93,20 @@ Index: libosmo-sccp-1.6.0/src/Makefile.am +noinst_LTLIBRARIES = libosmo-sigtran-internal.la +libosmo_sigtran_internal_la_SOURCES = $(libosmo_sigtran_la_SOURCES) +libosmo_sigtran_internal_la_LIBADD = $(libosmo_sigtran_la_LIBADD) -Index: libosmo-sccp-1.6.0/tests/m2ua/Makefile.am +Index: libosmo-sccp-1.7.0/tests/m2ua/Makefile.am =================================================================== ---- libosmo-sccp-1.6.0.orig/tests/m2ua/Makefile.am -+++ libosmo-sccp-1.6.0/tests/m2ua/Makefile.am +--- libosmo-sccp-1.7.0.orig/tests/m2ua/Makefile.am ++++ libosmo-sccp-1.7.0/tests/m2ua/Makefile.am @@ -5,4 +5,4 @@ EXTRA_DIST = m2ua_test.ok check_PROGRAMS = m2ua_test 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-1.6.0/tests/sccp/Makefile.am +Index: libosmo-sccp-1.7.0/tests/sccp/Makefile.am =================================================================== ---- libosmo-sccp-1.6.0.orig/tests/sccp/Makefile.am -+++ libosmo-sccp-1.6.0/tests/sccp/Makefile.am +--- libosmo-sccp-1.7.0.orig/tests/sccp/Makefile.am ++++ libosmo-sccp-1.7.0/tests/sccp/Makefile.am @@ -1,13 +1,13 @@ -AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include +AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include ${TALLOC_CFLAGS} @@ -124,10 +124,10 @@ Index: libosmo-sccp-1.6.0/tests/sccp/Makefile.am + ${TALLOC_LIBS} \ $(NULL) -Index: libosmo-sccp-1.6.0/tests/ss7/Makefile.am +Index: libosmo-sccp-1.7.0/tests/ss7/Makefile.am =================================================================== ---- libosmo-sccp-1.6.0.orig/tests/ss7/Makefile.am -+++ libosmo-sccp-1.6.0/tests/ss7/Makefile.am +--- libosmo-sccp-1.7.0.orig/tests/ss7/Makefile.am ++++ libosmo-sccp-1.7.0/tests/ss7/Makefile.am @@ -1,7 +1,5 @@ AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include -Wall AM_CFLAGS=-Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOVTY_CFLAGS) @@ -136,10 +136,10 @@ Index: libosmo-sccp-1.6.0/tests/ss7/Makefile.am LDADD = $(top_builddir)/src/libosmo-sigtran.la \ $(LIBOSMOCORE_LIBS) $(LIBOSMOVTY_LIBS) $(LIBOSMONETIF_LIBS) $(LIBSCTP_LIBS) -Index: libosmo-sccp-1.6.0/tests/xua/Makefile.am +Index: libosmo-sccp-1.7.0/tests/xua/Makefile.am =================================================================== ---- libosmo-sccp-1.6.0.orig/tests/xua/Makefile.am -+++ libosmo-sccp-1.6.0/tests/xua/Makefile.am +--- libosmo-sccp-1.7.0.orig/tests/xua/Makefile.am ++++ libosmo-sccp-1.7.0/tests/xua/Makefile.am @@ -1,8 +1,6 @@ -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) diff --git a/1.6.0.tar.gz b/1.6.0.tar.gz deleted file mode 100644 index 6cf3fdf..0000000 --- a/1.6.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:bda8010d5866cdb16df9f71b5525aafb49d5a1628c41944de22d6a7cfed152d7 -size 295298 diff --git a/1.7.0.tar.gz b/1.7.0.tar.gz new file mode 100644 index 0000000..7c94f1d --- /dev/null +++ b/1.7.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:75d65282f5eda182feee5b453c9b9840d4521624eeb3e6e44f23b6986f52273c +size 298080 diff --git a/harden_osmo-stp.service.patch b/harden_osmo-stp.service.patch index 4acacda..33bb83b 100644 --- a/harden_osmo-stp.service.patch +++ b/harden_osmo-stp.service.patch @@ -1,7 +1,11 @@ -Index: libosmo-sccp-1.4.0/contrib/systemd/osmo-stp.service +--- + contrib/systemd/osmo-stp.service | 13 +++++++++++++ + 1 file changed, 13 insertions(+) + +Index: libosmo-sccp-1.7.0/contrib/systemd/osmo-stp.service =================================================================== ---- libosmo-sccp-1.4.0.orig/contrib/systemd/osmo-stp.service -+++ libosmo-sccp-1.4.0/contrib/systemd/osmo-stp.service +--- libosmo-sccp-1.7.0.orig/contrib/systemd/osmo-stp.service ++++ libosmo-sccp-1.7.0/contrib/systemd/osmo-stp.service @@ -3,6 +3,19 @@ Description=Osmocom STP (Signal Transfer Documentation=https://osmocom.org/projects/osmo-stp/wiki @@ -21,4 +25,4 @@ Index: libosmo-sccp-1.4.0/contrib/systemd/osmo-stp.service +# end of automatic additions Type=simple Restart=always - ExecStart=/usr/bin/osmo-stp -c /etc/osmocom/osmo-stp.cfg + StateDirectory=osmocom diff --git a/libosmo-sccp.changes b/libosmo-sccp.changes index 39e3c2c..6b0655a 100644 --- a/libosmo-sccp.changes +++ b/libosmo-sccp.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu May 18 11:31:13 UTC 2023 - Jan Engelhardt + +- Update to release 1.7.0 + * SIGTRAN: cache Optional Data for SCCP CR/CC/RLSD + ------------------------------------------------------------------- Wed Aug 3 16:35:16 UTC 2022 - Jan Engelhardt diff --git a/libosmo-sccp.spec b/libosmo-sccp.spec index 14af370..bea4baf 100644 --- a/libosmo-sccp.spec +++ b/libosmo-sccp.spec @@ -1,7 +1,7 @@ # # spec file for package libosmo-sccp # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,14 +17,13 @@ Name: libosmo-sccp -Version: 1.6.0 +Version: 1.7.0 Release: 0 %define libversion %(echo "%version" | sed 's/\\./_/g') Summary: Osmocom library for the A-bis interface between BTS and BSC License: AGPL-3.0-or-later AND GPL-2.0-or-later Group: Hardware/Mobile URL: https://projects.osmocom.org/projects/libosmo-sccp - #Git-Clone: https://git.osmocom.org/libosmo-sccp Source: https://github.com/osmocom/libosmo-sccp/archive/%version.tar.gz Patch1: 0001-build-fixes.patch @@ -34,10 +33,10 @@ BuildRequires: libtool >= 2 BuildRequires: lksctp-tools-devel BuildRequires: pkg-config >= 0.20 BuildRequires: systemd-rpm-macros -BuildRequires: pkgconfig(libosmo-netif) >= 1.2.0 -BuildRequires: pkgconfig(libosmocore) >= 1.7.0 -BuildRequires: pkgconfig(libosmogsm) >= 1.7.0 -BuildRequires: pkgconfig(libosmovty) >= 1.7.0 +BuildRequires: pkgconfig(libosmo-netif) >= 1.3.0 +BuildRequires: pkgconfig(libosmocore) >= 1.8.0 +BuildRequires: pkgconfig(libosmogsm) >= 1.8.0 +BuildRequires: pkgconfig(libosmovty) >= 1.8.0 %description SCCP is a network layer protocol that provides extended routing, flow