diff --git a/proftpd.changes b/proftpd.changes index 9a5f436..edb4924 100644 --- a/proftpd.changes +++ b/proftpd.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Sun Feb 5 20:03:18 UTC 2017 - chris@computersalat.de + +- backport upstream feature + * include-in-limit-section (gh#410) + * add proftpd_include-in-limit-section.patch + ------------------------------------------------------------------- Tue Jan 17 19:53:55 UTC 2017 - chris@computersalat.de diff --git a/proftpd.spec b/proftpd.spec index 4c0ebcc..ebf8cf5 100644 --- a/proftpd.spec +++ b/proftpd.spec @@ -42,6 +42,8 @@ Patch102: %{name}-ftpasswd.patch Patch103: %{name}-strip.patch #PATCH-FIX-openSUSE: file-contains-date-and-time Patch104: %{name}-no_BuildDate.patch +#PATCH-Feature-back-port: include-in-limit-section +Patch105: %{name}_include-in-limit-section.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build #BuildRequires: gpg-offline BuildRequires: krb5-devel @@ -144,6 +146,7 @@ Here are Documentation for ProFTPD %patch102 %patch103 %patch104 +%patch105 %build rm contrib/mod_wrap.c diff --git a/proftpd_include-in-limit-section.patch b/proftpd_include-in-limit-section.patch new file mode 100644 index 0000000..e06a7f6 --- /dev/null +++ b/proftpd_include-in-limit-section.patch @@ -0,0 +1,47 @@ +Index: RELEASE_NOTES +=================================================================== +--- RELEASE_NOTES.orig ++++ RELEASE_NOTES +@@ -12,6 +12,16 @@ ChangeLog files. + + Fixed regression where all normal FTP users were handled as anonymous + users. + ++ + Changed Configuration Directives ++ ++ Include ++ The Include directive can now be used within a section, e.g.: ++ ++ ++ Include /path/to/allowed.txt ++ DenyAll ++ ++ + + 1.3.5c + --------- +Index: doc/modules/mod_core.html +=================================================================== +--- doc/modules/mod_core.html.orig ++++ doc/modules/mod_core.html +@@ -510,7 +510,7 @@ See also: Hid +

Include

+ Syntax: Include path|pattern
+ Default: None
+-Context: server config, <VirtualHost>, <Global>, <Anonymous>, <Directory>
++Context: server config, <VirtualHost>, <Global>, <Anonymous>, <Limit>, <Directory>
+ Module: mod_core
+ Compatibility: 1.2.10rc1 and later + +Index: modules/mod_core.c +=================================================================== +--- modules/mod_core.c.orig ++++ modules/mod_core.c +@@ -334,7 +334,7 @@ MODRET add_include(cmd_rec *cmd) { + int res; + + CHECK_ARGS(cmd, 1); +- CHECK_CONF(cmd, CONF_ROOT|CONF_VIRTUAL|CONF_ANON|CONF_GLOBAL|CONF_DIR); ++ CHECK_CONF(cmd, CONF_ROOT|CONF_VIRTUAL|CONF_ANON|CONF_GLOBAL|CONF_LIMIT|CONF_DIR); + + /* Make sure the given path is a valid path. */ +