From bf3eecb6ff6661178e458582fa2b0b2c6dc756b9a007af1ecb6d68dd46055427 Mon Sep 17 00:00:00 2001
From: Christian Wittmer <chris@computersalat.de>
Date: Thu, 1 Sep 2022 20:18:53 +0000
Subject: [PATCH] Accepting request 1000746 from
 home:computersalat:devel:network

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
---
 proftpd-basic.conf.patch |  5 +----
 proftpd-dist.patch       | 32 ++++++++++++++++++--------------
 proftpd.changes          |  7 +++++++
 3 files changed, 26 insertions(+), 18 deletions(-)

diff --git a/proftpd-basic.conf.patch b/proftpd-basic.conf.patch
index 0fb270e..78280d5 100644
--- a/proftpd-basic.conf.patch
+++ b/proftpd-basic.conf.patch
@@ -38,7 +38,7 @@ Index: sample-configurations/basic.conf
  
  # To prevent DoS attacks, set the maximum number of child processes
  # 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
  # that allows you to limit maximum number of processes per service
  # (such as xinetd).
@@ -219,9 +219,6 @@ Index: sample-configurations/basic.conf
 +		DenyAll
 +	</Limit>
 +
-+	# LoginPasswordPrompt -- Configure to display the passwort prompt or not
-+	LoginPasswordPrompt off
-+
 +	# DirFakeMode -- Hide real file/directory permissions
 +	DirFakeMode 0640
 +
diff --git a/proftpd-dist.patch b/proftpd-dist.patch
index 2c875c3..46122f3 100644
--- a/proftpd-dist.patch
+++ b/proftpd-dist.patch
@@ -27,7 +27,7 @@ Index: contrib/dist/rpm/proftpd.logrotate
 ===================================================================
 --- contrib/dist/rpm/proftpd.logrotate.orig
 +++ contrib/dist/rpm/proftpd.logrotate
-@@ -1,10 +1,16 @@
+@@ -1,10 +1,15 @@
 -/var/log/proftpd/*.log /var/log/xferlog {
 +/var/log/proftpd/xferlog /var/log/proftpd/*.log {
      compress
@@ -42,8 +42,7 @@ Index: contrib/dist/rpm/proftpd.logrotate
      sharedscripts
      postrotate
 -        test -f /var/lock/subsys/proftpd && /usr/bin/killall -HUP proftpd || :
-+     /usr/sbin/rcproftpd reload
-+     #/etc/init.d/xinetd reload
++      /usr/sbin/rcproftpd reload
      endscript
  }
  
@@ -56,18 +55,23 @@ Index: contrib/dist/rpm/xinetd
  service ftp
  {
 -	flags           = REUSE
- 	socket_type     = stream
-+	protocol        = tcp
- 	wait            = no
-+#	bind            = IP
-+	instances       = 30
- 	user            = root
- 	server          = /usr/sbin/in.proftpd
+-	socket_type     = stream
+-	wait            = no
+-	user            = root
+-	server          = /usr/sbin/in.proftpd
 -	log_on_success  += DURATION
 -	log_on_failure  += USERID
 -	nice		= 10
-+	log_on_success  += PID HOST USERID EXIT DURATION
-+	log_on_failure  += HOST USERID ATTEMPT
-+#	nice		= 10
- 	disable         = yes
+-	disable         = yes
++  socket_type     = stream
++  protocol        = tcp
++  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
  }
diff --git a/proftpd.changes b/proftpd.changes
index 3f10bb1..e188bee 100644
--- a/proftpd.changes
+++ b/proftpd.changes
@@ -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