Tue Oct 25 23:14:56 UTC 2011

6 files changed, 123 insertions, 169 deletions

diff --git a/core/kbd/PKGBUILD b/core/kbd/PKGBUILD
index c1643ec9a..efe8d3ede 100644
--- a/core/kbd/PKGBUILD
+++ b/core/kbd/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 123997 2011-05-15 19:12:02Z tpowa $
+# $Id: PKGBUILD 141105 2011-10-24 06:35:43Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgname=kbd
 pkgver=1.15.3
-pkgrel=1
+pkgrel=2
 pkgdesc="Keytable files and keyboard utilities"
 arch=('i686' 'x86_64')
 url="ftp://ftp.altlinux.org/pub/people/legion/kbd/"
@@ -11,7 +11,8 @@ license=('GPL')
 depends=('glibc')
 source=(ftp://ftp.altlinux.org/pub/people/legion/kbd/${pkgname}-${pkgver}.tar.gz
         fix-es.po.patch)
-md5sums=('8143e179a0f3c25646ce5085e8777200')
+md5sums=('8143e179a0f3c25646ce5085e8777200'
+         '4ded3edb50fb7a3277bae6a870cee812')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
@@ -25,6 +26,7 @@ build() {
   mv data/keymaps/i386/olpc/pt{,-olpc}.map
   mv data/keymaps/i386/dvorak/no{,-dvorak}.map
   mv data/keymaps/i386/fgGIod/trf{,-fgGIod}.map
+  mv data/keymaps/i386/colemak/{en-latin9,colemak}.map
 
   ./configure --prefix=/usr --datadir=/usr/share/kbd --mandir=/usr/share/man
   make KEYCODES_PROGS=yes RESIZECONS_PROGS=yes
@@ -40,5 +42,3 @@ package() {
   mkdir ${pkgdir}/bin
   ln -s /usr/bin/loadkeys ${pkgdir}/bin/loadkeys
 }
-md5sums=('8143e179a0f3c25646ce5085e8777200'
-         '4ded3edb50fb7a3277bae6a870cee812')
diff --git a/core/mkinitcpio-busybox/PKGBUILD b/core/mkinitcpio-busybox/PKGBUILD
index 1722fe189..eb4f651d9 100644
--- a/core/mkinitcpio-busybox/PKGBUILD
+++ b/core/mkinitcpio-busybox/PKGBUILD
@@ -1,31 +1,34 @@
-# $Id: PKGBUILD 135588 2011-08-16 07:52:57Z thomas $
+# $Id: PKGBUILD 141112 2011-10-24 09:59:21Z dreisner $
+# Maintainer: Dave Reisner <dreisner@archlinux.org>
 # Maintainer: Thomas Bächler <thomas@archlinux.org>
+
 pkgname=mkinitcpio-busybox
-pkgver=1.18.5
+pkgver=1.19.2
 pkgrel=1
 pkgdesc="base initramfs tools"
 arch=('i686' 'x86_64')
 url="http://www.busybox.net/"
 license=('GPL')
 depends=('glibc')
-source=(http://busybox.net/downloads/busybox-${pkgver}.tar.bz2
-        config)
-sha256sums=('10954fcd5c48d8a262a3497b16227bf983a05658bf2bf661af2fdeca773f2fc0'
-            '0961b4db5eb5eaa1b8d353a3fc792884f4f2733ec0f5715ba88a0e667f0f48ec')
+options=('!buildflags')
+source=("http://busybox.net/downloads/busybox-$pkgver.tar.bz2"
+        'config')
+sha256sums=('ea7ec9b6df70b8c528f4a2b6300e9913431c7223308fb08dfafa7508d75a0cb9'
+            '21ae2cd21e33ba1ef9500a9b14273579fc554bf995cfd7907fb3fe94fc162cf8')
 
 build() {
-  cd "${srcdir}/busybox-${pkgver}"
+  cd "$srcdir/busybox-$pkgver"
+
+  local safeflags="${CARCH/_/-} -mtune=generic -Os -pipe -fno-strict-aliasing"
+
+  sed 's|^\(CONFIG_EXTRA_CFLAGS\)=.*|\1="-march='"$safeflags"'"|' \
+    "$srcdir/config" > .config
 
-  unset CFLAGS CXXFLAGS
-  if [ ${CARCH} = "x86_64" ]; then
-    sed 's|^CONFIG_EXTRA_CFLAGS=.*|CONFIG_EXTRA_CFLAGS="-march=x86-64 -mtune=generic -Os -pipe -fno-strict-aliasing"|' "${srcdir}/config" > .config
-  else
-    sed 's|^CONFIG_EXTRA_CFLAGS=.*|CONFIG_EXTRA_CFLAGS="-march=i686 -mtune=generic -Os -pipe -fno-strict-aliasing"|' "${srcdir}/config" > .config
-  fi
   make
 }
 
 package() {
-  install -D -m755 "${srcdir}/busybox-${pkgver}"/busybox "${pkgdir}/lib/initcpio/busybox"
+  install -Dm755 "$srcdir/busybox-$pkgver/busybox" "$pkgdir/lib/initcpio/busybox"
 }
+
 # vim:set ts=2 sw=2 et:
diff --git a/core/mkinitcpio-busybox/config b/core/mkinitcpio-busybox/config
index 31a9d4330..86160a203 100644
--- a/core/mkinitcpio-busybox/config
+++ b/core/mkinitcpio-busybox/config
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Busybox version: 1.18.5
-# Sun Aug 14 01:22:25 2011
+# Busybox version: 1.19.2
+# Sun Oct 16 15:24:19 2011
 #
 CONFIG_HAVE_DOT_CONFIG=y
 
@@ -39,8 +39,8 @@ CONFIG_LAST_SUPPORTED_WCHAR=767
 CONFIG_LONG_OPTS=y
 CONFIG_FEATURE_DEVPTS=y
 # CONFIG_FEATURE_CLEAN_UP is not set
-# CONFIG_FEATURE_WTMP is not set
 # CONFIG_FEATURE_UTMP is not set
+# CONFIG_FEATURE_WTMP is not set
 # CONFIG_FEATURE_PIDFILE is not set
 CONFIG_FEATURE_SUID=y
 # CONFIG_FEATURE_SUID_CONFIG is not set
@@ -89,6 +89,8 @@ CONFIG_PREFIX="./_install"
 #
 # Busybox Library Tuning
 #
+# CONFIG_FEATURE_SYSTEMD is not set
+# CONFIG_FEATURE_RTMINMAX is not set
 CONFIG_PASSWORD_MINLEN=6
 CONFIG_MD5_SIZE_VS_SPEED=0
 CONFIG_FEATURE_FAST_TOP=y
@@ -99,6 +101,7 @@ CONFIG_FEATURE_EDITING_MAX_LEN=1024
 # CONFIG_FEATURE_EDITING_VI is not set
 CONFIG_FEATURE_EDITING_HISTORY=15
 # CONFIG_FEATURE_EDITING_SAVEHISTORY is not set
+# CONFIG_FEATURE_REVERSE_SEARCH is not set
 CONFIG_FEATURE_TAB_COMPLETION=y
 # CONFIG_FEATURE_USERNAME_COMPLETION is not set
 CONFIG_FEATURE_EDITING_FANCY_PROMPT=y
@@ -106,6 +109,7 @@ CONFIG_FEATURE_EDITING_FANCY_PROMPT=y
 CONFIG_FEATURE_NON_POSIX_CP=y
 CONFIG_FEATURE_VERBOSE_CP_MESSAGE=y
 CONFIG_FEATURE_COPYBUF_KB=4
+CONFIG_FEATURE_SKIP_ROOTFS=y
 CONFIG_MONOTONIC_SYSCALL=y
 CONFIG_IOCTL_HEX2STR_ERROR=y
 # CONFIG_FEATURE_HWIB is not set
@@ -169,12 +173,17 @@ CONFIG_CAT=y
 # CONFIG_FEATURE_DATE_ISOFMT is not set
 # CONFIG_FEATURE_DATE_NANO is not set
 # CONFIG_FEATURE_DATE_COMPAT is not set
+# CONFIG_ID is not set
+# CONFIG_GROUPS is not set
 CONFIG_TEST=y
 CONFIG_FEATURE_TEST_64=y
+CONFIG_TOUCH=y
 # CONFIG_TR is not set
 # CONFIG_FEATURE_TR_CLASSES is not set
 # CONFIG_FEATURE_TR_EQUIV is not set
 # CONFIG_BASE64 is not set
+# CONFIG_WHO is not set
+# CONFIG_USERS is not set
 # CONFIG_CAL is not set
 # CONFIG_CATV is not set
 CONFIG_CHGRP=y
@@ -212,10 +221,8 @@ CONFIG_FALSE=y
 CONFIG_HEAD=y
 CONFIG_FEATURE_FANCY_HEAD=y
 # CONFIG_HOSTID is not set
-# CONFIG_ID is not set
 CONFIG_INSTALL=y
 CONFIG_FEATURE_INSTALL_LONG_OPTIONS=y
-# CONFIG_LENGTH is not set
 CONFIG_LN=y
 # CONFIG_LOGNAME is not set
 CONFIG_LS=y
@@ -262,12 +269,11 @@ CONFIG_FEATURE_STAT_FORMAT=y
 # CONFIG_STTY is not set
 # CONFIG_SUM is not set
 # CONFIG_SYNC is not set
-# CONFIG_TAC is not set
+CONFIG_TAC=y
 CONFIG_TAIL=y
 CONFIG_FEATURE_FANCY_TAIL=y
 # CONFIG_TEE is not set
 # CONFIG_FEATURE_TEE_USE_BLOCK_IO is not set
-CONFIG_TOUCH=y
 CONFIG_TRUE=y
 # CONFIG_TTY is not set
 CONFIG_UNAME=y
@@ -279,7 +285,6 @@ CONFIG_UNIQ=y
 # CONFIG_UUENCODE is not set
 CONFIG_WC=y
 CONFIG_FEATURE_WC_LARGE=y
-# CONFIG_WHO is not set
 # CONFIG_WHOAMI is not set
 CONFIG_YES=y
 
@@ -350,20 +355,13 @@ CONFIG_MKTEMP=y
 # Editors
 #
 # CONFIG_PATCH is not set
-CONFIG_AWK=y
-# CONFIG_FEATURE_AWK_LIBM is not set
-# CONFIG_CMP is not set
-# CONFIG_DIFF is not set
-# CONFIG_FEATURE_DIFF_LONG_OPTIONS is not set
-# CONFIG_FEATURE_DIFF_DIR is not set
-# CONFIG_ED is not set
-CONFIG_SED=y
 CONFIG_VI=y
 CONFIG_FEATURE_VI_MAX_LEN=4096
 CONFIG_FEATURE_VI_8BIT=y
 CONFIG_FEATURE_VI_COLON=y
 CONFIG_FEATURE_VI_YANKMARK=y
 CONFIG_FEATURE_VI_SEARCH=y
+# CONFIG_FEATURE_VI_REGEX_SEARCH is not set
 CONFIG_FEATURE_VI_USE_SIGNALS=y
 CONFIG_FEATURE_VI_DOT_CMD=y
 CONFIG_FEATURE_VI_READONLY=y
@@ -372,6 +370,14 @@ CONFIG_FEATURE_VI_SET=y
 CONFIG_FEATURE_VI_WIN_RESIZE=y
 CONFIG_FEATURE_VI_ASK_TERMINAL=y
 CONFIG_FEATURE_VI_OPTIMIZE_CURSOR=y
+CONFIG_AWK=y
+# CONFIG_FEATURE_AWK_LIBM is not set
+# CONFIG_CMP is not set
+# CONFIG_DIFF is not set
+# CONFIG_FEATURE_DIFF_LONG_OPTIONS is not set
+# CONFIG_FEATURE_DIFF_DIR is not set
+# CONFIG_ED is not set
+CONFIG_SED=y
 # CONFIG_FEATURE_ALLOW_EXEC is not set
 
 #
@@ -419,7 +425,7 @@ CONFIG_FEATURE_GREP_EGREP_ALIAS=y
 CONFIG_HALT=y
 # CONFIG_FEATURE_CALL_TELINIT is not set
 CONFIG_TELINIT_PATH=""
-# CONFIG_INIT is not set
+CONFIG_INIT=y
 # CONFIG_FEATURE_USE_INITTAB is not set
 # CONFIG_FEATURE_KILL_REMOVED is not set
 CONFIG_FEATURE_KILL_DELAY=0
@@ -430,6 +436,7 @@ CONFIG_FEATURE_KILL_DELAY=0
 # CONFIG_FEATURE_INITRD is not set
 CONFIG_INIT_TERMINAL_TYPE=""
 # CONFIG_MESG is not set
+# CONFIG_FEATURE_MESG_ENABLE_ONLY_GROUP is not set
 
 #
 # Login/Password Management Utilities
@@ -515,6 +522,7 @@ CONFIG_DEFAULT_DEPMOD_FILE=""
 # CONFIG_ACPID is not set
 # CONFIG_FEATURE_ACPID_COMPAT is not set
 # CONFIG_BLKID is not set
+# CONFIG_FEATURE_BLKID_TYPE is not set
 CONFIG_DMESG=y
 CONFIG_FEATURE_DMESG_PRETTY=y
 # CONFIG_FBSET is not set
@@ -523,7 +531,7 @@ CONFIG_FEATURE_DMESG_PRETTY=y
 # CONFIG_FDFLUSH is not set
 # CONFIG_FDFORMAT is not set
 # CONFIG_FDISK is not set
-CONFIG_FDISK_SUPPORT_LARGE_DISKS=y
+# CONFIG_FDISK_SUPPORT_LARGE_DISKS is not set
 # CONFIG_FEATURE_FDISK_WRITABLE is not set
 # CONFIG_FEATURE_AIX_LABEL is not set
 # CONFIG_FEATURE_SGI_LABEL is not set
@@ -618,10 +626,25 @@ CONFIG_VOLUMEID=y
 # Miscellaneous Utilities
 #
 # CONFIG_CONSPY is not set
+CONFIG_LESS=y
+CONFIG_FEATURE_LESS_MAXLINES=9999999
+CONFIG_FEATURE_LESS_BRACKETS=y
+CONFIG_FEATURE_LESS_FLAGS=y
+# CONFIG_FEATURE_LESS_MARKS is not set
+# CONFIG_FEATURE_LESS_REGEXP is not set
+# CONFIG_FEATURE_LESS_WINCH is not set
+# CONFIG_FEATURE_LESS_ASK_TERMINAL is not set
+# CONFIG_FEATURE_LESS_DASHCMD is not set
+# CONFIG_FEATURE_LESS_LINENUMS is not set
 # CONFIG_NANDWRITE is not set
 # CONFIG_NANDDUMP is not set
+# CONFIG_SETSERIAL is not set
 # CONFIG_UBIATTACH is not set
 # CONFIG_UBIDETACH is not set
+# CONFIG_UBIMKVOL is not set
+# CONFIG_UBIRMVOL is not set
+# CONFIG_UBIRSVOL is not set
+# CONFIG_UBIUPDATEVOL is not set
 # CONFIG_ADJTIMEX is not set
 # CONFIG_BBCONFIG is not set
 # CONFIG_FEATURE_COMPRESS_BBCONFIG is not set
@@ -662,15 +685,6 @@ CONFIG_FEATURE_CROND_DIR=""
 # CONFIG_LAST is not set
 # CONFIG_FEATURE_LAST_SMALL is not set
 # CONFIG_FEATURE_LAST_FANCY is not set
-CONFIG_LESS=y
-CONFIG_FEATURE_LESS_MAXLINES=9999999
-CONFIG_FEATURE_LESS_BRACKETS=y
-CONFIG_FEATURE_LESS_FLAGS=y
-# CONFIG_FEATURE_LESS_MARKS is not set
-# CONFIG_FEATURE_LESS_REGEXP is not set
-# CONFIG_FEATURE_LESS_WINCH is not set
-# CONFIG_FEATURE_LESS_DASHCMD is not set
-# CONFIG_FEATURE_LESS_LINENUMS is not set
 # CONFIG_HDPARM is not set
 # CONFIG_FEATURE_HDPARM_GET_IDENTITY is not set
 # CONFIG_FEATURE_HDPARM_HDIO_SCAN_HWIF is not set
@@ -704,11 +718,17 @@ CONFIG_STRINGS=y
 #
 # Networking Utilities
 #
+# CONFIG_NAMEIF is not set
+# CONFIG_FEATURE_NAMEIF_EXTENDED is not set
 # CONFIG_NBDCLIENT is not set
 CONFIG_NC=y
 CONFIG_NC_SERVER=y
 CONFIG_NC_EXTRA=y
 # CONFIG_NC_110_COMPAT is not set
+CONFIG_PING=y
+CONFIG_PING6=y
+CONFIG_FEATURE_FANCY_PING=y
+# CONFIG_WHOIS is not set
 CONFIG_FEATURE_IPV6=y
 # CONFIG_FEATURE_UNIX_LOCAL is not set
 CONFIG_FEATURE_PREFER_IPV4_ADDRESS=y
@@ -781,17 +801,12 @@ CONFIG_IPRULE=y
 # CONFIG_IPCALC is not set
 # CONFIG_FEATURE_IPCALC_FANCY is not set
 # CONFIG_FEATURE_IPCALC_LONG_OPTIONS is not set
-# CONFIG_NAMEIF is not set
-# CONFIG_FEATURE_NAMEIF_EXTENDED is not set
 CONFIG_NETSTAT=y
 CONFIG_FEATURE_NETSTAT_WIDE=y
 CONFIG_FEATURE_NETSTAT_PRG=y
 CONFIG_NSLOOKUP=y
 # CONFIG_NTPD is not set
 # CONFIG_FEATURE_NTPD_SERVER is not set
-CONFIG_PING=y
-CONFIG_PING6=y
-CONFIG_FEATURE_FANCY_PING=y
 # CONFIG_PSCAN is not set
 CONFIG_ROUTE=y
 # CONFIG_SLATTACH is not set
@@ -824,12 +839,14 @@ CONFIG_FEATURE_TFTP_GET=y
 # CONFIG_DHCPRELAY is not set
 # CONFIG_DUMPLEASES is not set
 # CONFIG_FEATURE_UDHCPD_WRITE_LEASES_EARLY is not set
+# CONFIG_FEATURE_UDHCPD_BASE_IP_ON_MAC is not set
 CONFIG_DHCPD_LEASES_FILE=""
 # CONFIG_UDHCPC is not set
 # CONFIG_FEATURE_UDHCPC_ARPING is not set
 # CONFIG_FEATURE_UDHCP_PORT is not set
 CONFIG_UDHCP_DEBUG=0
 # CONFIG_FEATURE_UDHCP_RFC3397 is not set
+# CONFIG_FEATURE_UDHCP_8021Q is not set
 CONFIG_UDHCPC_DEFAULT_SCRIPT=""
 CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=0
 CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS=""
@@ -865,15 +882,19 @@ CONFIG_FEATURE_MIME_CHARSET=""
 #
 # CONFIG_IOSTAT is not set
 # CONFIG_MPSTAT is not set
+# CONFIG_NMETER is not set
 # CONFIG_PMAP is not set
 # CONFIG_POWERTOP is not set
+# CONFIG_PSTREE is not set
+# CONFIG_PWDX is not set
 # CONFIG_SMEMCAP is not set
+CONFIG_UPTIME=y
+# CONFIG_FEATURE_UPTIME_UTMP_SUPPORT is not set
 CONFIG_FREE=y
 # CONFIG_FUSER is not set
 CONFIG_KILL=y
 CONFIG_KILLALL=y
 # CONFIG_KILLALL5 is not set
-# CONFIG_NMETER is not set
 CONFIG_PGREP=y
 CONFIG_PIDOF=y
 CONFIG_FEATURE_PIDOF_SINGLE=y
@@ -894,7 +915,6 @@ CONFIG_FEATURE_PS_WIDE=y
 # CONFIG_FEATURE_TOP_SMP_PROCESS is not set
 # CONFIG_FEATURE_TOPMEM is not set
 # CONFIG_FEATURE_SHOW_THREADS is not set
-CONFIG_UPTIME=y
 # CONFIG_WATCH is not set
 
 #
@@ -932,6 +952,7 @@ CONFIG_SV_DEFAULT_SERVICE_DIR=""
 #
 CONFIG_ASH=y
 CONFIG_ASH_BASH_COMPAT=y
+# CONFIG_ASH_IDLE_TIMEOUT is not set
 CONFIG_ASH_JOB_CONTROL=y
 CONFIG_ASH_ALIAS=y
 CONFIG_ASH_GETOPTS=y
@@ -972,6 +993,7 @@ CONFIG_SH_MATH_SUPPORT=y
 CONFIG_FEATURE_SH_EXTRA_QUIET=y
 # CONFIG_FEATURE_SH_STANDALONE is not set
 # CONFIG_FEATURE_SH_NOFORK is not set
+# CONFIG_FEATURE_SH_HISTFILESIZE is not set
 
 #
 # System Logging Utilities
@@ -980,6 +1002,7 @@ CONFIG_FEATURE_SH_EXTRA_QUIET=y
 # CONFIG_FEATURE_ROTATE_LOGFILE is not set
 # CONFIG_FEATURE_REMOTE_LOG is not set
 # CONFIG_FEATURE_SYSLOGD_DUP is not set
+# CONFIG_FEATURE_SYSLOGD_CFG is not set
 CONFIG_FEATURE_SYSLOGD_READ_BUFFER_SIZE=0
 # CONFIG_FEATURE_IPC_SYSLOG is not set
 CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=0
diff --git a/core/udev/81-arch.rules b/core/udev/81-arch.rules
index 71f1a883b..6bdf4e249 100644
--- a/core/udev/81-arch.rules
+++ b/core/udev/81-arch.rules
@@ -1,71 +1,9 @@
-# Udev rules for Archlinux by Tobias Powalowski <tpowa@archlinux.org>
 # do not edit this file, it will be overwritten on update
-#
-# There are a number of modifiers that are allowed to be used in some
-# of the different fields. They provide the following subsitutions:
-#
-# %n the "kernel number" of the device.
-#    For example, 'sda3' has a "kernel number" of '3'
-# %k the kernel name for the device.
-# %M the kernel major number for the device
-# %m the kernel minor number for the device
-# %b the bus id for the device
-# %c the string returned by the PROGRAM
-# %s{filename} the content of a sysfs attribute.
-# %% the '%' char itself.
-#
-# There are a number of modifiers that are allowed to be used in some of the
-# fields.  See the udev man page for a full description of them.
-# global stuff
-#
+# this file is going away in the near future
 
-# permission for sg devices
-KERNEL=="sg[0-9]*", ATTRS{type}!="3|6", GROUP="disk", MODE="0660"
-
-# permissions for IDE CD devices
-SUBSYSTEMS=="ide", KERNEL=="hd[a-z]", ATTR{removable}=="1", ATTRS{media}=="cdrom*", GROUP="optical"
-
-# permissions for SCSI CD devices
-SUBSYSTEMS=="scsi", KERNEL=="s[rg][0-9]*", ATTRS{type}=="5", GROUP="optical"
-
-# permissions for removable devices like cardreaders or sticks
-KERNEL=="sd*", ATTRS{scsi_level}=="3", ATTRS{type}=="0", GROUP="storage"
-
-# permissions for firewire external drives
-KERNEL=="sd*", ATTRS{scsi_level}=="5", GROUP="storage"
-
-# permissions for usb to scsi external adapters
-KERNEL=="sd*", ATTRS{scsi_level}=="3", ATTRS{type}=="7", GROUP="storage"
-
-# permissions for ide storage like pcmcia card readers
-ACTION!="add", GOTO="pcmcia_end"
-SUBSYSTEM!="block", GOTO="pcmcia_end"
-KERNEL=="hd*[!0-9]", IMPORT{program}="ata_id --export $tempnode"
-KERNEL=="hd*", IMPORT{parent}=="ID_*"
-KERNEL=="hd*", ENV{ID_TYPE}=="generic", GROUP="storage"
-LABEL="pcmcia_end"
-
-# permissions for SCSI scanners
-SUBSYSTEMS=="scsi", KERNEL=="sg[0-9]*", ATTRS{type}=="6", GROUP="scanner"
-
-# mem
-KERNEL=="ram0", SYMLINK+="ramdisk"
-KERNEL=="ram1", SYMLINK+="ram"
-
-# video4linux
-
-KERNEL=="vbi0",		SYMLINK+="vbi"
-KERNEL=="radio0",	SYMLINK+="radio"
-KERNEL=="radio[0-9]*",	GROUP="video"
-KERNEL=="video0",	SYMLINK+="video"
-KERNEL=="vtx0",		SYMLINK+="vtx"
-
-# misc
-KERNEL=="sgi_fetchop",	MODE="0666"
+# this might belong in <http://aur.archlinux.org/packages.php?ID=22698>
+# see also /usr/src/*/Documentation/laptops/sonypi.txt
 KERNEL=="sonypi",	MODE="0666"
 
-# USB devices
+# this might belong in <https://aur.archlinux.org/packages.php?ID=18393>
 KERNEL=="legousbtower*", MODE="0666"
-#######################################
-# Permissions and Symlinks - end
-#######################################
diff --git a/core/udev/PKGBUILD b/core/udev/PKGBUILD
index bab6a2cbe..544af8f71 100644
--- a/core/udev/PKGBUILD
+++ b/core/udev/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 134147 2011-08-02 11:38:00Z tomegun $
+# $Id: PKGBUILD 141114 2011-10-24 09:59:24Z dreisner $
 # Maintainer: Aaron Griffin <aaron@archlinux.org>
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 # Maintainer: Thomas Bächler <thomas@archlinux.org>
@@ -6,23 +6,21 @@
 
 pkgbase="udev"
 pkgname=('udev' 'udev-compat')
-pkgver=173
-pkgrel=3
+pkgver=174
+pkgrel=1
 arch=(i686 x86_64)
 url="http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html"
 license=('GPL')
 groups=('base')
-# older initscripts versions required start_udev
 options=(!makeflags !libtool)
-makedepends=('glibc' 'coreutils' 'util-linux' 'pciutils' 'libusb-compat' 'glib2' 'kernel26' 'gperf' 'libxslt' 'gobject-introspection')
-source=(http://www.kernel.org/pub/linux/utils/kernel/hotplug/$pkgbase-$pkgver.tar.bz2
-	bluetooth.patch
+makedepends=('gobject-introspection' 'gperf')
+#source=(http://www.kernel.org/pub/linux/utils/kernel/hotplug/$pkgbase-$pkgver.tar.bz2
+source=(http://people.freedesktop.org/~kay/$pkgbase-$pkgver.tar.bz2
         81-arch.rules)
 
 build() {
   cd $srcdir/$pkgbase-$pkgver
-  # fix https://bugs.archlinux.org/task/25356 (submitted upstream)
-  patch -Np1 -i ../bluetooth.patch
+
   ./configure --sysconfdir=/etc\
               --with-rootlibdir=/lib\
               --libexecdir=/lib/udev\
@@ -30,13 +28,13 @@ build() {
               --with-systemdsystemunitdir=/lib/systemd/system\
               --disable-rule-generator\
               --enable-udev_acl
+
   make
 }
   
 package_udev() {
   pkgdesc="The userspace dev tools (udev)"
-  depends=('glibc' 'coreutils' 'util-linux' 'libusb-compat' 'glib2'
-           'module-init-tools>=3.11' 'pciutils')
+  depends=('util-linux' 'libusb-compat' 'glib2' 'module-init-tools' 'pciutils')
   install=udev.install
   backup=(etc/udev/udev.conf)
   conflicts=('pcmcia-cs' 'hotplug' 'initscripts<2009.07')
@@ -53,11 +51,14 @@ package_udev() {
   	echo "blacklist $mod" 
   done | sort -u > $pkgdir/lib/modprobe.d/framebuffer_blacklist.conf
 
-  # these static devices are created for convenience, to autoload the modules if necessary
-  # /dev/loop0
+  # /dev/loop0 is created for convenience, to autoload the module if necessary
+  # may be obsoleted by https://lkml.org/lkml/2011/7/30/111
   mknod -m 0660 ${pkgdir}/lib/udev/devices/loop0 b 7 0
   chgrp disk ${pkgdir}/lib/udev/devices/loop0
 
+  # udevd moved, symlink to make life easy for restarting udevd manually
+  ln -s /lib/udev/udevd ${pkgdir}/sbin/udevd
+
   # Replace dialout/tape/cdrom group in rules with uucp/storage/optical group
   for i in $pkgdir/lib/udev/rules.d/*.rules; do
     sed -i -e 's#GROUP="dialout"#GROUP="uucp"#g;
@@ -96,6 +97,5 @@ package_udev-compat() {
   # /dev/ppp
   mknod -m 0600 ${pkgdir}/lib/udev/devices/ppp c 108 0
 }
-md5sums=('91a88a359b60bbd074b024883cc0dbde'
-         '36cb9bfb55a8d931b7498d2e46730745'
-         'ec529eb1ddaabb70c61b38f80bb8462a')
+md5sums=('3b84706046a33d7a7e00491a1136804d'
+         '3da2bb9891592f9438a07bd641465531')
diff --git a/core/udev/udev.install b/core/udev/udev.install
index 272ab60c0..2cc8caaa0 100644
--- a/core/udev/udev.install
+++ b/core/udev/udev.install
@@ -2,7 +2,7 @@
 # arg 2:  the old package version
 
 post_upgrade() {
-  if [ "$(vercmp $2 172)" -lt 0 ]; then
+  if [ "$(vercmp $2 174)" -lt 0 ]; then
     echo "ATTENTION UDEV:"
     echo "----------"
     if [ "$(vercmp $2 168)" -lt 0 ]; then
@@ -32,41 +32,31 @@ post_upgrade() {
       echo "Add them to MODULES in rc.conf if you need them."
       echo "  --"
     fi
-    echo "Support for non-devtmpfs self-compiled kernels have been moved to udev-compat."
-    echo "  --"
-    echo "Blacklisting of framebuffer devices has moved from /etc/modprobe.d to"
-    echo "/lib/modprobe.d. Any customizations shoud be done to the file in /etc, as it"
-    echo "takes precedence."
+    if [ "$(vercmp $2 172)" -lt 0 ]; then
+      echo "Support for non-devtmpfs self-compiled kernels have been moved to udev-compat."
+      echo "  --"
+      echo "Blacklisting of framebuffer devices has moved from /etc/modprobe.d to"
+      echo "/lib/modprobe.d. Any customizations shoud be done to the file in /etc, as it"
+      echo "takes precedence."
+      echo "  --"
+      echo "kbd and rtc devices are no longer world readable."
+      echo "  --"
+      echo "rtc is no longer in the audio group and fb devices are no longer in"
+      echo "the video group, as permissions and ownership of fb devices are controlled"
+      echo "by X."
+      echo "  --"
+    fi
+    echo "We now use upstream rules for assigning devices to the 'disk', 'optical',"
+    echo "'scanner' and 'video' groups. Beware of any changes."
     echo "  --"
-    echo "kbd and rtc devices are no longer world readable."
+    echo "We no longer create symlinks from /dev/<dev> to /dev/<dev>0."
     echo "  --"
-    echo "rtc is no longer in the audio group and fb devices are no longer in"
-    echo "the video group, as permissions and ownership of fb devices are controlled"
-    echo "by X."
+    echo "For security reasons, we no longer add devices to the 'storage' group. Use"
+    echo "udisks and friends, or add custom rules to /etc/udev.d/rules/, if you want"
+    echo "this functionality back."
+    echo " --"
+    echo "We no longer create the static nodes on install needed for an initrd-less and"
+    echo "devtmpfs-less boot, this only affects fresh installs."
     echo "---------------"
   fi
 }
-
-post_install() {
-  # If a ramfs is mounted, we still need to make sure that /dev/{console,null,zero} exist
-  # The Archlinux installer bind-mounts /dev to /mnt/dev, thus making the real /dev invisible
-  ROOTDIR=""
-  [ "$(stat -c %D /)" != "$(stat -c %D /dev)" ] && ROOTDIR=$(mktemp -d /tmp/udevinstall.XXXXXX)
-  [ -n "${ROOTDIR}" ] && mount --bind / ${ROOTDIR}
-  if [ ! -c ${ROOTDIR}/dev/console ]; then
-    rm -f ${ROOTDIR}/dev/console
-    mknod -m600 ${ROOTDIR}/dev/console c 5 1
-  fi
-  if [ ! -c ${ROOTDIR}/dev/null ]; then
-    rm -f ${ROOTDIR}/dev/null
-    mknod -m644 ${ROOTDIR}/dev/null c 1 3
-  fi
-  if [ ! -c ${ROOTDIR}/dev/zero ]; then
-    rm -f ${ROOTDIR}/dev/zero
-    mknod -m644 ${ROOTDIR}/dev/zero c 1 5
-  fi
-  if [ -n "${ROOTDIR}" ]; then
-    umount ${ROOTDIR}
-    rmdir ${ROOTDIR}
-  fi
-}