build strtonum directly into apps/openssl

it is not needed as a library export

ok beck@

apps/Makefile.am.tpl

@@ -9,3 +9,7 @@ openssl_LDADD += $(top_builddir)/ssl/libssl.la
 
 openssl_SOURCES =
 noinst_HEADERS =
+
+if NO_STRTONUM
+openssl_SOURCES += strtonum.c
+endif

crypto/Makefile.am.tpl

@@ -60,9 +60,6 @@ endif
 if NO_ISSETUGID
 libcompat_la_SOURCES += compat/issetugid_linux.c
 endif
-if NO_STRTONUM
-libcompat_la_SOURCES += compat/strtonum.c
-endif
 
 noinst_HEADERS = des/ncbc_enc.c
 noinst_HEADERS += compat/thread_private.h

update.sh

@@ -63,7 +63,6 @@ for i in explicit_bzero.c strlcpy.c strlcat.c timingsafe_bcmp.c timingsafe_memcm
 	cp $libc_src/string/$i crypto/compat
 done
 cp $libc_src/stdlib/reallocarray.c crypto/compat
-cp $libc_src/stdlib/strtonum.c crypto/compat
 cp $libc_src/crypt/arc4random.c crypto/compat
 cp $libc_src/crypt/chacha_private.h crypto/compat
 cp $libcrypto_src/crypto/getentropy_*.c crypto/compat
@@ -374,10 +373,17 @@ crypto_excludes=(
 	done
 )
 
+# conditional compiles
+cp $libc_src/stdlib/strtonum.c apps/
+apps_excludes=(
+	strtonum.c
+	)
 (cd apps
 	cp Makefile.am.tpl Makefile.am
 	for i in `ls -1 *.c|sort`; do
-		echo "openssl_SOURCES += $i" >> Makefile.am
+		if ! [[ ${apps_excludes[*]} =~ $i ]]; then
+			echo "openssl_SOURCES += $i" >> Makefile.am
+		fi
 	done
 	for i in `ls -1 *.h|sort`; do
 		echo "noinst_HEADERS += $i" >> Makefile.am