rebase patches

author: Brent Cook <busterb@gmail.com> 2020-02-15 11:32:11 -0600
committer: Brent Cook <busterb@gmail.com> 2020-02-15 11:32:11 -0600
commit: 14dd93c37a2a38dee7b8d2e0b823b0e0cc21e8d4 (patch)
tree: 1771e8d5243dc8d8662fe0676ed9847fb20cbcc5
parent: 7f3bfc89224d5868675e101d7fb32baa806f84d8 (diff)
download: portable-14dd93c37a2a38dee7b8d2e0b823b0e0cc21e8d4.tar.gz
portable-14dd93c37a2a38dee7b8d2e0b823b0e0cc21e8d4.tar.bz2
portable-14dd93c37a2a38dee7b8d2e0b823b0e0cc21e8d4.zip
2 files changed, 26 insertions, 27 deletions
diff --git a/patches/netcat.c.patch b/patches/netcat.c.patch
index f32623c..7d82aca 100644
--- a/patches/netcat.c.patch
+++ b/patches/netcat.c.patch
@@ -1,5 +1,5 @@
--- apps/nc/netcat.c.orig       Mon Nov 18 01:13:56 2019
+--- apps/nc/netcat.c.orig       Sat Feb 15 11:04:42 2020
-+++ apps/nc/netcat.c    Sat Nov 30 03:29:50 2019
+++ apps/nc/netcat.c    Sat Feb 15 11:24:38 2020
 @@ -93,9 +93,13 @@
 int    Dflag;                                  /* sodebug */
 int    Iflag;                                  /* TCP receive buffer size */
@@ -53,7 +53,7 @@
 
        /* Cruft to make sure options are clean, and used properly. */
        if (argc == 1 && family == AF_UNIX) {
-@@ -926,7 +936,10 @@
+@@ -947,7 +957,10 @@
     char *ipaddr)
 {
        struct addrinfo *res, *res0;
@@ -65,7 +65,7 @@
 
        if ((error = getaddrinfo(host, port, &hints, &res0)))
                errx(1, "getaddrinfo for host \"%s\" port %s: %s", host,
-@@ -941,8 +954,10 @@
+@@ -962,8 +975,10 @@
                if (sflag || pflag) {
                        struct addrinfo ahints, *ares;
 
@@ -76,7 +76,7 @@
                        memset(&ahints, 0, sizeof(struct addrinfo));
                        ahints.ai_family = res->ai_family;
                        ahints.ai_socktype = uflag ? SOCK_DGRAM : SOCK_STREAM;
-@@ -1034,7 +1049,10 @@
+@@ -1055,7 +1070,10 @@
 local_listen(const char *host, const char *port, struct addrinfo hints)
 {
        struct addrinfo *res, *res0;
@@ -88,7 +88,7 @@
        int error;
 
        /* Allow nodename to be null. */
-@@ -1055,9 +1073,11 @@
+@@ -1076,9 +1094,11 @@
                    res->ai_protocol)) == -1)
                        continue;
 
@@ -100,7 +100,7 @@
 
                set_common_sockopts(s, res->ai_family);
 
-@@ -1555,11 +1575,13 @@
+@@ -1548,11 +1568,13 @@
 {
        int x = 1;
 
@@ -114,7 +114,7 @@
        if (Dflag) {
                if (setsockopt(s, SOL_SOCKET, SO_DEBUG,
                        &x, sizeof(x)) == -1)
-@@ -1570,9 +1592,16 @@
+@@ -1563,9 +1585,16 @@
                    IP_TOS, &Tflag, sizeof(Tflag)) == -1)
                        err(1, "set IP ToS");
 
@@ -131,7 +131,7 @@
        }
        if (Iflag) {
                if (setsockopt(s, SOL_SOCKET, SO_RCVBUF,
-@@ -1596,13 +1625,17 @@
+@@ -1589,13 +1618,17 @@
        }
 
        if (minttl != -1) {
@@ -150,30 +150,29 @@
        }
 }
 
-@@ -1824,14 +1857,22 @@
+@@ -1820,15 +1853,19 @@
        \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\
 -       \t-r            Randomize remote ports\n\
 -       \t-S            Enable the TCP MD5 signature option\n\
+-       \t-s sourceaddr Local source address\n\
 +       \t-r            Randomize remote ports\n"
 +#ifdef TCP_MD5SIG
-+       "\
+       "\t-S           Enable the TCP MD5 signature option\n"
-+       \t-S            Enable the TCP MD5 signature option\n"
 +#endif
-+       "\
+       "\t-s sourceaddr        Local source address\n\
-        \t-s source     Local source address\n\
        \t-T keyword    TOS value or TLS options\n\
        \t-t            Answer TELNET negotiation\n\
        \t-U            Use UNIX domain socket\n\
 -       \t-u            UDP mode\n\
 -       \t-V rtable     Specify alternate routing table\n\
+-       \t-v            Verbose\n\
 +       \t-u            UDP mode\n"
 +#ifdef SO_RTABLE
-+       "\
+       "\t-V rtable    Specify alternate routing table\n"
-+       \t-V rtable     Specify alternate routing table\n"
 +#endif
-+       "\
+       "\t-v           Verbose\n\
-        \t-v            Verbose\n\
        \t-W recvlimit  Terminate after receiving a number of packets\n\
        \t-w timeout    Timeout for connects and final net reads\n\
+        \t-X proto      Proxy protocol: \"4\", \"5\" (SOCKS) or \"connect\"\n\
diff --git a/patches/tlsexttest.c.patch b/patches/tlsexttest.c.patch
index ffb222b..205f30b 100644
--- a/patches/tlsexttest.c.patch
+++ b/patches/tlsexttest.c.patch
@@ -1,6 +1,6 @@
--- tests/tlsexttest.c.orig     Thu Apr 11 06:27:40 2019
+--- tests/tlsexttest.c.orig     Sat Feb 15 11:04:42 2020
-+++ tests/tlsexttest.c  Tue May  7 02:07:40 2019
+++ tests/tlsexttest.c  Sat Feb 15 11:25:30 2020
-@@ -1654,7 +1654,9 @@
+@@ -1656,7 +1656,9 @@
 };
 
 static unsigned char tlsext_sni_server[] = {
@@ -10,7 +10,7 @@
 
 static int
 test_tlsext_sni_client(void)
-@@ -1817,9 +1819,9 @@
+@@ -1819,9 +1821,9 @@
        if (!CBB_finish(&cbb, &data, &dlen))
                errx(1, "failed to finish CBB");
 
@@ -22,7 +22,7 @@
                goto err;
        }
 
