Hello community, here is the log from the commit of package proftpd for openSUSE:Factory checked in at 2017-02-09 11:16:12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/proftpd (Old) and /work/SRC/openSUSE:Factory/.proftpd.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "proftpd" Changes: -------- --- /work/SRC/openSUSE:Factory/proftpd/proftpd.changes 2017-01-24 10:34:07.904185019 +0100 +++ /work/SRC/openSUSE:Factory/.proftpd.new/proftpd.changes 2017-02-09 11:16:13.333930979 +0100 @@ -1,0 +2,7 @@ +Sun Feb 5 20:03:18 UTC 2017 - [email protected] + +- backport upstream feature + * include-in-limit-section (gh#410) + * add proftpd_include-in-limit-section.patch + +------------------------------------------------------------------- New: ---- proftpd_include-in-limit-section.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ proftpd.spec ++++++ --- /var/tmp/diff_new_pack.0Ghd3i/_old 2017-02-09 11:16:14.425776762 +0100 +++ /var/tmp/diff_new_pack.0Ghd3i/_new 2017-02-09 11:16:14.433775631 +0100 @@ -42,6 +42,8 @@ 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 @@ %patch102 %patch103 %patch104 +%patch105 %build rm contrib/mod_wrap.c ++++++ proftpd_include-in-limit-section.patch ++++++ 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 <Limit> section, e.g.: + + <Limit LOGIN> + Include /path/to/allowed.txt + DenyAll + </Limit> + 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: <a href="#HideGroup"><code>Hid <h2><a name="Include">Include</a></h2> <strong>Syntax:</strong> Include <em>path|pattern</em><br> <strong>Default:</strong> None<br> -<strong>Context:</strong> server config, <code><VirtualHost></code>, <code><Global></code>, <code><Anonymous></code>, <code><Directory></code><br> +<strong>Context:</strong> server config, <code><VirtualHost></code>, <code><Global></code>, <code><Anonymous></code>, <code><Limit></code>, <code><Directory></code><br> <strong>Module:</strong> mod_core<br> <strong>Compatibility:</strong> 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. */
