[arch-commits] Commit in udev/trunk (81-arch.rules PKGBUILD arch-udev-rules.patch)

[Tobias Powalowski]

    Date: Wednesday, March 18, 2009 @ 17:48:49
  Author: tpowa
Revision: 30320

'fix #13839 #13842'

Modified:
  udev/trunk/81-arch.rules
  udev/trunk/PKGBUILD
  udev/trunk/arch-udev-rules.patch

-----------------------+
 81-arch.rules         |    4 ++--
 PKGBUILD              |   11 +++++++----
 arch-udev-rules.patch |   14 --------------
 3 files changed, 9 insertions(+), 20 deletions(-)

Modified: 81-arch.rules
===================================================================
--- 81-arch.rules	2009-03-18 21:44:45 UTC (rev 30319)
+++ 81-arch.rules	2009-03-18 21:48:49 UTC (rev 30320)
@@ -61,7 +61,7 @@
 ENV{ID_CDROM}=="?*", SYMLINK+="cd/cdrom-%b"
 ENV{ID_CDROM_CD_RW}=="?*", SYMLINK+="cd/cdrw-%b"
 ENV{ID_CDROM_DVD}=="?*", SYMLINK+="cd/dvd-%b"
-ENV{ID_CDROM_DVD_R}=="?*", SYMLINK+="cd/dvd-%b"
+ENV{ID_CDROM_DVD_R}=="?*", SYMLINK+="cd/dvdrw-%b"
 ACTION=="add", SUBSYSTEMS=="ide", KERNEL=="hd[a-z]", ATTR{removable}=="1", ATTRS{media}=="cdrom*", RUN+="cdsymlinks.sh"
 ACTION=="add", SUBSYSTEMS=="scsi", KERNEL=="sr[0-9]*", ATTRS{type}=="5", RUN+="cdsymlinks.sh"
 ACTION=="add", SUBSYSTEMS=="scsi", KERNEL=="sg[0-9]*", ATTRS{type}=="5", RUN+="cdsymlinks.sh"
@@ -172,7 +172,7 @@
 KERNEL=="amixer*",	NAME="sound/%k", SYMLINK+="%k"
 KERNEL=="music",	NAME="sound/%k", SYMLINK+="%k"
 KERNEL=="dmfm*",	NAME="sound/%k", SYMLINK+="%k"
-KERNEL=="midi[0-9]*",	NAME="sound/%k", SYMLINK+="%k
+KERNEL=="midi[0-9]*",	NAME="sound/%k", SYMLINK+="%k"
 
 # USB devices
 KERNEL=="legousbtower*", MODE="0666"

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2009-03-18 21:44:45 UTC (rev 30319)
+++ PKGBUILD	2009-03-18 21:48:49 UTC (rev 30320)
@@ -4,7 +4,7 @@
 # Maintainer: Thomas Bächler <thomas at archlinux.org>
 pkgname=udev
 pkgver=140
-pkgrel=1
+pkgrel=2
 pkgdesc="The userspace dev tools (udev)"
 arch=(i686 x86_64)
 url="http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html"
@@ -26,12 +26,12 @@
         81-arch.rules load-modules.sh resolve-modalias.c cdsymlinks.sh root-link.sh
         arch-udev-rules.patch readme-udev-arch.txt ignore-remove.sh)
 md5sums=('7d1e5737a3557849eecd701a7fb068b4'
-         'de602ae07903946c0bbd518ef48702b3'
+         '825b2a4c7a7d781cc4d78f7d00e91617'
          'f4951f61438d69894b728212dac7318b'
          'e0d7ab73ec42eb81947daf23e224c0fb'
          'c090a2d58c4b9a227ad2f0675c6b54c1'
          '2d6dc6842464f107bccc68cd505a6c31'
-         'f3b715e6dea49ffe40b1b18083376096'
+         'b99537347a0b33815d64c97bd6f954ee'
          'fabe285ca75122bd0f2033f13869989d'
          '35fa97500243a79b2370fa4684828e69')
 
@@ -40,7 +40,10 @@
   ./configure --prefix="" --mandir=/usr/share/man --includedir=/usr/include
   make || return 1
   make DESTDIR=$startdir/pkg install
-
+  # Replace dialout group in rules with uucp group
+  for i in $pkgdir/lib/udev/rules.d/*.rules; do
+    sed -i -e 's#GROUP="dialout"#GROUP="uucp"#g' $i
+  done
   # Fix pkgconfig path
   install -d -m755 $pkgdir/usr/lib
   mv $pkgdir/lib/pkgconfig $pkgdir/usr/lib

Modified: arch-udev-rules.patch
===================================================================
--- arch-udev-rules.patch	2009-03-18 21:44:45 UTC (rev 30319)
+++ arch-udev-rules.patch	2009-03-18 21:48:49 UTC (rev 30320)
@@ -1,20 +1,6 @@
 diff -Nur rules.d/50-udev-default.rules rules.d.arch/50-udev-default.rules
 --- rules.d/50-udev-default.rules	2009-03-07 22:22:48.200242883 +0100
 +++ rules.d.arch/50-udev-default.rules	2009-03-07 22:23:26.134434516 +0100
-@@ -12,10 +12,10 @@
- KERNEL=="console",		MODE="0600"
- 
- # serial
--KERNEL=="tty[A-Z]*[0-9]|pppox[0-9]*|ircomm[0-9]*|noz[0-9]*", GROUP="dialout"
-+KERNEL=="tty[A-Z]*[0-9]|pppox[0-9]*|ircomm[0-9]*|noz[0-9]*", GROUP="uucp"
- KERNEL=="ppp",			MODE="0600"
--KERNEL=="mwave",		NAME="modems/mwave", GROUP="dialout"
--KERNEL=="hvc*|hvsi*",		GROUP="dialout"
-+KERNEL=="mwave",		NAME="modems/mwave", GROUP="uucp"
-+KERNEL=="hvc*|hvsi*",		GROUP="uucp"
- 
- # mem
- KERNEL=="null|zero|full|random|urandom", MODE="0666"
 @@ -64,20 +64,20 @@
  
  # floppy