summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGilles Chehade <gilles@poolp.org>2019-11-10 20:19:26 +0100
committerGilles Chehade <gilles@poolp.org>2019-11-10 20:19:26 +0100
commitcdc7680eb02e6400c2bd015f9b53e001dde065f7 (patch)
tree824eeb8cc670591101df83e3a1a4b460c68d769d
parentRevert "fix error messages when fail to build" (diff)
downloadOpenSMTPD-cdc7680eb02e6400c2bd015f9b53e001dde065f7.tar.xz
OpenSMTPD-cdc7680eb02e6400c2bd015f9b53e001dde065f7.zip
fix broken build
-rw-r--r--configure.ac12
-rw-r--r--openbsd-compat/Makefile.am6
-rw-r--r--openbsd-compat/waitpid.c50
3 files changed, 5 insertions, 63 deletions
diff --git a/configure.ac b/configure.ac
index 8641c50a..7912abc6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -168,15 +168,13 @@ AC_CHECK_HEADERS([bsd/libutil.h libutil.h])
AC_CHECK_HEADER([fts.h],
[],
- [AC_MSG_ERROR([*** fts.h missing - please install fts library ***])],
+ [AC_MSG_ERROR([*** fts.h missing - please install libfts ***])],
[
#include <sys/types.h>
#include <sys/stat.h>
])
-
-
#
# CHECKS FOR TYPES
#
@@ -586,7 +584,6 @@ AC_CHECK_DECL([strsep],
])
-
# These functions might be found in libressl
AC_CHECK_DECLS([strlcat, strlcpy],
[],
@@ -1620,7 +1617,7 @@ AC_ARG_WITH([libasr],
fi ]
)
-AC_CHECK_HEADER([asr.h], ,[AC_MSG_ERROR([*** asr.h missing - please install first or check config.log ***])],
+AC_CHECK_HEADER([asr.h], ,[AC_MSG_ERROR([*** asr.h missing - please install libasr ***])],
[#include <sys/types.h>
#include <sys/socket.h>
#include <netinet/in.h>])
@@ -1728,8 +1725,9 @@ if test "x${need_libevent_autodetect}" != "xno"; then
done
fi
+AC_CHECK_HEADER([event.h], ,[AC_MSG_ERROR([*** event.h missing - please install libevent ***])],
+[#include <sys/types.h>])
LIBS="-levent $LIBS"
-
AC_MSG_CHECKING([if programs using libevent functions will link])
AC_LINK_IFELSE(
[AC_LANG_PROGRAM([[
@@ -2026,8 +2024,6 @@ AM_CONDITIONAL([NEED_STRSEP], [test "x$ac_cv_have_strsep" != "xyes"])
AM_CONDITIONAL([NEED_STRTONUM], [test "x$ac_cv_have_strtonum" != "xyes"])
AM_CONDITIONAL([NEED_STRNDUP], [test "x$ac_cv_have_strndup" != "xyes"])
AM_CONDITIONAL([NEED_STRNLEN], [test "x$ac_cv_have_strnlen" != "xyes"])
-
-AM_CONDITIONAL([NEED_WAITPID], [test "x$ac_cv_have_waitpid" != "xyes"])
##
diff --git a/openbsd-compat/Makefile.am b/openbsd-compat/Makefile.am
index eb75621d..3bccf09c 100644
--- a/openbsd-compat/Makefile.am
+++ b/openbsd-compat/Makefile.am
@@ -6,6 +6,7 @@ libopenbsd_compat_a_SOURCES += arc4random.c
libopenbsd_compat_a_SOURCES += SSL_CTX_use_certificate_chain_mem.c
libopenbsd_compat_a_SOURCES += base64.c
libopenbsd_compat_a_SOURCES += bsd-misc.c
+libopenbsd_compat_a_SOURCES += bsd-waitpid.c
libopenbsd_compat_a_SOURCES += entropy.c
libopenbsd_compat_a_SOURCES += event_asr_run.c
libopenbsd_compat_a_SOURCES += getopt.c
@@ -134,11 +135,6 @@ if NEED_STRNLEN
libopenbsd_compat_a_SOURCES += strnlen.c
endif
-if NEED_WAITPID
-libopenbsd_compat_a_SOURCES += waitpid.c
-endif
-
-
if !SUPPORT_ERR_H
libopenbsd_compat_a_SOURCES += bsd-err.c
diff --git a/openbsd-compat/waitpid.c b/openbsd-compat/waitpid.c
deleted file mode 100644
index 3ef68a53..00000000
--- a/openbsd-compat/waitpid.c
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright (c) 2000 Ben Lindstrom. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "includes.h"
-
-#include <errno.h>
-#include <sys/wait.h>
-#include "bsd-waitpid.h"
-
-pid_t
-waitpid(int pid, int *stat_loc, int options)
-{
- union wait statusp;
- pid_t wait_pid;
-
- if (pid <= 0) {
- if (pid != -1) {
- errno = EINVAL;
- return (-1);
- }
- /* wait4() wants pid=0 for indiscriminate wait. */
- pid = 0;
- }
- wait_pid = wait4(pid, &statusp, options, NULL);
- if (stat_loc)
- *stat_loc = (int) statusp.w_status;
-
- return (wait_pid);
-}