pool/libosmocore
SHA256
4
0
Fork 2
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- Update to new upstream release 0.9.0

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/network:telephony/libosmocore?expand=0&rev=28
This commit is contained in:
Jan Engelhardt 2015-12-23 17:31:46 +00:00 committed by Git OBS Bridge
parent 4ca439b276
commit 62eaf3e2f3
8 changed files with 51 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libosmocore-0.8.3.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:55f3514df80ca620b044ab39f04623b9d6b33a5e7a5064da406f7a815690cb6f
size 388212

3
libosmocore-0.9.0.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:4fcecc0a9a7208bd9a0f25914db3fdf322f4d9385bf0609d85c6042ad268b356
size 396644

12
libosmocore.changes
View File

@ -1,3 +1,15 @@
-------------------------------------------------------------------
Wed Dec 23 17:19:46 UTC 2015 - jengelh@inai.de
- Update to new upstream release 0.9.0
* ipaccess: add OAP proto_ext (in design).
* stats: Report stat item values
* stats: Implement timer based reporting
* stats/vty: Add stats configuration
* stat/vty: Add vty_out_statistics_full to show all statistics
* stats: Add vty_out_stat_item_group
- Drop osmo-symbols.diff (solved better upstream)
-------------------------------------------------------------------
Thu Sep 10 21:13:26 UTC 2015 - jengelh@inai.de

19
libosmocore.spec
View File

@ -17,7 +17,7 @@
Name: libosmocore
Version: 0.8.3
Version: 0.9.0
Release: 0
Summary: Open Source Mobile Communications Core Library
License: GPL-2.0 and GPL-2.0+ and LGPL-3.0+ and AGPL-3.0+
@ -31,7 +31,6 @@ Patch1: osmo-talloc.diff
Patch2: osmo-talloc2.diff
Patch3: osmo-talloc3.diff
Patch4: osmo-pkgconfig.diff
Patch5: osmo-symbols.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: autoconf
BuildRequires: automake >= 1.6
@ -238,12 +237,12 @@ communications.
This subpackage contains libraries and header files for developing
applications that want to make use of libosmosim.
%package -n libosmovty2
%package -n libosmovty3
Summary: Osmocom VTY interface library
License: GPL-2.0+
Group: System/Libraries
%description -n libosmovty2
%description -n libosmovty3
libosmocore is a library with various utility functions that were
originally developed as part of the OpenBSC project, but which are of
a more generic nature and thus useful to (at least) other programs
@ -255,7 +254,7 @@ Summary: Development files for the Osmocom VTY interface library
License: GPL-2.0+
Group: Development/Libraries/C and C++
Requires: libosmocore-devel = %version
Requires: libosmovty2 = %version
Requires: libosmovty3 = %version
%description -n libosmovty-devel
libosmocore is a library with various utility functions that were
@ -269,7 +268,7 @@ applications that want to make use of libosmovty.
%prep
%setup -qn %name
%patch -P 1 -P 2 -P 3 -P 4 -P 5 -p1
%patch -P 1 -P 2 -P 3 -P 4 -p1
%build
echo "%version" >.tarball-version
@ -297,8 +296,8 @@ make %{?_smp_mflags} check
%postun -n libosmogsm5 -p /sbin/ldconfig
%post -n libosmosim0 -p /sbin/ldconfig
%postun -n libosmosim0 -p /sbin/ldconfig
%post -n libosmovty2 -p /sbin/ldconfig
%postun -n libosmovty2 -p /sbin/ldconfig
%post -n libosmovty3 -p /sbin/ldconfig
%postun -n libosmovty3 -p /sbin/ldconfig
%files tools
%defattr(-,root,root)
@ -371,9 +370,9 @@ make %{?_smp_mflags} check
%_libdir/libosmosim.so
%_libdir/pkgconfig/libosmosim.pc
%files -n libosmovty2
%files -n libosmovty3
%defattr(-,root,root)
%_libdir/libosmovty.so.2*
%_libdir/libosmovty.so.3*
%files -n libosmovty-devel
%defattr(-,root,root)

21
osmo-symbols.diff
View File

