diff options
author | Brent Cook <busterb@gmail.com> | 2019-05-07 02:11:02 -0500 |
---|---|---|
committer | Brent Cook <busterb@gmail.com> | 2019-05-07 02:11:02 -0500 |
commit | 6e2215c465448b68f35943713c36252f039dd950 (patch) | |
tree | db7fa02a527db15a10d95a24c7a387c2db468a24 /patches/netcat.c.patch | |
parent | 04aa7f71288b38a4ce18cf0789c52fab3a4e04c2 (diff) | |
download | portable-6e2215c465448b68f35943713c36252f039dd950.tar.gz portable-6e2215c465448b68f35943713c36252f039dd950.tar.bz2 portable-6e2215c465448b68f35943713c36252f039dd950.zip |
rebase patches
Diffstat (limited to 'patches/netcat.c.patch')
-rw-r--r-- | patches/netcat.c.patch | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/patches/netcat.c.patch b/patches/netcat.c.patch index 03857c9..c06eb5b 100644 --- a/patches/netcat.c.patch +++ b/patches/netcat.c.patch | |||
@@ -1,5 +1,5 @@ | |||
1 | --- apps/nc/netcat.c.orig Fri Jan 18 15:41:52 2019 | 1 | --- apps/nc/netcat.c.orig Tue Mar 19 05:24:51 2019 |
2 | +++ apps/nc/netcat.c Sat Jan 19 22:19:23 2019 | 2 | +++ apps/nc/netcat.c Tue May 7 02:07:40 2019 |
3 | @@ -93,9 +93,13 @@ | 3 | @@ -93,9 +93,13 @@ |
4 | int Dflag; /* sodebug */ | 4 | int Dflag; /* sodebug */ |
5 | int Iflag; /* TCP receive buffer size */ | 5 | int Iflag; /* TCP receive buffer size */ |
@@ -100,7 +100,7 @@ | |||
100 | 100 | ||
101 | set_common_sockopts(s, res->ai_family); | 101 | set_common_sockopts(s, res->ai_family); |
102 | 102 | ||
103 | @@ -1494,11 +1514,13 @@ | 103 | @@ -1498,11 +1518,13 @@ |
104 | { | 104 | { |
105 | int x = 1; | 105 | int x = 1; |
106 | 106 | ||
@@ -114,7 +114,7 @@ | |||
114 | if (Dflag) { | 114 | if (Dflag) { |
115 | if (setsockopt(s, SOL_SOCKET, SO_DEBUG, | 115 | if (setsockopt(s, SOL_SOCKET, SO_DEBUG, |
116 | &x, sizeof(x)) == -1) | 116 | &x, sizeof(x)) == -1) |
117 | @@ -1509,9 +1531,16 @@ | 117 | @@ -1513,9 +1535,16 @@ |
118 | IP_TOS, &Tflag, sizeof(Tflag)) == -1) | 118 | IP_TOS, &Tflag, sizeof(Tflag)) == -1) |
119 | err(1, "set IP ToS"); | 119 | err(1, "set IP ToS"); |
120 | 120 | ||
@@ -131,7 +131,7 @@ | |||
131 | } | 131 | } |
132 | if (Iflag) { | 132 | if (Iflag) { |
133 | if (setsockopt(s, SOL_SOCKET, SO_RCVBUF, | 133 | if (setsockopt(s, SOL_SOCKET, SO_RCVBUF, |
134 | @@ -1535,13 +1564,17 @@ | 134 | @@ -1539,13 +1568,17 @@ |
135 | } | 135 | } |
136 | 136 | ||
137 | if (minttl != -1) { | 137 | if (minttl != -1) { |
@@ -150,7 +150,7 @@ | |||
150 | } | 150 | } |
151 | } | 151 | } |
152 | 152 | ||
153 | @@ -1763,14 +1796,22 @@ | 153 | @@ -1767,14 +1800,22 @@ |
154 | \t-P proxyuser\tUsername for proxy authentication\n\ | 154 | \t-P proxyuser\tUsername for proxy authentication\n\ |
155 | \t-p port\t Specify local port for remote connects\n\ | 155 | \t-p port\t Specify local port for remote connects\n\ |
156 | \t-R CAfile CA bundle\n\ | 156 | \t-R CAfile CA bundle\n\ |