openssh: bumped to 7.8p1

negan07 · Oct 7, 2018 · b494785 · b494785
1 parent 1c082bf
commit b494785
Show file tree

Hide file tree

Showing 8 changed files with 44 additions and 45 deletions.
diff --git a/diffs/work/openssh-7.7p1/D7000_V1.0.1.68_work_openssh-7.7p1-100-dscp-qos.diff b/diffs/work/openssh-7.7p1/D7000_V1.0.1.68_work_openssh-7.7p1-100-dscp-qos.diff
diff --git a/...1.68_work_openssh-7.7p1-000-makefile.diff → ...1.68_work_openssh-7.8p1-000-makefile.diff b/...1.68_work_openssh-7.7p1-000-makefile.diff → ...1.68_work_openssh-7.8p1-000-makefile.diff
@@ -1,7 +1,7 @@
-diff -urN work/openssh-7.7p1/Makefile work/openssh-7.7p1/Makefile
---- work/openssh-7.7p1/Makefile	1970-01-01 01:00:00.000000000 +0100
-+++ work/openssh-7.7p1/Makefile	2018-01-05 12:00:11.000000000 +0100
-@@ -0,0 +1,199 @@
+diff -urN work/openssh-7.8p1/Makefile work/openssh-7.8p1/Makefile
+--- work/openssh-7.8p1/Makefile	1970-01-01 01:00:00.000000000 +0100
++++ work/openssh-7.8p1/Makefile	2018-01-05 12:00:11.000000000 +0100
+@@ -0,0 +1,198 @@
 +include ../Rules.mak
 +
 +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
 +	@echo "#PrintMotd yes" >> $(SSHD_CONF)
 +	@echo "#PrintLastLog yes" >> $(SSHD_CONF)
 +	@echo "#TCPKeepAlive yes" >> $(SSHD_CONF)
-+	@echo "#UseLogin no" >> $(SSHD_CONF)
 +	@echo "#PermitUserEnvironment no" >> $(SSHD_CONF)
 +	@echo "Compression yes" >> $(SSHD_CONF)
 +	@echo "#ClientAliveInterval 0" >> $(SSHD_CONF)

diff --git a/...0.1.68_work_openssh-7.7p1-001-rc_ssh.diff → ...0.1.68_work_openssh-7.8p1-001-rc_ssh.diff b/...0.1.68_work_openssh-7.7p1-001-rc_ssh.diff → ...0.1.68_work_openssh-7.8p1-001-rc_ssh.diff
@@ -1,6 +1,6 @@
-diff -urN work/openssh-7.7p1/rc_ssh work/openssh-7.7p1/rc_ssh
---- work/openssh-7.7p1/rc_ssh	1970-01-01 01:00:00.000000000 +0100
-+++ work/openssh-7.7p1/rc_ssh	2018-01-05 12:00:11.000000000 +0100
+diff -urN work/openssh-7.8p1/rc_ssh work/openssh-7.8p1/rc_ssh
+--- work/openssh-7.8p1/rc_ssh	1970-01-01 01:00:00.000000000 +0100
++++ work/openssh-7.8p1/rc_ssh	2018-01-05 12:00:11.000000000 +0100
 @@ -0,0 +1,211 @@
 +#!/bin/sh
 +#

diff --git a/...68_work_openssh-7.7p1-002-makefilein.diff → ...68_work_openssh-7.8p1-002-makefilein.diff b/...68_work_openssh-7.7p1-002-makefilein.diff → ...68_work_openssh-7.8p1-002-makefilein.diff
@@ -1,6 +1,6 @@
-diff -urN work/openssh-7.7p1/openssh-7.7p1/Makefile.in work/openssh-7.7p1/openssh-7.7p1/Makefile.in
---- work/openssh-7.7p1/openssh-7.7p1/Makefile.in	1970-01-01 01:00:00.000000000 +0100
-+++ work/openssh-7.7p1/openssh-7.7p1/Makefile.in	2018-01-05 12:00:11.000000000 +0100
+diff -urN work/openssh-7.8p1/openssh-7.8p1/Makefile.in work/openssh-7.8p1/openssh-7.8p1/Makefile.in
+--- work/openssh-7.8p1/openssh-7.8p1/Makefile.in	1970-01-01 01:00:00.000000000 +0100
++++ work/openssh-7.8p1/openssh-7.8p1/Makefile.in	2018-01-05 12:00:11.000000000 +0100
 @@ -60,7 +60,7 @@
  MANFMT=@MANFMT@
  MKDIR_P=@MKDIR_P@

diff --git a/...ssh-7.7p1-003-configure_undef_logout.diff → ...ssh-7.8p1-003-configure_undef_logout.diff b/...ssh-7.7p1-003-configure_undef_logout.diff → ...ssh-7.8p1-003-configure_undef_logout.diff
@@ -1,7 +1,7 @@
-diff -urN work/openssh-7.7p1/openssh-7.7p1/configure work/openssh-7.7p1/openssh-7.7p1/configure
---- work/openssh-7.7p1/openssh-7.7p1/configure	2018-01-26 14:13:08.324425774 +0100
-+++ work/openssh-7.7p1/openssh-7.7p1/configure	2018-01-26 14:13:08.324425774 +0100
-@@ -9843,7 +9843,7 @@
+diff -urN work/openssh-7.8p1/openssh-7.8p1/configure work/openssh-7.8p1/openssh-7.8p1/configure
+--- work/openssh-7.8p1/openssh-7.8p1/configure	2018-01-26 14:13:08.324425774 +0100
++++ work/openssh-7.8p1/openssh-7.8p1/configure	2018-01-26 14:13:08.324425774 +0100
+@@ -9878,7 +9878,7 @@
 
  fi
 

