Author: baggins Date: Sat Oct 2 23:08:26 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- revert accidental removal
---- Files affected:
packages/nfs-utils:
nfs-utils-heimdal_functions.patch (1.7 -> 1.8) , nfs-utils-install.patch
(1.4 -> 1.5) , nfs-utils-kerberos-ac.patch (1.3 -> 1.4) ,
nfs-utils-no_libgssapi.patch (1.6 -> 1.7) , nfs-utils-pkgconfig_ac.patch (1.4
-> 1.5) , nfs-utils-statdpath.patch (1.6 -> 1.7) , nfs-utils-subsys.patch (1.2
-> 1.3) , nfs-utils-union-mount.patch (1.2 -> 1.3) , nfs-utils.spec (1.192 ->
1.193) , nfs.init (1.52 -> 1.53) , nfs.sysconfig (1.7 -> 1.8) , nfsfs.init
(1.43 -> 1.44) , nfsfs.sysconfig (1.7 -> 1.8) , nfslock.init (1.23 -> 1.24) ,
nfslock.sysconfig (1.4 -> 1.5) , rpcgssd.init (1.11 -> 1.12) , rpcidmapd.init
(1.18 -> 1.19) , rpcsvcgssd.init (1.15 -> 1.16)
---- Diffs:
================================================================
Index: packages/nfs-utils/nfs-utils-heimdal_functions.patch
diff -u /dev/null packages/nfs-utils/nfs-utils-heimdal_functions.patch:1.8
--- /dev/null Sun Oct 3 01:08:26 2010
+++ packages/nfs-utils/nfs-utils-heimdal_functions.patch Sun Oct 3
01:08:20 2010
@@ -0,0 +1,69 @@
+--- utils/gssd/krb5_util.c 2008-10-17 14:20:09.000000000 +0000
++++ utils/gssd/krb5_util.c 2008-11-22 13:52:42.000000000 +0000
+@@ -115,9 +115,7 @@
+ #include <errno.h>
+ #include <time.h>
+ #include <gssapi/gssapi.h>
+-#ifdef USE_PRIVATE_KRB5_FUNCTIONS
+ #include <gssapi/gssapi_krb5.h>
+-#endif
+ #include <krb5.h>
+ #include <rpc/auth_gss.h>
+
+@@ -927,9 +927,37 @@
+ {
+ krb5_error_code ret;
+ krb5_creds creds;
+- krb5_cc_cursor cur;
+ int found = 0;
+
++#ifdef HAVE_HEIMDAL
++ krb5_creds pattern;
++ krb5_const_realm client_realm;
++
++ krb5_cc_clear_mcred(&pattern);
++
++ client_realm = krb5_principal_get_realm (context, principal);
++
++ ret = krb5_make_principal (context, &pattern.server,
++ client_realm, KRB5_TGS_NAME, client_realm,
++ NULL);
++ if (ret)
++ krb5_err (context, 1, ret, "krb5_make_principal");
++ pattern.client = principal;
++
++ ret = krb5_cc_retrieve_cred (context, ccache, 0, &pattern, &creds);
++ krb5_free_principal (context, pattern.server);
++ if (ret) {
++ if (ret == KRB5_CC_END)
++ return 1;
++ krb5_err (context, 1, ret, "krb5_cc_retrieve_cred");
++ }
++
++ found = creds.times.endtime > time(NULL);
++
++ krb5_free_cred_contents (context, &creds);
++#else
++ krb5_cc_cursor cur;
++
+ ret = krb5_cc_start_seq_get(context, ccache, &cur);
+ if (ret)
+ return 0;
+@@ -949,6 +977,7 @@
+ krb5_free_cred_contents(context, &creds);
+ }
+ krb5_cc_end_seq_get(context, ccache, &cur);
++#endif
+
+ return found;
+ }
+@@ -995,6 +1024,9 @@
+ }
+ krb5_free_principal(context, principal);
+ err_princ:
++#ifdef HAVE_HEIMDAL
++#define KRB5_TC_OPENCLOSE 0x00000001
++#endif
+ krb5_cc_set_flags(context, ccache, KRB5_TC_OPENCLOSE);
+ krb5_cc_close(context, ccache);
+ err_cache:
================================================================
Index: packages/nfs-utils/nfs-utils-install.patch
diff -u /dev/null packages/nfs-utils/nfs-utils-install.patch:1.5
--- /dev/null Sun Oct 3 01:08:26 2010
+++ packages/nfs-utils/nfs-utils-install.patch Sun Oct 3 01:08:20 2010
@@ -0,0 +1,11 @@
+--- nfs-utils-1.0.8/Makefile.am~ 2006-03-28 02:53:30.000000000 +0200
++++ nfs-utils-1.0.8/Makefile.am 2006-05-08 13:24:32.000000000 +0200
+@@ -46,8 +46,6 @@
+ touch $(DESTDIR)$(statedir)/rmtab; chmod 644 $(DESTDIR)$(statedir)/rmtab
+ mkdir -p $(DESTDIR)$(statedir)/sm $(DESTDIR)$(statedir)/sm.bak
+ touch $(DESTDIR)$(statedir)/state
+- chmod go-rwx $(DESTDIR)$(statedir)/sm $(DESTDIR)$(statedir)/sm.bak
$(DESTDIR)$(statedir)/state
+- -chown $(statduser) $(DESTDIR)$(statedir)/sm
$(DESTDIR)$(statedir)/sm.bak $(DESTDIR)$(statedir)/state
+
+ uninstall-hook:
+ rm $(DESTDIR)$(statedir)/xtab
================================================================
Index: packages/nfs-utils/nfs-utils-kerberos-ac.patch
diff -u /dev/null packages/nfs-utils/nfs-utils-kerberos-ac.patch:1.4
--- /dev/null Sun Oct 3 01:08:26 2010
+++ packages/nfs-utils/nfs-utils-kerberos-ac.patch Sun Oct 3 01:08:20 2010
@@ -0,0 +1,138 @@
+diff -NaurwB nfs-utils-1.1.2.orig/aclocal/kerberos5.m4
nfs-utils-1.1.2/aclocal/kerberos5.m4
+--- nfs-utils-1.1.2.orig/aclocal/kerberos5.m4 2008-03-14 16:46:29.000000000
+0100
++++ nfs-utils-1.1.2/aclocal/kerberos5.m4 2008-06-12 17:13:51.000000000
+0200
+@@ -1,112 +1,48 @@
+-dnl Checks for Kerberos
+-dnl NOTE: while we intend to do generic gss-api, currently we
+-dnl have a requirement to get an initial Kerberos machine
+-dnl credential. Thus, the requirement for Kerberos.
+-dnl The Kerberos gssapi library will be dynamically loaded?
+ AC_DEFUN([AC_KERBEROS_V5],[
++ K5CONFIG="krb5-config"
+ AC_MSG_CHECKING(for Kerberos v5)
+- AC_ARG_WITH(krb5,
+- [AC_HELP_STRING([--with-krb5=DIR], [use Kerberos v5 installation in DIR])],
++ AC_ARG_WITH(krb5-config,
++ [AC_HELP_STRING([--with-krb5-config=PATH], [Full Path to krb5-config.])],
+ [ case "$withval" in
+ yes|no)
+- krb5_with=""
++ K5CONFIG="krb5-config"
+ ;;
+ *)
+- krb5_with="$withval"
++ K5CONFIG="$withval"
+ ;;
+ esac ]
+ )
+
+- for dir in $krb5_with /usr /usr/kerberos /usr/local /usr/local/krb5 \
+- /usr/krb5 /usr/heimdal /usr/local/heimdal /usr/athena ; do
+- dnl This ugly hack brought on by the split installation of
+- dnl MIT Kerberos on Fedora Core 1
+- K5CONFIG=""
+- if test -f $dir/bin/krb5-config; then
+- K5CONFIG=$dir/bin/krb5-config
+- elif test -f "/usr/kerberos/bin/krb5-config"; then
+- K5CONFIG="/usr/kerberos/bin/krb5-config"
+- elif test -f "/usr/lib/mit/bin/krb5-config"; then
+- K5CONFIG="/usr/lib/mit/bin/krb5-config"
+- fi
+ if test "$K5CONFIG" != ""; then
+ KRBCFLAGS=`$K5CONFIG --cflags`
+ KRBLIBS=`$K5CONFIG --libs gssapi`
+- K5VERS=`$K5CONFIG --version | head -n 1 | awk '{split($(4),v,"."); if
(v@<:@"3"@:>@ == "") v@<:@"3"@:>@ = "0"; print
v@<:@"1"@:>@v@<:@"2"@:>@v@<:@"3"@:>@ }'`
+- AC_DEFINE_UNQUOTED(KRB5_VERSION, $K5VERS, [Define this as the Kerberos
version number])
+- if test -f $dir/include/gssapi/gssapi_krb5.h -a \
+- \( -f $dir/lib/libgssapi_krb5.a -o \
+- -f $dir/lib64/libgssapi_krb5.a -o \
+- -f $dir/lib64/libgssapi_krb5.so -o \
+- -f $dir/lib/libgssapi_krb5.so \) ; then
++ if $K5CONFIG --version | grep -q -e heimdal; then
++ K5VERS=`$K5CONFIG --version | head -n 1 | cut -f2 -d ' ' | tr -d '.'`
++ AC_DEFINE(HAVE_HEIMDAL, 1, [Define this if you have Heimdal Kerberos
libraries])
++ gssapi_lib=gssapi
++ KRBIMPL="heimdal"
++ elif $K5CONFIG --vendor | grep -q -e Massachusetts; then
++ K5VERS=`$K5CONFIG --version | head -n 1 | cut -f4 -d ' ' | tr -d '.'`
+ AC_DEFINE(HAVE_KRB5, 1, [Define this if you have MIT Kerberos
libraries])
+- KRBDIR="$dir"
+- dnl If we are using MIT K5 1.3.1 and before, we *MUST* use the
+- dnl private function (gss_krb5_ccache_name) to get correct
+- dnl behavior of changing the ccache used by gssapi.
+- dnl Starting in 1.3.2, we *DO NOT* want to use
+- dnl gss_krb5_ccache_name, instead we want to set KRB5CCNAME
+- dnl to get gssapi to use a different ccache
+ if test $K5VERS -le 131; then
+ AC_DEFINE(USE_GSS_KRB5_CCACHE_NAME, 1, [Define this if the private
function, gss_krb5_cache_name, must be used to tell the Kerberos library which
credentials cache to use. Otherwise, this is done by setting the KRB5CCNAME
environment variable])
+ fi
+ gssapi_lib=gssapi_krb5
+- break
+- dnl The following ugly hack brought on by the split installation
+- dnl of Heimdal Kerberos on SuSe
+- elif test \( -f $dir/include/heim_err.h -o\
+- -f $dir/include/heimdal/heim_err.h \) -a \
+- -f $dir/lib/libroken.a; then
+- AC_DEFINE(HAVE_HEIMDAL, 1, [Define this if you have Heimdal Kerberos
libraries])
+- KRBDIR="$dir"
+- gssapi_lib=gssapi
+- break
+- fi
+- fi
+- done
+- dnl We didn't find a usable Kerberos environment
+- if test "x$KRBDIR" = "x"; then
+- if test "x$krb5_with" = "x"; then
+- AC_MSG_ERROR(Kerberos v5 with GSS support not found: consider
--disable-gss or --with-krb5=)
++ KRBIMPL="mit-krb5"
+ else
+- AC_MSG_ERROR(Kerberos v5 with GSS support not found at $krb5_with)
+- fi
++ AC_MSG_ERROR(Unknown Kerberos 5 Implementation. Is neither heimdal or
mit-krb5.)
++ KRBIMPL="unknown"
+ fi
+- AC_MSG_RESULT($KRBDIR)
+-
+- dnl Check if -rpath=$(KRBDIR)/lib is needed
+- echo "The current KRBDIR is $KRBDIR"
+- if test "$KRBDIR/lib" = "/lib" -o "$KRBDIR/lib" = "/usr/lib" \
+- -o "$KRBDIR/lib" = "//lib" -o "$KRBDIR/lib" = "/usr//lib" ; then
+- KRBLDFLAGS="";
+- elif /sbin/ldconfig -p | grep > /dev/null "=> $KRBDIR/lib/"; then
+- KRBLDFLAGS="";
+- else
+- KRBLDFLAGS="-Wl,-rpath=$KRBDIR/lib"
++ AC_DEFINE_UNQUOTED(KRB5_VERSION, $K5VERS, [Define this as the Kerberos
version number])
+ fi
++ AC_MSG_RESULT($KRBIMPL)
+
+- dnl Now check for functions within gssapi library
+- AC_CHECK_LIB($gssapi_lib, gss_krb5_export_lucid_sec_context,
+- AC_DEFINE(HAVE_LUCID_CONTEXT_SUPPORT, 1, [Define this if the Kerberos GSS
library supports gss_krb5_export_lucid_sec_context]), ,$KRBLIBS)
+- AC_CHECK_LIB($gssapi_lib, gss_krb5_set_allowable_enctypes,
+- AC_DEFINE(HAVE_SET_ALLOWABLE_ENCTYPES, 1, [Define this if the Kerberos
GSS library supports gss_krb5_set_allowable_enctypes]), ,$KRBLIBS)
+- AC_CHECK_LIB($gssapi_lib, gss_krb5_ccache_name,
+- AC_DEFINE(HAVE_GSS_KRB5_CCACHE_NAME, 1, [Define this if the Kerberos GSS
library supports gss_krb5_ccache_name]), ,$KRBLIBS)
+-
+- dnl Check for newer error message facility
+- AC_CHECK_LIB($gssapi_lib, krb5_get_error_message,
+- AC_DEFINE(HAVE_KRB5_GET_ERROR_MESSAGE, 1, [Define this if the function
krb5_get_error_message is available]), ,$KRBLIBS)
++ AC_CHECK_LIB($gssapi_lib, gss_krb5_export_lucid_sec_context,
AC_DEFINE(HAVE_LUCID_CONTEXT_SUPPORT, 1, [Define this if the Kerberos GSS
library supports gss_krb5_export_lucid_sec_context]), ,$KRBLIBS)
++ AC_CHECK_LIB($gssapi_lib, gss_krb5_set_allowable_enctypes,
AC_DEFINE(HAVE_SET_ALLOWABLE_ENCTYPES, 1, [Define this if the Kerberos GSS
library supports gss_krb5_set_allowable_enctypes]), ,$KRBLIBS)
++ AC_CHECK_LIB($gssapi_lib, gss_krb5_ccache_name,
AC_DEFINE(HAVE_GSS_KRB5_CCACHE_NAME, 1, [Define this if the Kerberos GSS
library supports gss_krb5_ccache_name]), ,$KRBLIBS)
++ AC_CHECK_LIB($gssapi_lib, krb5_get_error_message,
AC_DEFINE(HAVE_KRB5_GET_ERROR_MESSAGE, 1, [Define this if the function
krb5_get_error_message is available]), ,$KRBLIBS)
++ AC_CHECK_LIB($gssapi_lib, krb5_get_init_creds_opt_set_addressless,
AC_DEFINE(HAVE_KRB5_GET_INIT_CREDS_OPT_SET_ADDRESSLESS, 1, [Define this if the
function krb5_get_init_creds_opt_set_addressless is available]), ,$KRBLIBS)
+
+- dnl Check for function to specify addressless tickets
+- AC_CHECK_LIB($gssapi_lib, krb5_get_init_creds_opt_set_addressless,
+- AC_DEFINE(HAVE_KRB5_GET_INIT_CREDS_OPT_SET_ADDRESSLESS, 1, [Define this
if the function krb5_get_init_creds_opt_set_addressless is available]),
,$KRBLIBS)
+-
+- dnl If they specified a directory and it didn't work, give them a warning
+- if test "x$krb5_with" != "x" -a "$krb5_with" != "$KRBDIR"; then
+- AC_MSG_WARN(Using $KRBDIR instead of requested value of $krb5_with for
Kerberos!)
+- fi
+-
+- AC_SUBST([KRBDIR])
+ AC_SUBST([KRBLIBS])
+ AC_SUBST([KRBCFLAGS])
+ AC_SUBST([KRBLDFLAGS])
================================================================
Index: packages/nfs-utils/nfs-utils-no_libgssapi.patch
diff -u /dev/null packages/nfs-utils/nfs-utils-no_libgssapi.patch:1.7
--- /dev/null Sun Oct 3 01:08:26 2010
+++ packages/nfs-utils/nfs-utils-no_libgssapi.patch Sun Oct 3 01:08:20 2010
@@ -0,0 +1,64 @@
+Index: nfs-utils-1.1.0/utils/gssd/context_lucid.c
+===================================================================
+--- nfs-utils-1.1.0.orig/utils/gssd/context_lucid.c
++++ nfs-utils-1.1.0/utils/gssd/context_lucid.c
+@@ -48,8 +48,10 @@
+ #include "context.h"
+
+ #ifndef OM_uint64
++#ifndef GSSAPI_GSSAPI_H_
+ typedef uint64_t OM_uint64;
+ #endif
++#endif
+
+ static int
+ write_lucid_keyblock(char **p, char *end, gss_krb5_lucid_key_t *key)
+@@ -171,10 +173,10 @@ serialize_krb5_ctx(gss_ctx_id_t ctx, gss
+ int retcode = 0;
+
+ printerr(2, "DEBUG: %s: lucid version!\n", __FUNCTION__);
+- maj_stat = gss_export_lucid_sec_context(&min_stat, &ctx,
++ maj_stat = gss_krb5_export_lucid_sec_context(&min_stat, &ctx,
+ 1, &return_ctx);
+ if (maj_stat != GSS_S_COMPLETE) {
+- pgsserr("gss_export_lucid_sec_context",
++ pgsserr("gss_krb5_export_lucid_sec_context",
+ maj_stat, min_stat, &krb5oid);
+ goto out_err;
+ }
+@@ -198,9 +200,9 @@ serialize_krb5_ctx(gss_ctx_id_t ctx, gss
+ else
+ retcode = prepare_krb5_rfc_cfx_buffer(lctx, buf);
+
+- maj_stat = gss_free_lucid_sec_context(&min_stat, ctx, return_ctx);
++ maj_stat = gss_krb5_free_lucid_sec_context(&min_stat, return_ctx);
+ if (maj_stat != GSS_S_COMPLETE) {
+- pgsserr("gss_export_lucid_sec_context",
++ pgsserr("gss_krb5_free_lucid_sec_context",
+ maj_stat, min_stat, &krb5oid);
+ printerr(0, "WARN: failed to free lucid sec context\n");
+ }
+Index: nfs-utils-1.1.0/utils/gssd/krb5_util.c
+===================================================================
+--- nfs-utils-1.1.0.orig/utils/gssd/krb5_util.c
++++ nfs-utils-1.1.0/utils/gssd/krb5_util.c
+@@ -1317,13 +1317,13 @@ limit_krb5_enctypes(struct rpc_gss_sec *
+ * list of supported enctypes, use local default here.
+ */
+ if (krb5_enctypes == NULL)
+- maj_stat = gss_set_allowable_enctypes(&min_stat, credh,
+- &krb5oid, num_enctypes, enctypes);
++ maj_stat = gss_krb5_set_allowable_enctypes(&min_stat, credh,
++ num_enctypes, enctypes);
+ else
+- maj_stat = gss_set_allowable_enctypes(&min_stat, credh,
+- &krb5oid, num_krb5_enctypes,
krb5_enctypes);
++ maj_stat = gss_krb5_set_allowable_enctypes(&min_stat, credh,
++ num_krb5_enctypes, krb5_enctypes);
+
+ if (maj_stat != GSS_S_COMPLETE) {
+- pgsserr("gss_set_allowable_enctypes",
++ pgsserr("gss_krb5_set_allowable_enctypes",
+ maj_stat, min_stat, &krb5oid);
+ gss_release_cred(&min_stat, &credh);
+ return -1;
================================================================
Index: packages/nfs-utils/nfs-utils-pkgconfig_ac.patch
diff -u /dev/null packages/nfs-utils/nfs-utils-pkgconfig_ac.patch:1.5
--- /dev/null Sun Oct 3 01:08:26 2010
+++ packages/nfs-utils/nfs-utils-pkgconfig_ac.patch Sun Oct 3 01:08:20 2010
@@ -0,0 +1,12 @@
+diff -ur nfs-utils-1.2.0/aclocal/rpcsec_vers.m4
nfs-utils-1.2.0-pkg/aclocal/rpcsec_vers.m4
+--- nfs-utils-1.2.0/aclocal/rpcsec_vers.m4 2009-06-02 16:43:05.000000000
+0200
++++ nfs-utils-1.2.0-pkg/aclocal/rpcsec_vers.m4 2009-06-30 15:48:36.603210573
+0200
+@@ -1,7 +1,7 @@
+ dnl Checks librpcsec version
+ AC_DEFUN([AC_RPCSEC_VERSION], [
+
+- PKG_CHECK_MODULES([GSSGLUE], [libgssglue >= 0.1])
++ PKG_CHECK_MODULES([GSSGLUE], [libgssglue >= 0.1], ,
[PKG_CHECK_MODULES([GSSGLUE], [heimdal-gssapi])])
+
+ dnl TI-RPC replaces librpcsecgss
+ if test "$enable_tirpc" = no; then
================================================================
Index: packages/nfs-utils/nfs-utils-statdpath.patch
diff -u /dev/null packages/nfs-utils/nfs-utils-statdpath.patch:1.7
--- /dev/null Sun Oct 3 01:08:26 2010
+++ packages/nfs-utils/nfs-utils-statdpath.patch Sun Oct 3 01:08:20 2010
@@ -0,0 +1,82 @@
+--- nfs-utils-1.1.4/Makefile.am~ 2009-03-05 12:29:46.000000000 +0100
++++ nfs-utils-1.1.4/Makefile.am 2009-03-05 12:44:46.000000000 +0100
+@@ -54,8 +54,8 @@
+ touch $(DESTDIR)$(statedir)/xtab; chmod 644 $(DESTDIR)$(statedir)/xtab
+ touch $(DESTDIR)$(statedir)/etab; chmod 644 $(DESTDIR)$(statedir)/etab
+ touch $(DESTDIR)$(statedir)/rmtab; chmod 644 $(DESTDIR)$(statedir)/rmtab
+- mkdir -p $(DESTDIR)$(statedir)/sm $(DESTDIR)$(statedir)/sm.bak
+- touch $(DESTDIR)$(statedir)/state
++ mkdir -p $(DESTDIR)$(statedir)/statd/sm
$(DESTDIR)$(statedir)/statd/sm.bak
++ touch $(DESTDIR)$(statedir)/statd/state
+
+ uninstall-hook:
+ rm $(DESTDIR)$(statedir)/xtab
+--- nfs-utils-1.2.2/support/nsm/file.c~ 2010-02-18 13:35:00.000000000
+0100
++++ nfs-utils-1.2.2/support/nsm/file.c 2010-02-24 17:27:51.635249268 +0100
+@@ -95,8 +95,8 @@
+ /*
+ * Some distributions place statd's files in a subdirectory
+ */
+-#define NSM_PATH_EXTENSION
+-/* #define NSM_PATH_EXTENSION "/statd" */
++/* #define NSM_PATH_EXTENSION */
++#define NSM_PATH_EXTENSION "/statd"
+
+ #define NSM_DEFAULT_STATEDIR NFS_STATEDIR NSM_PATH_EXTENSION
+
+--- nfs-utils-1.2.2/utils/statd/statd.man~ 2010-02-18 13:35:00.000000000
+0100
++++ nfs-utils-1.2.2/utils/statd/statd.man 2010-02-24 17:30:05.097124679
+0100
+@@ -232,7 +232,7 @@
+ If this option is not specified,
+ .B rpc.statd
+ uses
+-.I /var/lib/nfs
++.I /var/lib/nfs/statd
+ by default.
+ .IP
+ After starting,
+@@ -365,13 +365,13 @@
+ will operate.
+ .SH FILES
+ .TP 2.5i
+-.I /var/lib/nfs/sm
++.I /var/lib/nfs/statd/sm
+ directory containing monitor list
+ .TP 2.5i
+-.I /var/lib/nfs/sm.bak
++.I /var/lib/nfs/statd/sm.bak
+ directory containing notify list
+ .TP 2.5i
+-.I /var/lib/nfs/state
++.I /var/lib/nfs/statd/state
+ NSM state number for this host
+ .TP 2.5i
+ .I /var/run/run.statd.pid
+--- nfs-utils-1.2.2/utils/statd/sm-notify.man~ 2010-02-18 13:35:00.000000000
+0100
++++ nfs-utils-1.2.2/utils/statd/sm-notify.man 2010-02-24 17:30:27.917124808
+0100
+@@ -186,7 +186,7 @@
+ If this option is not specified,
+ .B sm-notify
+ uses
+-.I /var/lib/nfs
++.I /var/lib/nfs/statd
+ by default.
+ .IP
+ After starting,
+@@ -287,13 +287,13 @@
+ command supports sending notification only via datagram transport protocols.
+ .SH FILES
+ .TP 2.5i
+-.I /var/lib/nfs/sm
++.I /var/lib/nfs/statd/sm
+ directory containing monitor list
+ .TP 2.5i
+-.I /var/lib/nfs/sm.bak
++.I /var/lib/nfs/statd/sm.bak
+ directory containing notify list
+ .TP 2.5i
+-.I /var/lib/nfs/state
++.I /var/lib/nfs/statd/state
+ NSM state number for this host
+ .TP 2.5i
+ .I /proc/sys/fs/nfs/nsm_local_state
================================================================
Index: packages/nfs-utils/nfs-utils-subsys.patch
diff -u /dev/null packages/nfs-utils/nfs-utils-subsys.patch:1.3
--- /dev/null Sun Oct 3 01:08:26 2010
+++ packages/nfs-utils/nfs-utils-subsys.patch Sun Oct 3 01:08:20 2010
@@ -0,0 +1,20 @@
+--- nfs-utils-1.0.12/utils/mount/nfs4mount.c~ 2007-03-31 22:46:53.438974675
+0200
++++ nfs-utils-1.0.12/utils/mount/nfs4mount.c 2007-03-31 22:52:34.162391396
+0200
+@@ -52,7 +52,7 @@
+ extern int verbose;
+ extern int sloppy;
+
+-char *IDMAPLCK = DEFAULT_DIR "/rpcidmapd";
++char *IDMAPLCK = DEFAULT_DIR "/idmapd";
+ #define idmapd_check() do { \
+ if (access(IDMAPLCK, F_OK)) { \
+ printf(_("Warning: rpc.idmapd appears not to be running.\n" \
+@@ -60,7 +60,7 @@
+ } \
+ } while(0);
+
+-char *GSSDLCK = DEFAULT_DIR "/rpcgssd";
++char *GSSDLCK = DEFAULT_DIR "/gssd";
+ #define gssd_check() do { \
+ if (access(GSSDLCK, F_OK)) { \
+ printf(_("Warning: rpc.gssd appears not to be
running.\n")); \
================================================================
Index: packages/nfs-utils/nfs-utils-union-mount.patch
diff -u /dev/null packages/nfs-utils/nfs-utils-union-mount.patch:1.3
--- /dev/null Sun Oct 3 01:08:26 2010
+++ packages/nfs-utils/nfs-utils-union-mount.patch Sun Oct 3 01:08:20 2010
@@ -0,0 +1,22 @@
+--- nfs-utils-1.1.5/utils/mount/mount.c~ 2009-03-05 12:42:56.000000000
+0100
++++ nfs-utils-1.1.5/utils/mount/mount.c 2009-05-20 16:44:08.581980119
+0200
+@@ -94,6 +94,7 @@
+ { "sync", 0, 0, MS_SYNCHRONOUS}, /* synchronous I/O */
+ { "async", 0, 1, MS_SYNCHRONOUS}, /* asynchronous I/O */
+ { "dirsync", 0, 0, MS_DIRSYNC}, /* synchronous directory
modifications */
++ { "union", 0, 0, MS_UNION }, /* Union mount */
+ { "remount", 0, 0, MS_REMOUNT}, /* Alter flags of mounted FS */
+ { "bind", 0, 0, MS_BIND }, /* Remount part of tree elsewhere */
+ { "rbind", 0, 0, MS_BIND|MS_REC }, /* Idem, plus mounted subtrees */
+--- nfs-utils-1.1.5/utils/mount/mount_constants.h~ 2009-03-05
12:42:56.000000000 +0100
++++ nfs-utils-1.1.5/utils/mount/mount_constants.h 2009-05-20
16:42:50.292974566 +0200
+@@ -21,6 +21,9 @@
+ if we have a stack or plain mount - mount atop of it, forming a stack. */
+ #define MS_OVER 0x200 /* 512 */
+ #endif
++#ifndef MS_UNION
++#define MS_UNION 0x100 /* 256: Mount on top of a union */
++#endif
+ #ifndef MS_NOATIME
+ #define MS_NOATIME 0x400 /* 1024: Do not update access times. */
+ #endif
================================================================
Index: packages/nfs-utils/nfs-utils.spec
diff -u /dev/null packages/nfs-utils/nfs-utils.spec:1.193
--- /dev/null Sun Oct 3 01:08:26 2010
+++ packages/nfs-utils/nfs-utils.spec Sun Oct 3 01:08:20 2010
@@ -0,0 +1,589 @@
+# $Revision$, $Date$
+# TODO
+# - should unmount /proc/fs/nfsd and /var/lib/nfs/rpc_pipefs at package
+# uninstall (or in service nfs stop)
+#
+# Conditional build:
+%bcond_with krb5 # build with MIT Kerberos (+libgssglue) instead
of Heimdal
+%bcond_without tirpc # use librpcsecgss instead of libtirpc
+#
+Summary: Kernel NFS server
+Summary(pl.UTF-8): Działający na poziomie jądra serwer NFS
+Summary(pt_BR.UTF-8): Os utilitários para o cliente e servidor NFS do Linux
+Summary(ru.UTF-8): Утилиты для NFS и демоны поддержки для NFS-сервера ядра
+Summary(uk.UTF-8): Утиліти для NFS та демони підтримки для NFS-сервера ядра
+Name: nfs-utils
+Version: 1.2.3
+Release: 2
+License: GPL v2
+Group: Networking/Daemons
+Source0:
http://www.kernel.org/pub/linux/utils/nfs/%{name}-%{version}.tar.bz2
+# Source0-md5: 1131dc5f27c4f3905a6e7ee0d594fd4d
+#Source1: ftp://ftp.linuxnfs.sourceforge.org/pub/nfs/nfs.doc.tar.gz
+Source1: nfs.doc.tar.gz
+# Source1-md5: ae7db9c61c5ad04f83bb99e5caed73da
+Source2: nfs.init
+Source3: nfslock.init
+Source4: nfsfs.init
+Source5: rpcidmapd.init
+Source6: rpcgssd.init
+Source7: rpcsvcgssd.init
+Source8: nfs.sysconfig
+Source9: nfslock.sysconfig
+Source10: nfsfs.sysconfig
+Patch0: %{name}-install.patch
+Patch1: %{name}-statdpath.patch
+Patch2: %{name}-subsys.patch
+Patch3: %{name}-union-mount.patch
+Patch4: %{name}-kerberos-ac.patch
+Patch5: %{name}-no_libgssapi.patch
+Patch6: %{name}-pkgconfig_ac.patch
+Patch7: %{name}-heimdal_functions.patch
+URL: http://nfs.sourceforge.net/
+BuildRequires: autoconf >= 2.59
+BuildRequires: automake
+BuildRequires: cpp
+BuildRequires: libblkid-devel
+BuildRequires: libcap-devel
+BuildRequires: libevent-devel >= 1.2
+BuildRequires: libnfsidmap-devel >= 0.21-3
+BuildRequires: libtool
+BuildRequires: libwrap-devel
+BuildRequires: pkgconfig
+%if %{with tirpc}
+BuildRequires: libtirpc-devel >= 1:0.1.10-4
+%else
+BuildRequires: librpcsecgss-devel >= 0.16
+%endif
+%if %{with krb5}
+BuildRequires: krb5-devel >= 1.6
+BuildRequires: libgssglue-devel >= 0.1
+%else
+BuildRequires: heimdal-devel >= 1.0
+%endif
+# lucid context fields mismatch with current version of spkm3.h
+BuildConflicts: gss_mech_spkm3-devel
+Requires(post): fileutils
+Requires(post): sed >= 4.0
+Requires(post,preun): /sbin/chkconfig
+Requires: %{name}-common = %{version}-%{release}
+Requires: rc-scripts >= 0.4.1.5
+Requires: rpcbind >= 0.1.7
+Requires: setup >= 2.4.6-7
+Provides: nfsdaemon
+Obsoletes: knfsd
+Obsoletes: nfs-server
+Obsoletes: nfsdaemon
+Conflicts: kernel < 2.2.5
+Conflicts: krb5-common < 1.7
+ExcludeArch: armv4l
+BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+
+%description
+This is the *new* kernel NFS server and related tools. It provides a
+much higher level of performance than the traditional Linux user-land
+NFS server.
+
+%description -l pl.UTF-8
+To jest *nowy* działający na poziomie jądra serwer NFS oraz związane z
+nim narzędzia. Serwer ten dostarcza znacznie większą wydajność niż
+tradycyjny, działający na poziomie użytkownika serwer NFS.
+
+%description -l pt_BR.UTF-8
+O pacote nfs-utils provê os utilitários para o cliente e servidor NFS
+do Linux.
+
+%description -l ru.UTF-8
+Пакет nfs-utils предоставляет демона для NFS-сервера, включенного в
+ядро, и сопутствующие утилиты, которые обеспечивают намного большую
+производительность, чем традиционные Linux NFS-сервера, используемые
+большинством пользователей.
+
+%description -l uk.UTF-8
+Пакет nfs-utils надає демона для NFS-сервера, вбудованого в ядро, та
+супутні утиліти, які забезпечують набагато більшу продуктивність, ніж
+традиційні Linux NFS-сервери, які використовує більшість користувачів.
+
+%package clients
+Summary: Clients for connecting to a remote NFS server
+Summary(pl.UTF-8): Klienci do łączenia się ze zdalnym serwerem NFS
+Group: Networking
+Requires(post,preun): /sbin/chkconfig
+Requires: %{name}-common = %{version}-%{release}
+Requires: psmisc
+Requires: rc-scripts
+Provides: nfs-server-clients
+Provides: nfsclient
+Obsoletes: knfsd-clients
+Obsoletes: nfs-server-clients
+Obsoletes: nfsclient
+Conflicts: krb5-common < 1.7
+
+%description clients
+The nfs-server-clients package contains the showmount program.
+Showmount queries the mount daemon on a remote host for information
+about the NFS (Network File System) server on the remote host. For
<<Diff was trimmed, longer than 597 lines>>
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/nfs-utils/nfs-utils-heimdal_functions.patch?r1=1.7&r2=1.8&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/nfs-utils/nfs-utils-install.patch?r1=1.4&r2=1.5&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/nfs-utils/nfs-utils-kerberos-ac.patch?r1=1.3&r2=1.4&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/nfs-utils/nfs-utils-no_libgssapi.patch?r1=1.6&r2=1.7&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/nfs-utils/nfs-utils-pkgconfig_ac.patch?r1=1.4&r2=1.5&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/nfs-utils/nfs-utils-statdpath.patch?r1=1.6&r2=1.7&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/nfs-utils/nfs-utils-subsys.patch?r1=1.2&r2=1.3&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/nfs-utils/nfs-utils-union-mount.patch?r1=1.2&r2=1.3&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/nfs-utils/nfs-utils.spec?r1=1.192&r2=1.193&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/nfs-utils/nfs.init?r1=1.52&r2=1.53&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/nfs-utils/nfs.sysconfig?r1=1.7&r2=1.8&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/nfs-utils/nfsfs.init?r1=1.43&r2=1.44&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/nfs-utils/nfsfs.sysconfig?r1=1.7&r2=1.8&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/nfs-utils/nfslock.init?r1=1.23&r2=1.24&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/nfs-utils/nfslock.sysconfig?r1=1.4&r2=1.5&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/nfs-utils/rpcgssd.init?r1=1.11&r2=1.12&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/nfs-utils/rpcidmapd.init?r1=1.18&r2=1.19&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/nfs-utils/rpcsvcgssd.init?r1=1.15&r2=1.16&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
