aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitignore1
-rw-r--r--apps/ocspcheck/CMakeLists.txt7
-rw-r--r--apps/ocspcheck/Makefile.am4
-rwxr-xr-xupdate.sh1
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
141/apps/ocspcheck/ocspcheck* 141/apps/ocspcheck/ocspcheck*
142/apps/ocspcheck/compat/memmem.c 142/apps/ocspcheck/compat/memmem.c
143/apps/ocspcheck/compat/inet_ntop.c 143/apps/ocspcheck/compat/inet_ntop.c
144/apps/ocspcheck/compat/strtonum.c
144 145
145/apps/nc/*.h 146/apps/nc/*.h
146/apps/nc/*.c 147/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()
13 set(OCSPCHECK_SRC ${OCSPCHECK_SRC} compat/memmem.c) 13 set(OCSPCHECK_SRC ${OCSPCHECK_SRC} compat/memmem.c)
14endif() 14endif()
15 15
16check_function_exists(strtonum HAVE_STRTONUM)
17if(HAVE_STRTONUM)
18 add_definitions(-DHAVE_STRTONUM)
19else()
20 set(OCSPCHECK_SRC ${OCSPCHECK_SRC} compat/strtonum.c)
21endif()
22
16if(NOT "${OPENSSLDIR}" STREQUAL "") 23if(NOT "${OPENSSLDIR}" STREQUAL "")
17 add_definitions(-DDEFAULT_CA_FILE=\"${OPENSSLDIR}/cert.pem\") 24 add_definitions(-DDEFAULT_CA_FILE=\"${OPENSSLDIR}/cert.pem\")
18else() 25else()
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
19if !HAVE_MEMMEM 19if !HAVE_MEMMEM
20ocspcheck_SOURCES += compat/memmem.c 20ocspcheck_SOURCES += compat/memmem.c
21endif 21endif
22
23if !HAVE_STRTONUM
24ocspcheck_SOURCES += compat/strtonum.c
25endif
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"
254$CP $sbin_src/ocspcheck/ocspcheck.8 apps/ocspcheck 254$CP $sbin_src/ocspcheck/ocspcheck.8 apps/ocspcheck
255rm -f apps/ocspcheck/*.c apps/ocspcheck/*.h 255rm -f apps/ocspcheck/*.c apps/ocspcheck/*.h
256$CP_LIBC $libc_src/string/memmem.c apps/ocspcheck/compat 256$CP_LIBC $libc_src/string/memmem.c apps/ocspcheck/compat
257$CP_LIBC $libc_src/stdlib/strtonum.c apps/ocspcheck/compat
257for i in `awk '/SOURCES|HEADERS|MANS/ { print $3 }' apps/ocspcheck/Makefile.am` ; do 258for i in `awk '/SOURCES|HEADERS|MANS/ { print $3 }' apps/ocspcheck/Makefile.am` ; do
258 if [ -e $sbin_src/ocspcheck/$i ]; then 259 if [ -e $sbin_src/ocspcheck/$i ]; then
259 $CP $sbin_src/ocspcheck/$i apps/ocspcheck 260 $CP $sbin_src/ocspcheck/$i apps/ocspcheck