summaryrefslogtreecommitdiff
path: root/core/nfs-utils
diff options
context:
space:
mode:
authorNicolas Reynolds <fauno@kiwwwi.com.ar>2011-05-14 00:07:43 -0300
committerNicolas Reynolds <fauno@kiwwwi.com.ar>2011-05-14 00:07:43 -0300
commit6d90f2496f41209ab84d8b61d20b4d79d632ec7d (patch)
tree91a141bc21b17ccd6187b5c6a8b9f53367d9c93e /core/nfs-utils
parent26841be26f283b971f431eb735f748cef7a5250d (diff)
parent2c4629f613c001fd29740d0f4c0e497c771a2182 (diff)
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts: community/frogatto/PKGBUILD community/python-psycopg2/PKGBUILD core/libtirpc/PKGBUILD extra/cd-discid/PKGBUILD extra/cups/PKGBUILD extra/cyrus-sasl/PKGBUILD extra/evolution-data-server/PKGBUILD extra/gnome-control-center/PKGBUILD extra/gnugo/PKGBUILD extra/gperf/PKGBUILD extra/gtk2/PKGBUILD extra/kdegames/PKGBUILD extra/kismet/PKGBUILD extra/lzo/PKGBUILD extra/mutt/PKGBUILD extra/obconf/PKGBUILD extra/opensp/PKGBUILD extra/qt3/PKGBUILD extra/re2c/PKGBUILD extra/samba/PKGBUILD extra/sharutils/PKGBUILD extra/wireshark/PKGBUILD
Diffstat (limited to 'core/nfs-utils')
-rw-r--r--core/nfs-utils/PKGBUILD28
-rw-r--r--core/nfs-utils/nfs-server.conf2
2 files changed, 6 insertions, 24 deletions
diff --git a/core/nfs-utils/PKGBUILD b/core/nfs-utils/PKGBUILD
index 37c362942..4ae3d3242 100644
--- a/core/nfs-utils/PKGBUILD
+++ b/core/nfs-utils/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 109322 2011-02-08 08:33:56Z ibiru $
+# $Id: PKGBUILD 123110 2011-05-08 13:46:17Z stephane $
# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
# Contributor: John Proctor <jproctor@prium.net>
# Contributor: dibblethewrecker <dibblethewrecker.at.jiwe.org>
@@ -6,8 +6,8 @@
# Contributor: Marco Lima <cipparello gmail com>
pkgname=nfs-utils
-pkgver=1.2.2
-pkgrel=6
+pkgver=1.2.3
+pkgrel=2
pkgdesc="Support programs for Network File Systems"
arch=('i686' 'x86_64' 'mips64el')
url='http://nfs.sourceforge.net'
@@ -23,49 +23,31 @@ source=(http://downloads.sourceforge.net/project/nfs/${pkgname}/${pkgver}/${pkgn
exports
idmapd.conf
start-statd.patch
- nfs-utils-1.1.2-kerberos-ac.patch
- nfs-utils-1.1.6-no_libgssapi.patch
- nfs-utils-1.1.6-heimdal_functions.patch
nfs-utils-1.1.4-mtab-sym.patch
nfs-utils-1.1.4-no-exec.patch)
install=nfs-utils.install
-md5sums=('dad92f64db3266c7757f71bb53ee8f35'
+md5sums=('1131dc5f27c4f3905a6e7ee0d594fd4d'
'fc508e10cdf5e8ddd80373b1b2bc99a1'
'f73f197a16b02c3e248488ec35c4cf43'
'5ae080f6117cef3140f02bc162bdc755'
- 'b9b334414baec31b97f0431d9ecdcfb9'
+ '2bf71def3263325643a09458635520f0'
'ff585faf410a62c4333a027c50b56bae'
'eb4f4027fab6fc1201f1ca04f5954c76'
'e24f81a8c8657672e262c61235d34b4a'
- 'f3be115d392d9f9bb0f056e8d4341a14'
- '20c6fae1c771b9d8e91c4973f16372e3'
- 'e6fd3a8acfe97970a53db1b902c34f45'
'7674106eaaa4c149bccd4f05fe3604e9'
'4f4827dfc93008dfadd0a530ad0872b2')
build() {
cd $srcdir/${pkgname}-${pkgver}
- # Patches from gentoo for heimdal compatibility Bug 231396
- # http://bugs.gentoo.org/show_bug.cgi?id=231396
- patch -Np1 -i ../nfs-utils-1.1.2-kerberos-ac.patch
- patch -Np1 -i ../nfs-utils-1.1.6-no_libgssapi.patch
- patch -Np0 -i ../nfs-utils-1.1.6-heimdal_functions.patch
patch -Np1 -i ../nfs-utils-1.1.4-mtab-sym.patch
patch -Np1 -i ../nfs-utils-1.1.4-no-exec.patch
# arch specific patch
patch -Np0 -i $srcdir/start-statd.patch
- rm -f config.guess config.sub ltmain.sh
- autoreconf -i
-
- export GSSGLUE_CFLAGS='-I/usr/include/gssapi'
- export GSSGLUE_LIBS='-lgssapi -ldl'
-
./configure --prefix=/usr --enable-nfsv3 --enable-nfsv4 --enable-gss \
--with-tcp-wrappers --with-statedir=/var/lib/nfs --enable-ipv6 --sysconfdir=/etc
- unset LDFLAGS
make
}
diff --git a/core/nfs-utils/nfs-server.conf b/core/nfs-utils/nfs-server.conf
index cf75fb6f9..4054d6b88 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 1 --no-nfs-version 2"
+MOUNTD_OPTS="--no-nfs-version 2"
# 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".