| 1 |
billie 10/03/30 17:32:44 |
| 2 |
|
| 3 |
Added: hplip-3.10.2-udev-attrs.patch |
| 4 |
Removed: hplip-3.9.10-cupsddk.patch |
| 5 |
Log: |
| 6 |
Further python eclass related fixes. Removed unused patch. Hopefully fixes bug #277391. |
| 7 |
(Portage version: 2.1.7.17/cvs/Linux i686) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 net-print/hplip/files/hplip-3.10.2-udev-attrs.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-print/hplip/files/hplip-3.10.2-udev-attrs.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-print/hplip/files/hplip-3.10.2-udev-attrs.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: hplip-3.10.2-udev-attrs.patch |
| 16 |
=================================================================== |
| 17 |
diff -Naur hplip-3.10.2-old/data/rules/55-hpmud.rules hplip-3.10.2/data/rules/55-hpmud.rules |
| 18 |
--- hplip-3.10.2-old/data/rules/55-hpmud.rules 2010-02-25 00:06:35.000000000 +0100 |
| 19 |
+++ hplip-3.10.2/data/rules/55-hpmud.rules 2010-03-29 01:43:25.191669512 +0200 |
| 20 |
@@ -21,124 +21,124 @@ |
| 21 |
LABEL="hplip_pid_test" |
| 22 |
|
| 23 |
# Check for AiO products (0x03f0xx11). |
| 24 |
-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="??11", OWNER="root", GROUP="lp", MODE="660" |
| 25 |
+ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="??11", OWNER="root", GROUP="lp", MODE="660" |
| 26 |
|
| 27 |
# Check for Photosmart products without wildcard since cameras and scanners also used (0x03f0xx02). |
| 28 |
# The xx02 pid has been retired so this explicit list should not change. |
| 29 |
# photosmart_d2300_series |
| 30 |
-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="c302", OWNER="root", GROUP="lp", MODE="660" |
| 31 |
+ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="c302", OWNER="root", GROUP="lp", MODE="660" |
| 32 |
# photosmart_100 |
| 33 |
-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="3802", OWNER="root", GROUP="lp", MODE="660" |
| 34 |
+ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="3802", OWNER="root", GROUP="lp", MODE="660" |
| 35 |
# photosmart_1115 |
| 36 |
-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="3402", OWNER="root", GROUP="lp", MODE="660" |
| 37 |
+ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="3402", OWNER="root", GROUP="lp", MODE="660" |
| 38 |
# photosmart_1215 |
| 39 |
-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="3202", OWNER="root", GROUP="lp", MODE="660" |
| 40 |
+ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="3202", OWNER="root", GROUP="lp", MODE="660" |
| 41 |
# photosmart_1218 |
| 42 |
-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="3302", OWNER="root", GROUP="lp", MODE="660" |
| 43 |
+ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="3302", OWNER="root", GROUP="lp", MODE="660" |
| 44 |
# photosmart_130 |
| 45 |
-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="3902", OWNER="root", GROUP="lp", MODE="660" |
| 46 |
+ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="3902", OWNER="root", GROUP="lp", MODE="660" |
| 47 |
# photosmart_1315 |
| 48 |
-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="3602", OWNER="root", GROUP="lp", MODE="660" |
| 49 |
+ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="3602", OWNER="root", GROUP="lp", MODE="660" |
| 50 |
# photosmart_140_series |
| 51 |
-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="1002", OWNER="root", GROUP="lp", MODE="660" |
| 52 |
+ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="1002", OWNER="root", GROUP="lp", MODE="660" |
| 53 |
# photosmart_230 |
| 54 |
-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="3502", OWNER="root", GROUP="lp", MODE="660" |
| 55 |
+ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="3502", OWNER="root", GROUP="lp", MODE="660" |
| 56 |
# photosmart_240_series |
| 57 |
-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="1102", OWNER="root", GROUP="lp", MODE="660" |
| 58 |
+ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="1102", OWNER="root", GROUP="lp", MODE="660" |
| 59 |
# photosmart_320_series |
| 60 |
-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="1202", OWNER="root", GROUP="lp", MODE="660" |
| 61 |
+ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="1202", OWNER="root", GROUP="lp", MODE="660" |
| 62 |
# photosmart_330_series |
| 63 |
-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="1602", OWNER="root", GROUP="lp", MODE="660" |
| 64 |
+ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="1602", OWNER="root", GROUP="lp", MODE="660" |
| 65 |
# photosmart_370_series |
| 66 |
-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="1302", OWNER="root", GROUP="lp", MODE="660" |
| 67 |
+ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="1302", OWNER="root", GROUP="lp", MODE="660" |
| 68 |
# photosmart_380_series |
| 69 |
-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="1702", OWNER="root", GROUP="lp", MODE="660" |
| 70 |
+ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="1702", OWNER="root", GROUP="lp", MODE="660" |
| 71 |
# photosmart_420_series |
| 72 |
-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="1502", OWNER="root", GROUP="lp", MODE="660" |
| 73 |
+ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="1502", OWNER="root", GROUP="lp", MODE="660" |
| 74 |
# photosmart_470_series |
| 75 |
-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="1802", OWNER="root", GROUP="lp", MODE="660" |
| 76 |
+ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="1802", OWNER="root", GROUP="lp", MODE="660" |
| 77 |
# photosmart_7150 |
| 78 |
-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="3a02", OWNER="root", GROUP="lp", MODE="660" |
| 79 |
-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="3b02", OWNER="root", GROUP="lp", MODE="660" |
| 80 |
+ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="3a02", OWNER="root", GROUP="lp", MODE="660" |
| 81 |
+ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="3b02", OWNER="root", GROUP="lp", MODE="660" |
| 82 |
# photosmart_7200_series |
| 83 |
-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="b002", OWNER="root", GROUP="lp", MODE="660" |
| 84 |
+ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="b002", OWNER="root", GROUP="lp", MODE="660" |
| 85 |
# photosmart_7345 |
| 86 |
-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="2002", OWNER="root", GROUP="lp", MODE="660" |
| 87 |
+ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="2002", OWNER="root", GROUP="lp", MODE="660" |
| 88 |
# photosmart_7350 |
| 89 |
-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="3c02", OWNER="root", GROUP="lp", MODE="660" |
| 90 |
+ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="3c02", OWNER="root", GROUP="lp", MODE="660" |
| 91 |
# photosmart_7400_series |
| 92 |
-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="b802", OWNER="root", GROUP="lp", MODE="660" |
| 93 |
+ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="b802", OWNER="root", GROUP="lp", MODE="660" |
| 94 |
# photosmart_7550 |
| 95 |
-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="3e02", OWNER="root", GROUP="lp", MODE="660" |
| 96 |
+ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="3e02", OWNER="root", GROUP="lp", MODE="660" |
| 97 |
# photosmart_7600_series |
| 98 |
-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="b202", OWNER="root", GROUP="lp", MODE="660" |
| 99 |
+ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="b202", OWNER="root", GROUP="lp", MODE="660" |
| 100 |
# photosmart_7700_series |
| 101 |
-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="b402", OWNER="root", GROUP="lp", MODE="660" |
| 102 |
+ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="b402", OWNER="root", GROUP="lp", MODE="660" |
| 103 |
# photosmart_7800_series |
| 104 |
-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="c002", OWNER="root", GROUP="lp", MODE="660" |
| 105 |
+ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="c002", OWNER="root", GROUP="lp", MODE="660" |
| 106 |
# photosmart_7900_series |
| 107 |
-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="b602", OWNER="root", GROUP="lp", MODE="660" |
| 108 |
+ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="b602", OWNER="root", GROUP="lp", MODE="660" |
| 109 |
# photosmart_8000_series |
| 110 |
-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="c102", OWNER="root", GROUP="lp", MODE="660" |
| 111 |
+ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="c102", OWNER="root", GROUP="lp", MODE="660" |
| 112 |
# photosmart_8100_series |
| 113 |
-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="ba02", OWNER="root", GROUP="lp", MODE="660" |
| 114 |
+ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="ba02", OWNER="root", GROUP="lp", MODE="660" |
| 115 |
# photosmart_8200_series |
| 116 |
-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="c202", OWNER="root", GROUP="lp", MODE="660" |
| 117 |
+ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="c202", OWNER="root", GROUP="lp", MODE="660" |
| 118 |
# photosmart_8400_series |
| 119 |
-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="bb02", OWNER="root", GROUP="lp", MODE="660" |
| 120 |
+ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="bb02", OWNER="root", GROUP="lp", MODE="660" |
| 121 |
# photosmart_8700_series |
| 122 |
-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="bc02", OWNER="root", GROUP="lp", MODE="660" |
| 123 |
+ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="bc02", OWNER="root", GROUP="lp", MODE="660" |
| 124 |
# photosmart_a310_series |
| 125 |
-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="1d02", OWNER="root", GROUP="lp", MODE="660" |
| 126 |
+ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="1d02", OWNER="root", GROUP="lp", MODE="660" |
| 127 |
# photosmart_a320_series |
| 128 |
-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="1e02", OWNER="root", GROUP="lp", MODE="660" |
| 129 |
+ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="1e02", OWNER="root", GROUP="lp", MODE="660" |
| 130 |
# photosmart_a430_series |
| 131 |
-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="1902", OWNER="root", GROUP="lp", MODE="660" |
| 132 |
+ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="1902", OWNER="root", GROUP="lp", MODE="660" |
| 133 |
# photosmart_a440_series |
| 134 |
-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="1f02", OWNER="root", GROUP="lp", MODE="660" |
| 135 |
+ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="1f02", OWNER="root", GROUP="lp", MODE="660" |
| 136 |
# photosmart_a510_series |
| 137 |
-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="1a02", OWNER="root", GROUP="lp", MODE="660" |
| 138 |
+ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="1a02", OWNER="root", GROUP="lp", MODE="660" |
| 139 |
# photosmart_a520_series |
| 140 |
-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="2602", OWNER="root", GROUP="lp", MODE="660" |
| 141 |
+ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="2602", OWNER="root", GROUP="lp", MODE="660" |
| 142 |
# photosmart_a530_series |
| 143 |
-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="2b02", OWNER="root", GROUP="lp", MODE="660" |
| 144 |
+ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="2b02", OWNER="root", GROUP="lp", MODE="660" |
| 145 |
# photosmart_a610_series |
| 146 |
-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="1b02", OWNER="root", GROUP="lp", MODE="660" |
| 147 |
+ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="1b02", OWNER="root", GROUP="lp", MODE="660" |
| 148 |
# photosmart_a620_series |
| 149 |
-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="2702", OWNER="root", GROUP="lp", MODE="660" |
| 150 |
+ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="2702", OWNER="root", GROUP="lp", MODE="660" |
| 151 |
# photosmart_a630_series |
| 152 |
-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="2c02", OWNER="root", GROUP="lp", MODE="660" |
| 153 |
+ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="2c02", OWNER="root", GROUP="lp", MODE="660" |
| 154 |
# photosmart_a710_series |
| 155 |
-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="1c02", OWNER="root", GROUP="lp", MODE="660" |
| 156 |
+ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="1c02", OWNER="root", GROUP="lp", MODE="660" |
| 157 |
# photosmart_a820_series |
| 158 |
-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="2902", OWNER="root", GROUP="lp", MODE="660" |
| 159 |
+ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="2902", OWNER="root", GROUP="lp", MODE="660" |
| 160 |
# photosmart_d5060_series |
| 161 |
-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="c802", OWNER="root", GROUP="lp", MODE="660" |
| 162 |
+ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="c802", OWNER="root", GROUP="lp", MODE="660" |
| 163 |
# photosmart_d5100_series |
| 164 |
-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="c402", OWNER="root", GROUP="lp", MODE="660" |
| 165 |
+ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="c402", OWNER="root", GROUP="lp", MODE="660" |
| 166 |
# photosmart_d6100_series |
| 167 |
-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="c502", OWNER="root", GROUP="lp", MODE="660" |
| 168 |
+ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="c502", OWNER="root", GROUP="lp", MODE="660" |
| 169 |
# photosmart_d7100_series |
| 170 |
-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="c602", OWNER="root", GROUP="lp", MODE="660" |
| 171 |
+ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="c602", OWNER="root", GROUP="lp", MODE="660" |
| 172 |
# photosmart_d7300_series |
| 173 |
-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="c702", OWNER="root", GROUP="lp", MODE="660" |
| 174 |
+ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="c702", OWNER="root", GROUP="lp", MODE="660" |
| 175 |
# photosmart_pro_b8300_series |
| 176 |
-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="be02", OWNER="root", GROUP="lp", MODE="660" |
| 177 |
+ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="be02", OWNER="root", GROUP="lp", MODE="660" |
| 178 |
# photosmart_b8800_series |
| 179 |
-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="d002", OWNER="root", GROUP="lp", MODE="660" |
| 180 |
+ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="d002", OWNER="root", GROUP="lp", MODE="660" |
| 181 |
# photosmart_pro_b9100_series |
| 182 |
-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="bd02", OWNER="root", GROUP="lp", MODE="660" |
| 183 |
+ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="bd02", OWNER="root", GROUP="lp", MODE="660" |
| 184 |
# Photosmart_B8500_series |
| 185 |
-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="d102", OWNER="root", GROUP="lp", MODE="660" |
| 186 |
+ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="d102", OWNER="root", GROUP="lp", MODE="660" |
| 187 |
# Photosmart_A640_series |
| 188 |
-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="7902", OWNER="root", GROUP="lp", MODE="660" |
| 189 |
+ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="7902", OWNER="root", GROUP="lp", MODE="660" |
| 190 |
|
| 191 |
# Check for Business Inkjet products (0x03f0xx12). |
| 192 |
-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="??12", OWNER="root", GROUP="lp", MODE="660" |
| 193 |
+ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="??12", OWNER="root", GROUP="lp", MODE="660" |
| 194 |
# Check for Deskjet products (0x03f0xx04). |
| 195 |
-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="??04", OWNER="root", GROUP="lp", MODE="660" |
| 196 |
+ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="??04", OWNER="root", GROUP="lp", MODE="660" |
| 197 |
# Check for LaserJet products (0x03f0xx17). |
| 198 |
-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="??17", OWNER="root", GROUP="lp", MODE="660" |
| 199 |
+ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="??17", OWNER="root", GROUP="lp", MODE="660" |
| 200 |
|
| 201 |
# Removed the following rule because FHS states that /etc should be reserved for static files only. This |
| 202 |
# functionality should be done in a deb/rpm post install script. 2/11/2009, D Suffield |
| 203 |
diff -Naur hplip-3.10.2-old/data/rules/56-hpmud_support.rules hplip-3.10.2/data/rules/56-hpmud_support.rules |
| 204 |
--- hplip-3.10.2-old/data/rules/56-hpmud_support.rules 2010-02-25 00:06:35.000000000 +0100 |
| 205 |
+++ hplip-3.10.2/data/rules/56-hpmud_support.rules 2010-03-29 01:45:12.941658101 +0200 |
| 206 |
@@ -7,8 +7,8 @@ |
| 207 |
LABEL="pid_test" |
| 208 |
|
| 209 |
# Check for LaserJet products (0x03f0xx17). |
| 210 |
-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="??17", ENV{hp_model}="$sysfs{product}", ENV{hp_test}="yes" |
| 211 |
+ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="??17", RUN+="/bin/sh -c 'hp_model=%E{ID_MODEL} /usr/bin/hp-mkuri -c &'" |
| 212 |
|
| 213 |
ENV{hp_test}=="yes", RUN+="bin/sh -c '/usr/bin/hp-mkuri -c &'" |
| 214 |
|
| 215 |
-LABEL="hpmud_rules_end" |
| 216 |
\ No newline at end of file |
| 217 |
+LABEL="hpmud_rules_end" |
Archives