diff --git a/0003-tools-csr_usb-Fix-compilation-failure.patch b/0003-tools-csr_usb-Fix-compilation-failure.patch deleted file mode 100644 index 1113fe72fa6c09310045a77756bed42414776ce5..0000000000000000000000000000000000000000 --- a/0003-tools-csr_usb-Fix-compilation-failure.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 07a12a6685ea57be18f39e349dbc42e4af3744ed Mon Sep 17 00:00:00 2001 -From: Bastien Nocera -Date: Tue, 5 Sep 2017 10:32:15 +0200 -Subject: [PATCH 3/4] tools/csr_usb: Fix compilation failure - -GCC's "format-nonliteral" security check is enabled as an error in -recent versions of Fedora. Given the reduced scope of use, mark the -error as ignorable through pragma. - -tools/csr_usb.c: In function 'read_value': -tools/csr_usb.c:82:2: error: format not a string literal, argument types not checked [-Werror=format-nonliteral] - n = fscanf(file, format, &value); - ^ ---- - tools/csr_usb.c | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/tools/csr_usb.c b/tools/csr_usb.c -index a1d7324f7..33e9968a2 100644 ---- a/tools/csr_usb.c -+++ b/tools/csr_usb.c -@@ -67,6 +67,8 @@ struct usbfs_bulktransfer { - #define USBFS_IOCTL_CLAIMINTF _IOR('U', 15, unsigned int) - #define USBFS_IOCTL_RELEASEINTF _IOR('U', 16, unsigned int) - -+#pragma GCC diagnostic push -+#pragma GCC diagnostic ignored "-Wformat-nonliteral" - static int read_value(const char *name, const char *attr, const char *format) - { - char path[PATH_MAX]; -@@ -88,6 +90,7 @@ static int read_value(const char *name, const char *attr, const char *format) - fclose(file); - return value; - } -+#pragma GCC diagnostic pop - - static char *check_device(const char *name) - { --- -2.14.1 - diff --git a/bluez.spec b/bluez.spec index b69e4640f80a267c47fbdd33adc4614082055b4d..4da6660a86934f71ad34a48b3d4abfa14e6ded38 100644 --- a/bluez.spec +++ b/bluez.spec @@ -1,7 +1,7 @@ Name: bluez Summary: Bluetooth utilities Version: 5.50 -Release: 4 +Release: 5 License: GPLv2+ URL: http://www.bluez.org/ Source0: http://www.kernel.org/pub/linux/bluetooth/bluez-%{version}.tar.xz @@ -11,9 +11,7 @@ Source2: 69-btattach-bcm.rules Source3: btattach-bcm@.service Source4: btattach-bcm-service.sh -# The following patches all come from fedoraproject Patch0001: 0001-build-Enable-BIND_NOW.patch -Patch0002: 0003-tools-csr_usb-Fix-compilation-failure.patch Patch0003: 0001-obex-Use-GLib-helper-function-to-manipulate-paths.patch Patch0004: 0001-build-Always-define-confdir-and-statedir.patch Patch0005: 0002-systemd-Add-PrivateTmp-and-NoNewPrivileges-options.patch @@ -157,5 +155,11 @@ make check %_cups_serverbin/backend/bluetooth %changelog +* Sat Jan 11 2020 openEuler Buildteam - 5.50-5 +- Type:enhancement +- ID:NA +- SUG:NA +- DESC: delete patches + * Tue Sep 17 2019 Alex Chao - 5.50-4 - Package init