diff options
author | Brent Cook <bcook@openbsd.org> | 2015-09-13 19:15:34 -0500 |
---|---|---|
committer | Brent Cook <bcook@openbsd.org> | 2015-09-13 19:15:34 -0500 |
commit | c7ae7c0c9dfacbf93c939f14665d861495595a32 (patch) | |
tree | 52dfb5c8c722f34bb8cc47980666b565e7873fd6 | |
parent | 2cb6d19e10b6e36c7cd569899a45b51c3751b740 (diff) | |
download | portable-c7ae7c0c9dfacbf93c939f14665d861495595a32.tar.gz portable-c7ae7c0c9dfacbf93c939f14665d861495595a32.tar.bz2 portable-c7ae7c0c9dfacbf93c939f14665d861495595a32.zip |
fix a library paths, nc patch
-rw-r--r-- | apps/nc/Makefile.am | 4 | ||||
-rw-r--r-- | 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 | |||
7 | EXTRA_DIST = nc.1 | 7 | EXTRA_DIST = nc.1 |
8 | 8 | ||
9 | nc_LDADD = $(PLATFORM_LDADD) $(PROG_LDADD) | 9 | nc_LDADD = $(PLATFORM_LDADD) $(PROG_LDADD) |
10 | nc_LDADD += $(top_builddir)/tls/libcrypto.la | 10 | nc_LDADD += $(top_builddir)/crypto/libcrypto.la |
11 | nc_LDADD += $(top_builddir)/tls/libssl.la | 11 | nc_LDADD += $(top_builddir)/ssl/libssl.la |
12 | nc_LDADD += $(top_builddir)/tls/libtls.la | 12 | nc_LDADD += $(top_builddir)/tls/libtls.la |
13 | 13 | ||
14 | CPPFLAGS += -I$(top_srcdir)/apps/nc/compat | 14 | 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 @@ | |||
1 | --- apps/nc/netcat.c.orig Sun Sep 13 08:12:39 2015 | 1 | --- apps/nc/netcat.c.orig Sun Sep 13 08:12:39 2015 |
2 | +++ apps/nc/netcat.c Sun Sep 13 19:05:00 2015 | 2 | +++ apps/nc/netcat.c Sun Sep 13 19:15:13 2015 |
3 | @@ -98,9 +98,13 @@ | 3 | @@ -98,9 +98,13 @@ |
4 | int Dflag; /* sodebug */ | 4 | int Dflag; /* sodebug */ |
5 | int Iflag; /* TCP receive buffer size */ | 5 | int Iflag; /* TCP receive buffer size */ |
@@ -90,7 +90,7 @@ | |||
90 | - int s, ret, x = 1; | 90 | - int s, ret, x = 1; |
91 | + int s; | 91 | + int s; |
92 | +#ifdef SO_REUSEPORT | 92 | +#ifdef SO_REUSEPORT |
93 | + int ret; x = 1; | 93 | + int ret, x = 1; |
94 | +#endif | 94 | +#endif |
95 | int error; | 95 | int error; |
96 | 96 | ||