Upgrade to 1.0.50

6 files changed, 99 insertions, 36 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 6281b9eede7e..9a4e769f7133 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,24 +1,26 @@
-# Generated by mksrcinfo v8
-# Mon Jun  4 10:17:52 UTC 2018
 pkgbase = pure-ftpd-db
 	pkgdesc = A fast, production quality, standards-conformant FTP server. Compiled with mysql and pgsql.
-	pkgver = 1.0.47
+	pkgver = 1.0.50
 	pkgrel = 1
 	url = http://www.pureftpd.org/
-	changelog = pure-ftpd-db.changelog
 	arch = i686
 	arch = x86_64
 	license = custom
 	depends = openssl
-	depends = postgresql
-	depends = libmariadbclient
+	depends = mariadb-libs
+	depends = postgresql-libs
+	depends = libsodium
+	depends = libldap
 	provides = pure-ftpd
 	conflicts = pure-ftpd
 	backup = etc/pure-ftpd/pure-ftpd.conf
-	source = ftp://pureftpd.org/pub/pure-ftpd/releases/pure-ftpd-1.0.47.tar.bz2
+	source = ftp://pureftpd.org/pub/pure-ftpd/releases/pure-ftpd-1.0.50.tar.bz2
 	source = pure-ftpd.service
-	md5sums = a41fa531c0d21bd3416dd524d75495ae
-	md5sums = b6989f475edef34f2810646cc73b7b9e
+	source = welcome.msg
+	source = pure-ftpd.logrotate
+	sha256sums = 6722c7fd09fe3c9ebbd572f3d097087ec7b32aacb3df8fa3400d4c07e4f377d7
+	sha256sums = 9be7c746d579ea83f17b21f58a4d0055caa370c7bfe543993b1d81ba91672d96
+	sha256sums = 7c20f36c26c5a5cc469f376f6d047a8dc082ed1c34e55f318993aa0f2f4a0646
+	sha256sums = cabbdf0c1b9fb4651c6f30eea95438b1f4f2b6872e0a62a92cda99afb1b6f6c3
 
 pkgname = pure-ftpd-db
-
diff --git a/PKGBUILD b/PKGBUILD
index a735206eb341..af0ac15651d4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,3 +1,5 @@
+# Maintainer: Laszlo Malina <laszlo.malina@processnet.hu>
+# Contributor: Laszlo Malina <laszlo.malina@processnet.hu>
 # Contributor: Immae <ismael.bouya@normalesup.org>
 # Contributor: fila pruda.com
 # Contributor: tuxce <tuxce.net@gmail.com>
@@ -5,57 +7,75 @@
 # Contributor: BlueRaven <blue@ravenconsulting.it>
 # Contributor: dorphell <dorphell@archlinux.org>
 
-# Maintainer: Immae <ismael.bouya@normalesup.org>
 pkgname=pure-ftpd-db
 _srcname=pure-ftpd
-pkgver=1.0.47
+pkgver=1.0.50
 pkgrel=1
 pkgdesc="A fast, production quality, standards-conformant FTP server. Compiled with mysql and pgsql."
 arch=('i686' 'x86_64')
 url="http://www.pureftpd.org/"
 license=('custom')
-changelog="$pkgname.changelog"
 provides=('pure-ftpd')
 conflicts=('pure-ftpd')
-depends=('openssl' 'postgresql' 'libmariadbclient')
+depends=('openssl' 'mariadb-libs' 'postgresql-libs' 'libsodium' 'libldap')
 backup=('etc/pure-ftpd/pure-ftpd.conf')
