From 9887d8e34d25eb83c4023ddf6bfe29f376ad5e30a5196269ea6138a215952a04 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Sun, 2 Jun 2013 23:50:56 +0000 Subject: [PATCH] Update 0.1.5 again OBS-URL: https://build.opensuse.org/package/show/network:telephony/libosmo-abis?expand=0&rev=2 --- ...not-override-t203_sec-initialization.patch | 38 ++++++++++++++++++ ...-0-when-using-the-LAPD-from-userspac.patch | 40 +++++++++++++++++++ libosmo-abis-0.1.5.tar.xz | 4 +- libosmo-abis.changes | 10 +++++ libosmo-abis.spec | 13 +++--- 5 files changed, 98 insertions(+), 7 deletions(-) create mode 100644 0001-lapd-Do-not-override-t203_sec-initialization.patch create mode 100644 0002-misdn-Set-ret-to-0-when-using-the-LAPD-from-userspac.patch create mode 100644 libosmo-abis.changes diff --git a/0001-lapd-Do-not-override-t203_sec-initialization.patch b/0001-lapd-Do-not-override-t203_sec-initialization.patch new file mode 100644 index 0000000..4ad8caf --- /dev/null +++ b/0001-lapd-Do-not-override-t203_sec-initialization.patch @@ -0,0 +1,38 @@ +From 4b6860db447ffb3997acd7394ea822f29303e797 Mon Sep 17 00:00:00 2001 +From: Holger Hans Peter Freyther +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 + diff --git a/0002-misdn-Set-ret-to-0-when-using-the-LAPD-from-userspac.patch b/0002-misdn-Set-ret-to-0-when-using-the-LAPD-from-userspac.patch new file mode 100644 index 0000000..83b452c --- /dev/null +++ b/0002-misdn-Set-ret-to-0-when-using-the-LAPD-from-userspac.patch @@ -0,0 +1,40 @@ +From 5731dd74f76e7b9c6778ee57937fc92bb8be34d3 Mon Sep 17 00:00:00 2001 +From: Holger Hans Peter Freyther +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 + diff --git a/libosmo-abis-0.1.5.tar.xz b/libosmo-abis-0.1.5.tar.xz index c6c7e2e..b1fb0a8 100644 --- a/libosmo-abis-0.1.5.tar.xz +++ b/libosmo-abis-0.1.5.tar.xz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:49e65d3666fe8c933b811f77dd1d5c3f4e51075ac57ea9a9040f90d6b39c9149 -size 62592 +oid sha256:9ff6ad09b91563696da3eedf680e95976df2e5b14d1f62d11f34d6e0df097ff3 +size 62892 diff --git a/libosmo-abis.changes b/libosmo-abis.changes new file mode 100644 index 0000000..d43b1dd --- /dev/null +++ b/libosmo-abis.changes @@ -0,0 +1,10 @@ +------------------------------------------------------------------- +Sun Jun 2 23:50:42 UTC 2013 - jengelh@inai.de + +- Add 0001-lapd-Do-not-override-t203_sec-initialization.patch, + 0002-misdn-Set-ret-to-0-when-using-the-LAPD-from-userspac.patch + +------------------------------------------------------------------- +Fri Feb 22 09:03:06 UTC 2013 - jengelh@inai.de + +- Initial package (version 0.1.5) for build.opensuse.org diff --git a/libosmo-abis.spec b/libosmo-abis.spec index ca11b36..e514a9e 100644 --- a/libosmo-abis.spec +++ b/libosmo-abis.spec @@ -17,17 +17,20 @@ Name: libosmo-abis -Summary: Osmocom library for A-bis interface +Summary: Osmocom library for A-bis interface between BTS and BSC License: AGPL-3.0+ and GPL-2.0+ Group: Development/Libraries/C and C++ Version: 0.1.5 Release: 0 -Url: http://osmocom.org/ +Url: http://openbsc.osmocom.org/trac/wiki/libosmo-abis #Git-Clone: git://git.osmocom.org/libosmo-abis +# Source generated from tag "0.1.5" (commit 5731dd74f76e7b9c6778ee57937fc92bb8be34d3) Source: %name-%version.tar.xz Patch1: osmo-version.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 BuildRequires: autoconf BuildRequires: automake >= 1.6 @@ -42,7 +45,7 @@ BuildRequires: pkgconfig(ortp) >= 0.13.1 %description %package -n libosmoabis1 -Summary: A-bis core library +Summary: A-bis interface core library License: AGPL-3.0+ Group: System/Libraries @@ -74,8 +77,8 @@ Requires: libosmotrau0 = %version %description -n libosmotrau-devel %prep -%setup -q -%patch -P 1 -P 2 -p1 +%setup -qn %name +%patch -P 1 -P 2 -P 3 -P 4 -p1 %build autoreconf -fiv