From 62d88b35f122bc295194e0b2a923d3e1751ce724 Mon Sep 17 00:00:00 2001 From: Dmitry Belyavskiy Date: Sep 24 2021 13:39:42 +0000 Subject: Sources and spec changes Resolves: rhbz#2001002 --- diff --git a/.gitignore b/.gitignore index a250550..0a1fd60 100644 --- a/.gitignore +++ b/.gitignore @@ -50,3 +50,5 @@ pam_ssh_agent_auth-0.9.2.tar.bz2 /gpgkey-736060BA.gpg /openssh-8.6p1.tar.gz /openssh-8.6p1.tar.gz.asc +/openssh-8.7p1.tar.gz +/openssh-8.7p1.tar.gz.asc diff --git a/openssh.spec b/openssh.spec index 8954cba..0bd94ad 100644 --- a/openssh.spec +++ b/openssh.spec @@ -50,15 +50,15 @@ %{?static_openssl:%global static_libcrypto 1} # Do not forget to bump pam_ssh_agent_auth release if you rewind the main package release to 1 -%global openssh_ver 8.6p1 -%global openssh_rel 7 +%global openssh_ver 8.7p1 +%global openssh_rel 1 %global pam_ssh_agent_ver 0.10.4 -%global pam_ssh_agent_rel 3 +%global pam_ssh_agent_rel 4 Summary: An open source implementation of SSH protocol version 2 Name: openssh Version: %{openssh_ver} -Release: %{openssh_rel}%{?dist}.1 +Release: %{openssh_rel}%{?dist} URL: http://www.openssh.com/portable.html #URL1: https://github.com/jbeverly/pam_ssh_agent_auth/ Source0: ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-%{version}.tar.gz @@ -189,14 +189,10 @@ Patch964: openssh-8.0p1-openssl-kdf.patch Patch965: openssh-8.2p1-visibility.patch # Do not break X11 without IPv6 Patch966: openssh-8.2p1-x11-without-ipv6.patch -# https://bugzilla.mindrot.org/show_bug.cgi?id=3213 -Patch969: openssh-8.4p1-debian-compat.patch # ssh-keygen printing fingerprint issue with Windows keys (#1901518) Patch974: openssh-8.0p1-keygen-strip-doseol.patch # sshd provides PAM an incorrect error code (#1879503) Patch975: openssh-8.0p1-preserve-pam-errors.patch -# ssh incorrectly restores the blocking mode on standard output (#1942901) -Patch976: openssh-8.0p1-restore-nonblock.patch License: BSD Requires: /sbin/nologin @@ -267,7 +263,7 @@ Requires: openssh = %{version}-%{release} %package -n pam_ssh_agent_auth Summary: PAM module for authentication with ssh-agent Version: %{pam_ssh_agent_ver} -Release: %{pam_ssh_agent_rel}.%{openssh_rel}%{?dist}.2 +Release: %{pam_ssh_agent_rel}.%{openssh_rel}%{?dist} License: BSD %description @@ -370,10 +366,8 @@ popd %patch964 -p1 -b .openssl-kdf %patch965 -p1 -b .visibility %patch966 -p1 -b .x11-ipv6 -%patch969 -p0 -b .debian %patch974 -p1 -b .keygen-strip-doseol %patch975 -p1 -b .preserve-pam-errors -%patch976 -p1 -b .restore-nonblock %patch200 -p1 -b .audit %patch201 -p1 -b .audit-race @@ -658,6 +652,9 @@ test -f %{sysconfig_anaconda} && \ %endif %changelog +* Fri Sep 24 2021 Dmitry Belyavskiy - 8.7p1-1 + 0.10.4-4 +- New upstream release (#2001002) + * Mon Aug 09 2021 Mohan Boddu - 8.6p1-7.1 - Rebuilt for IMA sigs, glibc 2.34, aarch64 flags Related: rhbz#1991688 diff --git a/sources b/sources index 0675af0..6fe759c 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ -SHA512 (openssh-8.6p1.tar.gz) = 9854eda0b773c64c9f1f74844ce466b2b42ee8845f58ad062b73141d617af944fa4ebafdf72069f400106d2c2bd0a69c92fe805ec1fc26d4f0faadf06c3fbbe6 -SHA512 (openssh-8.6p1.tar.gz.asc) = ea75d7fe350fd1761ee5490b222249e9b8915b2a02a1d41979195f15d239def387e4c6467362ab9515d517087750fa66bc368f5baa15c325502f725172631967 +SHA512 (openssh-8.7p1.tar.gz) = 08c81024d9e1248abfda6cc874886ff5ae916669b93cd6aff640e0614ee8cbcbc3fe87a9ce47136b6443ddbb1168b114367c74e117551905994e1a7e3fa2c0c2 +SHA512 (openssh-8.7p1.tar.gz.asc) = 08b4bda855ca3ef202c271f1c0e3486082b93d1009a794d020e7ba223978bc87bf34b1fbccaae3379a47639bd849935fdaaf63bdb781d0a44625066ccf00fbfc SHA512 (pam_ssh_agent_auth-0.10.4.tar.gz) = caccf72174d15e43f4c86a459ac6448682e62116557cf1e1e828955f3d1731595b238df42adec57860e7f341e92daf5d8285020bcb5018f3b8a5145aa32ee1c2 SHA512 (gpgkey-736060BA.gpg) = df44f3fdbcd1d596705348c7f5aed3f738c5f626a55955e0642f7c6c082995cf36a1b1891bb41b8715cb2aff34fef1c877e0eff0d3507dd00a055ba695757a21