- rel 2; upstream pureftpd ignores config file if cmd line options are passed which...

[packages/pure-ftpd.git] / pure-ftpd.spec

diff --git a/pure-ftpd.spec b/pure-ftpd.spec
index 4e040801ddfed5b76f6c2910bf106769e3d4696c..68c47497c50cc9afc88ce6033a39e8d91b600c02 100644 (file)
--- a/pure-ftpd.spec
+++ b/pure-ftpd.spec
@@ -9,7 +9,7 @@
 %bcond_without tls             # disable SSL/TLS support
 %bcond_without cap             # disable capabilities
 
-%define        rel     1
+%define        rel     2
 Summary:       Small, fast and secure FTP server
 Summary(pl.UTF-8):     Mały, szybki i bezpieczny serwer FTP
 Name:          pure-ftpd
@@ -30,6 +30,8 @@ Patch0:               %{name}-config.patch
 Patch1:                %{name}-allauth.patch
 Patch2:                %{name}-pure-pw_passwd.patch
 Patch3:                %{name}-mysql_config.patch
+# from Fedora
+Patch4:                0003-Allow-having-both-options-and-config-file-on-command.patch
 
 Patch7:                audit_cap.patch
 Patch8:                %{name}-apparmor.patch
@@ -108,6 +110,7 @@ Ten pakiet zawiera schemat Pure-FTPd pureftpd.schema dla openldapa.
 %patch0 -p0
 %patch1 -p1
 %patch3 -p1
+%patch4 -p1
 
 %patch7 -p1
 %patch8 -p1