jengelh/libosmo-abis
SHA256
1
0
Fork 0
forked from pool/libosmo-abis
Code Pull Requests Activity

libosmo-abis-0.2.0

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/network:telephony/libosmo-abis?expand=0&rev=3
This commit is contained in:
Jan Engelhardt 2014-07-21 08:07:15 +00:00 committed by Git OBS Bridge
parent 9887d8e34d
commit d5b5393bc6
8 changed files with 39 additions and 112 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
0001-lapd-Do-not-override-t203_sec-initialization.patch
View File

@ -1,38 +0,0 @@
From 4b6860db447ffb3997acd7394ea822f29303e797 Mon Sep 17 00:00:00 2001
From: Holger Hans Peter Freyther <zecke@selfish.org>
Date: Sat, 9 Mar 2013 17:32:33 +0100
Subject: [PATCH 1/2] lapd: Do not override t203_sec initialization.
This was spotted by clang3.3 and got broken in git revision
f42280b6a235163ab935abc9fd36b60716d7a460 when moving to the
C99 initializer.
Warning:
input/lapd.c:106:30: warning: initializer overrides prior initialization of this subobject
[-Winitializer-overrides]
.t203_sec = 20, .t203_sec = 0,
^
input/lapd.c:106:14: note: previous initialization is here
.t203_sec = 20, .t203_sec = 0,
^~
1 warning generated.
---
src/input/lapd.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/input/lapd.c b/src/input/lapd.c
index bced94a..ac24fd8 100644
--- a/src/input/lapd.c
+++ b/src/input/lapd.c
@@ -103,7 +103,7 @@ const struct lapd_profile lapd_profile_sat = {
.t200_sec = 2, .t200_usec = 400000,
.t201_sec = 2, .t201_usec = 400000,
.t202_sec = 2, .t202_usec = 400000,
- .t203_sec = 20, .t203_sec = 0,
+ .t203_sec = 20, .t203_usec = 0,
.short_address = 1
};
--
1.8.2

40
0002-misdn-Set-ret-to-0-when-using-the-LAPD-from-userspac.patch
View File

