diff --git a/0001-build-fixes.patch b/0001-build-fixes.patch index d3e1f02..b1f9f5b 100644 --- a/0001-build-fixes.patch +++ b/0001-build-fixes.patch @@ -11,18 +11,18 @@ Multimedia Transfer Protocol library. configure.ac | 2 +- libosmo-mtp.pc.in | 2 +- libosmo-sccp.pc.in | 2 +- - src/Makefile.am | 22 ++++++++++++++++------ + src/Makefile.am | 20 +++++++++++++++----- tests/m2ua/Makefile.am | 2 +- tests/sccp/Makefile.am | 4 ++-- tests/ss7/Makefile.am | 2 -- tests/xua/Makefile.am | 6 ++---- - 8 files changed, 24 insertions(+), 18 deletions(-) + 8 files changed, 23 insertions(+), 17 deletions(-) -Index: libosmo-sccp-0.7.0.208/configure.ac +Index: libosmo-sccp-0.8.1/configure.ac =================================================================== ---- libosmo-sccp-0.7.0.208.orig/configure.ac -+++ libosmo-sccp-0.7.0.208/configure.ac -@@ -17,7 +17,6 @@ AC_PROG_MAKE_SET +--- libosmo-sccp-0.8.1.orig/configure.ac ++++ libosmo-sccp-0.8.1/configure.ac +@@ -21,7 +21,6 @@ AC_PROG_MAKE_SET AC_PROG_CC AC_PROG_INSTALL LT_INIT @@ -30,18 +30,18 @@ Index: libosmo-sccp-0.7.0.208/configure.ac dnl check for pkg-config (explained in detail in libosmocore/configure.ac) AC_PATH_PROG(PKG_CONFIG_INSTALLED, pkg-config, no) -@@ -26,6 +25,7 @@ if test "x$PKG_CONFIG_INSTALLED" = "xno" +@@ -30,6 +29,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 >= 0.3.0) - PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 0.3.0) - PKG_CHECK_MODULES(LIBOSMONETIF, libosmo-netif >= 0.0.6) -Index: libosmo-sccp-0.7.0.208/libosmo-mtp.pc.in + PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 0.10.0) + PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 0.10.0) + PKG_CHECK_MODULES(LIBOSMONETIF, libosmo-netif >= 0.1.0) +Index: libosmo-sccp-0.8.1/libosmo-mtp.pc.in =================================================================== ---- libosmo-sccp-0.7.0.208.orig/libosmo-mtp.pc.in -+++ libosmo-sccp-0.7.0.208/libosmo-mtp.pc.in +--- libosmo-sccp-0.8.1.orig/libosmo-mtp.pc.in ++++ libosmo-sccp-0.8.1/libosmo-mtp.pc.in @@ -6,5 +6,5 @@ includedir=@includedir@ Name: Osmo MTP Lib Description: Osmo MTP Lib @@ -49,10 +49,10 @@ Index: libosmo-sccp-0.7.0.208/libosmo-mtp.pc.in -Libs: -L${libdir} -lmtp +Libs: -L${libdir} -losmo-mtp Cflags: -I${includedir}/ -Index: libosmo-sccp-0.7.0.208/libosmo-sccp.pc.in +Index: libosmo-sccp-0.8.1/libosmo-sccp.pc.in =================================================================== ---- libosmo-sccp-0.7.0.208.orig/libosmo-sccp.pc.in -+++ libosmo-sccp-0.7.0.208/libosmo-sccp.pc.in +--- libosmo-sccp-0.8.1.orig/libosmo-sccp.pc.in ++++ libosmo-sccp-0.8.1/libosmo-sccp.pc.in @@ -6,5 +6,5 @@ includedir=@includedir@ Name: OpenBSC SCCP Lib Description: OpenBSC SCCP Lib @@ -60,11 +60,11 @@ Index: libosmo-sccp-0.7.0.208/libosmo-sccp.pc.in -Libs: -L${libdir} -lsccp +Libs: -L${libdir} -losmo-sccp Cflags: -I${includedir}/ -Index: libosmo-sccp-0.7.0.208/src/Makefile.am +Index: libosmo-sccp-0.8.1/src/Makefile.am =================================================================== ---- libosmo-sccp-0.7.0.208.orig/src/Makefile.am -+++ libosmo-sccp-0.7.0.208/src/Makefile.am -@@ -6,15 +6,21 @@ noinst_HEADERS = sccp_internal.h xua_asp +--- libosmo-sccp-0.8.1.orig/src/Makefile.am ++++ libosmo-sccp-0.8.1/src/Makefile.am +@@ -7,15 +7,21 @@ noinst_HEADERS = sccp_internal.h xua_asp # Legacy static libs sccpdir = $(libdir) @@ -91,30 +91,28 @@ Index: libosmo-sccp-0.7.0.208/src/Makefile.am # New shared lib -@@ -32,4 +38,8 @@ libosmo_sigtran_la_SOURCES = sccp_sap.c - osmo_ss7.c osmo_ss7_hmrt.c xua_asp_fsm.c xua_as_fsm.c \ - osmo_ss7_vty.c sccp_vty.c ipa.c +@@ -35,3 +41,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) $(LIBOSMONETIF_LIBS) $(LIBSCTP_LIBS) -+libosmo_sigtran_la_LIBADD = $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(LIBOSMONETIF_LIBS) $(LIBSCTP_LIBS) $(LIBOSMOVTY_LIBS) + libosmo_sigtran_la_LIBADD = $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(LIBOSMOVTY_LIBS) \ + $(LIBOSMONETIF_LIBS) $(LIBSCTP_LIBS) + +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-0.7.0.208/tests/m2ua/Makefile.am +Index: libosmo-sccp-0.8.1/tests/m2ua/Makefile.am =================================================================== ---- libosmo-sccp-0.7.0.208.orig/tests/m2ua/Makefile.am -+++ libosmo-sccp-0.7.0.208/tests/m2ua/Makefile.am +--- libosmo-sccp-0.8.1.orig/tests/m2ua/Makefile.am ++++ libosmo-sccp-0.8.1/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-0.7.0.208/tests/sccp/Makefile.am +Index: libosmo-sccp-0.8.1/tests/sccp/Makefile.am =================================================================== ---- libosmo-sccp-0.7.0.208.orig/tests/sccp/Makefile.am -+++ libosmo-sccp-0.7.0.208/tests/sccp/Makefile.am +--- libosmo-sccp-0.8.1.orig/tests/sccp/Makefile.am ++++ libosmo-sccp-0.8.1/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} @@ -128,10 +126,10 @@ Index: libosmo-sccp-0.7.0.208/tests/sccp/Makefile.am -sccp_test_LDADD = $(LIBOSMOCORE_LIBS) +sccp_test_LDADD = $(LIBOSMOCORE_LIBS) ${TALLOC_LIBS} -Index: libosmo-sccp-0.7.0.208/tests/ss7/Makefile.am +Index: libosmo-sccp-0.8.1/tests/ss7/Makefile.am =================================================================== ---- libosmo-sccp-0.7.0.208.orig/tests/ss7/Makefile.am -+++ libosmo-sccp-0.7.0.208/tests/ss7/Makefile.am +--- libosmo-sccp-0.8.1.orig/tests/ss7/Makefile.am ++++ libosmo-sccp-0.8.1/tests/ss7/Makefile.am @@ -1,7 +1,5 @@ AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include -Wall AM_CFLAGS=-Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOVTY_CFLAGS) @@ -140,10 +138,10 @@ Index: libosmo-sccp-0.7.0.208/tests/ss7/Makefile.am LDADD = $(top_builddir)/src/libosmo-sigtran.la \ $(LIBOSMOCORE_LIBS) $(LIBOSMOVTY_LIBS) $(LIBOSMONETIF_LIBS) $(LIBSCTP_LIBS) -Index: libosmo-sccp-0.7.0.208/tests/xua/Makefile.am +Index: libosmo-sccp-0.8.1/tests/xua/Makefile.am =================================================================== ---- libosmo-sccp-0.7.0.208.orig/tests/xua/Makefile.am -+++ libosmo-sccp-0.7.0.208/tests/xua/Makefile.am +--- libosmo-sccp-0.8.1.orig/tests/xua/Makefile.am ++++ libosmo-sccp-0.8.1/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) @@ -154,4 +152,4 @@ Index: libosmo-sccp-0.7.0.208/tests/xua/Makefile.am +LDADD = $(top_builddir)/src/libosmo-xua.la $(top_builddir)/src/libosmo-sigtran-internal.la \ $(LIBOSMOCORE_LIBS) $(LIBOSMOVTY_LIBS) $(LIBOSMONETIF_LIBS) $(LIBSCTP_LIBS) - EXTRA_DIST = xua_test.ok + EXTRA_DIST = xua_test.ok xua_test.err diff --git a/_service b/_service index dd1bc20..7a16b70 100644 --- a/_service +++ b/_service @@ -2,9 +2,8 @@ git git://git.osmocom.org/libosmo-sccp - master - 0.7.0 - @PARENT_TAG@.@TAG_OFFSET@ + 0.8.1 + 0.8.1 *.tar diff --git a/libosmo-sccp-0.7.0.284.tar.xz b/libosmo-sccp-0.7.0.284.tar.xz deleted file mode 100644 index 7f10158..0000000 --- a/libosmo-sccp-0.7.0.284.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:bcf72436d6918152662458b3e5f0dde0478449479f1089434c8c9f073980ac59 -size 162536 diff --git a/libosmo-sccp-0.8.1.tar.xz b/libosmo-sccp-0.8.1.tar.xz new file mode 100644 index 0000000..ace8594 --- /dev/null +++ b/libosmo-sccp-0.8.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ce3e44897344b07ccea36e4615146bc8a1af6c061c6d6c6048c60669485ff8b7 +size 181892 diff --git a/libosmo-sccp.changes b/libosmo-sccp.changes index aba8ea9..a34a612 100644 --- a/libosmo-sccp.changes +++ b/libosmo-sccp.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu Dec 28 00:32:03 UTC 2017 - jengelh@inai.de + +- Update to new upstream release 0.8.1 + * sccp_scrc: fix Network Indicator in SIO composition + * osmo_sccp_addr_encode(): Fix truncation of point codes + ------------------------------------------------------------------- Thu Oct 26 13:05:31 UTC 2017 - dimstar@opensuse.org diff --git a/libosmo-sccp.spec b/libosmo-sccp.spec index f226cc8..9b278bc 100644 --- a/libosmo-sccp.spec +++ b/libosmo-sccp.spec @@ -17,9 +17,9 @@ Name: libosmo-sccp -Version: 0.7.0.284 +Version: 0.8.1 Release: 0 -%define libversion 0_7_0_284 +%define libversion 0_8_1 Summary: Osmocom library for the A-bis interface between BTS and BSC License: AGPL-3.0+ and GPL-2.0+ Group: Hardware/Mobile @@ -34,10 +34,10 @@ BuildRequires: libtool >= 2 BuildRequires: lksctp-tools-devel BuildRequires: pkg-config >= 0.20 BuildRequires: xz -BuildRequires: pkgconfig(libosmo-netif) >= 0.0.6.1 -BuildRequires: pkgconfig(libosmocore) >= 0.9.0.45 -BuildRequires: pkgconfig(libosmogsm) >= 0.9.5 -BuildRequires: pkgconfig(libosmovty) >= 0.3.0 +BuildRequires: pkgconfig(libosmo-netif) >= 0.1.0 +BuildRequires: pkgconfig(libosmocore) >= 0.10.0 +BuildRequires: pkgconfig(libosmogsm) >= 0.10.0 +BuildRequires: pkgconfig(libosmovty) >= 0.10.0 %description SCCP is a network layer protocol that provides extended routing, flow @@ -49,12 +49,6 @@ heavily used in cellular networks such as GSM. Summary: Osmocom Message Transfer Part library License: GPL-2.0+ Group: System/Libraries -%if "%version" == "0.7.0.284" -# Version 0.7.0.284 was wrongly packages in lib packages called 0_7_0_208 -# in order to have proper upgrade paths, we need to obsolete the old/wrong -# package name -Obsoletes: libosmo-mtp-0_7_0_208 -%endif %description -n libosmo-mtp-%libversion The Message Transfer Part (MTP) is part of the Signaling System 7 @@ -79,12 +73,6 @@ library. Summary: Osmocom Signalling Connection Control Part library License: GPL-2.0+ Group: System/Libraries -%if "%version" == "0.7.0.284" -# Version 0.7.0.284 was wrongly packages in lib packages called 0_7_0_208 -# in order to have proper upgrade paths, we need to obsolete the old/wrong -# package name -Obsoletes: libosmo-sccp-0_7_0_208 -%endif %description -n libosmo-sccp-%libversion The Signalling Connection Control Part (SCCP) is a network layer @@ -131,12 +119,6 @@ SIGTRAN library. Summary: Osmocom Message Transfer Part 2 User Adaptation library License: GPL-2.0+ Group: System/Libraries -%if "%version" == "0.7.0.284" -# Version 0.7.0.284 was wrongly packages in lib packages called 0_7_0_208 -# in order to have proper upgrade paths, we need to obsolete the old/wrong -# package name -Obsoletes: libosmo-xua-0_7_0_208 -%endif %description -n libosmo-xua-%libversion M2UA (RFC 3331) provides an SCTP (RFC 3873) adaptation layer for the @@ -168,12 +150,11 @@ autoreconf -fiv make %{?_smp_mflags} %install -b="%buildroot" -make %{?_smp_mflags} install DESTDIR="$b" -find "$b/%_libdir" -type f -name "*.la" -delete +%make_install +find "%buildroot/%_libdir" -type f -name "*.la" -delete %check -%ifarch ppc64 +%ifnarch ppc64 sparc64 s390x # still BE problems? make %{?_smp_mflags} check %endif