Skip to content

Commit b494785

Browse files
negan07negan07
committed
openssh: bumped to 7.8p1
1 parent 1c082bf commit b494785

8 files changed

+44
-45
lines changed

‎diffs/work/openssh-7.7p1/D7000_V1.0.1.68_work_openssh-7.7p1-100-dscp-qos.diff‎

Lines changed: 0 additions & 23 deletions
This file was deleted.

diffs/work/openssh-7.7p1/D7000_V1.0.1.68_work_openssh-7.7p1-000-makefile.diff renamed to diffs/work/openssh-7.8p1/D7000_V1.0.1.68_work_openssh-7.8p1-000-makefile.diff

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
diff -urN work/openssh-7.7p1/Makefile work/openssh-7.7p1/Makefile
2-
--- work/openssh-7.7p1/Makefile 1970-01-01 01:00:00.000000000 +0100
3-
+++ work/openssh-7.7p1/Makefile 2018-01-05 12:00:11.000000000 +0100
4-
@@ -0,0 +1,199 @@
1+
diff -urN work/openssh-7.8p1/Makefile work/openssh-7.8p1/Makefile
2+
--- work/openssh-7.8p1/Makefile 1970-01-01 01:00:00.000000000 +0100
3+
+++ work/openssh-7.8p1/Makefile 2018-01-05 12:00:11.000000000 +0100
4+
@@ -0,0 +1,198 @@
55
+include ../Rules.mak
66
+
77
+BINS := $(OPEN_SSH)/sshd $(OPEN_SSH)/ssh-keygen $(OPEN_SSH)/scp
@@ -119,7 +119,6 @@ diff -urN work/openssh-7.7p1/Makefile work/openssh-7.7p1/Makefile
119119
+ @echo "#PrintMotd yes" >> $(SSHD_CONF)
120120
+ @echo "#PrintLastLog yes" >> $(SSHD_CONF)
121121
+ @echo "#TCPKeepAlive yes" >> $(SSHD_CONF)
122-
+ @echo "#UseLogin no" >> $(SSHD_CONF)
123122
+ @echo "#PermitUserEnvironment no" >> $(SSHD_CONF)
124123
+ @echo "Compression yes" >> $(SSHD_CONF)
125124
+ @echo "#ClientAliveInterval 0" >> $(SSHD_CONF)

diffs/work/openssh-7.7p1/D7000_V1.0.1.68_work_openssh-7.7p1-001-rc_ssh.diff renamed to diffs/work/openssh-7.8p1/D7000_V1.0.1.68_work_openssh-7.8p1-001-rc_ssh.diff

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
diff -urN work/openssh-7.7p1/rc_ssh work/openssh-7.7p1/rc_ssh
2-
--- work/openssh-7.7p1/rc_ssh 1970-01-01 01:00:00.000000000 +0100
3-
+++ work/openssh-7.7p1/rc_ssh 2018-01-05 12:00:11.000000000 +0100
1+
diff -urN work/openssh-7.8p1/rc_ssh work/openssh-7.8p1/rc_ssh
2+
--- work/openssh-7.8p1/rc_ssh 1970-01-01 01:00:00.000000000 +0100
3+
+++ work/openssh-7.8p1/rc_ssh 2018-01-05 12:00:11.000000000 +0100
44
@@ -0,0 +1,211 @@
55
+#!/bin/sh
66
+#

diffs/work/openssh-7.7p1/D7000_V1.0.1.68_work_openssh-7.7p1-002-makefilein.diff renamed to diffs/work/openssh-7.8p1/D7000_V1.0.1.68_work_openssh-7.8p1-002-makefilein.diff

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
diff -urN work/openssh-7.7p1/openssh-7.7p1/Makefile.in work/openssh-7.7p1/openssh-7.7p1/Makefile.in
2-
--- work/openssh-7.7p1/openssh-7.7p1/Makefile.in 1970-01-01 01:00:00.000000000 +0100
3-
+++ work/openssh-7.7p1/openssh-7.7p1/Makefile.in 2018-01-05 12:00:11.000000000 +0100
1+
diff -urN work/openssh-7.8p1/openssh-7.8p1/Makefile.in work/openssh-7.8p1/openssh-7.8p1/Makefile.in
2+
--- work/openssh-7.8p1/openssh-7.8p1/Makefile.in 1970-01-01 01:00:00.000000000 +0100
3+
+++ work/openssh-7.8p1/openssh-7.8p1/Makefile.in 2018-01-05 12:00:11.000000000 +0100
44
@@ -60,7 +60,7 @@
55
MANFMT=@MANFMT@
66
MKDIR_P=@MKDIR_P@

diffs/work/openssh-7.7p1/D7000_V1.0.1.68_work_openssh-7.7p1-003-configure_undef_logout.diff renamed to diffs/work/openssh-7.8p1/D7000_V1.0.1.68_work_openssh-7.8p1-003-configure_undef_logout.diff

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
diff -urN work/openssh-7.7p1/openssh-7.7p1/configure work/openssh-7.7p1/openssh-7.7p1/configure
2-
--- work/openssh-7.7p1/openssh-7.7p1/configure 2018-01-26 14:13:08.324425774 +0100
3-
+++ work/openssh-7.7p1/openssh-7.7p1/configure 2018-01-26 14:13:08.324425774 +0100
4-
@@ -9843,7 +9843,7 @@
1+
diff -urN work/openssh-7.8p1/openssh-7.8p1/configure work/openssh-7.8p1/openssh-7.8p1/configure
2+
--- work/openssh-7.8p1/openssh-7.8p1/configure 2018-01-26 14:13:08.324425774 +0100
3+
+++ work/openssh-7.8p1/openssh-7.8p1/configure 2018-01-26 14:13:08.324425774 +0100
4+
@@ -9878,7 +9878,7 @@
55

