pool/libosmocore
SHA256
4
0
Fork 2
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

libosmocore-0.6.6

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/network:telephony/libosmocore?expand=0&rev=8
This commit is contained in:
Jan Engelhardt 2014-07-21 07:58:13 +00:00 committed by Git OBS Bridge
parent 7997f6ca75
commit f5b32989e4
10 changed files with 63 additions and 124 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
0001-osmo-arfcn-Return-something-from-the-method.patch
View File

@ -1,25 +0,0 @@
From d0ce550251f8d1809f768428c11da0f80f940f10 Mon Sep 17 00:00:00 2001
From: Holger Hans Peter Freyther <zecke@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

10
0001-utils-resolve-compiler-warnings-on-implicit-declarat.patch
View File

@ -1,7 +1,7 @@
From e32564831311febc054f4b3f7fb042663ecb9440 Mon Sep 17 00:00:00 2001
From 02d132264692be5fb72ed9ee119d42ba17ed8164 Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de>
Date: Mon, 3 Jun 2013 01:38:57 +0200
Subject: [PATCH 1/2] utils: resolve compiler warnings on implicit declarations
Subject: [PATCH 1/4] utils: resolve compiler warnings on implicit declarations
CC osmo-auc-gen.o
osmo-auc-gen.c: In function 'main':
@ -12,7 +12,7 @@ Subject: [PATCH 1/2] utils: resolve compiler warnings on implicit declarations
1 file changed, 1 insertion(+)
diff --git a/utils/osmo-auc-gen.c b/utils/osmo-auc-gen.c
index 7a3c124..47256ff 100644
index ee349ae..7809730 100644
--- a/utils/osmo-auc-gen.c
+++ b/utils/osmo-auc-gen.c
@@ -25,6 +25,7 @@
@ -22,7 +22,7 @@ index 7a3c124..47256ff 100644
+#include <time.h>
#include <getopt.h>
#include <unistd.h>
#include <inttypes.h>
--
1.8.2
2.0.0

49
0002-utils-avoid-breaking-strict-aliasing.patch
View File

@ -1,49 +0,0 @@
From 6196f28b56b318ef312710dfa82d18a43ce6ae8e Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@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

3
libosmocore-0.6.0.tar.xz
View File

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

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

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

8
libosmocore.changes
View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Mon Jul 21 07:51:35 UTC 2014 - jengelh@inai.de
- Update to new upstream release 0.6.6
* No changelog was provided
- Remove 0001-osmo-arfcn-Return-something-from-the-method.patch,
0002-utils-avoid-breaking-strict-aliasing.patch (no longer needed)
-------------------------------------------------------------------
Sun Jun 2 23:08:13 UTC 2013 - jengelh@inai.de

49
libosmocore.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package libosmocore
#
# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2014 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
@ -20,19 +20,17 @@ 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
Version: 0.6.6
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)
#Snapshot: 0.6.6
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
Patch2: 0001-utils-resolve-compiler-warnings-on-implicit-declarat.patch
Patch3: osmo-talloc.diff
Patch4: osmo-talloc2.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: autoconf
BuildRequires: automake >= 1.6
@ -54,6 +52,7 @@ between OsmocomBB and OpenBSC to avoid code duplication.
%package tools
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
%description tools
@ -96,9 +95,9 @@ applications that want to make use of libosmocodec.
%package -n libosmocore4
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
Group: System/Libraries
%description -n libosmocore4
libosmocore is a library with various utility functions shared
@ -107,8 +106,8 @@ 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++
# crc16.h has GPL2-only clauses, the rest (*.h) is GPL-2.0+
Requires: libosmocore4 = %version
Requires: libtalloc-devel
@ -119,12 +118,12 @@ between OpenBSC and OsmocomBB.
This subpackage contains libraries and header files for developing
applications that want to make use of libosmocore.
%package -n libosmogb2
%package -n libosmogb3
Summary: Osmocom GPRS Gb Interface (NS/BSSGP) library
License: AGPL-3.0+
Group: System/Libraries
%description -n libosmogb2
%description -n libosmogb3
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
@ -136,7 +135,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: libosmogb2 = %version
Requires: libosmogb3 = %version
Requires: libosmogsm-devel = %version
%description -n libosmogb-devel
@ -149,12 +148,12 @@ communications.
This subpackage contains libraries and header files for developing
applications that want to make use of libosmogb.
%package -n libosmogsm3
%package -n libosmogsm5
Summary: Osmocom GSM core library
License: GPL-2.0+ and AGPL-3.0+
Group: System/Libraries
%description -n libosmogsm3
%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
@ -166,7 +165,7 @@ 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
Requires: libosmogsm5 = %version
%description -n libosmogsm-devel
libosmocore is a library with various utility functions that were
@ -211,7 +210,7 @@ applications that want to make use of libosmovty.
%prep
%setup -qn %name
%patch -P 1 -P 2 -P 3 -P 4 -P 5 -P 6 -p1
%patch -P 1 -P 2 -P 3 -P 4 -p1
%build
%if 0%{?use_system_talloc}
@ -234,10 +233,10 @@ make %{?_smp_mflags} check
%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 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
@ -267,9 +266,9 @@ make %{?_smp_mflags} check
%_libdir/libosmocore.so
%_libdir/pkgconfig/libosmocore.pc
%files -n libosmogb2
%files -n libosmogb3
%defattr(-,root,root)
%_libdir/libosmogb.so.2*
%_libdir/libosmogb.so.3*
%files -n libosmogb-devel
%defattr(-,root,root)
@ -278,9 +277,9 @@ make %{?_smp_mflags} check
%_libdir/libosmogb.so
%_libdir/pkgconfig/libosmogb.pc
%files -n libosmogsm3
%files -n libosmogsm5
%defattr(-,root,root)
%_libdir/libosmogsm.so.3*
%_libdir/libosmogsm.so.5*
%files -n libosmogsm-devel
%defattr(-,root,root)

