Updated to v1.0.44

3 files changed, 14 insertions, 15 deletions

diff --git a/.SRCINFO b/.SRCINFO
index cf6d70696231..dd6a9e2c2327 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Mon Aug  1 09:20:25 UTC 2016
+# Wed Jan 11 20:39:00 UTC 2017
 pkgbase = pure-ftpd
 	pkgdesc = A secure, production-quality and standard-conformant FTP server, focused on efficiency and ease of use.
-	pkgver = 1.0.43
+	pkgver = 1.0.44
 	pkgrel = 1
 	url = http://www.pureftpd.org/
 	install = pure-ftpd.install
@@ -13,13 +13,13 @@ pkgbase = pure-ftpd
 	depends = libmariadbclient
 	conflicts = pure-ftpd-db
 	backup = etc/pure-ftpd/pure-ftpd.conf
-	source = http://download.pureftpd.org/pub/pure-ftpd/releases/pure-ftpd-1.0.43.tar.bz2
+	source = http://download.pureftpd.org/pub/pure-ftpd/releases/pure-ftpd-1.0.44.tar.bz2
 	source = pure-ftpd.service
 	source = pure-ftpd.logrotate
 	source = welcome.msg
 	source = pure-ftpd.install
-	md5sums = 685498474a47340e9a3eae1518cf83c8
-	md5sums = 9091eb6510c8e1e3e23fbdd85099d926
+	md5sums = 8da4207c02a72267abfdf0a9fc2bf3a9
+	md5sums = 0d0845e17607ffb212eae0112c58e9ff
 	md5sums = 37a45c88a0f038de37b4a87c6c447534
 	md5sums = 7e91835f7e7975bd0536648fc99e5a22
 	md5sums = ff95d5cb24ee8a4e26e9f56699dc4457
diff --git a/PKGBUILD b/PKGBUILD
index d0279bbc7b27..0b9a3a626ecb 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,7 +8,7 @@
 # Contributor: dorphell <dorphell@archlinux.org>
 
 pkgname=pure-ftpd
-pkgver=1.0.43
+pkgver=1.0.44
 pkgrel=1
 pkgdesc="A secure, production-quality and standard-conformant FTP server, focused on efficiency and ease of use."
 arch=('i686' 'x86_64')
@@ -24,14 +24,16 @@ source=("http://download.pureftpd.org/pub/pure-ftpd/releases/pure-ftpd-${pkgver}
 	'welcome.msg'
 	'pure-ftpd.install' )
 
-md5sums=('685498474a47340e9a3eae1518cf83c8'
-         '9091eb6510c8e1e3e23fbdd85099d926'
+md5sums=('8da4207c02a72267abfdf0a9fc2bf3a9'
+         '0d0845e17607ffb212eae0112c58e9ff'
          '37a45c88a0f038de37b4a87c6c447534'
          '7e91835f7e7975bd0536648fc99e5a22'
          'ff95d5cb24ee8a4e26e9f56699dc4457')
 
 build() {
 	cd ${srcdir}/${pkgname}-${pkgver}
+	# Switch TLS lines to prevent config parser error
+	sed -n '1,61p;63p' src/simpleconf_ftpd.h >_ && sed -n '62p;64,1000p' src/simpleconf_ftpd.h >>_ && mv _ src/simpleconf_ftpd1.h
 	./configure --prefix=/usr \
 	--bindir=/usr/bin \
 	--sbindir=/usr/bin \
@@ -51,20 +53,17 @@ build() {
 package() {
 	cd ${srcdir}/${pkgname}-${pkgver}
 	make DESTDIR=${pkgdir} install
-	install -Dm644 -t ${pkgdir}/etc/pure-ftpd/ configuration-file/pure-ftpd.conf ${srcdir}/welcome.msg
-	install -Dm755 configuration-file/pure-config.pl ${pkgdir}/usr/bin/pure-config.pl
+	install -Dm644 -t ${pkgdir}/etc/pure-ftpd/ pure-ftpd.conf ${srcdir}/welcome.msg
 	install -Dm644 -t ${pkgdir}/usr/lib/systemd/system/ ${srcdir}/pure-ftpd.service
 	install -Dm644 ${srcdir}/pure-ftpd.logrotate ${pkgdir}/etc/logrotate.d/pure-ftpd
-	install -Dm644 -t ${pkgdir}/usr/share/doc/${pkgname}/ README* pureftpd-*sql.conf
+	install -Dm644 -t ${pkgdir}/usr/share/doc/${pkgname}/ README* pureftpd-*sql.conf ChangeLog
 	install -Dm644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
 
 	sed -i 's|NoAnonymous\s.*no|NoAnonymous yes|' ${pkgdir}/etc/pure-ftpd/pure-ftpd.conf
 	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.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
-	sed -i 's|# CertFile\s.*/etc/ssl/private/pure-ftpd.pem|CertFile /etc/ssl/private/pure-ftpd.pem|' ${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
 }
diff --git a/pure-ftpd.service b/pure-ftpd.service
index d0b92d6f0013..8c9ccd3c4056 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