[neon/backports-focal/iio-sensor-proxy/Neon/unstable] debian/patches: Drop cherry-picked patches. Now part of upstream release
Ritesh Raj Sarraf
null at kde.org
Fri Oct 9 07:46:07 BST 2020
Git commit 6caba77de07584ee10a6544ab28827ec9fd23d76 by Ritesh Raj Sarraf.
Committed on 04/08/2017 at 10:18.
Pushed by bshah into tag 'Neon/unstable'.
Drop cherry-picked patches. Now part of upstream release
D +0 -33 debian/patches/data-Fix-compass-property-name.patch
D +0 -62 debian/patches/iio-dbus-policy-security.patch
M +0 -2 debian/patches/series
https://invent.kde.org/neon/backports-focal/iio-sensor-proxy/commit/6caba77de07584ee10a6544ab28827ec9fd23d76
diff --git a/debian/patches/data-Fix-compass-property-name.patch b/debian/patches/data-Fix-compass-property-name.patch
deleted file mode 100644
index da2c8e6..0000000
--- a/debian/patches/data-Fix-compass-property-name.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 19ec07affa69ee22c33ca969680d72253a634cb6 Mon Sep 17 00:00:00 2001
-From: Bastien Nocera <hadess at hadess.net>
-Date: Wed, 28 Dec 2016 11:23:10 +0100
-Subject: [PATCH] data: Fix compass property name
-
-In commit 924dd58, we changed from matching the device names to a more
-generic property match. But we matched on the "iio-buffer-compass"
-property instead of the one actually set in the udev rules
-("iio-compass").
-
-Change the udev rules property name to "iio-buffer-compass" so that
-rules and code match.
-
-This fixes iio-sensor-proxy startup on HP Pavilion x360.
-
-Spotted by Ted Ying <yingted at gmail.com>
-
-Closes: #128
----
- data/80-iio-sensor-proxy.rules | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/data/80-iio-sensor-proxy.rules
-+++ b/data/80-iio-sensor-proxy.rules
-@@ -7,7 +7,7 @@
- SUBSYSTEM=="hwmon", TEST=="light", ENV{IIO_SENSOR_PROXY_TYPE}="hwmon-als"
- SUBSYSTEM=="iio", TEST=="in_accel_x_raw", TEST=="in_accel_y_raw", TEST=="in_accel_z_raw", ENV{IIO_SENSOR_PROXY_TYPE}="iio-poll-accel"
- SUBSYSTEM=="iio", TEST=="scan_elements/in_accel_x_en", TEST=="scan_elements/in_accel_y_en", TEST=="scan_elements/in_accel_z_en", ENV{IIO_SENSOR_PROXY_TYPE}="iio-buffer-accel"
--SUBSYSTEM=="iio", TEST=="scan_elements/in_rot_from_north_magnetic_tilt_comp_en", ENV{IIO_SENSOR_PROXY_TYPE}="iio-compass"
-+SUBSYSTEM=="iio", TEST=="scan_elements/in_rot_from_north_magnetic_tilt_comp_en", ENV{IIO_SENSOR_PROXY_TYPE}="iio-buffer-compass"
- SUBSYSTEM=="iio", TEST=="in_illuminance_input", ENV{IIO_SENSOR_PROXY_TYPE}="iio-poll-als"
- SUBSYSTEM=="iio", TEST=="scan_elements/in_intensity_both_en", ENV{IIO_SENSOR_PROXY_TYPE}="iio-buffer-als"
- SUBSYSTEM=="input", ENV{ID_INPUT_ACCELEROMETER}=="1", ENV{IIO_SENSOR_PROXY_TYPE}="input-accel"
diff --git a/debian/patches/iio-dbus-policy-security.patch b/debian/patches/iio-dbus-policy-security.patch
deleted file mode 100644
index d013131..0000000
--- a/debian/patches/iio-dbus-policy-security.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From 3695e3979daee9b11b99998b8a318716639ef9a5 Mon Sep 17 00:00:00 2001
-From: Simon McVittie <smcv at debian.org>
-Date: Thu, 2 Feb 2017 12:48:56 +0000
-Subject: [PATCH] Security fix: Make D-Bus policy rules only affect SensorProxy
- itself
-
-D-Bus policy XML files are generic configuration for the bus daemon:
-they are conventionally named like a bus name, but there is nothing
-that inherently limits their application to that bus name.
-
-In particular this means that a rule like
-
- <policy context="default">
- <allow send_interface="org.freedesktop.DBus.Properties"/>
-
-allows any process on the system bus to send an
-org.freedesktop.DBus.Properties.Set() call to any other process on the
-system bus, even if the destination process expected to be only
-accessible by root.
-
-Fixes https://github.com/hadess/iio-sensor-proxy/issues/41
----
- data/net.hadess.SensorProxy.conf | 24 ++++++++++++------------
- 1 file changed, 12 insertions(+), 12 deletions(-)
-
---- a/data/net.hadess.SensorProxy.conf
-+++ b/data/net.hadess.SensorProxy.conf
-@@ -12,22 +12,22 @@
-
- <!-- Only Geoclue can access the compass -->
- <policy user="geoclue">
-- <allow send_interface="net.hadess.SensorProxy.Compass" send_path="/net/hadess/SensorProxy/Compass"/>
-- <allow send_interface="org.freedesktop.DBus.Introspectable" send_path="/net/hadess/SensorProxy/Compass"/>
-- <allow send_interface="org.freedesktop.DBus.Properties" send_path="/net/hadess/SensorProxy/Compass"/>
-- <allow send_interface="org.freedesktop.DBus.Peer" send_path="/net/hadess/SensorProxy/Compass"/>
-+ <allow send_destination="net.hadess.SensorProxy" send_interface="net.hadess.SensorProxy.Compass" send_path="/net/hadess/SensorProxy/Compass"/>
-+ <allow send_destination="net.hadess.SensorProxy" send_interface="org.freedesktop.DBus.Introspectable" send_path="/net/hadess/SensorProxy/Compass"/>
-+ <allow send_destination="net.hadess.SensorProxy" send_interface="org.freedesktop.DBus.Properties" send_path="/net/hadess/SensorProxy/Compass"/>
-+ <allow send_destination="net.hadess.SensorProxy" send_interface="org.freedesktop.DBus.Peer" send_path="/net/hadess/SensorProxy/Compass"/>
- </policy>
-
- <!-- Anyone can talk to the main interface -->
- <policy context="default">
-- <allow send_interface="net.hadess.SensorProxy"/>
-- <allow send_interface="org.freedesktop.DBus.Introspectable"/>
-- <allow send_interface="org.freedesktop.DBus.Properties"/>
-- <allow send_interface="org.freedesktop.DBus.Peer"/>
-- <deny send_interface="org.freedesktop.DBus.Introspectable" send_path="/net/hadess/SensorProxy/Compass"/>
-- <deny send_interface="org.freedesktop.DBus.Properties" send_path="/net/hadess/SensorProxy/Compass"/>
-- <deny send_interface="org.freedesktop.DBus.Peer" send_path="/net/hadess/SensorProxy/Compass"/>
-- <!-- <deny send_interface="net.hadess.SensorProxy.Compass"/> -->
-+ <allow send_destination="net.hadess.SensorProxy" send_interface="net.hadess.SensorProxy"/>
-+ <allow send_destination="net.hadess.SensorProxy" send_interface="org.freedesktop.DBus.Introspectable"/>
-+ <allow send_destination="net.hadess.SensorProxy" send_interface="org.freedesktop.DBus.Properties"/>
-+ <allow send_destination="net.hadess.SensorProxy" send_interface="org.freedesktop.DBus.Peer"/>
-+ <deny send_destination="net.hadess.SensorProxy" send_interface="org.freedesktop.DBus.Introspectable" send_path="/net/hadess/SensorProxy/Compass"/>
-+ <deny send_destination="net.hadess.SensorProxy" send_interface="org.freedesktop.DBus.Properties" send_path="/net/hadess/SensorProxy/Compass"/>
-+ <deny send_destination="net.hadess.SensorProxy" send_interface="org.freedesktop.DBus.Peer" send_path="/net/hadess/SensorProxy/Compass"/>
-+ <!-- <deny send_destination="net.hadess.SensorProxy" send_interface="net.hadess.SensorProxy.Compass"/> -->
- </policy>
-
- </busconfig>
diff --git a/debian/patches/series b/debian/patches/series
index 9073c59..e69de29 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +0,0 @@
-data-Fix-compass-property-name.patch
-iio-dbus-policy-security.patch
More information about the Neon-commits
mailing list