- rediffed patches for fuzz 0

diff --git a/nfs-utils-heimdal.patch b/nfs-utils-heimdal.patch
index fe12ea5879ca60bee294263d0c9efa7573873a0b..d2f288e49ace987775775715c3ebd2eaf67f28a6 100644 (file)
--- a/nfs-utils-heimdal.patch
+++ b/nfs-utils-heimdal.patch
@@ -13,10 +13,10 @@
           AC_DEFINE(HAVE_HEIMDAL, 1, [Define this if you have Heimdal Kerberos libraries])
           KRBDIR="$dir"
           gssapi_lib=gssapi
---- nfs-utils-2.5.1/utils/gssd/krb5_util.c.orig        2020-06-18 19:10:06.000000000 +0200
-+++ nfs-utils-2.5.1/utils/gssd/krb5_util.c     2020-08-22 18:47:27.393014417 +0200
-@@ -836,7 +836,11 @@
-               myhostad[i+1] = 0;
+--- nfs-utils-2.5.3/utils/gssd/krb5_util.c.orig        2021-02-20 18:16:52.000000000 +0100
++++ nfs-utils-2.5.3/utils/gssd/krb5_util.c     2021-02-24 21:11:01.392926374 +0100
+@@ -891,7 +891,11 @@
+               myhostad[i+1] = 0;
        }
        if (adhostoverride)
 +#ifdef HAVE_HEIMDAL
@@ -25,9 +25,9 @@
                krb5_free_string(context, adhostoverride);
 +#endif
  
-       if (!srchost) {
-               retval = get_full_hostname(myhostname, myhostname, sizeof(myhostname));
-@@ -1003,9 +1007,37 @@
+       code = krb5_get_default_realm(context, &default_realm);
+       if (code) {
+@@ -1050,9 +1054,37 @@
  {
        krb5_error_code ret;
        krb5_creds creds;
@@ -66,7 +66,7 @@
        ret = krb5_cc_start_seq_get(context, ccache, &cur);
        if (ret) 
                return 0;
-@@ -1025,6 +1057,7 @@
+@@ -1072,6 +1104,7 @@
                krb5_free_cred_contents(context, &creds);
        }
        krb5_cc_end_seq_get(context, ccache, &cur);
@@ -74,7 +74,7 @@
  
        return found;
  }
-@@ -1071,6 +1104,9 @@
+@@ -1118,6 +1151,9 @@
        }
        krb5_free_principal(context, principal);
  err_princ:
@@ -84,7 +84,7 @@
        krb5_cc_set_flags(context, ccache,  KRB5_TC_OPENCLOSE);
        krb5_cc_close(context, ccache);
  err_cache:
-@@ -1369,7 +1405,7 @@
+@@ -1455,7 +1491,7 @@
  #endif
        if (msg != NULL)
                return msg;

diff --git a/nfs-utils-install.patch b/nfs-utils-install.patch
index 5b940dd7b71051adfbd6827eaaf71f72a04f96bf..a65346c40f41f37fe13cf92a5e67f618b3b3e9fc 100644 (file)
--- a/nfs-utils-install.patch
+++ b/nfs-utils-install.patch
@@ -1,6 +1,6 @@
---- nfs-utils-1.3.1/Makefile.am.orig   2014-10-14 19:12:41.085974100 +0200
-+++ nfs-utils-1.3.1/Makefile.am        2014-10-14 19:13:59.605970805 +0200
-@@ -56,8 +56,6 @@
+--- nfs-utils-2.5.3/Makefile.am.orig   2021-02-24 20:53:15.487950347 +0100
++++ nfs-utils-2.5.3/Makefile.am        2021-02-24 20:58:24.117204744 +0100
+@@ -27,8 +27,6 @@
        touch $(DESTDIR)$(statedir)/rmtab; chmod 644 $(DESTDIR)$(statedir)/rmtab
        mkdir -p $(DESTDIR)$(statdpath)/sm $(DESTDIR)$(statdpath)/sm.bak
        touch $(DESTDIR)$(statdpath)/state
@@ -8,4 +8,4 @@
 -      -chown $(statduser) $(DESTDIR)$(statdpath)/sm $(DESTDIR)$(statdpath)/sm.bak $(DESTDIR)$(statdpath)/state
  
  uninstall-hook:
-       rm $(DESTDIR)$(statedir)/xtab
+       rm -f $(DESTDIR)$(statedir)/xtab

diff --git a/nfs-utils-statdpath.patch b/nfs-utils-statdpath.patch
index 993c14de9d093689e1661ea802f65476b612134e..99ad73724303ff9a18781fb2d1e4c9267d7f14cd 100644 (file)
--- a/nfs-utils-statdpath.patch
+++ b/nfs-utils-statdpath.patch
@@ -1,6 +1,6 @@
---- 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 @@
+--- nfs-utils-2.5.3/utils/statd/statd.man.orig 2021-02-20 18:16:52.000000000 +0100
++++ nfs-utils-2.5.3/utils/statd/statd.man      2021-02-24 21:04:26.749244949 +0100
+@@ -251,7 +251,7 @@
  If this option is not specified,
  .B rpc.statd
  uses
@@ -9,8 +9,8 @@
  by default.
  .IP
  After starting,
-@@ -365,13 +365,13 @@
- will operate.
+@@ -431,13 +431,13 @@
+ .IR \-\-no\-notify .
  .SH FILES
  .TP 2.5i
 -.I /var/lib/nfs/sm

diff --git a/nfs-utils-x32.patch b/nfs-utils-x32.patch
index b983064af96bb2f20a51eeecc9e45ef076c11d85..77845175a7705e9bbd650c1dffbd8ca4a3e00d81 100644 (file)
--- a/nfs-utils-x32.patch
+++ b/nfs-utils-x32.patch
@@ -1,5 +1,5 @@
---- nfs-utils-2.4.2/aclocal/kerberos5.m4.orig  2019-11-29 16:24:46.626777231 +0100
-+++ nfs-utils-2.4.2/aclocal/kerberos5.m4       2019-11-29 16:27:53.019100791 +0100
+--- nfs-utils-2.5.3/aclocal/kerberos5.m4.orig  2021-02-24 21:11:25.667510884 +0100
++++ nfs-utils-2.5.3/aclocal/kerberos5.m4       2021-02-24 22:08:08.296189188 +0100
 @@ -39,8 +39,8 @@
        if test -f $dir/include/gssapi/gssapi_krb5.h -a \
                  \( -f $dir/lib/libgssapi_krb5.a -o \
@@ -9,9 +9,9 @@
 +                   -f $dir/libx32/libgssapi_krb5.a -o \
 +                   -f $dir/libx32/libgssapi_krb5.so -o \
                     -f $dir/lib64/libgssapi_krb5.a -o \
-                    -f $dir/lib64/libgssapi_krb5.so \) ; then
-          AC_DEFINE(HAVE_KRB5, 1, [Define this if you have MIT Kerberos libraries])
-@@ -53,6 +53,8 @@
+                    -f $dir/lib64/libgssapi_krb5.so -o \
+                    -f $dir/lib/$(uname -m)-linux-gnu/libgssapi_krb5.a -o \
+@@ -55,6 +55,8 @@
                         -f $dir/include/heimdal/heim_err.h \) -a \
                  \( -f $dir/lib/libroken.a -o \
                     -f $dir/lib64/libroken.a -o \