From 141d7b2d4a522b1329a15194ef105f5e01f66c51 Mon Sep 17 00:00:00 2001
From: Norbert Pocs <npocs@redhat.com>
Date: Jun 08 2023 11:56:15 +0000
Subject: Remove deprecated usage of %patchN


Signed-off-by: Norbert Pocs <npocs@redhat.com>

---

diff --git a/openssh.spec b/openssh.spec
index 6e28c3a..1d60f23 100644
--- a/openssh.spec
+++ b/openssh.spec
@@ -362,87 +362,87 @@ gpgv2 --quiet --keyring %{SOURCE3} %{SOURCE1} %{SOURCE0}
 
 %if %{pam_ssh_agent}
 pushd pam_ssh_agent_auth-pam_ssh_agent_auth-%{pam_ssh_agent_ver}
-%patch300 -p2 -b .psaa-build
-%patch301 -p2 -b .psaa-seteuid
-%patch302 -p2 -b .psaa-visibility
-%patch306 -p2 -b .psaa-compat
-%patch305 -p2 -b .psaa-agent
-%patch307 -p2 -b .psaa-deref
-%patch308 -p2 -b .rsasha2
-%patch309 -p1 -b .psaa-configure-c99
+%patch -P 300 -p2 -b .psaa-build
+%patch -P 301 -p2 -b .psaa-seteuid
+%patch -P 302 -p2 -b .psaa-visibility
+%patch -P 306 -p2 -b .psaa-compat
+%patch -P 305 -p2 -b .psaa-agent
+%patch -P 307 -p2 -b .psaa-deref
+%patch -P 308 -p2 -b .rsasha2
+%patch -P 309 -p1 -b .psaa-configure-c99
 # Remove duplicate headers and library files
 rm -f $(cat %{SOURCE5})
 popd
 %endif
 
-%patch400 -p1 -b .role-mls
-%patch404 -p1 -b .privsep-selinux
+%patch -P 400 -p1 -b .role-mls
+%patch -P 404 -p1 -b .privsep-selinux
 
-%patch502 -p1 -b .keycat
+%patch -P 502 -p1 -b .keycat
 
-%patch601 -p1 -b .ip-opts
-%patch606 -p1 -b .ipv6man
-%patch607 -p1 -b .sigpipe
-%patch609 -p1 -b .x11
-%patch702 -p1 -b .progress
-%patch703 -p1 -b .grab-info
-%patch707 -p1 -b .redhat
-%patch711 -p1 -b .log-usepam-no
+%patch -P 601 -p1 -b .ip-opts
+%patch -P 606 -p1 -b .ipv6man
+%patch -P 607 -p1 -b .sigpipe
+%patch -P 609 -p1 -b .x11
+%patch -P 702 -p1 -b .progress
+%patch -P 703 -p1 -b .grab-info
+%patch -P 707 -p1 -b .redhat
+%patch -P 711 -p1 -b .log-usepam-no
 # 
-%patch800 -p1 -b .gsskex
-%patch801 -p1 -b .force_krb
-%patch804 -p1 -b .ccache_name
-%patch805 -p1 -b .k5login
+%patch -P 800 -p1 -b .gsskex
+%patch -P 801 -p1 -b .force_krb
+%patch -P 804 -p1 -b .ccache_name
+%patch -P 805 -p1 -b .k5login
 # 
