Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Update files for OpenSSH-6.1p1 import.

  • Loading branch information...
commit a3775bf244235f5b1b580b0aab954df19e770863 1 parent a68c5b0
Peter Avalos authored
View
2  crypto/openssh/README.DRAGONFLY
@@ -4,7 +4,7 @@ ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/
A list of deleted files is in README.DELETED.
Upgrading notes:
-./configure --prefix=/usr --sysconfdir=/etc/ssh \
+./configure --prefix=/usr --sysconfdir=/etc/ssh --with-sandbox=rlimit \
--with-pam --with-tcp-wrappers --with-libedit --with-ssl-engine
Update config.h and version.h in secure/lib/libssh.
View
2  crypto/openssh/ssh_config
@@ -40,7 +40,7 @@
# Ciphers aes128-ctr,aes192-ctr,aes256-ctr,arcfour256,arcfour128,aes128-cbc,3des-cbc
# MACs hmac-md5,hmac-sha1,umac-64@openssh.com,hmac-ripemd160
# EscapeChar ~
-# VersionAddendum DragonFly-20110920
+# VersionAddendum DragonFly-20121028
# XAuthLocation /usr/pkg/bin/xauth
# Tunnel no
View
2  crypto/openssh/ssh_config.5
@@ -1215,7 +1215,7 @@ in
Specifies a string to append to the regular version string to identify
OS- or site-specific modifications.
The default is
-.Dq DragonFly-20110920 .
+.Dq DragonFly-20121028 .
.It Cm VisualHostKey
If this flag is set to
.Dq yes ,
View
4 crypto/openssh/ssh_namespace.h
@@ -98,6 +98,7 @@
#define channel_after_select ssh_channel_after_select
#define channel_by_id ssh_channel_by_id
#define channel_cancel_cleanup ssh_channel_cancel_cleanup
+#define channel_cancel_lport_listener ssh_channel_cancel_lport_listener
#define channel_cancel_rport_listener ssh_channel_cancel_rport_listener
#define channel_clear_adm_permitted_opens ssh_channel_clear_adm_permitted_opens
#define channel_clear_permitted_opens ssh_channel_clear_permitted_opens
@@ -106,6 +107,7 @@
#define channel_connect_by_listen_address ssh_channel_connect_by_listen_address
#define channel_connect_stdio_fwd ssh_channel_connect_stdio_fwd
#define channel_connect_to ssh_channel_connect_to
+#define channel_disable_adm_local_opens ssh_channel_disable_adm_local_opens
#define channel_find_open ssh_channel_find_open
#define channel_free ssh_channel_free
#define channel_free_all ssh_channel_free_all
@@ -149,6 +151,7 @@
#define channel_still_open ssh_channel_still_open
#define channel_stop_listening ssh_channel_stop_listening
#define channel_tcpwinsz ssh_channel_tcpwinsz
+#define channel_update_permitted_opens ssh_channel_update_permitted_opens
#define check_host_in_hostfile ssh_check_host_in_hostfile
#define check_key_in_hostkeys ssh_check_key_in_hostkeys
#define choose_dh ssh_choose_dh
@@ -433,6 +436,7 @@
#define percent_expand ssh_percent_expand
#define permanently_drop_suid ssh_permanently_drop_suid
#define permanently_set_uid ssh_permanently_set_uid
+#define permitopen_port ssh_permitopen_port
#define pkcs11_add_provider ssh_pkcs11_add_provider
#define pkcs11_del_provider ssh_pkcs11_del_provider
#define pkcs11_init ssh_pkcs11_init
View
3  crypto/openssh/sshd_config
@@ -13,7 +13,7 @@
# Note that some of DragonFly's defaults differ from OpenBSD's, and
# DragonFly has a few additional options.
-#VersionAddendum DragonFly-20110920
+#VersionAddendum DragonFly-20121028
#Port 22
#AddressFamily any
@@ -119,7 +119,6 @@ UsePrivilegeSeparation sandbox # Default for new installations.
#MaxStartups 10
#PermitTunnel no
#ChrootDirectory none
-#VersionAddendum none
#XAuthLocation /usr/pkg/bin/xauth
View
50 secure/lib/libssh/config.h
@@ -17,6 +17,9 @@
/* Define if your resolver libs need this for getrrsetbyname */
/* #undef BIND_8_COMPAT */
+/* The system has incomplete BSM API */
+/* #undef BROKEN_BSM_API */
+
/* Define if cmsg_type is not passed correctly */
/* #undef BROKEN_CMSG_TYPE */
@@ -238,7 +241,7 @@
/* #undef HAVE_CRYPTO_SHA2_H */
/* Define to 1 if you have the <crypt.h> header file. */
-#define HAVE_CRYPT_H 1
+/* #undef HAVE_CRYPT_H */
/* Define if you are on Cygwin */
/* #undef HAVE_CYGWIN */
@@ -436,7 +439,7 @@
/* #undef HAVE_GETRRSETBYNAME */
/* Define to 1 if you have the `getrusage' function. */
-#define HAVE_GETRUSAGE 1
+/* #undef HAVE_GETRUSAGE */
/* Define to 1 if you have the `getseuserbyname' function. */
/* #undef HAVE_GETSEUSERBYNAME */
@@ -501,6 +504,9 @@
/* Define if HEADER.ad exists in arpa/nameser.h */
#define HAVE_HEADER_AD 1
+/* Define to 1 if you have the `HMAC_CTX_init' function. */
+#define HAVE_HMAC_CTX_INIT 1
+
/* Define if you have ut_host in utmp.h */
#define HAVE_HOST_IN_UTMP 1
@@ -552,6 +558,9 @@
/* Define to 1 if you have the <lastlog.h> header file. */
/* #undef HAVE_LASTLOG_H */
+/* Define if you want ldns support */
+/* #undef HAVE_LDNS */
+
/* Define to 1 if you have the <libaudit.h> header file. */
/* #undef HAVE_LIBAUDIT_H */
@@ -562,7 +571,7 @@
/* #undef HAVE_LIBCRYPT */
/* Define to 1 if you have the `dl' library (-ldl). */
-/* #undef HAVE_LIBDL */
+#define HAVE_LIBDL 1
/* Define to 1 if you have the <libgen.h> header file. */
#define HAVE_LIBGEN_H 1
@@ -594,10 +603,19 @@
/* Define to 1 if you have the <limits.h> header file. */
#define HAVE_LIMITS_H 1
+/* Define to 1 if you have the <linux/audit.h> header file. */
+/* #undef HAVE_LINUX_AUDIT_H */
+
+/* Define to 1 if you have the <linux/filter.h> header file. */
+/* #undef HAVE_LINUX_FILTER_H */
+
/* Define to 1 if you have the <linux/if_tun.h> header file. */
/* #undef HAVE_LINUX_IF_TUN_H */
-/* Define if your libraries define login() */
+/* Define to 1 if you have the <linux/seccomp.h> header file. */
+/* #undef HAVE_LINUX_SECCOMP_H */
+
+/* Define to 1 if you have the `login' function. */
#define HAVE_LOGIN 1
/* Define to 1 if you have the <login_cap.h> header file. */
@@ -805,6 +823,9 @@
/* Define to 1 if you have the `setgroups' function. */
#define HAVE_SETGROUPS 1
+/* Define to 1 if you have the `setlinebuf' function. */
+#define HAVE_SETLINEBUF 1
+
/* Define to 1 if you have the `setlogin' function. */
#define HAVE_SETLOGIN 1
@@ -931,6 +952,9 @@
/* Define to 1 if you have the `strmode' function. */
#define HAVE_STRMODE 1
+/* Define to 1 if you have the `strnlen' function. */
+#define HAVE_STRNLEN 1
+
/* Define to 1 if you have the `strnvis' function. */
#define HAVE_STRNVIS 1
@@ -1317,6 +1341,9 @@
/* Define to the one symbol short name of this package. */
#define PACKAGE_TARNAME "openssh"
+/* Define to the home page for this package. */
+#define PACKAGE_URL ""
+
/* Define to the version of this package. */
#define PACKAGE_VERSION "Portable"
@@ -1348,21 +1375,26 @@
/* Sandbox using setrlimit(2) */
#define SANDBOX_RLIMIT 1
+/* Sandbox using seccomp filter */
+/* #undef SANDBOX_SECCOMP_FILTER */
+
+/* setrlimit RLIMIT_FSIZE works */
+/* #undef SANDBOX_SKIP_RLIMIT_FSIZE */
+
/* Sandbox using systrace(4) */
/* #undef SANDBOX_SYSTRACE */
+/* Specify the system call convention in use */
+/* #undef SECCOMP_AUDIT_ARCH */
+
/* Define if your platform breaks doing a seteuid before a setuid */
/* #undef SETEUID_BREAKS_SETUID */
-/* The size of `char', as computed by sizeof. */
-#define SIZEOF_CHAR 1
-
/* The size of `int', as computed by sizeof. */
#define SIZEOF_INT 4
/* The size of `long int', as computed by sizeof. */
-/* This doesn't matter since we have int64_t */
-#define SIZEOF_LONG_INT 4
+#define SIZEOF_LONG_INT 8
/* The size of `long long int', as computed by sizeof. */
#define SIZEOF_LONG_LONG_INT 8
View
4 secure/lib/libssh/version.h
@@ -5,8 +5,8 @@
#define SSH_VERSION (ssh_version_get())
#define SSH_RELEASE (ssh_version_get())
-#define SSH_VERSION_BASE "OpenSSH_5.9p1-hpn13v11"
-#define SSH_VERSION_ADDENDUM "DragonFly-20110920"
+#define SSH_VERSION_BASE "OpenSSH_6.1p1-hpn13v11"
+#define SSH_VERSION_ADDENDUM "DragonFly-20121028"
const char *ssh_version_get(void);
void ssh_version_set_addendum(const char *add);
Please sign in to comment.
Something went wrong with that request. Please try again.