update patches
This commit is contained in:
parent
5f187770f3
commit
f99d89a0fc
@ -1,5 +1,5 @@
|
||||
--- apps/nc/netcat.c.orig Mon Oct 3 06:09:29 2016
|
||||
+++ apps/nc/netcat.c Sun Oct 30 21:42:27 2016
|
||||
--- apps/nc/netcat.c.orig Sat Nov 5 14:00:01 2016
|
||||
+++ apps/nc/netcat.c Sat Nov 5 15:28:35 2016
|
||||
@@ -65,7 +65,9 @@
|
||||
#define POLL_NETIN 2
|
||||
#define POLL_STDOUT 3
|
||||
@ -10,7 +10,7 @@
|
||||
|
||||
#define TLS_LEGACY (1 << 1)
|
||||
#define TLS_NOVERIFY (1 << 2)
|
||||
@@ -92,9 +94,13 @@
|
||||
@@ -93,9 +95,13 @@
|
||||
int Dflag; /* sodebug */
|
||||
int Iflag; /* TCP receive buffer size */
|
||||
int Oflag; /* TCP send buffer size */
|
||||
@ -24,7 +24,7 @@
|
||||
|
||||
int usetls; /* use TLS */
|
||||
char *Cflag; /* Public cert file */
|
||||
@@ -146,7 +152,7 @@
|
||||
@@ -148,7 +154,7 @@
|
||||
struct servent *sv;
|
||||
socklen_t len;
|
||||
struct sockaddr_storage cliaddr;
|
||||
@ -33,7 +33,7 @@
|
||||
const char *errstr, *proxyhost = "", *proxyport = NULL;
|
||||
struct addrinfo proxyhints;
|
||||
char unix_dg_tmp_socket_buf[UNIX_DG_TMP_SOCKET_SIZE];
|
||||
@@ -256,12 +262,14 @@
|
||||
@@ -258,12 +264,14 @@
|
||||
case 'u':
|
||||
uflag = 1;
|
||||
break;
|
||||
@ -48,9 +48,9 @@
|
||||
case 'v':
|
||||
vflag = 1;
|
||||
break;
|
||||
@@ -294,9 +302,11 @@
|
||||
errx(1, "TCP send window %s: %s",
|
||||
errstr, optarg);
|
||||
@@ -299,9 +307,11 @@
|
||||
case 'o':
|
||||
oflag = optarg;
|
||||
break;
|
||||
+#ifdef TCP_MD5SIG
|
||||
case 'S':
|
||||
@ -60,7 +60,7 @@
|
||||
case 'T':
|
||||
errstr = NULL;
|
||||
errno = 0;
|
||||
@@ -320,9 +330,11 @@
|
||||
@@ -325,9 +335,11 @@
|
||||
argc -= optind;
|
||||
argv += optind;
|
||||
|
||||
@ -72,7 +72,7 @@
|
||||
|
||||
if (family == AF_UNIX) {
|
||||
if (pledge("stdio rpath wpath cpath tmppath unix", NULL) == -1)
|
||||
@@ -825,7 +837,10 @@
|
||||
@@ -836,7 +848,10 @@
|
||||
remote_connect(const char *host, const char *port, struct addrinfo hints)
|
||||
{
|
||||
struct addrinfo *res, *res0;
|
||||
@ -84,7 +84,7 @@
|
||||
|
||||
if ((error = getaddrinfo(host, port, &hints, &res0)))
|
||||
errx(1, "getaddrinfo: %s", gai_strerror(error));
|
||||
@@ -839,8 +854,10 @@
|
||||
@@ -850,8 +865,10 @@
|
||||
if (sflag || pflag) {
|
||||
struct addrinfo ahints, *ares;
|
||||
|
||||
@ -95,7 +95,7 @@
|
||||
memset(&ahints, 0, sizeof(struct addrinfo));
|
||||
ahints.ai_family = res->ai_family;
|
||||
ahints.ai_socktype = uflag ? SOCK_DGRAM : SOCK_STREAM;
|
||||
@@ -911,7 +928,10 @@
|
||||
@@ -922,7 +939,10 @@
|
||||
local_listen(char *host, char *port, struct addrinfo hints)
|
||||
{
|
||||
struct addrinfo *res, *res0;
|
||||
@ -107,7 +107,7 @@
|
||||
int error;
|
||||
|
||||
/* Allow nodename to be null. */
|
||||
@@ -932,9 +952,11 @@
|
||||
@@ -943,9 +963,11 @@
|
||||
res->ai_protocol)) < 0)
|
||||
continue;
|
||||
|
||||
@ -119,7 +119,7 @@
|
||||
|
||||
set_common_sockopts(s, res->ai_family);
|
||||
|
||||
@@ -1392,11 +1414,13 @@
|
||||
@@ -1403,11 +1425,13 @@
|
||||
{
|
||||
int x = 1;
|
||||
|
||||
@ -133,7 +133,7 @@
|
||||
if (Dflag) {
|
||||
if (setsockopt(s, SOL_SOCKET, SO_DEBUG,
|
||||
&x, sizeof(x)) == -1)
|
||||
@@ -1433,13 +1457,17 @@
|
||||
@@ -1444,13 +1468,17 @@
|
||||
}
|
||||
|
||||
if (minttl != -1) {
|
||||
@ -152,7 +152,7 @@
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1596,14 +1624,22 @@
|
||||
@@ -1644,14 +1672,22 @@
|
||||
\t-P proxyuser\tUsername for proxy authentication\n\
|
||||
\t-p port\t Specify local port for remote connects\n\
|
||||
\t-R CAfile CA bundle\n\
|
||||
|
@ -1,6 +1,6 @@
|
||||
--- apps/openssl/openssl.c.orig Sun Sep 13 09:11:31 2015
|
||||
+++ apps/openssl/openssl.c Sun Sep 13 09:10:02 2015
|
||||
@@ -399,7 +399,9 @@
|
||||
--- apps/openssl/openssl.c.orig Fri Nov 4 09:33:19 2016
|
||||
+++ apps/openssl/openssl.c Sat Nov 5 15:28:35 2016
|
||||
@@ -396,7 +396,9 @@
|
||||
static void
|
||||
openssl_startup(void)
|
||||
{
|
||||
|
Loading…
Reference in New Issue
Block a user