+# Copyright (C) 2009 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
# $Id$
include $(TOPDIR)/rules.mk
PKG_NAME:=nfs-kernel-server
-PKG_VERSION:=1.0.7
-PKG_RELEASE:=1
-PKG_MD5SUM:=8f863120261cd572ad320a9152581e11
+PKG_VERSION:=1.1.5
+PKG_RELEASE:=3
+PKG_MD5SUM:=2848072a5e53840b9bc520fbb6782b57
PKG_SOURCE_URL:=@SF/nfs
-PKG_SOURCE:=nfs-utils-$(PKG_VERSION).tar.gz
+PKG_SOURCE:=nfs-utils-$(PKG_VERSION).tar.bz2
PKG_BUILD_DIR:=$(BUILD_DIR)/nfs-utils-$(PKG_VERSION)
include $(INCLUDE_DIR)/package.mk
+define Package/nfs-kernel-server/Default
+ SECTION:=net
+ CATEGORY:=Network
+ DEPENDS:=+libwrap +libblkid
+ URL:=http://nfs.sourceforge.net/
+endef
+
define Package/nfs-kernel-server
-SECTION:=net
-CATEGORY:=Network
-TITLE:=Kernel NFS server support
-URL:=http://nfs.sourceforge.net/
-DEPENDS:=+kmod-fs-nfsd +kmod-fs-nfs +portmap
+ $(call Package/nfs-kernel-server/Default)
+ TITLE:=Kernel NFS server support
+ DEPENDS+= +kmod-fs-nfsd +kmod-fs-nfs +portmap
endef
define Package/nfs-kernel-server/description
-Kernel NFS server support
+ Kernel NFS server support
endef
define Package/nfs-kernel-server-utils
-SECTION:=net
-CATEGORY:=Network
-TITLE:=NFS server utils
-URL:=http://nfs.sourceforge.net
-DEPENDS:=nfs-kernel-server
+ $(call Package/nfs-kernel-server/Default)
+ TITLE:=NFS server utils
+ DEPENDS:=nfs-kernel-server
endef
define Package/nfs-kernel-server-utils/description
-NFS server utils
+ NFS server utils
endef
define Package/nfs-kernel-server/conffiles
/etc/exports
endef
-define Build/Configure
- $(call Build/Configure/Default, \
- --enable-static \
- --enable-shared \
- --disable-nfsv4 \
- --disable-gss \
- )
+define Package/nfs-utils
+ $(call Package/nfs-kernel-server/Default)
+ DEPENDS+= +libevent
+ TITLE:=updated mount utility (includes nfs4)
+endef
+
+define Package/nfs-utils/description
+ Updated mount.nfs command - allows mounting nfs4 volumes
endef
+CONFIGURE_ARGS += \
+ --disable-gss \
+ --disable-nfsv4 \
+ --enable-static \
+ --enable-shared
+
+TARGET_CFLAGS += -I$(PKG_BUILD_DIR)/lib
+TARGET_LDFLAGS += -Wl,-rpath-link=$(STAGING_DIR)/usr/lib
+
define Build/Compile
- rm -rf $(PKG_INSTALL_DIR)
- mkdir -p $(PKG_INSTALL_DIR)
- $(MAKE) -C $(PKG_BUILD_DIR)
+ $(call Build/Compile/Default, \
+ OPT="$(TARGET_CFLAGS)" \
+ INSTALLSUID="install -m 4755" \
+ DESTDIR="$(PKG_INSTALL_DIR)" \
+ all install \
+ )
endef
define Package/nfs-kernel-server/install
$(INSTALL_DIR) $(1)/etc/init.d $(1)/usr/sbin
$(INSTALL_DATA) ./files/nfsd.exports $(1)/etc/exports
$(INSTALL_BIN) ./files/nfsd.init $(1)/etc/init.d/nfsd
- $(INSTALL_BIN) $(PKG_BUILD_DIR)/utils/lockd/lockd $(1)/usr/sbin/rpc.lockd
$(INSTALL_BIN) $(PKG_BUILD_DIR)/utils/statd/statd $(1)/usr/sbin/rpc.statd
$(INSTALL_BIN) $(PKG_BUILD_DIR)/utils/nfsd/nfsd $(1)/usr/sbin/rpc.nfsd
$(INSTALL_BIN) $(PKG_BUILD_DIR)/utils/mountd/mountd $(1)/usr/sbin/rpc.mountd
$(INSTALL_BIN) $(PKG_BUILD_DIR)/utils/nfsstat/nfsstat $(1)/usr/sbin
endef
+define Package/nfs-utils/install
+ $(INSTALL_DIR) $(1)/sbin
+ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/sbin/mount.nfs $(1)/sbin/
+ (cd $(1)/sbin; ln -sf mount.nfs mount.nfs4; ln -sf mount.nfs umount.nfs; ln -sf mount.nfs umount.nfs4)
+endef
+
$(eval $(call BuildPackage,nfs-kernel-server))
$(eval $(call BuildPackage,nfs-kernel-server-utils))
+$(eval $(call BuildPackage,nfs-utils))
touch $NFS_D/rmtab
/usr/sbin/rpc.statd
- /usr/sbin/rpc.lockd
/usr/sbin/exportfs -r
/usr/sbin/rpc.nfsd
/usr/sbin/rpc.mountd
killall rpc.mountd 2> /dev/null
killall -9 rpc.nfsd 2> /dev/null
/usr/sbin/exportfs -au
- killall lockd 2> /dev/null
killall rpc.statd 2> /dev/null
}
+++ /dev/null
-Index: nfs-utils-1.0.7/support/nfs/svc_socket.c
-===================================================================
---- nfs-utils-1.0.7.orig/support/nfs/svc_socket.c 2007-12-30 16:52:24.647893048 +0100
-+++ nfs-utils-1.0.7/support/nfs/svc_socket.c 2007-12-30 16:53:46.880579218 +0100
-@@ -63,9 +63,10 @@
- }
- }
-
-- __bzero ((char *) &addr, sizeof (addr));
-+ memset((char *) &addr, 0, sizeof (addr));
- addr.sin_family = AF_INET;
-
-+#ifndef __UCLIBC__ /* neither getrpcbynumber() nor getrpcbynumber_r() is SuSv3 */
- ret = getrpcbynumber_r (number, &rpcbuf, rpcdata, sizeof rpcdata,
- &rpcp);
- if (ret == 0 && rpcp != NULL)
-@@ -99,6 +100,7 @@
- }
- }
- else
-+#endif /* ! __UCLIBC__ */
- {
- if (bindresvport (sock, &addr))
- {
--- /dev/null
+diff -urN nfs-utils-1.1.5/utils/mountd/cache.c nfs-utils-1.1.5.new/utils/mountd/cache.c
+--- nfs-utils-1.1.5/utils/mountd/cache.c 2009-03-05 12:42:56.000000000 +0100
++++ nfs-utils-1.1.5.new/utils/mountd/cache.c 2009-04-07 16:11:09.000000000 +0200
+@@ -142,6 +142,7 @@
+ pw = getpwuid(uid);
+ if (!pw)
+ rv = -1;
++#ifndef __UCLIBC__
+ else {
+ rv = getgrouplist(pw->pw_name, pw->pw_gid, groups, &ngroups);
+ if (rv == -1 && ngroups >= 100) {
+@@ -153,6 +154,7 @@
+ groups, &ngroups);
+ }
+ }
++#endif /* __UCLIBC__ */
+ qword_printint(f, uid);
+ qword_printint(f, time(0)+30*60);
+ if (rv >= 0) {
+diff -burN nfs-utils-1.1.5/support/nfs/svc_socket.c nfs-utils-1.1.5.p/support/nfs/svc_socket.c
+--- nfs-utils-1.1.5/support/nfs/svc_socket.c 2009-03-05 12:42:56.000000000 +0100
++++ nfs-utils-1.1.5.p/support/nfs/svc_socket.c 2009-04-07 17:33:07.307458029 +0200
+@@ -66,9 +66,13 @@
+
+ memset (&addr, 0, sizeof (addr));
+ addr.sin_family = AF_INET;
+-
++#ifndef __UCLIBC__ /* neither getrpcbynumber() nor getrpcbynumber_r() is SuSv3 */
+ ret = getrpcbynumber_r (number, &rpcbuf, rpcdata, sizeof rpcdata,
+ &rpcp);
++#else
++ rpcp = getrpcbynumber (number);
++ ret = 0;
++#endif
+ if (ret == 0 && rpcp != NULL)
+ {
+ /* First try name. */
+++ /dev/null
---- nfs-utils-1.0.7.orig/config.sub
-+++ nfs-utils-1.0.7/config.sub
-@@ -1,9 +1,9 @@
- #! /bin/sh
- # Configuration validation subroutine script.
--# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
--# Free Software Foundation, Inc.
-+# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-+# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
-
--timestamp='2001-03-19'
-+timestamp='2005-02-10'
-
- # This file is (in principle) common to ALL GNU software.
- # The presence of a machine in this file suggests that SOME GNU software
-@@ -29,7 +29,8 @@
- # configuration script generated by Autoconf, you may include it under
- # the same distribution terms that you use for the rest of that program.
-
--# Please send patches to <config-patches@gnu.org>.
-+# Please send patches to <config-patches@gnu.org>. Submit a context
-+# diff and a properly formatted ChangeLog entry.
- #
- # Configuration subroutine to validate and canonicalize a configuration type.
- # Supply the specified configuration type as an argument.
-@@ -69,7 +70,7 @@
- version="\
- GNU config.sub ($timestamp)
-
--Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
-+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
- Free Software Foundation, Inc.
-
- This is free software; see the source for copying conditions. There is NO
-@@ -117,7 +118,8 @@
- # Here we must recognize all the valid KERNEL-OS combinations.
- maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
- case $maybe_os in
-- nto-qnx* | linux-gnu* | storm-chaos* | os2-emx*)
-+ nto-qnx* | linux-gnu* | linux-dietlibc | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | \
-+ kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*)
- os=-$maybe_os
- basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
- ;;
-@@ -143,7 +145,7 @@
- -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
- -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
- -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
-- -apple | -axis)
-+ -apple | -axis | -knuth | -cray)
- os=
- basic_machine=$1
- ;;
-@@ -157,13 +159,17 @@
- os=-vxworks
- basic_machine=$1
- ;;
-+ -chorusos*)
-+ os=-chorusos
-+ basic_machine=$1
-+ ;;
-+ -chorusrdb)
-+ os=-chorusrdb
-+ basic_machine=$1
-+ ;;
- -hiux*)
- os=-hiuxwe2
- ;;
-- -mvs*)
-- os=-mvs
-- basic_machine=i370-ibm
-- ;;
- -sco5)
- os=-sco3.2v5
- basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-@@ -219,25 +225,50 @@
- case $basic_machine in
- # Recognize the basic CPU types without company name.
- # Some are omitted here because they have special meanings below.
-- tahoe | i860 | ia64 | m32r | m68k | m68000 | m88k | ns32k | arc \
-- | arm | arme[lb] | arm[bl]e | armv[2345] | armv[345][lb] | strongarm | xscale \
-- | pyramid | mn10200 | mn10300 | tron | a29k \
-- | 580 | i960 | h8300 \
-- | x86 | ppcbe | mipsbe | mipsle | shbe | shle \
-- | hppa | hppa1.0 | hppa1.1 | hppa2.0 | hppa2.0w | hppa2.0n \
-- | hppa64 \
-- | alpha | alphaev[4-8] | alphaev56 | alphapca5[67] \
-- | alphaev6[78] \
-- | we32k | ns16k | clipper | i370 | sh | sh[34] \
-- | powerpc | powerpcle \
-- | 1750a | dsp16xx | pdp10 | pdp11 \
-- | mips16 | mips64 | mipsel | mips64el \
-- | mips64orion | mips64orionel | mipstx39 | mipstx39el \
-- | mips64vr4300 | mips64vr4300el | mips64vr4100 | mips64vr4100el \
-- | mips64vr5000 | miprs64vr5000el | mcore | s390 | s390x \
-- | sparc | sparclet | sparclite | sparc64 | sparcv9 | v850 | c4x \
-- | thumb | d10v | d30v | fr30 | avr | openrisc | tic80 \
-- | pj | pjl | h8500)
-+ 1750a | 580 \
-+ | a29k \
-+ | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
-+ | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
-+ | am33_2.0 \
-+ | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
-+ | c4x | clipper \
-+ | d10v | d30v | dlx | dsp16xx \
-+ | fr30 | frv \
-+ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
-+ | i370 | i860 | i960 | ia64 \
-+ | ip2k | iq2000 \
-+ | m32r | m32rle | m68000 | m68k | m88k | maxq | mcore \
-+ | mips | mipsbe | mipseb | mipsel | mipsle \
-+ | mips16 \
-+ | mips64 | mips64el \
-+ | mips64vr | mips64vrel \
-+ | mips64orion | mips64orionel \
-+ | mips64vr4100 | mips64vr4100el \
-+ | mips64vr4300 | mips64vr4300el \
-+ | mips64vr5000 | mips64vr5000el \
-+ | mipsisa32 | mipsisa32el \
-+ | mipsisa32r2 | mipsisa32r2el \
-+ | mipsisa64 | mipsisa64el \
-+ | mipsisa64r2 | mipsisa64r2el \
-+ | mipsisa64sb1 | mipsisa64sb1el \
-+ | mipsisa64sr71k | mipsisa64sr71kel \
-+ | mipstx39 | mipstx39el \
-+ | mn10200 | mn10300 \
-+ | msp430 \
-+ | ns16k | ns32k \
-+ | openrisc | or32 \
-+ | pdp10 | pdp11 | pj | pjl \
-+ | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
-+ | pyramid \
-+ | sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
-+ | sh64 | sh64le \
-+ | sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv8 | sparcv9 | sparcv9b \
-+ | strongarm \
-+ | tahoe | thumb | tic4x | tic80 | tron \
-+ | v850 | v850e \
-+ | we32k \
-+ | x86 | xscale | xscalee[bl] | xstormy16 | xtensa \
-+ | z8k)
- basic_machine=$basic_machine-unknown
- ;;
- m6811 | m68hc11 | m6812 | m68hc12)
-@@ -245,13 +276,13 @@
- basic_machine=$basic_machine-unknown
- os=-none
- ;;
-- m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | z8k | v70 | w65)
-+ m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
- ;;
-
- # We use `pc' rather than `unknown'
- # because (1) that's what they normally are, and
- # (2) the word "unknown" tends to confuse beginning users.
-- i[234567]86 | x86_64)
-+ i*86 | x86_64)
- basic_machine=$basic_machine-pc
- ;;
- # Object if more than one company name word.
-@@ -260,30 +291,62 @@
- exit 1
- ;;
- # Recognize the basic CPU types with company name.
-- # FIXME: clean up the formatting here.
-- vax-* | tahoe-* | i[234567]86-* | i860-* | ia64-* | m32r-* | m68k-* | m68000-* \
-- | m88k-* | sparc-* | ns32k-* | fx80-* | arc-* | c[123]* \
-- | arm-* | armbe-* | armle-* | armv*-* | strongarm-* | xscale-* \
-- | mips-* | pyramid-* | tron-* | a29k-* | romp-* | rs6000-* \
-- | power-* | none-* | 580-* | cray2-* | h8300-* | h8500-* | i960-* \
-- | xmp-* | ymp-* \
-- | x86-* | ppcbe-* | mipsbe-* | mipsle-* | shbe-* | shle-* \
-- | hppa-* | hppa1.0-* | hppa1.1-* | hppa2.0-* | hppa2.0w-* \
-- | hppa2.0n-* | hppa64-* \
-- | alpha-* | alphaev[4-8]-* | alphaev56-* | alphapca5[67]-* \
-- | alphaev6[78]-* \
-- | we32k-* | cydra-* | ns16k-* | pn-* | np1-* | xps100-* \
-- | clipper-* | orion-* \
-- | sparclite-* | pdp10-* | pdp11-* | sh-* | powerpc-* | powerpcle-* \
-- | sparc64-* | sparcv9-* | sparc86x-* | mips16-* | mips64-* | mipsel-* \
-- | mips64el-* | mips64orion-* | mips64orionel-* \
-- | mips64vr4100-* | mips64vr4100el-* | mips64vr4300-* | mips64vr4300el-* \
-- | mipstx39-* | mipstx39el-* | mcore-* \
-- | f30[01]-* | f700-* | s390-* | s390x-* | sv1-* | t3e-* \
-- | [cjt]90-* \
-- | m88110-* | m680[01234]0-* | m683?2-* | m68360-* | z8k-* | d10v-* \
-- | thumb-* | v850-* | d30v-* | tic30-* | tic80-* | c30-* | fr30-* \
-- | bs2000-* | tic54x-* | c54x-* | x86_64-* | pj-* | pjl-*)
-+ 580-* \
-+ | a29k-* \
-+ | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
-+ | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
-+ | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
-+ | arm-* | armbe-* | armle-* | armeb-* | armv*-* \
-+ | avr-* \
-+ | bs2000-* \
-+ | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
-+ | clipper-* | craynv-* | cydra-* \
-+ | d10v-* | d30v-* | dlx-* \
-+ | elxsi-* \
-+ | f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
-+ | h8300-* | h8500-* \
-+ | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
-+ | i*86-* | i860-* | i960-* | ia64-* \
-+ | ip2k-* | iq2000-* \
-+ | m32r-* | m32rle-* \
-+ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
-+ | m88110-* | m88k-* | maxq-* | mcore-* \
-+ | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
-+ | mips16-* \
-+ | mips64-* | mips64el-* \
-+ | mips64vr-* | mips64vrel-* \
-+ | mips64orion-* | mips64orionel-* \
-+ | mips64vr4100-* | mips64vr4100el-* \
-+ | mips64vr4300-* | mips64vr4300el-* \
-+ | mips64vr5000-* | mips64vr5000el-* \
-+ | mipsisa32-* | mipsisa32el-* \
-+ | mipsisa32r2-* | mipsisa32r2el-* \
-+ | mipsisa64-* | mipsisa64el-* \
-+ | mipsisa64r2-* | mipsisa64r2el-* \
-+ | mipsisa64sb1-* | mipsisa64sb1el-* \
-+ | mipsisa64sr71k-* | mipsisa64sr71kel-* \
-+ | mipstx39-* | mipstx39el-* \
-+ | mmix-* \
-+ | msp430-* \
-+ | none-* | np1-* | ns16k-* | ns32k-* \
-+ | orion-* \
-+ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
-+ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
-+ | pyramid-* \
-+ | romp-* | rs6000-* \
-+ | sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \
-+ | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
-+ | sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \
-+ | sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
-+ | tahoe-* | thumb-* \
-+ | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
-+ | tron-* \
-+ | v850-* | v850e-* | vax-* \
-+ | we32k-* \
-+ | x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \
-+ | xstormy16-* | xtensa-* \
-+ | ymp-* \
-+ | z8k-*)
- ;;
- # Recognize the various machine names and aliases which stand
- # for a CPU type and a company and sometimes even an OS.
-@@ -301,6 +364,9 @@
- basic_machine=a29k-amd
- os=-udi
- ;;
-+ abacus)
-+ basic_machine=abacus-unknown
-+ ;;
- adobe68k)
- basic_machine=m68010-adobe
- os=-scout
-@@ -315,6 +381,12 @@
- basic_machine=a29k-none
- os=-bsd
- ;;
-+ amd64)
-+ basic_machine=x86_64-pc
-+ ;;
-+ amd64-*)
-+ basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
-+ ;;
- amdahl)
- basic_machine=580-amdahl
- os=-sysv
-@@ -346,6 +418,10 @@
- basic_machine=ns32k-sequent
- os=-dynix
- ;;
-+ c90)
-+ basic_machine=c90-cray
-+ os=-unicos
-+ ;;
- convex-c1)
- basic_machine=c1-convex
- os=-bsd
-@@ -366,30 +442,45 @@
- basic_machine=c38-convex
- os=-bsd
- ;;
-- cray | ymp)
-- basic_machine=ymp-cray
-+ cray | j90)
-+ basic_machine=j90-cray
- os=-unicos
- ;;
-- cray2)
-- basic_machine=cray2-cray
-- os=-unicos
-+ craynv)
-+ basic_machine=craynv-cray
-+ os=-unicosmp
- ;;
-- [cjt]90)
-- basic_machine=${basic_machine}-cray
-- os=-unicos
-+ cr16c)
-+ basic_machine=cr16c-unknown
-+ os=-elf
- ;;
- crds | unos)
- basic_machine=m68k-crds
- ;;
-+ crisv32 | crisv32-* | etraxfs*)
-+ basic_machine=crisv32-axis
-+ ;;
- cris | cris-* | etrax*)
- basic_machine=cris-axis
- ;;
-+ crx)
-+ basic_machine=crx-unknown
-+ os=-elf
-+ ;;
- da30 | da30-*)
- basic_machine=m68k-da30
- ;;
- decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn)
- basic_machine=mips-dec
- ;;
-+ decsystem10* | dec10*)
-+ basic_machine=pdp10-dec
-+ os=-tops10
-+ ;;
-+ decsystem20* | dec20*)
-+ basic_machine=pdp10-dec
-+ os=-tops20
-+ ;;
- delta | 3300 | motorola-3300 | motorola-delta \
- | 3300-motorola | delta-motorola)
- basic_machine=m68k-motorola
-@@ -398,6 +489,10 @@
- basic_machine=m88k-motorola
- os=-sysv3
- ;;
-+ djgpp)
-+ basic_machine=i586-pc
-+ os=-msdosdjgpp
-+ ;;
- dpx20 | dpx20-*)
- basic_machine=rs6000-bull
- os=-bosx
-@@ -506,23 +601,23 @@
- basic_machine=hppa1.1-hp
- os=-proelf
- ;;
-- i370*)
-+ i370-ibm* | ibm*)
- basic_machine=i370-ibm
- ;;
- # I'm not sure what "Sysv32" means. Should this be sysv3.2?
-- i[34567]86v32)
-+ i*86v32)
- basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
- os=-sysv32
- ;;
-- i[34567]86v4*)
-+ i*86v4*)
- basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
- os=-sysv4
- ;;
-- i[34567]86v)
-+ i*86v)
- basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
- os=-sysv
- ;;
-- i[34567]86sol2)
-+ i*86sol2)
- basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
- os=-solaris2
- ;;
-@@ -570,28 +665,20 @@
- basic_machine=m68k-atari
- os=-mint
- ;;
-- mipsel*-linux*)
-- basic_machine=mipsel-unknown
-- os=-linux-gnu
-- ;;
-- mips*-linux*)
-- basic_machine=mips-unknown
-- os=-linux-gnu
-- ;;
- mips3*-*)
- basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
- ;;
- mips3*)
- basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
- ;;
-- mmix*)
-- basic_machine=mmix-knuth
-- os=-mmixware
-- ;;
- monitor)
- basic_machine=m68k-rom68k
- os=-coff
- ;;
-+ morphos)
-+ basic_machine=powerpc-unknown
-+ os=-morphos
-+ ;;
- msdos)
- basic_machine=i386-pc
- os=-msdos
-@@ -671,6 +758,14 @@
- basic_machine=hppa1.1-oki
- os=-proelf
- ;;
-+ or32 | or32-*)
-+ basic_machine=or32-unknown
-+ os=-coff
-+ ;;
-+ os400)
-+ basic_machine=powerpc-ibm
-+ os=-os400
-+ ;;
- OSE68000 | ose68000)
- basic_machine=m68000-ericsson
- os=-ose
-@@ -693,42 +788,58 @@
- pbb)
- basic_machine=m68k-tti
- ;;
-- pc532 | pc532-*)
-+ pc532 | pc532-*)
- basic_machine=ns32k-pc532
- ;;
-- pentium | p5 | k5 | k6 | nexgen)
-+ pentium | p5 | k5 | k6 | nexgen | viac3)
- basic_machine=i586-pc
- ;;
-- pentiumpro | p6 | 6x86 | athlon)
-+ pentiumpro | p6 | 6x86 | athlon | athlon_*)
- basic_machine=i686-pc
- ;;
-- pentiumii | pentium2)
-+ pentiumii | pentium2 | pentiumiii | pentium3)
- basic_machine=i686-pc
- ;;
-- pentium-* | p5-* | k5-* | k6-* | nexgen-*)
-+ pentium4)
-+ basic_machine=i786-pc
-+ ;;
-+ pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
- basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
- ;;
- pentiumpro-* | p6-* | 6x86-* | athlon-*)
- basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
- ;;
-- pentiumii-* | pentium2-*)
-+ pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
- basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
- ;;
-+ pentium4-*)
-+ basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
-+ ;;
- pn)
- basic_machine=pn-gould
- ;;
- power) basic_machine=power-ibm
- ;;
- ppc) basic_machine=powerpc-unknown
-- ;;
-+ ;;
- ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
- ;;
- ppcle | powerpclittle | ppc-le | powerpc-little)
- basic_machine=powerpcle-unknown
-- ;;
-+ ;;
- ppcle-* | powerpclittle-*)
- basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
- ;;
-+ ppc64) basic_machine=powerpc64-unknown
-+ ;;
-+ ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
-+ ;;
-+ ppc64le | powerpc64little | ppc64-le | powerpc64-little)
-+ basic_machine=powerpc64le-unknown
-+ ;;
-+ ppc64le-* | powerpc64little-*)
-+ basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'`
-+ ;;
- ps2)
- basic_machine=i386-ibm
- ;;
-@@ -746,10 +857,26 @@
- rtpc | rtpc-*)
- basic_machine=romp-ibm
- ;;
-+ s390 | s390-*)
-+ basic_machine=s390-ibm
-+ ;;
-+ s390x | s390x-*)
-+ basic_machine=s390x-ibm
-+ ;;
- sa29200)
- basic_machine=a29k-amd
- os=-udi
- ;;
-+ sb1)
-+ basic_machine=mipsisa64sb1-unknown
-+ ;;
-+ sb1el)
-+ basic_machine=mipsisa64sb1el-unknown
-+ ;;
-+ sei)
-+ basic_machine=mips-sei
-+ os=-seiux
-+ ;;
- sequent)
- basic_machine=i386-sequent
- ;;
-@@ -757,7 +884,10 @@
- basic_machine=sh-hitachi
- os=-hms
- ;;
-- sparclite-wrs)
-+ sh64)
-+ basic_machine=sh64-unknown
-+ ;;
-+ sparclite-wrs | simso-wrs)
- basic_machine=sparclite-wrs
- os=-vxworks
- ;;
-@@ -824,22 +954,42 @@
- os=-dynix
- ;;
- t3e)
-- basic_machine=t3e-cray
-+ basic_machine=alphaev5-cray
-+ os=-unicos
-+ ;;
-+ t90)
-+ basic_machine=t90-cray
- os=-unicos
- ;;
- tic54x | c54x*)
- basic_machine=tic54x-unknown
- os=-coff
- ;;
-+ tic55x | c55x*)
-+ basic_machine=tic55x-unknown
-+ os=-coff
-+ ;;
-+ tic6x | c6x*)
-+ basic_machine=tic6x-unknown
-+ os=-coff
-+ ;;
- tx39)
- basic_machine=mipstx39-unknown
- ;;
- tx39el)
- basic_machine=mipstx39el-unknown
- ;;
-+ toad1)
-+ basic_machine=pdp10-xkl
-+ os=-tops20
-+ ;;
- tower | tower-32)
- basic_machine=m68k-ncr
- ;;
-+ tpf)
-+ basic_machine=s390x-ibm
-+ os=-tpf
-+ ;;
- udi29k)
- basic_machine=a29k-amd
- os=-udi
-@@ -861,8 +1011,8 @@
- os=-vms
- ;;
- vpp*|vx|vx-*)
-- basic_machine=f301-fujitsu
-- ;;
-+ basic_machine=f301-fujitsu
-+ ;;
- vxworks960)
- basic_machine=i960-wrs
- os=-vxworks
-@@ -883,13 +1033,17 @@
- basic_machine=hppa1.1-winbond
- os=-proelf
- ;;
-- xmp)
-- basic_machine=xmp-cray
-- os=-unicos
-+ xbox)
-+ basic_machine=i686-pc
-+ os=-mingw32
- ;;
-- xps | xps100)
-+ xps | xps100)
- basic_machine=xps100-honeywell
- ;;
-+ ymp)
-+ basic_machine=ymp-cray
-+ os=-unicos
-+ ;;
- z8k-*-coff)
- basic_machine=z8k-unknown
- os=-sim
-@@ -910,16 +1064,12 @@
- op60c)
- basic_machine=hppa1.1-oki
- ;;
-- mips)
-- if [ x$os = x-linux-gnu ]; then
-- basic_machine=mips-unknown
-- else
-- basic_machine=mips-mips
-- fi
-- ;;
- romp)
- basic_machine=romp-ibm
- ;;
-+ mmix)
-+ basic_machine=mmix-knuth
-+ ;;
- rs6000)
- basic_machine=rs6000-ibm
- ;;
-@@ -936,13 +1086,16 @@
- we32k)
- basic_machine=we32k-att
- ;;
-- sh3 | sh4)
-+ sh3 | sh4 | sh[34]eb | sh[1234]le | sh[23]ele)
- basic_machine=sh-unknown
- ;;
-- sparc | sparcv9)
-+ sh64)
-+ basic_machine=sh64-unknown
-+ ;;
-+ sparc | sparcv8 | sparcv9 | sparcv9b)
- basic_machine=sparc-sun
- ;;
-- cydra)
-+ cydra)
- basic_machine=cydra-cydrome
- ;;
- orion)
-@@ -957,9 +1110,8 @@
- pmac | pmac-mpw)
- basic_machine=powerpc-apple
- ;;
-- c4x*)
-- basic_machine=c4x-none
-- os=-coff
-+ *-unknown)
-+ # Make sure to match an already-canonicalized machine name.
- ;;
- *)
- echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
-@@ -1013,28 +1165,35 @@
- | -aos* \
- | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
- | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
-- | -hiux* | -386bsd* | -netbsd* | -openbsd* | -freebsd* | -riscix* \
-- | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
-+ | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* | -openbsd* \
-+ | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
-+ | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
- | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
- | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
-+ | -chorusos* | -chorusrdb* \
- | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-- | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \
-- | -interix* | -uwin* | -rhapsody* | -darwin* | -opened* \
-+ | -mingw32* | -linux-gnu* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \
-+ | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
- | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
-- | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* | -os2*)
-+ | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
-+ | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
-+ | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
-+ | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly*)
- # Remember, each alternative MUST END IN *, to match a version number.
- ;;
- -qnx*)
- case $basic_machine in
-- x86-* | i[34567]86-*)
-+ x86-* | i*86-*)
- ;;
- *)
- os=-nto$os
- ;;
- esac
- ;;
-+ -nto-qnx*)
-+ ;;
- -nto*)
-- os=-nto-qnx
-+ os=`echo $os | sed -e 's|nto|nto-qnx|'`
- ;;
- -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
- | -windows* | -osx | -abug | -netware* | -os9* | -beos* \
-@@ -1043,6 +1202,9 @@
- -mac*)
- os=`echo $os | sed -e 's|mac|macos|'`
- ;;
-+ -linux-dietlibc)
-+ os=-linux-dietlibc
-+ ;;
- -linux*)
- os=`echo $os | sed -e 's|linux|linux-gnu|'`
- ;;
-@@ -1055,6 +1217,9 @@
- -opened*)
- os=-openedition
- ;;
-+ -os400*)
-+ os=-os400
-+ ;;
- -wince*)
- os=-wince
- ;;
-@@ -1073,14 +1238,23 @@
- -acis*)
- os=-aos
- ;;
-+ -atheos*)
-+ os=-atheos
-+ ;;
-+ -syllable*)
-+ os=-syllable
-+ ;;
- -386bsd)
- os=-bsd
- ;;
- -ctix* | -uts*)
- os=-sysv
- ;;
-+ -nova*)
-+ os=-rtmk-nova
-+ ;;
- -ns2 )
-- os=-nextstep2
-+ os=-nextstep2
- ;;
- -nsk*)
- os=-nsk
-@@ -1092,6 +1266,9 @@
- -sinix*)
- os=-sysv4
- ;;
-+ -tpf*)
-+ os=-tpf
-+ ;;
- -triton*)
- os=-sysv3
- ;;
-@@ -1119,8 +1296,17 @@
- -xenix)
- os=-xenix
- ;;
-- -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
-- os=-mint
-+ -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
-+ os=-mint
-+ ;;
-+ -aros*)
-+ os=-aros
-+ ;;
-+ -kaos*)
-+ os=-kaos
-+ ;;
-+ -zvmoe)
-+ os=-zvmoe
- ;;
- -none)
- ;;
-@@ -1153,10 +1339,14 @@
- arm*-semi)
- os=-aout
- ;;
-+ c4x-* | tic4x-*)
-+ os=-coff
-+ ;;
-+ # This must come before the *-dec entry.
- pdp10-*)
- os=-tops20
- ;;
-- pdp11-*)
-+ pdp11-*)
- os=-none
- ;;
- *-dec | vax-*)
-@@ -1183,6 +1373,9 @@
- mips*-*)
- os=-elf
- ;;
-+ or32-*)
-+ os=-coff
-+ ;;
- *-tti) # must be before sparc entry or we get the wrong os.
- os=-sysv3
- ;;
-@@ -1195,6 +1388,9 @@
- *-ibm)
- os=-aix
- ;;
-+ *-knuth)
-+ os=-mmixware
-+ ;;
- *-wec)
- os=-proelf
- ;;
-@@ -1246,19 +1442,19 @@
- *-next)
- os=-nextstep3
- ;;
-- *-gould)
-+ *-gould)
- os=-sysv
- ;;
-- *-highlevel)
-+ *-highlevel)
- os=-bsd
- ;;
- *-encore)
- os=-bsd
- ;;
-- *-sgi)
-+ *-sgi)
- os=-irix
- ;;
-- *-siemens)
-+ *-siemens)
- os=-sysv4
- ;;
- *-masscomp)
-@@ -1327,10 +1523,16 @@
- -mvs* | -opened*)
- vendor=ibm
- ;;
-+ -os400*)
-+ vendor=ibm
-+ ;;
- -ptx*)
- vendor=sequent
- ;;
-- -vxsim* | -vxworks*)
-+ -tpf*)
-+ vendor=ibm
-+ ;;
-+ -vxsim* | -vxworks* | -windiss*)
- vendor=wrs
- ;;
- -aux*)
-@@ -1345,6 +1547,9 @@
- -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
- vendor=atari
- ;;
-+ -vos*)
-+ vendor=stratus
-+ ;;
- esac
- basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
- ;;
---- nfs-utils-1.0.7.orig/config.guess
-+++ nfs-utils-1.0.7/config.guess
-@@ -1,9 +1,9 @@
- #! /bin/sh
- # Attempt to guess a canonical system name.
--# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
--# Free Software Foundation, Inc.
-+# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-+# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
-
--timestamp='2001-03-16'
-+timestamp='2005-03-24'
-
- # This file is free software; you can redistribute it and/or modify it
- # under the terms of the GNU General Public License as published by
-@@ -24,8 +24,9 @@
- # configuration script generated by Autoconf, you may include it under
- # the same distribution terms that you use for the rest of that program.
-
--# Written by Per Bothner <bothner@cygnus.com>.
--# Please send patches to <config-patches@gnu.org>.
-+# Originally written by Per Bothner <per@bothner.com>.
-+# Please send patches to <config-patches@gnu.org>. Submit a context
-+# diff and a properly formatted ChangeLog entry.
- #
- # This script attempts to guess a canonical system name similar to
- # config.sub. If it succeeds, it prints the system name on stdout, and
-@@ -52,7 +53,7 @@
- GNU config.guess ($timestamp)
-
- Originally written by Per Bothner.
--Copyright (C) 1992, 93, 94, 95, 96, 97, 98, 99, 2000
-+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
- Free Software Foundation, Inc.
-
- This is free software; see the source for copying conditions. There is NO
-@@ -87,33 +88,45 @@
- exit 1
- fi
-
-+trap 'exit 1' 1 2 15
-
--dummy=dummy-$$
--trap 'rm -f $dummy.c $dummy.o $dummy.rel $dummy; exit 1' 1 2 15
-+# CC_FOR_BUILD -- compiler used by this script. Note that the use of a
-+# compiler to aid in system detection is discouraged as it requires
-+# temporary files to be created and, as you can see below, it is a
-+# headache to deal with in a portable fashion.
-
--# CC_FOR_BUILD -- compiler used by this script.
- # Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
- # use `HOST_CC' if defined, but it is deprecated.
-
-+# Portable tmp directory creation inspired by the Autoconf team.
-+
-+set_cc_for_build='
-+trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
-+trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
-+: ${TMPDIR=/tmp} ;
-+ { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
-+ { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
-+ { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
-+ { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
-+dummy=$tmp/dummy ;
-+tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ;
- case $CC_FOR_BUILD,$HOST_CC,$CC in
-- ,,) echo "int dummy(){}" > $dummy.c
-- for c in cc gcc c89 ; do
-- ($c $dummy.c -c -o $dummy.o) >/dev/null 2>&1
-- if test $? = 0 ; then
-- CC_FOR_BUILD="$c"; break
-- fi
-- done
-- rm -f $dummy.c $dummy.o $dummy.rel
-+ ,,) echo "int x;" > $dummy.c ;
-+ for c in cc gcc c89 c99 ; do
-+ if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then
-+ CC_FOR_BUILD="$c"; break ;
-+ fi ;
-+ done ;
- if test x"$CC_FOR_BUILD" = x ; then
-- CC_FOR_BUILD=no_compiler_found
-+ CC_FOR_BUILD=no_compiler_found ;
- fi
- ;;
- ,,*) CC_FOR_BUILD=$CC ;;
- ,*,*) CC_FOR_BUILD=$HOST_CC ;;
--esac
-+esac ;'
-
- # This is needed to find uname on a Pyramid OSx when run in the BSD universe.
--# (ghazi@noc.rutgers.edu 8/24/94.)
-+# (ghazi@noc.rutgers.edu 1994-08-24)
- if (test -f /.attbin/uname) >/dev/null 2>&1 ; then
- PATH=$PATH:/.attbin ; export PATH
- fi
-@@ -127,29 +140,31 @@
-
- case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
- *:NetBSD:*:*)
-- # Netbsd (nbsd) targets should (where applicable) match one or
-+ # NetBSD (nbsd) targets should (where applicable) match one or
- # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
- # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently
- # switched to ELF, *-*-netbsd* would select the old
- # object file format. This provides both forward
- # compatibility and a consistent mechanism for selecting the
- # object file format.
-- # Determine the machine/vendor (is the vendor relevant).
-- case "${UNAME_MACHINE}" in
-- amiga) machine=m68k-unknown ;;
-- arm32) machine=arm-unknown ;;
-- atari*) machine=m68k-atari ;;
-- sun3*) machine=m68k-sun ;;
-- mac68k) machine=m68k-apple ;;
-- macppc) machine=powerpc-apple ;;
-- hp3[0-9][05]) machine=m68k-hp ;;
-- ibmrt|romp-ibm) machine=romp-ibm ;;
-- *) machine=${UNAME_MACHINE}-unknown ;;
-+ #
-+ # Note: NetBSD doesn't particularly care about the vendor
-+ # portion of the name. We always set it to "unknown".
-+ sysctl="sysctl -n hw.machine_arch"
-+ UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \
-+ /usr/sbin/$sysctl 2>/dev/null || echo unknown)`
-+ case "${UNAME_MACHINE_ARCH}" in
-+ armeb) machine=armeb-unknown ;;
-+ arm*) machine=arm-unknown ;;
-+ sh3el) machine=shl-unknown ;;
-+ sh3eb) machine=sh-unknown ;;
-+ *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
- esac
- # The Operating System including object format, if it has switched
- # to ELF recently, or will in the future.
-- case "${UNAME_MACHINE}" in
-- i386|sparc|amiga|arm*|hp300|mvme68k|vax|atari|luna68k|mac68k|news68k|next68k|pc532|sun3*|x68k)
-+ case "${UNAME_MACHINE_ARCH}" in
-+ arm*|i386|m68k|ns32k|sh3*|sparc|vax)
-+ eval $set_cc_for_build
- if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
- | grep __ELF__ >/dev/null
- then
-@@ -165,70 +180,123 @@
- ;;
- esac
- # The OS release
-- release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
-+ # Debian GNU/NetBSD machines have a different userland, and
-+ # thus, need a distinct triplet. However, they do not need
-+ # kernel version information, so it can be replaced with a
-+ # suitable tag, in the style of linux-gnu.
-+ case "${UNAME_VERSION}" in
-+ Debian*)
-+ release='-gnu'
-+ ;;
-+ *)
-+ release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
-+ ;;
-+ esac
- # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
- # contains redundant information, the shorter form:
- # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
- echo "${machine}-${os}${release}"
- exit 0 ;;
-+ amd64:OpenBSD:*:*)
-+ echo x86_64-unknown-openbsd${UNAME_RELEASE}
-+ exit 0 ;;
-+ amiga:OpenBSD:*:*)
-+ echo m68k-unknown-openbsd${UNAME_RELEASE}
-+ exit 0 ;;
-+ cats:OpenBSD:*:*)
-+ echo arm-unknown-openbsd${UNAME_RELEASE}
-+ exit 0 ;;
-+ hp300:OpenBSD:*:*)
-+ echo m68k-unknown-openbsd${UNAME_RELEASE}
-+ exit 0 ;;
-+ luna88k:OpenBSD:*:*)
-+ echo m88k-unknown-openbsd${UNAME_RELEASE}
-+ exit 0 ;;
-+ mac68k:OpenBSD:*:*)
-+ echo m68k-unknown-openbsd${UNAME_RELEASE}
-+ exit 0 ;;
-+ macppc:OpenBSD:*:*)
-+ echo powerpc-unknown-openbsd${UNAME_RELEASE}
-+ exit 0 ;;
-+ mvme68k:OpenBSD:*:*)
-+ echo m68k-unknown-openbsd${UNAME_RELEASE}
-+ exit 0 ;;
-+ mvme88k:OpenBSD:*:*)
-+ echo m88k-unknown-openbsd${UNAME_RELEASE}
-+ exit 0 ;;
-+ mvmeppc:OpenBSD:*:*)
-+ echo powerpc-unknown-openbsd${UNAME_RELEASE}
-+ exit 0 ;;
-+ sgi:OpenBSD:*:*)
-+ echo mips64-unknown-openbsd${UNAME_RELEASE}
-+ exit 0 ;;
-+ sun3:OpenBSD:*:*)
-+ echo m68k-unknown-openbsd${UNAME_RELEASE}
-+ exit 0 ;;
-+ *:OpenBSD:*:*)
-+ echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE}
-+ exit 0 ;;
-+ *:ekkoBSD:*:*)
-+ echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
-+ exit 0 ;;
-+ macppc:MirBSD:*:*)
-+ echo powerppc-unknown-mirbsd${UNAME_RELEASE}
-+ exit 0 ;;
-+ *:MirBSD:*:*)
-+ echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
-+ exit 0 ;;
- alpha:OSF1:*:*)
-- if test $UNAME_RELEASE = "V4.0"; then
-+ case $UNAME_RELEASE in
-+ *4.0)
- UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
-- fi
-+ ;;
-+ *5.*)
-+ UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
-+ ;;
-+ esac
-+ # According to Compaq, /usr/sbin/psrinfo has been available on
-+ # OSF/1 and Tru64 systems produced since 1995. I hope that
-+ # covers most systems running today. This code pipes the CPU
-+ # types through head -n 1, so we only detect the type of CPU 0.
-+ ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^ The alpha \(.*\) processor.*$/\1/p' | head -n 1`
-+ case "$ALPHA_CPU_TYPE" in
-+ "EV4 (21064)")
-+ UNAME_MACHINE="alpha" ;;
-+ "EV4.5 (21064)")
-+ UNAME_MACHINE="alpha" ;;
-+ "LCA4 (21066/21068)")
-+ UNAME_MACHINE="alpha" ;;
-+ "EV5 (21164)")
-+ UNAME_MACHINE="alphaev5" ;;
-+ "EV5.6 (21164A)")
-+ UNAME_MACHINE="alphaev56" ;;
-+ "EV5.6 (21164PC)")
-+ UNAME_MACHINE="alphapca56" ;;
-+ "EV5.7 (21164PC)")
-+ UNAME_MACHINE="alphapca57" ;;
-+ "EV6 (21264)")
-+ UNAME_MACHINE="alphaev6" ;;
-+ "EV6.7 (21264A)")
-+ UNAME_MACHINE="alphaev67" ;;
-+ "EV6.8CB (21264C)")
-+ UNAME_MACHINE="alphaev68" ;;
-+ "EV6.8AL (21264B)")
-+ UNAME_MACHINE="alphaev68" ;;
-+ "EV6.8CX (21264D)")
-+ UNAME_MACHINE="alphaev68" ;;
-+ "EV6.9A (21264/EV69A)")
-+ UNAME_MACHINE="alphaev69" ;;
-+ "EV7 (21364)")
-+ UNAME_MACHINE="alphaev7" ;;
-+ "EV7.9 (21364A)")
-+ UNAME_MACHINE="alphaev79" ;;
-+ esac
-+ # A Pn.n version is a patched version.
- # A Vn.n version is a released version.
- # A Tn.n version is a released field test version.
- # A Xn.n version is an unreleased experimental baselevel.
- # 1.2 uses "1.2" for uname -r.
-- cat <<EOF >$dummy.s
-- .data
--\$Lformat:
-- .byte 37,100,45,37,120,10,0 # "%d-%x\n"
--
-- .text
-- .globl main
-- .align 4
-- .ent main
--main:
-- .frame \$30,16,\$26,0
-- ldgp \$29,0(\$27)
-- .prologue 1
-- .long 0x47e03d80 # implver \$0
-- lda \$2,-1
-- .long 0x47e20c21 # amask \$2,\$1
-- lda \$16,\$Lformat
-- mov \$0,\$17
-- not \$1,\$18
-- jsr \$26,printf
-- ldgp \$29,0(\$26)
-- mov 0,\$16
-- jsr \$26,exit
-- .end main
--EOF
-- $CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null
-- if test "$?" = 0 ; then
-- case `./$dummy` in
-- 0-0)
-- UNAME_MACHINE="alpha"
-- ;;
-- 1-0)
-- UNAME_MACHINE="alphaev5"
-- ;;
-- 1-1)
-- UNAME_MACHINE="alphaev56"
-- ;;
-- 1-101)
-- UNAME_MACHINE="alphapca56"
-- ;;
-- 2-303)
-- UNAME_MACHINE="alphaev6"
-- ;;
-- 2-307)
-- UNAME_MACHINE="alphaev67"
-- ;;
-- esac
-- fi
-- rm -f $dummy.s $dummy
-- echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-+ echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
- exit 0 ;;
- Alpha\ *:Windows_NT*:*)
- # How do we know it's Interix rather than the generic POSIX subsystem?
-@@ -242,33 +310,21 @@
- Amiga*:UNIX_System_V:4.0:*)
- echo m68k-unknown-sysv4
- exit 0;;
-- amiga:OpenBSD:*:*)
-- echo m68k-unknown-openbsd${UNAME_RELEASE}
-- exit 0 ;;
- *:[Aa]miga[Oo][Ss]:*:*)
- echo ${UNAME_MACHINE}-unknown-amigaos
- exit 0 ;;
-- arc64:OpenBSD:*:*)
-- echo mips64el-unknown-openbsd${UNAME_RELEASE}
-- exit 0 ;;
-- arc:OpenBSD:*:*)
-- echo mipsel-unknown-openbsd${UNAME_RELEASE}
-- exit 0 ;;
-- hkmips:OpenBSD:*:*)
-- echo mips-unknown-openbsd${UNAME_RELEASE}
-- exit 0 ;;
-- pmax:OpenBSD:*:*)
-- echo mipsel-unknown-openbsd${UNAME_RELEASE}
-- exit 0 ;;
-- sgi:OpenBSD:*:*)
-- echo mips-unknown-openbsd${UNAME_RELEASE}
-- exit 0 ;;
-- wgrisc:OpenBSD:*:*)
-- echo mipsel-unknown-openbsd${UNAME_RELEASE}
-+ *:[Mm]orph[Oo][Ss]:*:*)
-+ echo ${UNAME_MACHINE}-unknown-morphos
- exit 0 ;;
- *:OS/390:*:*)
- echo i370-ibm-openedition
- exit 0 ;;
-+ *:z/VM:*:*)
-+ echo s390-ibm-zvmoe
-+ exit 0 ;;
-+ *:OS400:*:*)
-+ echo powerpc-ibm-os400
-+ exit 0 ;;
- arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
- echo arm-acorn-riscix${UNAME_RELEASE}
- exit 0;;
-@@ -286,6 +342,13 @@
- NILE*:*:*:dcosx)
- echo pyramid-pyramid-svr4
- exit 0 ;;
-+ DRS?6000:unix:4.0:6*)
-+ echo sparc-icl-nx6
-+ exit 0 ;;
-+ DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*)
-+ case `/usr/bin/uname -p` in
-+ sparc) echo sparc-icl-nx7 && exit 0 ;;
-+ esac ;;
- sun4H:SunOS:5.*:*)
- echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
- exit 0 ;;
-@@ -314,7 +377,7 @@
- echo m68k-sun-sunos${UNAME_RELEASE}
- exit 0 ;;
- sun*:*:4.2BSD:*)
-- UNAME_RELEASE=`(head -1 /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
-+ UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
- test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
- case "`/bin/arch`" in
- sun3)
-@@ -328,9 +391,6 @@
- aushp:SunOS:*:*)
- echo sparc-auspex-sunos${UNAME_RELEASE}
- exit 0 ;;
-- atari*:OpenBSD:*:*)
-- echo m68k-unknown-openbsd${UNAME_RELEASE}
-- exit 0 ;;
- # The situation for MiNT is a little confusing. The machine name
- # can be virtually everything (everything which is not
- # "atarist" or "atariste" at least should have a processor
-@@ -357,17 +417,8 @@
- *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
- echo m68k-unknown-mint${UNAME_RELEASE}
- exit 0 ;;
-- sun3*:OpenBSD:*:*)
-- echo m68k-unknown-openbsd${UNAME_RELEASE}
-- exit 0 ;;
-- mac68k:OpenBSD:*:*)
-- echo m68k-unknown-openbsd${UNAME_RELEASE}
-- exit 0 ;;
-- mvme68k:OpenBSD:*:*)
-- echo m68k-unknown-openbsd${UNAME_RELEASE}
-- exit 0 ;;
-- mvme88k:OpenBSD:*:*)
-- echo m88k-unknown-openbsd${UNAME_RELEASE}
-+ m68k:machten:*:*)
-+ echo m68k-apple-machten${UNAME_RELEASE}
- exit 0 ;;
- powerpc:machten:*:*)
- echo powerpc-apple-machten${UNAME_RELEASE}
-@@ -385,6 +436,7 @@
- echo clipper-intergraph-clix${UNAME_RELEASE}
- exit 0 ;;
- mips:*:*:UMIPS | mips:*:*:RISCos)
-+ eval $set_cc_for_build
- sed 's/^ //' << EOF >$dummy.c
- #ifdef __cplusplus
- #include <stdio.h> /* for printf() prototype */
-@@ -406,12 +458,20 @@
- exit (-1);
- }
- EOF
-- $CC_FOR_BUILD $dummy.c -o $dummy \
-- && ./$dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
-- && rm -f $dummy.c $dummy && exit 0
-- rm -f $dummy.c $dummy
-+ $CC_FOR_BUILD -o $dummy $dummy.c \
-+ && $dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
-+ && exit 0
- echo mips-mips-riscos${UNAME_RELEASE}
- exit 0 ;;
-+ Motorola:PowerMAX_OS:*:*)
-+ echo powerpc-motorola-powermax
-+ exit 0 ;;
-+ Motorola:*:4.3:PL8-*)
-+ echo powerpc-harris-powermax
-+ exit 0 ;;
-+ Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
-+ echo powerpc-harris-powermax
-+ exit 0 ;;
- Night_Hawk:Power_UNIX:*:*)
- echo powerpc-harris-powerunix
- exit 0 ;;
-@@ -459,7 +519,7 @@
- ????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
- echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id
- exit 0 ;; # Note that: echo "'`uname -s`'" gives 'AIX '
-- i?86:AIX:*:*)
-+ i*86:AIX:*:*)
- echo i386-ibm-aix
- exit 0 ;;
- ia64:AIX:*:*)
-@@ -472,6 +532,7 @@
- exit 0 ;;
- *:AIX:2:3)
- if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
-+ eval $set_cc_for_build
- sed 's/^ //' << EOF >$dummy.c
- #include <sys/systemcfg.h>
-
-@@ -483,8 +544,7 @@
- exit(0);
- }
- EOF
-- $CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm -f $dummy.c $dummy && exit 0
-- rm -f $dummy.c $dummy
-+ $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
- echo rs6000-ibm-aix3.2.5
- elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
- echo rs6000-ibm-aix3.2.4
-@@ -493,7 +553,7 @@
- fi
- exit 0 ;;
- *:AIX:*:[45])
-- IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | head -1 | awk '{ print $1 }'`
-+ IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
- if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
- IBM_ARCH=rs6000
- else
-@@ -533,10 +593,8 @@
- 9000/31? ) HP_ARCH=m68000 ;;
- 9000/[34]?? ) HP_ARCH=m68k ;;
- 9000/[678][0-9][0-9])
-- case "${HPUX_REV}" in
-- 11.[0-9][0-9])
-- if [ -x /usr/bin/getconf ]; then
-- sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
-+ if [ -x /usr/bin/getconf ]; then
-+ sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
- sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
- case "${sc_cpu_version}" in
- 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
-@@ -545,12 +603,13 @@
- case "${sc_kernel_bits}" in
- 32) HP_ARCH="hppa2.0n" ;;
- 64) HP_ARCH="hppa2.0w" ;;
-+ '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20
- esac ;;
- esac
-- fi ;;
-- esac
-- if [ "${HP_ARCH}" = "" ]; then
-- sed 's/^ //' << EOF >$dummy.c
-+ fi
-+ if [ "${HP_ARCH}" = "" ]; then
-+ eval $set_cc_for_build
-+ sed 's/^ //' << EOF >$dummy.c
-
- #define _HPUX_SOURCE
- #include <stdlib.h>
-@@ -583,11 +642,21 @@
- exit (0);
- }
- EOF
-- (CCOPTS= $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null ) && HP_ARCH=`./$dummy`
-- if test -z "$HP_ARCH"; then HP_ARCH=hppa; fi
-- rm -f $dummy.c $dummy
-- fi ;;
-+ (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
-+ test -z "$HP_ARCH" && HP_ARCH=hppa
-+ fi ;;
- esac
-+ if [ ${HP_ARCH} = "hppa2.0w" ]
-+ then
-+ # avoid double evaluation of $set_cc_for_build
-+ test -n "$CC_FOR_BUILD" || eval $set_cc_for_build
-+ if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E -) | grep __LP64__ >/dev/null
-+ then
-+ HP_ARCH="hppa2.0w"
-+ else
-+ HP_ARCH="hppa64"
-+ fi
-+ fi
- echo ${HP_ARCH}-hp-hpux${HPUX_REV}
- exit 0 ;;
- ia64:HP-UX:*:*)
-@@ -595,6 +664,7 @@
- echo ia64-hp-hpux${HPUX_REV}
- exit 0 ;;
- 3050*:HI-UX:*:*)
-+ eval $set_cc_for_build
- sed 's/^ //' << EOF >$dummy.c
- #include <unistd.h>
- int
-@@ -620,8 +690,7 @@
- exit (0);
- }
- EOF
-- $CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm -f $dummy.c $dummy && exit 0
-- rm -f $dummy.c $dummy
-+ $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
- echo unknown-hitachi-hiuxwe2
- exit 0 ;;
- 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
-@@ -630,7 +699,7 @@
- 9000/8??:4.3bsd:*:*)
- echo hppa1.0-hp-bsd
- exit 0 ;;
-- *9??*:MPE/iX:*:*)
-+ *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
- echo hppa1.0-hp-mpeix
- exit 0 ;;
- hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
-@@ -639,7 +708,7 @@
- hp8??:OSF1:*:*)
- echo hppa1.0-hp-osf
- exit 0 ;;
-- i?86:OSF1:*:*)
-+ i*86:OSF1:*:*)
- if [ -x /usr/sbin/sysversion ] ; then
- echo ${UNAME_MACHINE}-unknown-osf1mk
- else
-@@ -649,9 +718,6 @@
- parisc*:Lites*:*:*)
- echo hppa1.1-hp-lites
- exit 0 ;;
-- hppa*:OpenBSD:*:*)
-- echo hppa-unknown-openbsd
-- exit 0 ;;
- C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
- echo c1-convex-bsd
- exit 0 ;;
-@@ -670,42 +736,39 @@
- C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
- echo c4-convex-bsd
- exit 0 ;;
-- CRAY*X-MP:*:*:*)
-- echo xmp-cray-unicos
-- exit 0 ;;
- CRAY*Y-MP:*:*:*)
-- echo ymp-cray-unicos${UNAME_RELEASE}
-+ echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
- exit 0 ;;
- CRAY*[A-Z]90:*:*:*)
- echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
- | sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
-- -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/
-+ -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
-+ -e 's/\.[^.]*$/.X/'
- exit 0 ;;
- CRAY*TS:*:*:*)
- echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
- exit 0 ;;
-- CRAY*T3D:*:*:*)
-- echo alpha-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-- exit 0 ;;
- CRAY*T3E:*:*:*)
- echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
- exit 0 ;;
- CRAY*SV1:*:*:*)
- echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
- exit 0 ;;
-- CRAY-2:*:*:*)
-- echo cray2-cray-unicos
-- exit 0 ;;
-+ *:UNICOS/mp:*:*)
-+ echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-+ exit 0 ;;
- F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
- FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
- FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
- FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
- echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
- exit 0 ;;
-- hp300:OpenBSD:*:*)
-- echo m68k-unknown-openbsd${UNAME_RELEASE}
-+ 5000:UNIX_System_V:4.*:*)
-+ FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
-+ FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
-+ echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
- exit 0 ;;
-- i?86:BSD/386:*:* | i?86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
-+ i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
- echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
- exit 0 ;;
- sparc*:BSD/OS:*:*)
-@@ -717,9 +780,6 @@
- *:FreeBSD:*:*)
- echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
- exit 0 ;;
-- *:OpenBSD:*:*)
-- echo ${UNAME_MACHINE}-unknown-openbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
-- exit 0 ;;
- i*:CYGWIN*:*)
- echo ${UNAME_MACHINE}-pc-cygwin
- exit 0 ;;
-@@ -729,15 +789,24 @@
- i*:PW*:*)
- echo ${UNAME_MACHINE}-pc-pw32
- exit 0 ;;
-+ x86:Interix*:[34]*)
-+ echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//'
-+ exit 0 ;;
-+ [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
-+ echo i${UNAME_MACHINE}-pc-mks
-+ exit 0 ;;
- i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
- # How do we know it's Interix rather than the generic POSIX subsystem?
- # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
- # UNAME_MACHINE based on the output of uname instead of i386?
-- echo i386-pc-interix
-+ echo i586-pc-interix
- exit 0 ;;
- i*:UWIN*:*)
- echo ${UNAME_MACHINE}-pc-uwin
- exit 0 ;;
-+ amd64:CYGWIN*:*:*)
-+ echo x86_64-unknown-cygwin
-+ exit 0 ;;
- p*:CYGWIN*:*)
- echo powerpcle-unknown-cygwin
- exit 0 ;;
-@@ -745,112 +814,93 @@
- echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
- exit 0 ;;
- *:GNU:*:*)
-+ # the GNU system
- echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
- exit 0 ;;
-+ *:GNU/*:*:*)
-+ # other systems with GNU libc and userland
-+ echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
-+ exit 0 ;;
- i*86:Minix:*:*)
- echo ${UNAME_MACHINE}-pc-minix
- exit 0 ;;
- arm*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
- exit 0 ;;
-+ cris:Linux:*:*)
-+ echo cris-axis-linux-gnu
-+ exit 0 ;;
-+ crisv32:Linux:*:*)
-+ echo crisv32-axis-linux-gnu
-+ exit 0 ;;
-+ frv:Linux:*:*)
-+ echo frv-unknown-linux-gnu
-+ exit 0 ;;
- ia64:Linux:*:*)
-- echo ${UNAME_MACHINE}-unknown-linux
-+ echo ${UNAME_MACHINE}-unknown-linux-gnu
-+ exit 0 ;;
-+ m32r*:Linux:*:*)
-+ echo ${UNAME_MACHINE}-unknown-linux-gnu
- exit 0 ;;
- m68*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
- exit 0 ;;
- mips:Linux:*:*)
-- cat >$dummy.c <<EOF
--#ifdef __cplusplus
--#include <stdio.h> /* for printf() prototype */
--int main (int argc, char *argv[]) {
--#else
--int main (argc, argv) int argc; char *argv[]; {
--#endif
--#ifdef __MIPSEB__
-- printf ("%s-unknown-linux-gnu\n", argv[1]);
--#endif
--#ifdef __MIPSEL__
-- printf ("%sel-unknown-linux-gnu\n", argv[1]);
--#endif
-- return 0;
--}
-+ eval $set_cc_for_build
-+ sed 's/^ //' << EOF >$dummy.c
-+ #undef CPU
-+ #undef mips
-+ #undef mipsel
-+ #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
-+ CPU=mipsel
-+ #else
-+ #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
-+ CPU=mips
-+ #else
-+ CPU=
-+ #endif
-+ #endif
- EOF
-- $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm -f $dummy.c $dummy && exit 0
-- rm -f $dummy.c $dummy
-+ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
-+ test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
- ;;
-- ppc:Linux:*:*)
-- # Determine Lib Version
-- cat >$dummy.c <<EOF
--#include <features.h>
--#if defined(__GLIBC__)
--extern char __libc_version[];
--extern char __libc_release[];
--#endif
--main(argc, argv)
-- int argc;
-- char *argv[];
--{
--#if defined(__GLIBC__)
-- printf("%s %s\n", __libc_version, __libc_release);
--#else
-- printf("unknown\n");
--#endif
-- return 0;
--}
-+ mips64:Linux:*:*)
-+ eval $set_cc_for_build
-+ sed 's/^ //' << EOF >$dummy.c
-+ #undef CPU
-+ #undef mips64
-+ #undef mips64el
-+ #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
-+ CPU=mips64el
-+ #else
-+ #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
-+ CPU=mips64
-+ #else
-+ CPU=
-+ #endif
-+ #endif
- EOF
-- LIBC=""
-- $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null
-- if test "$?" = 0 ; then
-- ./$dummy | grep 1\.99 > /dev/null
-- if test "$?" = 0 ; then LIBC="libc1" ; fi
-- fi
-- rm -f $dummy.c $dummy
-- echo powerpc-unknown-linux-gnu${LIBC}
-+ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
-+ test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
-+ ;;
-+ ppc:Linux:*:*)
-+ echo powerpc-unknown-linux-gnu
-+ exit 0 ;;
-+ ppc64:Linux:*:*)
-+ echo powerpc64-unknown-linux-gnu
- exit 0 ;;
- alpha:Linux:*:*)
-- cat <<EOF >$dummy.s
-- .data
-- \$Lformat:
-- .byte 37,100,45,37,120,10,0 # "%d-%x\n"
-- .text
-- .globl main
-- .align 4
-- .ent main
-- main:
-- .frame \$30,16,\$26,0
-- ldgp \$29,0(\$27)
-- .prologue 1
-- .long 0x47e03d80 # implver \$0
-- lda \$2,-1
-- .long 0x47e20c21 # amask \$2,\$1
-- lda \$16,\$Lformat
-- mov \$0,\$17
-- not \$1,\$18
-- jsr \$26,printf
-- ldgp \$29,0(\$26)
-- mov 0,\$16
-- jsr \$26,exit
-- .end main
--EOF
-- LIBC=""
-- $CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null
-- if test "$?" = 0 ; then
-- case `./$dummy` in
-- 0-0) UNAME_MACHINE="alpha" ;;
-- 1-0) UNAME_MACHINE="alphaev5" ;;
-- 1-1) UNAME_MACHINE="alphaev56" ;;
-- 1-101) UNAME_MACHINE="alphapca56" ;;
-- 2-303) UNAME_MACHINE="alphaev6" ;;
-- 2-307) UNAME_MACHINE="alphaev67" ;;
-- esac
-- objdump --private-headers $dummy | \
-- grep ld.so.1 > /dev/null
-- if test "$?" = 0 ; then
-- LIBC="libc1"
-- fi
-- fi
-- rm -f $dummy.s $dummy
-+ case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
-+ EV5) UNAME_MACHINE=alphaev5 ;;
-+ EV56) UNAME_MACHINE=alphaev56 ;;
-+ PCA56) UNAME_MACHINE=alphapca56 ;;
-+ PCA57) UNAME_MACHINE=alphapca56 ;;
-+ EV6) UNAME_MACHINE=alphaev6 ;;
-+ EV67) UNAME_MACHINE=alphaev67 ;;
-+ EV68*) UNAME_MACHINE=alphaev68 ;;
-+ esac
-+ objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
-+ if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
- echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
- exit 0 ;;
- parisc:Linux:*:* | hppa:Linux:*:*)
-@@ -867,6 +917,9 @@
- s390:Linux:*:* | s390x:Linux:*:*)
- echo ${UNAME_MACHINE}-ibm-linux
- exit 0 ;;
-+ sh64*:Linux:*:*)
-+ echo ${UNAME_MACHINE}-unknown-linux-gnu
-+ exit 0 ;;
- sh*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
- exit 0 ;;
-@@ -876,78 +929,69 @@
- x86_64:Linux:*:*)
- echo x86_64-unknown-linux-gnu
- exit 0 ;;
-- i?86:Linux:*:*)
-+ i*86:Linux:*:*)
- # The BFD linker knows what the default object file format is, so
- # first see if it will tell us. cd to the root directory to prevent
- # problems with other programs or directories called `ld' in the path.
-- ld_supported_emulations=`cd /; ld --help 2>&1 \
-- | sed -ne '/supported emulations:/!d
-+ # Set LC_ALL=C to ensure ld outputs messages in English.
-+ ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \
-+ | sed -ne '/supported targets:/!d
- s/[ ][ ]*/ /g
-- s/.*supported emulations: *//
-+ s/.*supported targets: *//
- s/ .*//
- p'`
-- case "$ld_supported_emulations" in
-- i?86linux)
-- echo "${UNAME_MACHINE}-pc-linux-gnuaout"
-- exit 0
-- ;;
-- elf_i?86)
-+ case "$ld_supported_targets" in
-+ elf32-i386)
- TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
- ;;
-- i?86coff)
-+ a.out-i386-linux)
-+ echo "${UNAME_MACHINE}-pc-linux-gnuaout"
-+ exit 0 ;;
-+ coff-i386)
- echo "${UNAME_MACHINE}-pc-linux-gnucoff"
-- exit 0
-- ;;
-- esac
-- # Either a pre-BFD a.out linker (linux-gnuoldld)
-- # or one that does not give us useful --help.
-- # GCC wants to distinguish between linux-gnuoldld and linux-gnuaout.
-- # If ld does not provide *any* "supported emulations:"
-- # that means it is gnuoldld.
-- test -z "$ld_supported_emulations" && echo "${UNAME_MACHINE}-pc-linux-gnuoldld" && exit 0
-- case "${UNAME_MACHINE}" in
-- i?86)
-- VENDOR=pc;
-- ;;
-- *)
-- VENDOR=unknown;
-- ;;
-+ exit 0 ;;
-+ "")
-+ # Either a pre-BFD a.out linker (linux-gnuoldld) or
-+ # one that does not give us useful --help.
-+ echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
-+ exit 0 ;;
- esac
- # Determine whether the default compiler is a.out or elf
-- cat >$dummy.c <<EOF
--#include <features.h>
--#ifdef __cplusplus
--#include <stdio.h> /* for printf() prototype */
-- int main (int argc, char *argv[]) {
--#else
-- int main (argc, argv) int argc; char *argv[]; {
--#endif
--#ifdef __ELF__
--# ifdef __GLIBC__
--# if __GLIBC__ >= 2
-- printf ("%s-${VENDOR}-linux-gnu\n", argv[1]);
--# else
-- printf ("%s-${VENDOR}-linux-gnulibc1\n", argv[1]);
--# endif
--# else
-- printf ("%s-${VENDOR}-linux-gnulibc1\n", argv[1]);
--# endif
--#else
-- printf ("%s-${VENDOR}-linux-gnuaout\n", argv[1]);
--#endif
-- return 0;
--}
-+ eval $set_cc_for_build
-+ sed 's/^ //' << EOF >$dummy.c
-+ #include <features.h>
-+ #ifdef __ELF__
-+ # ifdef __GLIBC__
-+ # if __GLIBC__ >= 2
-+ LIBC=gnu
-+ # else
-+ LIBC=gnulibc1
-+ # endif
-+ # else
-+ LIBC=gnulibc1
-+ # endif
-+ #else
-+ #ifdef __INTEL_COMPILER
-+ LIBC=gnu
-+ #else
-+ LIBC=gnuaout
-+ #endif
-+ #endif
-+ #ifdef __dietlibc__
-+ LIBC=dietlibc
-+ #endif
- EOF
-- $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm -f $dummy.c $dummy && exit 0
-- rm -f $dummy.c $dummy
-+ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
-+ test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0
- test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0
- ;;
--# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. earlier versions
--# are messed up and put the nodename in both sysname and nodename.
-- i?86:DYNIX/ptx:4*:*)
-+ i*86:DYNIX/ptx:4*:*)
-+ # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
-+ # earlier versions are messed up and put the nodename in both
-+ # sysname and nodename.
- echo i386-sequent-sysv4
- exit 0 ;;
-- i?86:UNIX_SV:4.2MP:2.*)
-+ i*86:UNIX_SV:4.2MP:2.*)
- # Unixware is an offshoot of SVR4, but it has its own version
- # number series starting with 2...
- # I am not positive that other SVR4 systems won't match this,
-@@ -955,7 +999,27 @@
- # Use sysv4.2uw... so that sysv4* matches it.
- echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
- exit 0 ;;
-- i?86:*:4.*:* | i?86:SYSTEM_V:4.*:*)
-+ i*86:OS/2:*:*)
-+ # If we were able to find `uname', then EMX Unix compatibility
-+ # is probably installed.
-+ echo ${UNAME_MACHINE}-pc-os2-emx
-+ exit 0 ;;
-+ i*86:XTS-300:*:STOP)
-+ echo ${UNAME_MACHINE}-unknown-stop
-+ exit 0 ;;
-+ i*86:atheos:*:*)
-+ echo ${UNAME_MACHINE}-unknown-atheos
-+ exit 0 ;;
-+ i*86:syllable:*:*)
-+ echo ${UNAME_MACHINE}-pc-syllable
-+ exit 0 ;;
-+ i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
-+ echo i386-unknown-lynxos${UNAME_RELEASE}
-+ exit 0 ;;
-+ i*86:*DOS:*:*)
-+ echo ${UNAME_MACHINE}-pc-msdosdjgpp
-+ exit 0 ;;
-+ i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
- UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
- if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
- echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL}
-@@ -963,36 +1027,32 @@
- echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
- fi
- exit 0 ;;
-- i?86:*:5:7*)
-- # Fixed at (any) Pentium or better
-- UNAME_MACHINE=i586
-- if [ ${UNAME_SYSTEM} = "UnixWare" ] ; then
-- echo ${UNAME_MACHINE}-sco-sysv${UNAME_RELEASE}uw${UNAME_VERSION}
-- else
-- echo ${UNAME_MACHINE}-pc-sysv${UNAME_RELEASE}
-- fi
-+ i*86:*:5:[78]*)
-+ case `/bin/uname -X | grep "^Machine"` in
-+ *486*) UNAME_MACHINE=i486 ;;
-+ *Pentium) UNAME_MACHINE=i586 ;;
-+ *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
-+ esac
-+ echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
- exit 0 ;;
-- i?86:*:3.2:*)
-+ i*86:*:3.2:*)
- if test -f /usr/options/cb.name; then
- UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
- echo ${UNAME_MACHINE}-pc-isc$UNAME_REL
- elif /bin/uname -X 2>/dev/null >/dev/null ; then
-- UNAME_REL=`(/bin/uname -X|egrep Release|sed -e 's/.*= //')`
-- (/bin/uname -X|egrep i80486 >/dev/null) && UNAME_MACHINE=i486
-- (/bin/uname -X|egrep '^Machine.*Pentium' >/dev/null) \
-+ UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')`
-+ (/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486
-+ (/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \
- && UNAME_MACHINE=i586
-- (/bin/uname -X|egrep '^Machine.*Pent ?II' >/dev/null) \
-+ (/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \
- && UNAME_MACHINE=i686
-- (/bin/uname -X|egrep '^Machine.*Pentium Pro' >/dev/null) \
-+ (/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \
- && UNAME_MACHINE=i686
- echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
- else
- echo ${UNAME_MACHINE}-pc-sysv32
- fi
- exit 0 ;;
-- i?86:*DOS:*:*)
-- echo ${UNAME_MACHINE}-pc-msdosdjgpp
-- exit 0 ;;
- pc:*:*:*)
- # Left here for compatibility:
- # uname -m prints for DJGPP always 'pc', but it prints nothing about
-@@ -1016,9 +1076,15 @@
- # "miniframe"
- echo m68010-convergent-sysv
- exit 0 ;;
-- M68*:*:R3V[567]*:*)
-+ mc68k:UNIX:SYSTEM5:3.51m)
-+ echo m68k-convergent-sysv
-+ exit 0 ;;
-+ M680?0:D-NIX:5.3:*)
-+ echo m68k-diab-dnix
-+ exit 0 ;;
-+ M68*:*:R3V[5678]*:*)
- test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
-- 3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 4850:*:4.0:3.0)
-+ 3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0)
- OS_REL=''
- test -r /etc/.relid \
- && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
-@@ -1029,22 +1095,19 @@
- 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
- /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
- && echo i486-ncr-sysv4 && exit 0 ;;
-- m68*:LynxOS:2.*:*)
-+ m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
- echo m68k-unknown-lynxos${UNAME_RELEASE}
- exit 0 ;;
- mc68030:UNIX_System_V:4.*:*)
- echo m68k-atari-sysv4
- exit 0 ;;
-- i?86:LynxOS:2.*:* | i?86:LynxOS:3.[01]*:*)
-- echo i386-unknown-lynxos${UNAME_RELEASE}
-- exit 0 ;;
- TSUNAMI:LynxOS:2.*:*)
- echo sparc-unknown-lynxos${UNAME_RELEASE}
- exit 0 ;;
- rs6000:LynxOS:2.*:*)
- echo rs6000-unknown-lynxos${UNAME_RELEASE}
- exit 0 ;;
-- PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:*)
-+ PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
- echo powerpc-unknown-lynxos${UNAME_RELEASE}
- exit 0 ;;
- SM[BE]S:UNIX_SV:*:*)
-@@ -1064,8 +1127,8 @@
- echo ns32k-sni-sysv
- fi
- exit 0 ;;
-- PENTIUM:CPunix:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
-- # says <Richard.M.Bartel@ccMail.Census.GOV>
-+ PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
-+ # says <Richard.M.Bartel@ccMail.Census.GOV>
- echo i586-unisys-sysv4
- exit 0 ;;
- *:UNIX_System_V:4*:FTX*)
-@@ -1077,6 +1140,10 @@
- # From seanf@swdc.stratus.com.
- echo i860-stratus-sysv4
- exit 0 ;;
-+ *:VOS:*:*)
-+ # From Paul.Green@stratus.com.
-+ echo hppa1.1-stratus-vos
-+ exit 0 ;;
- mc68*:A/UX:*:*)
- echo m68k-apple-aux${UNAME_RELEASE}
- exit 0 ;;
-@@ -1105,6 +1172,9 @@
- SX-5:SUPER-UX:*:*)
- echo sx5-nec-superux${UNAME_RELEASE}
- exit 0 ;;
-+ SX-6:SUPER-UX:*:*)
-+ echo sx6-nec-superux${UNAME_RELEASE}
-+ exit 0 ;;
- Power*:Rhapsody:*:*)
- echo powerpc-apple-rhapsody${UNAME_RELEASE}
- exit 0 ;;
-@@ -1112,18 +1182,28 @@
- echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
- exit 0 ;;
- *:Darwin:*:*)
-- echo `uname -p`-apple-darwin${UNAME_RELEASE}
-+ UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
-+ case $UNAME_PROCESSOR in
-+ *86) UNAME_PROCESSOR=i686 ;;
-+ unknown) UNAME_PROCESSOR=powerpc ;;
-+ esac
-+ echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
- exit 0 ;;
- *:procnto*:*:* | *:QNX:[0123456789]*:*)
-- if test "${UNAME_MACHINE}" = "x86pc"; then
-+ UNAME_PROCESSOR=`uname -p`
-+ if test "$UNAME_PROCESSOR" = "x86"; then
-+ UNAME_PROCESSOR=i386
- UNAME_MACHINE=pc
- fi
-- echo `uname -p`-${UNAME_MACHINE}-nto-qnx
-+ echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
- exit 0 ;;
- *:QNX:*:4*)
- echo i386-pc-qnx
- exit 0 ;;
-- NSR-[KW]:NONSTOP_KERNEL:*:*)
-+ NSE-?:NONSTOP_KERNEL:*:*)
-+ echo nse-tandem-nsk${UNAME_RELEASE}
-+ exit 0 ;;
-+ NSR-?:NONSTOP_KERNEL:*:*)
- echo nsr-tandem-nsk${UNAME_RELEASE}
- exit 0 ;;
- *:NonStop-UX:*:*)
-@@ -1146,11 +1226,6 @@
- fi
- echo ${UNAME_MACHINE}-unknown-plan9
- exit 0 ;;
-- i?86:OS/2:*:*)
-- # If we were able to find `uname', then EMX Unix compatibility
-- # is probably installed.
-- echo ${UNAME_MACHINE}-pc-os2-emx
-- exit 0 ;;
- *:TOPS-10:*:*)
- echo pdp10-unknown-tops10
- exit 0 ;;
-@@ -1169,11 +1244,28 @@
- *:ITS:*:*)
- echo pdp10-unknown-its
- exit 0 ;;
-+ SEI:*:*:SEIUX)
-+ echo mips-sei-seiux${UNAME_RELEASE}
-+ exit 0 ;;
-+ *:DragonFly:*:*)
-+ echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
-+ exit 0 ;;
-+ *:*VMS:*:*)
-+ UNAME_MACHINE=`(uname -p) 2>/dev/null`
-+ case "${UNAME_MACHINE}" in
-+ A*) echo alpha-dec-vms && exit 0 ;;
-+ I*) echo ia64-dec-vms && exit 0 ;;
-+ V*) echo vax-dec-vms && exit 0 ;;
-+ esac ;;
-+ *:XENIX:*:SysV)
-+ echo i386-pc-xenix
-+ exit 0 ;;
- esac
-
- #echo '(No uname command or uname output not recognized.)' 1>&2
- #echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
-
-+eval $set_cc_for_build
- cat >$dummy.c <<EOF
- #ifdef _SEQUENT_
- # include <sys/types.h>
-@@ -1288,8 +1380,7 @@
- }
- EOF
-
--$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy && rm -f $dummy.c $dummy && exit 0
--rm -f $dummy.c $dummy
-+$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && $dummy && exit 0
-
- # Apollos put the system type in the environment.
-
-@@ -1328,7 +1419,9 @@
- the operating system you are using. It is advised that you
- download the most up to date version of the config scripts from
-
-- ftp://ftp.gnu.org/pub/gnu/config/
-+ http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess
-+and
-+ http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub
-
- If the version you run ($0) is already up to date, please
- send the following data and any information you think might be
---- nfs-utils-1.0.7.orig/debian/control
-+++ nfs-utils-1.0.7/debian/control
-@@ -1,9 +1,9 @@
- Source: nfs-utils
- Priority: standard
- Section: net
--Maintainer: Chip Salzenberg <chip@debian.org>
-+Maintainer: Anibal Monsalve Salazar <anibal@debian.org>
- Build-Depends: debhelper (>= 4.1.16), libwrap0-dev, libevent-dev, libnfsidmap-dev, libkrb5-dev
--Standards-Version: 3.1.1.1
-+Standards-Version: 3.6.1
-
- Package: nfs-kernel-server
- Priority: optional
-@@ -37,6 +37,6 @@
- Architecture: any
- Depends: nfs-common, ${shlibs:Depends}
- Replaces: nfs-kernel-server
--Description: NFS benchmark program.
-+Description: NFS benchmark program
- .
- Upstream: SourceForge project "nfs", CVS module nfs-utils.
---- nfs-utils-1.0.7.orig/debian/nfs-common.default
-+++ nfs-utils-1.0.7/debian/nfs-common.default
-@@ -7,10 +7,10 @@
- # If so, set this variable to either "yes" or "no".
- NEED_LOCKD=
-
--# If you are not using NFSv4 and wish to disable the idmapd daemon
--# then uncomment the following line
--# NEED_IDMAPD=no
-+# If you are not using NFSv4 and wish to disable the idmapd daemon,
-+# then set NEED_IDMAPD to "no".
-+NEED_IDMAPD=no
-
- # If you are not running NFS with RPCSEC_GSS security, and wish to
--# disable the gssd client daemon then uncomment the following line
--# NEED_GSSD=no
-+# disable the gssd client daemon, then set NEED_GSSD to "no".
-+NEED_GSSD=no
---- nfs-utils-1.0.7.orig/debian/changelog
-+++ nfs-utils-1.0.7/debian/changelog
-@@ -1,3 +1,31 @@
-+nfs-utils (1:1.0.7-3) unstable; urgency=medium
-+
-+ * New maintainer, closes: #303559.
-+
-+ -- Anibal Monsalve Salazar <anibal@debian.org> Fri, 08 Apr 2005 11:25:17 +1000
-+
-+nfs-utils (1:1.0.7-2) unstable; urgency=low
-+
-+ * Orphaning package.
-+ * Upstream CVS sync:
-+ > Support "no_acl" export option, for the few specially patched
-+ kernels that understand it. (Closes: #253824)
-+ > Fix FTBTS on amd64. (Closes: #297729)
-+ > Update config.{guess,sub}. (Closes: #300552)
-+
-+ -- Chip Salzenberg <chip@debian.org> Thu, 7 Apr 2005 09:07:24 -0400
-+
-+nfs-utils (1:1.0.7-1) unstable; urgency=medium
-+
-+ * Acknowledge NMU; thanks to joeyh. (closes: #287053)
-+ * New upstream version:
-+ > Add support for NFSv4.
-+ > Ignore SIGPIPE, fixing a remote DOS. Note that the previous
-+ NMU already fixed this bug. (CAN-2004-1014)
-+ > At long last, fix "erroneous SM_UNMON" warnings. (closes: #165744)
-+
-+ -- Chip Salzenberg <chip@debian.org> Tue, 11 Jan 2005 23:31:05 -0500
-+
- nfs-utils (1:1.0.6-3) unstable; urgency=medium
-
- * Remove obsolete debconf-related files in debian/rules, because source
---- nfs-utils-1.0.7.orig/debian/nfs-kernel-server.default
-+++ nfs-utils-1.0.7/debian/nfs-kernel-server.default
-@@ -5,5 +5,5 @@
- RPCMOUNTDOPTS=
-
- # If you are not running NFS with RPCSEC_GSS security, and wish to
--# disable the gssd server daemon then uncomment the following line
--# NEED_SVCGSSD=no
-+# disable the gssd server daemon, then set NEED_SVCGSSD to "no".
-+NEED_SVCGSSD=no
---- nfs-utils-1.0.7.orig/debian/rules
-+++ nfs-utils-1.0.7/debian/rules
-@@ -1,8 +1,9 @@
- #!/usr/bin/make -f
- # Sample debian/rules that uses debhelper. GNU copyright 1997 by Joey Hess.
-+# Copyright (c) 2005 by Anibal Monsalve Salazar.
-
- # Uncomment this to turn on verbose mode.
--#export DH_VERBOSE=1
-+export DH_VERBOSE=1
-
- # You can use gcc 2.7.2 if it's installed,
- # but I don't think that's necessary any more.
---- nfs-utils-1.0.7.orig/configure.in
-+++ nfs-utils-1.0.7/configure.in
-@@ -202,7 +202,7 @@
- AC_DEFINE(HAVE_GSS_KRB5_CCACHE_NAME),,$KRBLIB)
- break
- fi
-- CFLAGS=$CFLAGS `K5CONFIG --cflags`
-+ CFLAGS=$CFLAGS `$K5CONFIG --cflags`
- fi
- done
- dnl We didn't find a usable Kerberos environment
---- nfs-utils-1.0.7.orig/support/include/xlog.h
-+++ nfs-utils-1.0.7/support/include/xlog.h
-@@ -7,12 +7,15 @@
- #ifndef XLOG_H
- #define XLOG_H
-
-+/* These are logged always. L_FATAL also does exit(1) */
- #define L_FATAL 0x0100
- #define L_ERROR 0x0200
- #define L_WARNING 0x0400
- #define L_NOTICE 0x0800
- #define L_ALL 0xFF00
-
-+/* These are logged if enabled with xlog_[s]config */
-+/* NB: code does not expect ORing together D_ and L_ */
- #define D_GENERAL 0x0001 /* general debug info */
- #define D_CALL 0x0002
- #define D_AUTH 0x0004
-@@ -31,7 +34,8 @@
- };
-
- void xlog_open(char *progname);
--void xlog_background(void);
-+void xlog_stderr(int on);
-+void xlog_syslog(int on);
- void xlog_config(int fac, int on);
- void xlog_sconfig(char *, int on);
- int xlog_enabled(int fac);
---- nfs-utils-1.0.7.orig/support/export/client.c
-+++ nfs-utils-1.0.7/support/export/client.c
-@@ -138,7 +138,9 @@
-
- if (clp->m_type == MCL_SUBNETWORK) {
- char *cp = strchr(clp->m_hostname, '/');
-+ static char slash32[] = "/32";
-
-+ if(!cp) cp = slash32;
- *cp = '\0';
- clp->m_addrlist[0].s_addr = inet_addr(clp->m_hostname);
- if (strchr(cp + 1, '.')) {
-@@ -443,5 +445,12 @@
- if (*sp == '\\' && sp[1])
- sp++;
- }
-- return MCL_FQDN;
-+ /* check for N.N.N.N */
-+ sp = ident;
-+ if(!isdigit(*sp) || strtoul(sp, &sp, 10) > 255 || *sp != '.') return MCL_FQDN;
-+ sp++; if(!isdigit(*sp) || strtoul(sp, &sp, 10) > 255 || *sp != '.') return MCL_FQDN;
-+ sp++; if(!isdigit(*sp) || strtoul(sp, &sp, 10) > 255 || *sp != '.') return MCL_FQDN;
-+ sp++; if(!isdigit(*sp) || strtoul(sp, &sp, 10) > 255 || *sp != '\0') return MCL_FQDN;
-+ /* we lie here a bit. but technically N.N.N.N == N.N.N.N/32 :) */
-+ return MCL_SUBNETWORK;
- }
---- nfs-utils-1.0.7.orig/support/rpc/svc_auth_gss.c
-+++ nfs-utils-1.0.7/support/rpc/svc_auth_gss.c
-@@ -382,7 +382,7 @@
- return (AUTH_FAILED);
- }
- auth->svc_ah_ops = &svc_auth_gss_ops;
-- SVCAUTH_PRIVATE(auth) = gd;
-+ auth->svc_ah_private = (caddr_t)gd;
- rqst->rq_xprt->xp_auth = auth;
- }
- else gd = SVCAUTH_PRIVATE(rqst->rq_xprt->xp_auth);
---- nfs-utils-1.0.7.orig/support/nfs/cacheio.c
-+++ nfs-utils-1.0.7/support/nfs/cacheio.c
-@@ -205,16 +205,17 @@
- */
- char *new;
- int nl;
-- *lenp += 128;
-+ *lenp *= 2;
- new = realloc(*buf, *lenp);
- if (new == NULL)
- return 0;
-- nl = read(fd, *buf +len, *lenp - len);
-- if (nl <= 0 )
-+ *buf = new;
-+ nl = read(fd, *buf + len, *lenp - len);
-+ if (nl <= 0)
- return 0;
-- new += nl;
-+ len += nl;
- }
-- (*buf)[len-1] = 0;
-+ (*buf)[len-1] = '\0';
- return 1;
- }
-
---- nfs-utils-1.0.7.orig/support/nfs/xlog.c
-+++ nfs-utils-1.0.7/support/nfs/xlog.c
-@@ -29,12 +29,12 @@
-
- #undef VERBOSE_PRINTF
-
--static int foreground = 1; /* not a daemon initially */
-+static int log_stderr = 1;
-+static int log_syslog = 1;
- static int logging = 0; /* enable/disable DEBUG logs */
- static int logmask = 0; /* What will be logged */
- static char log_name[256]; /* name of this program */
- static int log_pid = -1; /* PID of this program */
--static FILE *log_fp = (FILE *)NULL; /* fp for the log file */
-
- static void xlog_toggle(int sig);
- static struct xlog_debugfac debugnames[] = {
-@@ -50,11 +50,6 @@
- xlog_open(char *progname)
- {
- openlog(progname, LOG_PID, LOG_DAEMON);
-- if (foreground) {
-- log_fp = stderr;
-- if (log_fp != NULL)
-- setbuf(log_fp, NULL);
-- }
-
- strncpy(log_name, progname, sizeof (log_name) - 1);
- log_name [sizeof (log_name) - 1] = '\0';
-@@ -65,9 +60,15 @@
- }
-
- void
--xlog_background(void)
-+xlog_stderr(int on)
-+{
-+ log_stderr = on;
-+}
-+
-+void
-+xlog_syslog(int on)
- {
-- foreground = 0;
-+ log_syslog = on;
- }
-
- static void
-@@ -126,17 +127,13 @@
- }
-
-
--/* Write something to the system logfile. */
-+/* Write something to the system logfile and/or stderr */
- void
- xlog(int kind, const char *fmt, ...)
- {
- char buff[1024];
- va_list args;
-- int logged = 1, n;
--#ifdef VERBOSE_PRINTF
-- time_t now;
-- struct tm *tm;
--#endif
-+ int n;
-
- if (!(kind & (L_ALL)) && !(logging && (kind & logmask)))
- return;
-@@ -148,40 +145,44 @@
- if ((n = strlen(buff)) > 0 && buff[n-1] == '\n')
- buff[--n] = '\0';
-
-- switch (kind) {
-- case L_FATAL:
-- syslog(LOG_ERR, "%s", buff);
-- break;
-- case L_ERROR:
-- syslog(LOG_ERR, "%s", buff);
-- break;
-- case L_WARNING:
-- syslog(LOG_WARNING, "%s", buff);
-- break;
-- case L_NOTICE:
-- syslog(LOG_NOTICE, "%s", buff);
-- break;
-- default:
-- logged = 0;
-- break;
-+ if (log_syslog) {
-+ switch (kind) {
-+ case L_FATAL:
-+ syslog(LOG_ERR, "%s", buff);
-+ break;
-+ case L_ERROR:
-+ syslog(LOG_ERR, "%s", buff);
-+ break;
-+ case L_WARNING:
-+ syslog(LOG_WARNING, "%s", buff);
-+ break;
-+ case L_NOTICE:
-+ syslog(LOG_NOTICE, "%s", buff);
-+ break;
-+ default:
-+ if (!log_stderr)
-+ syslog(LOG_DEBUG, "%s", buff);
-+ break;
-+ }
- }
-- if (!logged || foreground) {
-- if (!logged && log_fp == NULL) {
-- syslog(LOG_DEBUG, "%s", buff);
-- } else if (log_fp != NULL) {
-+
-+ if (log_stderr) {
- #ifdef VERBOSE_PRINTF
-- time(&now);
-- tm = localtime(&now);
-- fprintf(log_fp, "%s[%d] %02d/%02d/%02d %02d:%02d %s\n",
-- log_name, log_pid,
-- tm->tm_mon + 1, tm->tm_mday,
-- tm->tm_year, tm->tm_hour, tm->tm_min,
-- buff);
-+ time_t now;
-+ struct tm *tm;
-+
-+ time(&now);
-+ tm = localtime(&now);
-+ fprintf(stderr, "%s[%d] %04d-%02d-%02d %02d:%02d:%02d %s\n",
-+ log_name, log_pid,
-+ tm->tm_year+1900, tm->tm_mon + 1, tm->tm_mday,
-+ tm->tm_hour, tm->tm_min, tm->tm_sec,
-+ buff);
- #else
-- fprintf(log_fp, "%s: %s\n", log_name, buff);
-+ fprintf(stderr, "%s: %s\n", log_name, buff);
- #endif
-- }
- }
-+
- if (kind == L_FATAL)
- exit(1);
- }
---- nfs-utils-1.0.7.orig/support/nfs/exports.c
-+++ nfs-utils-1.0.7/support/nfs/exports.c
-@@ -185,6 +185,8 @@
- "no_" : "");
- fprintf(fp, "%ssecure_locks,", (ep->e_flags & NFSEXP_NOAUTHNLM)?
- "in" : "");
-+ fprintf(fp, "%sacl,", (ep->e_flags & NFSEXP_NOACL)?
-+ "no_" : "");
- if (ep->e_flags & NFSEXP_FSID) {
- fprintf(fp, "fsid=%d,", ep->e_fsid);
- }
-@@ -374,6 +376,10 @@
- ep->e_flags &= ~NFSEXP_NOAUTHNLM;
- else if (strcmp(opt, "insecure_locks") == 0)
- ep->e_flags |= NFSEXP_NOAUTHNLM;
-+ else if (strcmp(opt, "acl") == 0)
-+ ep->e_flags &= ~NFSEXP_NOACL;
-+ else if (strcmp(opt, "no_acl") == 0)
-+ ep->e_flags |= NFSEXP_NOACL;
- else if (strncmp(opt, "mapping=", 8) == 0)
- ep->e_maptype = parsemaptype(opt+8);
- else if (strcmp(opt, "map_identity") == 0) /* old style */
---- nfs-utils-1.0.7.orig/configure
-+++ nfs-utils-1.0.7/configure
-@@ -2134,7 +2134,7 @@
-
- break
- fi
-- CFLAGS=$CFLAGS `K5CONFIG --cflags`
-+ CFLAGS=$CFLAGS `$K5CONFIG --cflags`
- fi
- done
- if test "x$KRBDIR" = "x"; then
---- nfs-utils-1.0.7.orig/utils/exportfs/exportfs.c
-+++ nfs-utils-1.0.7/utils/exportfs/exportfs.c
-@@ -398,6 +398,8 @@
- c = dumpopt(c, "no_subtree_check");
- if (ep->e_flags & NFSEXP_NOAUTHNLM)
- c = dumpopt(c, "insecure_locks");
-+ if (ep->e_flags & NFSEXP_NOACL)
-+ c = dumpopt(c, "no_acl");
- if (ep->e_flags & NFSEXP_FSID)
- c = dumpopt(c, "fsid=%d", ep->e_fsid);
- if (ep->e_mountpoint)
---- nfs-utils-1.0.7.orig/utils/exportfs/exports.man
-+++ nfs-utils-1.0.7/utils/exportfs/exports.man
-@@ -1,5 +1,4 @@
--.TH EXPORTS 5 "28 October 1999"
--.UC 5
-+.TH EXPORTS 5 "4 March 2005" "Linux" "Linux File Formats Manual"
- .SH NAME
- exports \- NFS file systems being exported (for Kernel based NFS)
- .SH SYNOPSIS
-@@ -171,7 +170,7 @@
- .TP
- .IR no_subtree_check
- This option disables subtree checking, which has mild security
--implications, but can improve reliability is some circumstances.
-+implications, but can improve reliability in some circumstances.
-
- If a subdirectory of a filesystem is exported, but the whole
- filesystem isn't then whenever a NFS request arrives, the server must
-@@ -190,7 +189,7 @@
- directories to which only root has access can only be accessed if the
- filesystem is exported with
- .I no_root_squash
--(see below), even the file itself allows more general access.
-+(see below), even if the file itself allows more general access.
-
- As a general guide, a home directory filesystem, which is normally
- exported at the root and may see lots of file renames, should be
-@@ -223,6 +222,21 @@
- .IR auth_nlm ,
- or
- .IR secure_locks .
-+.TP
-+.IR no_acl
-+On some specially patched kernels, and when exporting filesystems that
-+support ACLs, this option tells nfsd not to reveal ACLs to clients, so
-+they will see only a subset of actual permissions on the given file
-+system. This option is safe for filesystems used by NFSv2 clients and
-+old NFSv3 clients that perform access decisions locally. Current
-+NFSv3 clients use the ACCESS RPC to perform all access decisions on
-+the server. Note that the
-+.I no_acl
-+option only has effect on kernels specially patched to support it, and
-+when exporting filesystems with ACL support. The default is to export
-+with ACL support (i.e. by default,
-+.I no_acl
-+is off).
-
- '''.TP
- '''.I noaccess
-@@ -487,6 +501,12 @@
- '''entry.
- .SH FILES
- /etc/exports
-+.SH SEE ALSO
-+.BR exportfs (8),
-+.BR netgroup (5),
-+.BR mountd (8),
-+.BR nfsd (8),
-+.BR showmount (8).
- '''.SH DIAGNOSTICS
- '''An error parsing the file is reported using syslogd(8) as level NOTICE from
- '''a DAEMON whenever nfsd(8) or mountd(8) is started up. Any unknown
---- nfs-utils-1.0.7.orig/utils/svcgssd/Makefile
-+++ nfs-utils-1.0.7/utils/svcgssd/Makefile
-@@ -10,12 +10,20 @@
- LIBS = -Wl,-rpath=$(KRBDIR)/lib -lrpc -lgssapi -ldl $(KRBLIB) -lnfsidmap
- MAN8 = svcgssd
-
--predep ::
-- - ln ../gssd/err_util.c
-- - ln ../gssd/gss_util.c
-- - ln ../gssd/gss_oids.c
-- - ln ../gssd/context.c
-- - ln ../gssd/context_heimdal.c
-+LINKED = err_util.c gss_util.c gss_oids.c context.c context_heimdal.c
-+
-+predep :: $(LINKED)
-+
-+$(LINKED) :
-+ ln -s ../gssd/$@ .
-+
-+distclean ::
-+ for f in $(LINKED); do \
-+ if [ -L "$$f" ]; then \
-+ echo "rm -f $$f"; \
-+ rm -f "$$f"; \
-+ fi; \
-+ done
-
- include $(TOP)rules.mk
-
---- nfs-utils-1.0.7.orig/utils/statd/rmtcall.c
-+++ nfs-utils-1.0.7/utils/statd/rmtcall.c
-@@ -65,7 +65,7 @@
-
- memset(&sin, 0, sizeof(sin));
- sin.sin_family = AF_INET;
-- sin.sin_port = port;
-+ sin.sin_addr.s_addr = INADDR_ANY;
- /*
- * If a local hostname is given (-n option to statd), bind to the address
- * specified. This is required to support clients that ignore the mon_name in
-@@ -76,11 +76,18 @@
- if (hp)
- sin.sin_addr = *(struct in_addr *) hp->h_addr;
- }
-+ if (port != 0) {
-+ sin.sin_port = htons(port);
-+ if (bind(sockfd, &sin, sizeof(sin)) == 0)
-+ goto out_success;
-+ note(N_CRIT, "statd: failed to bind to outgoing port, %d\n"
-+ " falling back on randomly chosen port\n", port);
-+ }
- if (bindresvport(sockfd, &sin) < 0) {
- dprintf(N_WARNING,
- "process_hosts: can't bind to reserved port\n");
- }
--
-+out_success:
- return sockfd;
- }
-
---- nfs-utils-1.0.7.orig/utils/lockd/lockd.man
-+++ nfs-utils-1.0.7/utils/lockd/lockd.man
-@@ -1,7 +1,7 @@
- .\"
- .\" lockd(8)
- .\"
--.\" Copyright (C) 2000 Chip Salzenberg <chip@valinux.com>
-+.\" Copyright (C) 2000 Chip Salzenberg <chip@debian.org>
- .\"
- .TH rpc.lockd 8 "25 Feb 2000"
- .SH NAME
---- nfs-utils-1.0.7.orig/utils/mountd/mountd.c
-+++ nfs-utils-1.0.7/utils/mountd/mountd.c
-@@ -531,7 +531,8 @@
- }
- }
- /* Initialize logging. */
--/* xlog_open("mountd"); */
-+ if (!foreground) xlog_stderr(0);
-+ xlog_open("mountd");
-
- sa.sa_handler = SIG_IGN;
- sa.sa_flags = 0;
-@@ -589,7 +590,6 @@
- if (fd > 2) (void) close(fd);
- }
- setsid();
-- xlog_background();
- }
-
- my_svc_run();
---- nfs-utils-1.0.7.orig/ChangeLog
-+++ nfs-utils-1.0.7/ChangeLog
-@@ -1,3 +1,50 @@
-+2005-04-07 Chip Salzenberg <chip@pobox.com>
-+
-+ * debian/changelog: Version 1.0.7-2.
-+
-+2005-04-06 Chip Salzenberg <chip@pobox.com>
-+
-+ * config.guess, config.sub: Update.
-+
-+ * support/rpc/svc_auth_gss.c (_svcauth_gss): Avoid using a cast as
-+ an lvalue, as it is non-portable.
-+
-+ * support/nfs/exports.c (parseopts): Accept "acl" option to mean
-+ ~NFSEXP_NOACL, and "no_acl" to mean NFSEXP_NOACL.
-+ (putexportent): Report NFSEXP_NOACL as "no_acl", and ~NFSEXP_NOACL
-+ as "acl".
-+ * utils/exportfs/exportfs.c (dump): Report NFSEXP_NOACL as
-+ "no_acl".
-+ * utils/exportfs/exports.man: Document "no_acl".
-+
-+2005-03-14 NeilBrown <neilb@cse.unsw.edu.au>
-+ Denis Vlasenko <vda@ilport.com.ua>
-+ * support/export/client.c(client_init and client_gettype):
-+ treat N.N.N.N as a special case of MCL_SUBNETWORK instead of
-+ MCL_FQDN
-+
-+2005-03-06 G. Allen Morris III <gam3@gam3.net>
-+ * support/nfs/cacheio.c(readline): Could not read lines greater
-+ than 128 bytes. [1157791]
-+ * utils/exportfs/exports.man: Added a SEE ALSO section and
-+ fixed 2 typos. [1018450]
-+
-+2005-02-28 Trond Myklebust <trond.myklebust@fys.uio.no>
-+ * utils/statd/rmtcall.c(statd_get_socket): If a port number is
-+ explicitly given, make sure to try to bind to that.
-+
-+2005-01-11 Chip Salzenberg <chip@pobox.com>
-+
-+ * debian/changelog: Version 1.0.7-1.
-+ * debian/nfs-common.default (NEED_IDMAPD, NEED_GSSD):
-+ Disable by default, on advice of upstream.
-+ * debian/nfs-kernel-server.default (NEED_SVCGSSD):
-+ Likewise.
-+
-+ * utils/svcgssd/Makefile (predep): Symbolically link duplicated
-+ source files.
-+ (distclean): Remove symlinks to duplicated files.
-+
- 2004-12-17 NeilBrown <neilb@cse.unsw.edu.au>
- Release 1.0.7
-
+++ /dev/null
-diff -urN nfs-utils-1.0.7.old/support/export/mount.h nfs-utils-1.0.7/support/export/mount.h
---- nfs-utils-1.0.7.old/support/export/mount.h 1970-01-01 01:00:00.000000000 +0100
-+++ nfs-utils-1.0.7/support/export/mount.h 2006-03-24 15:39:43.000000000 +0100
-@@ -0,0 +1,469 @@
-+/*
-+ * Please do not edit this file.
-+ * It was generated using rpcgen.
-+ */
-+
-+#ifndef _MOUNT_H_RPCGEN
-+#define _MOUNT_H_RPCGEN
-+
-+#include <rpc/rpc.h>
-+
-+#ifndef IXDR_GET_INT32
-+#define IXDR_GET_INT32(buf) IXDR_GET_LONG((buf))
-+#endif
-+#ifndef IXDR_PUT_INT32
-+#define IXDR_PUT_INT32(buf, v) IXDR_PUT_LONG((buf), (v))
-+#endif
-+#ifndef IXDR_GET_U_INT32
-+#define IXDR_GET_U_INT32(buf) IXDR_GET_U_LONG((buf))
-+#endif
-+#ifndef IXDR_PUT_U_INT32
-+#define IXDR_PUT_U_INT32(buf, v) IXDR_PUT_U_LONG((buf), (v))
-+#endif
-+/*
-+ * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
-+ * unrestricted use provided that this legend is included on all tape
-+ * media and as a part of the software program in whole or part. Users
-+ * may copy or modify Sun RPC without charge, but are not authorized
-+ * to license or distribute it to anyone else except as part of a product or
-+ * program developed by the user or with the express written consent of
-+ * Sun Microsystems, Inc.
-+ *
-+ * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE
-+ * WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
-+ * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
-+ *
-+ * Sun RPC is provided with no support and without any obligation on the
-+ * part of Sun Microsystems, Inc. to assist in its use, correction,
-+ * modification or enhancement.
-+ *
-+ * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
-+ * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY SUN RPC
-+ * OR ANY PART THEREOF.
-+ *
-+ * In no event will Sun Microsystems, Inc. be liable for any lost revenue
-+ * or profits or other special, indirect and consequential damages, even if
-+ * Sun has been advised of the possibility of such damages.
-+ *
-+ * Sun Microsystems, Inc.
-+ * 2550 Garcia Avenue
-+ * Mountain View, California 94043
-+ */
-+/*
-+ * Copyright (c) 1985, 1990 by Sun Microsystems, Inc.
-+ */
-+
-+/* from @(#)mount.x 1.3 91/03/11 TIRPC 1.0 */
-+#ifndef _rpcsvc_mount_h
-+#define _rpcsvc_mount_h
-+#include <memory.h>
-+#define MNTPATHLEN 1024
-+#define MNTNAMLEN 255
-+#define FHSIZE 32
-+
-+typedef char fhandle[FHSIZE];
-+#ifdef __cplusplus
-+extern "C" bool_t xdr_fhandle(XDR *, fhandle);
-+#elif __STDC__
-+extern bool_t xdr_fhandle(XDR *, fhandle);
-+#else /* Old Style C */
-+bool_t xdr_fhandle();
-+#endif /* Old Style C */
-+
-+
-+struct fhstatus {
-+ u_int fhs_status;
-+ union {
-+ fhandle fhs_fhandle;
-+ } fhstatus_u;
-+};
-+typedef struct fhstatus fhstatus;
-+#ifdef __cplusplus
-+extern "C" bool_t xdr_fhstatus(XDR *, fhstatus*);
-+#elif __STDC__
-+extern bool_t xdr_fhstatus(XDR *, fhstatus*);
-+#else /* Old Style C */
-+bool_t xdr_fhstatus();
-+#endif /* Old Style C */
-+
-+
-+typedef char *dirpath;
-+#ifdef __cplusplus
-+extern "C" bool_t xdr_dirpath(XDR *, dirpath*);
-+#elif __STDC__
-+extern bool_t xdr_dirpath(XDR *, dirpath*);
-+#else /* Old Style C */
-+bool_t xdr_dirpath();
-+#endif /* Old Style C */
-+
-+
-+typedef char *name;
-+#ifdef __cplusplus
-+extern "C" bool_t xdr_name(XDR *, name*);
-+#elif __STDC__
-+extern bool_t xdr_name(XDR *, name*);
-+#else /* Old Style C */
-+bool_t xdr_name();
-+#endif /* Old Style C */
-+
-+
-+typedef struct mountbody *mountlist;
-+#ifdef __cplusplus
-+extern "C" bool_t xdr_mountlist(XDR *, mountlist*);
-+#elif __STDC__
-+extern bool_t xdr_mountlist(XDR *, mountlist*);
-+#else /* Old Style C */
-+bool_t xdr_mountlist();
-+#endif /* Old Style C */
-+
-+
-+struct mountbody {
-+ name ml_hostname;
-+ dirpath ml_directory;
-+ mountlist ml_next;
-+};
-+typedef struct mountbody mountbody;
-+#ifdef __cplusplus
-+extern "C" bool_t xdr_mountbody(XDR *, mountbody*);
-+#elif __STDC__
-+extern bool_t xdr_mountbody(XDR *, mountbody*);
-+#else /* Old Style C */
-+bool_t xdr_mountbody();
-+#endif /* Old Style C */
-+
-+
-+typedef struct groupnode *groups;
-+#ifdef __cplusplus
-+extern "C" bool_t xdr_groups(XDR *, groups*);
-+#elif __STDC__
-+extern bool_t xdr_groups(XDR *, groups*);
-+#else /* Old Style C */
-+bool_t xdr_groups();
-+#endif /* Old Style C */
-+
-+
-+struct groupnode {
-+ name gr_name;
-+ groups gr_next;
-+};
-+typedef struct groupnode groupnode;
-+#ifdef __cplusplus
-+extern "C" bool_t xdr_groupnode(XDR *, groupnode*);
-+#elif __STDC__
-+extern bool_t xdr_groupnode(XDR *, groupnode*);
-+#else /* Old Style C */
-+bool_t xdr_groupnode();
-+#endif /* Old Style C */
-+
-+
-+typedef struct exportnode *exports;
-+#ifdef __cplusplus
-+extern "C" bool_t xdr_exports(XDR *, exports*);
-+#elif __STDC__
-+extern bool_t xdr_exports(XDR *, exports*);
-+#else /* Old Style C */
-+bool_t xdr_exports();
-+#endif /* Old Style C */
-+
-+
-+struct exportnode {
-+ dirpath ex_dir;
-+ groups ex_groups;
-+ exports ex_next;
-+};
-+typedef struct exportnode exportnode;
-+#ifdef __cplusplus
-+extern "C" bool_t xdr_exportnode(XDR *, exportnode*);
-+#elif __STDC__
-+extern bool_t xdr_exportnode(XDR *, exportnode*);
-+#else /* Old Style C */
-+bool_t xdr_exportnode();
-+#endif /* Old Style C */
-+
-+
-+struct ppathcnf {
-+ int pc_link_max;
-+ short pc_max_canon;
-+ short pc_max_input;
-+ short pc_name_max;
-+ short pc_path_max;
-+ short pc_pipe_buf;
-+ u_char pc_vdisable;
-+ char pc_xxx;
-+ short pc_mask[2];
-+};
-+typedef struct ppathcnf ppathcnf;
-+#ifdef __cplusplus
-+extern "C" bool_t xdr_ppathcnf(XDR *, ppathcnf*);
-+#elif __STDC__
-+extern bool_t xdr_ppathcnf(XDR *, ppathcnf*);
-+#else /* Old Style C */
-+bool_t xdr_ppathcnf();
-+#endif /* Old Style C */
-+
-+#define FHSIZE3 64
-+
-+typedef struct {
-+ u_int fhandle3_len;
-+ char *fhandle3_val;
-+} fhandle3;
-+#ifdef __cplusplus
-+extern "C" bool_t xdr_fhandle3(XDR *, fhandle3*);
-+#elif __STDC__
-+extern bool_t xdr_fhandle3(XDR *, fhandle3*);
-+#else /* Old Style C */
-+bool_t xdr_fhandle3();
-+#endif /* Old Style C */
-+
-+
-+enum mountstat3 {
-+ MNT_OK = 0,
-+ MNT3ERR_PERM = 1,
-+ MNT3ERR_NOENT = 2,
-+ MNT3ERR_IO = 5,
-+ MNT3ERR_ACCES = 13,
-+ MNT3ERR_NOTDIR = 20,
-+ MNT3ERR_INVAL = 22,
-+ MNT3ERR_NAMETOOLONG = 63,
-+ MNT3ERR_NOTSUPP = 10004,
-+ MNT3ERR_SERVERFAULT = 10006,
-+};
-+typedef enum mountstat3 mountstat3;
-+#ifdef __cplusplus
-+extern "C" bool_t xdr_mountstat3(XDR *, mountstat3*);
-+#elif __STDC__
-+extern bool_t xdr_mountstat3(XDR *, mountstat3*);
-+#else /* Old Style C */
-+bool_t xdr_mountstat3();
-+#endif /* Old Style C */
-+
-+
-+struct mountres3_ok {
-+ fhandle3 fhandle;
-+ struct {
-+ u_int auth_flavors_len;
-+ int *auth_flavors_val;
-+ } auth_flavors;
-+};
-+typedef struct mountres3_ok mountres3_ok;
-+#ifdef __cplusplus
-+extern "C" bool_t xdr_mountres3_ok(XDR *, mountres3_ok*);
-+#elif __STDC__
-+extern bool_t xdr_mountres3_ok(XDR *, mountres3_ok*);
-+#else /* Old Style C */
-+bool_t xdr_mountres3_ok();
-+#endif /* Old Style C */
-+
-+
-+struct mountres3 {
-+ mountstat3 fhs_status;
-+ union {
-+ mountres3_ok mountinfo;
-+ } mountres3_u;
-+};
-+typedef struct mountres3 mountres3;
-+#ifdef __cplusplus
-+extern "C" bool_t xdr_mountres3(XDR *, mountres3*);
-+#elif __STDC__
-+extern bool_t xdr_mountres3(XDR *, mountres3*);
-+#else /* Old Style C */
-+bool_t xdr_mountres3();
-+#endif /* Old Style C */
-+
-+#endif /*!_rpcsvc_mount_h*/
-+
-+#define MOUNTPROG ((u_int32_t)100005)
-+#define MOUNTVERS ((u_int32_t)1)
-+
-+#ifdef __cplusplus
-+#define MOUNTPROC_NULL ((u_int32_t)0)
-+extern "C" void * mountproc_null_1(void *, CLIENT *);
-+extern "C" void * mountproc_null_1_svc(void *, struct svc_req *);
-+#define MOUNTPROC_MNT ((u_int32_t)1)
-+extern "C" fhstatus * mountproc_mnt_1(dirpath *, CLIENT *);
-+extern "C" fhstatus * mountproc_mnt_1_svc(dirpath *, struct svc_req *);
-+#define MOUNTPROC_DUMP ((u_int32_t)2)
-+extern "C" mountlist * mountproc_dump_1(void *, CLIENT *);
-+extern "C" mountlist * mountproc_dump_1_svc(void *, struct svc_req *);
-+#define MOUNTPROC_UMNT ((u_int32_t)3)
-+extern "C" void * mountproc_umnt_1(dirpath *, CLIENT *);
-+extern "C" void * mountproc_umnt_1_svc(dirpath *, struct svc_req *);
-+#define MOUNTPROC_UMNTALL ((u_int32_t)4)
-+extern "C" void * mountproc_umntall_1(void *, CLIENT *);
-+extern "C" void * mountproc_umntall_1_svc(void *, struct svc_req *);
-+#define MOUNTPROC_EXPORT ((u_int32_t)5)
-+extern "C" exports * mountproc_export_1(void *, CLIENT *);
-+extern "C" exports * mountproc_export_1_svc(void *, struct svc_req *);
-+#define MOUNTPROC_EXPORTALL ((u_int32_t)6)
-+extern "C" exports * mountproc_exportall_1(void *, CLIENT *);
-+extern "C" exports * mountproc_exportall_1_svc(void *, struct svc_req *);
-+
-+#elif __STDC__
-+#define MOUNTPROC_NULL ((u_int32_t)0)
-+extern void * mountproc_null_1(void *, CLIENT *);
-+extern void * mountproc_null_1_svc(void *, struct svc_req *);
-+#define MOUNTPROC_MNT ((u_int32_t)1)
-+extern fhstatus * mountproc_mnt_1(dirpath *, CLIENT *);
-+extern fhstatus * mountproc_mnt_1_svc(dirpath *, struct svc_req *);
-+#define MOUNTPROC_DUMP ((u_int32_t)2)
-+extern mountlist * mountproc_dump_1(void *, CLIENT *);
-+extern mountlist * mountproc_dump_1_svc(void *, struct svc_req *);
-+#define MOUNTPROC_UMNT ((u_int32_t)3)
-+extern void * mountproc_umnt_1(dirpath *, CLIENT *);
-+extern void * mountproc_umnt_1_svc(dirpath *, struct svc_req *);
-+#define MOUNTPROC_UMNTALL ((u_int32_t)4)
-+extern void * mountproc_umntall_1(void *, CLIENT *);
-+extern void * mountproc_umntall_1_svc(void *, struct svc_req *);
-+#define MOUNTPROC_EXPORT ((u_int32_t)5)
-+extern exports * mountproc_export_1(void *, CLIENT *);
-+extern exports * mountproc_export_1_svc(void *, struct svc_req *);
-+#define MOUNTPROC_EXPORTALL ((u_int32_t)6)
-+extern exports * mountproc_exportall_1(void *, CLIENT *);
-+extern exports * mountproc_exportall_1_svc(void *, struct svc_req *);
-+
-+#else /* Old Style C */
-+#define MOUNTPROC_NULL ((u_int32_t)0)
-+extern void * mountproc_null_1();
-+extern void * mountproc_null_1_svc();
-+#define MOUNTPROC_MNT ((u_int32_t)1)
-+extern fhstatus * mountproc_mnt_1();
-+extern fhstatus * mountproc_mnt_1_svc();
-+#define MOUNTPROC_DUMP ((u_int32_t)2)
-+extern mountlist * mountproc_dump_1();
-+extern mountlist * mountproc_dump_1_svc();
-+#define MOUNTPROC_UMNT ((u_int32_t)3)
-+extern void * mountproc_umnt_1();
-+extern void * mountproc_umnt_1_svc();
-+#define MOUNTPROC_UMNTALL ((u_int32_t)4)
-+extern void * mountproc_umntall_1();
-+extern void * mountproc_umntall_1_svc();
-+#define MOUNTPROC_EXPORT ((u_int32_t)5)
-+extern exports * mountproc_export_1();
-+extern exports * mountproc_export_1_svc();
-+#define MOUNTPROC_EXPORTALL ((u_int32_t)6)
-+extern exports * mountproc_exportall_1();
-+extern exports * mountproc_exportall_1_svc();
-+#endif /* Old Style C */
-+#define MOUNTVERS_POSIX ((u_int32_t)2)
-+
-+#ifdef __cplusplus
-+extern "C" void * mountproc_null_2(void *, CLIENT *);
-+extern "C" void * mountproc_null_2_svc(void *, struct svc_req *);
-+extern "C" fhstatus * mountproc_mnt_2(dirpath *, CLIENT *);
-+extern "C" fhstatus * mountproc_mnt_2_svc(dirpath *, struct svc_req *);
-+extern "C" mountlist * mountproc_dump_2(void *, CLIENT *);
-+extern "C" mountlist * mountproc_dump_2_svc(void *, struct svc_req *);
-+extern "C" void * mountproc_umnt_2(dirpath *, CLIENT *);
-+extern "C" void * mountproc_umnt_2_svc(dirpath *, struct svc_req *);
-+extern "C" void * mountproc_umntall_2(void *, CLIENT *);
-+extern "C" void * mountproc_umntall_2_svc(void *, struct svc_req *);
-+extern "C" exports * mountproc_export_2(void *, CLIENT *);
-+extern "C" exports * mountproc_export_2_svc(void *, struct svc_req *);
-+extern "C" exports * mountproc_exportall_2(void *, CLIENT *);
-+extern "C" exports * mountproc_exportall_2_svc(void *, struct svc_req *);
-+#define MOUNTPROC_PATHCONF ((u_int32_t)7)
-+extern "C" ppathcnf * mountproc_pathconf_2(dirpath *, CLIENT *);
-+extern "C" ppathcnf * mountproc_pathconf_2_svc(dirpath *, struct svc_req *);
-+
-+#elif __STDC__
-+extern void * mountproc_null_2(void *, CLIENT *);
-+extern void * mountproc_null_2_svc(void *, struct svc_req *);
-+extern fhstatus * mountproc_mnt_2(dirpath *, CLIENT *);
-+extern fhstatus * mountproc_mnt_2_svc(dirpath *, struct svc_req *);
-+extern mountlist * mountproc_dump_2(void *, CLIENT *);
-+extern mountlist * mountproc_dump_2_svc(void *, struct svc_req *);
-+extern void * mountproc_umnt_2(dirpath *, CLIENT *);
-+extern void * mountproc_umnt_2_svc(dirpath *, struct svc_req *);
-+extern void * mountproc_umntall_2(void *, CLIENT *);
-+extern void * mountproc_umntall_2_svc(void *, struct svc_req *);
-+extern exports * mountproc_export_2(void *, CLIENT *);
-+extern exports * mountproc_export_2_svc(void *, struct svc_req *);
-+extern exports * mountproc_exportall_2(void *, CLIENT *);
-+extern exports * mountproc_exportall_2_svc(void *, struct svc_req *);
-+#define MOUNTPROC_PATHCONF ((u_int32_t)7)
-+extern ppathcnf * mountproc_pathconf_2(dirpath *, CLIENT *);
-+extern ppathcnf * mountproc_pathconf_2_svc(dirpath *, struct svc_req *);
-+
-+#else /* Old Style C */
-+extern void * mountproc_null_2();
-+extern void * mountproc_null_2_svc();
-+extern fhstatus * mountproc_mnt_2();
-+extern fhstatus * mountproc_mnt_2_svc();
-+extern mountlist * mountproc_dump_2();
-+extern mountlist * mountproc_dump_2_svc();
-+extern void * mountproc_umnt_2();
-+extern void * mountproc_umnt_2_svc();
-+extern void * mountproc_umntall_2();
-+extern void * mountproc_umntall_2_svc();
-+extern exports * mountproc_export_2();
-+extern exports * mountproc_export_2_svc();
-+extern exports * mountproc_exportall_2();
-+extern exports * mountproc_exportall_2_svc();
-+#define MOUNTPROC_PATHCONF ((u_int32_t)7)
-+extern ppathcnf * mountproc_pathconf_2();
-+extern ppathcnf * mountproc_pathconf_2_svc();
-+#endif /* Old Style C */
-+#define MOUNTVERS_NFSV3 ((u_int32_t)3)
-+
-+#ifdef __cplusplus
-+#define MOUNTPROC3_NULL ((u_int32_t)0)
-+extern "C" void * mountproc3_null_3(void *, CLIENT *);
-+extern "C" void * mountproc3_null_3_svc(void *, struct svc_req *);
-+#define MOUNTPROC3_MNT ((u_int32_t)1)
-+extern "C" mountres3 * mountproc3_mnt_3(dirpath *, CLIENT *);
-+extern "C" mountres3 * mountproc3_mnt_3_svc(dirpath *, struct svc_req *);
-+#define MOUNTPROC3_DUMP ((u_int32_t)2)
-+extern "C" mountlist * mountproc3_dump_3(void *, CLIENT *);
-+extern "C" mountlist * mountproc3_dump_3_svc(void *, struct svc_req *);
-+#define MOUNTPROC3_UMNT ((u_int32_t)3)
-+extern "C" void * mountproc3_umnt_3(dirpath *, CLIENT *);
-+extern "C" void * mountproc3_umnt_3_svc(dirpath *, struct svc_req *);
-+#define MOUNTPROC3_UMNTALL ((u_int32_t)4)
-+extern "C" void * mountproc3_umntall_3(void *, CLIENT *);
-+extern "C" void * mountproc3_umntall_3_svc(void *, struct svc_req *);
-+#define MOUNTPROC3_EXPORT ((u_int32_t)5)
-+extern "C" exports * mountproc3_export_3(void *, CLIENT *);
-+extern "C" exports * mountproc3_export_3_svc(void *, struct svc_req *);
-+
-+#elif __STDC__
-+#define MOUNTPROC3_NULL ((u_int32_t)0)
-+extern void * mountproc3_null_3(void *, CLIENT *);
-+extern void * mountproc3_null_3_svc(void *, struct svc_req *);
-+#define MOUNTPROC3_MNT ((u_int32_t)1)
-+extern mountres3 * mountproc3_mnt_3(dirpath *, CLIENT *);
-+extern mountres3 * mountproc3_mnt_3_svc(dirpath *, struct svc_req *);
-+#define MOUNTPROC3_DUMP ((u_int32_t)2)
-+extern mountlist * mountproc3_dump_3(void *, CLIENT *);
-+extern mountlist * mountproc3_dump_3_svc(void *, struct svc_req *);
-+#define MOUNTPROC3_UMNT ((u_int32_t)3)
-+extern void * mountproc3_umnt_3(dirpath *, CLIENT *);
-+extern void * mountproc3_umnt_3_svc(dirpath *, struct svc_req *);
-+#define MOUNTPROC3_UMNTALL ((u_int32_t)4)
-+extern void * mountproc3_umntall_3(void *, CLIENT *);
-+extern void * mountproc3_umntall_3_svc(void *, struct svc_req *);
-+#define MOUNTPROC3_EXPORT ((u_int32_t)5)
-+extern exports * mountproc3_export_3(void *, CLIENT *);
-+extern exports * mountproc3_export_3_svc(void *, struct svc_req *);
-+
-+#else /* Old Style C */
-+#define MOUNTPROC3_NULL ((u_int32_t)0)
-+extern void * mountproc3_null_3();
-+extern void * mountproc3_null_3_svc();
-+#define MOUNTPROC3_MNT ((u_int32_t)1)
-+extern mountres3 * mountproc3_mnt_3();
-+extern mountres3 * mountproc3_mnt_3_svc();
-+#define MOUNTPROC3_DUMP ((u_int32_t)2)
-+extern mountlist * mountproc3_dump_3();
-+extern mountlist * mountproc3_dump_3_svc();
-+#define MOUNTPROC3_UMNT ((u_int32_t)3)
-+extern void * mountproc3_umnt_3();
-+extern void * mountproc3_umnt_3_svc();
-+#define MOUNTPROC3_UMNTALL ((u_int32_t)4)
-+extern void * mountproc3_umntall_3();
-+extern void * mountproc3_umntall_3_svc();
-+#define MOUNTPROC3_EXPORT ((u_int32_t)5)
-+extern exports * mountproc3_export_3();
-+extern exports * mountproc3_export_3_svc();
-+#endif /* Old Style C */
-+
-+#endif /* !_MOUNT_H_RPCGEN */
-diff -urN nfs-utils-1.0.7.old/support/export/mount_clnt.c nfs-utils-1.0.7/support/export/mount_clnt.c
---- nfs-utils-1.0.7.old/support/export/mount_clnt.c 1970-01-01 01:00:00.000000000 +0100
-+++ nfs-utils-1.0.7/support/export/mount_clnt.c 2006-03-24 15:39:43.000000000 +0100
-@@ -0,0 +1,337 @@
-+/*
-+ * Please do not edit this file.
-+ * It was generated using rpcgen.
-+ */
-+
-+#include "mount.h"
-+/*
-+ * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
-+ * unrestricted use provided that this legend is included on all tape
-+ * media and as a part of the software program in whole or part. Users
-+ * may copy or modify Sun RPC without charge, but are not authorized
-+ * to license or distribute it to anyone else except as part of a product or
-+ * program developed by the user or with the express written consent of
-+ * Sun Microsystems, Inc.
-+ *
-+ * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE
-+ * WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
-+ * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
-+ *
-+ * Sun RPC is provided with no support and without any obligation on the
-+ * part of Sun Microsystems, Inc. to assist in its use, correction,
-+ * modification or enhancement.
-+ *
-+ * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
-+ * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY SUN RPC
-+ * OR ANY PART THEREOF.
-+ *
-+ * In no event will Sun Microsystems, Inc. be liable for any lost revenue
-+ * or profits or other special, indirect and consequential damages, even if
-+ * Sun has been advised of the possibility of such damages.
-+ *
-+ * Sun Microsystems, Inc.
-+ * 2550 Garcia Avenue
-+ * Mountain View, California 94043
-+ */
-+/*
-+ * Copyright (c) 1985, 1990 by Sun Microsystems, Inc.
-+ */
-+
-+/* from @(#)mount.x 1.3 91/03/11 TIRPC 1.0 */
-+
-+/* Default timeout can be changed using clnt_control() */
-+static struct timeval TIMEOUT = { 25, 0 };
-+
-+void *
-+mountproc_null_1(argp, clnt)
-+ void *argp;
-+ CLIENT *clnt;
-+{
-+ static char clnt_res;
-+
-+ memset((char *)&clnt_res, 0, sizeof(clnt_res));
-+ if (clnt_call(clnt, MOUNTPROC_NULL, (xdrproc_t) xdr_void, (caddr_t) argp, (xdrproc_t) xdr_void, (caddr_t) &clnt_res, TIMEOUT) != RPC_SUCCESS) {
-+ return (NULL);
-+ }
-+ return ((void *)&clnt_res);
-+}
-+
-+fhstatus *
-+mountproc_mnt_1(argp, clnt)
-+ dirpath *argp;
-+ CLIENT *clnt;
-+{
-+ static fhstatus clnt_res;
-+
-+ memset((char *)&clnt_res, 0, sizeof(clnt_res));
-+ if (clnt_call(clnt, MOUNTPROC_MNT, (xdrproc_t) xdr_dirpath, (caddr_t) argp, (xdrproc_t) xdr_fhstatus, (caddr_t) &clnt_res, TIMEOUT) != RPC_SUCCESS) {
-+ return (NULL);
-+ }
-+ return (&clnt_res);
-+}
-+
-+mountlist *
-+mountproc_dump_1(argp, clnt)
-+ void *argp;
-+ CLIENT *clnt;
-+{
-+ static mountlist clnt_res;
-+
-+ memset((char *)&clnt_res, 0, sizeof(clnt_res));
-+ if (clnt_call(clnt, MOUNTPROC_DUMP, (xdrproc_t) xdr_void, (caddr_t) argp, (xdrproc_t) xdr_mountlist, (caddr_t) &clnt_res, TIMEOUT) != RPC_SUCCESS) {
-+ return (NULL);
-+ }
-+ return (&clnt_res);
-+}
-+
-+void *
-+mountproc_umnt_1(argp, clnt)
-+ dirpath *argp;
-+ CLIENT *clnt;
-+{
-+ static char clnt_res;
-+
-+ memset((char *)&clnt_res, 0, sizeof(clnt_res));
-+ if (clnt_call(clnt, MOUNTPROC_UMNT, (xdrproc_t) xdr_dirpath, (caddr_t) argp, (xdrproc_t) xdr_void, (caddr_t) &clnt_res, TIMEOUT) != RPC_SUCCESS) {
-+ return (NULL);
-+ }
-+ return ((void *)&clnt_res);
-+}
-+
-+void *
-+mountproc_umntall_1(argp, clnt)
-+ void *argp;
-+ CLIENT *clnt;
-+{
-+ static char clnt_res;
-+
-+ memset((char *)&clnt_res, 0, sizeof(clnt_res));
-+ if (clnt_call(clnt, MOUNTPROC_UMNTALL, (xdrproc_t) xdr_void, (caddr_t) argp, (xdrproc_t) xdr_void, (caddr_t) &clnt_res, TIMEOUT) != RPC_SUCCESS) {
-+ return (NULL);
-+ }
-+ return ((void *)&clnt_res);
-+}
-+
-+exports *
-+mountproc_export_1(argp, clnt)
-+ void *argp;
-+ CLIENT *clnt;
-+{
-+ static exports clnt_res;
-+
-+ memset((char *)&clnt_res, 0, sizeof(clnt_res));
-+ if (clnt_call(clnt, MOUNTPROC_EXPORT, (xdrproc_t) xdr_void, (caddr_t) argp, (xdrproc_t) xdr_exports, (caddr_t) &clnt_res, TIMEOUT) != RPC_SUCCESS) {
-+ return (NULL);
-+ }
-+ return (&clnt_res);
-+}
-+
-+exports *
-+mountproc_exportall_1(argp, clnt)
-+ void *argp;
-+ CLIENT *clnt;
-+{
-+ static exports clnt_res;
-+
-+ memset((char *)&clnt_res, 0, sizeof(clnt_res));
-+ if (clnt_call(clnt, MOUNTPROC_EXPORTALL, (xdrproc_t) xdr_void, (caddr_t) argp, (xdrproc_t) xdr_exports, (caddr_t) &clnt_res, TIMEOUT) != RPC_SUCCESS) {
-+ return (NULL);
-+ }
-+ return (&clnt_res);
-+}
-+
-+void *
-+mountproc_null_2(argp, clnt)
-+ void *argp;
-+ CLIENT *clnt;
-+{
-+ static char clnt_res;
-+
-+ memset((char *)&clnt_res, 0, sizeof(clnt_res));
-+ if (clnt_call(clnt, MOUNTPROC_NULL, (xdrproc_t) xdr_void, (caddr_t) argp, (xdrproc_t) xdr_void, (caddr_t) &clnt_res, TIMEOUT) != RPC_SUCCESS) {
-+ return (NULL);
-+ }
-+ return ((void *)&clnt_res);
-+}
-+
-+fhstatus *
-+mountproc_mnt_2(argp, clnt)
-+ dirpath *argp;
-+ CLIENT *clnt;
-+{
-+ static fhstatus clnt_res;
-+
-+ memset((char *)&clnt_res, 0, sizeof(clnt_res));
-+ if (clnt_call(clnt, MOUNTPROC_MNT, (xdrproc_t) xdr_dirpath, (caddr_t) argp, (xdrproc_t) xdr_fhstatus, (caddr_t) &clnt_res, TIMEOUT) != RPC_SUCCESS) {
-+ return (NULL);
-+ }
-+ return (&clnt_res);
-+}
-+
-+mountlist *
-+mountproc_dump_2(argp, clnt)
-+ void *argp;
-+ CLIENT *clnt;
-+{
-+ static mountlist clnt_res;
-+
-+ memset((char *)&clnt_res, 0, sizeof(clnt_res));
-+ if (clnt_call(clnt, MOUNTPROC_DUMP, (xdrproc_t) xdr_void, (caddr_t) argp, (xdrproc_t) xdr_mountlist, (caddr_t) &clnt_res, TIMEOUT) != RPC_SUCCESS) {
-+ return (NULL);
-+ }
-+ return (&clnt_res);
-+}
-+
-+void *
-+mountproc_umnt_2(argp, clnt)
-+ dirpath *argp;
-+ CLIENT *clnt;
-+{
-+ static char clnt_res;
-+
-+ memset((char *)&clnt_res, 0, sizeof(clnt_res));
-+ if (clnt_call(clnt, MOUNTPROC_UMNT, (xdrproc_t) xdr_dirpath, (caddr_t) argp, (xdrproc_t) xdr_void, (caddr_t) &clnt_res, TIMEOUT) != RPC_SUCCESS) {
-+ return (NULL);
-+ }
-+ return ((void *)&clnt_res);
-+}
-+
-+void *
-+mountproc_umntall_2(argp, clnt)
-+ void *argp;
-+ CLIENT *clnt;
-+{
-+ static char clnt_res;
-+
-+ memset((char *)&clnt_res, 0, sizeof(clnt_res));
-+ if (clnt_call(clnt, MOUNTPROC_UMNTALL, (xdrproc_t) xdr_void, (caddr_t) argp, (xdrproc_t) xdr_void, (caddr_t) &clnt_res, TIMEOUT) != RPC_SUCCESS) {
-+ return (NULL);
-+ }
-+ return ((void *)&clnt_res);
-+}
-+
-+exports *
-+mountproc_export_2(argp, clnt)
-+ void *argp;
-+ CLIENT *clnt;
-+{
-+ static exports clnt_res;
-+
-+ memset((char *)&clnt_res, 0, sizeof(clnt_res));
-+ if (clnt_call(clnt, MOUNTPROC_EXPORT, (xdrproc_t) xdr_void, (caddr_t) argp, (xdrproc_t) xdr_exports, (caddr_t) &clnt_res, TIMEOUT) != RPC_SUCCESS) {
-+ return (NULL);
-+ }
-+ return (&clnt_res);
-+}
-+
-+exports *
-+mountproc_exportall_2(argp, clnt)
-+ void *argp;
-+ CLIENT *clnt;
-+{
-+ static exports clnt_res;
-+
-+ memset((char *)&clnt_res, 0, sizeof(clnt_res));
-+ if (clnt_call(clnt, MOUNTPROC_EXPORTALL, (xdrproc_t) xdr_void, (caddr_t) argp, (xdrproc_t) xdr_exports, (caddr_t) &clnt_res, TIMEOUT) != RPC_SUCCESS) {
-+ return (NULL);
-+ }
-+ return (&clnt_res);
-+}
-+
-+ppathcnf *
-+mountproc_pathconf_2(argp, clnt)
-+ dirpath *argp;
-+ CLIENT *clnt;
-+{
-+ static ppathcnf clnt_res;
-+
-+ memset((char *)&clnt_res, 0, sizeof(clnt_res));
-+ if (clnt_call(clnt, MOUNTPROC_PATHCONF, (xdrproc_t) xdr_dirpath, (caddr_t) argp, (xdrproc_t) xdr_ppathcnf, (caddr_t) &clnt_res, TIMEOUT) != RPC_SUCCESS) {
-+ return (NULL);
-+ }
-+ return (&clnt_res);
-+}
-+
-+void *
-+mountproc3_null_3(argp, clnt)
-+ void *argp;
-+ CLIENT *clnt;
-+{
-+ static char clnt_res;
-+
-+ memset((char *)&clnt_res, 0, sizeof(clnt_res));
-+ if (clnt_call(clnt, MOUNTPROC3_NULL, (xdrproc_t) xdr_void, (caddr_t) argp, (xdrproc_t) xdr_void, (caddr_t) &clnt_res, TIMEOUT) != RPC_SUCCESS) {
-+ return (NULL);
-+ }
-+ return ((void *)&clnt_res);
-+}
-+
-+mountres3 *
-+mountproc3_mnt_3(argp, clnt)
-+ dirpath *argp;
-+ CLIENT *clnt;
-+{
-+ static mountres3 clnt_res;
-+
-+ memset((char *)&clnt_res, 0, sizeof(clnt_res));
-+ if (clnt_call(clnt, MOUNTPROC3_MNT, (xdrproc_t) xdr_dirpath, (caddr_t) argp, (xdrproc_t) xdr_mountres3, (caddr_t) &clnt_res, TIMEOUT) != RPC_SUCCESS) {
-+ return (NULL);
-+ }
-+ return (&clnt_res);
-+}
-+
-+mountlist *
-+mountproc3_dump_3(argp, clnt)
-+ void *argp;
-+ CLIENT *clnt;
-+{
-+ static mountlist clnt_res;
-+
-+ memset((char *)&clnt_res, 0, sizeof(clnt_res));
-+ if (clnt_call(clnt, MOUNTPROC3_DUMP, (xdrproc_t) xdr_void, (caddr_t) argp, (xdrproc_t) xdr_mountlist, (caddr_t) &clnt_res, TIMEOUT) != RPC_SUCCESS) {
-+ return (NULL);
-+ }
-+ return (&clnt_res);
-+}
-+
-+void *
-+mountproc3_umnt_3(argp, clnt)
-+ dirpath *argp;
-+ CLIENT *clnt;
-+{
-+ static char clnt_res;
-+
-+ memset((char *)&clnt_res, 0, sizeof(clnt_res));
-+ if (clnt_call(clnt, MOUNTPROC3_UMNT, (xdrproc_t) xdr_dirpath, (caddr_t) argp, (xdrproc_t) xdr_void, (caddr_t) &clnt_res, TIMEOUT) != RPC_SUCCESS) {
-+ return (NULL);
-+ }
-+ return ((void *)&clnt_res);
-+}
-+
-+void *
-+mountproc3_umntall_3(argp, clnt)
-+ void *argp;
-+ CLIENT *clnt;
-+{
-+ static char clnt_res;
-+
-+ memset((char *)&clnt_res, 0, sizeof(clnt_res));
-+ if (clnt_call(clnt, MOUNTPROC3_UMNTALL, (xdrproc_t) xdr_void, (caddr_t) argp, (xdrproc_t) xdr_void, (caddr_t) &clnt_res, TIMEOUT) != RPC_SUCCESS) {
-+ return (NULL);
-+ }
-+ return ((void *)&clnt_res);
-+}
-+
-+exports *
-+mountproc3_export_3(argp, clnt)
-+ void *argp;
-+ CLIENT *clnt;
-+{
-+ static exports clnt_res;
-+
-+ memset((char *)&clnt_res, 0, sizeof(clnt_res));
-+ if (clnt_call(clnt, MOUNTPROC3_EXPORT, (xdrproc_t) xdr_void, (caddr_t) argp, (xdrproc_t) xdr_exports, (caddr_t) &clnt_res, TIMEOUT) != RPC_SUCCESS) {
-+ return (NULL);
-+ }
-+ return (&clnt_res);
-+}
-diff -urN nfs-utils-1.0.7.old/support/export/mount_xdr.c nfs-utils-1.0.7/support/export/mount_xdr.c
---- nfs-utils-1.0.7.old/support/export/mount_xdr.c 1970-01-01 01:00:00.000000000 +0100
-+++ nfs-utils-1.0.7/support/export/mount_xdr.c 2006-03-24 15:39:43.000000000 +0100
-@@ -0,0 +1,421 @@
-+/*
-+ * Please do not edit this file.
-+ * It was generated using rpcgen.
-+ */
-+
-+#include "mount.h"
-+/*
-+ * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
-+ * unrestricted use provided that this legend is included on all tape
-+ * media and as a part of the software program in whole or part. Users
-+ * may copy or modify Sun RPC without charge, but are not authorized
-+ * to license or distribute it to anyone else except as part of a product or
-+ * program developed by the user or with the express written consent of
-+ * Sun Microsystems, Inc.
-+ *
-+ * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE
-+ * WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
-+ * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
-+ *
-+ * Sun RPC is provided with no support and without any obligation on the
-+ * part of Sun Microsystems, Inc. to assist in its use, correction,
-+ * modification or enhancement.
-+ *
-+ * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
-+ * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY SUN RPC
-+ * OR ANY PART THEREOF.
-+ *
-+ * In no event will Sun Microsystems, Inc. be liable for any lost revenue
-+ * or profits or other special, indirect and consequential damages, even if
-+ * Sun has been advised of the possibility of such damages.
-+ *
-+ * Sun Microsystems, Inc.
-+ * 2550 Garcia Avenue
-+ * Mountain View, California 94043
-+ */
-+/*
-+ * Copyright (c) 1985, 1990 by Sun Microsystems, Inc.
-+ */
-+
-+/* from @(#)mount.x 1.3 91/03/11 TIRPC 1.0 */
-+
-+bool_t
-+xdr_fhandle(xdrs, objp)
-+ XDR *xdrs;
-+ fhandle objp;
-+{
-+
-+ register int32_t *buf;
-+
-+ if (!xdr_opaque(xdrs, objp, FHSIZE)) {
-+ return (FALSE);
-+ }
-+ return (TRUE);
-+}
-+
-+bool_t
-+xdr_fhstatus(xdrs, objp)
-+ XDR *xdrs;
-+ fhstatus *objp;
-+{
-+
-+ register int32_t *buf;
-+
-+ if (!xdr_u_int(xdrs, &objp->fhs_status)) {
-+ return (FALSE);
-+ }
-+ switch (objp->fhs_status) {
-+ case 0:
-+ if (!xdr_fhandle(xdrs, objp->fhstatus_u.fhs_fhandle)) {
-+ return (FALSE);
-+ }
-+ break;
-+ default:
-+ break;
-+ }
-+ return (TRUE);
-+}
-+
-+bool_t
-+xdr_dirpath(xdrs, objp)
-+ XDR *xdrs;
-+ dirpath *objp;
-+{
-+
-+ register int32_t *buf;
-+
-+ if (!xdr_string(xdrs, objp, MNTPATHLEN)) {
-+ return (FALSE);
-+ }
-+ return (TRUE);
-+}
-+
-+bool_t
-+xdr_name(xdrs, objp)
-+ XDR *xdrs;
-+ name *objp;
-+{
-+
-+ register int32_t *buf;
-+
-+ if (!xdr_string(xdrs, objp, MNTNAMLEN)) {
-+ return (FALSE);
-+ }
-+ return (TRUE);
-+}
-+
-+bool_t
-+xdr_mountlist(xdrs, objp)
-+ XDR *xdrs;
-+ mountlist *objp;
-+{
-+
-+ register int32_t *buf;
-+
-+ if (!xdr_pointer(xdrs, (char **)objp, sizeof(struct mountbody), (xdrproc_t)xdr_mountbody)) {
-+ return (FALSE);
-+ }
-+ return (TRUE);
-+}
-+
-+bool_t
-+xdr_mountbody(xdrs, objp)
-+ XDR *xdrs;
-+ mountbody *objp;
-+{
-+
-+ register int32_t *buf;
-+
-+ if (!xdr_name(xdrs, &objp->ml_hostname)) {
-+ return (FALSE);
-+ }
-+ if (!xdr_dirpath(xdrs, &objp->ml_directory)) {
-+ return (FALSE);
-+ }
-+ if (!xdr_mountlist(xdrs, &objp->ml_next)) {
-+ return (FALSE);
-+ }
-+ return (TRUE);
-+}
-+
-+bool_t
-+xdr_groups(xdrs, objp)
-+ XDR *xdrs;
-+ groups *objp;
-+{
-+
-+ register int32_t *buf;
-+
-+ if (!xdr_pointer(xdrs, (char **)objp, sizeof(struct groupnode), (xdrproc_t)xdr_groupnode)) {
-+ return (FALSE);
-+ }
-+ return (TRUE);
-+}
-+
-+bool_t
-+xdr_groupnode(xdrs, objp)
-+ XDR *xdrs;
-+ groupnode *objp;
-+{
-+
-+ register int32_t *buf;
-+
-+ if (!xdr_name(xdrs, &objp->gr_name)) {
-+ return (FALSE);
-+ }
-+ if (!xdr_groups(xdrs, &objp->gr_next)) {
-+ return (FALSE);
-+ }
-+ return (TRUE);
-+}
-+
-+bool_t
-+xdr_exports(xdrs, objp)
-+ XDR *xdrs;
-+ exports *objp;
-+{
-+
-+ register int32_t *buf;
-+
-+ if (!xdr_pointer(xdrs, (char **)objp, sizeof(struct exportnode), (xdrproc_t)xdr_exportnode)) {
-+ return (FALSE);
-+ }
-+ return (TRUE);
-+}
-+
-+bool_t
-+xdr_exportnode(xdrs, objp)
-+ XDR *xdrs;
-+ exportnode *objp;
-+{
-+
-+ register int32_t *buf;
-+
-+ if (!xdr_dirpath(xdrs, &objp->ex_dir)) {
-+ return (FALSE);
-+ }
-+ if (!xdr_groups(xdrs, &objp->ex_groups)) {
-+ return (FALSE);
-+ }
-+ if (!xdr_exports(xdrs, &objp->ex_next)) {
-+ return (FALSE);
-+ }
-+ return (TRUE);
-+}
-+
-+bool_t
-+xdr_ppathcnf(xdrs, objp)
-+ XDR *xdrs;
-+ ppathcnf *objp;
-+{
-+
-+ register int32_t *buf;
-+
-+ int i;
-+
-+ if (xdrs->x_op == XDR_ENCODE) {
-+ buf = XDR_INLINE(xdrs,6 * BYTES_PER_XDR_UNIT);
-+ if (buf == NULL) {
-+ if (!xdr_int(xdrs, &objp->pc_link_max)) {
-+ return (FALSE);
-+ }
-+ if (!xdr_short(xdrs, &objp->pc_max_canon)) {
-+ return (FALSE);
-+ }
-+ if (!xdr_short(xdrs, &objp->pc_max_input)) {
-+ return (FALSE);
-+ }
-+ if (!xdr_short(xdrs, &objp->pc_name_max)) {
-+ return (FALSE);
-+ }
-+ if (!xdr_short(xdrs, &objp->pc_path_max)) {
-+ return (FALSE);
-+ }
-+ if (!xdr_short(xdrs, &objp->pc_pipe_buf)) {
-+ return (FALSE);
-+ }
-+
-+ }
-+ else {
-+ IXDR_PUT_INT32(buf,objp->pc_link_max);
-+ IXDR_PUT_SHORT(buf,objp->pc_max_canon);
-+ IXDR_PUT_SHORT(buf,objp->pc_max_input);
-+ IXDR_PUT_SHORT(buf,objp->pc_name_max);
-+ IXDR_PUT_SHORT(buf,objp->pc_path_max);
-+ IXDR_PUT_SHORT(buf,objp->pc_pipe_buf);
-+ }
-+ if (!xdr_u_char(xdrs, &objp->pc_vdisable)) {
-+ return (FALSE);
-+ }
-+ if (!xdr_char(xdrs, &objp->pc_xxx)) {
-+ return (FALSE);
-+ }
-+ buf = XDR_INLINE(xdrs, 2 * BYTES_PER_XDR_UNIT);
-+ if (buf == NULL) {
-+ if (!xdr_vector(xdrs, (char *)objp->pc_mask, 2, sizeof(short), (xdrproc_t)xdr_short)) {
-+ return (FALSE);
-+ }
-+
-+ }
-+ else {
-+ { register short *genp;
-+ for ( i = 0,genp=objp->pc_mask;
-+ i < 2; i++){
-+ IXDR_PUT_SHORT(buf,*genp++);
-+ }
-+ };
-+ }
-+
-+ return (TRUE);
-+ } else if (xdrs->x_op == XDR_DECODE) {
-+ buf = XDR_INLINE(xdrs,6 * BYTES_PER_XDR_UNIT);
-+ if (buf == NULL) {
-+ if (!xdr_int(xdrs, &objp->pc_link_max)) {
-+ return (FALSE);
-+ }
-+ if (!xdr_short(xdrs, &objp->pc_max_canon)) {
-+ return (FALSE);
-+ }
-+ if (!xdr_short(xdrs, &objp->pc_max_input)) {
-+ return (FALSE);
-+ }
-+ if (!xdr_short(xdrs, &objp->pc_name_max)) {
-+ return (FALSE);
-+ }
-+ if (!xdr_short(xdrs, &objp->pc_path_max)) {
-+ return (FALSE);
-+ }
-+ if (!xdr_short(xdrs, &objp->pc_pipe_buf)) {
-+ return (FALSE);
-+ }
-+
-+ }
-+ else {
-+ objp->pc_link_max = IXDR_GET_INT32(buf);
-+ objp->pc_max_canon = IXDR_GET_SHORT(buf);
-+ objp->pc_max_input = IXDR_GET_SHORT(buf);
-+ objp->pc_name_max = IXDR_GET_SHORT(buf);
-+ objp->pc_path_max = IXDR_GET_SHORT(buf);
-+ objp->pc_pipe_buf = IXDR_GET_SHORT(buf);
-+ }
-+ if (!xdr_u_char(xdrs, &objp->pc_vdisable)) {
-+ return (FALSE);
-+ }
-+ if (!xdr_char(xdrs, &objp->pc_xxx)) {
-+ return (FALSE);
-+ }
-+ buf = XDR_INLINE(xdrs, 2 * BYTES_PER_XDR_UNIT);
-+ if (buf == NULL) {
-+ if (!xdr_vector(xdrs, (char *)objp->pc_mask, 2, sizeof(short), (xdrproc_t)xdr_short)) {
-+ return (FALSE);
-+ }
-+
-+ }
-+ else {
-+ { register short *genp;
-+ for ( i = 0,genp=objp->pc_mask;
-+ i < 2; i++){
-+ *genp++ = IXDR_GET_SHORT(buf);
-+ }
-+ };
-+ }
-+ return(TRUE);
-+ }
-+
-+ if (!xdr_int(xdrs, &objp->pc_link_max)) {
-+ return (FALSE);
-+ }
-+ if (!xdr_short(xdrs, &objp->pc_max_canon)) {
-+ return (FALSE);
-+ }
-+ if (!xdr_short(xdrs, &objp->pc_max_input)) {
-+ return (FALSE);
-+ }
-+ if (!xdr_short(xdrs, &objp->pc_name_max)) {
-+ return (FALSE);
-+ }
-+ if (!xdr_short(xdrs, &objp->pc_path_max)) {
-+ return (FALSE);
-+ }
-+ if (!xdr_short(xdrs, &objp->pc_pipe_buf)) {
-+ return (FALSE);
-+ }
-+ if (!xdr_u_char(xdrs, &objp->pc_vdisable)) {
-+ return (FALSE);
-+ }
-+ if (!xdr_char(xdrs, &objp->pc_xxx)) {
-+ return (FALSE);
-+ }
-+ if (!xdr_vector(xdrs, (char *)objp->pc_mask, 2, sizeof(short), (xdrproc_t)xdr_short)) {
-+ return (FALSE);
-+ }
-+ return (TRUE);
-+}
-+
-+bool_t
-+xdr_fhandle3(xdrs, objp)
-+ XDR *xdrs;
-+ fhandle3 *objp;
-+{
-+
-+ register int32_t *buf;
-+
-+ if (!xdr_bytes(xdrs, (char **)&objp->fhandle3_val, (u_int *)&objp->fhandle3_len, FHSIZE3)) {
-+ return (FALSE);
-+ }
-+ return (TRUE);
-+}
-+
-+bool_t
-+xdr_mountstat3(xdrs, objp)
-+ XDR *xdrs;
-+ mountstat3 *objp;
-+{
-+
-+ register int32_t *buf;
-+
-+ if (!xdr_enum(xdrs, (enum_t *)objp)) {
-+ return (FALSE);
-+ }
-+ return (TRUE);
-+}
-+
-+bool_t
-+xdr_mountres3_ok(xdrs, objp)
-+ XDR *xdrs;
-+ mountres3_ok *objp;
-+{
-+
-+ register int32_t *buf;
-+
-+ if (!xdr_fhandle3(xdrs, &objp->fhandle)) {
-+ return (FALSE);
-+ }
-+ if (!xdr_array(xdrs, (char **)&objp->auth_flavors.auth_flavors_val, (u_int *)&objp->auth_flavors.auth_flavors_len, ~0, sizeof(int), (xdrproc_t)xdr_int)) {
-+ return (FALSE);
-+ }
-+ return (TRUE);
-+}
-+
-+bool_t
-+xdr_mountres3(xdrs, objp)
-+ XDR *xdrs;
-+ mountres3 *objp;
-+{
-+
-+ register int32_t *buf;
-+
-+ if (!xdr_mountstat3(xdrs, &objp->fhs_status)) {
-+ return (FALSE);
-+ }
-+ switch (objp->fhs_status) {
-+ case MNT_OK:
-+ if (!xdr_mountres3_ok(xdrs, &objp->mountres3_u.mountinfo)) {
-+ return (FALSE);
-+ }
-+ break;
-+ default:
-+ break;
-+ }
-+ return (TRUE);
-+}
-diff -urN nfs-utils-1.0.7.old/support/include/mount.h nfs-utils-1.0.7/support/include/mount.h
---- nfs-utils-1.0.7.old/support/include/mount.h 1970-01-01 01:00:00.000000000 +0100
-+++ nfs-utils-1.0.7/support/include/mount.h 2006-03-24 15:39:43.000000000 +0100
-@@ -0,0 +1,469 @@
-+/*
-+ * Please do not edit this file.
-+ * It was generated using rpcgen.
-+ */
-+
-+#ifndef _MOUNT_H_RPCGEN
-+#define _MOUNT_H_RPCGEN
-+
-+#include <rpc/rpc.h>
-+
-+#ifndef IXDR_GET_INT32
-+#define IXDR_GET_INT32(buf) IXDR_GET_LONG((buf))
-+#endif
-+#ifndef IXDR_PUT_INT32
-+#define IXDR_PUT_INT32(buf, v) IXDR_PUT_LONG((buf), (v))
-+#endif
-+#ifndef IXDR_GET_U_INT32
-+#define IXDR_GET_U_INT32(buf) IXDR_GET_U_LONG((buf))
-+#endif
-+#ifndef IXDR_PUT_U_INT32
-+#define IXDR_PUT_U_INT32(buf, v) IXDR_PUT_U_LONG((buf), (v))
-+#endif
-+/*
-+ * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
-+ * unrestricted use provided that this legend is included on all tape
-+ * media and as a part of the software program in whole or part. Users
-+ * may copy or modify Sun RPC without charge, but are not authorized
-+ * to license or distribute it to anyone else except as part of a product or
-+ * program developed by the user or with the express written consent of
-+ * Sun Microsystems, Inc.
-+ *
-+ * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE
-+ * WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
-+ * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
-+ *
-+ * Sun RPC is provided with no support and without any obligation on the
-+ * part of Sun Microsystems, Inc. to assist in its use, correction,
-+ * modification or enhancement.
-+ *
-+ * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
-+ * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY SUN RPC
-+ * OR ANY PART THEREOF.
-+ *
-+ * In no event will Sun Microsystems, Inc. be liable for any lost revenue
-+ * or profits or other special, indirect and consequential damages, even if
-+ * Sun has been advised of the possibility of such damages.
-+ *
-+ * Sun Microsystems, Inc.
-+ * 2550 Garcia Avenue
-+ * Mountain View, California 94043
-+ */
-+/*
-+ * Copyright (c) 1985, 1990 by Sun Microsystems, Inc.
-+ */
-+
-+/* from @(#)mount.x 1.3 91/03/11 TIRPC 1.0 */
-+#ifndef _rpcsvc_mount_h
-+#define _rpcsvc_mount_h
-+#include <memory.h>
-+#define MNTPATHLEN 1024
-+#define MNTNAMLEN 255
-+#define FHSIZE 32
-+
-+typedef char fhandle[FHSIZE];
-+#ifdef __cplusplus
-+extern "C" bool_t xdr_fhandle(XDR *, fhandle);
-+#elif __STDC__
-+extern bool_t xdr_fhandle(XDR *, fhandle);
-+#else /* Old Style C */
-+bool_t xdr_fhandle();
-+#endif /* Old Style C */
-+
-+
-+struct fhstatus {
-+ u_int fhs_status;
-+ union {
-+ fhandle fhs_fhandle;
-+ } fhstatus_u;
-+};
-+typedef struct fhstatus fhstatus;
-+#ifdef __cplusplus
-+extern "C" bool_t xdr_fhstatus(XDR *, fhstatus*);
-+#elif __STDC__
-+extern bool_t xdr_fhstatus(XDR *, fhstatus*);
-+#else /* Old Style C */
-+bool_t xdr_fhstatus();
-+#endif /* Old Style C */
-+
-+
-+typedef char *dirpath;
-+#ifdef __cplusplus
-+extern "C" bool_t xdr_dirpath(XDR *, dirpath*);
-+#elif __STDC__
-+extern bool_t xdr_dirpath(XDR *, dirpath*);
-+#else /* Old Style C */
-+bool_t xdr_dirpath();
-+#endif /* Old Style C */
-+
-+
-+typedef char *name;
-+#ifdef __cplusplus
-+extern "C" bool_t xdr_name(XDR *, name*);
-+#elif __STDC__
-+extern bool_t xdr_name(XDR *, name*);
-+#else /* Old Style C */
-+bool_t xdr_name();
-+#endif /* Old Style C */
-+
-+
-+typedef struct mountbody *mountlist;
-+#ifdef __cplusplus
-+extern "C" bool_t xdr_mountlist(XDR *, mountlist*);
-+#elif __STDC__
-+extern bool_t xdr_mountlist(XDR *, mountlist*);
-+#else /* Old Style C */
-+bool_t xdr_mountlist();
-+#endif /* Old Style C */
-+
-+
-+struct mountbody {
-+ name ml_hostname;
-+ dirpath ml_directory;
-+ mountlist ml_next;
-+};
-+typedef struct mountbody mountbody;
-+#ifdef __cplusplus
-+extern "C" bool_t xdr_mountbody(XDR *, mountbody*);
-+#elif __STDC__
-+extern bool_t xdr_mountbody(XDR *, mountbody*);
-+#else /* Old Style C */
-+bool_t xdr_mountbody();
-+#endif /* Old Style C */
-+
-+
-+typedef struct groupnode *groups;
-+#ifdef __cplusplus
-+extern "C" bool_t xdr_groups(XDR *, groups*);
-+#elif __STDC__
-+extern bool_t xdr_groups(XDR *, groups*);
-+#else /* Old Style C */
-+bool_t xdr_groups();
-+#endif /* Old Style C */
-+
-+
-+struct groupnode {
-+ name gr_name;
-+ groups gr_next;
-+};
-+typedef struct groupnode groupnode;
-+#ifdef __cplusplus
-+extern "C" bool_t xdr_groupnode(XDR *, groupnode*);
-+#elif __STDC__
-+extern bool_t xdr_groupnode(XDR *, groupnode*);
-+#else /* Old Style C */
-+bool_t xdr_groupnode();
-+#endif /* Old Style C */
-+
-+
-+typedef struct exportnode *exports;
-+#ifdef __cplusplus
-+extern "C" bool_t xdr_exports(XDR *, exports*);
-+#elif __STDC__
-+extern bool_t xdr_exports(XDR *, exports*);
-+#else /* Old Style C */
-+bool_t xdr_exports();
-+#endif /* Old Style C */
-+
-+
-+struct exportnode {
-+ dirpath ex_dir;
-+ groups ex_groups;
-+ exports ex_next;
-+};
-+typedef struct exportnode exportnode;
-+#ifdef __cplusplus
-+extern "C" bool_t xdr_exportnode(XDR *, exportnode*);
-+#elif __STDC__
-+extern bool_t xdr_exportnode(XDR *, exportnode*);
-+#else /* Old Style C */
-+bool_t xdr_exportnode();
-+#endif /* Old Style C */
-+
-+
-+struct ppathcnf {
-+ int pc_link_max;
-+ short pc_max_canon;
-+ short pc_max_input;
-+ short pc_name_max;
-+ short pc_path_max;
-+ short pc_pipe_buf;
-+ u_char pc_vdisable;
-+ char pc_xxx;
-+ short pc_mask[2];
-+};
-+typedef struct ppathcnf ppathcnf;
-+#ifdef __cplusplus
-+extern "C" bool_t xdr_ppathcnf(XDR *, ppathcnf*);
-+#elif __STDC__
-+extern bool_t xdr_ppathcnf(XDR *, ppathcnf*);
-+#else /* Old Style C */
-+bool_t xdr_ppathcnf();
-+#endif /* Old Style C */
-+
-+#define FHSIZE3 64
-+
-+typedef struct {
-+ u_int fhandle3_len;
-+ char *fhandle3_val;
-+} fhandle3;
-+#ifdef __cplusplus
-+extern "C" bool_t xdr_fhandle3(XDR *, fhandle3*);
-+#elif __STDC__
-+extern bool_t xdr_fhandle3(XDR *, fhandle3*);
-+#else /* Old Style C */
-+bool_t xdr_fhandle3();
-+#endif /* Old Style C */
-+
-+
-+enum mountstat3 {
-+ MNT_OK = 0,
-+ MNT3ERR_PERM = 1,
-+ MNT3ERR_NOENT = 2,
-+ MNT3ERR_IO = 5,
-+ MNT3ERR_ACCES = 13,
-+ MNT3ERR_NOTDIR = 20,
-+ MNT3ERR_INVAL = 22,
-+ MNT3ERR_NAMETOOLONG = 63,
-+ MNT3ERR_NOTSUPP = 10004,
-+ MNT3ERR_SERVERFAULT = 10006,
-+};
-+typedef enum mountstat3 mountstat3;
-+#ifdef __cplusplus
-+extern "C" bool_t xdr_mountstat3(XDR *, mountstat3*);
-+#elif __STDC__
-+extern bool_t xdr_mountstat3(XDR *, mountstat3*);
-+#else /* Old Style C */
-+bool_t xdr_mountstat3();
-+#endif /* Old Style C */
-+
-+
-+struct mountres3_ok {
-+ fhandle3 fhandle;
-+ struct {
-+ u_int auth_flavors_len;
-+ int *auth_flavors_val;
-+ } auth_flavors;
-+};
-+typedef struct mountres3_ok mountres3_ok;
-+#ifdef __cplusplus
-+extern "C" bool_t xdr_mountres3_ok(XDR *, mountres3_ok*);
-+#elif __STDC__
-+extern bool_t xdr_mountres3_ok(XDR *, mountres3_ok*);
-+#else /* Old Style C */
-+bool_t xdr_mountres3_ok();
-+#endif /* Old Style C */
-+
-+
-+struct mountres3 {
-+ mountstat3 fhs_status;
-+ union {
-+ mountres3_ok mountinfo;
-+ } mountres3_u;
-+};
-+typedef struct mountres3 mountres3;
-+#ifdef __cplusplus
-+extern "C" bool_t xdr_mountres3(XDR *, mountres3*);
-+#elif __STDC__
-+extern bool_t xdr_mountres3(XDR *, mountres3*);
-+#else /* Old Style C */
-+bool_t xdr_mountres3();
-+#endif /* Old Style C */
-+
-+#endif /*!_rpcsvc_mount_h*/
-+
-+#define MOUNTPROG ((u_int32_t)100005)
-+#define MOUNTVERS ((u_int32_t)1)
-+
-+#ifdef __cplusplus
-+#define MOUNTPROC_NULL ((u_int32_t)0)
-+extern "C" void * mountproc_null_1(void *, CLIENT *);
-+extern "C" void * mountproc_null_1_svc(void *, struct svc_req *);
-+#define MOUNTPROC_MNT ((u_int32_t)1)
-+extern "C" fhstatus * mountproc_mnt_1(dirpath *, CLIENT *);
-+extern "C" fhstatus * mountproc_mnt_1_svc(dirpath *, struct svc_req *);
-+#define MOUNTPROC_DUMP ((u_int32_t)2)
-+extern "C" mountlist * mountproc_dump_1(void *, CLIENT *);
-+extern "C" mountlist * mountproc_dump_1_svc(void *, struct svc_req *);
-+#define MOUNTPROC_UMNT ((u_int32_t)3)
-+extern "C" void * mountproc_umnt_1(dirpath *, CLIENT *);
-+extern "C" void * mountproc_umnt_1_svc(dirpath *, struct svc_req *);
-+#define MOUNTPROC_UMNTALL ((u_int32_t)4)
-+extern "C" void * mountproc_umntall_1(void *, CLIENT *);
-+extern "C" void * mountproc_umntall_1_svc(void *, struct svc_req *);
-+#define MOUNTPROC_EXPORT ((u_int32_t)5)
-+extern "C" exports * mountproc_export_1(void *, CLIENT *);
-+extern "C" exports * mountproc_export_1_svc(void *, struct svc_req *);
-+#define MOUNTPROC_EXPORTALL ((u_int32_t)6)
-+extern "C" exports * mountproc_exportall_1(void *, CLIENT *);
-+extern "C" exports * mountproc_exportall_1_svc(void *, struct svc_req *);
-+
-+#elif __STDC__
-+#define MOUNTPROC_NULL ((u_int32_t)0)
-+extern void * mountproc_null_1(void *, CLIENT *);
-+extern void * mountproc_null_1_svc(void *, struct svc_req *);
-+#define MOUNTPROC_MNT ((u_int32_t)1)
-+extern fhstatus * mountproc_mnt_1(dirpath *, CLIENT *);
-+extern fhstatus * mountproc_mnt_1_svc(dirpath *, struct svc_req *);
-+#define MOUNTPROC_DUMP ((u_int32_t)2)
-+extern mountlist * mountproc_dump_1(void *, CLIENT *);
-+extern mountlist * mountproc_dump_1_svc(void *, struct svc_req *);
-+#define MOUNTPROC_UMNT ((u_int32_t)3)
-+extern void * mountproc_umnt_1(dirpath *, CLIENT *);
-+extern void * mountproc_umnt_1_svc(dirpath *, struct svc_req *);
-+#define MOUNTPROC_UMNTALL ((u_int32_t)4)
-+extern void * mountproc_umntall_1(void *, CLIENT *);
-+extern void * mountproc_umntall_1_svc(void *, struct svc_req *);
-+#define MOUNTPROC_EXPORT ((u_int32_t)5)
-+extern exports * mountproc_export_1(void *, CLIENT *);
-+extern exports * mountproc_export_1_svc(void *, struct svc_req *);
-+#define MOUNTPROC_EXPORTALL ((u_int32_t)6)
-+extern exports * mountproc_exportall_1(void *, CLIENT *);
-+extern exports * mountproc_exportall_1_svc(void *, struct svc_req *);
-+
-+#else /* Old Style C */
-+#define MOUNTPROC_NULL ((u_int32_t)0)
-+extern void * mountproc_null_1();
-+extern void * mountproc_null_1_svc();
-+#define MOUNTPROC_MNT ((u_int32_t)1)
-+extern fhstatus * mountproc_mnt_1();
-+extern fhstatus * mountproc_mnt_1_svc();
-+#define MOUNTPROC_DUMP ((u_int32_t)2)
-+extern mountlist * mountproc_dump_1();
-+extern mountlist * mountproc_dump_1_svc();
-+#define MOUNTPROC_UMNT ((u_int32_t)3)
-+extern void * mountproc_umnt_1();
-+extern void * mountproc_umnt_1_svc();
-+#define MOUNTPROC_UMNTALL ((u_int32_t)4)
-+extern void * mountproc_umntall_1();
-+extern void * mountproc_umntall_1_svc();
-+#define MOUNTPROC_EXPORT ((u_int32_t)5)
-+extern exports * mountproc_export_1();
-+extern exports * mountproc_export_1_svc();
-+#define MOUNTPROC_EXPORTALL ((u_int32_t)6)
-+extern exports * mountproc_exportall_1();
-+extern exports * mountproc_exportall_1_svc();
-+#endif /* Old Style C */
-+#define MOUNTVERS_POSIX ((u_int32_t)2)
-+
-+#ifdef __cplusplus
-+extern "C" void * mountproc_null_2(void *, CLIENT *);
-+extern "C" void * mountproc_null_2_svc(void *, struct svc_req *);
-+extern "C" fhstatus * mountproc_mnt_2(dirpath *, CLIENT *);
-+extern "C" fhstatus * mountproc_mnt_2_svc(dirpath *, struct svc_req *);
-+extern "C" mountlist * mountproc_dump_2(void *, CLIENT *);
-+extern "C" mountlist * mountproc_dump_2_svc(void *, struct svc_req *);
-+extern "C" void * mountproc_umnt_2(dirpath *, CLIENT *);
-+extern "C" void * mountproc_umnt_2_svc(dirpath *, struct svc_req *);
-+extern "C" void * mountproc_umntall_2(void *, CLIENT *);
-+extern "C" void * mountproc_umntall_2_svc(void *, struct svc_req *);
-+extern "C" exports * mountproc_export_2(void *, CLIENT *);
-+extern "C" exports * mountproc_export_2_svc(void *, struct svc_req *);
-+extern "C" exports * mountproc_exportall_2(void *, CLIENT *);
-+extern "C" exports * mountproc_exportall_2_svc(void *, struct svc_req *);
-+#define MOUNTPROC_PATHCONF ((u_int32_t)7)
-+extern "C" ppathcnf * mountproc_pathconf_2(dirpath *, CLIENT *);
-+extern "C" ppathcnf * mountproc_pathconf_2_svc(dirpath *, struct svc_req *);
-+
-+#elif __STDC__
-+extern void * mountproc_null_2(void *, CLIENT *);
-+extern void * mountproc_null_2_svc(void *, struct svc_req *);
-+extern fhstatus * mountproc_mnt_2(dirpath *, CLIENT *);
-+extern fhstatus * mountproc_mnt_2_svc(dirpath *, struct svc_req *);
-+extern mountlist * mountproc_dump_2(void *, CLIENT *);
-+extern mountlist * mountproc_dump_2_svc(void *, struct svc_req *);
-+extern void * mountproc_umnt_2(dirpath *, CLIENT *);
-+extern void * mountproc_umnt_2_svc(dirpath *, struct svc_req *);
-+extern void * mountproc_umntall_2(void *, CLIENT *);
-+extern void * mountproc_umntall_2_svc(void *, struct svc_req *);
-+extern exports * mountproc_export_2(void *, CLIENT *);
-+extern exports * mountproc_export_2_svc(void *, struct svc_req *);
-+extern exports * mountproc_exportall_2(void *, CLIENT *);
-+extern exports * mountproc_exportall_2_svc(void *, struct svc_req *);
-+#define MOUNTPROC_PATHCONF ((u_int32_t)7)
-+extern ppathcnf * mountproc_pathconf_2(dirpath *, CLIENT *);
-+extern ppathcnf * mountproc_pathconf_2_svc(dirpath *, struct svc_req *);
-+
-+#else /* Old Style C */
-+extern void * mountproc_null_2();
-+extern void * mountproc_null_2_svc();
-+extern fhstatus * mountproc_mnt_2();
-+extern fhstatus * mountproc_mnt_2_svc();
-+extern mountlist * mountproc_dump_2();
-+extern mountlist * mountproc_dump_2_svc();
-+extern void * mountproc_umnt_2();
-+extern void * mountproc_umnt_2_svc();
-+extern void * mountproc_umntall_2();
-+extern void * mountproc_umntall_2_svc();
-+extern exports * mountproc_export_2();
-+extern exports * mountproc_export_2_svc();
-+extern exports * mountproc_exportall_2();
-+extern exports * mountproc_exportall_2_svc();
-+#define MOUNTPROC_PATHCONF ((u_int32_t)7)
-+extern ppathcnf * mountproc_pathconf_2();
-+extern ppathcnf * mountproc_pathconf_2_svc();
-+#endif /* Old Style C */
-+#define MOUNTVERS_NFSV3 ((u_int32_t)3)
-+
-+#ifdef __cplusplus
-+#define MOUNTPROC3_NULL ((u_int32_t)0)
-+extern "C" void * mountproc3_null_3(void *, CLIENT *);
-+extern "C" void * mountproc3_null_3_svc(void *, struct svc_req *);
-+#define MOUNTPROC3_MNT ((u_int32_t)1)
-+extern "C" mountres3 * mountproc3_mnt_3(dirpath *, CLIENT *);
-+extern "C" mountres3 * mountproc3_mnt_3_svc(dirpath *, struct svc_req *);
-+#define MOUNTPROC3_DUMP ((u_int32_t)2)
-+extern "C" mountlist * mountproc3_dump_3(void *, CLIENT *);
-+extern "C" mountlist * mountproc3_dump_3_svc(void *, struct svc_req *);
-+#define MOUNTPROC3_UMNT ((u_int32_t)3)
-+extern "C" void * mountproc3_umnt_3(dirpath *, CLIENT *);
-+extern "C" void * mountproc3_umnt_3_svc(dirpath *, struct svc_req *);
-+#define MOUNTPROC3_UMNTALL ((u_int32_t)4)
-+extern "C" void * mountproc3_umntall_3(void *, CLIENT *);
-+extern "C" void * mountproc3_umntall_3_svc(void *, struct svc_req *);
-+#define MOUNTPROC3_EXPORT ((u_int32_t)5)
-+extern "C" exports * mountproc3_export_3(void *, CLIENT *);
-+extern "C" exports * mountproc3_export_3_svc(void *, struct svc_req *);
-+
-+#elif __STDC__
-+#define MOUNTPROC3_NULL ((u_int32_t)0)
-+extern void * mountproc3_null_3(void *, CLIENT *);
-+extern void * mountproc3_null_3_svc(void *, struct svc_req *);
-+#define MOUNTPROC3_MNT ((u_int32_t)1)
-+extern mountres3 * mountproc3_mnt_3(dirpath *, CLIENT *);
-+extern mountres3 * mountproc3_mnt_3_svc(dirpath *, struct svc_req *);
-+#define MOUNTPROC3_DUMP ((u_int32_t)2)
-+extern mountlist * mountproc3_dump_3(void *, CLIENT *);
-+extern mountlist * mountproc3_dump_3_svc(void *, struct svc_req *);
-+#define MOUNTPROC3_UMNT ((u_int32_t)3)
-+extern void * mountproc3_umnt_3(dirpath *, CLIENT *);
-+extern void * mountproc3_umnt_3_svc(dirpath *, struct svc_req *);
-+#define MOUNTPROC3_UMNTALL ((u_int32_t)4)
-+extern void * mountproc3_umntall_3(void *, CLIENT *);
-+extern void * mountproc3_umntall_3_svc(void *, struct svc_req *);
-+#define MOUNTPROC3_EXPORT ((u_int32_t)5)
-+extern exports * mountproc3_export_3(void *, CLIENT *);
-+extern exports * mountproc3_export_3_svc(void *, struct svc_req *);
-+
-+#else /* Old Style C */
-+#define MOUNTPROC3_NULL ((u_int32_t)0)
-+extern void * mountproc3_null_3();
-+extern void * mountproc3_null_3_svc();
-+#define MOUNTPROC3_MNT ((u_int32_t)1)
-+extern mountres3 * mountproc3_mnt_3();
-+extern mountres3 * mountproc3_mnt_3_svc();
-+#define MOUNTPROC3_DUMP ((u_int32_t)2)
-+extern mountlist * mountproc3_dump_3();
-+extern mountlist * mountproc3_dump_3_svc();
-+#define MOUNTPROC3_UMNT ((u_int32_t)3)
-+extern void * mountproc3_umnt_3();
-+extern void * mountproc3_umnt_3_svc();
-+#define MOUNTPROC3_UMNTALL ((u_int32_t)4)
-+extern void * mountproc3_umntall_3();
-+extern void * mountproc3_umntall_3_svc();
-+#define MOUNTPROC3_EXPORT ((u_int32_t)5)
-+extern exports * mountproc3_export_3();
-+extern exports * mountproc3_export_3_svc();
-+#endif /* Old Style C */
-+
-+#endif /* !_MOUNT_H_RPCGEN */
-diff -urN nfs-utils-1.0.7.old/utils/statd/sm_inter.h nfs-utils-1.0.7/utils/statd/sm_inter.h
---- nfs-utils-1.0.7.old/utils/statd/sm_inter.h 1970-01-01 01:00:00.000000000 +0100
-+++ nfs-utils-1.0.7/utils/statd/sm_inter.h 2006-03-24 15:39:44.000000000 +0100
-@@ -0,0 +1,218 @@
-+/*
-+ * Please do not edit this file.
-+ * It was generated using rpcgen.
-+ */
-+
-+#ifndef _SM_INTER_H_RPCGEN
-+#define _SM_INTER_H_RPCGEN
-+
-+#include <rpc/rpc.h>
-+
-+#ifndef IXDR_GET_INT32
-+#define IXDR_GET_INT32(buf) IXDR_GET_LONG((buf))
-+#endif
-+#ifndef IXDR_PUT_INT32
-+#define IXDR_PUT_INT32(buf, v) IXDR_PUT_LONG((buf), (v))
-+#endif
-+#ifndef IXDR_GET_U_INT32
-+#define IXDR_GET_U_INT32(buf) IXDR_GET_U_LONG((buf))
-+#endif
-+#ifndef IXDR_PUT_U_INT32
-+#define IXDR_PUT_U_INT32(buf, v) IXDR_PUT_U_LONG((buf), (v))
-+#endif
-+#define SM_MAXSTRLEN 1024
-+#define SM_PRIV_SIZE 16
-+
-+struct sm_name {
-+ char *mon_name;
-+};
-+typedef struct sm_name sm_name;
-+#ifdef __cplusplus
-+extern "C" bool_t xdr_sm_name(XDR *, sm_name*);
-+#elif __STDC__
-+extern bool_t xdr_sm_name(XDR *, sm_name*);
-+#else /* Old Style C */
-+bool_t xdr_sm_name();
-+#endif /* Old Style C */
-+
-+
-+struct my_id {
-+ char *my_name;
-+ int my_prog;
-+ int my_vers;
-+ int my_proc;
-+};
-+typedef struct my_id my_id;
-+#ifdef __cplusplus
-+extern "C" bool_t xdr_my_id(XDR *, my_id*);
-+#elif __STDC__
-+extern bool_t xdr_my_id(XDR *, my_id*);
-+#else /* Old Style C */
-+bool_t xdr_my_id();
-+#endif /* Old Style C */
-+
-+
-+struct mon_id {
-+ char *mon_name;
-+ struct my_id my_id;
-+};
-+typedef struct mon_id mon_id;
-+#ifdef __cplusplus
-+extern "C" bool_t xdr_mon_id(XDR *, mon_id*);
-+#elif __STDC__
-+extern bool_t xdr_mon_id(XDR *, mon_id*);
-+#else /* Old Style C */
-+bool_t xdr_mon_id();
-+#endif /* Old Style C */
-+
-+
-+struct mon {
-+ struct mon_id mon_id;
-+ char priv[SM_PRIV_SIZE];
-+};
-+typedef struct mon mon;
-+#ifdef __cplusplus
-+extern "C" bool_t xdr_mon(XDR *, mon*);
-+#elif __STDC__
-+extern bool_t xdr_mon(XDR *, mon*);
-+#else /* Old Style C */
-+bool_t xdr_mon();
-+#endif /* Old Style C */
-+
-+
-+struct stat_chge {
-+ char *mon_name;
-+ int state;
-+};
-+typedef struct stat_chge stat_chge;
-+#ifdef __cplusplus
-+extern "C" bool_t xdr_stat_chge(XDR *, stat_chge*);
-+#elif __STDC__
-+extern bool_t xdr_stat_chge(XDR *, stat_chge*);
-+#else /* Old Style C */
-+bool_t xdr_stat_chge();
-+#endif /* Old Style C */
-+
-+
-+struct sm_stat {
-+ int state;
-+};
-+typedef struct sm_stat sm_stat;
-+#ifdef __cplusplus
-+extern "C" bool_t xdr_sm_stat(XDR *, sm_stat*);
-+#elif __STDC__
-+extern bool_t xdr_sm_stat(XDR *, sm_stat*);
-+#else /* Old Style C */
-+bool_t xdr_sm_stat();
-+#endif /* Old Style C */
-+
-+
-+enum res {
-+ stat_succ = 0,
-+ stat_fail = 1,
-+};
-+typedef enum res res;
-+#ifdef __cplusplus
-+extern "C" bool_t xdr_res(XDR *, res*);
-+#elif __STDC__
-+extern bool_t xdr_res(XDR *, res*);
-+#else /* Old Style C */
-+bool_t xdr_res();
-+#endif /* Old Style C */
-+
-+
-+struct sm_stat_res {
-+ res res_stat;
-+ int state;
-+};
-+typedef struct sm_stat_res sm_stat_res;
-+#ifdef __cplusplus
-+extern "C" bool_t xdr_sm_stat_res(XDR *, sm_stat_res*);
-+#elif __STDC__
-+extern bool_t xdr_sm_stat_res(XDR *, sm_stat_res*);
-+#else /* Old Style C */
-+bool_t xdr_sm_stat_res();
-+#endif /* Old Style C */
-+
-+
-+struct status {
-+ char *mon_name;
-+ int state;
-+ char priv[SM_PRIV_SIZE];
-+};
-+typedef struct status status;
-+#ifdef __cplusplus
-+extern "C" bool_t xdr_status(XDR *, status*);
-+#elif __STDC__
-+extern bool_t xdr_status(XDR *, status*);
-+#else /* Old Style C */
-+bool_t xdr_status();
-+#endif /* Old Style C */
-+
-+#define SM_INTER_X
-+
-+#define SM_PROG ((u_int32_t)100024)
-+#define SM_VERS ((u_int32_t)1)
-+
-+#ifdef __cplusplus
-+#define SM_STAT ((u_int32_t)1)
-+extern "C" struct sm_stat_res * sm_stat_1(struct sm_name *, CLIENT *);
-+extern "C" struct sm_stat_res * sm_stat_1_svc(struct sm_name *, struct svc_req *);
-+#define SM_MON ((u_int32_t)2)
-+extern "C" struct sm_stat_res * sm_mon_1(struct mon *, CLIENT *);
-+extern "C" struct sm_stat_res * sm_mon_1_svc(struct mon *, struct svc_req *);
-+#define SM_UNMON ((u_int32_t)3)
-+extern "C" struct sm_stat * sm_unmon_1(struct mon_id *, CLIENT *);
-+extern "C" struct sm_stat * sm_unmon_1_svc(struct mon_id *, struct svc_req *);
-+#define SM_UNMON_ALL ((u_int32_t)4)
-+extern "C" struct sm_stat * sm_unmon_all_1(struct my_id *, CLIENT *);
-+extern "C" struct sm_stat * sm_unmon_all_1_svc(struct my_id *, struct svc_req *);
-+#define SM_SIMU_CRASH ((u_int32_t)5)
-+extern "C" void * sm_simu_crash_1(void *, CLIENT *);
-+extern "C" void * sm_simu_crash_1_svc(void *, struct svc_req *);
-+#define SM_NOTIFY ((u_int32_t)6)
-+extern "C" void * sm_notify_1(struct stat_chge *, CLIENT *);
-+extern "C" void * sm_notify_1_svc(struct stat_chge *, struct svc_req *);
-+
-+#elif __STDC__
-+#define SM_STAT ((u_int32_t)1)
-+extern struct sm_stat_res * sm_stat_1(struct sm_name *, CLIENT *);
-+extern struct sm_stat_res * sm_stat_1_svc(struct sm_name *, struct svc_req *);
-+#define SM_MON ((u_int32_t)2)
-+extern struct sm_stat_res * sm_mon_1(struct mon *, CLIENT *);
-+extern struct sm_stat_res * sm_mon_1_svc(struct mon *, struct svc_req *);
-+#define SM_UNMON ((u_int32_t)3)
-+extern struct sm_stat * sm_unmon_1(struct mon_id *, CLIENT *);
-+extern struct sm_stat * sm_unmon_1_svc(struct mon_id *, struct svc_req *);
-+#define SM_UNMON_ALL ((u_int32_t)4)
-+extern struct sm_stat * sm_unmon_all_1(struct my_id *, CLIENT *);
-+extern struct sm_stat * sm_unmon_all_1_svc(struct my_id *, struct svc_req *);
-+#define SM_SIMU_CRASH ((u_int32_t)5)
-+extern void * sm_simu_crash_1(void *, CLIENT *);
-+extern void * sm_simu_crash_1_svc(void *, struct svc_req *);
-+#define SM_NOTIFY ((u_int32_t)6)
-+extern void * sm_notify_1(struct stat_chge *, CLIENT *);
-+extern void * sm_notify_1_svc(struct stat_chge *, struct svc_req *);
-+
-+#else /* Old Style C */
-+#define SM_STAT ((u_int32_t)1)
-+extern struct sm_stat_res * sm_stat_1();
-+extern struct sm_stat_res * sm_stat_1_svc();
-+#define SM_MON ((u_int32_t)2)
-+extern struct sm_stat_res * sm_mon_1();
-+extern struct sm_stat_res * sm_mon_1_svc();
-+#define SM_UNMON ((u_int32_t)3)
-+extern struct sm_stat * sm_unmon_1();
-+extern struct sm_stat * sm_unmon_1_svc();
-+#define SM_UNMON_ALL ((u_int32_t)4)
-+extern struct sm_stat * sm_unmon_all_1();
-+extern struct sm_stat * sm_unmon_all_1_svc();
-+#define SM_SIMU_CRASH ((u_int32_t)5)
-+extern void * sm_simu_crash_1();
-+extern void * sm_simu_crash_1_svc();
-+#define SM_NOTIFY ((u_int32_t)6)
-+extern void * sm_notify_1();
-+extern void * sm_notify_1_svc();
-+#endif /* Old Style C */
-+
-+#endif /* !_SM_INTER_H_RPCGEN */
-diff -urN nfs-utils-1.0.7.old/utils/statd/sm_inter_clnt.c nfs-utils-1.0.7/utils/statd/sm_inter_clnt.c
---- nfs-utils-1.0.7.old/utils/statd/sm_inter_clnt.c 1970-01-01 01:00:00.000000000 +0100
-+++ nfs-utils-1.0.7/utils/statd/sm_inter_clnt.c 2006-03-24 15:39:44.000000000 +0100
-@@ -0,0 +1,95 @@
-+/*
-+ * Please do not edit this file.
-+ * It was generated using rpcgen.
-+ */
-+
-+#include "sm_inter.h"
-+#include <string.h>
-+#define SM_INTER_X
-+
-+/* Default timeout can be changed using clnt_control() */
-+static struct timeval TIMEOUT = { 25, 0 };
-+
-+struct sm_stat_res *
-+sm_stat_1(argp, clnt)
-+ struct sm_name *argp;
-+ CLIENT *clnt;
-+{
-+ static struct sm_stat_res clnt_res;
-+
-+ memset((char *)&clnt_res, 0, sizeof(clnt_res));
-+ if (clnt_call(clnt, SM_STAT, (xdrproc_t) xdr_sm_name, (caddr_t) argp, (xdrproc_t) xdr_sm_stat_res, (caddr_t) &clnt_res, TIMEOUT) != RPC_SUCCESS) {
-+ return (NULL);
-+ }
-+ return (&clnt_res);
-+}
-+
-+struct sm_stat_res *
-+sm_mon_1(argp, clnt)
-+ struct mon *argp;
-+ CLIENT *clnt;
-+{
-+ static struct sm_stat_res clnt_res;
-+
-+ memset((char *)&clnt_res, 0, sizeof(clnt_res));
-+ if (clnt_call(clnt, SM_MON, (xdrproc_t) xdr_mon, (caddr_t) argp, (xdrproc_t) xdr_sm_stat_res, (caddr_t) &clnt_res, TIMEOUT) != RPC_SUCCESS) {
-+ return (NULL);
-+ }
-+ return (&clnt_res);
-+}
-+
-+struct sm_stat *
-+sm_unmon_1(argp, clnt)
-+ struct mon_id *argp;
-+ CLIENT *clnt;
-+{
-+ static struct sm_stat clnt_res;
-+
-+ memset((char *)&clnt_res, 0, sizeof(clnt_res));
-+ if (clnt_call(clnt, SM_UNMON, (xdrproc_t) xdr_mon_id, (caddr_t) argp, (xdrproc_t) xdr_sm_stat, (caddr_t) &clnt_res, TIMEOUT) != RPC_SUCCESS) {
-+ return (NULL);
-+ }
-+ return (&clnt_res);
-+}
-+
-+struct sm_stat *
-+sm_unmon_all_1(argp, clnt)
-+ struct my_id *argp;
-+ CLIENT *clnt;
-+{
-+ static struct sm_stat clnt_res;
-+
-+ memset((char *)&clnt_res, 0, sizeof(clnt_res));
-+ if (clnt_call(clnt, SM_UNMON_ALL, (xdrproc_t) xdr_my_id, (caddr_t) argp, (xdrproc_t) xdr_sm_stat, (caddr_t) &clnt_res, TIMEOUT) != RPC_SUCCESS) {
-+ return (NULL);
-+ }
-+ return (&clnt_res);
-+}
-+
-+void *
-+sm_simu_crash_1(argp, clnt)
-+ void *argp;
-+ CLIENT *clnt;
-+{
-+ static char clnt_res;
-+
-+ memset((char *)&clnt_res, 0, sizeof(clnt_res));
-+ if (clnt_call(clnt, SM_SIMU_CRASH, (xdrproc_t) xdr_void, (caddr_t) argp, (xdrproc_t) xdr_void, (caddr_t) &clnt_res, TIMEOUT) != RPC_SUCCESS) {
-+ return (NULL);
-+ }
-+ return ((void *)&clnt_res);
-+}
-+
-+void *
-+sm_notify_1(argp, clnt)
-+ struct stat_chge *argp;
-+ CLIENT *clnt;
-+{
-+ static char clnt_res;
-+
-+ memset((char *)&clnt_res, 0, sizeof(clnt_res));
-+ if (clnt_call(clnt, SM_NOTIFY, (xdrproc_t) xdr_stat_chge, (caddr_t) argp, (xdrproc_t) xdr_void, (caddr_t) &clnt_res, TIMEOUT) != RPC_SUCCESS) {
-+ return (NULL);
-+ }
-+ return ((void *)&clnt_res);
-+}
-diff -urN nfs-utils-1.0.7.old/utils/statd/sm_inter_svc.c nfs-utils-1.0.7/utils/statd/sm_inter_svc.c
---- nfs-utils-1.0.7.old/utils/statd/sm_inter_svc.c 1970-01-01 01:00:00.000000000 +0100
-+++ nfs-utils-1.0.7/utils/statd/sm_inter_svc.c 2006-03-24 15:39:44.000000000 +0100
-@@ -0,0 +1,123 @@
-+/*
-+ * Please do not edit this file.
-+ * It was generated using rpcgen.
-+ */
-+
-+#include "sm_inter.h"
-+#include <stdio.h>
-+#include <stdlib.h>/* getenv, exit */
-+#include <signal.h>
-+#include <memory.h>
-+#include <sys/socket.h>
-+#include <netinet/in.h>
-+#include <syslog.h>
-+
-+#ifdef __STDC__
-+#define SIG_PF void(*)(int)
-+#endif
-+
-+#ifdef DEBUG
-+#define RPC_SVC_FG
-+#endif
-+
-+#define _RPCSVC_CLOSEDOWN 120
-+#define SM_INTER_X
-+extern int _rpcpmstart; /* Started by a port monitor ? */
-+extern int _rpcfdtype; /* Whether Stream or Datagram ? */
-+extern int _rpcsvcdirty; /* Still serving ? */
-+
-+static
-+void _msgout(msg)
-+ char *msg;
-+{
-+#ifdef RPC_SVC_FG
-+ if (_rpcpmstart)
-+ syslog(LOG_ERR, "%s", msg);
-+ else
-+ (void) fprintf(stderr, "%s\n", msg);
-+#else
-+ syslog(LOG_ERR, "%s", msg);
-+#endif
-+}
-+
-+void
-+sm_prog_1(rqstp, transp)
-+ struct svc_req *rqstp;
-+ register SVCXPRT *transp;
-+{
-+ union {
-+ struct sm_name sm_stat_1_arg;
-+ struct mon sm_mon_1_arg;
-+ struct mon_id sm_unmon_1_arg;
-+ struct my_id sm_unmon_all_1_arg;
-+ struct stat_chge sm_notify_1_arg;
-+ } argument;
-+ char *result;
-+ bool_t (*xdr_argument)(), (*xdr_result)();
-+ char *(*local)();
-+
-+ _rpcsvcdirty = 1;
-+ switch (rqstp->rq_proc) {
-+ case NULLPROC:
-+ (void) svc_sendreply(transp, (xdrproc_t) xdr_void, (char *)NULL);
-+ _rpcsvcdirty = 0;
-+ return;
-+
-+ case SM_STAT:
-+ xdr_argument = xdr_sm_name;
-+ xdr_result = xdr_sm_stat_res;
-+ local = (char *(*)()) sm_stat_1_svc;
-+ break;
-+
-+ case SM_MON:
-+ xdr_argument = xdr_mon;
-+ xdr_result = xdr_sm_stat_res;
-+ local = (char *(*)()) sm_mon_1_svc;
-+ break;
-+
-+ case SM_UNMON:
-+ xdr_argument = xdr_mon_id;
-+ xdr_result = xdr_sm_stat;
-+ local = (char *(*)()) sm_unmon_1_svc;
-+ break;
-+
-+ case SM_UNMON_ALL:
-+ xdr_argument = xdr_my_id;
-+ xdr_result = xdr_sm_stat;
-+ local = (char *(*)()) sm_unmon_all_1_svc;
-+ break;
-+
-+ case SM_SIMU_CRASH:
-+ xdr_argument = xdr_void;
-+ xdr_result = xdr_void;
-+ local = (char *(*)()) sm_simu_crash_1_svc;
-+ break;
-+
-+ case SM_NOTIFY:
-+ xdr_argument = xdr_stat_chge;
-+ xdr_result = xdr_void;
-+ local = (char *(*)()) sm_notify_1_svc;
-+ break;
-+
-+ default:
-+ svcerr_noproc(transp);
-+ _rpcsvcdirty = 0;
-+ return;
-+ }
-+ (void) memset((char *)&argument, 0, sizeof (argument));
-+ if (!svc_getargs(transp, (xdrproc_t) xdr_argument, (caddr_t) &argument)) {
-+ svcerr_decode(transp);
-+ _rpcsvcdirty = 0;
-+ return;
-+ }
-+ result = (*local)(&argument, rqstp);
-+ if (result != NULL && !svc_sendreply(transp, (xdrproc_t) xdr_result, result)) {
-+ svcerr_systemerr(transp);
-+ }
-+ if (!svc_freeargs(transp, (xdrproc_t) xdr_argument, (caddr_t) &argument)) {
-+ _msgout("unable to free arguments");
-+ exit(1);
-+ }
-+ _rpcsvcdirty = 0;
-+ return;
-+}
-diff -urN nfs-utils-1.0.7.old/utils/statd/sm_inter_xdr.c nfs-utils-1.0.7/utils/statd/sm_inter_xdr.c
---- nfs-utils-1.0.7.old/utils/statd/sm_inter_xdr.c 1970-01-01 01:00:00.000000000 +0100
-+++ nfs-utils-1.0.7/utils/statd/sm_inter_xdr.c 2006-03-24 15:39:44.000000000 +0100
-@@ -0,0 +1,162 @@
-+/*
-+ * Please do not edit this file.
-+ * It was generated using rpcgen.
-+ */
-+
-+#include "sm_inter.h"
-+
-+bool_t
-+xdr_sm_name(xdrs, objp)
-+ XDR *xdrs;
-+ sm_name *objp;
-+{
-+
-+ register int32_t *buf;
-+
-+ if (!xdr_string(xdrs, &objp->mon_name, SM_MAXSTRLEN)) {
-+ return (FALSE);
-+ }
-+ return (TRUE);
-+}
-+
-+bool_t
-+xdr_my_id(xdrs, objp)
-+ XDR *xdrs;
-+ my_id *objp;
-+{
-+
-+ register int32_t *buf;
-+
-+ if (!xdr_string(xdrs, &objp->my_name, SM_MAXSTRLEN)) {
-+ return (FALSE);
-+ }
-+ if (!xdr_int(xdrs, &objp->my_prog)) {
-+ return (FALSE);
-+ }
-+ if (!xdr_int(xdrs, &objp->my_vers)) {
-+ return (FALSE);
-+ }
-+ if (!xdr_int(xdrs, &objp->my_proc)) {
-+ return (FALSE);
-+ }
-+ return (TRUE);
-+}
-+
-+bool_t
-+xdr_mon_id(xdrs, objp)
-+ XDR *xdrs;
-+ mon_id *objp;
-+{
-+
-+ register int32_t *buf;
-+
-+ if (!xdr_string(xdrs, &objp->mon_name, SM_MAXSTRLEN)) {
-+ return (FALSE);
-+ }
-+ if (!xdr_my_id(xdrs, &objp->my_id)) {
-+ return (FALSE);
-+ }
-+ return (TRUE);
-+}
-+
-+bool_t
-+xdr_mon(xdrs, objp)
-+ XDR *xdrs;
-+ mon *objp;
-+{
-+
-+ register int32_t *buf;
-+
-+ int i;
-+ if (!xdr_mon_id(xdrs, &objp->mon_id)) {
-+ return (FALSE);
-+ }
-+ if (!xdr_opaque(xdrs, objp->priv, SM_PRIV_SIZE)) {
-+ return (FALSE);
-+ }
-+ return (TRUE);
-+}
-+
-+bool_t
-+xdr_stat_chge(xdrs, objp)
-+ XDR *xdrs;
-+ stat_chge *objp;
-+{
-+
-+ register int32_t *buf;
-+
-+ if (!xdr_string(xdrs, &objp->mon_name, SM_MAXSTRLEN)) {
-+ return (FALSE);
-+ }
-+ if (!xdr_int(xdrs, &objp->state)) {
-+ return (FALSE);
-+ }
-+ return (TRUE);
-+}
-+
-+bool_t
-+xdr_sm_stat(xdrs, objp)
-+ XDR *xdrs;
-+ sm_stat *objp;
-+{
-+
-+ register int32_t *buf;
-+
-+ if (!xdr_int(xdrs, &objp->state)) {
-+ return (FALSE);
-+ }
-+ return (TRUE);
-+}
-+
-+bool_t
-+xdr_res(xdrs, objp)
-+ XDR *xdrs;
-+ res *objp;
-+{
-+
-+ register int32_t *buf;
-+
-+ if (!xdr_enum(xdrs, (enum_t *)objp)) {
-+ return (FALSE);
-+ }
-+ return (TRUE);
-+}
-+
-+bool_t
-+xdr_sm_stat_res(xdrs, objp)
-+ XDR *xdrs;
-+ sm_stat_res *objp;
-+{
-+
-+ register int32_t *buf;
-+
-+ if (!xdr_res(xdrs, &objp->res_stat)) {
-+ return (FALSE);
-+ }
-+ if (!xdr_int(xdrs, &objp->state)) {
-+ return (FALSE);
-+ }
-+ return (TRUE);
-+}
-+
-+bool_t
-+xdr_status(xdrs, objp)
-+ XDR *xdrs;
-+ status *objp;
-+{
-+
-+ register int32_t *buf;
-+
-+ int i;
-+ if (!xdr_string(xdrs, &objp->mon_name, SM_MAXSTRLEN)) {
-+ return (FALSE);
-+ }
-+ if (!xdr_int(xdrs, &objp->state)) {
-+ return (FALSE);
-+ }
-+ if (!xdr_opaque(xdrs, objp->priv, SM_PRIV_SIZE)) {
-+ return (FALSE);
-+ }
-+ return (TRUE);
-+}
-+#define SM_INTER_X
+++ /dev/null
-diff -urN nfs-utils-1.0.7/tools/getkversion/getkversion.c nfs-utils-1.0.7.new/tools/getkversion/getkversion.c
---- nfs-utils-1.0.7/tools/getkversion/getkversion.c 1999-10-19 01:21:12.000000000 +0200
-+++ nfs-utils-1.0.7.new/tools/getkversion/getkversion.c 2007-01-05 23:25:14.000000000 +0100
-@@ -12,6 +12,10 @@
- int
- main(void) /* This is for Dan Popp ;) */
- {
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,19)
-+ printf("%s\n", LINUX_VERSION_CODE);
-+#else
- printf("%s\n", UTS_RELEASE);
-+#endif
- return 0;
- }
+++ /dev/null
-#
-# Copyright (C) 2006-2008 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-# $Id$
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=nfs-utils
-PKG_VERSION:=1.1.2
-PKG_RELEASE:=3
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://downloads.sourceforge.net/nfs/
-PKG_MD5SUM:=76ee9274c2b867839427eba91b327f03
-
-PKG_BUILD_DEPENDS:=libgssapi librpcsecgss libnfsidmap libwrap
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/nfs-utils/Default
- SECTION:=net
- CATEGORY:=Network
- URL:=http://sourceforge.net/projects/nfs/
-endef
-
-define Package/nfs-utils
- $(call Package/nfs-utils/Default)
- DEPENDS:=+libwrap +libevent +libblkid
- TITLE:=updated mount utility (includes nfs4)
-endef
-
-define Package/nfs-utils/description
-Updated mount.nfs command - allows mounting nfs4 volumes
-endef
-
-CONFIGURE_ARGS += --disable-gss
-TARGET_CFLAGS += -I$(PKG_BUILD_DIR)/lib
-TARGET_LDFLAGS += -Wl,-rpath-link=$(STAGING_DIR)/usr/lib
-
-define Build/Compile
- $(call Build/Compile/Default, \
- OPT="$(TARGET_CFLAGS)" \
- INSTALLSUID="install -m 4755" \
- DESTDIR="$(PKG_INSTALL_DIR)" \
- all install \
- )
-endef
-
-define Package/nfs-utils/install
- $(INSTALL_DIR) $(1)/sbin
- $(INSTALL_BIN) $(PKG_INSTALL_DIR)/sbin/mount.nfs $(1)/sbin/
- (cd $(1)/sbin; ln -sf mount.nfs mount.nfs4; ln -sf mount.nfs umount.nfs; ln -sf mount.nfs umount.nfs4)
-endef
-
-$(eval $(call BuildPackage,nfs-utils))
+++ /dev/null
-Index: nfs-utils-1.1.2/support/nfs/svc_socket.c
-===================================================================
---- nfs-utils-1.1.2.orig/support/nfs/svc_socket.c 2008-04-13 10:38:24.000000000 +0200
-+++ nfs-utils-1.1.2/support/nfs/svc_socket.c 2008-04-13 10:38:24.000000000 +0200
-@@ -67,8 +67,10 @@
- memset (&addr, 0, sizeof (addr));
- addr.sin_family = AF_INET;
-
-- ret = getrpcbynumber_r (number, &rpcbuf, rpcdata, sizeof rpcdata,
-- &rpcp);
-+// ret = getrpcbynumber_r (number, &rpcbuf, rpcdata, sizeof rpcdata,
-+// &rpcp);
-+ rpcp = getrpcbynumber (number);
-+ ret = 0;
- if (ret == 0 && rpcp != NULL)
- {
- /* First try name. */
+++ /dev/null
-Index: nfs-utils-1.1.2/utils/mountd/cache.c
-===================================================================
---- nfs-utils-1.1.2.orig/utils/mountd/cache.c 2008-04-13 10:38:24.000000000 +0200
-+++ nfs-utils-1.1.2/utils/mountd/cache.c 2008-04-13 10:38:25.000000000 +0200
-@@ -141,17 +141,17 @@
- pw = getpwuid(uid);
- if (!pw)
- rv = -1;
-- else {
-- rv = getgrouplist(pw->pw_name, pw->pw_gid, groups, &ngroups);
-- if (rv == -1 && ngroups >= 100) {
-- groups = malloc(sizeof(gid_t)*ngroups);
-- if (!groups)
-- rv = -1;
-- else
-- rv = getgrouplist(pw->pw_name, pw->pw_gid,
-- groups, &ngroups);
-- }
-- }
-+// else {
-+// rv = getgrouplist(pw->pw_name, pw->pw_gid, groups, &ngroups);
-+// if (rv == -1 && ngroups >= 100) {
-+// groups = malloc(sizeof(gid_t)*ngroups);
-+// if (!groups)
-+// rv = -1;
-+// else
-+// rv = getgrouplist(pw->pw_name, pw->pw_gid,
-+// groups, &ngroups);
-+// }
-+// }
- qword_printint(f, uid);
- qword_printint(f, time(0)+30*60);
- if (rv >= 0) {
projects / openwrt / svn-archive / archive.git / commitdiff