rpms/argyllcms/F-12 argyllcms-1.0.4-use-acl-udev-rules.patch, NONE, 1.1 argyllcms.spec, 1.15, 1.16

[Richard Hughes]

Author: rhughes

Update of /cvs/pkgs/rpms/argyllcms/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20830

Modified Files:
	argyllcms.spec 
Added Files:
	argyllcms-1.0.4-use-acl-udev-rules.patch 
Log Message:
* Mon Feb 01 2010 Richard Hughes <rhughes at redhat.com> - 1.0.4-5
- Backport the 55-Argyll.rules files from hargyllcms as the upstream Argyll file
  is insecure.
- Resolves #560050


argyllcms-1.0.4-use-acl-udev-rules.patch:
 55-Argyll.rules |   40 +++++++++++++++++++++++++---------------
 1 file changed, 25 insertions(+), 15 deletions(-)

--- NEW FILE argyllcms-1.0.4-use-acl-udev-rules.patch ---
--- Argyll_V1.0.4.old/libusb/55-Argyll.rules	2010-02-01 08:54:08.000000000 +0000
+++ Argyll_V1.0.4.old/libusb/55-Argyll.rules	2010-02-01 08:56:09.000000000 +0000
@@ -1,38 +1,48 @@ 
 # udev rule to recognize instruments and make them accessible to user applications.
-# Copy to /etc/udev/rules.d/55-Argyll.rules
 
-# Enable serial port connected instruments connected on first two ports.
-KERNEL=="ttyS[01]", MODE="666"
+# Skip all this to speed things up if it'a not a usb add.
+ACTION!="add", GOTO="argyll_rules_end"
+SUBSYSTEM!="usb", GOTO="argyll_rules_end"
 
-# Enable serial port connected instruments on USB serial converteds connected on first two ports.
-KERNEL=="ttyUSB[01]", MODE="666"
+# Recognize the color measurement devices
 
 # DTP20
-SYSFS{idVendor}=="0765", SYSFS{idProduct}=="d020", MODE="666"
+ATTRS{idVendor}=="0765", ATTRS{idProduct}=="d020", ENV{COLOR_MEASUREMENT_DEVICE}="1"
 
 # DTP92Q (not testedt)
-SYSFS{idVendor}=="0765", SYSFS{idProduct}=="d092", MODE="666"
+ATTRS{idVendor}=="0765", ATTRS{idProduct}=="d092", ENV{COLOR_MEASUREMENT_DEVICE}="1"
 
 # DTP94
-SYSFS{idVendor}=="0765", SYSFS{idProduct}=="d094", MODE="666"
+ATTRS{idVendor}=="0765", ATTRS{idProduct}=="d094", ENV{COLOR_MEASUREMENT_DEVICE}="1"
 
 # MonacoOPTIX (Same as i1 Display 1)
-SYSFS{idVendor}=="0670", SYSFS{idProduct}=="0001", MODE="666"
+ATTRS{idVendor}=="0670", ATTRS{idProduct}=="0001", ENV{COLOR_MEASUREMENT_DEVICE}="1"
 
 # i1Display
-SYSFS{idVendor}=="0971", SYSFS{idProduct}=="2003", MODE="666"
+ATTRS{idVendor}=="0971", ATTRS{idProduct}=="2003", ENV{COLOR_MEASUREMENT_DEVICE}="1"
 
 # i1Monitor
-SYSFS{idVendor}=="0971", SYSFS{idProduct}=="2001", MODE="666"
+ATTRS{idVendor}=="0971", ATTRS{idProduct}=="2001", ENV{COLOR_MEASUREMENT_DEVICE}="1"
 
 # i1Pro
-SYSFS{idVendor}=="0971", SYSFS{idProduct}=="2000", MODE="666"
+ATTRS{idVendor}=="0971", ATTRS{idProduct}=="2000", ENV{COLOR_MEASUREMENT_DEVICE}="1"
+
+# ColorMunki
+ATTRS{idVendor}=="0971", ATTRS{idProduct}=="2007", ENV{COLOR_MEASUREMENT_DEVICE}="1"
 
 # Colorimtre HCFR
-SYSFS{idVendor}=="04db", SYSFS{idProduct}=="005b", MODE="666"
+ATTRS{idVendor}=="04db", ATTRS{idProduct}=="005b", ENV{COLOR_MEASUREMENT_DEVICE}="1"
 
 # Spyder 2
-SYSFS{idVendor}=="085c", SYSFS{idProduct}=="0200", MODE="666"
+ATTRS{idVendor}=="085c", ATTRS{idProduct}=="0200", ENV{COLOR_MEASUREMENT_DEVICE}="1"
+
+# Spyder 3
+ATTRS{idVendor}=="085c", ATTRS{idProduct}=="0300", ENV{COLOR_MEASUREMENT_DEVICE}="1"
 
 # Huey
-SYSFS{idVendor}=="0971", SYSFS{idProduct}=="2005", MODE="666"
+ATTRS{idVendor}=="0971", ATTRS{idProduct}=="2005", ENV{COLOR_MEASUREMENT_DEVICE}="1"
+
+# color calibration device
+ENV{COLOR_MEASUREMENT_DEVICE}=="*?", ENV{ACL_MANAGE}="1", IMPORT{program}="usb-db %p"
+
+LABEL="argyll_rules_end"


Index: argyllcms.spec
===================================================================
RCS file: /cvs/pkgs/rpms/argyllcms/F-12/argyllcms.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- argyllcms.spec	9 Nov 2009 21:47:05 -0000	1.15
+++ argyllcms.spec	2 Feb 2010 09:10:33 -0000	1.16
@@ -5,7 +5,7 @@
 
 Name:    argyllcms
 Version: 1.0.4
-Release: 4%{?alphatag}%{?dist}
+Release: 5%{?alphatag}%{?dist}
 Summary: ICC compatible color management system
 
 Group:   User Interface/X
@@ -22,6 +22,7 @@ Patch4:  %{name}-1.0.2-legal.patch
 #Patch6: argyllcms-CVE-2009-0792.patch
 #Patch7: argyllcms-1.0.3-autotools.patch
 Patch8: argyllcms-1.0.4-dispwin-randr-fix.patch
+Patch9: argyllcms-1.0.4-use-acl-udev-rules.patch
 
 BuildRoot:     %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildRequires: libtiff-devel, libusb-devel
@@ -72,6 +73,7 @@ This package contains the Argyll color m
 #%patch6 -p0
 #%patch7 -p0
 %patch8 -p1 -b .randr
+%patch9 -p1 -b .acl-rules
 
 # Salvage policy files
 mv libusb/19-color.fdi .
@@ -134,6 +136,11 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Feb 01 2010 Richard Hughes <rhughes at redhat.com> - 1.0.4-5
+- Backport the 55-Argyll.rules files from hargyllcms as the upstream Argyll file
+  is insecure.
+- Resolves #560050
+
 * Mon Nov 09 2009 Adam Jackson <ajax at redhat.com> 1.0.4-4
 - argyllcms-1.0.4-dispwin-randr-fix.patch: Fix dispwin to not look at
   outputs with no CRTC (which is not the same thing as outputs with no