diff --git a/_service b/_service index b9b35db..7fa89fe 100644 --- a/_service +++ b/_service @@ -1,13 +1,13 @@ - + git git://git.osmocom.org/libosmocore master @PARENT_TAG@.@TAG_OFFSET@ - + *.tar xz - + diff --git a/libosmocore-0.9.0.212.tar.xz b/libosmocore-0.9.0.212.tar.xz deleted file mode 100644 index cce6c90..0000000 --- a/libosmocore-0.9.0.212.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4a515486adb811d588b1ba7cec5af2651d06be3b298fb6fc08a040264b776224 -size 429128 diff --git a/libosmocore-0.9.6.400.tar.xz b/libosmocore-0.9.6.400.tar.xz new file mode 100644 index 0000000..4bdef31 --- /dev/null +++ b/libosmocore-0.9.6.400.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b2704dd3f39699d0da257896a53ab01b8e0acc4f728e0f80a8ca47389a467641 +size 529804 diff --git a/libosmocore.changes b/libosmocore.changes index 9a56b4e..03cece4 100644 --- a/libosmocore.changes +++ b/libosmocore.changes @@ -1,3 +1,36 @@ +------------------------------------------------------------------- +Mon Oct 2 22:37:48 UTC 2017 - jengelh@inai.de + +- Update to new upstream snapshot 0.9.6.400 + * vty: install 'exit', 'end',... commands on *all* nodes + * osmo-auc-gen: umts: add --ind-len arg + * osmo-auc-gen: umts: add --ind arg + * Add osmo_gprs_{ul,dl}_block_size_{bits,bytes} functions + * BSSGP: add function to reset all PTP BVC + * GSUP: define default GSUP port as 4222 + * gsup: Add encoding/decoding for the pdp charging characteristics + * Add missing BSSGP cause values + * gsm0808: fix length check of the element decoder functions + * Add header file with definitions for GSM TS 04.14 / 3GPP TS 44.014 + * Fix wrongful GSM FR codec SID frame detection in DTX. + * Distinguish between unsupported and invalid MCS + +------------------------------------------------------------------- +Fri Apr 28 20:26:26 UTC 2017 - jengelh@inai.de + +- Update to new upstream snapshot 0.9.6.193 + * fix: DLGSUP logging category "unusable" + * ph_data_param struct changed / Extend L1SAP PH-DATA with + measurement information. + * Size of ph_tch_param struct changed / Extend with RTP Marker + * Size of struct log_target changed / Extend with GSMTAP + * Internal API for GPRS cipher implementors updated to + accommodate for arbitrary key lengths. + * Extend L1SAP PH-DATA with presence information + * Fix the counter index after the NS reset. + * Fix rate_ctr attribute for GPRS NS counters. +- Remove test.diff (no longer applicable) + ------------------------------------------------------------------- Sat Jul 30 16:02:05 UTC 2016 - jengelh@inai.de diff --git a/libosmocore.spec b/libosmocore.spec index 1bd5117..43aa93e 100644 --- a/libosmocore.spec +++ b/libosmocore.spec @@ -1,7 +1,7 @@ # # spec file for package libosmocore # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,37 +16,31 @@ # -%define version_unconverted 0.9.0.212 +%define version_unconverted 0.9.6.400 Name: libosmocore -Version: 0.9.0.212 +Version: 0.9.6.400 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+ +License: GPL-2.0 and GPL-2.0+ and LGPL-2.1+ and AGPL-3.0+ Group: Productivity/Telephony/Utilities -Url: http://bb.osmocom.org/trac/wiki/libosmocore +Url: https://osmocom.org/projects/libosmocore/wiki/Libosmocore -#Git-Clone: git://git.osmocom.org/libosmocore Source: %name-%version.tar.xz Patch1: osmo-pkgconfig.diff -Patch2: test.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: autoconf BuildRequires: automake >= 1.6 -BuildRequires: gcc-c++ -BuildRequires: libtool -BuildRequires: pkg-config -BuildRequires: python +BuildRequires: libtool >= 2 +BuildRequires: pkg-config >= 0.20 BuildRequires: xz BuildRequires: pkgconfig(libpcsclite) -BuildRequires: pkgconfig(talloc) +BuildRequires: pkgconfig(talloc) >= 2.0.1 %description -libosmocore is a library with various utility functions that were +libosmocore is a package 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 -that we develop in the sphere of Free Software / Open Source mobile -communications. +that Osmocom develops w.r.t. mobile communications. There is no clear scope of it. It simply houses all code shared between OsmocomBB and OpenBSC to avoid code duplication. @@ -55,61 +49,84 @@ between OsmocomBB and OpenBSC to avoid code duplication. Summary: GSM utilities from the osmocore project License: GPL-2.0 and GPL-2.0+ and LGPL-3.0+ and AGPL-3.0+ Group: Productivity/Telephony/Utilities +Provides: %name-utils = %version-%release %description tools -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 -that we develop in the sphere of Free Software / Open Source mobile -communications. +libosmocore is a package with various utility functions that were +originally developed as part of the OpenBSC project. -This package contains GSM utilities from libosmocore. +This package contains a program for frequency calculation for GSM +called "osmo-arfcn", and a program called "osmo-auc-gen" that is used +for testing GSM authentication. %package -n libosmocodec0 -Summary: Library for Osmocom codec-related utilities +Summary: GSM 06.10, 06.20, 06.60, 06.90 codec library License: GPL-2.0+ Group: System/Libraries %description -n libosmocodec0 -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 -that we develop in the sphere of Free Software / Open Source mobile -communications. +The libosmocodec library contains an implementation of multiple +GSM codecs: + +* GSM 06.10 Full Rate (FR) codec +* GSM 06.20 Half Rate (HR) codec +* GSM 06.60 Enhanced Full Range (EFR) codec +* GSM 06.90 Adaptive Multi-Rate (AMR) codec %package -n libosmocodec-devel -Summary: Development files for the Osmocom codec library +Summary: Development files for the Osmocom GSM codec library License: GPL-2.0+ Group: Development/Libraries/C and C++ Requires: libosmocodec0 = %version %description -n libosmocodec-devel -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 -that we develop in the sphere of Free Software / Open Source mobile -communications. +The libosmocodec library contains an implementation of multiple +GSM codecs. This subpackage contains libraries and header files for developing applications that want to make use of libosmocodec. -%package -n libosmocore7 +%package -n libosmocoding0 +Summary: GSM/GPRS/EDGE transcoding routines library +License: GPL-2.0+ +Group: System/Libraries + +%description -n libosmocoding0 +libosmocoding is a library which provides GSM, GPRS and EDGE +transcoding routines. + +The following data types are currently supported: xCCH, PDTCH (CS 1-4 +and MCS 1-9), TCH/FR, TCH/HR, TCH/AFS, RCH/AHS, RACH and SCH. + +%package -n libosmocoding-devel +Summary: Development files for the Osmocom transcoding library +License: GPL-2.0+ +Group: Development/Libraries/C and C++ +Requires: libosmocoding0 = %version + +%description -n libosmocoding-devel +libosmocoding is a library which provides GSM, GPRS and EDGE +transcoding routines. + +This subpackage contains libraries and header files for developing +applications that want to make use of libosmocoding. + +%package -n libosmocore8 Summary: Osmocom core library +# crc16.c has GPL2-only clauses, the rest (*.c) is GPL-2.0+ License: GPL-2.0 and GPL-2.0+ Group: System/Libraries -# crc16.c has GPL2-only clauses, the rest (*.c) is GPL-2.0+ -# talloc.c (LGPL-3.0+) is not part of libosmocore.so -%description -n libosmocore7 +%description -n libosmocore8 libosmocore is a library with various utility functions shared between OpenBSC and OsmocomBB. %package -n libosmocore-devel Summary: Development files for the Osmocom core library +# crc16.h has GPL2-only clauses, the rest (*.h) is GPL-2.0+ License: GPL-2.0 and GPL-2.0+ Group: Development/Libraries/C and C++ -# crc16.h has GPL2-only clauses, the rest (*.h) is GPL-2.0+ -Requires: libosmocore7 = %version +Requires: libosmocore8 = %version Requires: libtalloc-devel %description -n libosmocore-devel @@ -125,8 +142,8 @@ License: GPL-2.0+ Group: System/Libraries %description -n libosmoctrl0 -libosmocore is a library with various utility functions shared -between OpenBSC and OsmocomBB. +libosmocore is a package with various utility functions that were +originally developed as part of the OpenBSC project. libosmoctrl is an SNMP-like control interface. In contrast to the VTY interface, the control interface is meant to be used by programs. @@ -152,11 +169,10 @@ License: AGPL-3.0+ Group: System/Libraries %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 -that we develop in the sphere of Free Software / Open Source mobile -communications. +libosmocore is a package with various utility functions that were +originally developed as part of the OpenBSC project. + +The libosmogb library contains a GPRS BSSGP protocol implementation. %package -n libosmogb-devel Summary: Development files for the Osmocom GPRS Gb interface library @@ -167,40 +183,39 @@ Requires: libosmogb4 = %version Requires: libosmogsm-devel = %version %description -n libosmogb-devel -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 -that we develop in the sphere of Free Software / Open Source mobile -communications. +The libosmogb library contains a GPRS BSSGP protocol implementation. This subpackage contains libraries and header files for developing applications that want to make use of libosmogb. -%package -n libosmogsm5 -Summary: Osmocom GSM core library +%package -n libosmogsm6 +Summary: Osmocom GSM utility library License: GPL-2.0+ and AGPL-3.0+ Group: System/Libraries -%description -n libosmogsm5 -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 -that we develop in the sphere of Free Software / Open Source mobile -communications. +%description -n libosmogsm6 +libosmocore is a package with various utility functions that were +originally developed as part of the OpenBSC project. + +The libosmogsm library in particular is a collection of common code +used in various GSM related sub-projects inside the Osmocom family of +projects. It includes A5/1 and A5/2 ciphers, COMP128v1, a LAPDm +implementation, a GSM TLV parser, SMS utility routines as well as +protocol definitions for a series of protocols. %package -n libosmogsm-devel -Summary: Development files for the Osmocom GSM core library +Summary: Development files for the Osmocom GSM utility library License: GPL-2.0+ and AGPL-3.0+ Group: Development/Libraries/C and C++ Requires: libosmocore-devel = %version -Requires: libosmogsm5 = %version +Requires: libosmogsm6 = %version %description -n libosmogsm-devel -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 -that we develop in the sphere of Free Software / Open Source mobile -communications. +The libosmogsm library in particular is a collection of common code +used in various GSM related sub-projects inside the Osmocom family of +projects. It includes A5/1 and A5/2 ciphers, COMP128v1, a LAPDm +implementation, a GSM TLV parser, SMS utility routines as well as +protocol definitions for a series of protocols. This subpackage contains libraries and header files for developing applications that want to make use of libosmogsm. @@ -211,11 +226,11 @@ License: GPL-2.0+ Group: System/Libraries %description -n libosmosim0 -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 -that we develop in the sphere of Free Software / Open Source mobile -communications. +libosmocore is a package with various utility functions that were +originally developed as part of the OpenBSC project. + +The libosmosim library in particular contains routines for SIM card +access. %package -n libosmosim-devel Summary: Development files for the Osmocom SIM card utility library @@ -225,11 +240,8 @@ Requires: libosmocore-devel = %version Requires: libosmosim0 = %version %description -n libosmosim-devel -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 -that we develop in the sphere of Free Software / Open Source mobile -communications. +The libosmosim library in particular contains routines for SIM card +access. This subpackage contains libraries and header files for developing applications that want to make use of libosmosim. @@ -240,11 +252,11 @@ License: GPL-2.0+ Group: System/Libraries %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 -that we develop in the sphere of Free Software / Open Source mobile -communications. +libosmocore is a package with various utility functions that were +originally developed as part of the OpenBSC project. + +The libosmovty library implements the interactive command-line on the +VTY (Virtual TTY), as well as configuration file parsing. %package -n libosmovty-devel Summary: Development files for the Osmocom VTY interface library @@ -254,25 +266,22 @@ Requires: libosmocore-devel = %version Requires: libosmovty3 = %version %description -n libosmovty-devel -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 -that we develop in the sphere of Free Software / Open Source mobile -communications. +The libosmovty library implements the interactive command-line on the +VTY (Virtual TTY), as well as configuration file parsing. This subpackage contains libraries and header files for developing applications that want to make use of libosmovty. %prep %setup -q -%patch -P 1 -P 2 -p1 +%patch -P 1 -p1 %build echo "%version" >.tarball-version autoreconf -fiv %configure --enable-shared --disable-static \ --includedir="%_includedir/%name" -make %{?_smp_mflags} +make %{?_smp_mflags} V=1 %install b="%buildroot" @@ -285,14 +294,16 @@ make %{?_smp_mflags} check || : %post -n libosmocodec0 -p /sbin/ldconfig %postun -n libosmocodec0 -p /sbin/ldconfig -%post -n libosmocore7 -p /sbin/ldconfig -%postun -n libosmocore7 -p /sbin/ldconfig +%post -n libosmocoding0 -p /sbin/ldconfig +%postun -n libosmocoding0 -p /sbin/ldconfig +%post -n libosmocore8 -p /sbin/ldconfig +%postun -n libosmocore8 -p /sbin/ldconfig %post -n libosmoctrl0 -p /sbin/ldconfig %postun -n libosmoctrl0 -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 libosmogsm6 -p /sbin/ldconfig +%postun -n libosmogsm6 -p /sbin/ldconfig %post -n libosmosim0 -p /sbin/ldconfig %postun -n libosmosim0 -p /sbin/ldconfig %post -n libosmovty3 -p /sbin/ldconfig @@ -314,9 +325,21 @@ make %{?_smp_mflags} check || : %_libdir/libosmocodec.so %_libdir/pkgconfig/libosmocodec.pc -%files -n libosmocore7 +%files -n libosmocoding0 %defattr(-,root,root) -%_libdir/libosmocore.so.7* +%_libdir/libosmocoding.so.0* + +%files -n libosmocoding-devel +%defattr(-,root,root) +%dir %_includedir/%name +%dir %_includedir/%name/osmocom +%_includedir/%name/osmocom/coding/ +%_libdir/libosmocoding.so +%_libdir/pkgconfig/libosmocoding.pc + +%files -n libosmocore8 +%defattr(-,root,root) +%_libdir/libosmocore.so.8* %files -n libosmocore-devel %defattr(-,root,root) @@ -350,9 +373,9 @@ make %{?_smp_mflags} check || : %_libdir/libosmogb.so %_libdir/pkgconfig/libosmogb.pc -%files -n libosmogsm5 +%files -n libosmogsm6 %defattr(-,root,root) -%_libdir/libosmogsm.so.5* +%_libdir/libosmogsm.so.6* %files -n libosmogsm-devel %defattr(-,root,root) @@ -384,6 +407,7 @@ make %{?_smp_mflags} check || : %dir %_includedir/%name %dir %_includedir/%name/osmocom %_includedir/%name/osmocom/vty/ +%_includedir/%name/osmo-release.mk %_libdir/libosmovty.so %_libdir/pkgconfig/libosmovty.pc diff --git a/osmo-pkgconfig.diff b/osmo-pkgconfig.diff index 9c0d4f0..c5c6034 100644 --- a/osmo-pkgconfig.diff +++ b/osmo-pkgconfig.diff @@ -6,16 +6,16 @@ Ensure all .pc files ARE installed. Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -Index: libosmocore/Makefile.am +Index: libosmocore-0.9.6.400/Makefile.am =================================================================== ---- libosmocore.orig/Makefile.am -+++ libosmocore/Makefile.am +--- libosmocore-0.9.6.400.orig/Makefile.am ++++ libosmocore-0.9.6.400/Makefile.am @@ -5,7 +5,7 @@ SUBDIRS = include src src/vty src/codec pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = libosmocore.pc libosmocodec.pc libosmovty.pc libosmogsm.pc \ -- libosmogb.pc libosmoctrl.pc -+ libosmogb.pc libosmoctrl.pc libosmosim.pc +- libosmogb.pc libosmoctrl.pc libosmocoding.pc ++ libosmogb.pc libosmoctrl.pc libosmocoding.pc libosmosim.pc + + @RELMAKE@ - BUILT_SOURCES = $(top_srcdir)/.version - $(top_srcdir)/.version: diff --git a/test.diff b/test.diff deleted file mode 100644 index 3fe853c..0000000 --- a/test.diff +++ /dev/null @@ -1,23 +0,0 @@ - -resolve this compile warning hinting about bad code: - -msgb/msgb_test.c:198:31: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast] - msgb_resize_area(msg, NULL, (int)msg->data, 0); - ---- - tests/msgb/msgb_test.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -Index: libosmocore/tests/msgb/msgb_test.c -=================================================================== ---- libosmocore.orig/tests/msgb/msgb_test.c -+++ libosmocore/tests/msgb/msgb_test.c -@@ -195,7 +195,7 @@ static void test_msgb_resize_area() - OSMO_ASSERT(e != 0); - - if (OSMO_PANIC_TRY(&e)) -- msgb_resize_area(msg, NULL, (int)msg->data, 0); -+ msgb_resize_area(msg, NULL, (intptr_t)msg->data, 0); - OSMO_ASSERT(e != 0); - - if (OSMO_PANIC_TRY(&e))