-source=("ftp://pureftpd.org/pub/${_srcname}/releases/${_srcname}-${pkgver}.tar.bz2"
-	'pure-ftpd.service')
-
-
+# https://download.pureftpd.org/pub/pure-ftpd/releases/
+source=(
+	"ftp://pureftpd.org/pub/${_srcname}/releases/${_srcname}-${pkgver}.tar.bz2"
+	'pure-ftpd.service'
+	'welcome.msg'
+	'pure-ftpd.logrotate'
+)
 
 build() {
 	cd ${srcdir}/${_srcname}-${pkgver}
-	./configure --prefix=/usr \
+	./configure \
+	   --prefix=/usr \
 	   --bindir=/usr/bin \
 	   --sbindir=/usr/bin \
 	   --with-puredb \
-	   --with-ftpwho \
-	   --with-altlog \
-	   --with-tls \
+	   --with-pam \
 	   --with-pgsql \
 	   --with-mysql \
-	   --with-quotas
+	   --with-ldap \
+	   --with-extauth \
+	   --with-altlog \
+	   --with-cookie \
+	   --with-diraliases \
+	   --with-ftpwho \
+	   --with-peruserlimits \
+	   --with-quotas \
+	   --with-ratios \
+	   --with-rfc2640 \
+	   --with-throttling \
+	   --with-virtualhosts \
+	   --with-virtualchroot \
+	   --with-tls
 	make
 }
 
 package() {
 	cd ${srcdir}/${_srcname}-${pkgver}
+	
 	make DESTDIR=${pkgdir} install
-	install -Dm644 ${srcdir}/pure-ftpd.service ${pkgdir}/usr/lib/systemd/system/pure-ftpd.service
-
 	install -Dm644 pure-ftpd.conf ${pkgdir}/etc/pure-ftpd/pure-ftpd.conf
-	sed -i 's|#PIDFile                     /var/run/pure-ftpd.pid|PIDFile                     /run/pure-ftpd.pid|' ${pkgdir}/etc/pure-ftpd/pure-ftpd.conf
-	sed -i 's|/etc/pureftpd|/etc/pure-ftpd/pureftpd|' ${pkgdir}/etc/pure-ftpd/pure-ftpd.conf
-
-	#install license
+	install -Dm644 ${srcdir}/pure-ftpd.service ${pkgdir}/usr/lib/systemd/system/pure-ftpd.service
+	install -Dm644 ${srcdir}/pure-ftpd.logrotate ${pkgdir}/etc/logrotate.d/pure-ftpd
+	install -Dm644 -t ${pkgdir}/etc/pure-ftpd/ pure-ftpd.conf ${srcdir}/welcome.msg
 	install -Dm644 COPYING ${pkgdir}/usr/share/licenses/${_srcname}/LICENSE
-
-	#install doc
 	install -d ${pkgdir}/usr/share/doc/${_srcname}/
-	install -Dm644 -t ${pkgdir}/usr/share/doc/${_srcname}/ README* pureftpd-*sql.conf
+	install -Dm644 -t ${pkgdir}/usr/share/doc/${_srcname}/ README* pureftpd-*.conf pureftpd.schema ChangeLog
+	
+	rm -f ${pkgdir}/etc/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|NoAnonymous\s.*no|NoAnonymous yes|' ${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 -S:HIGH:MEDIUM:+TLSv1|' ${pkgdir}/etc/pure-ftpd/pure-ftpd.conf
 }
-md5sums=('a41fa531c0d21bd3416dd524d75495ae'
-         'b6989f475edef34f2810646cc73b7b9e')
-
+sha256sums=('6722c7fd09fe3c9ebbd572f3d097087ec7b32aacb3df8fa3400d4c07e4f377d7'
+            '9be7c746d579ea83f17b21f58a4d0055caa370c7bfe543993b1d81ba91672d96'
+            '7c20f36c26c5a5cc469f376f6d047a8dc082ed1c34e55f318993aa0f2f4a0646'
+            'cabbdf0c1b9fb4651c6f30eea95438b1f4f2b6872e0a62a92cda99afb1b6f6c3')
diff --git a/pure-ftpd.install b/pure-ftpd.install
new file mode 100644
index 000000000000..3aa22e9b522b
--- /dev/null
+++ b/pure-ftpd.install
@@ -0,0 +1,33 @@
+post_install()
+{
+    if [ ! -f /etc/ssl/private/pure-ftpd-dhparams.pem ]; then
+	echo 
+	openssl dhparam -out /etc/ssl/private/pure-ftpd-dhparams.pem 2048
+	chmod 600 /etc/ssl/private/pure-ftpd-dhparams.pem
+    fi
+
+    if [ ! -f /etc/ssl/private/pure-ftpd.pem ]; then
+	echo
+	openssl req -x509 -nodes -newkey rsa:2048 -sha256 -keyout /etc/ssl/private/pure-ftpd.pem -out /etc/ssl/private/pure-ftpd.pem -days 3650 -subj "/C=US/ST=California/L=San Francisco/O=FD/CN=$(hostname -f)"
+	echo
+	echo "A self-signed SSL certificate has been generated for you."
+	echo
+	echo "You can generate a new one with the following commands (as root):"
+	echo "openssl req -x509 -nodes -newkey rsa:2048 -sha256 -keyout /etc/ssl/private/pure-ftpd.pem -out /etc/ssl/private/pure-ftpd.pem -days 365"
+	echo "chmod 600 /etc/ssl/private/pure-ftpd.pem"
+	echo
+	echo "Note: The Common Name (CN) should be exactly the FQDN of the server."
+	echo "The validity can be extended by increasing the '-days' parameter value."
+	echo
+	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() {
+    post_install
+}
diff --git a/pure-ftpd.logrotate b/pure-ftpd.logrotate
new file mode 100644
index 000000000000..63e2f9f2d5f5
--- /dev/null
+++ b/pure-ftpd.logrotate
@@ -0,0 +1,7 @@
+/var/log/pureftpd.log
+{
+        daily
+        missingok
+        notifempty
+        compress
+}
diff --git a/pure-ftpd.service b/pure-ftpd.service
index 20c53171769b..c616742d0589 100644
--- a/pure-ftpd.service
+++ b/pure-ftpd.service
@@ -5,7 +5,7 @@ After=network.target
 [Service]
 Type=forking
 PIDFile=/run/pure-ftpd.pid
-ExecStart=/usr/bin/pure-config.pl /etc/pure-ftpd/pure-ftpd.conf
+ExecStart=/usr/bin/pure-ftpd /etc/pure-ftpd/pure-ftpd.conf
 
 [Install]
 WantedBy=multi-user.target
diff --git a/welcome.msg b/welcome.msg
new file mode 100644
index 000000000000..b3d344fa0deb
--- /dev/null
+++ b/welcome.msg
@@ -0,0 +1 @@
+Welcome to the FTP server.