From 5976e1a23b1add1c8b1f530cd2a8570399e59fd7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B2=88=E4=BB=B2=E4=BC=9F?= Date: Tue, 3 Dec 2024 17:15:59 +0800 Subject: [PATCH] fix: %patchN is deprecated (7 usages found), use %patch N (or %patch -P N) (cherry picked from commit 0acab5b2bec4cfa625931f32374c3e714a674fa8) --- proftpd.spec | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/proftpd.spec b/proftpd.spec index 82de297..d0d5335 100644 --- a/proftpd.spec +++ b/proftpd.spec @@ -20,7 +20,7 @@ Name: proftpd Version: 1.3.8b -Release: 5 +Release: 6 Summary: Flexible, stable and highly-configurable FTP server License: GPLv2+ URL: http://www.proftpd.org/ @@ -225,20 +225,20 @@ sed -e 's|@RUNDIR@|%{rundir}|' %{SOURCE6} > anonftp.conf mv contrib/README contrib/README.contrib # Change shellbangs /usr/bin/env perl ⇒ /usr/bin/perl -%patch1 +%patch 1 # If we don't have libmemcached support, remove the mod_tls_memcache # snippet from the config file -%patch2 +%patch 2 # If we're running the full test suite, include the mod_vroot test -%patch3 -p1 -b .test_vroot +%patch 3 -p1 -b .test_vroot # Remove references to mod_wrap from the configuration file if necessary -%patch4 -b .nowrappers +%patch 4 -b .nowrappers # Remove references to mod_geoip from the configuration file if necessary -%patch5 -b .nogeoip +%patch 5 -b .nogeoip %if %{use_systemd} # Tweak logrotate script for systemd compatibility (#802178) @@ -246,12 +246,12 @@ sed -i -e '/killall/s/test.*/systemctl reload proftpd.service/' \ contrib/dist/rpm/proftpd.logrotate %else # Not using systemd, so we want hostname and timestamp in log messages -%patch6 +%patch 6 %endif -%patch7 -p1 -%patch8 -p1 -%patch9 -p1 +%patch 7 -p1 +%patch 8 -p1 +%patch 9 -p1 # Avoid docfile dependencies chmod -c -x contrib/xferstats.holger-preiss @@ -537,6 +537,12 @@ fi %{_mandir}/man1/ftpwho.1* %changelog +* Tue Dec 03 2024 shenzhongwei - 1.3.8b-6 +- Type:bugfix +- ID:NA +- SUG:NA +- DESC:fix: %patchN is deprecated (7 usages found), use %patch N (or %patch -P N) + * Sat Nov 30 2024 liningjie - 1.3.8b-5 - Type:CVE - ID:NA