include strtonum for ocspcheck

4 files changed, 13 insertions, 0 deletions

diff --git a/.gitignore b/.gitignore
index 4bef715..fc686bc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -141,6 +141,7 @@ include/openssl/*.h
 /apps/ocspcheck/ocspcheck*
 /apps/ocspcheck/compat/memmem.c
 /apps/ocspcheck/compat/inet_ntop.c
+/apps/ocspcheck/compat/strtonum.c
 
 /apps/nc/*.h
 /apps/nc/*.c
diff --git a/apps/ocspcheck/CMakeLists.txt b/apps/ocspcheck/CMakeLists.txt
index 3c80458..b960a81 100644
--- a/apps/ocspcheck/CMakeLists.txt
+++ b/apps/ocspcheck/CMakeLists.txt
@@ -13,6 +13,13 @@ else()
         set(OCSPCHECK_SRC ${OCSPCHECK_SRC} compat/memmem.c)
 endif()
 
+check_function_exists(strtonum HAVE_STRTONUM)
+if(HAVE_STRTONUM)
+        add_definitions(-DHAVE_STRTONUM)
+else()
+        set(OCSPCHECK_SRC ${OCSPCHECK_SRC} compat/strtonum.c)
+endif()
+
 if(NOT "${OPENSSLDIR}" STREQUAL "")
         add_definitions(-DDEFAULT_CA_FILE=\"${OPENSSLDIR}/cert.pem\")
 else()
diff --git a/apps/ocspcheck/Makefile.am b/apps/ocspcheck/Makefile.am
index 51de6c6..e3f7971 100644
--- a/apps/ocspcheck/Makefile.am
+++ b/apps/ocspcheck/Makefile.am
@@ -19,3 +19,7 @@ noinst_HEADERS = http.h
 if !HAVE_MEMMEM
 ocspcheck_SOURCES += compat/memmem.c
 endif
+
+if !HAVE_STRTONUM
+ocspcheck_SOURCES += compat/strtonum.c
+endif
diff --git a/update.sh b/update.sh
index 0ed7834..22048ea 100755
--- a/update.sh
+++ b/update.sh
@@ -254,6 +254,7 @@ echo "copying ocspcheck(1) source"
 $CP $sbin_src/ocspcheck/ocspcheck.8 apps/ocspcheck
 rm -f apps/ocspcheck/*.c apps/ocspcheck/*.h
 $CP_LIBC $libc_src/string/memmem.c apps/ocspcheck/compat
+$CP_LIBC $libc_src/stdlib/strtonum.c apps/ocspcheck/compat
 for i in `awk '/SOURCES|HEADERS|MANS/ { print $3 }' apps/ocspcheck/Makefile.am` ; do
         if [ -e $sbin_src/ocspcheck/$i ]; then
                 $CP $sbin_src/ocspcheck/$i apps/ocspcheck