From 1d5dfff695d7bfb32521f4f8c7c296e27b18e908 Mon Sep 17 00:00:00 2001 From: Brent Cook Date: Mon, 2 Nov 2015 20:22:26 -0600 Subject: update patches --- patches/netcat.c.patch | 12 ++++++------ 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 @@ ---- apps/nc/netcat.c.orig 2015-10-23 16:01:14.000000000 -0700 -+++ apps/nc/netcat.c 2015-10-23 16:17:08.000000000 -0700 +--- apps/nc/netcat.c.orig Mon Nov 2 20:00:31 2015 ++++ apps/nc/netcat.c Mon Nov 2 20:00:39 2015 @@ -57,6 +57,10 @@ #include #include "atomicio.h" @@ -80,7 +80,7 @@ if (pledge("stdio rpath wpath cpath tmppath unix", NULL) == -1) err(1, "pledge"); } -@@ -797,7 +811,10 @@ +@@ -798,7 +812,10 @@ remote_connect(const char *host, const char *port, struct addrinfo hints) { struct addrinfo *res, *res0; @@ -92,7 +92,7 @@ if ((error = getaddrinfo(host, port, &hints, &res))) errx(1, "getaddrinfo: %s", gai_strerror(error)); -@@ -808,16 +825,20 @@ +@@ -809,16 +826,20 @@ SOCK_NONBLOCK, res0->ai_protocol)) < 0) continue; @@ -113,7 +113,7 @@ memset(&ahints, 0, sizeof(struct addrinfo)); ahints.ai_family = res0->ai_family; ahints.ai_socktype = uflag ? SOCK_DGRAM : SOCK_STREAM; -@@ -886,7 +907,10 @@ +@@ -887,7 +908,10 @@ local_listen(char *host, char *port, struct addrinfo hints) { struct addrinfo *res, *res0; @@ -125,7 +125,7 @@ int error; /* Allow nodename to be null. */ -@@ -908,13 +932,17 @@ +@@ -909,13 +933,17 @@ res0->ai_protocol)) < 0) continue; 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 @@ ---- tests/rfc5280time.c.orig Sat Oct 17 22:36:27 2015 -+++ tests/rfc5280time.c Sat Oct 17 22:44:25 2015 +--- tests/rfc5280time.c.orig Mon Nov 2 20:00:31 2015 ++++ tests/rfc5280time.c Mon Nov 2 20:03:12 2015 @@ -91,6 +91,7 @@ .data = "20150923032700Z", .time = 1442978820, @@ -10,7 +10,7 @@ .str = "00000101000000Z", @@ -103,6 +104,7 @@ .data = "20491231235959Z", - .time = 2524607999, + .time = 2524607999LL, }, +#endif { @@ -18,7 +18,7 @@ .str = "19500101000000Z", @@ -112,6 +114,7 @@ }; - + struct rfc5280_time_test rfc5280_gentime_tests[] = { +#if SIZEOF_TIME_T == 8 { @@ -26,7 +26,7 @@ .str = "99991231235959Z", @@ -129,6 +132,7 @@ .data = "20500101000000Z", - .time = 2524608000, + .time = 2524608000LL, }, +#endif }; @@ -40,21 +40,21 @@ { .str = "491231235959Z", .data = "491231235959Z", - .time = 2524607999, + .time = 2524607999LL, }, +#endif { .str = "700101000000Z", .data = "700101000000Z", @@ -273,14 +279,14 @@ - + if ((i = X509_cmp_time(gt, &att->time)) != -1) { fprintf(stderr, "FAIL: test %i - X509_cmp_time failed - returned %d compared to %lld\n", - test_no, i, att->time); + test_no, i, (long long)att->time); goto done; } - + att->time--; if ((i = X509_cmp_time(gt, &att->time)) != 1) { fprintf(stderr, "FAIL: test %i - X509_cmp_time failed - returned %d compared to %lld\n", @@ -64,14 +64,14 @@ } att->time++; @@ -325,14 +331,14 @@ - + if ((i = X509_cmp_time(ut, &att->time)) != -1) { fprintf(stderr, "FAIL: test %i - X509_cmp_time failed - returned %d compared to %lld\n", - test_no, i, att->time); + test_no, i, (long long)att->time); goto done; } - + att->time--; if ((i = X509_cmp_time(ut, &att->time)) != 1) { fprintf(stderr, "FAIL: test %i - X509_cmp_time failed - returned %d compared to %lld\n", -- cgit v1.2.3-55-g6feb