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