From a3f05c646f0df8a5a79884e1e9a6eee41a15a091 Mon Sep 17 00:00:00 2001 From: Richard Hughes Date: Thu, 29 Mar 2012 16:04:25 +0100 Subject: [PATCH] Disable PrivateNetwork=1 as it breaks sensor hotplug. --- ...ivateNetwork-yes-as-it-breaks-hotplu.patch | 30 +++++++++++++++++++ colord.spec | 7 ++++- 2 files changed, 36 insertions(+), 1 deletion(-) create mode 100644 0001-Do-not-enable-PrivateNetwork-yes-as-it-breaks-hotplu.patch diff --git a/0001-Do-not-enable-PrivateNetwork-yes-as-it-breaks-hotplu.patch b/0001-Do-not-enable-PrivateNetwork-yes-as-it-breaks-hotplu.patch new file mode 100644 index 0000000..94ef0b3 --- /dev/null +++ b/0001-Do-not-enable-PrivateNetwork-yes-as-it-breaks-hotplu.patch @@ -0,0 +1,30 @@ +From 4e28e25feaf611a4366fef88fec885657bfd76bc Mon Sep 17 00:00:00 2001 +From: Richard Hughes +Date: Thu, 29 Mar 2012 15:56:48 +0100 +Subject: [PATCH] Do not enable PrivateNetwork=yes as it breaks hotplugging + devices + +We think that udev's AF_NETLINK messages are being filtered when network +namespacing is on. +--- + data/colord.service.in | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/data/colord.service.in b/data/colord.service.in +index 8a4b43d..8301b40 100644 +--- a/data/colord.service.in ++++ b/data/colord.service.in +@@ -6,7 +6,9 @@ Type=dbus + BusName=org.freedesktop.ColorManager + ExecStart=@servicedir@/colord + User=@daemon_user@ +-PrivateNetwork=yes ++# We think that udev's AF_NETLINK messages are being filtered when ++# network namespacing is on. ++# PrivateNetwork=yes + PrivateTmp=yes + + [Install] +-- +1.7.9.3 + diff --git a/colord.spec b/colord.spec index 0164e8e..2e3e8ef 100644 --- a/colord.spec +++ b/colord.spec @@ -1,10 +1,11 @@ Summary: Color daemon Name: colord Version: 0.1.18 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ and LGPLv2+ URL: http://www.freedesktop.org/software/colord/ Source0: http://www.freedesktop.org/software/colord/releases/%{name}-%{version}.tar.xz +Patch0: 0001-Do-not-enable-PrivateNetwork-yes-as-it-breaks-hotplu.patch BuildRequires: dbus-devel BuildRequires: docbook-utils @@ -38,6 +39,7 @@ Files for development with %{name}. %prep %setup -q +%patch0 -p1 -b .fix-device-hotplug %build %configure \ @@ -111,6 +113,9 @@ exit 0 %{_datadir}/vala/vapi/*.vapi %changelog +* Thu Mar 29 2012 Richard Hughes 0.1.18-2 +- Disable PrivateNetwork=1 as it breaks sensor hotplug. + * Thu Mar 15 2012 Richard Hughes 0.1.18-1 - New upstream version - Add a Manager.CreateProfileWithFd() method for QtDBus