Merge branch 'master' of ssh://kiao.no-ip.info:443/~/attapu

3 files changed, 98 insertions, 7 deletions

diff --git a/base/udev/.footprint b/base/udev/.footprint
index 1594f6e61..849e80b59 100644
--- a/base/udev/.footprint
+++ b/base/udev/.footprint
@@ -5,8 +5,8 @@ drwxr-xr-x	root/root	etc/udev/rules.d/
 -rw-r--r--	root/root	etc/udev/udev.conf
 drwxr-xr-x	root/root	lib/
 drwxr-xr-x	root/root	lib/firmware/
-lrwxrwxrwx	root/root	lib/libudev.so.0 -> libudev.so.0.8.2
--rwxr-xr-x	root/root	lib/libudev.so.0.8.2
+lrwxrwxrwx	root/root	lib/libudev.so.0 -> libudev.so.0.8.3
+-rwxr-xr-x	root/root	lib/libudev.so.0.8.3
 drwxr-xr-x	root/root	lib/udev/
 -rwxr-xr-x	root/root	lib/udev/ata_id
 -rwxr-xr-x	root/root	lib/udev/cdrom_id
@@ -21,10 +21,69 @@ lrwxrwxrwx	root/root	lib/udev/devices/stderr -> /proc/self/fd/2
 lrwxrwxrwx	root/root	lib/udev/devices/stdin -> /proc/self/fd/0
 lrwxrwxrwx	root/root	lib/udev/devices/stdout -> /proc/self/fd/1
 -rwxr-xr-x	root/root	lib/udev/edd_id
+-rwxr-xr-x	root/root	lib/udev/findkeyboards
 -rwxr-xr-x	root/root	lib/udev/firmware
 -rwxr-xr-x	root/root	lib/udev/fstab_import
+-rwxr-xr-x	root/root	lib/udev/hid2hci
 -rwxr-xr-x	root/root	lib/udev/input_id
+-rwxr-xr-x	root/root	lib/udev/keyboard-force-release.sh
+-rwxr-xr-x	root/root	lib/udev/keymap
+drwxr-xr-x	root/root	lib/udev/keymaps/
+-rw-r--r--	root/root	lib/udev/keymaps/acer
+-rw-r--r--	root/root	lib/udev/keymaps/acer-aspire_5720
+-rw-r--r--	root/root	lib/udev/keymaps/acer-aspire_5920g
+-rw-r--r--	root/root	lib/udev/keymaps/acer-aspire_6920
+-rw-r--r--	root/root	lib/udev/keymaps/acer-travelmate_c300
+-rw-r--r--	root/root	lib/udev/keymaps/asus
+-rw-r--r--	root/root	lib/udev/keymaps/compaq-e_evo
+-rw-r--r--	root/root	lib/udev/keymaps/dell
+-rw-r--r--	root/root	lib/udev/keymaps/everex-xt5000
+drwxr-xr-x	root/root	lib/udev/keymaps/force-release/
+-rw-r--r--	root/root	lib/udev/keymaps/force-release/common-volume-keys
+-rw-r--r--	root/root	lib/udev/keymaps/force-release/samsung-other
+-rw-r--r--	root/root	lib/udev/keymaps/fujitsu-amilo_pa_2548
+-rw-r--r--	root/root	lib/udev/keymaps/fujitsu-amilo_pro_edition_v3505
+-rw-r--r--	root/root	lib/udev/keymaps/fujitsu-amilo_pro_v3205
+-rw-r--r--	root/root	lib/udev/keymaps/fujitsu-amilo_si_1520
+-rw-r--r--	root/root	lib/udev/keymaps/fujitsu-esprimo_mobile_v5
+-rw-r--r--	root/root	lib/udev/keymaps/fujitsu-esprimo_mobile_v6
+-rw-r--r--	root/root	lib/udev/keymaps/hewlett-packard
+-rw-r--r--	root/root	lib/udev/keymaps/hewlett-packard-2510p_2530p
+-rw-r--r--	root/root	lib/udev/keymaps/hewlett-packard-compaq_elitebook
+-rw-r--r--	root/root	lib/udev/keymaps/hewlett-packard-pavilion
+-rw-r--r--	root/root	lib/udev/keymaps/hewlett-packard-presario-2100
+-rw-r--r--	root/root	lib/udev/keymaps/hewlett-packard-tablet
+-rw-r--r--	root/root	lib/udev/keymaps/hewlett-packard-tx2
+-rw-r--r--	root/root	lib/udev/keymaps/inventec-symphony_6.0_7.0
+-rw-r--r--	root/root	lib/udev/keymaps/lenovo-3000
+-rw-r--r--	root/root	lib/udev/keymaps/lenovo-thinkpad-usb-keyboard-trackpoint
+-rw-r--r--	root/root	lib/udev/keymaps/lenovo-thinkpad_x200_tablet
+-rw-r--r--	root/root	lib/udev/keymaps/lenovo-thinkpad_x6_tablet
+-rw-r--r--	root/root	lib/udev/keymaps/lg-x110
+-rw-r--r--	root/root	lib/udev/keymaps/logitech-wave
+-rw-r--r--	root/root	lib/udev/keymaps/logitech-wave-cordless
+-rw-r--r--	root/root	lib/udev/keymaps/maxdata-pro_7000
+-rw-r--r--	root/root	lib/udev/keymaps/medion-fid2060
+-rw-r--r--	root/root	lib/udev/keymaps/medionnb-a555
+-rw-r--r--	root/root	lib/udev/keymaps/micro-star
+-rw-r--r--	root/root	lib/udev/keymaps/module-asus-w3j
+-rw-r--r--	root/root	lib/udev/keymaps/module-ibm
+-rw-r--r--	root/root	lib/udev/keymaps/module-lenovo
+-rw-r--r--	root/root	lib/udev/keymaps/module-sony
+-rw-r--r--	root/root	lib/udev/keymaps/module-sony-old
+-rw-r--r--	root/root	lib/udev/keymaps/olpc-xo
+-rw-r--r--	root/root	lib/udev/keymaps/oqo-model2
+-rw-r--r--	root/root	lib/udev/keymaps/samsung-other
+-rw-r--r--	root/root	lib/udev/keymaps/samsung-sq1us
+-rw-r--r--	root/root	lib/udev/keymaps/samsung-sx20s
+-rw-r--r--	root/root	lib/udev/keymaps/toshiba-satellite_a100
+-rw-r--r--	root/root	lib/udev/keymaps/toshiba-satellite_a110
+-rw-r--r--	root/root	lib/udev/keymaps/toshiba-satellite_m30x
+-rw-r--r--	root/root	lib/udev/keymaps/zepto-znote
+-rwxr-xr-x	root/root	lib/udev/mobile-action-modeswitch
+-rwxr-xr-x	root/root	lib/udev/mtd_probe
 -rwxr-xr-x	root/root	lib/udev/path_id
