开源软件构建与测试

We truncated the diff of some files because they were too big. If you want to see the full diff for every file, click here.

Changes of Revision 2

_service:tar_scm:bluez.spec Changed

@@ -1,7 +1,7 @@
 Name:             bluez
 Summary:          Bluetooth utilities
-Version:          5.71
-Release:          3
+Version:          5.77
+Release:          1
 License:          GPLv2+
 URL:              http://www.bluez.org/
 Source0:          http://www.kernel.org/pub/linux/bluetooth/bluez-%{version}.tar.xz
@@ -17,12 +17,10 @@
 %ifarch sw_64
 Patch6013:	  bluez-5.54-sw.patch
 %endif
-Patch7000:	  0001-Fix-crash-after-pair-command.patch
-Patch7001:	  Fix-memory-leak.patch
 
 BuildRequires:    dbus-devel >= 1.6 libell-devel >= 0.28 autoconf
 BuildRequires:    glib2-devel libical-devel readline-devel 
-BuildRequires:    json-c-devel systemd-devel cups-devel libtool automake python3-docutils
+BuildRequires:    json-c-devel systemd-devel cups-devel libtool automake python3-docutils python3-pygments
 Requires:         dbus >= 1.6 %{name}-libs = %{version}-%{release}
 Requires(post):   systemd
 Requires(preun):  systemd
@@ -98,6 +96,9 @@
 # Copy bluetooth config file
 install -D -p -m0644 src/main.conf %{buildroot}/etc/bluetooth/main.conf
 install -D -p -m0644 mesh/mesh-main.conf %{buildroot}/etc/bluetooth/mesh-main.conf
+install -D -p -m0644 profiles/input/input.conf %${buildroot}/etc/bluetooth/input.conf
+install -D -p -m0644 profiles/network/network.conf %${buildroot}/etc/bluetooth/network.conf
+
 
 # Setup auto enable
 sed -i 's/#\Policy\$/\Policy\/; s/#AutoEnable=false/AutoEnable=true/' ${RPM_BUILD_ROOT}/%{_sysconfdir}/bluetooth/main.conf
@@ -132,6 +133,8 @@
 %doc AUTHORS ChangeLog
 %license COPYING
 %config %{_sysconfdir}/bluetooth/main.conf
+%config %{_sysconfdir}/bluetooth/input.conf
+%config %{_sysconfdir}/bluetooth/network.conf
 %config %{_sysconfdir}/bluetooth/mesh-main.conf
 %{_datadir}/dbus-1/system.d/bluetooth.conf
 %{_datadir}/dbus-1/system.d/bluetooth-mesh.conf
@@ -148,6 +151,7 @@
 %{_unitdir}/bluetooth-mesh.service
 %{_datadir}/zsh/site-functions/_bluetoothctl
 %{_datadir}/dbus-1/services/org.bluez.obex.service
+%{_userunitdir}/dbus-org.bluez.obex.service
 %{_datadir}/dbus-1/system-services/org.bluez.service
 %{_datadir}/dbus-1/system-services/org.bluez.mesh.service
 %{_userunitdir}/obex.service