19
osmo-talloc.diff
View File

@ -1,7 +1,7 @@
From 4917e6f0efb9cb901252b0a577d73b39e82c63d4 Mon Sep 17 00:00:00 2001
From 69015be0dfe88476d80895aa3261ab64223c664c Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de>
Date: Sun, 17 Feb 2013 20:23:09 +0100
Subject: [PATCH] build: resolve link failure in libosmogsm when
Subject: [PATCH 2/4] build: resolve link failure in libosmogsm when
--disable-talloc is used
The link stage fails at some point. libosmogsm.so:lapd-core.c uses
@ -12,14 +12,14 @@ talloc_free, but does not link to libtalloc.so. Correct this.
collect2: error: ld returned 1 exit status
make[2]: *** [osmo-arfcn] Error 1
---
src/gsm/Makefile.am | 3 +++
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.
diff --git a/src/gsm/Makefile.am b/src/gsm/Makefile.am
index 46698cd..c471b45 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 \
libosmogsm_la_LDFLAGS = $(LTLDFLAGS_OSMOGSM) -version-info $(LIBVERSION) -no-undefined
libosmogsm_la_LIBADD = $(top_builddir)/src/libosmocore.la
@ -28,3 +28,6 @@ Index: libosmocore/src/gsm/Makefile.am
+endif
EXTRA_DIST = libosmogsm.map
--
2.0.0

19
osmo-talloc2.diff
View File

@ -1,7 +1,7 @@
From 2741248caf93604321ddb0835c9467e73de136b0 Mon Sep 17 00:00:00 2001
From e539a62cadc2d182ed5fff77da86d8ab727d6dbe Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de>
Date: Sun, 17 Feb 2013 21:13:29 +0100
Subject: [PATCH] build: always install our talloc.h
Subject: [PATCH 3/4] 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
@ -9,14 +9,14 @@ 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 --
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
diff --git a/include/Makefile.am b/include/Makefile.am
index b035906..2db13ae 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -81,9 +81,7 @@ if ENABLE_PLUGIN
nobase_include_HEADERS += osmocom/core/plugin.h
endif
@ -26,3 +26,6 @@ Index: libosmocore/include/Makefile.am
if ENABLE_MSGFILE
nobase_include_HEADERS += osmocom/core/msgfile.h
--
2.0.0

2
osmo-version.diff
View File

@ -14,7 +14,7 @@ index 3e88a1b..ce4dd55 100644
@@ -1,5 +1,5 @@
AC_INIT([libosmocore],
- m4_esyscmd([./git-version-gen .tarball-version]),
+ [0.5.3],
+ [0.6.6],
[openbsc@lists.osmocom.org])
AM_INIT_AUTOMAKE([foreign dist-bzip2 no-dist-gzip 1.6])