+-rwxr-xr-x	root/root	lib/udev/pci-db
 -rw-r--r--	root/root	lib/udev/rule_generator.functions
 drwxr-xr-x	root/root	lib/udev/rules.d/
 -rw-r--r--	root/root	lib/udev/rules.d/30-kernel-compat.rules
@@ -38,13 +97,24 @@ drwxr-xr-x	root/root	lib/udev/rules.d/
 -rw-r--r--	root/root	lib/udev/rules.d/60-persistent-storage-tape.rules
 -rw-r--r--	root/root	lib/udev/rules.d/60-persistent-storage.rules
 -rw-r--r--	root/root	lib/udev/rules.d/60-persistent-v4l.rules
+-rw-r--r--	root/root	lib/udev/rules.d/61-mobile-action.rules
 -rw-r--r--	root/root	lib/udev/rules.d/61-persistent-storage-edd.rules
+-rw-r--r--	root/root	lib/udev/rules.d/70-acl.rules
+-rw-r--r--	root/root	lib/udev/rules.d/70-hid2hci.rules
 -rw-r--r--	root/root	lib/udev/rules.d/75-cd-aliases-generator.rules
+-rw-r--r--	root/root	lib/udev/rules.d/75-net-description.rules
 -rw-r--r--	root/root	lib/udev/rules.d/75-persistent-net-generator.rules
+-rw-r--r--	root/root	lib/udev/rules.d/75-probe_mtd.rules
+-rw-r--r--	root/root	lib/udev/rules.d/75-tty-description.rules
+-rw-r--r--	root/root	lib/udev/rules.d/78-sound-card.rules
 -rw-r--r--	root/root	lib/udev/rules.d/79-fstab_import.rules
 -rw-r--r--	root/root	lib/udev/rules.d/80-drivers.rules
+-rw-r--r--	root/root	lib/udev/rules.d/95-keyboard-force-release.rules
+-rw-r--r--	root/root	lib/udev/rules.d/95-keymap.rules
 -rw-r--r--	root/root	lib/udev/rules.d/95-udev-late.rules
 -rwxr-xr-x	root/root	lib/udev/scsi_id
+-rwxr-xr-x	root/root	lib/udev/udev-acl
+-rwxr-xr-x	root/root	lib/udev/usb-db
 -rwxr-xr-x	root/root	lib/udev/usb_id
 -rwxr-xr-x	root/root	lib/udev/v4l_id
 -rwxr-xr-x	root/root	lib/udev/write_cd_rules
@@ -54,16 +124,36 @@ drwxr-xr-x	root/root	sbin/
 -rwxr-xr-x	root/root	sbin/udevd
 drwxr-xr-x	root/root	usr/
 drwxr-xr-x	root/root	usr/include/
