svn commit: r542402 - in head/sysutils/tmate-ssh-server: . files
Steve Wills
swills at FreeBSD.org
Fri Jul 17 04:36:31 UTC 2020
Author: swills
Date: Fri Jul 17 04:36:30 2020
New Revision: 542402
URL: https://svnweb.freebsd.org/changeset/ports/542402
Log:
sysutils/tmate-ssh-server: revive port and update
Added:
head/sysutils/tmate-ssh-server/
- copied from r534092, head/sysutils/tmate-slave/
Modified:
head/sysutils/tmate-ssh-server/Makefile
head/sysutils/tmate-ssh-server/distinfo
head/sysutils/tmate-ssh-server/files/patch-tmate-ssh-server.c
Modified: head/sysutils/tmate-ssh-server/Makefile
==============================================================================
--- head/sysutils/tmate-slave/Makefile Tue May 5 15:22:17 2020 (r534092)
+++ head/sysutils/tmate-ssh-server/Makefile Fri Jul 17 04:36:30 2020 (r542402)
@@ -1,18 +1,13 @@
# $FreeBSD$
-PORTNAME= tmate-slave
-PORTVERSION= g2018112801
-PORTREVISION= 1
+PORTNAME= tmate-ssh-server
+PORTVERSION= g2020071601
PORTEPOCH= 1
CATEGORIES= sysutils
MAINTAINER= swills at FreeBSD.org
COMMENT= Instant terminal sharing server
-BROKEN= fails to patch
-DEPRECATED= Broken for more than 6 months
-EXPIRATION_DATE= 2020-05-05
-
LIB_DEPENDS= libevent.so:devel/libevent \
libmsgpackc.so:devel/msgpack \
libssh.so:security/libssh
@@ -20,14 +15,12 @@ LIB_DEPENDS= libevent.so:devel/libevent \
USES= autoreconf ncurses pkgconfig
USE_GITHUB= yes
GH_ACCOUNT= tmate-io
-GH_TAGNAME= 8b294f3
+GH_TAGNAME= 97d2024
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
LDFLAGS+= -lexecinfo
-PLIST_FILES= bin/tmate-slave
-
-PORTSCOUT= skipv:1.8,1.7,to_copy,base
+PLIST_FILES= bin/tmate-ssh-server
.include <bsd.port.mk>
Modified: head/sysutils/tmate-ssh-server/distinfo
==============================================================================
--- head/sysutils/tmate-slave/distinfo Tue May 5 15:22:17 2020 (r534092)
+++ head/sysutils/tmate-ssh-server/distinfo Fri Jul 17 04:36:30 2020 (r542402)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1573750791
-SHA256 (tmate-io-tmate-slave-g2018112801-8b294f3_GH0.tar.gz) = 3927a27541451a8221f10262c7e467ff16df72def2134ff2da610feccef45bdb
-SIZE (tmate-io-tmate-slave-g2018112801-8b294f3_GH0.tar.gz) = 620302
+TIMESTAMP = 1594956880
+SHA256 (tmate-io-tmate-ssh-server-g2020071601-97d2024_GH0.tar.gz) = 76769310d2b8741ef8d0f15390f167b2ed5d0def9e4ad4095805ccb360eead9e
+SIZE (tmate-io-tmate-ssh-server-g2020071601-97d2024_GH0.tar.gz) = 623861
Modified: head/sysutils/tmate-ssh-server/files/patch-tmate-ssh-server.c
==============================================================================
--- head/sysutils/tmate-slave/files/patch-tmate-ssh-server.c Tue May 5 15:22:17 2020 (r534092)
+++ head/sysutils/tmate-ssh-server/files/patch-tmate-ssh-server.c Fri Jul 17 04:36:30 2020 (r542402)
@@ -1,51 +1,23 @@
---- tmate-ssh-server.c.orig 2018-11-19 02:28:35 UTC
+--- tmate-ssh-server.c.orig 2020-04-27 23:54:26 UTC
+++ tmate-ssh-server.c
-@@ -8,6 +8,8 @@
- #include <stdio.h>
- #include <event.h>
- #include <arpa/inet.h>
-+#include <netinet/in.h>
-+#include <sys/signal.h>
+@@ -242,6 +242,12 @@ static void client_bootstrap(struct tmate_session *_se
- #include "tmate.h"
-
-@@ -252,6 +254,10 @@ static void client_bootstrap(struct tmate_session *_se
-
ssh_options_set(session, SSH_OPTIONS_TIMEOUT, &grace_period);
ssh_options_set(session, SSH_OPTIONS_COMPRESSION, "yes");
+ ssh_options_set(session, SSH_OPTIONS_KEY_EXCHANGE, "curve25519-sha256 at libssh.org,diffie-hellman-group18-sha512,diffie-hellman-group14-sha256,diffie-hellman-group16-sha512");
+ ssh_options_set(session, SSH_OPTIONS_CIPHERS_C_S, "aes256-gcm at openssh.com,aes128-gcm at openssh.com,chacha20-poly1305 at openssh.com,aes256-ctr,aes192-ctr,aes128-ctr");
+ ssh_options_set(session, SSH_OPTIONS_CIPHERS_S_C, "aes256-gcm at openssh.com,aes128-gcm at openssh.com,chacha20-poly1305 at openssh.com,aes256-ctr,aes192-ctr,aes128-ctr");
++ ssh_options_set(session, SSH_OPTIONS_HMAC_S_C, "hmac-sha2-512-etm at openssh.com,hmac-sha2-256-etm at openssh.com,umac-128-etm at openssh.com");
++ ssh_options_set(session, SSH_OPTIONS_HMAC_C_S, "hmac-sha2-512-etm at openssh.com,hmac-sha2-256-etm at openssh.com,umac-128-etm at openssh.com");
+ ssh_options_set(session, SSH_OPTIONS_HOSTKEYS, "ecdsa-sha2-nistp384-cert-v01 at openssh.com,ecdsa-sha2-nistp521-cert-v01 at openssh.com,ssh-ed25519-cert-v01 at openssh.com,ssh-rsa-cert-v01 at openssh.com,ecdsa-sha2-nistp384,ecdsa-sha2-nistp521,ssh-ed25519,ssh-rsa");
- ssh_set_auth_methods(client->session, SSH_AUTH_METHOD_PUBLICKEY);
-
-@@ -323,6 +329,9 @@ static ssh_bind prepare_ssh(const char *keys_dir, cons
- ssh_bind bind;
- char buffer[PATH_MAX];
- int ssh_log_level;
-+ ssh_key rsakey = NULL;
-+ ssh_key ecdsakey = NULL;
-+ ssh_key ed25519key = NULL;
-
- ssh_log_level = SSH_LOG_WARNING + max(log_get_level() - LOG_NOTICE, 0);
-
-@@ -339,10 +348,16 @@ static ssh_bind prepare_ssh(const char *keys_dir, cons
+ ssh_set_auth_methods(client->session, SSH_AUTH_METHOD_NONE |
+ SSH_AUTH_METHOD_PUBLICKEY);
+@@ -417,7 +423,6 @@ static ssh_bind prepare_ssh(const char *keys_dir, cons
+ ssh_bind_options_set(bind, SSH_BIND_OPTIONS_BANNER, TMATE_SSH_BANNER);
ssh_bind_options_set(bind, SSH_BIND_OPTIONS_LOG_VERBOSITY, &ssh_log_level);
- sprintf(buffer, "%s/ssh_host_rsa_key", keys_dir);
-- ssh_bind_options_set(bind, SSH_BIND_OPTIONS_RSAKEY, buffer);
-+ ssh_pki_import_privkey_file(buffer, NULL, NULL, NULL, &rsakey);
-+ ssh_bind_options_set(bind, SSH_BIND_OPTIONS_IMPORT_KEY, rsakey);
+- ssh_import_key(bind, keys_dir, "ssh_host_rsa_key");
+ ssh_import_key(bind, keys_dir, "ssh_host_ed25519_key");
-+ sprintf(buffer, "%s/ssh_host_ed25519_key", keys_dir);
-+ ssh_pki_import_privkey_file(buffer, NULL, NULL, NULL, &ed25519key);
-+ ssh_bind_options_set(bind, SSH_BIND_OPTIONS_IMPORT_KEY, ed25519key);
-+
- sprintf(buffer, "%s/ssh_host_ecdsa_key", keys_dir);
-- ssh_bind_options_set(bind, SSH_BIND_OPTIONS_ECDSAKEY, buffer);
-+ ssh_pki_import_privkey_file(buffer, NULL, NULL, NULL, &ecdsakey);
-+ ssh_bind_options_set(bind, SSH_BIND_OPTIONS_IMPORT_KEY, ecdsakey);
-
if (ssh_bind_listen(bind) < 0)
- tmate_fatal("Error listening to socket: %s\n", ssh_get_error(bind));
More information about the svn-ports-head
mailing list