@ -1,21 +0,0 @@
From: Jan Engelhardt
Date: 2015-09-10 23:14:05.272124041 +0200
Building the testsuite (with an overall ./configure --disable-static)
was broken by commit 0d727855686c9e857b608d7b8b22bfdf7c618b07.
---
src/gsm/libosmogsm.map | 2 ++
1 file changed, 2 insertions(+)
Index: libosmocore/src/gsm/libosmogsm.map
===================================================================
--- libosmocore.orig/src/gsm/libosmogsm.map
+++ libosmocore/src/gsm/libosmogsm.map
@@ -1,5 +1,7 @@
LIBOSMOGSM_1.0 {
global:
+/* testsuite uses this */
+_a5_3; _a5_4; _kasumi; _kasumi_kgcore; _kasumi_key_expand;
abis_nm_adm_state_names;
abis_nm_att_settable;

21
osmo-talloc.diff
View File

@ -14,22 +14,19 @@ when programs using libosmogsm are being built. Correct this issue.
collect2: error: ld returned 1 exit status
make[2]: *** [osmo-arfcn] Error 1
---
src/gsm/Makefile.am | 3 +++
src/gsm/Makefile.am | 3 +++
1 file changed, 3 insertions(+)
diff --git a/src/gsm/Makefile.am b/src/gsm/Makefile.am
index 828aa50..b0cdea2 100644
--- a/src/gsm/Makefile.am
+++ b/src/gsm/Makefile.am
@@ -24,5 +24,8 @@ libosmogsm_la_SOURCES = a5.c rxlev_stat.c tlv_parser.c comp128.c comp128v23.c \
Index: libosmocore/src/gsm/Makefile.am
===================================================================
--- libosmocore.orig/src/gsm/Makefile.am
+++ libosmocore/src/gsm/Makefile.am
@@ -28,5 +28,8 @@ libgsmint_la_LIBADD = ../libosmocore.la
libosmogsm_la_SOURCES =
libosmogsm_la_LDFLAGS = $(LTLDFLAGS_OSMOGSM) -version-info $(LIBVERSION) -no-undefined
libosmogsm_la_LIBADD = $(top_builddir)/src/libosmocore.la
libosmogsm_la_LIBADD = libgsmint.la
+if !ENABLE_TALLOC
+libosmogsm_la_LIBADD += -ltalloc
+libosmogsm_la_LIBADD += $(TALLOC_LIBS)
+endif
EXTRA_DIST = libosmogsm.map
--
2.0.0

32
osmo-talloc2.diff
View File

@ -26,7 +26,7 @@ Index: libosmocore/.gitignore
===================================================================
--- libosmocore.orig/.gitignore
+++ libosmocore/.gitignore
@@ -96,6 +96,7 @@ doc/html.tar
@@ -97,6 +97,7 @@ doc/html.tar
src/crc*gen.c
include/osmocom/core/crc*gen.h
include/osmocom/core/bit*gen.h
@ -75,7 +75,7 @@ Index: libosmocore/include/Makefile.am
===================================================================
--- libosmocore.orig/include/Makefile.am
+++ libosmocore/include/Makefile.am
@@ -94,8 +94,9 @@ if ENABLE_PLUGIN
@@ -96,8 +96,9 @@ if ENABLE_PLUGIN
nobase_include_HEADERS += osmocom/core/plugin.h
endif
@ -522,15 +522,15 @@ Index: libosmocore/src/gsm/Makefile.am
AM_CFLAGS = -Wall ${GCC_FVISIBILITY_HIDDEN}
# FIXME: this should eventually go into a milenage/Makefile.am
@@ -23,9 +24,6 @@ libosmogsm_la_SOURCES = a5.c rxlev_stat.
milenage/milenage.c gan.c ipa.c gsm0341.c apn.c
@@ -27,9 +28,6 @@ libgsmint_la_LIBADD = ../libosmocore.la
libosmogsm_la_SOURCES =
libosmogsm_la_LDFLAGS = $(LTLDFLAGS_OSMOGSM) -version-info $(LIBVERSION) -no-undefined
-libosmogsm_la_LIBADD = $(top_builddir)/src/libosmocore.la
-libosmogsm_la_LIBADD = libgsmint.la
-if !ENABLE_TALLOC
-libosmogsm_la_LIBADD += -ltalloc
-libosmogsm_la_LIBADD += $(TALLOC_LIBS)
-endif
+libosmogsm_la_LIBADD = $(top_builddir)/src/libosmocore.la $(TALLOC_LIBS)
+libosmogsm_la_LIBADD = libgsmint.la $(TALLOC_LIBS)
EXTRA_DIST = libosmogsm.map
Index: libosmocore/tests/Makefile.am
@ -543,7 +543,7 @@ Index: libosmocore/tests/Makefile.am
AM_CFLAGS = -Wall
check_PROGRAMS = timer/timer_test sms/sms_test ussd/ussd_test \
@@ -48,7 +48,7 @@ lapd_lapd_test_SOURCES = lapd/lapd_test.
@@ -49,7 +49,7 @@ lapd_lapd_test_SOURCES = lapd/lapd_test.
lapd_lapd_test_LDADD = $(top_builddir)/src/libosmocore.la $(top_builddir)/src/gsm/libosmogsm.la
msgfile_msgfile_test_SOURCES = msgfile/msgfile_test.c
@ -552,7 +552,7 @@ Index: libosmocore/tests/Makefile.am
smscb_smscb_test_SOURCES = smscb/smscb_test.c
smscb_smscb_test_LDADD = $(top_builddir)/src/libosmocore.la $(top_builddir)/src/gsm/libosmogsm.la
@@ -60,13 +60,13 @@ sms_sms_test_SOURCES = sms/sms_test.c
@@ -61,7 +61,7 @@ sms_sms_test_SOURCES = sms/sms_test.c
sms_sms_test_LDADD = $(top_builddir)/src/libosmocore.la $(top_builddir)/src/gsm/libosmogsm.la
timer_timer_test_SOURCES = timer/timer_test.c
@ -561,14 +561,16 @@ Index: libosmocore/tests/Makefile.am
ussd_ussd_test_SOURCES = ussd/ussd_test.c
ussd_ussd_test_LDADD = $(top_builddir)/src/libosmocore.la $(top_builddir)/src/gsm/libosmogsm.la
@@ -73,7 +73,7 @@ gb_gprs_bssgp_test_SOURCES = gb/gprs_bss
gb_gprs_bssgp_test_LDADD = $(top_builddir)/src/libosmocore.la $(top_builddir)/src/gb/libosmogb.la $(top_builddir)/src/vty/libosmovty.la $(LIBRARY_DL)
gb_bssgp_fc_test_SOURCES = gb/bssgp_fc_test.c
-gb_bssgp_fc_test_LDADD = $(top_builddir)/src/libosmocore.la $(top_builddir)/src/gb/libosmogb.la
+gb_bssgp_fc_test_LDADD = $(top_builddir)/src/libosmocore.la $(top_builddir)/src/gb/libosmogb.la $(TALLOC_LIBS)
gb_gprs_ns_test_SOURCES = gb/gprs_ns_test.c
-gb_gprs_ns_test_LDADD = $(top_builddir)/src/libosmocore.la $(top_builddir)/src/gb/libosmogb.la $(top_builddir)/src/vty/libosmovty.la $(LIBRARY_DL)
+gb_gprs_ns_test_LDADD = $(top_builddir)/src/libosmocore.la $(top_builddir)/src/gb/libosmogb.la $(top_builddir)/src/vty/libosmovty.la $(LIBRARY_DL) $(TALLOC_LIBS)
gb_gprs_bssgp_test_SOURCES = gb/gprs_bssgp_test.c
gb_gprs_bssgp_test_LDADD = $(top_builddir)/src/libosmocore.la $(top_builddir)/src/gb/libosmogb.la $(LIBRARY_DL)
@@ -84,10 +84,10 @@ loggingrb_loggingrb_test_SOURCES = loggi
logging_logging_test_SOURCES = logging/logging_test.c
logging_logging_test_LDADD = $(top_builddir)/src/libosmocore.la
@@ -85,10 +85,10 @@ loggingrb_loggingrb_test_SOURCES = loggi
loggingrb_loggingrb_test_LDADD = $(top_builddir)/src/libosmocore.la $(top_builddir)/src/vty/libosmovty.la
strrb_strrb_test_SOURCES = strrb/strrb_test.c

2
osmo-talloc3.diff
View File

@ -49,7 +49,7 @@ Index: libosmocore/include/Makefile.am
===================================================================
--- libosmocore.orig/include/Makefile.am
+++ libosmocore/include/Makefile.am
@@ -93,7 +93,7 @@ nobase_include_HEADERS += osmocom/core/p
@@ -97,7 +97,7 @@ nobase_include_HEADERS += osmocom/core/p
endif
nobase_nodist_include_HEADERS = osmocom/core/talloc.h