@ -1,40 +0,0 @@
From 5731dd74f76e7b9c6778ee57937fc92bb8be34d3 Mon Sep 17 00:00:00 2001
From: Holger Hans Peter Freyther <zecke@selfish.org>
Date: Sat, 9 Mar 2013 17:35:17 +0100
Subject: [PATCH 2/2] misdn: Set ret to 0 when using the LAPD from userspace
Warning:
input/misdn.c:252:6: warning: variable 'ret' is used uninitialized whenever 'if' condition is
true [-Wsometimes-uninitialized]
if (mline->use_userspace_lapd) {
^~~~~~~~~~~~~~~~~~~~~~~~~
input/misdn.c:289:9: note: uninitialized use occurs here
return ret;
^~~
input/misdn.c:252:2: note: remove the 'if' if its condition is always false
if (mline->use_userspace_lapd) {
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
input/misdn.c:241:9: note: initialize the variable 'ret' to silence this warning
int ret;
^
= 0
1 warning generated.
---
src/input/misdn.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/input/misdn.c b/src/input/misdn.c
index 5fdd847..a72a21e 100644
--- a/src/input/misdn.c
+++ b/src/input/misdn.c
@@ -255,6 +255,7 @@ static int handle_ts1_write(struct osmo_fd *bfd)
osmo_hexdump(msg->data, msg->len));
lapd_transmit(e1i_ts->lapd, sign_link->tei,
sign_link->sapi, msg);
+ ret = 0;
} else {
l2_data = msg->data;
--
1.8.2

3
libosmo-abis-0.1.5.tar.xz
View File

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

3
libosmo-abis-0.2.0.tar.xz Normal file
View File

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

9
libosmo-abis.changes
View File

@ -1,3 +1,12 @@
-------------------------------------------------------------------
Mon Jul 21 08:00:10 UTC 2014 - jengelh@inai.de
- Update to new upstream release 0.2.0
* No changelog was provided
- Remove 0001-lapd-Do-not-override-t203_sec-initialization.patch,
0002-misdn-Set-ret-to-0-when-using-the-LAPD-from-userspac.patch
(no longer needed)
------------------------------------------------------------------- -------------------------------------------------------------------
Sun Jun 2 23:50:42 UTC 2013 - jengelh@inai.de Sun Jun 2 23:50:42 UTC 2013 - jengelh@inai.de

25
libosmo-abis.spec
View File

@ -20,20 +20,19 @@ Name: libosmo-abis
Summary: Osmocom library for A-bis interface between BTS and BSC Summary: Osmocom library for A-bis interface between BTS and BSC
License: AGPL-3.0+ and GPL-2.0+ License: AGPL-3.0+ and GPL-2.0+
Group: Development/Libraries/C and C++ Group: Development/Libraries/C and C++
Version: 0.1.5 Version: 0.2.0
Release: 0 Release: 0
Url: http://openbsc.osmocom.org/trac/wiki/libosmo-abis Url: http://openbsc.osmocom.org/trac/wiki/libosmo-abis
#Git-Clone: git://git.osmocom.org/libosmo-abis #Git-Clone: git://git.osmocom.org/libosmo-abis
# Source generated from tag "0.1.5" (commit 5731dd74f76e7b9c6778ee57937fc92bb8be34d3) #Snapshot: v0.2.0
Source: %name-%version.tar.xz Source: %name-%version.tar.xz
Patch1: osmo-version.diff Patch1: osmo-version.diff
Patch2: osmo-talloc.diff Patch2: osmo-talloc.diff
Patch3: 0001-lapd-Do-not-override-t203_sec-initialization.patch
Patch4: 0002-misdn-Set-ret-to-0-when-using-the-LAPD-from-userspac.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: autoconf BuildRequires: autoconf
BuildRequires: automake >= 1.6 BuildRequires: automake >= 1.6
#BuildRequires: dahdi-linux-devel
BuildRequires: libtool BuildRequires: libtool
BuildRequires: pkgconfig BuildRequires: pkgconfig
BuildRequires: xz BuildRequires: xz
@ -44,18 +43,18 @@ BuildRequires: pkgconfig(ortp) >= 0.13.1
%description %description
%package -n libosmoabis1 %package -n libosmoabis3
Summary: A-bis interface core library Summary: A-bis interface core library
License: AGPL-3.0+ License: AGPL-3.0+
Group: System/Libraries Group: System/Libraries
%description -n libosmoabis1 %description -n libosmoabis3
%package -n libosmoabis-devel %package -n libosmoabis-devel
Summary: Development files for the Osmocom A-bis core library Summary: Development files for the Osmocom A-bis core library
License: AGPL-3.0+ License: AGPL-3.0+
Group: Development/Libraries/C and C++ Group: Development/Libraries/C and C++
Requires: libosmoabis1 = %version Requires: libosmoabis3 = %version
Requires: libosmocore-devel >= 0.3.0 Requires: libosmocore-devel >= 0.3.0
Requires: libosmogsm-devel >= 0.3.10 Requires: libosmogsm-devel >= 0.3.10
@ -78,11 +77,11 @@ Requires: libosmotrau0 = %version
%prep %prep
%setup -qn %name %setup -qn %name
%patch -P 1 -P 2 -P 3 -P 4 -p1 %patch -P 1 -P 2 -p1
%build %build
autoreconf -fiv autoreconf -fiv
%configure --enable-shared --disable-static --disable-talloc %configure --enable-shared --disable-static
make %{?_smp_mflags} make %{?_smp_mflags}
%install %install
@ -93,14 +92,14 @@ find "$b/%_libdir" -type f -name "*.la" -delete
%check %check
make %{?_smp_mflags} check make %{?_smp_mflags} check
%post -n libosmoabis1 -p /sbin/ldconfig %post -n libosmoabis3 -p /sbin/ldconfig
%postun -n libosmoabis1 -p /sbin/ldconfig %postun -n libosmoabis3 -p /sbin/ldconfig
%post -n libosmotrau0 -p /sbin/ldconfig %post -n libosmotrau0 -p /sbin/ldconfig
%postun -n libosmotrau0 -p /sbin/ldconfig %postun -n libosmotrau0 -p /sbin/ldconfig
%files -n libosmoabis1 %files -n libosmoabis3
%defattr(-,root,root) %defattr(-,root,root)
%_libdir/libosmoabis.so.1* %_libdir/libosmoabis.so.3*
%files -n libosmoabis-devel %files -n libosmoabis-devel
%defattr(-,root,root) %defattr(-,root,root)

31
osmo-talloc.diff
View File

@ -9,24 +9,24 @@ The source files use talloc, so link to talloc.
src/Makefile.am | 2 +- src/Makefile.am | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-) 2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac Index: libosmo-abis/configure.ac
index 8b4014a..08abd19 100644 ===================================================================
--- a/configure.ac --- libosmo-abis.orig/configure.ac
+++ b/configure.ac +++ libosmo-abis/configure.ac
@@ -34,6 +34,7 @@ PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 0.3.0) @@ -33,6 +33,7 @@ AM_CONFIG_HEADER(config.h)
PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 0.3.0)
PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 0.3.0) PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 0.3.0)
PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 0.3.10) PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 0.3.10)
PKG_CHECK_MODULES(ORTP, ortp >= 0.13.1)
+PKG_CHECK_MODULES([TALLOC], [talloc]) +PKG_CHECK_MODULES([TALLOC], [talloc])
PKG_CHECK_MODULES([ORTP], [ortp >= 0.13.1],
AC_CHECK_HEADERS(dahdi/user.h,,AC_MSG_WARN(DAHDI input driver will not be built)) [
PKG_CHECK_MODULES([ORTP_VERSION], [ortp >= 0.21],
diff --git a/src/Makefile.am b/src/Makefile.am Index: libosmo-abis/src/Makefile.am
index 01f0913..55e9122 100644 ===================================================================
--- a/src/Makefile.am --- libosmo-abis.orig/src/Makefile.am
+++ b/src/Makefile.am +++ libosmo-abis/src/Makefile.am
@@ -6,7 +6,7 @@ TRAU_LIBVERSION=0:0:0 @@ -6,7 +6,7 @@ TRAU_LIBVERSION=0:0:0
INCLUDES = $(all_includes) -I$(top_srcdir)/include -I$(top_builddir) AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include -I$(top_builddir)
AM_CFLAGS= -Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(COVERAGE_CFLAGS) AM_CFLAGS= -Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(COVERAGE_CFLAGS)
AM_LDFLAGS = $(COVERAGE_LDFLAGS) AM_LDFLAGS = $(COVERAGE_LDFLAGS)
-COMMONLIBS = $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(LIBOSMOVTY_LIBS) -COMMONLIBS = $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(LIBOSMOVTY_LIBS)
@ -34,6 +34,3 @@ index 01f0913..55e9122 100644
lib_LTLIBRARIES = libosmoabis.la libosmotrau.la lib_LTLIBRARIES = libosmoabis.la libosmotrau.la
--
1.7.10.4

2
osmo-version.diff
View File

@ -14,7 +14,7 @@ index 08abd19..a69ff8a 100644
@@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
AC_INIT([libosmo-abis], AC_INIT([libosmo-abis],
- m4_esyscmd([./git-version-gen .tarball-version]), - m4_esyscmd([./git-version-gen .tarball-version]),
+ [0.1.5], + [0.2.0],
[openbsc@lists.osmocom.org]) [openbsc@lists.osmocom.org])
AM_INIT_AUTOMAKE([foreign dist-bzip2 no-dist-gzip 1.6]) AM_INIT_AUTOMAKE([foreign dist-bzip2 no-dist-gzip 1.6])