/[smeserver]/rpms/e-smith-proftpd/sme10/e-smith-proftpd-2.6.0-bz11357-rmConflcits.patch
ViewVC logotype

Contents of /rpms/e-smith-proftpd/sme10/e-smith-proftpd-2.6.0-bz11357-rmConflcits.patch

Parent Directory Parent Directory | Revision Log Revision Log | View Revision Graph Revision Graph


Revision 1.1 - (show annotations) (download)
Thu Feb 18 16:36:19 2021 UTC (3 years, 3 months ago) by jpp
Branch: MAIN
CVS Tags: e-smith-proftpd-2_6_0-14_el7_sme, e-smith-proftpd-2_6_0-12_el7_sme, e-smith-proftpd-2_6_0-15_el7_sme, e-smith-proftpd-2_6_0-13_el7_sme, HEAD
* Thu Feb 18 2021 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-12.sme
- fix circular Conflict with proftpd [SME: 11357]

1 diff -Nur e-smith-proftpd-2.6.0.old/root/usr/lib/systemd/system/ftp.service e-smith-proftpd-2.6.0/root/usr/lib/systemd/system/ftp.service
2 --- e-smith-proftpd-2.6.0.old/root/usr/lib/systemd/system/ftp.service 2021-02-18 11:32:38.038000000 -0500
3 +++ e-smith-proftpd-2.6.0/root/usr/lib/systemd/system/ftp.service 2021-02-18 11:33:47.306000000 -0500
4 @@ -1,7 +1,6 @@
5 [Unit]
6 Description=ftp (proftpd)
7 After=network.target
8 -Conflicts=proftpd.service
9 Requires=runit.service
10
11 [Service]

admin@koozali.org
ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed