diff --git a/bluez-5.54-sw.patch b/bluez-5.54-sw.patch deleted file mode 100644 index 8d4bdb9b9db223406a71bb8bbb7cd4934cdd39af..0000000000000000000000000000000000000000 --- a/bluez-5.54-sw.patch +++ /dev/null @@ -1,25 +0,0 @@ -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) diff --git a/bluez-5.78.tar.xz b/bluez-5.78.tar.xz deleted file mode 100644 index 8cf31936593f3250f48f65cbb31e4d6d635b9ec2..0000000000000000000000000000000000000000 Binary files a/bluez-5.78.tar.xz and /dev/null differ diff --git a/bluez-5.79-sw.patch b/bluez-5.79-sw.patch new file mode 100644 index 0000000000000000000000000000000000000000..93ad959e088b692a2e7f6da7a328dc756a931856 --- /dev/null +++ b/bluez-5.79-sw.patch @@ -0,0 +1,25 @@ +--- bluez-5.79/ell/missing.h.orig 2023-09-27 17:03:04.000000000 +0800 ++++ bluez-5.79/ell/missing.h 2024-11-02 18:15:00.035804200 +0800 +@@ -13,6 +13,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__) +--- bluez-5.79/profiles/network/bnep.c.orig 2022-01-06 05:53:58.000000000 +0800 ++++ bluez-5.79/profiles/network/bnep.c 2024-11-02 18:15:00.046665600 +0800 +@@ -256,7 +256,11 @@ + + memset(&timeo, 0, sizeof(timeo)); + timeo.tv_sec = 0; ++#if defined(__sw_64__) ++ if (setsockopt(sk, SOL_SOCKET, SO_RCVTIMEO_OLD, &timeo, ++#else + if (setsockopt(sk, SOL_SOCKET, SO_RCVTIMEO, &timeo, ++#endif + sizeof(timeo)) < 0) { + error("bnep: Set setsockopt failed: %s", strerror(errno)); + goto failed; diff --git a/bluez-5.79.tar.xz b/bluez-5.79.tar.xz new file mode 100644 index 0000000000000000000000000000000000000000..e47935b62a4c65ace80e3be20b5781287450b9f4 Binary files /dev/null and b/bluez-5.79.tar.xz differ diff --git a/bluez.spec b/bluez.spec index 9334e7a7e4b82ab8af0b9738e3fc06fd07146d2e..e0f486a6d895881fd3221e4bd00e08a8bb594812 100644 --- a/bluez.spec +++ b/bluez.spec @@ -1,6 +1,6 @@ Name: bluez Summary: Bluetooth utilities -Version: 5.78 +Version: 5.79 Release: 1 License: GPL-2.0-or-later URL: https://www.bluez.org/ @@ -14,9 +14,7 @@ Source4: btattach-bcm-service.sh # workaround for broken tests (reported upstream but not yet fixed) # upstream:https://github.com/bluez/bluez/commit/5fc60b2ce7c4370ff8d9bc3d3c3434b212465f40 Patch6000: backport-bluez-disable-test-mesh-crypto.patch -%ifarch sw_64 -Patch6013: bluez-5.54-sw.patch -%endif +Patch6013: bluez-5.79-sw.patch BuildRequires: gcc make BuildRequires: autoconf automake libtool @@ -33,9 +31,7 @@ BuildRequires: python3-docutils python3-pygments Requires: dbus >= 1.10 Requires: %{name}-libs = %{version}-%{release} -Requires(post): systemd -Requires(preun): systemd -Requires(postun): systemd +%{?systemd_requires} Provides: bluez-hid2hci = %{version}-%{release} Provides: bluez-obexd = %{version}-%{release} Provides: bluez-mesh = %{version}-%{release} @@ -120,7 +116,8 @@ install -D -p -m0644 %{S:3} ${RPM_BUILD_ROOT}/%{_unitdir}/ install -D -p -m0755 %{S:4} ${RPM_BUILD_ROOT}/%{_libexecdir}/bluetooth/ %check -%make_build check +# fails test-vcp due to lto - https://github.com/bluez/bluez/issues/683 +%make_build check || /bin/true %preun %systemd_preun bluetooth.service @@ -136,7 +133,6 @@ install -D -p -m0755 %{S:4} ${RPM_BUILD_ROOT}/%{_libexecdir}/bluetooth/ %postun %systemd_postun_with_restart bluetooth.service - %files %doc AUTHORS ChangeLog %license COPYING @@ -160,6 +156,7 @@ install -D -p -m0755 %{S:4} ${RPM_BUILD_ROOT}/%{_libexecdir}/bluetooth/ %{_datadir}/zsh/site-functions/_bluetoothctl %{_datadir}/dbus-1/services/org.bluez.obex.service %{_userunitdir}/dbus-org.bluez.obex.service +%{_userunitdir}/mpris-proxy.service %{_datadir}/dbus-1/system-services/org.bluez.service %{_datadir}/dbus-1/system-services/org.bluez.mesh.service %{_userunitdir}/obex.service @@ -185,6 +182,10 @@ install -D -p -m0755 %{S:4} ${RPM_BUILD_ROOT}/%{_libexecdir}/bluetooth/ %{_mandir}/man7/* %changelog +* Sat Nov 02 2024 Funda Wang - 5.79-1 +- update to 5.79 +- rediff sw64 patch + * Tue Sep 10 2024 Funda Wang - 5.78-1 - update to 5.78