Hello community,

here is the log from the commit of package libosmocore for openSUSE:Factory 
checked in at 2013-07-01 16:57:29
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libosmocore (Old)
 and      /work/SRC/openSUSE:Factory/.libosmocore.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "libosmocore"

Changes:
--------
New Changes file:

--- /dev/null   2013-06-28 09:24:09.524034006 +0200
+++ /work/SRC/openSUSE:Factory/.libosmocore.new/libosmocore.changes     
2013-07-01 16:57:30.000000000 +0200
@@ -0,0 +1,20 @@
+-------------------------------------------------------------------
+Sun Jun  2 23:08:13 UTC 2013 - jeng...@inai.de
+
+- Update to new upstream release 0.6.0
+* No changelog was provided
+- Add 0001-osmo-arfcn-Return-something-from-the-method.patch
+  from upstream to provide fix for rpmlint errors
+- Add 0001-utils-resolve-compiler-warnings-on-implicit-declarat.patch,
+  0002-utils-avoid-breaking-strict-aliasing.patch to fix rpmlint
+  warnings
+
+-------------------------------------------------------------------
+Sun Feb 17 19:17:54 UTC 2013 - jeng...@inai.de
+
+- Initial package (version 0.5.3) for build.opensuse.org
+
+-------------------------------------------------------------------
+Mon Oct 10 12:14:16 UTC 2011 - jeng...@medozas.de
+
+- Initial prototype (version 0.3.10)

New:
----
  0001-osmo-arfcn-Return-something-from-the-method.patch
  0001-utils-resolve-compiler-warnings-on-implicit-declarat.patch
  0002-utils-avoid-breaking-strict-aliasing.patch
  libosmocore-0.6.0.tar.xz
  libosmocore.changes
  libosmocore.spec
  osmo-talloc.diff
  osmo-talloc2.diff
  osmo-version.diff

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ libosmocore.spec ++++++
#
# spec file for package libosmocore
#
# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
# upon. The license for this file, and modifications and additions to the
# file, is the same license as for the pristine package itself (unless the
# license for the pristine package is not an Open Source License, in which
# case the license is the MIT License). An "Open Source License" is a
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.

# Please submit bugfixes or comments via http://bugs.opensuse.org/
#


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.0
Release:        0
Url:            http://bb.osmocom.org/trac/wiki/libosmocore

#Git-Clone:     git://git.osmocom.org/libosmocore
# Source created from tag "0.6.0" (commit 
533f63f15aa584eec73044802e0a8bc798a313fe)
Source:         %name-%version.tar.xz
Patch1:         osmo-version.diff
Patch2:         osmo-talloc.diff
Patch3:         osmo-talloc2.diff
Patch4:         0001-osmo-arfcn-Return-something-from-the-method.patch
Patch5:         0001-utils-resolve-compiler-warnings-on-implicit-declarat.patch
Patch6:         0002-utils-avoid-breaking-strict-aliasing.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-build
BuildRequires:  autoconf
BuildRequires:  automake >= 1.6
BuildRequires:  gcc-c++
BuildRequires:  libtalloc-devel
BuildRequires:  libtool
BuildRequires:  pkgconfig
BuildRequires:  xz

%description
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.

There is no clear scope of it. It simply houses all code shared
between OsmocomBB and OpenBSC to avoid code duplication.

%package tools
Summary:        GSM utilities from the osmocore project
Group:          Productivity/Telephony/Utilities

%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.

This package contains GSM utilities from libosmocore.

%package -n libosmocodec0
Summary:        Library for Osmocom codec-related utilities
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.

%package -n libosmocodec-devel
Summary:        Development files for the Osmocom 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.

This subpackage contains libraries and header files for developing
applications that want to make use of libosmocodec.

%package -n libosmocore4
Summary:        Osmocom core library
License:        GPL-2.0 and GPL-2.0+
# crc16.c has GPL2-only clauses, the rest (*.c) is GPL-2.0+
# talloc.c (LGPL-3.0+) is not part of libosmocore.so
Group:          System/Libraries

