diff options
Diffstat (limited to 'pkg/openssh')
| -rw-r--r-- | pkg/openssh/README.md | 5 | ||||
| -rw-r--r-- | pkg/openssh/config.h | 4 | ||||
| -rw-r--r-- | pkg/openssh/gen.lua | 2 |
3 files changed, 5 insertions, 6 deletions
diff --git a/pkg/openssh/README.md b/pkg/openssh/README.md index 5019ca98..f404b4a1 100644 --- a/pkg/openssh/README.md +++ b/pkg/openssh/README.md @@ -14,9 +14,8 @@ Several changes were made: * `SECCOMP_AUDIT_ARCH` and `SANDBOX_SECCOMP_FILTER` were removed and instead defined in `gen.lua` dependent on the target toolchain architecture. -* `HAVE_READPASSPHRASE` and `HAVE_STRNVIS` are undefined because although we do - build them into `libbsd.a`, we don't include the whole openbsd header - directory. +* `HAVE_STRNVIS` was undefined because although we do build it into + `libbsd.a`, we don't include the whole openbsd header directory. * `HAVE_PLEDGE` is defined because we have a stub definition in `pkg/openbsd/include/unistd.h`. * `SIZEOF_*` are undefined because they are only used if C99 `int*_t` are not diff --git a/pkg/openssh/config.h b/pkg/openssh/config.h index 1420ebcf..2a0f4d56 100644 --- a/pkg/openssh/config.h +++ b/pkg/openssh/config.h @@ -334,8 +334,8 @@ #define HAVE_PUTUTLINE 1 #define HAVE_PUTUTXLINE 1 #define HAVE_RAISE 1 -/* #undef HAVE_READPASSPHRASE */ -/* #undef HAVE_READPASSPHRASE_H */ +#define HAVE_READPASSPHRASE 1 +#define HAVE_READPASSPHRASE_H 1 #define HAVE_REALLOC 1 #define HAVE_REALLOCARRAY 1 #define HAVE_REALPATH 1 diff --git a/pkg/openssh/gen.lua b/pkg/openssh/gen.lua index c3172730..61722736 100644 --- a/pkg/openssh/gen.lua +++ b/pkg/openssh/gen.lua @@ -9,10 +9,10 @@ cflags{ archflags[config.target.toolchain:match('[^-]*')] or '-D SANDBOX_RLIMIT=1', '-I $dir', '-I $srcdir', - '-I $srcdir/openbsd-compat', '-I pkg/openbsd/include', '-I $builddir/pkg/libressl/include', '-I $builddir/pkg/zlib/include', + '-idirafter $srcdir/openbsd-compat', } pkg.deps = { |
