pool/proftpd
SHA256
3
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 454981 from network

Browse Source 
backport upstream feature include-in-limit-section (forwarded request 454980 from computersalat)

OBS-URL: https://build.opensuse.org/request/show/454981
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/proftpd?expand=0&rev=25
This commit is contained in:
Dominique Leuenberger 2017-02-09 10:16:12 +00:00 committed by Git OBS Bridge
commit 1954910ec3
3 changed files with 57 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
proftpd.changes
View File

@ -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

3
proftpd.spec
View File

@ -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

47
proftpd_include-in-limit-section.patch Normal file
View File

@ -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 <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>&lt;VirtualHost&gt;</code>, <code>&lt;Global&gt;</code>, <code>&lt;Anonymous&gt;</code>, <code>&lt;Directory&gt;</code><br>
+<strong>Context:</strong> server config, <code>&lt;VirtualHost&gt;</code>, <code>&lt;Global&gt;</code>, <code>&lt;Anonymous&gt;</code>, <code>&lt;Limit&gt;</code>, <code>&lt;Directory&gt;</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. */