Jan Engelhardt 2014-10-02 20:37:02 +00:00 committed by Git OBS Bridge
parent f5b32989e4
commit 7d6ca2b8d6
5 changed files with 96 additions and 7 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:7507716562d0b5610abce38e325b64e81ef8fb1821b0be6b06eb2b1992e7f2ee
size 347268

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

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:125cb5ea2a46f06f0a2e631c3c800e0e45700a91c10731ecac5659b65f37540d
size 363004

View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Thu Oct 2 20:05:34 UTC 2014 - jengelh@inai.de
- Update to new upstream release 0.7.0
* No changelog was provided
* osmocore gained GPRS NS interface support, and now provides a
control interface library (libosmoctrl)
-------------------------------------------------------------------
Mon Jul 21 07:51:35 UTC 2014 - jengelh@inai.de

View File

@ -20,17 +20,18 @@ Name: libosmocore
Summary: Open Source Mobile Communications Core Library
License: GPL-2.0 and GPL-2.0+ and LGPL-3.0+ and AGPL-3.0+
Group: Productivity/Telephony/Utilities
Version: 0.6.6
Version: 0.7.0
Release: 0
Url: http://bb.osmocom.org/trac/wiki/libosmocore
#Git-Clone: git://git.osmocom.org/libosmocore
#Snapshot: 0.6.6
#Snapshot: 0.7.0
Source: %name-%version.tar.xz
Patch1: osmo-version.diff
Patch2: 0001-utils-resolve-compiler-warnings-on-implicit-declarat.patch
Patch3: osmo-talloc.diff
Patch4: osmo-talloc2.diff
Patch5: osmo-kasumi.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: autoconf
BuildRequires: automake >= 1.6
@ -118,6 +119,33 @@ between OpenBSC and OsmocomBB.
This subpackage contains libraries and header files for developing
applications that want to make use of libosmocore.
%package -n libosmoctrl0
Summary: Osmocom SNMP-like control interface library
License: GPL-2.0+
Group: System/Libraries
%description -n libosmoctrl0
libosmocore is a library with various utility functions shared
between OpenBSC and OsmocomBB.
libosmoctrl is an SNMP-like control interface. In contrast to the VTY
interface, the control interface is meant to be used by programs.
%package -n libosmoctrl-devel
Summary: Osmocom control interface library
License: GPL-2.0+
Group: Development/Libraries/C and C++
Requires: libosmocore-devel = %version
Requires: libosmoctrl0 = %version
Requires: libosmovty-devel = %version
%description -n libosmoctrl-devel
libosmoctrl is an SNMP-like control interface. In contrast to the VTY
interface, the control interface is meant to be used by programs.
This subpackage contains libraries and header files for developing
applications that want to make use of libosmoctrl.
%package -n libosmogb3
Summary: Osmocom GPRS Gb Interface (NS/BSSGP) library
License: AGPL-3.0+
@ -210,7 +238,7 @@ applications that want to make use of libosmovty.
%prep
%setup -qn %name
%patch -P 1 -P 2 -P 3 -P 4 -p1
%patch -P 1 -P 2 -P 3 -P 4 -P 5 -p1
%build
%if 0%{?use_system_talloc}
@ -227,12 +255,14 @@ make %{?_smp_mflags} install DESTDIR="$b"
find "$b/%_libdir" -type f -name "*.la" -delete
%check
make %{?_smp_mflags} check
make check
%post -n libosmocodec0 -p /sbin/ldconfig
%postun -n libosmocodec0 -p /sbin/ldconfig
%post -n libosmocore4 -p /sbin/ldconfig
%postun -n libosmocore4 -p /sbin/ldconfig
%post -n libosmoctrl0 -p /sbin/ldconfig
%postun -n libosmoctrl0 -p /sbin/ldconfig
%post -n libosmogb3 -p /sbin/ldconfig
%postun -n libosmogb3 -p /sbin/ldconfig
%post -n libosmogsm5 -p /sbin/ldconfig
@ -266,6 +296,17 @@ make %{?_smp_mflags} check
%_libdir/libosmocore.so
%_libdir/pkgconfig/libosmocore.pc
%files -n libosmoctrl0
%defattr(-,root,root)
%_libdir/libosmoctrl.so.0*
%files -n libosmoctrl-devel
%defattr(-,root,root)
%dir %_includedir/osmocom
%_includedir/osmocom/ctrl/
%_libdir/libosmoctrl.so
%_libdir/pkgconfig/libosmoctrl.pc
%files -n libosmogb3
%defattr(-,root,root)
%_libdir/libosmogb.so.3*

40
osmo-kasumi.diff Normal file
View File

@ -0,0 +1,40 @@
From 0929c5b1d3ae71fb600120fd5c60221495b8391c Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de>
Date: Thu, 2 Oct 2014 22:22:28 +0200
Subject: [PATCH] build: fix linker error with kasumi_test
When the osmocore package is configured with --disable-static,
building of kasumi_test fails. This seems quite legit, given
the function _kasumi_kgcore is not exported.
Don't try to workaround the build system. Include the code.
CCLD kasumi/kasumi_test
kasumi_test.o: In function `test_expansion':
~tests/kasumi/kasumi_test.c:25: undefined reference to `_kasumi_key_expand'
kasumi_test.o: In function `main':
~tests/kasumi/kasumi_test.c:56: undefined reference to `_kasumi'
~tests/kasumi/kasumi_test.c:100: undefined reference to `_kasumi_key_expand'
~tests/kasumi/kasumi_test.c:112: undefined reference to `_kasumi_kgcore'
[...]
---
tests/Makefile.am | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 8779c4f..3f7db1f 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -20,9 +20,8 @@ utils_utils_test_LDADD = $(top_builddir)/src/libosmocore.la
a5_a5_test_SOURCES = a5/a5_test.c
a5_a5_test_LDADD = $(top_builddir)/src/libosmocore.la $(top_builddir)/src/gsm/libosmogsm.la
-kasumi_kasumi_test_SOURCES = kasumi/kasumi_test.c
+kasumi_kasumi_test_SOURCES = kasumi/kasumi_test.c ../src/gsm/kasumi.c
kasumi_kasumi_test_LDADD = $(top_builddir)/src/libosmocore.la $(top_builddir)/src/gsm/libosmogsm.la
-kasumi_kasumi_test_LDFLAGS = -static
comp128_comp128_test_SOURCES = comp128/comp128_test.c
comp128_comp128_test_LDADD = $(top_builddir)/src/libosmocore.la $(top_builddir)/src/gsm/libosmogsm.la
--
2.0.0