packages/bluez
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!80 添加SW架构

Browse Source 
From: @mr-zhang_zx 
Reviewed-by: @yanan-rock 
Signed-off-by: @yanan-rock
This commit is contained in:
openeuler-ci-bot 2023-02-21 07:05:38 +00:00 committed by Gitee
commit 4ccc7d3015
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 32 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
bluez-5.54-sw.patch Normal file
View File

@ -0,0 +1,25 @@
diff -Nuar bluez-5.54/ell/missing.h bluez-5.54-sw/ell/missing.h
--- bluez-5.54/ell/missing.h 2019-04-03 17:49:21.000000000 +0000
+++ bluez-5.54-sw/ell/missing.h 2022-07-20 13:43:50.420000000 +0000
@@ -27,6 +27,8 @@
# define __NR_getrandom 318
# elif defined(__i386__)
# define __NR_getrandom 355
+# elif defined(__sw_64__)
+# define __NR_getrandom 511
# elif defined(__arm__)
# define __NR_getrandom 384
# elif defined(__aarch64__)
diff -Nuar bluez-5.54/profiles/network/bnep.c bluez-5.54-sw/profiles/network/bnep.c
--- bluez-5.54/profiles/network/bnep.c 2019-09-19 18:51:03.000000000 +0000
+++ bluez-5.54-sw/profiles/network/bnep.c 2022-07-20 13:58:58.390000000 +0000
@@ -268,7 +268,8 @@
memset(&timeo, 0, sizeof(timeo));
timeo.tv_sec = 0;
- setsockopt(sk, SOL_SOCKET, SO_RCVTIMEO, &timeo, sizeof(timeo));
+/* setsockopt(sk, SOL_SOCKET, SO_RCVTIMEO, &timeo, sizeof(timeo)); */
+ setsockopt(sk, SOL_SOCKET, SO_RCVTIMEO_OLD, &timeo, sizeof(timeo));
sk = g_io_channel_unix_get_fd(session->io);
if (bnep_connadd(sk, session->src, session->iface) < 0)

8
bluez.spec
View File

@ -1,7 +1,7 @@
Name: bluez
Summary: Bluetooth utilities
Version: 5.54
Release: 15
Release: 16
License: GPLv2+
URL: http://www.bluez.org/
Source0: http://www.kernel.org/pub/linux/bluetooth/bluez-%{version}.tar.xz
@ -34,6 +34,9 @@ Patch6009: backport-CVE-2021-41229.patch
Patch6010: backport-CVE-2022-39176.patch
Patch6011: backport-0001-CVE-2022-39177.patch
Patch6012: backport-0002-CVE-2022-39177.patch
%ifarch sw_64
Patch6013: bluez-5.54-sw.patch
%endif
BuildRequires: dbus-devel >= 1.6 libell-devel >= 0.28 autoconf
BuildRequires: glib2-devel libical-devel readline-devel
@ -190,6 +193,9 @@ make check
%{_mandir}/man8/*
%changelog
* Thu Dec 08 2022 zhangzhixin <zhixin.zhang@i-soft.com.cn> - 5.54-16
- add sw64 patch
* Wed Sep 07 2022 wangkerong <wangkerong@h-partners.com> - 5.54-15
- DESC:fix CVE-2022-39176,CVE-2022-39177