diff --git a/huawei-proftpd-service-add-restart.patch b/huawei-proftpd-service-add-restart.patch new file mode 100644 index 0000000..7ce062c --- /dev/null +++ b/huawei-proftpd-service-add-restart.patch @@ -0,0 +1,24 @@ +From 39d7026876e29020dde52655927e73bf6f98f5ff Mon Sep 17 00:00:00 2001 +From: chengyechun +Date: Wed, 3 Jan 2024 03:18:36 +0000 +Subject: [PATCH] huawei-proftpd-service-add-restart + +--- + contrib/dist/rpm/proftpd.service | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/contrib/dist/rpm/proftpd.service b/contrib/dist/rpm/proftpd.service +index 6c81db3..14ae9e5 100644 +--- a/contrib/dist/rpm/proftpd.service ++++ b/contrib/dist/rpm/proftpd.service +@@ -11,6 +11,7 @@ ExecStartPre = /usr/sbin/proftpd --configtest + ExecStart = /usr/sbin/proftpd --nodaemon $PROFTPD_OPTIONS + ExecReload = /bin/kill -HUP $MAINPID + PIDFile = /run/proftpd/proftpd.pid ++Restart=on-failure + + [Install] + WantedBy = multi-user.target +-- +2.33.0 + diff --git a/proftpd.spec b/proftpd.spec index 08ffbfb..3a757cc 100644 --- a/proftpd.spec +++ b/proftpd.spec @@ -20,7 +20,7 @@ Name: proftpd Version: 1.3.8b -Release: 3 +Release: 4 Summary: Flexible, stable and highly-configurable FTP server License: GPLv2+ URL: http://www.proftpd.org/ @@ -43,6 +43,7 @@ Patch4: proftpd-1.3.6-no-mod-wrap.patch Patch5: proftpd-1.3.6-no-mod-geoip.patch Patch6: proftpd-1.3.7rc3-logging-not-systemd.patch Patch7: proftpd-1.3.8-fix-environment-sensitive-tests-failure.patch +Patch8: huawei-proftpd-service-add-restart.patch BuildRequires: coreutils BuildRequires: gcc @@ -248,6 +249,7 @@ sed -i -e '/killall/s/test.*/systemctl reload proftpd.service/' \ %endif %patch7 -p1 +%patch8 -p1 # Avoid docfile dependencies chmod -c -x contrib/xferstats.holger-preiss @@ -533,6 +535,12 @@ fi %{_mandir}/man1/ftpwho.1* %changelog +* Thu Jan 11 2024 chengyechun - 1.3.8b-4 +- Type:requirement +- ID:NA +- SUG:NA +- DESC:add Restart in proftpd.service + * Fri Dec 29 2023 wangkai <13474090681@163.com> - 1.3.8b-3 - Adjust patch number