aboutsummaryrefslogtreecommitdiff
path: root/patches/netcat.c.patch
diff options
context:
space:
mode:
authorBrent Cook <bcook@openbsd.org>2016-11-06 02:27:21 -0600
committerBrent Cook <bcook@openbsd.org>2016-11-06 02:27:21 -0600
commitf99d89a0fc0ad24b0a45155d71bf92ec44c7ca0c (patch)
treea7569ccfb64578b04b2de2c80ff2cb7d49dbdd0c /patches/netcat.c.patch
parent5f187770f36e5049f54a3c717e8c71e3c824e5ba (diff)
downloadportable-f99d89a0fc0ad24b0a45155d71bf92ec44c7ca0c.tar.gz
portable-f99d89a0fc0ad24b0a45155d71bf92ec44c7ca0c.tar.bz2
portable-f99d89a0fc0ad24b0a45155d71bf92ec44c7ca0c.zip
update patches
Diffstat (limited to 'patches/netcat.c.patch')
-rw-r--r--patches/netcat.c.patch32
1 files changed, 16 insertions, 16 deletions
diff --git a/patches/netcat.c.patch b/patches/netcat.c.patch
index b69e0e3..4d2f893 100644
--- a/patches/netcat.c.patch
+++ b/patches/netcat.c.patch
@@ -1,5 +1,5 @@
1--- apps/nc/netcat.c.orig Mon Oct 3 06:09:29 2016 1--- apps/nc/netcat.c.orig Sat Nov 5 14:00:01 2016
2+++ apps/nc/netcat.c Sun Oct 30 21:42:27 2016 2+++ apps/nc/netcat.c Sat Nov 5 15:28:35 2016
3@@ -65,7 +65,9 @@ 3@@ -65,7 +65,9 @@
4 #define POLL_NETIN 2 4 #define POLL_NETIN 2
5 #define POLL_STDOUT 3 5 #define POLL_STDOUT 3
@@ -10,7 +10,7 @@
10 10
11 #define TLS_LEGACY (1 << 1) 11 #define TLS_LEGACY (1 << 1)
12 #define TLS_NOVERIFY (1 << 2) 12 #define TLS_NOVERIFY (1 << 2)
13@@ -92,9 +94,13 @@ 13@@ -93,9 +95,13 @@
14 int Dflag; /* sodebug */ 14 int Dflag; /* sodebug */
15 int Iflag; /* TCP receive buffer size */ 15 int Iflag; /* TCP receive buffer size */
16 int Oflag; /* TCP send buffer size */ 16 int Oflag; /* TCP send buffer size */
@@ -24,7 +24,7 @@
24 24
25 int usetls; /* use TLS */ 25 int usetls; /* use TLS */
26 char *Cflag; /* Public cert file */ 26 char *Cflag; /* Public cert file */
27@@ -146,7 +152,7 @@ 27@@ -148,7 +154,7 @@
28 struct servent *sv; 28 struct servent *sv;
29 socklen_t len; 29 socklen_t len;
30 struct sockaddr_storage cliaddr; 30 struct sockaddr_storage cliaddr;
@@ -33,7 +33,7 @@
33 const char *errstr, *proxyhost = "", *proxyport = NULL; 33 const char *errstr, *proxyhost = "", *proxyport = NULL;
34 struct addrinfo proxyhints; 34 struct addrinfo proxyhints;
35 char unix_dg_tmp_socket_buf[UNIX_DG_TMP_SOCKET_SIZE]; 35 char unix_dg_tmp_socket_buf[UNIX_DG_TMP_SOCKET_SIZE];
36@@ -256,12 +262,14 @@ 36@@ -258,12 +264,14 @@
37 case 'u': 37 case 'u':
38 uflag = 1; 38 uflag = 1;
39 break; 39 break;
@@ -48,9 +48,9 @@
48 case 'v': 48 case 'v':
49 vflag = 1; 49 vflag = 1;
50 break; 50 break;
51@@ -294,9 +302,11 @@ 51@@ -299,9 +307,11 @@
52 errx(1, "TCP send window %s: %s", 52 case 'o':
53 errstr, optarg); 53 oflag = optarg;
54 break; 54 break;
55+#ifdef TCP_MD5SIG 55+#ifdef TCP_MD5SIG
56 case 'S': 56 case 'S':
@@ -60,7 +60,7 @@
60 case 'T': 60 case 'T':
61 errstr = NULL; 61 errstr = NULL;
62 errno = 0; 62 errno = 0;
63@@ -320,9 +330,11 @@ 63@@ -325,9 +335,11 @@
64 argc -= optind; 64 argc -= optind;
65 argv += optind; 65 argv += optind;
66 66
@@ -72,7 +72,7 @@
72 72
73 if (family == AF_UNIX) { 73 if (family == AF_UNIX) {
74 if (pledge("stdio rpath wpath cpath tmppath unix", NULL) == -1) 74 if (pledge("stdio rpath wpath cpath tmppath unix", NULL) == -1)
75@@ -825,7 +837,10 @@ 75@@ -836,7 +848,10 @@
76 remote_connect(const char *host, const char *port, struct addrinfo hints) 76 remote_connect(const char *host, const char *port, struct addrinfo hints)
77 { 77 {
78 struct addrinfo *res, *res0; 78 struct addrinfo *res, *res0;
@@ -84,7 +84,7 @@
84 84
85 if ((error = getaddrinfo(host, port, &hints, &res0))) 85 if ((error = getaddrinfo(host, port, &hints, &res0)))
86 errx(1, "getaddrinfo: %s", gai_strerror(error)); 86 errx(1, "getaddrinfo: %s", gai_strerror(error));
87@@ -839,8 +854,10 @@ 87@@ -850,8 +865,10 @@
88 if (sflag || pflag) { 88 if (sflag || pflag) {
89 struct addrinfo ahints, *ares; 89 struct addrinfo ahints, *ares;
90 90
@@ -95,7 +95,7 @@
95 memset(&ahints, 0, sizeof(struct addrinfo)); 95 memset(&ahints, 0, sizeof(struct addrinfo));
96 ahints.ai_family = res->ai_family; 96 ahints.ai_family = res->ai_family;
97 ahints.ai_socktype = uflag ? SOCK_DGRAM : SOCK_STREAM; 97 ahints.ai_socktype = uflag ? SOCK_DGRAM : SOCK_STREAM;
98@@ -911,7 +928,10 @@ 98@@ -922,7 +939,10 @@
99 local_listen(char *host, char *port, struct addrinfo hints) 99 local_listen(char *host, char *port, struct addrinfo hints)
100 { 100 {
101 struct addrinfo *res, *res0; 101 struct addrinfo *res, *res0;
@@ -107,7 +107,7 @@
107 int error; 107 int error;
108 108
109 /* Allow nodename to be null. */ 109 /* Allow nodename to be null. */
110@@ -932,9 +952,11 @@ 110@@ -943,9 +963,11 @@
111 res->ai_protocol)) < 0) 111 res->ai_protocol)) < 0)
112 continue; 112 continue;
113 113
@@ -119,7 +119,7 @@
119 119
120 set_common_sockopts(s, res->ai_family); 120 set_common_sockopts(s, res->ai_family);
121 121
122@@ -1392,11 +1414,13 @@ 122@@ -1403,11 +1425,13 @@
123 { 123 {
124 int x = 1; 124 int x = 1;
125 125
@@ -133,7 +133,7 @@
133 if (Dflag) { 133 if (Dflag) {
134 if (setsockopt(s, SOL_SOCKET, SO_DEBUG, 134 if (setsockopt(s, SOL_SOCKET, SO_DEBUG,
135 &x, sizeof(x)) == -1) 135 &x, sizeof(x)) == -1)
136@@ -1433,13 +1457,17 @@ 136@@ -1444,13 +1468,17 @@
137 } 137 }
138 138
139 if (minttl != -1) { 139 if (minttl != -1) {
@@ -152,7 +152,7 @@
152 } 152 }
153 } 153 }
154 154
155@@ -1596,14 +1624,22 @@ 155@@ -1644,14 +1672,22 @@
156 \t-P proxyuser\tUsername for proxy authentication\n\ 156 \t-P proxyuser\tUsername for proxy authentication\n\
157 \t-p port\t Specify local port for remote connects\n\ 157 \t-p port\t Specify local port for remote connects\n\
158 \t-R CAfile CA bundle\n\ 158 \t-R CAfile CA bundle\n\