%description -n libosmocore4
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
License:        GPL-2.0 and GPL-2.0+
# crc16.h has GPL2-only clauses, the rest (*.h) is GPL-2.0+
Group:          Development/Libraries/C and C++
Requires:       libosmocore4 = %version
Requires:       libtalloc-devel

%description -n libosmocore-devel
libosmocore is a library with various utility functions shared
between OpenBSC and OsmocomBB.

This subpackage contains libraries and header files for developing
applications that want to make use of libosmocore.

%package -n libosmogb2
Summary:        Osmocom GPRS Gb Interface (NS/BSSGP) library
License:        AGPL-3.0+
Group:          System/Libraries

%description -n libosmogb2
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 libosmogb-devel
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:       libosmogb2 = %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.

This subpackage contains libraries and header files for developing
applications that want to make use of libosmogb.

%package -n libosmogsm3
Summary:        Osmocom GSM core library
License:        GPL-2.0+ and AGPL-3.0+
Group:          System/Libraries

%description -n libosmogsm3
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 libosmogsm-devel
Summary:        Development files for the Osmocom GSM core library
License:        GPL-2.0+ and AGPL-3.0+
Group:          Development/Libraries/C and C++
Requires:       libosmocore-devel = %version
Requires:       libosmogsm3 = %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.

This subpackage contains libraries and header files for developing
applications that want to make use of libosmogsm.

%package -n libosmovty0
Summary:        Osmocom VTY interface library
License:        GPL-2.0+
Group:          System/Libraries

%description -n libosmovty0
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 libosmovty-devel
Summary:        Development files for the Osmocom VTY interface library
License:        GPL-2.0+
Group:          Development/Libraries/C and C++
Requires:       libosmocore-devel = %version
Requires:       libosmovty0 = %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.

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 -P 6 -p1

%build
%if 0%{?use_system_talloc}
echo "#include <talloc.h>" >include/osmocom/core/talloc.h
%endif
autoreconf -fiv
%configure --enable-shared --disable-static \
        %{?use_system_talloc:--disable-talloc}
make %{?_smp_mflags}

%install
b="%buildroot"
make %{?_smp_mflags} install DESTDIR="$b"
find "$b/%_libdir" -type f -name "*.la" -delete

%check
make %{?_smp_mflags} 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 libosmogb2 -p /sbin/ldconfig
%postun -n libosmogb2 -p /sbin/ldconfig
%post   -n libosmogsm3 -p /sbin/ldconfig
%postun -n libosmogsm3 -p /sbin/ldconfig
%post   -n libosmovty0 -p /sbin/ldconfig
%postun -n libosmovty0 -p /sbin/ldconfig

%files tools
%defattr(-,root,root)
%_bindir/osmo-*

%files -n libosmocodec0
%defattr(-,root,root)
%_libdir/libosmocodec.so.0*

%files -n libosmocodec-devel
%defattr(-,root,root)
%dir %_includedir/osmocom
%_includedir/osmocom/codec/
%_libdir/libosmocodec.so
%_libdir/pkgconfig/libosmocodec.pc

%files -n libosmocore4
%defattr(-,root,root)
%_libdir/libosmocore.so.4*

%files -n libosmocore-devel
%defattr(-,root,root)
%dir %_includedir/osmocom
%_includedir/osmocom/core/
%_libdir/libosmocore.so
%_libdir/pkgconfig/libosmocore.pc

%files -n libosmogb2
%defattr(-,root,root)
%_libdir/libosmogb.so.2*

%files -n libosmogb-devel
%defattr(-,root,root)
%dir %_includedir/osmocom
%_includedir/osmocom/gprs/
%_libdir/libosmogb.so
%_libdir/pkgconfig/libosmogb.pc

