Author: baggins Date: Wed Sep 29 10:09:03 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- updated to 1.2.3
---- Files affected:
packages/nfs-utils:
nfs-utils-heimdal_functions.patch (1.5 -> 1.6) ,
nfs-utils-no_libgssapi.patch (1.4 -> 1.5) , nfs-utils.spec (1.189 -> 1.190)
---- Diffs:
================================================================
Index: packages/nfs-utils/nfs-utils-heimdal_functions.patch
diff -u packages/nfs-utils/nfs-utils-heimdal_functions.patch:1.5
packages/nfs-utils/nfs-utils-heimdal_functions.patch:1.6
--- packages/nfs-utils/nfs-utils-heimdal_functions.patch:1.5 Mon Aug 30
18:52:01 2010
+++ packages/nfs-utils/nfs-utils-heimdal_functions.patch Wed Sep 29
12:08:58 2010
@@ -1,5 +1,15 @@
--- 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;
@@ -9,14 +19,14 @@
+#ifdef HAVE_HEIMDAL
+ krb5_creds pattern;
-+ krb5_realm *client_realm;
++ krb5_const_realm client_realm;
+
+ krb5_cc_clear_mcred(&pattern);
+
-+ client_realm = krb5_princ_realm (context, principal);
++ client_realm = krb5_principal_get_realm (context, principal);
+
+ ret = krb5_make_principal (context, &pattern.server,
-+ *client_realm, KRB5_TGS_NAME, *client_realm,
++ client_realm, KRB5_TGS_NAME, client_realm,
+ NULL);
+ if (ret)
+ krb5_err (context, 1, ret, "krb5_make_principal");
@@ -57,15 +67,3 @@
krb5_cc_set_flags(context, ccache, KRB5_TC_OPENCLOSE);
krb5_cc_close(context, ccache);
err_cache:
-@@ -1262,7 +1294,11 @@
- if (context != NULL) {
- origmsg = krb5_get_error_message(context, code);
- msg = strdup(origmsg);
-+#ifdef HAVE_HEIMDAL
-+ krb5_free_error_string(context, origmsg);
-+#else
- krb5_free_error_message(context, origmsg);
-+#endif
- }
- #endif
- if (msg != NULL)
================================================================
Index: packages/nfs-utils/nfs-utils-no_libgssapi.patch
diff -u packages/nfs-utils/nfs-utils-no_libgssapi.patch:1.4
packages/nfs-utils/nfs-utils-no_libgssapi.patch:1.5
--- packages/nfs-utils/nfs-utils-no_libgssapi.patch:1.4 Mon Aug 30 18:52:01 2010
+++ packages/nfs-utils/nfs-utils-no_libgssapi.patch Wed Sep 29 12:08:58 2010
@@ -16,7 +16,7 @@
@@ -171,10 +173,10 @@ serialize_krb5_ctx(gss_ctx_id_t ctx, gss
int retcode = 0;
- printerr(2, "DEBUG: serialize_krb5_ctx: lucid version!\n");
+ 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);
@@ -42,13 +42,20 @@
===================================================================
--- nfs-utils-1.1.0.orig/utils/gssd/krb5_util.c
+++ nfs-utils-1.1.0/utils/gssd/krb5_util.c
-@@ -294,10 +294,10 @@ limit_krb5_enctypes(struct rpc_gss_sec *
- return -1;
- }
+@@ -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);
-- maj_stat = gss_set_allowable_enctypes(&min_stat, credh, &krb5oid,
-+ maj_stat = gss_krb5_set_allowable_enctypes(&min_stat, credh,
- num_enctypes, &enctypes);
if (maj_stat != GSS_S_COMPLETE) {
- pgsserr("gss_set_allowable_enctypes",
+ pgsserr("gss_krb5_set_allowable_enctypes",
================================================================
Index: packages/nfs-utils/nfs-utils.spec
diff -u packages/nfs-utils/nfs-utils.spec:1.189
packages/nfs-utils/nfs-utils.spec:1.190
--- packages/nfs-utils/nfs-utils.spec:1.189 Mon Aug 30 18:52:01 2010
+++ packages/nfs-utils/nfs-utils.spec Wed Sep 29 12:08:58 2010
@@ -13,12 +13,12 @@
Summary(ru.UTF-8): Утилиты для NFS и демоны поддержки для NFS-сервера ядра
Summary(uk.UTF-8): Утиліти для NFS та демони підтримки для NFS-сервера ядра
Name: nfs-utils
-Version: 1.2.2
-Release: 4
+Version: 1.2.3
+Release: 1
License: GPL v2
Group: Networking/Daemons
Source0:
http://www.kernel.org/pub/linux/utils/nfs/%{name}-%{version}.tar.bz2
-# Source0-md5: dad92f64db3266c7757f71bb53ee8f35
+# Source0-md5: 1131dc5f27c4f3905a6e7ee0d594fd4d
#Source1: ftp://ftp.linuxnfs.sourceforge.org/pub/nfs/nfs.doc.tar.gz
Source1: nfs.doc.tar.gz
# Source1-md5: ae7db9c61c5ad04f83bb99e5caed73da
@@ -385,11 +385,15 @@
%attr(4755,root,root) /sbin/umount.nfs
%attr(4755,root,root) /sbin/mount.nfs4
%attr(4755,root,root) /sbin/umount.nfs4
+%attr(755,root,root) %{_sbindir}/mountstats
+%attr(755,root,root) %{_sbindir}/nfsiostat
%attr(755,root,root) %{_sbindir}/showmount
%attr(755,root,root) %{_sbindir}/rpc.gssd
%attr(754,root,root) /etc/rc.d/init.d/gssd
%{_mandir}/man8/gssd.8*
%{_mandir}/man8/mount.nfs.8*
+%{_mandir}/man8/mountstats.8*
+%{_mandir}/man8/nfsiostat.8*
%{_mandir}/man8/rpc.gssd.8*
%{_mandir}/man8/showmount.8*
%{_mandir}/man8/umount.nfs.8*
@@ -413,6 +417,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.190 2010/09/29 10:08:58 baggins
+- updated to 1.2.3
+
Revision 1.189 2010/08/30 16:52:01 baggins
- rel 4
- git patch and ipv6/gss changes moved to DEVEL due yo issues with nfs3 mounts
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/nfs-utils/nfs-utils-heimdal_functions.patch?r1=1.5&r2=1.6&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/nfs-utils/nfs-utils-no_libgssapi.patch?r1=1.4&r2=1.5&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/nfs-utils/nfs-utils.spec?r1=1.189&r2=1.190&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
