Hello community, here is the log from the commit of package libosmocore for openSUSE:Factory checked in at 2015-03-03 11:14:42 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libosmocore (Old) and /work/SRC/openSUSE:Factory/.libosmocore.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libosmocore" Changes: -------- --- /work/SRC/openSUSE:Factory/libosmocore/libosmocore.changes 2015-02-18 20:36:42.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libosmocore.new/libosmocore.changes 2015-03-03 11:14:46.000000000 +0100 @@ -1,0 +2,18 @@ +Sun Mar 1 01:10:34 UTC 2015 - [email protected] + +- Update to new upstream release 0.8.0 +* new Osmocom SIM card library +- Remove 0001-utils-resolve-compiler-warnings-on-implicit-declarat.patch, + libosmocore_0_7_0_avoid_smscb_test_failure.patch, + osmo-kasumi.diff, osmo-version.diff (no longer needed x4), + rework osmo-talloc2.diff and add osmo-talloc3.diff after upstream + conversion. Add osmo-pkgconfig.diff. + +------------------------------------------------------------------- +Wed Feb 18 16:07:32 UTC 2015 - [email protected] + +- remove the previous patch about ppc/ppc64 architectures + as upstream suggesting that known to be not supported + so explicitely add ExcludeArch in spec file. + +------------------------------------------------------------------- Old: ---- 0001-utils-resolve-compiler-warnings-on-implicit-declarat.patch libosmocore-0.7.0.tar.xz libosmocore_0_7_0_avoid_smscb_test_failure.patch osmo-kasumi.diff osmo-version.diff New: ---- libosmocore-0.8.0.tar.xz osmo-pkgconfig.diff osmo-talloc3.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libosmocore.spec ++++++ --- /var/tmp/diff_new_pack.O8v3Fv/_old 2015-03-03 11:14:47.000000000 +0100 +++ /var/tmp/diff_new_pack.O8v3Fv/_new 2015-03-03 11:14:47.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package libosmocore # -# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 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 @@ -17,31 +17,32 @@ Name: libosmocore +Version: 0.8.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+ Group: Productivity/Telephony/Utilities -Version: 0.7.0 -Release: 0 Url: http://bb.osmocom.org/trac/wiki/libosmocore #Git-Clone: git://git.osmocom.org/libosmocore -#Snapshot: 0.7.0 #Update osmo-version.diff too! 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 -Patch6: libosmocore_0_7_0_avoid_smscb_test_failure.patch +Patch1: osmo-talloc.diff +Patch2: osmo-talloc2.diff +Patch3: osmo-talloc3.diff +Patch4: osmo-pkgconfig.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: autoconf BuildRequires: automake >= 1.6 BuildRequires: gcc-c++ -BuildRequires: libtalloc-devel BuildRequires: libtool -BuildRequires: pkgconfig +BuildRequires: pkg-config BuildRequires: xz +BuildRequires: pkgconfig(libpcsclite) +BuildRequires: pkgconfig(talloc) +# do not try to build for big-endian archs +# as suggested by http://lists.osmocom.org/pipermail/baseband-devel/2015-February/000022.html +ExcludeArch: ppc ppc64 ppc64p7 mips mips64 %sparc s390 s390x %description libosmocore is a library with various utility functions that were @@ -95,14 +96,14 @@ This subpackage contains libraries and header files for developing applications that want to make use of libosmocodec. -%package -n libosmocore4 +%package -n libosmocore6 Summary: Osmocom core library 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 libosmocore4 +%description -n libosmocore6 libosmocore is a library with various utility functions shared between OpenBSC and OsmocomBB. @@ -111,7 +112,7 @@ 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: libosmocore4 = %version +Requires: libosmocore6 = %version Requires: libtalloc-devel %description -n libosmocore-devel @@ -207,12 +208,41 @@ This subpackage contains libraries and header files for developing applications that want to make use of libosmogsm. -%package -n libosmovty0 +%package -n libosmosim0 +Summary: Osmocom SIM card related utility library +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. + +%package -n libosmosim-devel +Summary: Development files for the Osmocom SIM card utility library +License: GPL-2.0+ +Group: Development/Libraries/C and C++ +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. + +This subpackage contains libraries and header files for developing +applications that want to make use of libosmosim. + +%package -n libosmovty1 Summary: Osmocom VTY interface library License: GPL-2.0+ Group: System/Libraries -%description -n libosmovty0 +%description -n libosmovty1 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 @@ -224,7 +254,7 @@ License: GPL-2.0+ Group: Development/Libraries/C and C++ Requires: libosmocore-devel = %version -Requires: libosmovty0 = %version +Requires: libosmovty1 = %version %description -n libosmovty-devel libosmocore is a library with various utility functions that were @@ -236,20 +266,14 @@ This subpackage contains libraries and header files for developing applications that want to make use of libosmovty. -%define use_system_talloc 1 - %prep %setup -qn %name -%patch -P 1 -P 2 -P 3 -P 4 -P 5 -p1 -%patch6 -p1 +%patch -P 1 -P 2 -P 3 -P 4 -p1 %build -%if 0%{?use_system_talloc} -echo "#include <talloc.h>" >include/osmocom/core/talloc.h -%endif +echo "%version" >.tarball-version autoreconf -fiv -%configure --enable-shared --disable-static \ - %{?use_system_talloc:--disable-talloc} +%configure --enable-shared --disable-static make %{?_smp_mflags} %install @@ -262,16 +286,18 @@ %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 libosmocore6 -p /sbin/ldconfig +%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 libosmogsm5 -p /sbin/ldconfig %postun -n libosmogsm5 -p /sbin/ldconfig -%post -n libosmovty0 -p /sbin/ldconfig -%postun -n libosmovty0 -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 %files tools %defattr(-,root,root) @@ -288,9 +314,9 @@ %_libdir/libosmocodec.so %_libdir/pkgconfig/libosmocodec.pc -%files -n libosmocore4 +%files -n libosmocore6 %defattr(-,root,root) -%_libdir/libosmocore.so.4* +%_libdir/libosmocore.so.6* %files -n libosmocore-devel %defattr(-,root,root) @@ -333,9 +359,20 @@ %_libdir/libosmogsm.so %_libdir/pkgconfig/libosmogsm.pc -%files -n libosmovty0 +%files -n libosmosim0 +%defattr(-,root,root) +%_libdir/libosmosim.so.0* + +%files -n libosmosim-devel +%defattr(-,root,root) +%dir %_includedir/osmocom/ +%_includedir/osmocom/sim/ +%_libdir/libosmosim.so +%_libdir/pkgconfig/libosmosim.pc + +%files -n libosmovty1 %defattr(-,root,root) -%_libdir/libosmovty.so.0* +%_libdir/libosmovty.so.1* %files -n libosmovty-devel %defattr(-,root,root) ++++++ libosmocore-0.7.0.tar.xz -> libosmocore-0.8.0.tar.xz ++++++ ++++ 6522 lines of diff (skipped) ++++++ osmo-pkgconfig.diff ++++++ From: Jan Engelhardt <[email protected]> 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/Makefile.am =================================================================== --- libosmocore.orig/Makefile.am +++ libosmocore/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 BUILT_SOURCES = $(top_srcdir)/.version $(top_srcdir)/.version: ++++++ osmo-talloc.diff ++++++ --- /var/tmp/diff_new_pack.O8v3Fv/_old 2015-03-03 11:14:47.000000000 +0100 +++ /var/tmp/diff_new_pack.O8v3Fv/_new 2015-03-03 11:14:47.000000000 +0100 @@ -1,11 +1,13 @@ -From 69015be0dfe88476d80895aa3261ab64223c664c Mon Sep 17 00:00:00 2001 +From c1d2d27e87686969b02f86475fe3fb4967ba5872 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt <[email protected]> Date: Sun, 17 Feb 2013 20:23:09 +0100 -Subject: [PATCH 2/4] build: resolve link failure in libosmogsm when +Subject: [PATCH 1/3] build: resolve link failure in libosmogsm when --disable-talloc is used -The link stage fails at some point. libosmogsm.so:lapd-core.c uses -talloc_free, but does not link to libtalloc.so. Correct this. +libosmogsm.so:lapd-core.c uses talloc_free unconditionally (like +libosmocore), but in the absence of the builtin talloc, does not link +to libtalloc.so (like libosmocore would). This causes linker failures +when programs using libosmogsm are being built. Correct this issue. CCLD osmo-arfcn ../src/gsm/.libs/libosmogsm.so: undefined reference to `talloc_free' @@ -16,15 +18,15 @@ 1 file changed, 3 insertions(+) diff --git a/src/gsm/Makefile.am b/src/gsm/Makefile.am -index 46698cd..c471b45 100644 +index 828aa50..b0cdea2 100644 --- a/src/gsm/Makefile.am +++ b/src/gsm/Makefile.am -@@ -23,5 +23,8 @@ libosmogsm_la_SOURCES = a5.c rxlev_stat.c tlv_parser.c comp128.c comp128v23.c \ +@@ -24,5 +24,8 @@ libosmogsm_la_SOURCES = a5.c rxlev_stat.c tlv_parser.c comp128.c comp128v23.c \ libosmogsm_la_LDFLAGS = $(LTLDFLAGS_OSMOGSM) -version-info $(LIBVERSION) -no-undefined libosmogsm_la_LIBADD = $(top_builddir)/src/libosmocore.la +if !ENABLE_TALLOC -+libosmogsm_la_LIBDADD = -ltalloc ++libosmogsm_la_LIBADD += -ltalloc +endif EXTRA_DIST = libosmogsm.map ++++++ osmo-talloc2.diff ++++++ ++++ 608 lines (skipped) ++++ between /work/SRC/openSUSE:Factory/libosmocore/osmo-talloc2.diff ++++ and /work/SRC/openSUSE:Factory/.libosmocore.new/osmo-talloc2.diff ++++++ osmo-talloc3.diff ++++++ >From d6c1607a724a07416c7d39f9b43f7af7349de666 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt <[email protected]> Date: Fri, 3 Oct 2014 12:14:17 +0200 Subject: [PATCH 2/2] build: default to system-provided talloc Rename the option --enable-talloc to --enable-internal-talloc, and then make disable-internal-talloc the default when nothing else is specified. --- configure.ac | 12 ++++++------ include/Makefile.am | 2 +- src/Makefile.am | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) Index: libosmocore/configure.ac =================================================================== --- libosmocore.orig/configure.ac +++ libosmocore/configure.ac @@ -94,14 +94,14 @@ if test "x$enable_pcsc" = "xyes" ; then fi AM_CONDITIONAL(ENABLE_PCSC, test "x$enable_pcsc" = "xyes") -AC_ARG_ENABLE(talloc, +AC_ARG_ENABLE([internal-talloc], [AS_HELP_STRING( - [--disable-talloc], + [--enable-internal-talloc], [Disable using bundled talloc memory allocator] )], - [enable_talloc=$enableval], [enable_talloc="yes"]) -AM_CONDITIONAL(ENABLE_TALLOC, [test x"$enable_talloc" = x"yes"]) -AS_IF([test x"$enable_talloc" = xno], + [internal_talloc=$enableval], [internal_talloc="no"]) +AM_CONDITIONAL([INTERNAL_TALLOC], [test x"$internal_talloc" = x"yes"]) +AS_IF([test x"$internal_talloc" = xno], [ PKG_CHECK_MODULES([TALLOC], [talloc]) OSMOCORE_INTERNAL_TALLOC=0 @@ -198,7 +198,7 @@ then AM_CONDITIONAL(ENABLE_MSGFILE, false) AM_CONDITIONAL(ENABLE_SERIAL, false) AM_CONDITIONAL(ENABLE_VTY, false) - AM_CONDITIONAL(ENABLE_TALLOC, false) + AM_CONDITIONAL([INTERNAL_TALLOC], [true]) AM_CONDITIONAL(ENABLE_UTILITIES, false) AM_CONDITIONAL(ENABLE_GB, false) AC_DEFINE([PANIC_INFLOOP],[1],[Use infinite loop on panic rather than fprintf/abort]) Index: libosmocore/include/Makefile.am =================================================================== --- libosmocore.orig/include/Makefile.am +++ libosmocore/include/Makefile.am @@ -93,7 +93,7 @@ nobase_include_HEADERS += osmocom/core/p endif nobase_nodist_include_HEADERS = osmocom/core/talloc.h -if ENABLE_TALLOC +if INTERNAL_TALLOC nobase_include_HEADERS += osmocom/core/talloc_int.h endif Index: libosmocore/src/Makefile.am =================================================================== --- libosmocore.orig/src/Makefile.am +++ libosmocore/src/Makefile.am @@ -27,7 +27,7 @@ else libosmocore_la_LDFLAGS = -version-info $(LIBVERSION) -no-undefined endif -if ENABLE_TALLOC +if INTERNAL_TALLOC libosmocore_la_SOURCES += talloc.c else libosmocore_la_LIBADD += $(TALLOC_LIBS) -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