%files -n libosmogsm3
%defattr(-,root,root)
%_libdir/libosmogsm.so.3*

%files -n libosmogsm-devel
%defattr(-,root,root)
%dir %_includedir/osmocom
%_includedir/osmocom/gsm/
%_includedir/osmocom/crypt/
%_libdir/libosmogsm.so
%_libdir/pkgconfig/libosmogsm.pc

%files -n libosmovty0
%defattr(-,root,root)
%_libdir/libosmovty.so.0*

%files -n libosmovty-devel
%defattr(-,root,root)
%dir %_includedir/osmocom
%_includedir/osmocom/vty/
%_libdir/libosmovty.so
%_libdir/pkgconfig/libosmovty.pc

%changelog
++++++ 0001-osmo-arfcn-Return-something-from-the-method.patch ++++++
>From d0ce550251f8d1809f768428c11da0f80f940f10 Mon Sep 17 00:00:00 2001
From: Holger Hans Peter Freyther <ze...@selfish.org>
Date: Sun, 21 Apr 2013 21:04:19 +0200
Subject: [PATCH] osmo-arfcn: Return something from the method

This is a fatal error when building RPMs for OpenSUSE.
---
 utils/osmo-arfcn.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/utils/osmo-arfcn.c b/utils/osmo-arfcn.c
index 2be3958..5103c97 100644
--- a/utils/osmo-arfcn.c
+++ b/utils/osmo-arfcn.c
@@ -77,6 +77,7 @@ static int freq2arfcn(int freq10, int uplink)
        printf("%s: ARFCN %4d\n",
                gsm_band_name(gsm_arfcn2band(arfcn)),
                arfcn & ~ARFCN_FLAG_MASK);
+       return 0;
 }
 
 static void help(const char *progname)
-- 
1.8.2

++++++ 0001-utils-resolve-compiler-warnings-on-implicit-declarat.patch ++++++
>From e32564831311febc054f4b3f7fb042663ecb9440 Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jeng...@inai.de>
Date: Mon, 3 Jun 2013 01:38:57 +0200
Subject: [PATCH 1/2] utils: resolve compiler warnings on implicit declarations

        CC       osmo-auc-gen.o
        osmo-auc-gen.c: In function 'main':
        osmo-auc-gen.c:216:3: warning: implicit declaration of function
        'time' [-Wimplicit-function-declaration]
---
 utils/osmo-auc-gen.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/utils/osmo-auc-gen.c b/utils/osmo-auc-gen.c
index 7a3c124..47256ff 100644
--- a/utils/osmo-auc-gen.c
+++ b/utils/osmo-auc-gen.c
@@ -25,6 +25,7 @@
 #include <stdio.h>
 #include <errno.h>
 #include <string.h>
+#include <time.h>
 #include <getopt.h>
 #include <unistd.h>
 
-- 
1.8.2

++++++ 0002-utils-avoid-breaking-strict-aliasing.patch ++++++
>From 6196f28b56b318ef312710dfa82d18a43ce6ae8e Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jeng...@inai.de>
Date: Mon, 3 Jun 2013 01:40:57 +0200
Subject: [PATCH 2/2] utils: avoid breaking strict aliasing

          CC       osmo-auc-gen.o
        osmo-auc-gen.c: In function 'main':
        osmo-auc-gen.c:217:3: warning: dereferencing type-punned
        pointer will break strict-aliasing rules [-Wstrict-aliasing]
        osmo-auc-gen.c:218:3: warning: dereferencing type-punned
        pointer will break strict-aliasing rules [-Wstrict-aliasing]
        osmo-auc-gen.c:219:3: warning: dereferencing type-punned
        pointer will break strict-aliasing rules [-Wstrict-aliasing]
        osmo-auc-gen.c:220:3: warning: dereferencing type-punned
        pointer will break strict-aliasing rules [-Wstrict-aliasing]
---
 utils/osmo-auc-gen.c | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/utils/osmo-auc-gen.c b/utils/osmo-auc-gen.c
