diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-03-11 11:53:09 +0100 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-03-11 11:53:09 +0100 |
| commit | 3156702a5deccd61451be9f7d8ba0fd212a3043b (patch) | |
| tree | 624620bf3c78560df2455ebe11c66073a39d7355 /core/nfs-utils | |
| parent | aa74620a7ef4a49bd466b993c4675514781bd179 (diff) | |
| parent | 4640048ddd1331c9f6fc14b8921ccecdb6b1ea11 (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
core/kmod/PKGBUILD
core/nfs-utils/PKGBUILD
extra/libdmx/PKGBUILD
gnome-unstable/gnome-keyring/PKGBUILD
gnome-unstable/libgnome-keyring/PKGBUILD
gnome-unstable/libgweather/PKGBUILD
gnome-unstable/libgweather/libgweather.install
multilib/lib32-gnutls/PKGBUILD
multilib/lib32-libtiff/PKGBUILD
testing/libxcb/PKGBUILD
testing/libxcb/libxcb-1.1-no-pthread-stubs.patch
testing/libxi/PKGBUILD
testing/mesa/PKGBUILD
Diffstat (limited to 'core/nfs-utils')
| -rw-r--r-- | core/nfs-utils/PKGBUILD | 6 | ||||
| -rw-r--r-- | core/nfs-utils/nfs-server.conf | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/core/nfs-utils/PKGBUILD b/core/nfs-utils/PKGBUILD index 4ec7c926d..7ee8f4942 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.1 +pkgrel=2 pkgdesc="Support programs for Network File Systems" arch=('i686' 'x86_64' 'mips64el') 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". |