Merge branch 'master' of vparabola:~/projects/abslibre-mips64el

Conflicts:
	libre/initscripts/PKGBUILD

17 files changed, 146 insertions, 268 deletions

diff --git a/core/coreutils/PKGBUILD b/core/coreutils/PKGBUILD
index a5dd6ce81..614a30346 100644
--- a/core/coreutils/PKGBUILD
+++ b/core/coreutils/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 120920 2011-04-27 11:05:23Z allan $
+# $Id: PKGBUILD 127042 2011-06-10 00:56:53Z bisson $
 # Maintainer: Allan McRae <allan@archlinux.org>
 # Contributor: judd <jvinet@zeroflux.org>
 
 pkgname=coreutils
 pkgver=8.12
-pkgrel=1
+pkgrel=3
 pkgdesc="The basic file, shell and text manipulation utilities of the GNU operating system"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL3')
diff --git a/core/iproute2/PKGBUILD b/core/iproute2/PKGBUILD
index 401e43d6f..499584d3f 100644
--- a/core/iproute2/PKGBUILD
+++ b/core/iproute2/PKGBUILD
@@ -1,15 +1,17 @@
-# $Id: PKGBUILD 107230 2011-01-22 18:51:34Z ronald $
+# $Id: PKGBUILD 126335 2011-06-04 22:38:16Z tomegun $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Judd Vinet <jvinet@zeroflux.org>
 
 pkgname=iproute2
-pkgver=2.6.37
-pkgrel=1
+pkgver=2.6.38
+pkgrel=3
 pkgdesc="IP Routing Utilities"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL2')
 url="http://www.linux-foundation.org/en/Net:Iproute2"
-depends=('linux-atm' 'perl')
+depends=('perl')
+makedepends=('linux-atm')
+optdepends=('linux-atm: ATM support')
 provides=('iproute')
 conflicts=('iproute')
 replaces=('iproute')
@@ -18,7 +20,7 @@ backup=('etc/iproute2/ematch_map' 'etc/iproute2/rt_dsfield' 'etc/iproute2/rt_pro
 	'etc/iproute2/rt_realms' 'etc/iproute2/rt_scopes' 'etc/iproute2/rt_tables')
 source=(http://devresources.linux-foundation.org/dev/iproute2/download/iproute2-${pkgver}.tar.bz2
 	'iproute2-fhs.patch')
