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

Accepting request 355542 from network:telephony

Browse Source 
- Update to new upstream snapshot 0.7.0.11

OBS-URL: https://build.opensuse.org/request/show/355542
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libosmo-sccp?expand=0&rev=3
This commit is contained in:
Dominique Leuenberger 2016-02-01 18:55:36 +00:00 committed by Git OBS Bridge
commit 00f5de64e5
5 changed files with 105 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

91
0001-build-fixes.patch
View File

@ -1,4 +1,4 @@
From 155761a550f09a074f960deb2e65dc8724465714 Mon Sep 17 00:00:00 2001 From f34a36b94185f377639c7c997dcdd2453fc23574 Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de> From: Jan Engelhardt <jengelh@inai.de>
Date: Mon, 21 Jul 2014 10:13:00 +0200 Date: Mon, 21 Jul 2014 10:13:00 +0200
Subject: [PATCH] build: fixes Subject: [PATCH] build: fixes
@ -8,35 +8,33 @@ 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 | 4 +++- configure.ac | 3 ++-
libosmo-mtp.pc.in | 2 +- libosmo-mtp.pc.in | 2 +-
libosmo-sccp.pc.in | 2 +- libosmo-sccp.pc.in | 2 +-
src/Makefile.am | 12 ++++++++---- src/Makefile.am | 14 +++++++++-----
tests/m2ua/Makefile.am | 2 +- tests/m2ua/Makefile.am | 2 +-
tests/sccp/Makefile.am | 4 ++-- tests/sccp/Makefile.am | 4 ++--
6 files changed, 16 insertions(+), 10 deletions(-) 6 files changed, 16 insertions(+), 11 deletions(-)
diff --git a/configure.ac b/configure.ac Index: libosmo-sccp/configure.ac
index 49c5f7e..2f9d29a 100644 ===================================================================
--- a/configure.ac --- libosmo-sccp.orig/configure.ac
+++ b/configure.ac +++ libosmo-sccp/configure.ac
@@ -13,9 +13,11 @@ dnl checks for programs @@ -14,8 +14,9 @@ AC_PROG_MAKE_SET
AC_PROG_MAKE_SET
AC_PROG_CC AC_PROG_CC
AC_PROG_INSTALL AC_PROG_INSTALL
-AC_PROG_RANLIB LT_INIT
+LT_INIT -AC_PROG_LIBTOOL
PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 0.3.0)
+PKG_CHECK_MODULES([LIBOSMOGSM], [libosmogsm]) +PKG_CHECK_MODULES([LIBOSMOGSM], [libosmogsm])
+PKG_CHECK_MODULES([TALLOC], [talloc]) +PKG_CHECK_MODULES([TALLOC], [talloc])
PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 0.3.0)
PKG_CHECK_MODULES(LIBOSMONETIF, libosmo-netif >= 0.0.6)
# The following test is taken from WebKit's webkit.m4 Index: libosmo-sccp/libosmo-mtp.pc.in
saved_CFLAGS="$CFLAGS" ===================================================================
diff --git a/libosmo-mtp.pc.in b/libosmo-mtp.pc.in --- libosmo-sccp.orig/libosmo-mtp.pc.in
index 675d0d3..5e99dd3 100644 +++ libosmo-sccp/libosmo-mtp.pc.in
--- a/libosmo-mtp.pc.in
+++ b/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
@ -44,10 +42,10 @@ index 675d0d3..5e99dd3 100644
-Libs: -L${libdir} -lmtp -Libs: -L${libdir} -lmtp
+Libs: -L${libdir} -losmo-mtp +Libs: -L${libdir} -losmo-mtp
Cflags: -I${includedir}/ Cflags: -I${includedir}/
diff --git a/libosmo-sccp.pc.in b/libosmo-sccp.pc.in Index: libosmo-sccp/libosmo-sccp.pc.in
index eda8d49..9dd18c1 100644 ===================================================================
--- a/libosmo-sccp.pc.in --- libosmo-sccp.orig/libosmo-sccp.pc.in
+++ b/libosmo-sccp.pc.in +++ libosmo-sccp/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
@ -55,12 +53,12 @@ index eda8d49..9dd18c1 100644
-Libs: -L${libdir} -lsccp -Libs: -L${libdir} -lsccp
+Libs: -L${libdir} -losmo-sccp +Libs: -L${libdir} -losmo-sccp
Cflags: -I${includedir}/ Cflags: -I${includedir}/
diff --git a/src/Makefile.am b/src/Makefile.am Index: libosmo-sccp/src/Makefile.am
index fa47e85..815fb8c 100644 ===================================================================
--- a/src/Makefile.am --- libosmo-sccp.orig/src/Makefile.am
+++ b/src/Makefile.am +++ libosmo-sccp/src/Makefile.am
@@ -2,8 +2,12 @@ AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include -I$(top_builddir) @@ -4,15 +4,19 @@ AM_CFLAGS=-Wall $(LIBOSMOCORE_CFLAGS) $(
AM_CFLAGS=-Wall $(LIBOSMOCORE_CFLAGS) # Legacy static libs
sccpdir = $(libdir) sccpdir = $(libdir)
-sccp_LIBRARIES = libsccp.a libmtp.a libxua.a -sccp_LIBRARIES = libsccp.a libmtp.a libxua.a
@ -72,24 +70,32 @@ index fa47e85..815fb8c 100644
+libosmo_sccp_la_SOURCES = sccp.c +libosmo_sccp_la_SOURCES = sccp.c
+libosmo_mtp_la_SOURCES = mtp_pcap.c +libosmo_mtp_la_SOURCES = mtp_pcap.c
+libosmo_xua_la_SOURCES = xua_msg.c +libosmo_xua_la_SOURCES = xua_msg.c
# ensure that the file for the static lib is built with different C
# flags, working around automake complaining that xua_msg.o is built
# both with libtool (below) and without (here)
-libxua_a_CPPFLAGS = $(AM_CPPFLAGS) -DDUMMY -UDUMMY
+libosmo_xua_la_CPPFLAGS = ${AM_CPPFLAGS} -DDUMMY -UDUMMY
+ +
+libosmo_sccp_la_LDFLAGS = -release ${PACKAGE_VERSION} +libosmo_sccp_la_LDFLAGS = -release ${PACKAGE_VERSION}
+libosmo_mtp_la_LDFLAGS = -release ${PACKAGE_VERSION} +libosmo_mtp_la_LDFLAGS = -release ${PACKAGE_VERSION}
+libosmo_xua_la_LDFLAGS = -release ${PACKAGE_VERSION} +libosmo_xua_la_LDFLAGS = -release ${PACKAGE_VERSION}
diff --git a/tests/m2ua/Makefile.am b/tests/m2ua/Makefile.am
index 33618ef..a04145f 100644
--- a/tests/m2ua/Makefile.am # New shared lib
+++ b/tests/m2ua/Makefile.am Index: libosmo-sccp/tests/m2ua/Makefile.am
===================================================================
--- libosmo-sccp.orig/tests/m2ua/Makefile.am
+++ libosmo-sccp/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}
diff --git a/tests/sccp/Makefile.am b/tests/sccp/Makefile.am Index: libosmo-sccp/tests/sccp/Makefile.am
index 8cce20c..50624ce 100644 ===================================================================
--- a/tests/sccp/Makefile.am --- libosmo-sccp.orig/tests/sccp/Makefile.am
+++ b/tests/sccp/Makefile.am +++ libosmo-sccp/tests/sccp/Makefile.am
@@ -1,4 +1,4 @@ @@ -1,4 +1,4 @@
-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_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include ${TALLOC_CFLAGS}
@ -103,6 +109,3 @@ index 8cce20c..50624ce 100644
-sccp_test_LDADD = $(LIBOSMOCORE_LIBS) -sccp_test_LDADD = $(LIBOSMOCORE_LIBS)
+sccp_test_LDADD = $(LIBOSMOCORE_LIBS) ${TALLOC_LIBS} +sccp_test_LDADD = $(LIBOSMOCORE_LIBS) ${TALLOC_LIBS}
--
2.4.3

