pidfile now in /run; install shows warning about broken clients

4 files changed, 9 insertions, 4 deletions

diff --git a/.SRCINFO b/.SRCINFO
index af774b639781..b24a766a1726 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = pure-ftpd
 	pkgdesc = A secure, production-quality and standard-conformant FTP server, focused on efficiency and ease of use.
 	pkgver = 1.0.42
-	pkgrel = 2
+	pkgrel = 3
 	url = http://www.pureftpd.org/
 	install = pure-ftpd.install
 	arch = i686
diff --git a/PKGBUILD b/PKGBUILD
index 0e3f8c863c2f..44274e14168d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,4 +1,5 @@
 # Maintainer: mrxx <mrxx at cyberhome dot at>
+# Contributor: spapanik21
 # Contributor: kleph
 # Contributor: fila pruda.com
 # Contributor: tuxce <tuxce.net@gmail.com>
@@ -8,7 +9,7 @@
 
 pkgname=pure-ftpd
 pkgver=1.0.42
-pkgrel=2
+pkgrel=3
 pkgdesc="A secure, production-quality and standard-conformant FTP server, focused on efficiency and ease of use."
 arch=('i686' 'x86_64')
 url="http://www.pureftpd.org/"
@@ -61,7 +62,7 @@ package() {
 	sed -i "/# FortunesFile/a FortunesFile \/etc\/pure-ftpd\/welcome.msg" ${pkgdir}/etc/pure-ftpd/pure-ftpd.conf
 	sed -i 's|SyslogFacility\s.*ftp|SyslogFacility none|' ${pkgdir}/etc/pure-ftpd/pure-ftpd.conf
 	sed -i 's|# /usr/sbin/pure-config.pl /usr/etc/pure-ftpd.conf|# /usr/bin/pure-config.pl /etc/pure-ftpd/pure-ftpd.conf|' ${pkgdir}/etc/pure-ftpd/pure-ftpd.conf
-	sed -i 's|#PIDFile\s.*/var/run/pure-ftpd.pid|PIDFile /run/pure-ftpd/pure-ftpd.pid|' ${pkgdir}/etc/pure-ftpd/pure-ftpd.conf
+	sed -i 's|#PIDFile\s.*/var/run/pure-ftpd.pid|PIDFile /run/pure-ftpd.pid|' ${pkgdir}/etc/pure-ftpd/pure-ftpd.conf
 	sed -i 's|# AltLog\s.*clf:/var/log/pureftpd.log|AltLog clf:/var/log/pureftpd.log|' ${pkgdir}/etc/pure-ftpd/pure-ftpd.conf
 	sed -i 's|# TLS\s.*1|TLS 1|' ${pkgdir}/etc/pure-ftpd/pure-ftpd.conf
 	sed -i 's|# TLSCipherSuite\s.*HIGH|TLSCipherSuite HIGH:MEDIUM:+TLSv1|' ${pkgdir}/etc/pure-ftpd/pure-ftpd.conf
diff --git a/pure-ftpd.install b/pure-ftpd.install
index 54d3238a0256..82fcadba44f7 100644
--- a/pure-ftpd.install
+++ b/pure-ftpd.install
@@ -22,6 +22,10 @@ post_install()
 		echo "Then restart the ftp service: systemctl restart pure-ftpd.service"
 		echo
 	fi
+
+	echo "With some FTP clients (e.g. Total Commander, AndFTP) you may encounter unexpected"
+	echo "closed connections. This can be resolved by enabling 'BrokenClientsCompatibility'"
+	echo "in /etc/pure-ftpd/pure-ftpd.conf."
 }
 
 post_upgrade() {
diff --git a/pure-ftpd.service b/pure-ftpd.service
index 994d3320e063..d0b92d6f0013 100644
--- a/pure-ftpd.service
+++ b/pure-ftpd.service
@@ -4,7 +4,7 @@ After=network.target
 
 [Service]
 Type=forking
-PIDFile=/run/pure-ftpd/pure-ftpd.pid
+PIDFile=/run/pure-ftpd.pid
 ExecStart=/usr/bin/pure-config.pl /etc/pure-ftpd/pure-ftpd.conf
 
 [Install]