-sha1sums=('7852fb66fb745dc3c1fabee24d7d8ff017c48d36'
+sha1sums=('e9f6d457a06866a2a20a6cba6b3a039b2ec3e14a'
           '2416b11252364d7a6c742eabb4a6924a75637a46')
 
 build() {
@@ -37,6 +39,11 @@ package() {
 
   make DESTDIR=$pkgdir install
 
+  # allow loopback to be started before /usr is mounted, this may not be supported in the future
+  mkdir -p ${pkgdir}/sbin
+  mv ${pkgdir}/usr/sbin/ip ${pkgdir}/sbin/ip
+  ln -s /sbin/ip ${pkgdir}/usr/sbin/ip
+
   # libnetlink isn't installed, install it FS#19385
   install -Dm644 include/libnetlink.h ${pkgdir}/usr/include/libnetlink.h
   install -Dm644 lib/libnetlink.a ${pkgdir}/usr/lib/libnetlink.a
diff --git a/core/jfsutils/PKGBUILD b/core/jfsutils/PKGBUILD
index e8aef3bc6..a96f6b8c5 100644
--- a/core/jfsutils/PKGBUILD
+++ b/core/jfsutils/PKGBUILD
@@ -1,7 +1,7 @@
-# $Id: PKGBUILD 100375 2010-11-23 01:27:06Z stephane $
+# $Id: PKGBUILD 126948 2011-06-08 20:07:37Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 pkgname=jfsutils
-pkgver=1.1.14
+pkgver=1.1.15
 pkgrel=2
 pkgdesc="JFS filesystem utilities"
 arch=(i686 x86_64 'mips64el')
@@ -10,7 +10,7 @@ license=('GPL')
 groups=('base')
 depends=('util-linux-ng')
 source=(http://jfs.sourceforge.net/project/pub/${pkgname}-${pkgver}.tar.gz)
-md5sums=('05150840987176d5e8438066b80add1a')
+md5sums=('8809465cd48a202895bc2a12e1923b5d')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
@@ -22,4 +22,3 @@ package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   make DESTDIR=${pkgdir} install
 }
-
diff --git a/core/links/PKGBUILD b/core/links/PKGBUILD
index 24ccedf08..286f4f46b 100644
--- a/core/links/PKGBUILD
+++ b/core/links/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 102993 2010-12-13 20:58:28Z eric $
-# Maintainer: Eric Belanger <eric@archlinux.org>
+# $Id: PKGBUILD 126520 2011-06-06 04:11:26Z eric $
+# Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=links
-pkgver=2.3pre1
+pkgver=2.3pre2
 pkgrel=1
 pkgdesc="A text WWW browser, similar to Lynx"
 arch=('i686' 'x86_64' 'mips64el')
@@ -15,8 +15,10 @@ provides=('links-g')
 conflicts=('links-g')
 replaces=('links-g')
 source=(http://links.twibright.com/download/${pkgname}-${pkgver}.tar.bz2 links.desktop)
-md5sums=('76cff0c716cd2a710abb078f859cfe9b' '7c47b15aaef51f1de129ff3a2afb7eac')
-sha1sums=('6d420a5c4514b45ee245fd3933d2a8cfa6eae76d' 'f600e27c2a71184444f7dd07a10230aa44463a02')
+md5sums=('4a6970d54f4a9c64b8cf5d83a5815c45'
+         '7c47b15aaef51f1de129ff3a2afb7eac')
+sha1sums=('5bc210f746559725565bec1d4748b5c56b263ee5'
+          'f600e27c2a71184444f7dd07a10230aa44463a02')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/core/net-tools/PKGBUILD b/core/net-tools/PKGBUILD
index 366c710b2..d46f0605e 100644
--- a/core/net-tools/PKGBUILD
+++ b/core/net-tools/PKGBUILD
@@ -1,40 +1,44 @@
-# $Id: PKGBUILD 38718 2009-05-10 07:37:29Z tpowa $
+# $Id: PKGBUILD 127037 2011-06-10 00:48:19Z bisson $
 # Maintainer: judd <jvinet@zeroflux.org>
 pkgname=net-tools
 pkgver=1.60
-pkgrel=14
+pkgrel=18
 pkgdesc="Configuration tools for Linux networking"
 arch=(i686 x86_64 'mips64el')
 license=('GPL')
 url="http://www.tazenda.demon.co.uk/phil/net-tools"
-groups=('base')
 depends=('glibc')
-backup=('etc/conf.d/nisdomainname')
 source=(http://www.tazenda.demon.co.uk/phil/$pkgname/$pkgname-$pkgver.tar.bz2
   net-tools.patch gcc340.patch net-tools-1.60-2.6-compilefix.patch
-  net-tools-1.60-miiioctl.patch nisdomainname.conf.d
+  net-tools-1.60-miiioctl.patch
   net-tools-1.60-nameif.patch
   net-tools-1.60-nameif_strncpy.patch)
 options=(!makeflags)
-md5sums=('888774accab40217dde927e21979c165' 
-	 '7ef8d0c6818faa0fdeea94970a20e3fb'
-         'b52d899cba9956bb0055150506f41ac1' 
-	 '51de6eabe2d6d6dc860f72c41cee636b'
-         'c16109863bc63f3dad4ef35305a340bb' 
-	 'af3eef5d4837939f7858eec692aa4671'
-         '29a32617382fab1735acba4d920f1fcd' 
-	 'e66466b9304dac85eb42b32f1ec3b284')
+install=net-tools.install
 
 build() {
   cd $srcdir/$pkgname-$pkgver
-  patch -Np1 -i ../net-tools.patch || return 1
-  patch -Np1 -i ../net-tools-1.60-2.6-compilefix.patch || return 1
-  patch -Np1 -i ../net-tools-1.60-miiioctl.patch || return 1
-  patch -Np1 -i ../gcc340.patch || return 1
-  patch -Np1 -i ${srcdir}/net-tools-1.60-nameif.patch || return 1
-  patch -Np1 -i ${srcdir}/net-tools-1.60-nameif_strncpy.patch || return 1
-  yes "" | make || return 1
+  patch -Np1 -i ../net-tools.patch
+  patch -Np1 -i ../net-tools-1.60-2.6-compilefix.patch
+  patch -Np1 -i ../net-tools-1.60-miiioctl.patch
+  patch -Np1 -i ../gcc340.patch
+  patch -Np1 -i ${srcdir}/net-tools-1.60-nameif.patch
+  patch -Np1 -i ${srcdir}/net-tools-1.60-nameif_strncpy.patch
+  yes "" | make
+}
+
+package() {
+  cd $srcdir/$pkgname-$pkgver
   make BASEDIR=$pkgdir update
-  install -D -m644 ../nisdomainname.conf.d \
-    $pkgdir/etc/conf.d/nisdomainname
+
+  # the following is provided by yp-tools
+  rm "${pkgdir}"/bin/{nis,yp}domainname
+  rm "${pkgdir}"/usr/share/man/man1/{nis,yp}domainname.1
 }
+md5sums=('888774accab40217dde927e21979c165'
+         '7ef8d0c6818faa0fdeea94970a20e3fb'
+         'b52d899cba9956bb0055150506f41ac1'
+         '51de6eabe2d6d6dc860f72c41cee636b'
+         'c16109863bc63f3dad4ef35305a340bb'
+         '29a32617382fab1735acba4d920f1fcd'
+         'e66466b9304dac85eb42b32f1ec3b284')
diff --git a/core/net-tools/net-tools.install b/core/net-tools/net-tools.install
new file mode 100644
index 000000000..9eee9e51b
--- /dev/null
+++ b/core/net-tools/net-tools.install
@@ -0,0 +1,12 @@
+post_upgrade() {
+  if [ "$(vercmp $2 1.60-16)" -lt 0 ]; then
+    echo "hostname and {,yp,nis}domainname has moved:"
+    echo "----------"
+    echo "hostname is now in coreutils"
+    echo "domainname is now in yp-tools"
+    echo "their functionality might have changed slightly"
+    echo ""
+    echo "dnsdomainname remains in net-tools"
+    echo "----------"
+  fi
+}
diff --git a/core/net-tools/nisdomainname.conf.d b/core/net-tools/nisdomainname.conf.d
deleted file mode 100644
index 6033ecf1c..000000000
--- a/core/net-tools/nisdomainname.conf.d
+++ /dev/null
@@ -1,3 +0,0 @@
-# Set your NIS domain name here
-NISDOMAINNAME=""
-
diff --git a/core/rp-pppoe/PKGBUILD b/core/rp-pppoe/PKGBUILD
deleted file mode 100644
index 7e2e268ca..000000000
--- a/core/rp-pppoe/PKGBUILD
+++ /dev/null
@@ -1,39 +0,0 @@
-# $Id: PKGBUILD 119995 2011-04-18 07:09:47Z daniel $
-# Maintainer: Daniel Isenmann <daniel@archlinux.org>
-# Contributor: orelien <aurelien.foret@wanadoo.fr>
-
-pkgname=rp-pppoe
-pkgver=3.10
-pkgrel=6
-pkgdesc="Roaring Penguin's Point-to-Point Protocol over Ethernet client"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://www.roaringpenguin.com/pppoe/"
-license=('GPL')
-depends=('ppp>=2.4.5' 'sh')
-options=('!makeflags')
-backup=(etc/ppp/pppoe.conf etc/ppp/firewall-standalone etc/ppp/firewall-masq etc/ppp/pppoe-server-options)
-source=(http://www.roaringpenguin.com/files/download/rp-pppoe-$pkgver.tar.gz adsl)
-install=rp-pppoe.install
-md5sums=('d58a13cc4185bca6121a606ff456dec0'
-         'adace1ad441aa88dcb3db52fb7f9c97f')
-
-build() {
-  cd $srcdir/$pkgname-$pkgver/src
-  ./configure --prefix=/usr --enable-plugin
-  make PLUGIN_DIR="/usr/lib/rp-pppoe" || return 1
-}
-
-package() {
-  cd $srcdir/$pkgname-$pkgver/src
-  make DESTDIR=$pkgdir install
-  
-  #moving .so files to /usr/lib according to FS#13876
-  mkdir -p ${pkgdir}/usr/lib/rp-pppoe
-  mv ${pkgdir}/etc/ppp/plugins/rp-pppoe.so ${pkgdir}/usr/lib/rp-pppoe/
-  #not necessary after moving the plugin
-  rm -rf ${pkgdir}/etc/ppp/plugins
-  #changing config to the new path
-  #sed -i 's/LINUX_PLUGIN=/LINUX_PLUGIN=\/usr\/lib\/rp-pppoe\/rp-pppoe.so/g' ${pkgdir}/etc/ppp/pppoe.conf
-  
-  install -Dm755 $srcdir/adsl $pkgdir/etc/rc.d/adsl
-}
diff --git a/core/rp-pppoe/adsl b/core/rp-pppoe/adsl
deleted file mode 100755
index 33bd91839..000000000
--- a/core/rp-pppoe/adsl
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-case "$1" in
-  start)
-    stat_busy "Starting ADSL Connection"
-    /usr/sbin/pppoe-start &>/dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon adsl
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping ADSL Connection"
-    /usr/sbin/pppoe-stop &>/dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon adsl
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
-exit 0
diff --git a/core/rp-pppoe/rp-pppoe.install b/core/rp-pppoe/rp-pppoe.install
deleted file mode 100644
index 1d4bccce2..000000000
--- a/core/rp-pppoe/rp-pppoe.install
+++ /dev/null
@@ -1,12 +0,0 @@
-#arg 1:  the new package version
-post_install() {
-echo ">>> The kernel-mode plugin has a new place."
-echo ">>> It's now located under /usr/lib/rp-pppoe/rp-pppoe.so"
-echo ">>> Change LINUX_PLUGIN to the new path in your /etc/ppp/pppoe.conf"
-}
-
-# arg 1:  the new package version
-# arg 2:  the old package version
-post_upgrade() {
-  post_install $1
-}
diff --git a/core/udev/80-drivers.rules b/core/udev/80-drivers.rules
deleted file mode 100644
index 56ac06cb4..000000000
--- a/core/udev/80-drivers.rules
+++ /dev/null
@@ -1,14 +0,0 @@
-# do not edit this file, it will be overwritten on update
-
-ACTION=="remove", GOTO="drivers_end"
-
-DRIVER!="?*", ENV{MODALIAS}=="?*", RUN+="/lib/udev/load-modules.sh  $env{MODALIAS}"
-SUBSYSTEM=="tifm", ENV{TIFM_CARD_TYPE}=="SD", RUN+="/lib/udev/load-modules.sh  tifm_sd"
-SUBSYSTEM=="tifm", ENV{TIFM_CARD_TYPE}=="MS", RUN+="/lib/udev/load-modules.sh  tifm_ms"
-SUBSYSTEM=="memstick", RUN+="/lib/udev/load-modules.sh ms_block"
-SUBSYSTEM=="memstick", RUN+="/lib/udev/load-modules.sh mspro_block"
-SUBSYSTEM=="i2o", RUN+="/lib/udev/load-modules.sh  i2o_block"
-SUBSYSTEM=="scsi", ENV{DEVTYPE}=="scsi_device", TEST!="[module/sg]", RUN+="/lib/udev/load-modules.sh sg"
-SUBSYSTEM=="module", KERNEL=="parport_pc", RUN+="/lib/udev/load-modules.sh ppdev"
-
-LABEL="drivers_end"
diff --git a/core/udev/81-arch.rules b/core/udev/81-arch.rules
index 3e71a9118..cd4e3e9b4 100644
--- a/core/udev/81-arch.rules
+++ b/core/udev/81-arch.rules
@@ -19,37 +19,6 @@
 # global stuff
 #
 
-#####################################
-###### Hotplug rules - begin
-# Only additional modules, 
-# which are not detectable,
-# are loaded here!
-#####################################
-# check if the device has already been claimed by a driver
-ACTION!="add", GOTO="drivers_end"
-
-#PNP addon modules
-SUBSYSTEM=="pnp", ENV{MODALIAS}!="?*", ATTRS{id}=="PNP0800", RUN+="/lib/udev/load-modules.sh pcspkr"
-SUBSYSTEM=="pnp", ENV{MODALIAS}!="?*", ATTRS{id}=="*PNP051[01]*", RUN+="/lib/udev/load-modules.sh irtty-sir"
-SUBSYSTEM=="pnp", ENV{MODALIAS}!="?*", ATTRS{id}=="PNPb02f", RUN+="/lib/udev/load-modules.sh analog"
-
-# PARPORT addon modules
-SUBSYSTEM=="pnp", ENV{MODALIAS}!="?*", ATTRS{id}=="PNP040*", RUN+="/lib/udev/load-modules.sh lp"
-SUBSYSTEM=="pnp", ENV{MODALIAS}!="?*", ATTRS{id}=="PNP040*", RUN+="/lib/udev/load-modules.sh ppdev"
-
-# fix ide cdrom detection on old proliant servers
-SUBSYSTEM=="pci", ENV{MODALIAS}=="pci:v00000E11d00000001sv00000000sd00000000bc06sc02i00", RUN+="/lib/udev/load-modules.sh ide-generic"
-
-LABEL="drivers_end"
-#####################################
-##### Hotplug rules - end
-#####################################
-
-#####################################
-# Additional Archlinux
-# Permissions and Symlinks - begin
-#####################################
-
 # permission for sg devices
 KERNEL=="sg[0-9]*", ATTRS{type}!="3|6", GROUP="disk", MODE="0660"
 
diff --git a/core/udev/PKGBUILD b/core/udev/PKGBUILD
index 94e2e12b6..b80fd7707 100644
--- a/core/udev/PKGBUILD
+++ b/core/udev/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 125635 2011-05-27 11:47:52Z tomegun $
+# $Id: PKGBUILD 126202 2011-06-02 14:49:12Z tomegun $
 # Maintainer: Aaron Griffin <aaron@archlinux.org>
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 # Maintainer: Thomas Bächler <thomas@archlinux.org>
@@ -7,8 +7,8 @@
 pkgbase="udev"
 pkgname=('udev' 'udev-compat')
 pkgver=171
-pkgrel=1
-arch=(i686 x86_64 'mips64el')
+pkgrel=2
+arch=(i686 x86_64)
 url="http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html"
 license=('GPL')
 groups=('base')
@@ -16,15 +16,15 @@ groups=('base')
 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
-        80-drivers.rules 
-        81-arch.rules 
-        load-modules.sh
-	static-audio-nodes-permissions.patch)
+        81-arch.rules
+	static-audio-nodes-group.patch
+	static-nodes-permissions.patch)
 
 build() {
   cd $srcdir/$pkgbase-$pkgver
   # fix https://bugs.archlinux.org/task/24362 (will be in udev-172)
-  patch -Np1 -i ../static-audio-nodes-permissions.patch
+  patch -Np1 -i ../static-audio-nodes-group.patch
+  patch -Np1 -i ../static-nodes-permissions.patch
   ./configure --sysconfdir=/etc --with-rootlibdir=/lib --libexecdir=/lib/udev\
               --sbindir=/sbin --with-systemdsystemunitdir=/lib/systemd/system\
               --disable-rule-generator
@@ -43,12 +43,8 @@ package_udev() {
   
   cd $srcdir/$pkgbase-$pkgver
   make DESTDIR=${pkgdir} install
-  # Replace original 80-drivers.rules with custom one.
-  install -D -m644 $srcdir/80-drivers.rules $pkgdir/lib/udev/rules.d/80-drivers.rules
   # Install our rule for permissions and symlinks
   install -D -m644 $srcdir/81-arch.rules $pkgdir/lib/udev/rules.d/81-arch.rules
-  # install our module loading subsystem
-  install -D -m755 $srcdir/load-modules.sh $pkgdir/lib/udev/load-modules.sh
 
   # create framebuffer blacklist
   mkdir -p $pkgdir/etc/modprobe.d/
@@ -100,7 +96,6 @@ package_udev-compat() {
   install -D -m644 ${srcdir}/${pkgbase}-${pkgver}/rules/misc/30-kernel-compat.rules ${pkgdir}/lib/udev/rules.d/30-kernel-compat.rules
 }
 md5sums=('bdf4617284be2ecac11767437417e209'
-         '4427855146513a4703ab5c7eb8a0156e'
-         'd8725e64fd0ce6e784ae795fae424c0a'
-         'f91fddc67609b45b244a624977c4247b'
-         '4f625aea95a5597afd8cdf189421f193')
+         '6ee44e3feb8e0f037947e7d4ca273f12'
+         '4f625aea95a5597afd8cdf189421f193'
+         'f9e50b8dfcd2215f5423ff9bc04ecf68')
diff --git a/core/udev/load-modules.sh b/core/udev/load-modules.sh
deleted file mode 100755
index 1e2af913e..000000000
--- a/core/udev/load-modules.sh
+++ /dev/null
@@ -1,80 +0,0 @@
-#!/bin/bash
-# Implement blacklisting for udev-loaded modules
-
-[ $# -ne 1 ] && exit 1
-
-. /etc/rc.conf
-
-# grab modules from rc.conf
-BLACKLIST="${MOD_BLACKLIST[@]}"
-MODPROBE="/sbin/modprobe"
-LOGGER="/usr/bin/logger"
-RESOLVEALIAS="${MODPROBE} --resolve-alias"
-USEBLACKLIST="--use-blacklist"
-
-if [ -f /proc/cmdline ]; then 
-    for cmd in $(cat /proc/cmdline); do
-        case $cmd in
-            disablemodules=*) eval $cmd ;;
-            load_modules=off) exit ;;
-        esac
-    done
-    #parse cmdline entries of the form "disablemodules=x,y,z"
-    if [ -n "$disablemodules" ]; then
-        BLACKLIST="$BLACKLIST $(echo $disablemodules | sed 's|,| |g')"
-    fi
-fi
-
-#MODULES entries in rc.conf that begin with ! are blacklisted
-for mod in ${MODULES[@]}; do
-    if [ "${mod}" != "${mod#!}" ]; then
-        BLACKLIST="$BLACKLIST ${mod#!}"
-    fi
-done
-
-if [ "$MOD_AUTOLOAD" = "yes" -o "$MOD_AUTOLOAD" = "YES" ]; then
-  if [ -n "${BLACKLIST}" ]; then
-    # If an alias name is on the blacklist, load no modules for this device
-    if echo "${BLACKLIST}" | /bin/grep -q -e " $1 " -e "^$1 " -e " $1\$"; then
-      $LOGGER -p info -t "$(basename $0)" "Not loading module alias '$1' because it is blacklisted"
-      exit
-    fi
-    #sanitize the blacklist
-    BLACKLIST="$(echo "$BLACKLIST" | sed -e 's|-|_|g')"
-    # Try to find all modules for the alias
-    mods=$($RESOLVEALIAS $1)
-    # If no modules could be found, try if the alias name is a module name
-    # In that case, omit the --use-blacklist parameter to imitate normal modprobe behaviour
-    [ -z "${mods}" ] && $MODPROBE -qni $1 && mods="$1" && USEBLACKLIST=""
-    [ -z "${mods}" ] && $LOGGER -p local0.debug -t "$(basename $0)" "'$1' is not a valid module or alias name"
-    for mod in ${mods}; do
-      # Find the module and all its dependencies
-      deps="$($MODPROBE -i --show-depends ${mod})"
-      [ $? -ne 0 ] && continue
-
-      #sanitize the module names
-      deps="$(echo "$deps" | sed \
-              -e "s#^insmod /lib.*/\(.*\)\.ko.*#\1#g" \
-              -e 's|-|_|g')"
-
-      # If the module or any of its dependencies is blacklisted, don't load it
-      for dep in $deps; do
-        if echo "${BLACKLIST}" | /bin/grep -q -e " ${dep} " -e "^${dep} " -e " ${dep}\$"; then
-          if [ "${dep}" = "${mod}" ]; then
-            $LOGGER -p local0.info -t "$(basename $0)" "Not loading module '${mod}' for alias '$1' because it is blacklisted"
-          else
-            $LOGGER -p local0.info -t "$(basename $0)" "Not loading module '${mod}' for alias '$1' because its dependency '${dep}' is blacklisted"
-          fi
-          continue 2
-        fi
-      done
-      # modprobe usually uses the "blacklist" statements from modprobe.conf only to blacklist all aliases
-      # of a module, but not the module itself. We use --use-blacklist here so that modprobe also blacklists
-      # module names if we resolved alias names manually above
-      $MODPROBE $USEBLACKLIST ${mod}
-    done
-  else
-    $MODPROBE $USEBLACKLIST $1
-  fi
-fi
-# vim: set et ts=4:
diff --git a/core/udev/static-audio-nodes-permissions.patch b/core/udev/static-audio-nodes-group.patch
index b1fc4f935..b1fc4f935 100644
--- a/core/udev/static-audio-nodes-permissions.patch
+++ b/core/udev/static-audio-nodes-group.patch
diff --git a/core/udev/static-nodes-permissions.patch b/core/udev/static-nodes-permissions.patch
new file mode 100644
index 000000000..51e6ad6bc
--- /dev/null
+++ b/core/udev/static-nodes-permissions.patch
@@ -0,0 +1,57 @@
+From c112873b5bc9ebbae39c32f502bc6211f33546cc Mon Sep 17 00:00:00 2001
+From: Kay Sievers <kay.sievers@vrfy.org>
+Date: Mon, 30 May 2011 02:12:02 +0200
+Subject: [PATCH 1/2] rules: static_node - use 0660 if group is given to get
+ the cigar
+
+>> On Tue, May 24, 2011 at 15:33, Tom Gundersen <teg@jklm.no> wrote:
+>
+> Close, but no cigar. Looks like the static nodes are not assigned
+> permissions 0660 even if a gid is set (the nodes have perms 0600).
+>
+> Cheers,
+>
+> Tom
+---
+ udev/udev-rules.c |   10 ++++++++--
+ 1 files changed, 8 insertions(+), 2 deletions(-)
+
+diff --git a/udev/udev-rules.c b/udev/udev-rules.c
+index 48395e7..56a258d 100644
+--- a/udev/udev-rules.c
++++ b/udev/udev-rules.c
+@@ -2709,8 +2709,9 @@ void udev_rules_apply_static_dev_perms(struct udev_rules *rules)
+ 		case TK_A_STATIC_NODE: {
+ 			char filename[UTIL_PATH_SIZE];
+ 			struct stat stats;
++
+ 			/* we assure, that the permissions tokens are sorted before the static token */
+-			if (mode == 0 && uid == 0 && gid == 0)
++			if (uid == 0 && gid == 0)
+ 				goto next;
+ 			util_strscpyl(filename, sizeof(filename), udev_get_dev_path(rules->udev), "/",
+ 				      &rules->buf[cur->key.value_off], NULL);
+@@ -2718,14 +2719,19 @@ void udev_rules_apply_static_dev_perms(struct udev_rules *rules)
+ 				goto next;
+ 			if (!S_ISBLK(stats.st_mode) && !S_ISCHR(stats.st_mode))
+ 				goto next;
+-			if (mode != 0 && mode != (stats.st_mode & 0777)) {
++
++			if (mode == 0 && gid > 0)
++				mode = 0660;
++			if (mode != (stats.st_mode & 0777)) {
+ 				chmod(filename, mode);
+ 				info(rules->udev, "chmod '%s' %#o\n", filename, mode);
+ 			}
++
+ 			if ((uid != 0 && uid != stats.st_uid) || (gid != 0 && gid != stats.st_gid)) {
+ 				chown(filename, uid, gid);
+ 				info(rules->udev, "chown '%s' %u %u\n", filename, uid, gid);
+ 			}
++
+ 			utimensat(AT_FDCWD, filename, NULL, 0);
+ 			break;
+ 		}
+-- 
+1.7.5.2
+
diff --git a/core/udev/udev.install b/core/udev/udev.install
index b2ed69467..5c02dd15b 100644
--- a/core/udev/udev.install
+++ b/core/udev/udev.install
@@ -22,6 +22,22 @@ post_upgrade() {
     echo "Errors are now logged (possibly to the console) by default."
     echo "---------------"
   fi
+  if [ "$(vercmp $2 172)" -lt 0 ]; then
+    echo "ATTENTION UDEV:"
+    echo "---------------"
+    echo "Arch's custom blacklisting logic has been removed. MOD_AUTOLOAD and"
+    echo "blacklisting in MODULES no longer works."
+    echo "See 'man modprobe.conf' for a replacement to blacklisting."
+    echo "To disable a module mod1 on the kernel command line, use"
+    echo "mod1.disable=1"
+    echo "or"
+    echo "modprobe.blacklist=mod1"
+    echo "  --"
+    echo "The following modules are no longer unconditionally loaded:"
+    echo "  pcspkr irtty-sir analog lp ppdev ide-generic"
+    echo "Add them to MODULES in rc.conf if you need them."
+    echo "---------------"
+  fi
 }
 
 post_install() {