diff options
| author |   Gilles Chehade <gilles@poolp.org> | 2020-11-27 14:30:28 +0100 |
|---|---|---|
| committer |   GitHub <noreply@github.com> | 2020-11-27 14:30:28 +0100 |
| commit | 29412e45af94e2b0b22100f605e4864e643f76c7 (patch) | |
| tree | 7bd54df3414b0a5aa7f13ddf84d0726a6ed84fc6 | |
| parent | Merge pull request #1099 from ryanakca/remerge-makefile (diff) | |
| parent | fix sourcehut openbsd ci (diff) | |
| download | OpenSMTPD-29412e45af94e2b0b22100f605e4864e643f76c7.tar.xz OpenSMTPD-29412e45af94e2b0b22100f605e4864e643f76c7.zip | |
Merge pull request #1098 from gearnode/fix-macos-build
Fix macos build
| -rw-r--r-- | .builds/openbsd.yml | 4 | ||||
| -rw-r--r-- | openbsd-compat/err_h/err.h | 3 | ||||
| -rw-r--r-- | openbsd-compat/openbsd-compat.h | 2 | ||||
| -rw-r--r-- | usr.sbin/smtpd/smtpd.c | 1 |
4 files changed, 8 insertions, 2 deletions
diff --git a/.builds/openbsd.yml b/.builds/openbsd.yml index a0557a99..97b9634c 100644 --- a/.builds/openbsd.yml +++ b/.builds/openbsd.yml @@ -1,6 +1,6 @@ -image: openbsd/6.6 +image: openbsd/6.8 packages: -- autoconf-2.69p2 +- autoconf-2.69p3 - automake-1.14.1p1 - libtool sources: diff --git a/openbsd-compat/err_h/err.h b/openbsd-compat/err_h/err.h index a56b6188..92aa69f6 100644 --- a/openbsd-compat/err_h/err.h +++ b/openbsd-compat/err_h/err.h @@ -10,6 +10,9 @@ void err(int, const char *, ...); __attribute__ ((noreturn)) void errx(int, const char *, ...); +__attribute__ ((noreturn)) +void errc(int, int, const char *, ...); + void warn(const char *, ...); void warnx(const char *, ...); diff --git a/openbsd-compat/openbsd-compat.h b/openbsd-compat/openbsd-compat.h index 57748621..ec0ae516 100644 --- a/openbsd-compat/openbsd-compat.h +++ b/openbsd-compat/openbsd-compat.h @@ -334,6 +334,8 @@ const char *strerror(int); int usleep(unsigned int useconds); #endif +int pipe2(int pipefd[2], int flags); + char *get_progname(char *); diff --git a/usr.sbin/smtpd/smtpd.c b/usr.sbin/smtpd/smtpd.c index 3b8c6764..ad0ebdea 100644 --- a/usr.sbin/smtpd/smtpd.c +++ b/usr.sbin/smtpd/smtpd.c @@ -80,6 +80,7 @@ #include <util.h> #endif +#include <openssl/rand.h> #include <openssl/ssl.h> #include <openssl/evp.h> |