From 1ef9f552f7c5da809013096aedb725b40ae1b2b2 Mon Sep 17 00:00:00 2001 From: bitianyuan Date: Mon, 23 Dec 2024 13:19:42 +0000 Subject: [PATCH] dos2unix all file Signed-off-by: bitianyuan (cherry picked from commit c2dd1c747c71b6c9fc5a35a1a6d64a1001ce6357) --- openssh.spec | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/openssh.spec b/openssh.spec index fd0ae83..f35ad5a 100644 --- a/openssh.spec +++ b/openssh.spec @@ -6,11 +6,12 @@ %{?no_gtk2:%global gtk2 0} %global sshd_uid 74 -%global openssh_release 2 +%global openssh_release 3 Name: openssh Version: 9.6p1 Release: %{openssh_release} +%global openssh_version %{version} URL: http://www.openssh.com/portable.html License: BSD Summary: An open source implementation of SSH protocol version 2 @@ -115,7 +116,7 @@ Requires: libselinux >= 2.3-5 audit-libs >= 1.0.8 Requires: openssh-server = %{version}-%{release} BuildRequires: gtk2-devel libX11-devel openldap-devel autoconf automake perl-interpreter perl-generators -BuildRequires: zlib-devel audit-libs-devel >= 2.0.5 util-linux groff pam-devel +BuildRequires: zlib-devel audit-libs-devel >= 2.0.5 util-linux groff pam-devel dos2unix BuildRequires: openssl-devel >= 0.9.8j perl-podlators systemd-devel gcc p11-kit-devel krb5-devel BuildRequires: libedit-devel ncurses-devel libselinux-devel >= 2.3-5 audit-libs >= 1.0.8 xauth gnupg2 @@ -183,6 +184,8 @@ instance. The module is most useful for su and sudo service stacks. %prep %setup -q -a 3 +find %{_sourcedir} -type f -exec dos2unix -q {} \; +find %{_builddir}/%{name}-%{openssh_version} -type f -exec dos2unix -q {} \; pushd pam_ssh_agent_auth-pam_ssh_agent_auth-0.10.4 %patch -P 4 -p2 -b .psaa-build @@ -494,6 +497,12 @@ fi %attr(0644,root,root) %{_mandir}/man8/sftp-server.8* %changelog +* Mon Dec 23 2024 bitianyuan - 9.6p1-3 +- Type:bugfix +- CVE:NA +- SUG:NA +- DESC:dos2unix all file + * Fri Dec 20 2024 bitianyuan - 9.6p1-2 - Type:bugfix - CVE:NA -- Gitee