diff options
Diffstat (limited to 'pkg')
| -rw-r--r-- | pkg/openssh/config.h | 12 | ||||
| -rw-r--r-- | pkg/openssh/gen.lua | 20 | ||||
| m--------- | pkg/openssh/src | 0 | ||||
| -rw-r--r-- | pkg/openssh/ver | 2 |
4 files changed, 22 insertions, 12 deletions
diff --git a/pkg/openssh/config.h b/pkg/openssh/config.h index 3dd37019..2c22709e 100644 --- a/pkg/openssh/config.h +++ b/pkg/openssh/config.h @@ -315,6 +315,7 @@ /* #undef HAVE_PRIV_H */ #define HAVE_PROC_PID 1 /* #undef HAVE_PROC_PIDINFO */ +#define HAVE_PSELECT 1 /* #undef HAVE_PSTAT */ #define HAVE_PTY_H 1 #define HAVE_PUTUTLINE 1 @@ -369,6 +370,7 @@ /* #undef HAVE_SHA512UPDATE */ #define HAVE_SHADOW_H 1 #define HAVE_SIGACTION 1 +/* #undef HAVE_SIGHANDLER_T */ /* #undef HAVE_SIGVEC */ #define HAVE_SIG_ATOMIC_T 1 #define HAVE_SIZE_T 1 @@ -553,10 +555,11 @@ /* #undef SANDBOX_SOLARIS */ /* #undef SANDBOX_SYSTRACE */ /* #undef SETEUID_BREAKS_SETUID */ -/* #undef SIZEOF_INT */ -/* #undef SIZEOF_LONG_INT */ -/* #undef SIZEOF_LONG_LONG_INT */ -/* #undef SIZEOF_SHORT_INT */ +#define SIZEOF_INT 4 +#define SIZEOF_LONG_INT SIZEOF_LONG +#define SIZEOF_LONG_LONG_INT 8 +#define SIZEOF_SHORT_INT 2 +/* probe SIZEOF_TIME_T */ #define SNPRINTF_CONST const #define SPT_TYPE SPT_REUSEARGV /* #undef SSHD_ACQUIRES_CTTY */ @@ -587,6 +590,7 @@ /* #undef USE_SOLARIS_PRIVS */ /* #undef USE_SOLARIS_PROCESS_CONTRACTS */ /* #undef USE_SOLARIS_PROJECTS */ +#define VARIABLE_DECLARATION_AFTER_CODE 1 /* #undef VARIABLE_LENGTH_ARRAYS */ /* #undef WITH_ABBREV_NO_TTY */ /* #undef WITH_AIXAUTHENTICATE */ diff --git a/pkg/openssh/gen.lua b/pkg/openssh/gen.lua index 5d85efd1..77ce0fa2 100644 --- a/pkg/openssh/gen.lua +++ b/pkg/openssh/gen.lua @@ -8,7 +8,7 @@ cflags{ '-D _XOPEN_SOURCE=600', '-D _DEFAULT_SOURCE', archflags[arch] or '-D SANDBOX_RLIMIT=1', - '-I $dir', + '-I $outdir', '-I $srcdir', '-isystem $basedir/pkg/openbsd/include', '-isystem $builddir/pkg/bearssl/include', @@ -23,8 +23,15 @@ pkg.deps = { 'pkg/libfido2/headers', 'pkg/linux-headers/headers', 'pkg/zlib/headers', + '$outdir/config.h', } +build('cat', '$outdir/config.h', { + '$dir/config.h', + '$builddir/probe/SIZEOF_LONG', + '$builddir/probe/SIZEOF_TIME_T', +}) + lib('libopenbsd-compat.a', [[openbsd-compat/( base64.c basename.c bcrypt_pbkdf.c bindresvport.c blowfish.c daemon.c dirname.c explicit_bzero.c fmt_scaled.c freezero.c getcwd.c @@ -87,6 +94,8 @@ lib('libssh.a', [[ ssh-sk-client.c + sftp-common.c sftp-client.c sftp-glob.c sftp-server.c + libopenbsd-compat.a $builddir/pkg/bearssl/libbearssl.a $builddir/pkg/libfido2/libfido2.a.d @@ -100,9 +109,6 @@ exe('ssh', [[ ]]) file('bin/ssh', '755', '$outdir/ssh') -cc('sftp-server.c') -cc('sftp-common.c') - exe('sshd', [[ sshd.c auth-rhosts.c auth-passwd.c audit.c audit-bsm.c audit-linux.c platform.c @@ -114,7 +120,7 @@ exe('sshd', [[ monitor.c monitor_wrap.c auth-krb5.c auth2-gss.c gss-serv.c gss-serv-krb5.c loginrec.c auth-pam.c auth-shadow.c auth-sia.c md5crypt.c - srclimit.c sftp-server.c.o sftp-common.c.o + srclimit.c sandbox-null.c sandbox-rlimit.c sandbox-systrace.c sandbox-darwin.c sandbox-seccomp-filter.c sandbox-capsicum.c sandbox-pledge.c sandbox-solaris.c uidswap.c @@ -140,10 +146,10 @@ file('bin/ssh-keyscan', '755', '$outdir/ssh-keyscan') exe('ssh-sk-helper', {'ssh-sk-helper.c', 'ssh-sk.c', 'sk-usbhid.c', 'libssh.a.d'}) file('libexec/ssh-sk-helper', '755', '$outdir/ssh-sk-helper') -exe('sftp-server', {'sftp-common.c.o', 'sftp-server.c.o', 'sftp-server-main.c', 'libssh.a.d'}) +exe('sftp-server', {'sftp-server-main.c', 'libssh.a.d'}) file('libexec/sftp-server', '755', '$outdir/sftp-server') -exe('sftp', {'sftp.c', 'sftp-client.c', 'sftp-common.c.o', 'sftp-glob.c', 'libssh.a.d'}) +exe('sftp', {'sftp.c', 'libssh.a.d'}) file('bin/sftp', '755', '$outdir/sftp') man{ diff --git a/pkg/openssh/src b/pkg/openssh/src -Subproject f6f628d392e684c4c2e6d1f46cc763c39742300 +Subproject 2e9b991522ad46d872f20e4746cd6b746371e52 diff --git a/pkg/openssh/ver b/pkg/openssh/ver index d16263cb..8654eb48 100644 --- a/pkg/openssh/ver +++ b/pkg/openssh/ver @@ -1 +1 @@ -8.6p1 r3 +8.7p1 r0 |