3
libosmo-sccp-0.7.0.11.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:2c2c91f70c1a6534a58716f44a68f08f7c003c7c38e7589372bdcfdb758b9f51
size 45664

3
libosmo-sccp-0.7.0.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:9a1923984890b26f50e624101112c7a6bbfdeb11ae43f40a4a7400961df64a5f
size 36260

8
libosmo-sccp.changes
View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Fri Jan 22 18:33:36 UTC 2016 - jengelh@inai.de
- Update to new upstream snapshot 0.7.0.11
* Add missing OSMO_SCCP_SSN_RANAP for RANAP SSN
* Properly define SCCP_SAP_USER without random magic number
* Import SUA (SCCP User Adaptation) and SCCP User SAP
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Sep 10 21:34:08 UTC 2015 - jengelh@inai.de Thu Sep 10 21:34:08 UTC 2015 - jengelh@inai.de

58
libosmo-sccp.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package libosmo-sccp # spec file for package libosmo-sccp
# #
# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
# #
# 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
@ -17,25 +17,28 @@
Name: libosmo-sccp Name: libosmo-sccp
Version: 0.7.0.11
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+ and GPL-2.0+ License: AGPL-3.0+ and GPL-2.0+
Group: Development/Libraries/C and C++ Group: Hardware/Mobile
Version: 0.7.0
Release: 0
Url: http://openbsc.osmocom.org/ Url: http://openbsc.osmocom.org/
#Git-Clone: git://git.osmocom.org/libosmo-sccp #Git-Clone: git://git.osmocom.org/libosmo-sccp
#Snapshot: 0.7.0 #Snapshot: 0.7.0-11-gf440267 (--tags)
Source: %name-%version.tar.xz Source: %name-%version.tar.xz
Patch1: 0001-build-fixes.patch Patch1: 0001-build-fixes.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: autoconf BuildRequires: autoconf
BuildRequires: automake >= 1.6 BuildRequires: automake >= 1.6
BuildRequires: libtool BuildRequires: libtool
BuildRequires: lksctp-tools-devel
BuildRequires: pkg-config BuildRequires: pkg-config
BuildRequires: xz BuildRequires: xz
BuildRequires: pkgconfig(libosmocore) >= 0.3.0 BuildRequires: pkgconfig(libosmo-netif) >= 0.0.6.1
BuildRequires: pkgconfig(libosmocore) >= 0.9.0.45
BuildRequires: pkgconfig(libosmogsm) BuildRequires: pkgconfig(libosmogsm)
BuildRequires: pkgconfig(libosmovty)
BuildRequires: pkgconfig(talloc) BuildRequires: pkgconfig(talloc)
%description %description
@ -55,6 +58,7 @@ across an IP network.
Summary: Development files for the Osmocom M2UA library Summary: Development files for the Osmocom M2UA library
License: AGPL-3.0+ License: AGPL-3.0+
Group: Development/Libraries/C and C++ Group: Development/Libraries/C and C++
Requires: libosmo-sigtran-devel = %version
Requires: libosmo-xua-0_7_0 = %version Requires: libosmo-xua-0_7_0 = %version
%description -n libosmo-xua-devel %description -n libosmo-xua-devel
@ -114,6 +118,22 @@ 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-sigtran0
Summary: Osmocom SIGTRAN library
License: AGPL-3.0+
Group: System/Libraries
%description -n libosmo-sigtran0
Osmocom implementation of (parts of) SIGTRAN.
%package -n libosmo-sigtran-devel
Summary: Development files for the Osmocom sigtran library
License: AGPL-3.0+
Group: Development/Libraries/C and C++
Requires: libosmo-sigtran0 = %version
%description -n libosmo-sigtran-devel
%prep %prep
%setup -qn %name %setup -qn %name
%patch -P 1 -p1 %patch -P 1 -p1
@ -121,7 +141,7 @@ library.
%build %build
echo "%version" >.tarball-version echo "%version" >.tarball-version
autoreconf -fiv autoreconf -fiv
%configure --enable-shared --disable-static %configure --enable-shared --disable-static --includedir="%_includedir/%name"
make %{?_smp_mflags} make %{?_smp_mflags}
%install %install
@ -145,8 +165,6 @@ make %{?_smp_mflags} check
%files -n libosmo-xua-devel %files -n libosmo-xua-devel
%defattr(-,root,root) %defattr(-,root,root)
%dir %_includedir/osmocom
%_includedir/osmocom/sigtran/
%_libdir/libosmo-xua.so %_libdir/libosmo-xua.so
%files -n libosmo-mtp-0_7_0 %files -n libosmo-mtp-0_7_0
@ -155,8 +173,9 @@ make %{?_smp_mflags} check
%files -n libosmo-mtp-devel %files -n libosmo-mtp-devel
%defattr(-,root,root) %defattr(-,root,root)
%dir %_includedir/osmocom %dir %_includedir/%name
%_includedir/osmocom/mtp/ %dir %_includedir/%name/osmocom
%_includedir/%name/osmocom/mtp/
%_libdir/libosmo-mtp.so %_libdir/libosmo-mtp.so
%_libdir/pkgconfig/libosmo-mtp.pc %_libdir/pkgconfig/libosmo-mtp.pc
@ -167,8 +186,21 @@ make %{?_smp_mflags} check
%files -n libosmo-sccp-devel %files -n libosmo-sccp-devel
%defattr(-,root,root) %defattr(-,root,root)
%dir %_includedir/osmocom %dir %_includedir/%name
%_includedir/osmocom/sccp/ %dir %_includedir/%name/osmocom
%_includedir/%name/osmocom/sccp/
%_libdir/pkgconfig/libosmo-sccp.pc %_libdir/pkgconfig/libosmo-sccp.pc
%files -n libosmo-sigtran0
%defattr(-,root,root)
%_libdir/libosmo-sigtran.so.0*
%files -n libosmo-sigtran-devel
%defattr(-,root,root)
%dir %_includedir/%name
%dir %_includedir/%name/osmocom
%_includedir/%name/osmocom/sigtran/
%_libdir/libosmo-sigtran.so
%_libdir/pkgconfig/libosmo-sigtran.pc
%changelog %changelog