diff --git a/colord-0.1.13.tar.xz b/colord-0.1.13.tar.xz deleted file mode 100644 index 423d3fc..0000000 --- a/colord-0.1.13.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:eb3d00653d4a028f4e97f4e61ffa29940c65b42c20d4439e067cb183b725c292 -size 445420 diff --git a/colord-0.1.15.tar.xz b/colord-0.1.15.tar.xz new file mode 100644 index 0000000..6226568 --- /dev/null +++ b/colord-0.1.15.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:dff56476e02527899f4a2c39eeb092af369ab5dac1e21cbb6a5b0955b5c6e746 +size 456776 diff --git a/colord-polkit-annotate-owner.patch b/colord-polkit-annotate-owner.patch new file mode 100644 index 0000000..d124c74 --- /dev/null +++ b/colord-polkit-annotate-owner.patch @@ -0,0 +1,354 @@ +commit 9f088d598187b1bddd0ce4fb97a56d61564d8381 +Author: Vincent Untz +Date: Tue Dec 6 10:40:21 2011 +0100 + + Add org.freedesktop.policykit.owner annotations to .policy file + + We only add those annotations when the daemon is configured to run as + non-root. + +diff --git a/policy/Makefile.am b/policy/Makefile.am +index 85e3ecc..272675b 100644 +--- a/policy/Makefile.am ++++ b/policy/Makefile.am +@@ -1,9 +1,16 @@ ++org.freedesktop.color.policy.in: org.freedesktop.color.policy.in.in Makefile.am ++ $(AM_V_GEN)if test "x$(daemon_user)" != "xroot"; then \ ++ sed -e "s|<@ANNOTATE_OWNER@/>|unix-user:$(daemon_user)|g" $< > $@ ; \ ++ else \ ++ sed -e "/^\s*<@ANNOTATE_OWNER@\/>\s*$$/d;s|<@ANNOTATE_OWNER@/>||g" $< > $@ ; \ ++ fi ++ + @INTLTOOL_POLICY_RULE@ + polkit_policydir = $(datadir)/polkit-1/actions +-dist_polkit_policy_DATA = \ ++polkit_policy_DATA = \ + org.freedesktop.color.policy + +-EXTRA_DIST = org.freedesktop.color.policy.in +-DISTCLEANFILES = org.freedesktop.color.policy ++EXTRA_DIST = org.freedesktop.color.policy.in.in ++DISTCLEANFILES = org.freedesktop.color.policy org.freedesktop.color.policy.in + + -include $(top_srcdir)/git.mk +diff --git a/policy/org.freedesktop.color.policy.in b/policy/org.freedesktop.color.policy.in +deleted file mode 100644 +index a5bcfaf..0000000 +--- a/policy/org.freedesktop.color.policy.in ++++ /dev/null +@@ -1,150 +0,0 @@ +- +- +- +- +- +- +- System Color Manager +- http://www.freedesktop.org/projects/system-color-manager/ +- application-vnd.iccprofile +- +- +- +- <_description>Create a color managed device +- <_message>Authentication is required to create a color managed device +- application-vnd.iccprofile +- +- no +- no +- yes +- +- +- +- +- +- <_description>Create a color profile +- <_message>Authentication is required to create a color profile +- application-vnd.iccprofile +- +- no +- no +- yes +- +- +- +- +- +- <_description>Remove a color managed device +- <_message>Authentication is required to remove a color managed device +- application-vnd.iccprofile +- +- no +- no +- yes +- +- +- +- +- +- <_description>Remove a color profile +- <_message>Authentication is required to remove a color profile +- application-vnd.iccprofile +- +- no +- no +- yes +- +- +- +- +- +- <_description>Modify color settings for a device +- <_message>Authentication is required to modify the color settings for a device +- application-vnd.iccprofile +- +- no +- no +- yes +- +- +- +- +- +- <_description>Modify a color profile +- <_message>Authentication is required to modify a color profile +- application-vnd.iccprofile +- +- no +- no +- yes +- +- +- +- +- +- <_description>Install system color profiles +- <_message>Authentication is required to install the color profile for all users +- application-vnd.iccprofile +- +- no +- no +- auth_admin_keep +- +- +- +- +- +- <_description>Inhibit color profile selection +- <_message>Authentication is required to disable profile matching for a device +- application-vnd.iccprofile +- +- no +- no +- yes +- +- +- +- +- +- <_description>Use color sensor +- <_message>Authentication is required to use the color sensor +- application-vnd.iccprofile +- +- no +- no +- yes +- +- +- +- +- +diff --git a/policy/org.freedesktop.color.policy.in.in b/policy/org.freedesktop.color.policy.in.in +new file mode 100644 +index 0000000..4570f8f +--- /dev/null ++++ b/policy/org.freedesktop.color.policy.in.in +@@ -0,0 +1,159 @@ ++ ++ ++ ++ ++ ++ ++ System Color Manager ++ http://www.freedesktop.org/projects/system-color-manager/ ++ application-vnd.iccprofile ++ ++ ++ ++ <_description>Create a color managed device ++ <_message>Authentication is required to create a color managed device ++ application-vnd.iccprofile ++ ++ no ++ no ++ yes ++ ++ <@ANNOTATE_OWNER@/> ++ ++ ++ ++ ++ <_description>Create a color profile ++ <_message>Authentication is required to create a color profile ++ application-vnd.iccprofile ++ ++ no ++ no ++ yes ++ ++ <@ANNOTATE_OWNER@/> ++ ++ ++ ++ ++ <_description>Remove a color managed device ++ <_message>Authentication is required to remove a color managed device ++ application-vnd.iccprofile ++ ++ no ++ no ++ yes ++ ++ <@ANNOTATE_OWNER@/> ++ ++ ++ ++ ++ <_description>Remove a color profile ++ <_message>Authentication is required to remove a color profile ++ application-vnd.iccprofile ++ ++ no ++ no ++ yes ++ ++ <@ANNOTATE_OWNER@/> ++ ++ ++ ++ ++ <_description>Modify color settings for a device ++ <_message>Authentication is required to modify the color settings for a device ++ application-vnd.iccprofile ++ ++ no ++ no ++ yes ++ ++ <@ANNOTATE_OWNER@/> ++ ++ ++ ++ ++ <_description>Modify a color profile ++ <_message>Authentication is required to modify a color profile ++ application-vnd.iccprofile ++ ++ no ++ no ++ yes ++ ++ <@ANNOTATE_OWNER@/> ++ ++ ++ ++ ++ <_description>Install system color profiles ++ <_message>Authentication is required to install the color profile for all users ++ application-vnd.iccprofile ++ ++ no ++ no ++ auth_admin_keep ++ ++ <@ANNOTATE_OWNER@/> ++ ++ ++ ++ ++ <_description>Inhibit color profile selection ++ <_message>Authentication is required to disable profile matching for a device ++ application-vnd.iccprofile ++ ++ no ++ no ++ yes ++ ++ <@ANNOTATE_OWNER@/> ++ ++ ++ ++ ++ <_description>Use color sensor ++ <_message>Authentication is required to use the color sensor ++ application-vnd.iccprofile ++ ++ no ++ no ++ yes ++ ++ <@ANNOTATE_OWNER@/> ++ ++ ++ ++ diff --git a/colord.changes b/colord.changes index df09cbb..c3180aa 100644 --- a/colord.changes +++ b/colord.changes @@ -1,3 +1,61 @@ +------------------------------------------------------------------- +Thu Dec 8 20:25:09 UTC 2011 - dimstar@opensuse.org + +- Split typelib file into typelib-1_0-Colord-1_0 subpackage. +- Add typelib-1_0-Colord-1_0 Requires to libcolord-devel + subpackage. + +------------------------------------------------------------------- +Tue Dec 6 16:06:22 UTC 2011 - vuntz@opensuse.org + +- Run the colord daemon as user colord (bnc#698250): + + Add colord-polkit-annotate-owner.patch: add + org.freedesktop.policykit.owner annotations to policy file so + that running as colord user works. + + Add a %pre script to create the colord user and change + ownership of /var/lib/colord. + + Add pwdutils Requires(pre), to make sure we can create the + user. + + Pass --with-daemon-user=colord to configure. + + Package /var/lib/colord with the right user. + + Add libtool BuildRequires and calls to autoreconf and + intltoolize, as needed by above patch. + +------------------------------------------------------------------- +Tue Nov 29 21:27:11 UTC 2011 - dimstar@opensuse.org + +- Update to version 0.1.15: + + This release fixes an important security bug: CVE-2011-4349. + + New Features: + - Add a native driver for the Hughski ColorHug hardware + - Export cd-math as three projects are now using it + + Bugfixes: + - Documentation fixes and improvements + - Do not crash the daemon if adding the device to the db failed + - Do not match any sensor device with a kernel driver + - Don't be obscure when the user passes a device-id to colormgr + - Fix a memory leak when getting properties from a device + - Fix colormgr device-get-default-profile + - Fix some conection bugs in colormgr + - Fix some potential SQL injections + - Make gusb optional + - Only use the udev USB helper if the PID and VID have matches + - Output the Huey calibration matrices when dumping the sensor + +------------------------------------------------------------------- +Wed Nov 16 10:27:26 UTC 2011 - dimstar@opensuse.org + +- Update to version 0.1.14: + + New Features: + - Add defines for the i1 Display 3 + - Add two more DATA_source values to the specification + - Align the output from colormgr get-devices and get-profiles + - Allow cd-fix-profile to append and edit new metadata + + Bugfixes: + - Ensure non-native device are added with no driver module + - Split the sensor and device udev code + + Updated translations. + ------------------------------------------------------------------- Fri Oct 28 14:31:58 UTC 2011 - lnussel@suse.de diff --git a/colord.spec b/colord.spec index 7db03b2..df3c4fe 100644 --- a/colord.spec +++ b/colord.spec @@ -15,19 +15,21 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - - Name: colord -Version: 0.1.13 -Release: 1 -License: GPLv2+ +Version: 0.1.15 +Release: 0 Summary: System Daemon for Managing Color Devices -Url: http://colord.hughsie.com/ +License: GPL-2.0+ Group: System/Daemons +Url: http://colord.hughsie.com/ Source0: http://www.freedesktop.org/software/colord/releases/%{name}-%{version}.tar.xz Source99: baselibs.conf +# PATCH-FIX-UPSTREAM colord-polkit-annotate-owner.patch vuntz@opensuse.org -- Add org.freedesktop.policykit.owner annotations to policy file; will enter git very soon +Patch1: colord-polkit-annotate-owner.patch BuildRequires: gobject-introspection-devel BuildRequires: intltool +# needed for patch1 +BuildRequires: libtool BuildRequires: sane-backends-devel BuildRequires: vala # Only needed because we don't (and won't) support building xz tarballs by default... See bnc#697467 @@ -43,6 +45,7 @@ BuildRequires: pkgconfig(lcms2) BuildRequires: pkgconfig(libusb-1.0) >= 1.0.0 BuildRequires: pkgconfig(polkit-gobject-1) BuildRequires: pkgconfig(sqlite3) +Requires(pre): pwdutils Requires: shared-color-profiles Recommends: %{name}-lang BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -62,10 +65,23 @@ colord is a system activated daemon that maps devices to color profiles. It is used by gnome-color-manager for system integration and use when there are no users logged in. +%package -n typelib-1_0-Colord-1_0 +Summary: System Daemon for Managing Color Devices -- Introspection bindings +Group: System/Libraries + +%description -n typelib-1_0-Colord-1_0 +colord is a system activated daemon that maps devices to color profiles. +It is used by gnome-color-manager for system integration and use when +there are no users logged in. + +This package provides the GObject Introspection bindings for the +libcolord library. + %package -n libcolord-devel Summary: System Daemon for Managing Color Devices -- Development Files Group: Development/Languages/C and C++ Requires: libcolord1 = %{version} +Requires: typelib-1_0-Colord-1_0 = %{version} %description -n libcolord-devel colord is a system activated daemon that maps devices to color profiles. @@ -75,11 +91,16 @@ there are no users logged in. %lang_package %prep %setup -q +%patch1 -p1 %build +# needed for patch1 +autoreconf -fi +intltoolize --force %configure \ --disable-static \ - --enable-polkit + --enable-polkit \ + --with-daemon-user=colord make %{?_smp_mflags} %install @@ -96,6 +117,13 @@ test ! -f *.[2-9] popd %find_lang %{name} +%pre +getent group colord >/dev/null || groupadd -r colord +getent passwd colord >/dev/null || useradd -r -g colord -d %{_localstatedir}/lib/colord -s /sbin/nologin -c "user for colord" colord +# Fix ownership of /var/lib/colord from first packages (in 12.1) +test ! -d %{_localstatedir}/lib/colord || chown -R colord:colord %{_localstatedir}/lib/colord +exit 0 + %post -n libcolord1 -p /sbin/ldconfig %postun -n libcolord1 -p /sbin/ldconfig @@ -104,6 +132,7 @@ popd %defattr(-,root,root) %doc AUTHORS ChangeLog COPYING NEWS README /lib/udev/rules.d/*.rules +%attr(755,colord,colord) %dir %{_localstatedir}/lib/colord %config(noreplace) %{_sysconfdir}/%{name}.conf %{_sysconfdir}/dbus-1/system.d/org.freedesktop.ColorManager.conf %{_bindir}/cd-create-profile @@ -122,6 +151,9 @@ popd %files -n libcolord1 %defattr(-, root, root) %{_libdir}/libcolord.so.* + +%files -n typelib-1_0-Colord-1_0 +%defattr(-,root,root) %{_libdir}/girepository-1.0/Colord-1.0.typelib %files -n libcolord-devel