2015-09-10 21:27:26 +00:00
committed by Git OBS Bridge
parent a8dc1a5931
commit 4ca439b276
6 changed files with 60 additions and 26 deletions

View File

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

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

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

View File

@@ -1,3 +1,15 @@
-------------------------------------------------------------------
Thu Sep 10 21:13:26 UTC 2015 - jengelh@inai.de
- Update to new upstream release 0.8.3
* Add G-RNTI derived TLLI types defined in 23.003
* vty: Change API to have node installation be done by int
* ipa: Properly parse LV stream of a ID_GET request
* Add APN utility function to libosmogsm
* gsm: Add A5/3-4 cipher support
* bssgp: Handle BSSGP STATUS messages
- Add osmo-symbols.diff
-------------------------------------------------------------------
Sun Mar 1 01:10:34 UTC 2015 - jengelh@inai.de

View File

@@ -17,7 +17,7 @@
Name: libosmocore
Version: 0.8.0
Version: 0.8.3
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,6 +31,7 @@ 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
@@ -149,12 +150,12 @@ 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
%package -n libosmogb4
Summary: Osmocom GPRS Gb Interface (NS/BSSGP) library
License: AGPL-3.0+
Group: System/Libraries
%description -n libosmogb3
%description -n libosmogb4
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
@@ -166,7 +167,7 @@ Summary: Development files for the Osmocom GPRS Gb interface library
License: AGPL-3.0+
Group: Development/Libraries/C and C++
Requires: libosmocore-devel = %version
Requires: libosmogb3 = %version
Requires: libosmogb4 = %version
Requires: libosmogsm-devel = %version
%description -n libosmogb-devel
@@ -237,12 +238,12 @@ communications.
This subpackage contains libraries and header files for developing
applications that want to make use of libosmosim.
%package -n libosmovty1
%package -n libosmovty2
Summary: Osmocom VTY interface library
License: GPL-2.0+
Group: System/Libraries
%description -n libosmovty1
%description -n libosmovty2
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
@@ -254,7 +255,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: libosmovty1 = %version
Requires: libosmovty2 = %version
%description -n libosmovty-devel
libosmocore is a library with various utility functions that were
@@ -268,7 +269,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
echo "%version" >.tarball-version
@@ -290,14 +291,14 @@ make %{?_smp_mflags} check
%postun -n libosmocore6 -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 libosmogb4 -p /sbin/ldconfig
%postun -n libosmogb4 -p /sbin/ldconfig
%post -n libosmogsm5 -p /sbin/ldconfig
%postun -n libosmogsm5 -p /sbin/ldconfig
%post -n libosmosim0 -p /sbin/ldconfig
%postun -n libosmosim0 -p /sbin/ldconfig
%post -n libosmovty1 -p /sbin/ldconfig
%postun -n libosmovty1 -p /sbin/ldconfig
%post -n libosmovty2 -p /sbin/ldconfig
%postun -n libosmovty2 -p /sbin/ldconfig
%files tools
%defattr(-,root,root)
@@ -336,9 +337,9 @@ make %{?_smp_mflags} check
%_libdir/libosmoctrl.so
%_libdir/pkgconfig/libosmoctrl.pc
%files -n libosmogb3
%files -n libosmogb4
%defattr(-,root,root)
%_libdir/libosmogb.so.3*
%_libdir/libosmogb.so.4*
%files -n libosmogb-devel
%defattr(-,root,root)
@@ -370,9 +371,9 @@ make %{?_smp_mflags} check
%_libdir/libosmosim.so
%_libdir/pkgconfig/libosmosim.pc
%files -n libosmovty1
%files -n libosmovty2
%defattr(-,root,root)
%_libdir/libosmovty.so.1*
%_libdir/libosmovty.so.2*
%files -n libosmovty-devel
%defattr(-,root,root)

21
osmo-symbols.diff Normal file
View File

@@ -0,0 +1,21 @@
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;

View File

@@ -75,7 +75,7 @@ Index: libosmocore/include/Makefile.am
===================================================================
--- libosmocore.orig/include/Makefile.am
+++ libosmocore/include/Makefile.am
@@ -92,8 +92,9 @@ if ENABLE_PLUGIN
@@ -94,8 +94,9 @@ if ENABLE_PLUGIN
nobase_include_HEADERS += osmocom/core/plugin.h
endif
@@ -523,7 +523,7 @@ Index: libosmocore/src/gsm/Makefile.am
# 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
milenage/milenage.c gan.c ipa.c gsm0341.c apn.c
libosmogsm_la_LDFLAGS = $(LTLDFLAGS_OSMOGSM) -version-info $(LIBVERSION) -no-undefined
-libosmogsm_la_LIBADD = $(top_builddir)/src/libosmocore.la
@@ -538,12 +538,12 @@ Index: libosmocore/tests/Makefile.am
--- libosmocore.orig/tests/Makefile.am
+++ libosmocore/tests/Makefile.am
@@ -1,4 +1,4 @@
-AM_CPPFLAGS = -I$(top_srcdir)/include
+AM_CPPFLAGS = -I$(top_srcdir)/include $(TALLOC_CFLAGS)
-AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include
+AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include $(TALLOC_CFLAGS)
AM_CFLAGS = -Wall
check_PROGRAMS = timer/timer_test sms/sms_test ussd/ussd_test \
@@ -46,7 +46,7 @@ lapd_lapd_test_SOURCES = lapd/lapd_test.
@@ -48,7 +48,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
@@ -58,13 +58,13 @@ sms_sms_test_SOURCES = sms/sms_test.c
@@ -60,13 +60,13 @@ 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
@@ -568,7 +568,7 @@ Index: libosmocore/tests/Makefile.am
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)
@@ -82,10 +82,10 @@ loggingrb_loggingrb_test_SOURCES = loggi
@@ -84,10 +84,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