diff options
author | Brent Cook <bcook@openbsd.org> | 2015-11-02 20:22:26 -0600 |
---|---|---|
committer | Brent Cook <bcook@openbsd.org> | 2015-11-02 20:22:26 -0600 |
commit | 1d5dfff695d7bfb32521f4f8c7c296e27b18e908 (patch) | |
tree | 0b31b0444b8f39d47d338a9cf3e9f3d93da0f579 | |
parent | 7180bed3bb78144e19c1dfe3180b0dd2f426bf60 (diff) | |
download | portable-1d5dfff695d7bfb32521f4f8c7c296e27b18e908.tar.gz portable-1d5dfff695d7bfb32521f4f8c7c296e27b18e908.tar.bz2 portable-1d5dfff695d7bfb32521f4f8c7c296e27b18e908.zip |
update patches
-rw-r--r-- | patches/netcat.c.patch | 12 | ||||
-rw-r--r-- | patches/rfc5280.c.patch | 20 |
2 files changed, 16 insertions, 16 deletions
diff --git a/patches/netcat.c.patch b/patches/netcat.c.patch index 36278d9..fffd726 100644 --- a/patches/netcat.c.patch +++ b/patches/netcat.c.patch | |||
@@ -1,5 +1,5 @@ | |||
1 | --- apps/nc/netcat.c.orig 2015-10-23 16:01:14.000000000 -0700 | 1 | --- apps/nc/netcat.c.orig Mon Nov 2 20:00:31 2015 |
2 | +++ apps/nc/netcat.c 2015-10-23 16:17:08.000000000 -0700 | 2 | +++ apps/nc/netcat.c Mon Nov 2 20:00:39 2015 |
3 | @@ -57,6 +57,10 @@ | 3 | @@ -57,6 +57,10 @@ |
4 | #include <tls.h> | 4 | #include <tls.h> |
5 | #include "atomicio.h" | 5 | #include "atomicio.h" |
@@ -80,7 +80,7 @@ | |||
80 | if (pledge("stdio rpath wpath cpath tmppath unix", NULL) == -1) | 80 | if (pledge("stdio rpath wpath cpath tmppath unix", NULL) == -1) |
81 | err(1, "pledge"); | 81 | err(1, "pledge"); |
82 | } | 82 | } |
83 | @@ -797,7 +811,10 @@ | 83 | @@ -798,7 +812,10 @@ |
84 | remote_connect(const char *host, const char *port, struct addrinfo hints) | 84 | remote_connect(const char *host, const char *port, struct addrinfo hints) |
85 | { | 85 | { |
86 | struct addrinfo *res, *res0; | 86 | struct addrinfo *res, *res0; |
@@ -92,7 +92,7 @@ | |||
92 | 92 | ||
93 | if ((error = getaddrinfo(host, port, &hints, &res))) | 93 | if ((error = getaddrinfo(host, port, &hints, &res))) |
94 | errx(1, "getaddrinfo: %s", gai_strerror(error)); | 94 | errx(1, "getaddrinfo: %s", gai_strerror(error)); |
95 | @@ -808,16 +825,20 @@ | 95 | @@ -809,16 +826,20 @@ |
96 | SOCK_NONBLOCK, res0->ai_protocol)) < 0) | 96 | SOCK_NONBLOCK, res0->ai_protocol)) < 0) |
97 | continue; | 97 | continue; |
98 | 98 | ||
@@ -113,7 +113,7 @@ | |||
113 | memset(&ahints, 0, sizeof(struct addrinfo)); | 113 | memset(&ahints, 0, sizeof(struct addrinfo)); |
114 | ahints.ai_family = res0->ai_family; | 114 | ahints.ai_family = res0->ai_family; |
115 | ahints.ai_socktype = uflag ? SOCK_DGRAM : SOCK_STREAM; | 115 | ahints.ai_socktype = uflag ? SOCK_DGRAM : SOCK_STREAM; |
116 | @@ -886,7 +907,10 @@ | 116 | @@ -887,7 +908,10 @@ |
117 | local_listen(char *host, char *port, struct addrinfo hints) | 117 | local_listen(char *host, char *port, struct addrinfo hints) |
118 | { | 118 | { |
119 | struct addrinfo *res, *res0; | 119 | struct addrinfo *res, *res0; |
@@ -125,7 +125,7 @@ | |||
125 | int error; | 125 | int error; |
126 | 126 | ||
127 | /* Allow nodename to be null. */ | 127 | /* Allow nodename to be null. */ |
128 | @@ -908,13 +932,17 @@ | 128 | @@ -909,13 +933,17 @@ |
129 | res0->ai_protocol)) < 0) | 129 | res0->ai_protocol)) < 0) |
130 | continue; | 130 | continue; |
131 | 131 | ||
diff --git a/patches/rfc5280.c.patch b/patches/rfc5280.c.patch index 4281109..9262183 100644 --- a/patches/rfc5280.c.patch +++ b/patches/rfc5280.c.patch | |||
@@ -1,5 +1,5 @@ | |||
1 | --- tests/rfc5280time.c.orig Sat Oct 17 22:36:27 2015 | 1 | --- tests/rfc5280time.c.orig Mon Nov 2 20:00:31 2015 |
2 | +++ tests/rfc5280time.c Sat Oct 17 22:44:25 2015 | 2 | +++ tests/rfc5280time.c Mon Nov 2 20:03:12 2015 |
3 | @@ -91,6 +91,7 @@ | 3 | @@ -91,6 +91,7 @@ |
4 | .data = "20150923032700Z", | 4 | .data = "20150923032700Z", |
5 | .time = 1442978820, | 5 | .time = 1442978820, |
@@ -10,7 +10,7 @@ | |||
10 | .str = "00000101000000Z", | 10 | .str = "00000101000000Z", |
11 | @@ -103,6 +104,7 @@ | 11 | @@ -103,6 +104,7 @@ |
12 | .data = "20491231235959Z", | 12 | .data = "20491231235959Z", |
13 | .time = 2524607999, | 13 | .time = 2524607999LL, |
14 | }, | 14 | }, |
15 | +#endif | 15 | +#endif |
16 | { | 16 | { |
@@ -18,7 +18,7 @@ | |||
18 | .str = "19500101000000Z", | 18 | .str = "19500101000000Z", |
19 | @@ -112,6 +114,7 @@ | 19 | @@ -112,6 +114,7 @@ |
20 | }; | 20 | }; |
21 | 21 | ||
22 | struct rfc5280_time_test rfc5280_gentime_tests[] = { | 22 | struct rfc5280_time_test rfc5280_gentime_tests[] = { |
23 | +#if SIZEOF_TIME_T == 8 | 23 | +#if SIZEOF_TIME_T == 8 |
24 | { | 24 | { |
@@ -26,7 +26,7 @@ | |||
26 | .str = "99991231235959Z", | 26 | .str = "99991231235959Z", |
27 | @@ -129,6 +132,7 @@ | 27 | @@ -129,6 +132,7 @@ |
28 | .data = "20500101000000Z", | 28 | .data = "20500101000000Z", |
29 | .time = 2524608000, | 29 | .time = 2524608000LL, |
30 | }, | 30 | }, |
31 | +#endif | 31 | +#endif |
32 | }; | 32 | }; |
@@ -40,21 +40,21 @@ | |||
40 | { | 40 | { |
41 | .str = "491231235959Z", | 41 | .str = "491231235959Z", |
42 | .data = "491231235959Z", | 42 | .data = "491231235959Z", |
43 | .time = 2524607999, | 43 | .time = 2524607999LL, |
44 | }, | 44 | }, |
45 | +#endif | 45 | +#endif |
46 | { | 46 | { |
47 | .str = "700101000000Z", | 47 | .str = "700101000000Z", |
48 | .data = "700101000000Z", | 48 | .data = "700101000000Z", |
49 | @@ -273,14 +279,14 @@ | 49 | @@ -273,14 +279,14 @@ |
50 | 50 | ||
51 | if ((i = X509_cmp_time(gt, &att->time)) != -1) { | 51 | if ((i = X509_cmp_time(gt, &att->time)) != -1) { |
52 | fprintf(stderr, "FAIL: test %i - X509_cmp_time failed - returned %d compared to %lld\n", | 52 | fprintf(stderr, "FAIL: test %i - X509_cmp_time failed - returned %d compared to %lld\n", |
53 | - test_no, i, att->time); | 53 | - test_no, i, att->time); |
54 | + test_no, i, (long long)att->time); | 54 | + test_no, i, (long long)att->time); |
55 | goto done; | 55 | goto done; |
56 | } | 56 | } |
57 | 57 | ||
58 | att->time--; | 58 | att->time--; |
59 | if ((i = X509_cmp_time(gt, &att->time)) != 1) { | 59 | if ((i = X509_cmp_time(gt, &att->time)) != 1) { |
60 | fprintf(stderr, "FAIL: test %i - X509_cmp_time failed - returned %d compared to %lld\n", | 60 | fprintf(stderr, "FAIL: test %i - X509_cmp_time failed - returned %d compared to %lld\n", |
@@ -64,14 +64,14 @@ | |||
64 | } | 64 | } |
65 | att->time++; | 65 | att->time++; |
66 | @@ -325,14 +331,14 @@ | 66 | @@ -325,14 +331,14 @@ |
67 | 67 | ||
68 | if ((i = X509_cmp_time(ut, &att->time)) != -1) { | 68 | if ((i = X509_cmp_time(ut, &att->time)) != -1) { |
69 | fprintf(stderr, "FAIL: test %i - X509_cmp_time failed - returned %d compared to %lld\n", | 69 | fprintf(stderr, "FAIL: test %i - X509_cmp_time failed - returned %d compared to %lld\n", |
70 | - test_no, i, att->time); | 70 | - test_no, i, att->time); |
71 | + test_no, i, (long long)att->time); | 71 | + test_no, i, (long long)att->time); |
72 | goto done; | 72 | goto done; |
73 | } | 73 | } |
74 | 74 | ||
75 | att->time--; | 75 | att->time--; |
76 | if ((i = X509_cmp_time(ut, &att->time)) != 1) { | 76 | if ((i = X509_cmp_time(ut, &att->time)) != 1) { |
77 | fprintf(stderr, "FAIL: test %i - X509_cmp_time failed - returned %d compared to %lld\n", | 77 | fprintf(stderr, "FAIL: test %i - X509_cmp_time failed - returned %d compared to %lld\n", |