[arch-commits] Commit in systemd/trunk (2 files)

[Jan Steffens]

    Date: Wednesday, March 20, 2013 @ 20:23:22
  Author: heftig
Revision: 180377

use backported patch that actually applies

Modified:
  systemd/trunk/0001-rules-move-builtin-calls-before-the-permissions-sect.patch
  systemd/trunk/PKGBUILD

-----------------------------------------------------------------+
 0001-rules-move-builtin-calls-before-the-permissions-sect.patch |   19 ++++++----
 PKGBUILD                                                        |    2 -
 2 files changed, 13 insertions(+), 8 deletions(-)

Modified: 0001-rules-move-builtin-calls-before-the-permissions-sect.patch
===================================================================
--- 0001-rules-move-builtin-calls-before-the-permissions-sect.patch	2013-03-20 18:37:55 UTC (rev 180376)
+++ 0001-rules-move-builtin-calls-before-the-permissions-sect.patch	2013-03-20 19:23:22 UTC (rev 180377)
@@ -1,4 +1,4 @@
-From bbb7f2ae5035105575365750592caa87213d7072 Mon Sep 17 00:00:00 2001
+From 34b99a8bf7b769b31ad59ff0d60f8572bd0adab5 Mon Sep 17 00:00:00 2001
 From: Kay Sievers <kay at vrfy.org>
 Date: Wed, 20 Mar 2013 01:26:17 +0100
 Subject: [PATCH] rules: move builtin calls before the permissions section
@@ -7,15 +7,18 @@
 <heftig> because the "lp" group isn't applied anymore
 <heftig> SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ENV{ID_USB_INTERFACES}=="*:0701??:*", GROUP="lp"
 <heftig> moving this line to the end of 50-udev-default.rules restores correct behavior, as it's after usb_id
+
+Conflicts:
+	rules/50-udev-default.rules
 ---
- rules/50-udev-default.rules | 15 +++++++++------
- 1 file changed, 9 insertions(+), 6 deletions(-)
+ rules/50-udev-default.rules | 17 ++++++++++-------
+ 1 file changed, 10 insertions(+), 7 deletions(-)
 
 diff --git a/rules/50-udev-default.rules b/rules/50-udev-default.rules
-index 9d17cf7..1790652 100644
+index 5d8bde5..ce0a4ef 100644
 --- a/rules/50-udev-default.rules
 +++ b/rules/50-udev-default.rules
-@@ -1,5 +1,12 @@
+@@ -1,5 +1,13 @@
  # do not edit this file, it will be overwritten on update
  
 +SUBSYSTEM=="rtc", ATTR{hctosys}=="1", SYMLINK+="rtc"
@@ -23,12 +26,13 @@
 +
 +SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", IMPORT{builtin}="usb_id", IMPORT{builtin}="hwdb --subsystem=usb"
 +SUBSYSTEM=="input", ENV{ID_INPUT}=="", IMPORT{builtin}="input_id"
++SUBSYSTEM=="firmware", ACTION=="add", IMPORT{builtin}="firmware"
 +ENV{MODALIAS}!="", IMPORT{builtin}="hwdb --subsystem=$env{SUBSYSTEM}"
 +
  ACTION!="add", GOTO="default_permissions_end"
  
  SUBSYSTEM=="tty", KERNEL=="ptmx", GROUP="tty", MODE="0666"
-@@ -8,6 +15,8 @@ SUBSYSTEM=="tty", KERNEL=="tty[0-9]*", GROUP="tty", MODE="0620"
+@@ -8,6 +16,8 @@ SUBSYSTEM=="tty", KERNEL=="tty[0-9]*", GROUP="tty", MODE="0620"
  SUBSYSTEM=="vc", KERNEL=="vcs*|vcsa*", GROUP="tty"
  KERNEL=="tty[A-Z]*[0-9]|pppox[0-9]*|ircomm[0-9]*|noz[0-9]*|rfcomm[0-9]*", GROUP="dialout"
  
@@ -37,7 +41,7 @@
  SUBSYSTEM=="mem", KERNEL=="mem|kmem|port", GROUP="kmem", MODE="0640"
  
  SUBSYSTEM=="input", KERNEL=="mouse*|mice|event*", MODE="0640"
-@@ -59,9 +68,3 @@ KERNEL=="tun", MODE="0666", OPTIONS+="static_node=net/tun"
+@@ -59,10 +69,3 @@ KERNEL=="tun", MODE="0666", OPTIONS+="static_node=net/tun"
  KERNEL=="fuse", MODE="0666", OPTIONS+="static_node=fuse"
  
  LABEL="default_permissions_end"
@@ -46,6 +50,7 @@
 -
 -SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", IMPORT{builtin}="usb_id", IMPORT{builtin}="hwdb --subsystem=usb"
 -SUBSYSTEM=="input", ENV{ID_INPUT}=="", IMPORT{builtin}="input_id"
+-SUBSYSTEM=="firmware", ACTION=="add", IMPORT{builtin}="firmware"
 -ENV{MODALIAS}!="", IMPORT{builtin}="hwdb --subsystem=$env{SUBSYSTEM}"
 -- 
 1.8.2

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-03-20 18:37:55 UTC (rev 180376)
+++ PKGBUILD	2013-03-20 19:23:22 UTC (rev 180377)
@@ -26,7 +26,7 @@
          'df69615503ad293c9ddf9d8b7755282d'
          'c93785560cd33e25013224ac84689aa3'
          '80db2672a49667a3add02fb07dee9dca'
-         '8d45beb923b06d52cc5dc2be65df6d7f'
+         'a0d3aca35ff7f71d1a5a79022b715ae0'
          '76bf83fe34c5b40533abc5dc940576a6')
 
 build() {