diff --git a/_service b/_service index 8ca4bb4..44bb8ec 100644 --- a/_service +++ b/_service @@ -2,8 +2,8 @@ git git://git.osmocom.org/libosmocore - 0.10.2 - 0.10.2 + 0.12.1 + 0.12.1 *.tar diff --git a/libosmocore-0.10.2.tar.xz b/libosmocore-0.10.2.tar.xz deleted file mode 100644 index 3b9f016..0000000 --- a/libosmocore-0.10.2.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6aa366b791f483ffc0e5206bbc7b043a3c83627bfef4e8b3e80ee697e0410863 -size 542900 diff --git a/libosmocore-0.12.1.tar.xz b/libosmocore-0.12.1.tar.xz new file mode 100644 index 0000000..12a0b6c --- /dev/null +++ b/libosmocore-0.12.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4fb0f2c42b4c9d4ae24b0fdf39d898b37df37177b043f1b240a2c31681e43359 +size 653156 diff --git a/libosmocore.changes b/libosmocore.changes index 77098f5..d1c87eb 100644 --- a/libosmocore.changes +++ b/libosmocore.changes @@ -1,3 +1,23 @@ +------------------------------------------------------------------- +Mon Aug 20 18:01:05 UTC 2018 - mardnh@gmx.de + +- Update to new upstream release 0.12.1 + * GnuTLS fall-back for obtaining randomness + * support for three-digit MNC throughout the code-base + * add talloc introspection via VTY + * tighter CRTL input parsing + * stricter VTY config file parsing + * allow to print only basename of source code file in logging + * print log level with color-keying of the level name + + See the following URLs for complete changelogs: + http://git.osmocom.org/libosmocore/plain/debian/changelog?h=0.12.1 + http://git.osmocom.org/libosmocore/plain/debian/changelog?h=0.12.0 + http://git.osmocom.org/libosmocore/plain/debian/changelog?h=0.11.0 + +- Remove patch: + * osmo-pkgconfig.diff (fixed upstream) + ------------------------------------------------------------------- Thu Mar 22 19:18:12 UTC 2018 - jengelh@inai.de diff --git a/libosmocore.spec b/libosmocore.spec index 6d30ebb..f9cf0a9 100644 --- a/libosmocore.spec +++ b/libosmocore.spec @@ -16,10 +16,10 @@ # -%define version_unconverted 0.10.2 +%define version_unconverted 0.12.1 Name: libosmocore -Version: 0.10.2 +Version: 0.12.1 Release: 0 Summary: The Open Source Mobile Communications Core Library License: GPL-2.0-only AND GPL-2.0-or-later AND LGPL-2.1-or-later AND AGPL-3.0-or-later @@ -27,13 +27,13 @@ Group: Productivity/Telephony/Utilities Url: https://osmocom.org/projects/libosmocore/wiki/Libosmocore Source: %name-%version.tar.xz -Patch1: osmo-pkgconfig.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: automake >= 1.6 BuildRequires: libtool >= 2 BuildRequires: pkg-config >= 0.20 BuildRequires: python BuildRequires: xz +BuildRequires: pkgconfig(gnutls) >= 2.12.0 BuildRequires: pkgconfig(libpcsclite) BuildRequires: pkgconfig(talloc) >= 2.0.1 @@ -113,13 +113,13 @@ transcoding routines. This subpackage contains libraries and header files for developing applications that want to make use of libosmocoding. -%package -n libosmocore9 +%package -n libosmocore11 Summary: Osmocom core library # crc16.c has GPL2-only clauses, the rest (*.c) is GPL-2.0+ License: GPL-2.0-only AND GPL-2.0-or-later Group: System/Libraries -%description -n libosmocore9 +%description -n libosmocore11 libosmocore is a library with various utility functions shared between OpenBSC and OsmocomBB. @@ -128,7 +128,7 @@ 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-only AND GPL-2.0-or-later Group: Development/Libraries/C and C++ -Requires: libosmocore9 = %version +Requires: libosmocore11 = %version Requires: libtalloc-devel %description -n libosmocore-devel @@ -165,12 +165,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 libosmogb5 +%package -n libosmogb6 Summary: Osmocom GPRS Gb Interface (NS/BSSGP) library License: AGPL-3.0-or-later Group: System/Libraries -%description -n libosmogb5 +%description -n libosmogb6 libosmocore is a package with various utility functions that were originally developed as part of the OpenBSC project. @@ -181,7 +181,7 @@ Summary: Development files for the Osmocom GPRS Gb interface library License: AGPL-3.0-or-later Group: Development/Libraries/C and C++ Requires: libosmocore-devel = %version -Requires: libosmogb5 = %version +Requires: libosmogb6 = %version Requires: libosmogsm-devel = %version %description -n libosmogb-devel @@ -190,12 +190,12 @@ 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 libosmogsm8 +%package -n libosmogsm10 Summary: Osmocom GSM utility library License: GPL-2.0-or-later AND AGPL-3.0-or-later Group: System/Libraries -%description -n libosmogsm8 +%description -n libosmogsm10 libosmocore is a package with various utility functions that were originally developed as part of the OpenBSC project. @@ -210,7 +210,7 @@ Summary: Development files for the Osmocom GSM utility library License: GPL-2.0-or-later AND AGPL-3.0-or-later Group: Development/Libraries/C and C++ Requires: libosmocore-devel = %version -Requires: libosmogsm8 = %version +Requires: libosmogsm10 = %version %description -n libosmogsm-devel The libosmogsm library in particular is a collection of common code @@ -276,7 +276,6 @@ applications that want to make use of libosmovty. %prep %setup -q -%patch -P 1 -p1 %build echo "%version" >.tarball-version @@ -291,21 +290,20 @@ make %{?_smp_mflags} install DESTDIR="$b" find "$b/%_libdir" -type f -name "*.la" -delete %check -# susceptible to timing issues -make %{?_smp_mflags} check || : +make %{?_smp_mflags} check || (find . -name testsuite.log -exec cat {} +) %post -n libosmocodec0 -p /sbin/ldconfig %postun -n libosmocodec0 -p /sbin/ldconfig %post -n libosmocoding0 -p /sbin/ldconfig %postun -n libosmocoding0 -p /sbin/ldconfig -%post -n libosmocore9 -p /sbin/ldconfig -%postun -n libosmocore9 -p /sbin/ldconfig +%post -n libosmocore11 -p /sbin/ldconfig +%postun -n libosmocore11 -p /sbin/ldconfig %post -n libosmoctrl0 -p /sbin/ldconfig %postun -n libosmoctrl0 -p /sbin/ldconfig -%post -n libosmogb5 -p /sbin/ldconfig -%postun -n libosmogb5 -p /sbin/ldconfig -%post -n libosmogsm8 -p /sbin/ldconfig -%postun -n libosmogsm8 -p /sbin/ldconfig +%post -n libosmogb6 -p /sbin/ldconfig +%postun -n libosmogb6 -p /sbin/ldconfig +%post -n libosmogsm10 -p /sbin/ldconfig +%postun -n libosmogsm10 -p /sbin/ldconfig %post -n libosmosim0 -p /sbin/ldconfig %postun -n libosmosim0 -p /sbin/ldconfig %post -n libosmovty4 -p /sbin/ldconfig @@ -339,9 +337,9 @@ make %{?_smp_mflags} check || : %_libdir/libosmocoding.so %_libdir/pkgconfig/libosmocoding.pc -%files -n libosmocore9 +%files -n libosmocore11 %defattr(-,root,root) -%_libdir/libosmocore.so.9* +%_libdir/libosmocore.so.11* %files -n libosmocore-devel %defattr(-,root,root) @@ -363,9 +361,9 @@ make %{?_smp_mflags} check || : %_libdir/libosmoctrl.so %_libdir/pkgconfig/libosmoctrl.pc -%files -n libosmogb5 +%files -n libosmogb6 %defattr(-,root,root) -%_libdir/libosmogb.so.5* +%_libdir/libosmogb.so.6* %files -n libosmogb-devel %defattr(-,root,root) @@ -375,9 +373,9 @@ make %{?_smp_mflags} check || : %_libdir/libosmogb.so %_libdir/pkgconfig/libosmogb.pc -%files -n libosmogsm8 +%files -n libosmogsm10 %defattr(-,root,root) -%_libdir/libosmogsm.so.8* +%_libdir/libosmogsm.so.10* %files -n libosmogsm-devel %defattr(-,root,root) diff --git a/osmo-pkgconfig.diff b/osmo-pkgconfig.diff deleted file mode 100644 index c5c6034..0000000 --- a/osmo-pkgconfig.diff +++ /dev/null @@ -1,21 +0,0 @@ -From: Jan Engelhardt -Date: 2015-03-01 02:09:23.272148046 +0100 - -Ensure all .pc files ARE installed. ---- - Makefile.am | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -Index: libosmocore-0.9.6.400/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 libosmocoding.pc -+ libosmogb.pc libosmoctrl.pc libosmocoding.pc libosmosim.pc - - @RELMAKE@ -