add some backcompat in nc, don't install it

2 files changed, 10 insertions, 1 deletions

diff --git a/apps/nc/Makefile.am b/apps/nc/Makefile.am
index ccb770a..a8e7a40 100644
--- a/apps/nc/Makefile.am
+++ b/apps/nc/Makefile.am
@@ -1,6 +1,8 @@
 include $(top_srcdir)/Makefile.am.common
 
-bin_PROGRAMS = nc
+if HAVE_POLL
+
+noinst_PROGRAMS = nc
 
 nc_LDADD = $(PLATFORM_LDADD) $(PROG_LDADD)
 nc_LDADD += $(top_builddir)/tls/libtls.la
@@ -9,3 +11,9 @@ nc_SOURCES = atomicio.c
 nc_SOURCES += netcat.c
 nc_SOURCES += socks.c
 noinst_HEADERS = atomicio.h
+
+if !HAVE_STRTONUM
+nc_SOURCES += compat/strtonum.c
+endif
+
+endif
diff --git a/update.sh b/update.sh
index 842ecd2..f4aa70a 100755
--- a/update.sh
+++ b/update.sh
@@ -213,6 +213,7 @@ sed -e "s/compat\///" crypto/Makefile.am.arc4random > \
 # copy nc(1) source
 echo "copying nc(1) source"
 rm -f apps/nc/*.c apps/nc/*.h
+$CP $libc_src/stdlib/strtonum.c apps/nc
 for i in `awk '/SOURCES|HEADERS|MANS/ { print $3 }' apps/nc/Makefile.am` ; do
         if [ -e $app_src/nc/$i ]; then
                 $CP $app_src/nc/$i apps/nc