[packages/nfs-utils] - up to 1.2.8
baggins
baggins at pld-linux.org
Sun Aug 4 20:04:28 CEST 2013
commit 98900fc51741c84db7c8d11cbd0f5d95f1cd6920
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Sun Aug 4 20:04:07 2013 +0200
- up to 1.2.8
nfs-utils-heimdal.patch | 106 ------------------------------------------------
nfs-utils.spec | 10 ++---
2 files changed, 5 insertions(+), 111 deletions(-)
---
diff --git a/nfs-utils.spec b/nfs-utils.spec
index 1548894..8f7d756 100644
--- a/nfs-utils.spec
+++ b/nfs-utils.spec
@@ -1,6 +1,6 @@
#
# Conditional build:
-%bcond_with krb5 # build with MIT Kerberos (+libgssglue) instead of Heimdal
+%bcond_with krb5 # build with MIT Kerberos instead of Heimdal
%bcond_without tirpc # use librpcsecgss instead of libtirpc
#
Summary: Kernel NFS server
@@ -9,13 +9,13 @@ 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.7
+Version: 1.2.8
Release: 1
License: GPL v2
Group: Networking/Daemons
#Source0: http://www.kernel.org/pub/linux/utils/nfs/%{name}-%{version}.tar.bz2
Source0: http://downloads.sourceforge.net/nfs/%{name}-%{version}.tar.bz2
-# Source0-md5: 3b5ca797197765dc0c3a4122720c7716
+# Source0-md5: 6e7d97de51e428a0b8698c16ca23db77
#Source1: ftp://ftp.linuxnfs.sourceforge.org/pub/nfs/nfs.doc.tar.gz
Source1: nfs.doc.tar.gz
# Source1-md5: ae7db9c61c5ad04f83bb99e5caed73da
@@ -70,7 +70,6 @@ BuildRequires: librpcsecgss-devel >= 0.16
%endif
%if %{with krb5}
BuildRequires: krb5-devel >= 1.6
-BuildRequires: libgssglue-devel >= 0.3
%else
BuildRequires: heimdal-devel >= 1.0
%endif
@@ -214,6 +213,7 @@ Wspólne programy do obsługi NFS.
--with-statduser=rpcstatd \
--with-start-statd=/sbin/start-statd \
--with-tcp-wrappers \
+ --without-gssglue \
--with-krb5
%{__make} all
@@ -409,7 +409,7 @@ fi
%files
%defattr(644,root,root,755)
-%doc ChangeLog README html
+%doc README html
%attr(755,root,root) /sbin/rpcdebug
%attr(755,root,root) /sbin/fsck.nfs
%attr(755,root,root) %{_sbindir}/exportfs
diff --git a/nfs-utils-heimdal.patch b/nfs-utils-heimdal.patch
index 3df950a..1889b6e 100644
--- a/nfs-utils-heimdal.patch
+++ b/nfs-utils-heimdal.patch
@@ -1,36 +1,5 @@
---- nfs-utils-1.2.3.dist/aclocal/rpcsec_vers.m4.orig 2010-09-28 14:24:16.000000000 +0200
-+++ nfs-utils-1.2.3.dist/aclocal/rpcsec_vers.m4 2010-10-03 14:53:06.379424854 +0200
-@@ -1,7 +1,10 @@
- dnl Checks librpcsec version
- AC_DEFUN([AC_RPCSEC_VERSION], [
-
-- PKG_CHECK_MODULES([GSSGLUE], [libgssglue >= 0.3])
-+ dnl libgssglue is needed only for MIT Kerberos
-+ if test "$gssapi_lib" = gssapi_krb5; then
-+ PKG_CHECK_MODULES([GSSGLUE], [libgssglue >= 0.3])
-+ fi
-
- dnl TI-RPC replaces librpcsecgss
- if test "$enable_tirpc" = no; then
--- nfs-utils-1.2.3.dist/aclocal/kerberos5.m4~ 2010-09-28 14:24:16.000000000 +0200
+++ nfs-utils-1.2.3.dist/aclocal/kerberos5.m4 2010-10-03 14:13:17.274424855 +0200
-@@ -32,14 +32,14 @@
- fi
- if test "$K5CONFIG" != ""; then
- KRBCFLAGS=`$K5CONFIG --cflags`
-- KRBLIBS=`$K5CONFIG --libs`
-- K5VERS=`$K5CONFIG --version | head -n 1 | awk '{split($(4),v,"."); if (v@<:@"3"@:>@ == "") v@<:@"3"@:>@ = "0"; print v@<:@"1"@:>@v@<:@"2"@:>@v@<:@"3"@:>@ }'`
-+ KRBLIBS=`$K5CONFIG --libs gssapi`
- 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
-+ 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(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
@@ -56,7 +56,11 @@
dnl of Heimdal Kerberos on SuSe
elif test \( -f $dir/include/heim_err.h -o\
@@ -44,45 +13,8 @@
AC_DEFINE(HAVE_HEIMDAL, 1, [Define this if you have Heimdal Kerberos libraries])
KRBDIR="$dir"
gssapi_lib=gssapi
---- nfs-utils-1.2.3.dist/utils/gssd/context_lucid.c.orig 2010-09-28 14:24:16.000000000 +0200
-+++ nfs-utils-1.2.3.dist/utils/gssd/context_lucid.c 2010-10-03 14:31:31.150424854 +0200
-@@ -267,8 +267,13 @@
- int retcode = 0;
-
- printerr(2, "DEBUG: %s: lucid version!\n", __FUNCTION__);
-+#ifdef HAVE_HEIMDAL
-+ maj_stat = gss_krb5_export_lucid_sec_context(&min_stat, &ctx,
-+ 1, &return_ctx);
-+#else
- maj_stat = gss_export_lucid_sec_context(&min_stat, &ctx,
- 1, &return_ctx);
-+#endif
- if (maj_stat != GSS_S_COMPLETE) {
- pgsserr("gss_export_lucid_sec_context",
- maj_stat, min_stat, &krb5oid);
-@@ -303,7 +308,11 @@
- else
- retcode = prepare_krb5_rfc4121_buffer(lctx, buf, endtime);
-
-+#ifdef HAVE_HEIMDAL
-+ maj_stat = gss_krb5_free_lucid_sec_context(&min_stat, return_ctx);
-+#else
- maj_stat = gss_free_lucid_sec_context(&min_stat, ctx, return_ctx);
-+#endif
- if (maj_stat != GSS_S_COMPLETE) {
- pgsserr("gss_export_lucid_sec_context",
- maj_stat, min_stat, &krb5oid);
--- nfs-utils-1.2.3.dist/utils/gssd/krb5_util.c.orig 2010-09-28 14:24:16.000000000 +0200
+++ nfs-utils-1.2.3.dist/utils/gssd/krb5_util.c 2010-10-03 14:33:07.992424854 +0200
-@@ -115,7 +115,7 @@
- #include <errno.h>
- #include <time.h>
- #include <gssapi/gssapi.h>
--#ifdef USE_PRIVATE_KRB5_FUNCTIONS
-+#ifdef HAVE_HEIMDAL
- #include <gssapi/gssapi_krb5.h>
- #endif
- #include <krb5.h>
@@ -927,9 +927,37 @@
{
krb5_error_code ret;
@@ -140,41 +72,3 @@
krb5_cc_set_flags(context, ccache, KRB5_TC_OPENCLOSE);
krb5_cc_close(context, ccache);
err_cache:
-@@ -1316,12 +1316,21 @@
- * If we failed for any reason to produce global
- * list of supported enctypes, use local default here.
- */
-+#ifdef HAVE_HEIMDAL
-+ if (krb5_enctypes == NULL || limit_to_legacy_enctypes)
-+ maj_stat = gss_krb5_set_allowable_enctypes(&min_stat, credh,
-+ num_enctypes, enctypes);
-+ else
-+ maj_stat = gss_krb5_set_allowable_enctypes(&min_stat, credh,
-+ num_krb5_enctypes, krb5_enctypes);
-+#else
- if (krb5_enctypes == NULL || limit_to_legacy_enctypes)
- maj_stat = gss_set_allowable_enctypes(&min_stat, credh,
- &krb5oid, num_enctypes, enctypes);
- else
- maj_stat = gss_set_allowable_enctypes(&min_stat, credh,
- &krb5oid, num_krb5_enctypes, krb5_enctypes);
-+#endif
-
- if (maj_stat != GSS_S_COMPLETE) {
- pgsserr("gss_set_allowable_enctypes",
---- nfs-utils-1.2.4/utils/gssd/svcgssd_krb5.c~ 2011-06-30 15:00:42.000000000 +0200
-+++ nfs-utils-1.2.4/utils/gssd/svcgssd_krb5.c 2011-08-03 12:40:53.865782009 +0200
-@@ -186,8 +186,13 @@
- num_enctypes = default_num_enctypes;
- }
-
-+#ifdef HAVE_HEIMDAL
-+ maj_stat = gss_krb5_set_allowable_enctypes(&min_stat, gssd_creds,
-+ num_enctypes, enctypes);
-+#else
- maj_stat = gss_set_allowable_enctypes(&min_stat, gssd_creds,
- &krb5oid, num_enctypes, enctypes);
-+#endif
- if (maj_stat != GSS_S_COMPLETE) {
- printerr(1, "WARNING: gss_set_allowable_enctypes failed\n");
- pgsserr("svcgssd_limit_krb5_enctypes: gss_set_allowable_enctypes",
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/nfs-utils.git/commitdiff/98900fc51741c84db7c8d11cbd0f5d95f1cd6920
More information about the pld-cvs-commit
mailing list