diff --git a/...0.1.68_work_openssh-7.7p1-011-syslog.diff → ...0.1.68_work_openssh-7.8p1-011-syslog.diff b/...0.1.68_work_openssh-7.7p1-011-syslog.diff → ...0.1.68_work_openssh-7.8p1-011-syslog.diff
@@ -1,6 +1,6 @@
-diff -urN work/openssh-7.7p1/openssh-7.7p1/log.c work/openssh-7.7p1/openssh-7.7p1/log.c
---- work/openssh-7.7p1/openssh-7.7p1/log.c	1970-01-01 01:00:00.000000000 +0100
-+++ work/openssh-7.7p1/openssh-7.7p1/log.c	2018-01-05 12:00:11.000000000 +0100
+diff -urN work/openssh-7.8p1/openssh-7.8p1/log.c work/openssh-7.8p1/openssh-7.8p1/log.c
+--- work/openssh-7.8p1/openssh-7.8p1/log.c	1970-01-01 01:00:00.000000000 +0100
++++ work/openssh-7.8p1/openssh-7.8p1/log.c	2018-01-05 12:00:11.000000000 +0100
 @@ -52,6 +52,8 @@
 
  #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
  static LogLevel log_level = SYSLOG_LEVEL_INFO;
  static int log_on_stderr = 1;
  static int log_stderr_fd = STDERR_FILENO;
-@@ -400,7 +402,7 @@
+@@ -406,7 +408,7 @@
  	char msgbuf[MSGBUFSIZ];
  	char fmtbuf[MSGBUFSIZ];
  	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
  	int saved_errno = errno;
  	log_handler_fn *tmp_handler;
 
-@@ -411,34 +413,34 @@
+@@ -417,34 +419,34 @@
  	case SYSLOG_LEVEL_FATAL:
  		if (!log_on_stderr)
  			txt = "fatal";
@@ -62,7 +62,7 @@ diff -urN work/openssh-7.7p1/openssh-7.7p1/log.c work/openssh-7.7p1/openssh-7.7p
  		break;
  	}
  	if (txt != NULL && log_handler == NULL) {
-@@ -462,11 +464,13 @@
+@@ -468,11 +470,13 @@
  	} else {
  #if defined(HAVE_OPENLOG_R) && defined(SYSLOG_DATA_INIT)
  		openlog_r(argv0 ? argv0 : __progname, LOG_PID, log_facility, &sdata);

diff --git a/diffs/work/openssh-7.8p1/D7000_V1.0.1.68_work_openssh-7.8p1-100-dscp-qos.diff b/diffs/work/openssh-7.8p1/D7000_V1.0.1.68_work_openssh-7.8p1-100-dscp-qos.diff
@@ -0,0 +1,23 @@
+diff -urN work/openssh-7.8p1/openssh-7.8p1/ssh_config work/openssh-7.8p1/openssh-7.8p1/ssh_config
+--- work/openssh-7.8p1/openssh-7.8p1/ssh_config	2018-04-02 07:38:28.000000000 +0200
++++ work/openssh-7.8p1/openssh-7.8p1/ssh_config	2018-05-08 18:46:37.213533875 +0200
+@@ -44,3 +44,6 @@
+ #   VisualHostKey no
+ #   ProxyCommand ssh -q -W %h:%p gateway.example.com
+ #   RekeyLimit 1G 1h
++
++# enable DSCP QoS values (per RFC-4594)
++#IPQoS AF21 AF11
+diff -urN work/openssh-7.8p1/openssh-7.8p1/sshd_config work/openssh-7.8p1/openssh-7.8p1/sshd_config
+--- work/openssh-7.8p1/openssh-7.8p1/sshd_config	2018-04-02 07:38:28.000000000 +0200
++++ work/openssh-7.8p1/openssh-7.8p1/sshd_config	2018-05-08 18:48:25.164852441 +0200
+@@ -105,6 +105,9 @@
+ # no default banner path
+ #Banner none
+
++# enable DSCP QoS values (per RFC-4594)
++#IPQoS AF21 AF11
++
+ # override default of no subsystems
+ Subsystem	sftp	/usr/libexec/sftp-server
+
diff --git a/work/dirs.mak b/work/dirs.mak
@@ -304,7 +304,7 @@ DIRLIST				+= $(OPEN_VPN)
 TARLIST				+= $(OPEN_VPN)
 # OPENSSH
 OPEN_SSH_NAME			:= openssh
-VER_$(OPEN_SSH_NAME)		:= 7.7p1
+VER_$(OPEN_SSH_NAME)		:= 7.8p1
 OPEN_SSH			:= $(OPEN_SSH_NAME)-$(VER_$(OPEN_SSH_NAME))
 NAME_$(OPEN_SSH)		:= $(OPEN_SSH_NAME)$(DBG)
 SUBVER_$(OPEN_SSH)		:=