aboutsummaryrefslogtreecommitdiff
path: root/patches/netcat.c.patch
diff options
context:
space:
mode:
authorBrent Cook <busterb@gmail.com>2019-11-30 03:50:54 -0600
committerBrent Cook <busterb@gmail.com>2019-11-30 03:50:54 -0600
commitda75637d836a8e930e671ea69e47355dac74cc07 (patch)
tree5ab952b5ddf2362add039fe84ed442b6f5767e6c /patches/netcat.c.patch
parent77216eec7ac40bee90fafa4344242abf028db08d (diff)
downloadportable-da75637d836a8e930e671ea69e47355dac74cc07.tar.gz
portable-da75637d836a8e930e671ea69e47355dac74cc07.tar.bz2
portable-da75637d836a8e930e671ea69e47355dac74cc07.zip
update netcat patch
Diffstat (limited to 'patches/netcat.c.patch')
-rw-r--r--patches/netcat.c.patch18
1 files changed, 9 insertions, 9 deletions
diff --git a/patches/netcat.c.patch b/patches/netcat.c.patch
index f9c08ad..f32623c 100644
--- a/patches/netcat.c.patch
+++ b/patches/netcat.c.patch
@@ -1,5 +1,5 @@
1--- apps/nc/netcat.c.orig Sun Oct 27 09:22:15 2019 1--- apps/nc/netcat.c.orig Mon Nov 18 01:13:56 2019
2+++ apps/nc/netcat.c Sun Oct 27 09:24:17 2019 2+++ apps/nc/netcat.c Sat Nov 30 03:29:50 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 */
@@ -52,7 +52,7 @@
52+#endif 52+#endif
53 53
54 /* Cruft to make sure options are clean, and used properly. */ 54 /* Cruft to make sure options are clean, and used properly. */
55 if (argv[0] && !argv[1] && family == AF_UNIX) { 55 if (argc == 1 && family == AF_UNIX) {
56@@ -926,7 +936,10 @@ 56@@ -926,7 +936,10 @@
57 char *ipaddr) 57 char *ipaddr)
58 { 58 {
@@ -76,7 +76,7 @@
76 memset(&ahints, 0, sizeof(struct addrinfo)); 76 memset(&ahints, 0, sizeof(struct addrinfo));
77 ahints.ai_family = res->ai_family; 77 ahints.ai_family = res->ai_family;
78 ahints.ai_socktype = uflag ? SOCK_DGRAM : SOCK_STREAM; 78 ahints.ai_socktype = uflag ? SOCK_DGRAM : SOCK_STREAM;
79@@ -1028,7 +1043,10 @@ 79@@ -1034,7 +1049,10 @@
80 local_listen(const char *host, const char *port, struct addrinfo hints) 80 local_listen(const char *host, const char *port, struct addrinfo hints)
81 { 81 {
82 struct addrinfo *res, *res0; 82 struct addrinfo *res, *res0;
@@ -88,7 +88,7 @@
88 int error; 88 int error;
89 89
90 /* Allow nodename to be null. */ 90 /* Allow nodename to be null. */
91@@ -1049,9 +1067,11 @@ 91@@ -1055,9 +1073,11 @@
92 res->ai_protocol)) == -1) 92 res->ai_protocol)) == -1)
93 continue; 93 continue;
94 94
@@ -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@@ -1521,11 +1541,13 @@ 103@@ -1555,11 +1575,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@@ -1536,9 +1558,16 @@ 117@@ -1570,9 +1592,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@@ -1562,13 +1591,17 @@ 134@@ -1596,13 +1625,17 @@
135 } 135 }
136 136
137 if (minttl != -1) { 137 if (minttl != -1) {
@@ -150,7 +150,7 @@
150 } 150 }
151 } 151 }
152 152
153@@ -1790,14 +1823,22 @@ 153@@ -1824,14 +1857,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\