diff --git a/base/openssh/PKG-INFO b/base/openssh/PKG-INFO index 842439bb5..70365b3ea 100644 --- a/base/openssh/PKG-INFO +++ b/base/openssh/PKG-INFO @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: openssh -Version: 6.6.1p1 +Version: 7.8p1 Summary: An open source implementation of SSH protocol versions 1 and 2 Home-page: Author: diff --git a/base/openssh/centos/build_srpm.data b/base/openssh/centos/build_srpm.data index ed8de7493..8aeb55368 100644 --- a/base/openssh/centos/build_srpm.data +++ b/base/openssh/centos/build_srpm.data @@ -1 +1 @@ -TIS_PATCH_VER=10 +TIS_PATCH_VER=1 diff --git a/base/openssh/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch b/base/openssh/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch index 881496126..42d787e44 100644 --- a/base/openssh/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch +++ b/base/openssh/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch @@ -4,6 +4,7 @@ Date: Mon, 2 Oct 2017 15:32:16 -0400 Subject: 0001-Update-package-versioning-for-TIS-format.patch Signed-off-by: zhipengl +Signed-off-by: Dongqi Chen --- SPECS/openssh.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) @@ -12,21 +13,21 @@ diff --git a/SPECS/openssh.spec b/SPECS/openssh.spec index 5c030bc..0a91b56 100644 --- a/SPECS/openssh.spec +++ b/SPECS/openssh.spec -@@ -71,7 +71,7 @@ - Summary: An open source implementation of SSH protocol versions 1 and 2 +@@ -73,7 +73,7 @@ + Summary: An open source implementation of SSH protocol version 2 Name: openssh Version: %{openssh_ver} -Release: %{openssh_rel}%{?dist}%{?rescue_rel} -+Release: %{openssh_rel}.el7_4%{?_tis_dist}.%{tis_patch_ver} ++Release: %{openssh_rel}.el8%{?_tis_dist}.%{tis_patch_ver} URL: http://www.openssh.com/portable.html #URL1: http://pamsshagentauth.sourceforge.net Source0: ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-%{version}.tar.gz -@@ -346,7 +346,7 @@ Requires: openssh = %{version}-%{release} +@@ -323,7 +323,7 @@ Requires: openssh = %{version}-%{release} Summary: PAM module for authentication with ssh-agent Group: System Environment/Base Version: %{pam_ssh_agent_ver} -Release: %{pam_ssh_agent_rel}.%{openssh_rel}%{?dist}%{?rescue_rel} -+Release: %{pam_ssh_agent_rel}.el7_2%{?_tis_dist}.%{tis_patch_ver} ++Release: %{pam_ssh_agent_rel}.el8%{?_tis_dist}.%{tis_patch_ver} License: BSD %description diff --git a/base/openssh/centos/meta_patches/PATCH_ORDER b/base/openssh/centos/meta_patches/PATCH_ORDER index 2d936ef02..4d197e094 100644 --- a/base/openssh/centos/meta_patches/PATCH_ORDER +++ b/base/openssh/centos/meta_patches/PATCH_ORDER @@ -1,3 +1,2 @@ 0001-Update-package-versioning-for-TIS-format.patch -spec-include-TiS-changes.patch -openssh-init-script-kill-old-instances-on-start.patch +spec-include-TiS-changes.patch \ No newline at end of file diff --git a/base/openssh/centos/meta_patches/openssh-init-script-kill-old-instances-on-start.patch b/base/openssh/centos/meta_patches/openssh-init-script-kill-old-instances-on-start.patch deleted file mode 100644 index 905fd3840..000000000 --- a/base/openssh/centos/meta_patches/openssh-init-script-kill-old-instances-on-start.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 7eefd34e4adc9a4c88fc667f99bf76e967270813 Mon Sep 17 00:00:00 2001 -From: Scott Little -Date: Mon, 2 Oct 2017 15:32:16 -0400 -Subject: [PATCH 6/7] WRS: - openssh-init-script-kill-old-instances-on-start.patch - ---- - SOURCES/sshd.init | 8 ++++++++ - 1 file changed, 8 insertions(+) - -diff --git a/SOURCES/sshd.init b/SOURCES/sshd.init -index 8901b4f..cd8b4ab 100755 ---- a/SOURCES/sshd.init -+++ b/SOURCES/sshd.init -@@ -60,6 +60,14 @@ start() - # Create keys if necessary - /usr/sbin/sshd-keygen - -+ # In rare instances, sshd may be started but a pid -+ # file is not generated. This is seen usually during -+ # system reboot scenarios. A subsequent attempt to start -+ # sshd here will trigger a port bind error. As a sanity -+ # check attempt a kill call (mostly redundant) to any -+ # previously running sshd instance -+ /bin/kill `/usr/sbin/pidof "$SSHD"` >/dev/null 2>&1 -+ - echo -n $"Starting $prog: " - $SSHD $OPTIONS && success || failure - RETVAL=$? --- -1.9.1 diff --git a/base/openssh/centos/meta_patches/spec-include-TiS-changes.patch b/base/openssh/centos/meta_patches/spec-include-TiS-changes.patch index 6b328db57..4e084c7ac 100644 --- a/base/openssh/centos/meta_patches/spec-include-TiS-changes.patch +++ b/base/openssh/centos/meta_patches/spec-include-TiS-changes.patch @@ -4,33 +4,25 @@ Date: Mon, 2 Oct 2017 15:32:16 -0400 Subject: spec-include-TiS-changes.patch Signed-off-by: zhipengl +Signed-off-by: Dongqi Chen --- - SPECS/openssh.spec | 5 ----- - 1 file changed, 5 deletions(-) + SPECS/openssh.spec | 3 --- + 1 file changed, 3 deletions(-) diff --git a/SPECS/openssh.spec b/SPECS/openssh.spec index 0a91b56..bbae9d7 100644 --- a/SPECS/openssh.spec +++ b/SPECS/openssh.spec -@@ -719,9 +723,6 @@ getent passwd sshd >/dev/null || \ +@@ -659,9 +659,6 @@ getent passwd sshd >/dev/null || \ %preun server %systemd_preun sshd.service sshd.socket - + -%postun server -%systemd_postun_with_restart sshd.service - %files - %defattr(-,root,root) - %{!?_licensedir:%global license %%doc} -@@ -784,8 +785,6 @@ getent passwd sshd >/dev/null || \ - %attr(0644,root,root) %{_unitdir}/sshd.socket - %attr(0644,root,root) %{_unitdir}/sshd-keygen.service - --%files server-sysvinit --%defattr(-,root,root) - %attr(0755,root,root) /etc/rc.d/init.d/sshd - %endif - --- + %license LICENCE + %doc CREDITS ChangeLog INSTALL OVERVIEW PROTOCOL* README README.platform README.privsep README.tun README.dns TODO +-- 1.8.3.1 diff --git a/base/openssh/centos/srpm_path b/base/openssh/centos/srpm_path index d5332f546..f0b4ad4fc 100644 --- a/base/openssh/centos/srpm_path +++ b/base/openssh/centos/srpm_path @@ -1 +1 @@ -mirror:Source/openssh-7.4p1-16.el7.src.rpm +mirror:Source/openssh-7.8p1-4.el8.src.rpm