index 47256ff..1618211 100644
--- a/utils/osmo-auc-gen.c
+++ b/utils/osmo-auc-gen.c
@@ -213,12 +213,18 @@ int main(int argc, char **argv)
        }
 
        if (!rand_is_set) {
+               int r;
+
                printf("WARNING: We're using really weak random numbers!\n\n");
                srand(time(NULL));
-               *(uint32_t *)&_rand[0] = rand();
-               *(uint32_t *)(&_rand[4]) = rand();
-               *(uint32_t *)(&_rand[8]) = rand();
-               *(uint32_t *)(&_rand[12]) = rand();
+               r = rand();
+               memcpy(_rand, &r, sizeof(r));
+               r = rand();
+               memcpy(_rand + 4, &r, sizeof(r));
+               r = rand();
+               memcpy(_rand + 8, &r, sizeof(r));
+               r = rand();
+               memcpy(_rand + 12, &r, sizeof(r));
        }
 
        if (test_aud.type == OSMO_AUTH_TYPE_NONE ||
-- 
1.8.2

++++++ osmo-talloc.diff ++++++
>From 4917e6f0efb9cb901252b0a577d73b39e82c63d4 Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jeng...@inai.de>
Date: Sun, 17 Feb 2013 20:23:09 +0100
Subject: [PATCH] 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.

           CCLD     osmo-arfcn
        ../src/gsm/.libs/libosmogsm.so: undefined reference to `talloc_free'
        collect2: error: ld returned 1 exit status
        make[2]: *** [osmo-arfcn] Error 1
---
 src/gsm/Makefile.am |    3 +++
 1 file changed, 3 insertions(+)

Index: libosmocore/src/gsm/Makefile.am
===================================================================
--- libosmocore.orig/src/gsm/Makefile.am
+++ libosmocore/src/gsm/Makefile.am
@@ -22,5 +22,8 @@ libosmogsm_la_SOURCES = a5.c rxlev_stat.
 
 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
+endif
 
 EXTRA_DIST = libosmogsm.map
++++++ osmo-talloc2.diff ++++++
>From 2741248caf93604321ddb0835c9467e73de136b0 Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jeng...@inai.de>
Date: Sun, 17 Feb 2013 21:13:29 +0100
Subject: [PATCH] build: always install our talloc.h

Next-level packages like libosmo-abis strictly depend on
<osmocom/core/talloc.h>, therefore always ship this file. When
distributions are using --disable-talloc to use a system talloc
instead of the shipped copy, they will simply have to overwrite
osmocom/core/talloc.h with the single line #include <talloc.h>.
---
 include/Makefile.am |    2 --
 1 file changed, 2 deletions(-)

Index: libosmocore/include/Makefile.am
===================================================================
--- libosmocore.orig/include/Makefile.am
+++ libosmocore/include/Makefile.am
@@ -76,9 +76,7 @@ if ENABLE_PLUGIN
 nobase_include_HEADERS += osmocom/core/plugin.h
 endif
 
-if ENABLE_TALLOC
 nobase_include_HEADERS += osmocom/core/talloc.h
-endif
 
 if ENABLE_MSGFILE
 nobase_include_HEADERS += osmocom/core/msgfile.h
++++++ osmo-version.diff ++++++
>From d1b55320c2c6877ff421f44396c2684bc7aa64ba Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jeng...@inai.de>
Date: Sun, 17 Feb 2013 21:09:22 +0100
Subject: [PATCH] set version

---
 configure.ac |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index 3e88a1b..ce4dd55 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_INIT([libosmocore],
-       m4_esyscmd([./git-version-gen .tarball-version]),
+       [0.5.3],
        [open...@lists.osmocom.org])
 
 AM_INIT_AUTOMAKE([foreign dist-bzip2 no-dist-gzip 1.6])
-- 
1.7.10.4

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

Reply via email to