From 7a6683c1496b42e6926e9aa1c9e977aebe2ecfad7a64eb5642620f65c90d8cf6 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Sun, 14 Mar 2021 20:59:38 +0000 Subject: [PATCH] - Update to release 1.4.0 OBS-URL: https://build.opensuse.org/package/show/network:telephony/libosmo-sccp?expand=0&rev=45 --- 0001-build-fixes.patch | 58 +++++++++++++++++++-------------------- 1.4.0.tar.gz | 3 ++ _service | 13 --------- libosmo-sccp-1.3.0.tar.xz | 3 -- libosmo-sccp.changes | 7 +++++ libosmo-sccp.spec | 15 +++++----- 6 files changed, 46 insertions(+), 53 deletions(-) create mode 100644 1.4.0.tar.gz delete mode 100644 _service delete mode 100644 libosmo-sccp-1.3.0.tar.xz diff --git a/0001-build-fixes.patch b/0001-build-fixes.patch index eb80149..fe3808e 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.2.0/configure.ac +Index: libosmo-sccp-1.4.0/configure.ac =================================================================== ---- libosmo-sccp-1.2.0.orig/configure.ac -+++ libosmo-sccp-1.2.0/configure.ac -@@ -29,6 +29,7 @@ if test "x$PKG_CONFIG_INSTALLED" = "xno" +--- libosmo-sccp-1.4.0.orig/configure.ac ++++ libosmo-sccp-1.4.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.3.0) - PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 1.3.0) - PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 1.3.0) -Index: libosmo-sccp-1.2.0/libosmo-mtp.pc.in + PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.5.0) + PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 1.5.0) + PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 1.5.0) +Index: libosmo-sccp-1.4.0/libosmo-mtp.pc.in =================================================================== ---- libosmo-sccp-1.2.0.orig/libosmo-mtp.pc.in -+++ libosmo-sccp-1.2.0/libosmo-mtp.pc.in +--- libosmo-sccp-1.4.0.orig/libosmo-mtp.pc.in ++++ libosmo-sccp-1.4.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.2.0/libosmo-mtp.pc.in -Libs: -L${libdir} -lmtp +Libs: -L${libdir} -losmo-mtp Cflags: -I${includedir}/ -Index: libosmo-sccp-1.2.0/libosmo-sccp.pc.in +Index: libosmo-sccp-1.4.0/libosmo-sccp.pc.in =================================================================== ---- libosmo-sccp-1.2.0.orig/libosmo-sccp.pc.in -+++ libosmo-sccp-1.2.0/libosmo-sccp.pc.in +--- libosmo-sccp-1.4.0.orig/libosmo-sccp.pc.in ++++ libosmo-sccp-1.4.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.2.0/libosmo-sccp.pc.in -Libs: -L${libdir} -lsccp +Libs: -L${libdir} -losmo-sccp Cflags: -I${includedir}/ -Index: libosmo-sccp-1.2.0/src/Makefile.am +Index: libosmo-sccp-1.4.0/src/Makefile.am =================================================================== ---- libosmo-sccp-1.2.0.orig/src/Makefile.am -+++ libosmo-sccp-1.2.0/src/Makefile.am +--- libosmo-sccp-1.4.0.orig/src/Makefile.am ++++ libosmo-sccp-1.4.0/src/Makefile.am @@ -7,15 +7,21 @@ noinst_HEADERS = sccp_internal.h xua_asp # Legacy static libs @@ -85,7 +85,7 @@ Index: libosmo-sccp-1.2.0/src/Makefile.am # New shared lib -@@ -35,3 +41,7 @@ libosmo_sigtran_la_SOURCES = sccp_sap.c +@@ -36,3 +42,7 @@ libosmo_sigtran_la_SOURCES = sccp_sap.c libosmo_sigtran_la_LDFLAGS = -version-info $(LIBVERSION) -no-undefined -export-symbols-regex '^osmo_' libosmo_sigtran_la_LIBADD = $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(LIBOSMOVTY_LIBS) \ $(LIBOSMONETIF_LIBS) $(LIBSCTP_LIBS) @@ -93,20 +93,20 @@ Index: libosmo-sccp-1.2.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.2.0/tests/m2ua/Makefile.am +Index: libosmo-sccp-1.4.0/tests/m2ua/Makefile.am =================================================================== ---- libosmo-sccp-1.2.0.orig/tests/m2ua/Makefile.am -+++ libosmo-sccp-1.2.0/tests/m2ua/Makefile.am +--- libosmo-sccp-1.4.0.orig/tests/m2ua/Makefile.am ++++ libosmo-sccp-1.4.0/tests/m2ua/Makefile.am @@ -5,4 +5,4 @@ EXTRA_DIST = m2ua_test.ok noinst_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.2.0/tests/sccp/Makefile.am +Index: libosmo-sccp-1.4.0/tests/sccp/Makefile.am =================================================================== ---- libosmo-sccp-1.2.0.orig/tests/sccp/Makefile.am -+++ libosmo-sccp-1.2.0/tests/sccp/Makefile.am +--- libosmo-sccp-1.4.0.orig/tests/sccp/Makefile.am ++++ libosmo-sccp-1.4.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.2.0/tests/sccp/Makefile.am + ${TALLOC_LIBS} \ $(NULL) -Index: libosmo-sccp-1.2.0/tests/ss7/Makefile.am +Index: libosmo-sccp-1.4.0/tests/ss7/Makefile.am =================================================================== ---- libosmo-sccp-1.2.0.orig/tests/ss7/Makefile.am -+++ libosmo-sccp-1.2.0/tests/ss7/Makefile.am +--- libosmo-sccp-1.4.0.orig/tests/ss7/Makefile.am ++++ libosmo-sccp-1.4.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.2.0/tests/ss7/Makefile.am LDADD = $(top_builddir)/src/libosmo-sigtran.la \ $(LIBOSMOCORE_LIBS) $(LIBOSMOVTY_LIBS) $(LIBOSMONETIF_LIBS) $(LIBSCTP_LIBS) -Index: libosmo-sccp-1.2.0/tests/xua/Makefile.am +Index: libosmo-sccp-1.4.0/tests/xua/Makefile.am =================================================================== ---- libosmo-sccp-1.2.0.orig/tests/xua/Makefile.am -+++ libosmo-sccp-1.2.0/tests/xua/Makefile.am +--- libosmo-sccp-1.4.0.orig/tests/xua/Makefile.am ++++ libosmo-sccp-1.4.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.4.0.tar.gz b/1.4.0.tar.gz new file mode 100644 index 0000000..7ac95db --- /dev/null +++ b/1.4.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c4b4bfbb64ccbb605f65dca45396b8bc6f6068ea43fe3c99e02a8227f1fe6eeb +size 288911 diff --git a/_service b/_service deleted file mode 100644 index d4e88df..0000000 --- a/_service +++ /dev/null @@ -1,13 +0,0 @@ - - - git - https://git.osmocom.org/libosmo-sccp - 1.3.0 - 1.3.0 - - - *.tar - xz - - - diff --git a/libosmo-sccp-1.3.0.tar.xz b/libosmo-sccp-1.3.0.tar.xz deleted file mode 100644 index 81d6865..0000000 --- a/libosmo-sccp-1.3.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a24830860a318d0f9c0fd7d9fcc00bb9d3a0eb0e56c34cf2e06f4fb4541b5a89 -size 214536 diff --git a/libosmo-sccp.changes b/libosmo-sccp.changes index 05c8c5a..ed5e3d8 100644 --- a/libosmo-sccp.changes +++ b/libosmo-sccp.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Sun Mar 14 20:59:25 UTC 2021 - Jan Engelhardt + +- Update to release 1.4.0 + * Support setting rt-prio and cpu-affinity mask through VTY + * Introduce SS7 IPv6 support + ------------------------------------------------------------------- Sun Sep 6 12:59:41 UTC 2020 - Jan Engelhardt diff --git a/libosmo-sccp.spec b/libosmo-sccp.spec index 98f0e0a..3fb5bf6 100644 --- a/libosmo-sccp.spec +++ b/libosmo-sccp.spec @@ -1,7 +1,7 @@ # # spec file for package libosmo-sccp # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: libosmo-sccp -Version: 1.3.0 +Version: 1.4.0 Release: 0 %define libversion %(echo "%version" | sed 's/\\./_/g') Summary: Osmocom library for the A-bis interface between BTS and BSC @@ -26,18 +26,17 @@ Group: Hardware/Mobile URL: https://projects.osmocom.org/projects/libosmo-sccp #Git-Clone: https://git.osmocom.org/libosmo-sccp -Source: %name-%version.tar.xz +Source: https://github.com/osmocom/libosmo-sccp/archive/%version.tar.gz Patch1: 0001-build-fixes.patch BuildRequires: automake >= 1.6 BuildRequires: libtool >= 2 BuildRequires: lksctp-tools-devel BuildRequires: pkg-config >= 0.20 BuildRequires: systemd-rpm-macros -BuildRequires: xz -BuildRequires: pkgconfig(libosmo-netif) >= 0.7.0 -BuildRequires: pkgconfig(libosmocore) >= 1.3.0 -BuildRequires: pkgconfig(libosmogsm) >= 1.3.0 -BuildRequires: pkgconfig(libosmovty) >= 1.3.0 +BuildRequires: pkgconfig(libosmo-netif) >= 1.1.0 +BuildRequires: pkgconfig(libosmocore) >= 1.5.0 +BuildRequires: pkgconfig(libosmogsm) >= 1.5.0 +BuildRequires: pkgconfig(libosmovty) >= 1.5.0 %description SCCP is a network layer protocol that provides extended routing, flow