factotum/libressl-portable
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

a few more linux nc build tweaks

Browse Source
This commit is contained in:
Brent Cook 2015-09-13 19:06:29 -05:00
parent 696ba18c6a
commit eaa4c1cc8a
2 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/nc/Makefile.am
View File

@ -7,6 +7,8 @@ noinst_PROGRAMS = nc
EXTRA_DIST = nc.1 EXTRA_DIST = nc.1
nc_LDADD = $(PLATFORM_LDADD) $(PROG_LDADD) nc_LDADD = $(PLATFORM_LDADD) $(PROG_LDADD)
nc_LDADD += $(top_builddir)/tls/libcrypto.la
nc_LDADD += $(top_builddir)/tls/libssl.la
nc_LDADD += $(top_builddir)/tls/libtls.la nc_LDADD += $(top_builddir)/tls/libtls.la
CPPFLAGS += -I$(top_srcdir)/apps/nc/compat CPPFLAGS += -I$(top_srcdir)/apps/nc/compat

20
patches/netcat.c.patch
View File

@ -1,5 +1,5 @@
--- apps/nc/netcat.c.orig Sun Sep 13 08:12:39 2015 --- apps/nc/netcat.c.orig Sun Sep 13 08:12:39 2015
+++ apps/nc/netcat.c Sun Sep 13 18:56:27 2015 +++ apps/nc/netcat.c Sun Sep 13 19:05:00 2015
@@ -98,9 +98,13 @@ @@ -98,9 +98,13 @@
int Dflag; /* sodebug */ int Dflag; /* sodebug */
int Iflag; /* TCP receive buffer size */ int Iflag; /* TCP receive buffer size */
@ -83,7 +83,19 @@
memset(&ahints, 0, sizeof(struct addrinfo)); memset(&ahints, 0, sizeof(struct addrinfo));
ahints.ai_family = res0->ai_family; ahints.ai_family = res0->ai_family;
ahints.ai_socktype = uflag ? SOCK_DGRAM : SOCK_STREAM; ahints.ai_socktype = uflag ? SOCK_DGRAM : SOCK_STREAM;
@@ -887,13 +902,17 @@ @@ -865,7 +880,10 @@
local_listen(char *host, char *port, struct addrinfo hints)
{
struct addrinfo *res, *res0;
- int s, ret, x = 1;
+ int s;
+#ifdef SO_REUSEPORT
+ int ret; x = 1;
+#endif
int error;
/* Allow nodename to be null. */
@@ -887,13 +905,17 @@
res0->ai_protocol)) < 0) res0->ai_protocol)) < 0)
continue; continue;
@ -101,7 +113,7 @@
set_common_sockopts(s, res0->ai_family); set_common_sockopts(s, res0->ai_family);
@@ -1337,11 +1356,13 @@ @@ -1337,11 +1359,13 @@
{ {
int x = 1; int x = 1;
@ -115,7 +127,7 @@
if (Dflag) { if (Dflag) {
if (setsockopt(s, SOL_SOCKET, SO_DEBUG, if (setsockopt(s, SOL_SOCKET, SO_DEBUG,
&x, sizeof(x)) == -1) &x, sizeof(x)) == -1)
@@ -1516,15 +1537,19 @@ @@ -1516,15 +1540,19 @@
\t-P proxyuser\tUsername for proxy authentication\n\ \t-P proxyuser\tUsername for proxy authentication\n\
\t-p port\t Specify local port for remote connects\n\ \t-p port\t Specify local port for remote connects\n\
\t-R CAfile CA bundle\n\ \t-R CAfile CA bundle\n\