diff options
| -rw-r--r-- | pkg/openssh/config.h | 7 | ||||
| -rw-r--r-- | pkg/openssh/gen.rc | 19 | ||||
| -rw-r--r-- | pkg/openssh/rev | 2 | ||||
| m--------- | pkg/openssh/src | 0 |
4 files changed, 14 insertions, 14 deletions
diff --git a/pkg/openssh/config.h b/pkg/openssh/config.h index ef00fb14..d9f3e39b 100644 --- a/pkg/openssh/config.h +++ b/pkg/openssh/config.h @@ -24,7 +24,6 @@ /* #undef BROKEN_GLOB */ /* #undef BROKEN_INET_NTOA */ /* #undef BROKEN_LIBIAF */ -/* #undef BROKEN_MMAP */ /* #undef BROKEN_ONE_BYTE_DIRENT_D_NAME */ /* #undef BROKEN_READV_COMPARISON */ /* #undef BROKEN_READ_COMPARISON */ @@ -286,6 +285,7 @@ #define HAVE_SO_PEERCRED 1 #define HAVE_SS_FAMILY_IN_SS 1 #define HAVE_STATFS 1 +#define HAVE_STRCASESTR 1 #define HAVE_STRICT_MKSTEMP 1 #define HAVE_STRLCAT 1 #define HAVE_STRLCPY 1 @@ -315,6 +315,7 @@ #define HAVE_SYS_PRCTL_H 1 /* #undef HAVE_SYS_PSTAT_H */ /* #undef HAVE_SYS_PTMS_H */ +#define HAVE_SYS_PTRACE_H 1 /* #undef HAVE_SYS_STREAM_H */ #define HAVE_SYS_STROPTS_H 1 /* #undef HAVE_SYS_STRTIO_H */ @@ -373,10 +374,7 @@ #define LOCKED_PASSWD_PREFIX "!" /* #undef LOCKED_PASSWD_STRING */ /* #undef LOCKED_PASSWD_SUBSTR */ -/* #undef LOGIN_NEEDS_TERM */ /* #undef LOGIN_NEEDS_UTMPX */ -/* #undef LOGIN_NO_ENDOPT */ -#define LOGIN_PROGRAM_FALLBACK "/bin/login" /* #undef MAIL_DIRECTORY */ /* #undef NEED_SETPGRP */ /* #undef NO_ATTRIBUTE_ON_RETURN_TYPE */ @@ -426,6 +424,7 @@ #define SNPRINTF_CONST const #define SPT_TYPE SPT_REUSEARGV /* #undef SSHD_ACQUIRES_CTTY */ +/* #undef SSHD_PAM_SERVICE */ /* #undef SSHPAM_CHAUTHTOK_NEEDS_RUID */ /* #undef SSH_AUDIT_EVENTS */ /* #undef SSH_IOBUFSZ */ diff --git a/pkg/openssh/gen.rc b/pkg/openssh/gen.rc index 9c33f111..b80c57e0 100644 --- a/pkg/openssh/gen.rc +++ b/pkg/openssh/gen.rc @@ -21,15 +21,16 @@ lib libopenbsd-compat.a openbsd-compat/^(\ dirname.c fmt_scaled.c getcwd.c getgrouplist.c getopt_long.c\ getrrsetbyname.c glob.c inet_aton.c inet_ntoa.c inet_ntop.c mktemp.c\ pwcache.c readpassphrase.c reallocarray.c realpath.c rresvport.c\ - setenv.c setproctitle.c sha1.c sha2.c rmd160.c md5.c sigact.c strlcat.c\ - strlcpy.c strmode.c strnlen.c strptime.c strsep.c strtonum.c strtoll.c\ - strtoul.c strtoull.c timingsafe_bcmp.c vis.c explicit_bzero.c\ + setenv.c setproctitle.c sha1.c sha2.c rmd160.c md5.c sigact.c\ + strcasestr.c strlcat.c strlcpy.c strmode.c strnlen.c strptime.c\ + strsep.c strtonum.c strtoll.c strtoul.c strtoull.c timingsafe_bcmp.c\ + vis.c explicit_bzero.c\ \ arc4random.c bsd-asprintf.c bsd-closefrom.c bsd-cray.c\ bsd-cygwin_util.c bsd-getpeereid.c getrrsetbyname-ldns.c bsd-misc.c\ bsd-nextstep.c bsd-openpty.c bsd-poll.c bsd-setres_id.c bsd-snprintf.c\ - bsd-statvfs.c bsd-waitpid.c fake-rfc2553.c openssl-compat.c xmmap.c\ - xcrypt.c kludge-fd_set.c\ + bsd-statvfs.c bsd-waitpid.c fake-rfc2553.c openssl-compat.c xcrypt.c\ + kludge-fd_set.c\ \ port-aix.c port-irix.c port-linux.c port-solaris.c port-uw.c\ ) @@ -79,14 +80,14 @@ cc sftp-server.c cc sftp-common.c exe sshd -d '$dir'/deps\ - sshd.c auth-rhosts.c auth-passwd.c auth-rsa.c auth-rh-rsa.c\ + sshd.c auth-rhosts.c auth-passwd.c\ audit.c audit-bsm.c audit-linux.c platform.c\ sshpty.c sshlogin.c servconf.c serverloop.c\ - auth.c auth1.c auth2.c auth-options.c session.c\ - auth-chall.c auth2-chall.c groupaccess.c\ + auth.c auth2.c auth-options.c session.c\ + auth2-chall.c groupaccess.c\ auth-skey.c auth-bsdauth.c auth2-hostbased.c auth2-kbdint.c\ auth2-none.c auth2-passwd.c auth2-pubkey.c\ - monitor_mm.c monitor.c monitor_wrap.c auth-krb5.c\ + 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\ sftp-server.c.o sftp-common.c.o\ diff --git a/pkg/openssh/rev b/pkg/openssh/rev index 0cfbf088..00750edc 100644 --- a/pkg/openssh/rev +++ b/pkg/openssh/rev @@ -1 +1 @@ -2 +3 diff --git a/pkg/openssh/src b/pkg/openssh/src -Subproject 99522ba7ec6963a05c04a156bf20e3ba3605987 +Subproject 4a354fc231174901f2629437c2a6e924a2dd677 |