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

Accepting request 1000746 from home:computersalat:devel:network

Browse Source 
fix config, remove obsolete option

OBS-URL: https://build.opensuse.org/request/show/1000746
OBS-URL: https://build.opensuse.org/package/show/network/proftpd?expand=0&rev=87
This commit is contained in:
Christian Wittmer 2022-09-01 20:18:53 +00:00 committed by Git OBS Bridge
parent d5f48dd4e2
commit bf3eecb6ff
3 changed files with 26 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
proftpd-basic.conf.patch
View File

@ -38,7 +38,7 @@ Index: sample-configurations/basic.conf
# To prevent DoS attacks, set the maximum number of child processes # To prevent DoS attacks, set the maximum number of child processes
# to 30. If you need to allow more than 30 concurrent connections # to 30. If you need to allow more than 30 concurrent connections
@@ -23,43 +33,210 @@ Umask 022 @@ -23,43 +33,207 @@ Umask 022
# in standalone mode, in inetd mode you should use an inetd server # in standalone mode, in inetd mode you should use an inetd server
# that allows you to limit maximum number of processes per service # that allows you to limit maximum number of processes per service
# (such as xinetd). # (such as xinetd).
@ -219,9 +219,6 @@ Index: sample-configurations/basic.conf
+ DenyAll + DenyAll
+ </Limit> + </Limit>
+ +
+ # LoginPasswordPrompt -- Configure to display the passwort prompt or not
+ LoginPasswordPrompt off
+
+ # DirFakeMode -- Hide real file/directory permissions + # DirFakeMode -- Hide real file/directory permissions
+ DirFakeMode 0640 + DirFakeMode 0640
+ +

32
proftpd-dist.patch
View File

@ -27,7 +27,7 @@ Index: contrib/dist/rpm/proftpd.logrotate
=================================================================== ===================================================================
--- contrib/dist/rpm/proftpd.logrotate.orig --- contrib/dist/rpm/proftpd.logrotate.orig
+++ contrib/dist/rpm/proftpd.logrotate +++ contrib/dist/rpm/proftpd.logrotate
@@ -1,10 +1,16 @@ @@ -1,10 +1,15 @@
-/var/log/proftpd/*.log /var/log/xferlog { -/var/log/proftpd/*.log /var/log/xferlog {
+/var/log/proftpd/xferlog /var/log/proftpd/*.log { +/var/log/proftpd/xferlog /var/log/proftpd/*.log {
compress compress
@ -42,8 +42,7 @@ Index: contrib/dist/rpm/proftpd.logrotate
sharedscripts sharedscripts
postrotate postrotate
- test -f /var/lock/subsys/proftpd && /usr/bin/killall -HUP proftpd || : - test -f /var/lock/subsys/proftpd && /usr/bin/killall -HUP proftpd || :
+ /usr/sbin/rcproftpd reload + /usr/sbin/rcproftpd reload
+ #/etc/init.d/xinetd reload
endscript endscript
} }
@ -56,18 +55,23 @@ Index: contrib/dist/rpm/xinetd
service ftp service ftp
{ {
- flags = REUSE - flags = REUSE
socket_type = stream - socket_type = stream
+ protocol = tcp - wait = no
wait = no - user = root
+# bind = IP - server = /usr/sbin/in.proftpd
+ instances = 30
user = root
server = /usr/sbin/in.proftpd
- log_on_success += DURATION - log_on_success += DURATION
- log_on_failure += USERID - log_on_failure += USERID
- nice = 10 - nice = 10
+ log_on_success += PID HOST USERID EXIT DURATION - disable = yes
+ log_on_failure += HOST USERID ATTEMPT + socket_type = stream
+# nice = 10 + protocol = tcp
disable = yes + wait = no
+# bind = IP
+ instances = 30
+ user = root
+ server = /usr/sbin/in.proftpd
+ log_on_success += PID HOST USERID EXIT DURATION
+ log_on_failure += HOST USERID ATTEMPT
+# nice = 10
+ disable = yes
} }

7
proftpd.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Thu Sep 1 19:28:50 UTC 2022 - chris@computersalat.de
- Update proftpd-basic.conf.patch
* remove obsolete config option, LoginPasswordPrompt
- rework proftpd-dist.patch
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Aug 9 16:37:52 UTC 2022 - chris@computersalat.de Tue Aug 9 16:37:52 UTC 2022 - chris@computersalat.de