-@@ -1828,14 +1830,14 @@
+@@ -1830,14 +1832,14 @@
                fprintf(stderr, "received:\n");
                hexdump(data, dlen);
                fprintf(stderr, "test data:\n");
@@ -39,7 +39,7 @@
        if (!tlsext_sni_client_parse(ssl, &cbs, &alert)) {
                FAIL("failed to parse server SNI\n");
                goto err;
-@@ -2719,7 +2721,10 @@
+@@ -2721,7 +2723,10 @@
        0x02, 0x01, 0x02, 0x03,
 };
 
@@ -51,7 +51,7 @@
 
 static int
 test_tlsext_clienthello_build(void)
-@@ -2784,18 +2789,18 @@
+@@ -2786,18 +2791,18 @@
        if (!CBB_finish(&cbb, &data, &dlen))
                errx(1, "failed to finish CBB");
 
@@ -74,7 +74,7 @@
                goto err;
        }
 
-@@ -2810,7 +2815,10 @@
+@@ -2812,7 +2817,10 @@
        return (failure);
 }
 
@@ -86,7 +86,7 @@
 
 unsigned char tlsext_serverhello_enabled[] = {
        0x00, 0x13, 0xff, 0x01, 0x00, 0x01, 0x00, 0x00,
-@@ -2850,18 +2858,18 @@
+@@ -2852,18 +2860,18 @@
        if (!CBB_finish(&cbb, &data, &dlen))
                errx(1, "failed to finish CBB");
author	Brent Cook <busterb@gmail.com>	2020-02-15 11:32:11 -0600
committer	Brent Cook <busterb@gmail.com>	2020-02-15 11:32:11 -0600
commit	14dd93c37a2a38dee7b8d2e0b823b0e0cc21e8d4 (patch)
tree	1771e8d5243dc8d8662fe0676ed9847fb20cbcc5
parent	7f3bfc89224d5868675e101d7fb32baa806f84d8 (diff)
download	portable-14dd93c37a2a38dee7b8d2e0b823b0e0cc21e8d4.tar.gz portable-14dd93c37a2a38dee7b8d2e0b823b0e0cc21e8d4.tar.bz2 portable-14dd93c37a2a38dee7b8d2e0b823b0e0cc21e8d4.zip