From adde656bb7a859fb4cc334cb89a00840a7023c2e Mon Sep 17 00:00:00 2001
From: kinichiro <kinichiro.inoguchi@gmail.com>
Date: Sun, 26 Dec 2021 15:42:47 +0900
Subject: Add strtonum to compat library and export it

crypto library requires strtonum now, and add it to compat library.
remove it from applications compat/ directories.
---
 apps/nc/CMakeLists.txt        | 8 --------
 apps/nc/Makefile.am           | 4 ----
 apps/ocspcheck/CMakeLists.txt | 8 --------
 apps/ocspcheck/Makefile.am    | 4 ----
 apps/openssl/CMakeLists.txt   | 8 --------
 apps/openssl/Makefile.am      | 4 ----
 6 files changed, 36 deletions(-)

(limited to 'apps')

diff --git a/apps/nc/CMakeLists.txt b/apps/nc/CMakeLists.txt
index e873de8..bd59211 100644
--- a/apps/nc/CMakeLists.txt
+++ b/apps/nc/CMakeLists.txt
@@ -29,14 +29,6 @@ else()
 	set(NC_SRC ${NC_SRC} compat/readpassphrase.c)
 endif()
 
-check_function_exists(strtonum HAVE_STRTONUM)
-if(HAVE_STRTONUM AND CMAKE_SYSTEM_NAME MATCHES "Darwin" AND
-    CMAKE_HOST_SYSTEM_VERSION VERSION_GREATER_EQUAL 20)
-	add_definitions(-DHAVE_STRTONUM)
-else()
-	set(NC_SRC ${NC_SRC} compat/strtonum.c)
-endif()
-
 if(NOT "${OPENSSLDIR}" STREQUAL "")
 	add_definitions(-DDEFAULT_CA_FILE=\"${OPENSSLDIR}/cert.pem\")
 else()
diff --git a/apps/nc/Makefile.am b/apps/nc/Makefile.am
index 58b5c01..e9db6e5 100644
--- a/apps/nc/Makefile.am
+++ b/apps/nc/Makefile.am
@@ -43,8 +43,4 @@ if !HAVE_READPASSPHRASE
 nc_SOURCES += compat/readpassphrase.c
 endif
 
-if !HAVE_STRTONUM
-nc_SOURCES += compat/strtonum.c
-endif
-
 endif
diff --git a/apps/ocspcheck/CMakeLists.txt b/apps/ocspcheck/CMakeLists.txt
index 249f0f4..2dddb6e 100644
--- a/apps/ocspcheck/CMakeLists.txt
+++ b/apps/ocspcheck/CMakeLists.txt
@@ -13,14 +13,6 @@ else()
         set(OCSPCHECK_SRC ${OCSPCHECK_SRC} compat/memmem.c)
 endif()
 
-check_function_exists(strtonum HAVE_STRTONUM)
-if(HAVE_STRTONUM AND CMAKE_SYSTEM_NAME MATCHES "Darwin" AND
-    CMAKE_HOST_SYSTEM_VERSION VERSION_GREATER_EQUAL 20)
-	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 71a73ea..7c7b454 100644
--- a/apps/ocspcheck/Makefile.am
+++ b/apps/ocspcheck/Makefile.am
@@ -22,7 +22,3 @@ 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/apps/openssl/CMakeLists.txt b/apps/openssl/CMakeLists.txt
index bb058e1..2a84178 100644
--- a/apps/openssl/CMakeLists.txt
+++ b/apps/openssl/CMakeLists.txt
@@ -61,14 +61,6 @@ if(WIN32)
 	set(OPENSSL_SRC ${OPENSSL_SRC} compat/poll_win.c)
 endif()
 
-check_function_exists(strtonum HAVE_STRTONUM)
-if(HAVE_STRTONUM AND CMAKE_SYSTEM_NAME MATCHES "Darwin" AND
-    CMAKE_HOST_SYSTEM_VERSION VERSION_GREATER_EQUAL 20)
-	add_definitions(-DHAVE_STRTONUM)
-else()
-	set(OPENSSL_SRC ${OPENSSL_SRC} compat/strtonum.c)
-endif()
-
 if(CMAKE_SYSTEM_NAME MATCHES "Darwin")
         check_function_exists(clock_gettime HAVE_CLOCK_GETTIME)
         if(NOT HAVE_CLOCK_GETTIME)
diff --git a/apps/openssl/Makefile.am b/apps/openssl/Makefile.am
index b98e08d..7cbac48 100644
--- a/apps/openssl/Makefile.am
+++ b/apps/openssl/Makefile.am
@@ -84,10 +84,6 @@ openssl_SOURCES += compat/clock_gettime_osx.c
 endif
 endif
 
-if !HAVE_STRTONUM
-openssl_SOURCES += compat/strtonum.c
-endif
-
 noinst_HEADERS = apps.h
 noinst_HEADERS += progs.h
 noinst_HEADERS += s_apps.h
-- 
cgit v1.2.3-55-g6feb