@@ -174,8 +178,15 @@
 %{_mandir}/man1/*
 %{_mandir}/man5/*
 %{_mandir}/man8/*
+%{_mandir}/man7/*
 
 %changelog
+* Tue Jul 16 2024 dillon chen <dillon.chen@gmail.com> - 5.77-1
+- update to 5.77
+
+* Thu Jul 11 2024 dillon chen <dillon.chen@gmail.com> - 5.76-1
+- update to 5.76
+
 * Tue Jun 4 2024 xuchenchen <xuchenchen@kylinos.cn> - 5.71-3
 - sync patches from community, shared/csip: Fix memory leak

_service:tar_scm:0001-Fix-crash-after-pair-command.patch Deleted

@@ -1,76 +0,0 @@
-From 60d60166e4bfae8555fb671e5a99952586cc6b56 Mon Sep 17 00:00:00 2001
-From: Vinit Mehta <vinit.mehta@nxp.com>
-Date: 2023-12-19 11:58:01 +0530
-Subject: PATCH Fix crash after pair command
-
-After pair command, if the user doesn't provide any input on bluetoothctl
-CLI interface after receiving the prompt(yes/no) below crash is observed:
-
-dbus782: arguments to dbus_message_get_no_reply() were incorrect,
-assertion "message != NULL" failed in file
-/usr/src/debug/dbus/1.14.10-r0/dbus/dbus-message.c line 3250.
-This is normally a bug in some application using the D-Bus library.
-/usr/lib/libc.so.6(+0x27534) 0xffffa1b67534
-/usr/lib/libc.so.6(__libc_start_main+0x9c) 0xffffa1b6760c
-bluetoothctl(+0x188f0) 0xaaaac9c088f0
-Aborted (core dumped)
----
- client/agent.c | 15 +++++++++------
- client/mgmt.c  | 12 +++++++++---
- 2 files changed, 18 insertions(+), 9 deletions(-)
-
-diff --git a/client/agent.c b/client/agent.c
-index 35b4041..ff5e57f 100644
---- a/client/agent.c
-+++ b/client/agent.c
-@@ -77,14 +77,17 @@ static void confirm_response(const char *input, void *user_data)
- {
- 	DBusConnection *conn = user_data;
- 
--	if (!strcmp(input, "yes"))
--		g_dbus_send_reply(conn, pending_message, DBUS_TYPE_INVALID);
--	else if (!strcmp(input, "no"))
--		g_dbus_send_error(conn, pending_message,
-+	if (pending_message != NULL) {
-+		if (!strcmp(input, "yes"))
-+			g_dbus_send_reply(conn, pending_message,
-+					DBUS_TYPE_INVALID);
-+		else if (!strcmp(input, "no"))
-+			g_dbus_send_error(conn, pending_message,
- 					"org.bluez.Error.Rejected", NULL);
--	else
--		g_dbus_send_error(conn, pending_message,
-+		else
-+			g_dbus_send_error(conn, pending_message,
- 					"org.bluez.Error.Canceled", NULL);
-+	}
- }
- 
- static void agent_release(DBusConnection *conn)
-diff --git a/client/mgmt.c b/client/mgmt.c
-index 947d8fc..e9ebb3d 100644
---- a/client/mgmt.c
-+++ b/client/mgmt.c
-@@ -849,10 +849,16 @@ static void prompt_input(const char *input, void *user_data)
- 								&prompt.addr);
- 		break;
- 	case MGMT_EV_USER_CONFIRM_REQUEST:
--		if (input0 == 'y' || input0 == 'Y')
--			mgmt_confirm_reply(prompt.index, &prompt.addr);
--		else
-+		if (len) {
-+			if (input0 == 'y' || input0 == 'Y')
-+				mgmt_confirm_reply(prompt.index, &prompt.addr);
-+			else
-+				mgmt_confirm_neg_reply(prompt.index,
-+						&prompt.addr);
-+		} else {
- 			mgmt_confirm_neg_reply(prompt.index, &prompt.addr);
-+			bt_shell_set_prompt(PROMPT_ON);
-+		}
- 		break;
- 	}
- }
--- 
-2.33.0
-

_service:tar_scm:Fix-memory-leak.patch Deleted

@@ -1,58 +0,0 @@
-From 09e39a7d6dca8041f3723ee9020c54b94c0c8d47 Mon Sep 17 00:00:00 2001
-From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
-Date: Fri, 24 May 2024 10:47:41 -0400
-Subject: shared/csip: Fix memory leak
-
-This fixes the following leak:
-
-102 bytes in 6 blocks are definitely lost in loss record 660 of 909
-   at 0x484282F: malloc (vg_replace_malloc.c:446)
-   by 0x5A078B: util_malloc (util.c:46)
-   by 0x649162: read_sirk (csip.c:485)
-   by 0x5C74FA: read_cb (gatt-client.c:2713)
-   by 0x5C4137: handle_rsp (att.c:880)
-   by 0x5C4137: can_read_data (att.c:1072)
-   by 0x65DDA4: watch_callback (io-glib.c:157)
-   by 0x49656AB: ??? (in /usr/lib64/libglib-2.0.so.0.8000.2)
-   by 0x49C6707: ??? (in /usr/lib64/libglib-2.0.so.0.8000.2)
-   by 0x496B666: g_main_loop_run (in /usr/lib64/libglib-2.0.so.0.8000.2)
-   by 0x65FE3D: mainloop_run (mainloop-glib.c:66)
-   by 0x6605A3: mainloop_run_with_signal (mainloop-notify.c:188)
-   by 0x31DEFA: main (main.c:1468)
-
----
- src/shared/csip.c | 11 ++++++++++-
- 1 file changed, 10 insertions(+), 1 deletion(-)
-
-diff --git a/src/shared/csip.c b/src/shared/csip.c
-index e13efb6..87b4590 100644
---- a/src/shared/csip.c
-+++ b/src/shared/csip.c
-@@ -128,6 +128,15 @@ void bt_csip_detach(struct bt_csip *csip)
- 	queue_foreach(csip_cbs, csip_detached, csip);
- }
- 
-+static void csis_free(struct bt_csis *csis)
-+{
-+	if (!csis)
-+		return;
-+
-+	free(csis->sirk_val);
-+	free(csis);
-+}
-+
- static void csip_db_free(void *data)
- {
- 	struct bt_csip_db *cdb = data;
-@@ -137,7 +146,7 @@ static void csip_db_free(void *data)
- 
- 	gatt_db_unref(cdb->db);
- 
--	free(cdb->csis);
-+	csis_free(cdb->csis);
- 	free(cdb);
- }
- 
--- 
-2.27.0
-

_service Changed

_service:tar_scm:bluez-5.71.tar.xz -> _service:tar_scm:bluez-5.77.tar.xz Changed