-%patch901 -p1 -b .kuserok
-%patch906 -p1 -b .fromto-remote
-%patch916 -p1 -b .contexts
-%patch918 -p1 -b .log-in-chroot
-%patch919 -p1 -b .scp
-%patch802 -p1 -b .GSSAPIEnablek5users
-%patch922 -p1 -b .sshdt
-%patch926 -p1 -b .sftp-force-mode
-%patch939 -p1 -b .s390-dev
-%patch944 -p1 -b .x11max
-%patch948 -p1 -b .systemd
-%patch949 -p1 -b .refactor
-%patch950 -p1 -b .sandbox
-%patch951 -p1 -b .pkcs11-uri
-%patch953 -p1 -b .scp-ipv6
-%patch962 -p1 -b .crypto-policies
-%patch963 -p1 -b .openssl-evp
-%patch964 -p1 -b .openssl-kdf
-%patch965 -p1 -b .visibility
-%patch966 -p1 -b .x11-ipv6
-%patch974 -p1 -b .keygen-strip-doseol
-%patch975 -p1 -b .preserve-pam-errors
-
-%patch977 -p1 -b .kill-scp
-
-%patch981 -p1 -b .scp-sftpdirs
-%patch982 -p1 -b .minrsabits
-%patch983 -p1 -b .evpgenrsa
-%patch984 -p1 -b .ibmca
-
-%patch200 -p1 -b .audit
-%patch201 -p1 -b .audit-race
-%patch202 -p1 -b .audit-log
-%patch700 -p1 -b .fips
-
-%patch1002 -p1 -b .ssh-manpage
-%patch1004 -p1 -b .gssapi-auth
-
-%patch1006 -p1 -b .negotiate-supported-algs
-
-%patch1011 -p1 -b .evp-fips-sign
-%patch1012 -p1 -b .evp-fips-dh
-%patch1013 -p1 -b .evp-fips-ecdh
-%patch1014 -p1 -b .nosha1hostproof
-%patch1015 -p1 -b .evp-pkcs11
-
-%patch1016 -p1 -b .man-hostkeyalgos
-
-%patch100 -p1 -b .coverity
+%patch -P 901 -p1 -b .kuserok
+%patch -P 906 -p1 -b .fromto-remote
+%patch -P 916 -p1 -b .contexts
+%patch -P 918 -p1 -b .log-in-chroot
+%patch -P 919 -p1 -b .scp
+%patch -P 802 -p1 -b .GSSAPIEnablek5users
+%patch -P 922 -p1 -b .sshdt
+%patch -P 926 -p1 -b .sftp-force-mode
+%patch -P 939 -p1 -b .s390-dev
+%patch -P 944 -p1 -b .x11max
+%patch -P 948 -p1 -b .systemd
+%patch -P 949 -p1 -b .refactor
+%patch -P 950 -p1 -b .sandbox
+%patch -P 951 -p1 -b .pkcs11-uri
+%patch -P 953 -p1 -b .scp-ipv6
+%patch -P 962 -p1 -b .crypto-policies
+%patch -P 963 -p1 -b .openssl-evp
+%patch -P 964 -p1 -b .openssl-kdf
+%patch -P 965 -p1 -b .visibility
+%patch -P 966 -p1 -b .x11-ipv6
+%patch -P 974 -p1 -b .keygen-strip-doseol
+%patch -P 975 -p1 -b .preserve-pam-errors
+
+%patch -P 977 -p1 -b .kill-scp
+
+%patch -P 981 -p1 -b .scp-sftpdirs
+%patch -P 982 -p1 -b .minrsabits
+%patch -P 983 -p1 -b .evpgenrsa
+%patch -P 984 -p1 -b .ibmca
+
+%patch -P 200 -p1 -b .audit
+%patch -P 201 -p1 -b .audit-race
+%patch -P 202 -p1 -b .audit-log
+%patch -P 700 -p1 -b .fips
+
+%patch -P 1002 -p1 -b .ssh-manpage
+%patch -P 1004 -p1 -b .gssapi-auth
+
+%patch -P 1006 -p1 -b .negotiate-supported-algs
+
+%patch -P 1011 -p1 -b .evp-fips-sign
+%patch -P 1012 -p1 -b .evp-fips-dh
+%patch -P 1013 -p1 -b .evp-fips-ecdh
+%patch -P 1014 -p1 -b .nosha1hostproof
+%patch -P 1015 -p1 -b .evp-pkcs11
+
+%patch -P 1016 -p1 -b .man-hostkeyalgos
+
+%patch -P 100 -p1 -b .coverity
 
 autoreconf
 pushd pam_ssh_agent_auth-pam_ssh_agent_auth-%{pam_ssh_agent_ver}
@@ -748,6 +748,9 @@ test -f %{sysconfig_anaconda} && \
 %endif
 
 %changelog
+* Thu Jun 08 2023 Norbert Pocs <npocs@redhat.com> - 9.3p1-4
+- Fix deprecated %patchN syntax
+
 * Wed Jun 07 2023 Dmitry Belyavskiy <dbelyavs@redhat.com> - 9.3p1-3
 - Fix DSS verification problem
   Resolves: rhbz#2212937