From: Arkadiusz Miśkiewicz <arekm@maven.pl>
Date: Wed, 1 Sep 2021 13:38:10 +0000 (+0200)
Subject: Rel 5; pure-uploadscript retval has meaning only if it is enabled
X-Git-Tag: auto/th/pure-ftpd-1.0.49-5~1
X-Git-Url: http://git.pld-linux.org/?p=packages%2Fpure-ftpd.git;a=commitdiff_plain;h=524fc98

Rel 5; pure-uploadscript retval has meaning only if it is enabled
---

diff --git a/pure-ftpd.init b/pure-ftpd.init
index 2805f1e..43a3568 100644
--- a/pure-ftpd.init
+++ b/pure-ftpd.init
@@ -133,9 +133,14 @@ case "$1" in
 	;;
   status)
 	status pure-ftpd
-	status pure-uploadscript
 	RETVAL=$?
-	if [ $RETVAL -eq 0 ]; then
+	PUREFTPDRETVAL=$RETVAL
+
+	status pure-uploadscript
+	if [ -n "$UPLOADSCRIPT" ]; then
+	  RETVAL=$?
+	fi
+	if [ $PUREFTPDRETVAL -eq 0 ]; then
 		pure-ftpwho
 	fi
 	;;
diff --git a/pure-ftpd.spec b/pure-ftpd.spec
index a2b2071..9c09bbd 100644
--- a/pure-ftpd.spec
+++ b/pure-ftpd.spec
@@ -9,7 +9,7 @@
 %bcond_without	tls		# disable SSL/TLS support
 %bcond_without	cap		# disable capabilities
 
-%define	rel	4
+%define	rel	5
 Summary:	Small, fast and secure FTP server
 Summary(pl.UTF-8):	Mały, szybki i bezpieczny serwer FTP
 Name:		pure-ftpd