nfs-utils-x32.patch

   1 --- nfs-utils-2.4.2/aclocal/kerberos5.m4.orig   2019-11-29 16:24:46.626777231 +0100
   2 +++ nfs-utils-2.4.2/aclocal/kerberos5.m4        2019-11-29 16:27:53.019100791 +0100
   3 @@ -39,8 +39,8 @@
   4        if test -f $dir/include/gssapi/gssapi_krb5.h -a \
   5                  \( -f $dir/lib/libgssapi_krb5.a -o \
   6                     -f $dir/lib/libgssapi_krb5.so -o \
   7 -                   -f $dir/lib32/libgssapi_krb5.a -o \
   8 -                   -f $dir/lib32/libgssapi_krb5.so -o \
   9 +                   -f $dir/libx32/libgssapi_krb5.a -o \
  10 +                   -f $dir/libx32/libgssapi_krb5.so -o \
  11                     -f $dir/lib64/libgssapi_krb5.a -o \
  12                     -f $dir/lib64/libgssapi_krb5.so \) ; then
  13           AC_DEFINE(HAVE_KRB5, 1, [Define this if you have MIT Kerberos libraries])
  14 @@ -53,6 +53,8 @@
  15                  -f $dir/include/heimdal/heim_err.h \) -a \
  16                  \( -f $dir/lib/libroken.a -o \
  17                     -f $dir/lib64/libroken.a -o \
  18 +                   -f $dir/libx32/libroken.a -o \
  19 +                   -f $dir/libx32/libroken.so -o \
  20                     -f $dir/lib64/libroken.so -o \
  21                     -f $dir/lib/libroken.so \) ; then
  22           K5VERS=`$K5CONFIG --version | head -n 1 | awk '{split($(2),v,"."); if (v@<:@"3"@:>@ == "") v@<:@"3"@:>@ = "0"; print v@<:@"1"@:>@v@<:@"2"@:>@v@<:@"3"@:>@ }'`
  23 --- nfs-utils-2.3.3/support/nfs/cacheio.c.orig  2018-09-06 20:09:08.000000000 +0200
  24 +++ nfs-utils-2.3.3/support/nfs/cacheio.c       2018-12-09 20:39:32.658337475 +0100
  25 @@ -234,7 +234,7 @@
  26             stb.st_mtime > now)
  27                 stb.st_mtime = time(0);
  28
  29 -       sprintf(stime, "%ld\n", stb.st_mtime);
  30 +       sprintf(stime, "%lld\n", (long long)stb.st_mtime);
  31         for (c=0; cachelist[c]; c++) {
  32                 int fd;
  33                 sprintf(path, "/proc/net/rpc/%s/flush", cachelist[c]);
  34 --- nfs-utils-2.3.3/utils/idmapd/idmapd.c.orig  2018-09-06 20:09:08.000000000 +0200
  35 +++ nfs-utils-2.3.3/utils/idmapd/idmapd.c       2018-12-09 20:40:55.019279956 +0100
  36 @@ -171,7 +171,7 @@
  37         int fd;
  38         char stime[32];
  39
  40 -       sprintf(stime, "%ld\n", now);
  41 +       sprintf(stime, "%lld\n", (long long)now);
  42         fd = open(path, O_RDWR);
  43         if (fd == -1)
  44                 return -1;
  45 @@ -612,8 +612,8 @@
  46                 /* Name */
  47                 addfield(&bp, &bsiz, im.im_name);
  48                 /* expiry */
  49 -               snprintf(buf1, sizeof(buf1), "%lu",
  50 -                        time(NULL) + cache_entry_expiration);
  51 +               snprintf(buf1, sizeof(buf1), "%llu",
  52 +                        (unsigned long long)(time(NULL) + cache_entry_expiration));
  53                 addfield(&bp, &bsiz, buf1);
  54                 /* Note that we don't want to write the id if the mapping
  55                  * failed; instead, by leaving it off, we write a negative
  56 @@ -640,8 +640,8 @@
  57                 snprintf(buf1, sizeof(buf1), "%u", im.im_id);
  58                 addfield(&bp, &bsiz, buf1);
  59                 /* expiry */
  60 -               snprintf(buf1, sizeof(buf1), "%lu",
  61 -                        time(NULL) + cache_entry_expiration);
  62 +               snprintf(buf1, sizeof(buf1), "%llu",
  63 +                        (unsigned long long)(time(NULL) + cache_entry_expiration));
  64                 addfield(&bp, &bsiz, buf1);
  65                 /* Note we're ignoring the status field in this case; we'll
  66                  * just map to nobody instead. */
  67 --- nfs-utils-2.3.3/utils/nfsdcltrack/sqlite.c.orig     2018-09-06 20:09:08.000000000 +0200
  68 +++ nfs-utils-2.3.3/utils/nfsdcltrack/sqlite.c  2018-12-09 20:41:52.172247084 +0100
  69 @@ -542,8 +542,8 @@
  70         int ret;
  71         char *err = NULL;
  72
  73 -       ret = snprintf(buf, sizeof(buf), "DELETE FROM clients WHERE time < %ld",
  74 -                       grace_start);
  75 +       ret = snprintf(buf, sizeof(buf), "DELETE FROM clients WHERE time < %lld",
  76 +                       (long long)grace_start);
  77         if (ret < 0) {
  78                 return ret;
  79         } else if ((size_t)ret >= sizeof(buf)) {