diff options
author | Theo Buehler <tb@openbsd.org> | 2023-02-09 18:44:56 +0100 |
---|---|---|
committer | Brent Cook <busterb@gmail.com> | 2023-02-13 20:36:37 -0600 |
commit | 7dc7ef81d16f98327321028257e8ecaebe95bfc2 (patch) | |
tree | 83a7890078d66a58f3a607e7400f4770cd0caaac /patches/netcat.c.patch | |
parent | 81e6fb0fe9999a51b6d21393247a32cc4e18f738 (diff) | |
download | portable-7dc7ef81d16f98327321028257e8ecaebe95bfc2.tar.gz portable-7dc7ef81d16f98327321028257e8ecaebe95bfc2.tar.bz2 portable-7dc7ef81d16f98327321028257e8ecaebe95bfc2.zip |
refresh patches
Diffstat (limited to 'patches/netcat.c.patch')
-rw-r--r-- | patches/netcat.c.patch | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/patches/netcat.c.patch b/patches/netcat.c.patch index d21466a..f9d4be0 100644 --- a/patches/netcat.c.patch +++ b/patches/netcat.c.patch | |||
@@ -1,6 +1,6 @@ | |||
1 | --- apps/nc/netcat.c.orig Wed Jun 22 11:15:52 2022 | 1 | --- apps/nc/netcat.c.orig Thu Feb 9 18:42:55 2023 |
2 | +++ apps/nc/netcat.c Wed Jun 22 11:15:52 2022 | 2 | +++ apps/nc/netcat.c Thu Feb 9 18:43:08 2023 |
3 | @@ -93,9 +93,13 @@ | 3 | @@ -93,9 +93,13 @@ int zflag; /* Port Scan Flag */ |
4 | int Dflag; /* sodebug */ | 4 | int Dflag; /* sodebug */ |
5 | int Iflag; /* TCP receive buffer size */ | 5 | int Iflag; /* TCP receive buffer size */ |
6 | int Oflag; /* TCP send buffer size */ | 6 | int Oflag; /* TCP send buffer size */ |
@@ -14,7 +14,7 @@ | |||
14 | 14 | ||
15 | int usetls; /* use TLS */ | 15 | int usetls; /* use TLS */ |
16 | const char *Cflag; /* Public cert file */ | 16 | const char *Cflag; /* Public cert file */ |
17 | @@ -269,12 +273,14 @@ | 17 | @@ -268,12 +272,14 @@ main(int argc, char *argv[]) |
18 | case 'u': | 18 | case 'u': |
19 | uflag = 1; | 19 | uflag = 1; |
20 | break; | 20 | break; |
@@ -29,7 +29,7 @@ | |||
29 | case 'v': | 29 | case 'v': |
30 | vflag = 1; | 30 | vflag = 1; |
31 | break; | 31 | break; |
32 | @@ -321,9 +327,11 @@ | 32 | @@ -320,9 +326,11 @@ main(int argc, char *argv[]) |
33 | case 'o': | 33 | case 'o': |
34 | oflag = optarg; | 34 | oflag = optarg; |
35 | break; | 35 | break; |
@@ -41,7 +41,7 @@ | |||
41 | case 'T': | 41 | case 'T': |
42 | errstr = NULL; | 42 | errstr = NULL; |
43 | errno = 0; | 43 | errno = 0; |
44 | @@ -347,9 +355,11 @@ | 44 | @@ -346,9 +354,11 @@ main(int argc, char *argv[]) |
45 | argc -= optind; | 45 | argc -= optind; |
46 | argv += optind; | 46 | argv += optind; |
47 | 47 | ||
@@ -53,7 +53,7 @@ | |||
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 (argc == 1 && family == AF_UNIX) { | 55 | if (argc == 1 && family == AF_UNIX) { |
56 | @@ -945,7 +955,10 @@ | 56 | @@ -927,7 +937,10 @@ remote_connect(const char *host, const char *port, str |
57 | char *ipaddr) | 57 | char *ipaddr) |
58 | { | 58 | { |
59 | struct addrinfo *res, *res0; | 59 | struct addrinfo *res, *res0; |
@@ -65,7 +65,7 @@ | |||
65 | 65 | ||
66 | if ((error = getaddrinfo(host, port, &hints, &res0))) | 66 | if ((error = getaddrinfo(host, port, &hints, &res0))) |
67 | errx(1, "getaddrinfo for host \"%s\" port %s: %s", host, | 67 | errx(1, "getaddrinfo for host \"%s\" port %s: %s", host, |
68 | @@ -960,8 +973,10 @@ | 68 | @@ -942,8 +955,10 @@ remote_connect(const char *host, const char *port, str |
69 | if (sflag || pflag) { | 69 | if (sflag || pflag) { |
70 | struct addrinfo ahints, *ares; | 70 | struct addrinfo ahints, *ares; |
71 | 71 | ||
@@ -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 | @@ -1053,7 +1068,10 @@ | 79 | @@ -1035,7 +1050,10 @@ int |
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 | @@ -1074,9 +1092,11 @@ | 91 | @@ -1056,9 +1074,11 @@ local_listen(const char *host, const char *port, struc |
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 | @@ -1545,11 +1565,13 @@ | 103 | @@ -1557,11 +1577,13 @@ set_common_sockopts(int s, int af) |
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 | @@ -1560,9 +1582,16 @@ | 117 | @@ -1572,9 +1594,16 @@ set_common_sockopts(int s, int af) |
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 | @@ -1586,13 +1615,17 @@ | 134 | @@ -1598,13 +1627,17 @@ set_common_sockopts(int s, int af) |
135 | } | 135 | } |
136 | 136 | ||
137 | if (minttl != -1) { | 137 | if (minttl != -1) { |
@@ -150,7 +150,7 @@ | |||
150 | } | 150 | } |
151 | } | 151 | } |
152 | 152 | ||
153 | @@ -1817,15 +1850,19 @@ | 153 | @@ -1829,15 +1862,19 @@ help(void) |
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\ |