+drwxr-xr-x	root/root	usr/include/gudev-1.0/
+drwxr-xr-x	root/root	usr/include/gudev-1.0/gudev/
+-rw-r--r--	root/root	usr/include/gudev-1.0/gudev/gudev.h
+-rw-r--r--	root/root	usr/include/gudev-1.0/gudev/gudevclient.h
+-rw-r--r--	root/root	usr/include/gudev-1.0/gudev/gudevdevice.h
+-rw-r--r--	root/root	usr/include/gudev-1.0/gudev/gudevenums.h
+-rw-r--r--	root/root	usr/include/gudev-1.0/gudev/gudevenumtypes.h
+-rw-r--r--	root/root	usr/include/gudev-1.0/gudev/gudevtypes.h
 -rw-r--r--	root/root	usr/include/libudev.h
 drwxr-xr-x	root/root	usr/lib/
+drwxr-xr-x	root/root	usr/lib/ConsoleKit/
+drwxr-xr-x	root/root	usr/lib/ConsoleKit/run-seat.d/
+lrwxrwxrwx	root/root	usr/lib/ConsoleKit/run-seat.d/udev-acl.ck -> /lib/udev/udev-acl
+drwxr-xr-x	root/root	usr/lib/girepository-1.0/
+-rw-r--r--	root/root	usr/lib/girepository-1.0/GUdev-1.0.typelib
+-rwxr-xr-x	root/root	usr/lib/libgudev-1.0.la
+lrwxrwxrwx	root/root	usr/lib/libgudev-1.0.so -> libgudev-1.0.so.0.0.1
+lrwxrwxrwx	root/root	usr/lib/libgudev-1.0.so.0 -> libgudev-1.0.so.0.0.1
+-rwxr-xr-x	root/root	usr/lib/libgudev-1.0.so.0.0.1
 -rwxr-xr-x	root/root	usr/lib/libudev.la
-lrwxrwxrwx	root/root	usr/lib/libudev.so -> ../../lib/libudev.so.0.8.2
+lrwxrwxrwx	root/root	usr/lib/libudev.so -> ../../lib/libudev.so.0.8.3
 drwxr-xr-x	root/root	usr/lib/pkgconfig/
+-rw-r--r--	root/root	usr/lib/pkgconfig/gudev-1.0.pc
 -rw-r--r--	root/root	usr/lib/pkgconfig/libudev.pc
 drwxr-xr-x	root/root	usr/share/
 drwxr-xr-x	root/root	usr/share/doc/
 drwxr-xr-x	root/root	usr/share/doc/udev-config/
 -rw-r--r--	root/root	usr/share/doc/udev-config/55-lfs.txt
+drwxr-xr-x	root/root	usr/share/gir-1.0/
+-rw-r--r--	root/root	usr/share/gir-1.0/GUdev-1.0.gir
 drwxr-xr-x	root/root	usr/share/man/
 drwxr-xr-x	root/root	usr/share/man/man7/
 -rw-r--r--	root/root	usr/share/man/man7/udev.7.gz
diff --git a/base/udev/.md5sum b/base/udev/.md5sum
index 6e303b26b..adaacc325 100644
--- a/base/udev/.md5sum
+++ b/base/udev/.md5sum
@@ -1,2 +1,2 @@
-0ea39cc875116982abf200eb16c1b53e  udev-157.tar.bz2
+26f99dde11f8e393d659614d7d1a3964  udev-158.tar.bz2
 a0da4e9b11920f7a7d23f8787e773036  udev-config-20100128.tar.bz2
diff --git a/base/udev/Pkgfile b/base/udev/Pkgfile
index aaa59eb4b..201c778d2 100644
--- a/base/udev/Pkgfile
+++ b/base/udev/Pkgfile
@@ -2,9 +2,10 @@
 # URL: http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html
 # Maintainer: NuTyX core team
 # Packager: thierryn1 at hispeed dot ch
+# Depends on: glib, usbutils, gobject-introspection, gperf, acl, picutils
 
 name=udev
-version=157
+version=158
 release=1
 _lfs_release=20100128
 source=(ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/$name-$version.tar.bz2 \
@@ -25,12 +26,12 @@ ln -s /proc/kcore $PKG/lib/udev/devices/core
     --sysconfdir=/etc --sbindir=/sbin \
     --with-rootlibdir=/lib --libexecdir=/lib/udev \
     --docdir=/usr/share/doc/udev-$version \
-    --disable-extras --disable-introspection
+    --with-pci-ids-path=/usr/share/pci.ids.gz
 
 make 
 
 make install DESTDIR=$PKG mandir="/usr/share/man"
-install -m644 -v rules/gentoo/30-kernel-compat.rules \
+install -m644 -v rules/misc/30-kernel-compat.rules \
 	$PKG/lib/udev/rules.d/
 cd ../udev-config-${_lfs_release}
 make DESTDIR=$PKG install