66
fi
77

diffs/work/openssh-7.7p1/D7000_V1.0.1.68_work_openssh-7.7p1-011-syslog.diff renamed to diffs/work/openssh-7.8p1/D7000_V1.0.1.68_work_openssh-7.8p1-011-syslog.diff

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
diff -urN work/openssh-7.7p1/openssh-7.7p1/log.c work/openssh-7.7p1/openssh-7.7p1/log.c
2-
--- work/openssh-7.7p1/openssh-7.7p1/log.c 1970-01-01 01:00:00.000000000 +0100
3-
+++ work/openssh-7.7p1/openssh-7.7p1/log.c 2018-01-05 12:00:11.000000000 +0100
1+
diff -urN work/openssh-7.8p1/openssh-7.8p1/log.c work/openssh-7.8p1/openssh-7.8p1/log.c
2+
--- work/openssh-7.8p1/openssh-7.8p1/log.c 1970-01-01 01:00:00.000000000 +0100
3+
+++ work/openssh-7.8p1/openssh-7.8p1/log.c 2018-01-05 12:00:11.000000000 +0100
44
@@ -52,6 +52,8 @@
55

66
#include "log.h"
@@ -10,7 +10,7 @@ diff -urN work/openssh-7.7p1/openssh-7.7p1/log.c work/openssh-7.7p1/openssh-7.7p
1010
static LogLevel log_level = SYSLOG_LEVEL_INFO;
1111
static int log_on_stderr = 1;
1212
static int log_stderr_fd = STDERR_FILENO;
13-
@@ -400,7 +402,7 @@
13+
@@ -406,7 +408,7 @@
1414
char msgbuf[MSGBUFSIZ];
1515
char fmtbuf[MSGBUFSIZ];
1616
char *txt = NULL;
@@ -19,7 +19,7 @@ diff -urN work/openssh-7.7p1/openssh-7.7p1/log.c work/openssh-7.7p1/openssh-7.7p
1919
int saved_errno = errno;
2020
log_handler_fn *tmp_handler;
2121

22-
@@ -411,34 +413,34 @@
22+
@@ -417,34 +419,34 @@
2323
case SYSLOG_LEVEL_FATAL:
2424
if (!log_on_stderr)
2525
txt = "fatal";
@@ -62,7 +62,7 @@ diff -urN work/openssh-7.7p1/openssh-7.7p1/log.c work/openssh-7.7p1/openssh-7.7p
6262
break;
6363
}
6464
if (txt != NULL && log_handler == NULL) {
65-
@@ -462,11 +464,13 @@
65+
@@ -468,11 +470,13 @@
6666
} else {
6767
#if defined(HAVE_OPENLOG_R) && defined(SYSLOG_DATA_INIT)
6868
openlog_r(argv0 ? argv0 : __progname, LOG_PID, log_facility, &sdata);

‎diffs/work/openssh-7.8p1/D7000_V1.0.1.68_work_openssh-7.8p1-100-dscp-qos.diff‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
diff -urN work/openssh-7.8p1/openssh-7.8p1/ssh_config work/openssh-7.8p1/openssh-7.8p1/ssh_config
2+
--- work/openssh-7.8p1/openssh-7.8p1/ssh_config 2018-04-02 07:38:28.000000000 +0200
3+
+++ work/openssh-7.8p1/openssh-7.8p1/ssh_config 2018-05-08 18:46:37.213533875 +0200
4+
@@ -44,3 +44,6 @@
5+
# VisualHostKey no
6+
# ProxyCommand ssh -q -W %h:%p gateway.example.com
7+
# RekeyLimit 1G 1h
8+
+
9+
+# enable DSCP QoS values (per RFC-4594)
10+
+#IPQoS AF21 AF11
11+
diff -urN work/openssh-7.8p1/openssh-7.8p1/sshd_config work/openssh-7.8p1/openssh-7.8p1/sshd_config
12+
--- work/openssh-7.8p1/openssh-7.8p1/sshd_config 2018-04-02 07:38:28.000000000 +0200
13+
+++ work/openssh-7.8p1/openssh-7.8p1/sshd_config 2018-05-08 18:48:25.164852441 +0200
14+
@@ -105,6 +105,9 @@
15+
# no default banner path
16+
#Banner none
17+
18+
+# enable DSCP QoS values (per RFC-4594)
19+
+#IPQoS AF21 AF11
20+
+
21+
# override default of no subsystems
22+
Subsystem sftp /usr/libexec/sftp-server
23+

‎work/dirs.mak‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -304,7 +304,7 @@ DIRLIST += $(OPEN_VPN)
304304
TARLIST += $(OPEN_VPN)
305305
# OPENSSH
306306
OPEN_SSH_NAME := openssh
307-
VER_$(OPEN_SSH_NAME) := 7.7p1
307+
VER_$(OPEN_SSH_NAME) := 7.8p1
308308
OPEN_SSH := $(OPEN_SSH_NAME)-$(VER_$(OPEN_SSH_NAME))
309309
NAME_$(OPEN_SSH) := $(OPEN_SSH_NAME)$(DBG)
310310
SUBVER_$(OPEN_SSH) :=

0 commit comments

Comments
 (0)