From c7ae7c0c9dfacbf93c939f14665d861495595a32 Mon Sep 17 00:00:00 2001 From: Brent Cook Date: Sun, 13 Sep 2015 19:15:34 -0500 Subject: fix a library paths, nc patch --- apps/nc/Makefile.am | 4 ++-- patches/netcat.c.patch | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/apps/nc/Makefile.am b/apps/nc/Makefile.am index 7d8e04f..d0f6c0c 100644 --- a/apps/nc/Makefile.am +++ b/apps/nc/Makefile.am @@ -7,8 +7,8 @@ noinst_PROGRAMS = nc EXTRA_DIST = nc.1 nc_LDADD = $(PLATFORM_LDADD) $(PROG_LDADD) -nc_LDADD += $(top_builddir)/tls/libcrypto.la -nc_LDADD += $(top_builddir)/tls/libssl.la +nc_LDADD += $(top_builddir)/crypto/libcrypto.la +nc_LDADD += $(top_builddir)/ssl/libssl.la nc_LDADD += $(top_builddir)/tls/libtls.la CPPFLAGS += -I$(top_srcdir)/apps/nc/compat diff --git a/patches/netcat.c.patch b/patches/netcat.c.patch index 9f26ed4..fc61550 100644 --- a/patches/netcat.c.patch +++ b/patches/netcat.c.patch @@ -1,5 +1,5 @@ --- apps/nc/netcat.c.orig Sun Sep 13 08:12:39 2015 -+++ apps/nc/netcat.c Sun Sep 13 19:05:00 2015 ++++ apps/nc/netcat.c Sun Sep 13 19:15:13 2015 @@ -98,9 +98,13 @@ int Dflag; /* sodebug */ int Iflag; /* TCP receive buffer size */ @@ -90,7 +90,7 @@ - int s, ret, x = 1; + int s; +#ifdef SO_REUSEPORT -+ int ret; x = 1; ++ int ret, x = 1; +#endif int error; -- cgit v1.2.3-55-g6feb