!80 [sync] PR-79: fix: %patchN is deprecated (7 usages found), use %patch N (or %patch -P N)

From: @openeuler-sync-bot 
Reviewed-by: @wk333 
Signed-off-by: @wk333
This commit is contained in:
openeuler-ci-bot 2024-12-05 03:31:50 +00:00 committed by Gitee
commit 6ecd24196e
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F

View File

@ -20,7 +20,7 @@
Name: proftpd Name: proftpd
Version: 1.3.8b Version: 1.3.8b
Release: 5 Release: 6
Summary: Flexible, stable and highly-configurable FTP server Summary: Flexible, stable and highly-configurable FTP server
License: GPLv2+ License: GPLv2+
URL: http://www.proftpd.org/ URL: http://www.proftpd.org/
@ -225,20 +225,20 @@ sed -e 's|@RUNDIR@|%{rundir}|' %{SOURCE6} > anonftp.conf
mv contrib/README contrib/README.contrib mv contrib/README contrib/README.contrib
# Change shellbangs /usr/bin/env perl ⇒ /usr/bin/perl # Change shellbangs /usr/bin/env perl ⇒ /usr/bin/perl
%patch1 %patch 1
# If we don't have libmemcached support, remove the mod_tls_memcache # If we don't have libmemcached support, remove the mod_tls_memcache
# snippet from the config file # snippet from the config file
%patch2 %patch 2
# If we're running the full test suite, include the mod_vroot test # 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 # 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 # Remove references to mod_geoip from the configuration file if necessary
%patch5 -b .nogeoip %patch 5 -b .nogeoip
%if %{use_systemd} %if %{use_systemd}
# Tweak logrotate script for systemd compatibility (#802178) # 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 contrib/dist/rpm/proftpd.logrotate
%else %else
# Not using systemd, so we want hostname and timestamp in log messages # Not using systemd, so we want hostname and timestamp in log messages
%patch6 %patch 6
%endif %endif
%patch7 -p1 %patch 7 -p1
%patch8 -p1 %patch 8 -p1
%patch9 -p1 %patch 9 -p1
# Avoid docfile dependencies # Avoid docfile dependencies
chmod -c -x contrib/xferstats.holger-preiss chmod -c -x contrib/xferstats.holger-preiss
@ -537,6 +537,12 @@ fi
%{_mandir}/man1/ftpwho.1* %{_mandir}/man1/ftpwho.1*
%changelog %changelog
* Tue Dec 03 2024 shenzhongwei <shenzhongwei@kylinos.cn> - 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 <liningjie@xfusion.com> - 1.3.8b-5 * Sat Nov 30 2024 liningjie <liningjie@xfusion.com> - 1.3.8b-5
- Type:CVE - Type:CVE
- ID:NA - ID:NA