From 503034bfe282c58ff13c42c7a6b92aa062d779b5 Mon Sep 17 00:00:00 2001
From: root <root@rshg054.dnsready.net>
Date: Sun, 11 Mar 2012 00:02:38 +0000
Subject: Sun Mar 11 00:02:37 UTC 2012

---
 core/kmod/PKGBUILD             | 23 ++++++-----------------
 core/nfs-utils/PKGBUILD        |  6 +++---
 core/nfs-utils/nfs-server.conf |  2 +-
 3 files changed, 10 insertions(+), 21 deletions(-)

(limited to 'core')

diff --git a/core/kmod/PKGBUILD b/core/kmod/PKGBUILD
index d0b714fde..1605d798f 100644
--- a/core/kmod/PKGBUILD
+++ b/core/kmod/PKGBUILD
@@ -1,39 +1,28 @@
-# $Id: PKGBUILD 150335 2012-02-16 23:20:12Z dreisner $
+# $Id: PKGBUILD 152815 2012-03-09 17:34:10Z dreisner $
 # Maintainer: Dave Reisner <dreisner@archlinux.org>
 
 pkgname=kmod
-pkgver=5
-pkgrel=4
+pkgver=6
+pkgrel=1
 pkgdesc="Linux kernel module handling"
 arch=('i686' 'x86_64')
-url="http://git.profusion.mobi/cgit.cgi/kmod.git"
+url='http://git.kernel.org/?p=utils/kernel/kmod/kmod.git;a=summary'
 license=('GPL2')
 depends=('glibc' 'zlib')
 options=('!libtool')
 provides=('module-init-tools=3.16')
 conflicts=('module-init-tools')
 replaces=('module-init-tools')
-source=("http://packages.profusion.mobi/$pkgname/$pkgname-$pkgver.tar.xz"
-        '0001-libkmod-module-probe-Fix-ignore-loaded-flag-not-bein.patch'
-        '0001-libkmod-module-probe-fix-infinite-loop-with-softdeps.patch'
+source=("ftp://ftp.kernel.org/pub/linux/utils/kernel/$pkgname/$pkgname-$pkgver.tar.xz"
         "depmod-search.conf")
-md5sums=('b271c2ec54aba1c67bda63c8579d8c15'
-         '81545a1509b43008f85c03fb980f0e86'
-         '662a85dbe420f04c1ef24f9cd4e4c990'
+md5sums=('bad08102fad212cd34405136d9a7eb94'
          '4b8cbcbc54b9029c99fd730e257d4436')
 
 build() {
   cd "$pkgname-$pkgver"
 
-  # fix modprobe --show-depends failures on loaded modules
-  patch -Np1 <"$srcdir/0001-libkmod-module-probe-Fix-ignore-loaded-flag-not-bein.patch"
-
-  # fix infinite loop with softdeps
-  patch -Np1 <"$srcdir/0001-libkmod-module-probe-fix-infinite-loop-with-softdeps.patch"
-
   ./configure \
     --sysconfdir=/etc \
-    --with-rootprefix= \
     --with-zlib
 
   make
diff --git a/core/nfs-utils/PKGBUILD b/core/nfs-utils/PKGBUILD
index cdcbf3e86..73a8fd32e 100644
--- a/core/nfs-utils/PKGBUILD
+++ b/core/nfs-utils/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 139845 2011-10-05 07:58:34Z tpowa $
+# $Id: PKGBUILD 152724 2012-03-09 12:06:10Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 # Contributor: John Proctor <jproctor@prium.net>
 # Contributor: dibblethewrecker <dibblethewrecker.at.jiwe.org>
@@ -7,7 +7,7 @@
 
 pkgname=nfs-utils
 pkgver=1.2.5
-pkgrel=1
+pkgrel=2
 pkgdesc="Support programs for Network File Systems"
 arch=('i686' 'x86_64')
 url='http://nfs.sourceforge.net'
@@ -30,7 +30,7 @@ md5sums=('8395ac770720b83c5c469f88306d7765'
          'dd0d65fc6e8f422fa12520813098264b'
          'f73f197a16b02c3e248488ec35c4cf43'
          'e619f18354ff958ed624d05d08853d8f'
-         '2bf71def3263325643a09458635520f0'
+         '9cef69bc686cc5dcac23fbb51450747d'
          'ff585faf410a62c4333a027c50b56bae'
          'eb4f4027fab6fc1201f1ca04f5954c76'
          'e9144277a89a620d9bc80413158a7d27'
diff --git a/core/nfs-utils/nfs-server.conf b/core/nfs-utils/nfs-server.conf
index 4054d6b88..581e26350 100644
--- a/core/nfs-utils/nfs-server.conf
+++ b/core/nfs-utils/nfs-server.conf
@@ -18,7 +18,7 @@ PROCNFSD_MOUNTOPTS=""
 # If you have a port-based firewall, you might want to set up
 # a fixed port here using the --port option.
 # See rpc.mountd(8) for more details.
-MOUNTD_OPTS="--no-nfs-version 2"
+MOUNTD_OPTS=""
 
 # Do you want to start the svcgssd daemon? It is only required for Kerberos
 # exports. Valid alternatives are "yes" and "no"; the default is "no".
-- 
cgit v1.2.3-54-g00ecf