Version bump. Removed old

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0x981CA6FC

3 files changed, 53 insertions, 26 deletions

diff --git a/net-ftp/pure-ftpd/ChangeLog b/net-ftp/pure-ftpd/ChangeLog
index 1276b9dc3c3b..c7536c617748 100644
--- a/net-ftp/pure-ftpd/ChangeLog
+++ b/net-ftp/pure-ftpd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-ftp/pure-ftpd
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/pure-ftpd/ChangeLog,v 1.168 2015/07/22 16:32:18 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/pure-ftpd/ChangeLog,v 1.169 2015/07/28 13:23:15 polynomial-c Exp $
+
+*pure-ftpd-1.0.42 (28 Jul 2015)
+
+  28 Jul 2015; Lars Wendler <polynomial-c@gentoo.org> -pure-ftpd-1.0.36.ebuild,
+  +pure-ftpd-1.0.42.ebuild:
+  Version bump. Removed old.
 
   22 Jul 2015; Mikle Kolyada <zlogene@gentoo.org> pure-ftpd-1.0.40.ebuild:
   ia64 stable wrt bug #552254
diff --git a/net-ftp/pure-ftpd/Manifest b/net-ftp/pure-ftpd/Manifest
index 3d6c09a23b81..5b5dffc54ac2 100644
--- a/net-ftp/pure-ftpd/Manifest
+++ b/net-ftp/pure-ftpd/Manifest
@@ -1,24 +1,32 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX pure-ftpd-1.0.28-pam.patch 564 SHA256 21b340701ba18454cc55b7a719033c71d758960b02cc626ff60183a5dae50fc7 SHA512 dfaa24a95747fcc85e48e87bc31b8c8ee5c2e80128fcac02a2dc9ad9addd2c17724c9369c03c1b5a44d9ecc751f0135a35a16263a3f476b1b64a4201a3ce49f7 WHIRLPOOL de9ede827c171a5a0a312470b83d6072d21f9cd4fd9d932d879f44c34bbbf5a11d7ebf2cddd5de7e23cdc92cce64825ec08c0d284da4a58e9425a1092cdf6c07
 AUX pure-ftpd.conf_d-3 3728 SHA256 6b67379efa91a6168bd4cebee56ba09dfa77830a4843b25edb7a85f1bb88e5fa SHA512 a5cc8e59178a5d0f7b5909d09009ef6ace1f8e6874bd733e21bc30f4899447e70b020a0369077132751ceb28afa971588efedcce3dea83e9b043b1545caf3393 WHIRLPOOL 5004cbac643d05b0315309d943c1718c30778f07bcbfb834fb3957a7b9060b24ad98607793060549dc17a61ec7714a5081d80151dfa80b0d41d0f9abad77c312
 AUX pure-ftpd.rc11 2136 SHA256 b59fa0c0ee824ad86a8d39df475f66a343734ec3ed9014adad2d3b016ab001e8 SHA512 1318f85905a0cf7caf12c13db13f985c31d353567cc183aa5b31b2039578611f792f1b49afe58ffcdcb9df6939803d9d070c17db6e401fd6822d05e5a56640c6 WHIRLPOOL c70e886d6aa000f62c268ba759a725bc6a423b7521b22bcb8e2d693e17a17c822b3aadb7e6767a34f6dafcd04d41673082586ccf2288b32c8d90cf4e8826198e
 AUX pure-ftpd.xinetd 247 SHA256 30e166051c7331c48ab1d948d6deecaa71130aaf3cfdc3ffb99124971b64f80c SHA512 e8ac0527daf1e182e7514d17f04bd20e789231e627cc7228ac23a241a4c420204a61ef9438c57e63f402eb3608ae0acc15a72fe484c99bb4e172bbd5ece2b72d WHIRLPOOL 557d9f627b0ff32975edc674386bdde3676ab8e69d486e28755f889e844171f5a26a53511f313a9416e3376d27f00113b005f12c9605017498b898862c9e3fc1
-DIST pure-ftpd-1.0.36.tar.bz2 487746 SHA256 16e3cff004c80d752ff85e8a011a523867c7f2ab99af0f9c170891118e0fcc6b SHA512 875a9a8e9f63add265077d52b7584e0682786f497b493ca81cac3d72b1084fcd02c11627826742ed94cc28f146b8581b9aa638cab958dcbd3f462fff37da89c6 WHIRLPOOL 0ef07b890bc57b7a7e4d54ea89d674d1f11118e5c09bc5d257e6cd818dd9ad4e02e4e9373107a1b63314e4a9b4c4664836d5d7730bce6d26a400ea94522e9ed6
 DIST pure-ftpd-1.0.40.tar.bz2 495141 SHA256 004dd4e991537f100fb6cdcdcd43460ed49847aefb60bc4577466839de95aa20 SHA512 26a9918ddb298a6fd2b684e88173466b351671ad9b5c702796fabd1a7b0abb52fefcd3537b9d17210468d7f2efc80e4c881fc60dd3c9c73dcbed5f46e59e4420 WHIRLPOOL 09d6d5fed066a5c0cfb4801e1827770cd3d909dbf85e627c30c583ca0999dd3ec44a1528004db12ccbb232d22e263a4f742f2785a111d255db0007a097146f7d
 DIST pure-ftpd-1.0.41.tar.bz2 496457 SHA256 1d48f650f366b8151d86b86c79f4bb874e95143bdac0e767038eda832d28a010 SHA512 d63fb4f245dc2f1115447de3861f1a805712fb432c461e21b5739e1bae35da9d1367d5e7f54609f2fd5c3064e8d3853dd513a6684166300f1c72a60a79fddd21 WHIRLPOOL a0ed31b912e83f07c1f3814f47f7514a22db0e5fd699a890a4640fd36b053e491a93a15fe0a8b721ce08389a2727acc0928994c495c341bbfdfc5453d5d4af31
-EBUILD pure-ftpd-1.0.36.ebuild 4017 SHA256 bff4ae96bb63350349be1a564aad8c6029512a49692b871c7d7529d28704c0bf SHA512 e436829fe1caf5b46af4aa77906d9df714a7d844be4e73febfda35376ec55adba8d8580ee4f052d09c349926ca1343dad51eb75fc11697668dd937b629091e17 WHIRLPOOL 2c8dd96bc490de454846dcf9d779557b3e4af34124a27abfcca78b9af42662aa679574029cb6a3d89ed9d93196e1724806d81184c993f36cf2325343f5d80a4e
+DIST pure-ftpd-1.0.42.tar.bz2 496652 SHA256 efd11295998453e31dbeef9159624beabbac2643a338134ae8c2ef529aa2ec10 SHA512 730ece22ce9a8562c5da6063de2b99404fbc0d0fa0b591383c319a762ea33cec74239474bcb56606b7af254dd76e31154f27a745df0c619932c9b8b4f150bc9c WHIRLPOOL bcbcd32fcfe10741f214559f7051bca302addc9bdc0a90a24e33a53c8103199a2eb40ea65e314fc66c59a47a479bd6774e332f4898d750c90b6dbf1bee01bcec
 EBUILD pure-ftpd-1.0.40.ebuild 4397 SHA256 327c68f440bd41da37894867b871dd6370c53cdba3cfd251d1ba58d22f00753e SHA512 7b5836e72200f8962e4b134e0060418dba331445c6228adafa1a8c4695071d280f2306adfe1d2299b99a8b7d4e02ea39c59fac72ca75a6ff619c7398b6fafa0e WHIRLPOOL fdb20a0ed0834065d86a085446ddd1d7685bf72b0375b0a0e07dd70143e1890c4abb27fad03e0516607efa85d6f7e3beea8c129376d64e56260fc9e55ba9cd4f
 EBUILD pure-ftpd-1.0.41.ebuild 4410 SHA256 41f60e0dcb5a1289dc8ab01f05b46ab5262af287bcdd340c23212c141a89362c SHA512 50d9d12e3d70047f7fad5e4270d30ab983b15b4bb3ae64031883495b3b010fecc33a14c46bfbb1c1ec52325809af1b3b7192dc678c4114111c418c03716ef8f7 WHIRLPOOL 258e5110d3bdbf37a26535f601db0ffcc1e118d88456cb7c3f14b967cd608e02b09f5bb555239f87e0d4f6cd53fa65de042dce8cf355a4d395f5da1deb8c6f96
-MISC ChangeLog 26226 SHA256 aae1be422ed56111e1e1dfb4d46af58165d39952a238aa37e6a88cb6e95125ac SHA512 cb38f6fcd64ab977dd272a79dabc63082fe9b8490d09a7ccd742caff45924d80df627ff9ca68cd7e307929612194f2717959e5526fe841efd0988dab2a898d67 WHIRLPOOL df6a533a31917737c016b707194d1c02f07f6fc3ecea17e204522a43480bc9c743f25e846d0079f44c74e59cc891b90b7c2f40f8399d165c9374f2830b0f4f12
+EBUILD pure-ftpd-1.0.42.ebuild 4410 SHA256 67af61da34d269d76be8468276560e025d952667e9e3b1b6ed76ea7a9b908a4c SHA512 dbd3d04697734bc8c3b88609b14404073d050bf53efd6b5fd69c28225f831644b00181a32dfe82d4ce189a15e97aed0d15afe9b2606b93c4ec98ae5b122b34cf WHIRLPOOL c5b24db1cd4d098670bb839b77d58ade13533067aa5c8692cea3cb16c40652715897058ded592e0adbdcc940ef7cd68a60f2b33f649d5174d8b78c60b01416bf
+MISC ChangeLog 26402 SHA256 192a65608c963577c608802cf06913574bbb6f92839609a774dcd92e1d955309 SHA512 bb720b13f2e07e33e2345562427273368aad03af1400d340978b98e7376e9f13ac9b0c1b8872a07c1878b0019f16a50e0af4b5de3c68a907a30378a70e20337f WHIRLPOOL 0e4305b08866528e0226344e19dd83786198ae0fb0f2f16f1fd4a9fa61a6e4fb059bdacaceb3a05111481c8f34e7e144de26063dd21ea00981c48b264ad118f7
 MISC metadata.xml 1240 SHA256 b84643dabed5b46821ed0540289e8335682981ceb0a8f48ea39d6eba158483b1 SHA512 d5c007246be504b4ea5dfe759d4fe7d64609a38a85b527429972d61484a396c1d703d278f56b657b6857bf93d43845d64d8520888c8a23e5313d5c07d0aa898d WHIRLPOOL 06dcefb0d864cce880416109f9b887dcf8ec81a5f8c2124ecab6d9ecbdd4bc9d63bf2e023dc48be3cfedbf0c028b4ff20d92e9eb8cb80ea88755da8ea8a6aac2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iJwEAQEIAAYFAlWvxQgACgkQG9wOWsQutdZmnwQA0QW1nc/M/vQS0hLFbNMLhHwK
-JiyZBu7jUo9IfUPPSpumfhvCeBawi1vBgQza4Di6o7k7thKkvyiP3PjUQSCIY2r1
-Awzys5GcPQiVKbWEBmpgh9UxmqxOABaDQb7quykJzH9greFaW4q8TBtTLnURo/gX
-0OV/ZZbCZa4BtMXImwo=
-=xoxm
+iQIcBAEBCgAGBQJVt4JGAAoJEPiazRVxLXTFzVoQAMk4k+Fb0Jh3N0XArxmX50LT
+6aXikOHULxw5ahjgWvIe07I7r6ndaxMAiFboTHTVV8WWezkLlxPc1izVcU3jmEKN
+oBVFTIE4BQWTtnLBUCfq+5FxS/Gvdkp8S66J4SSHWR0wPJ2e03rdjAAlbGUqXA8s
+E/+I+lSlWXjIFHpjQ+2QYwql8PgEZDAtXM63e6JZQpz0kl1urD78kZo7G7oqwiUh
+eWnIC4yHrlqUgk8F3fQi4VT/xhAPUr28Aur6Kc+M5tWFeoYt81qBMWQywqtg8vqR
+2f6Dyu0jUuu8w8ruThwm4Ha/q5Puw3hklBJg3Vr6X8Pr9LseH+kNvls3aUXIxrpN
+TjeE7YmoWnoirzUdaUljbVZyca1Ao15CQF3FCfSwAx3sq9nAXqinn+V7Lpfh7oa9
+MTCkBMw2A300WMCjuOfB4urkonrMBmwJkh83hnqjhaTVpN8/A444X6ZsCBpa/Lp3
+K/S4hPLlQGb4cFha49dAuc14dxNCQs5p81L0teXnD4lR5XAE/MFT0BEeCeSe9Uhv
+nTpAdXPDmltZXQVLo+2256iVKbsjNHaxmyrzae5rHeqY/kx2X8+4Lz+oCO2yWoWs
+44rTRMbIyaE0tHKhJUXzhtvswjPJwFLmxLqOgjXJy+cCveDtrcmHPc4qAqQq8lyV
+u6TjUK6JC32Hv1HsxDx8
+=gKGm
 -----END PGP SIGNATURE-----
diff --git a/net-ftp/pure-ftpd/pure-ftpd-1.0.36.ebuild b/net-ftp/pure-ftpd/pure-ftpd-1.0.42.ebuild
index ebbd68cfb28d..21215529a564 100644
--- a/net-ftp/pure-ftpd/pure-ftpd-1.0.36.ebuild
+++ b/net-ftp/pure-ftpd/pure-ftpd-1.0.42.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/pure-ftpd/pure-ftpd-1.0.36.ebuild,v 1.16 2015/04/16 09:35:12 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/pure-ftpd/pure-ftpd-1.0.42.ebuild,v 1.1 2015/07/28 13:23:15 polynomial-c Exp $
 
 EAPI=5
 inherit eutils confutils flag-o-matic
 
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
 DESCRIPTION="Fast, production-quality, standard-conformant FTP server"
 HOMEPAGE="http://www.pureftpd.org/"
@@ -15,7 +15,9 @@ SRC_URI="ftp://ftp.pureftpd.org/pub/${PN}/releases/${P}.tar.bz2
 LICENSE="BSD"
 SLOT="0"
 
-IUSE="anondel anonperm anonren anonres caps charconv ldap mysql noiplog pam paranoidmsg postgres resolveids selinux ssl sysquota vchroot xinetd"
+IUSE="anondel anonperm anonren anonres caps charconv implicittls ldap mysql noiplog pam paranoidmsg postgres resolveids selinux ssl sysquota vchroot xinetd"
+
+REQUIRED_USE="implicittls? ( ssl )"
 
 DEPEND="caps? ( sys-libs/libcap )
 	charconv? ( virtual/libiconv )
@@ -23,11 +25,12 @@ DEPEND="caps? ( sys-libs/libcap )
 	mysql? ( virtual/mysql )
 	pam? ( virtual/pam )
 	postgres? ( dev-db/postgresql:= )
-	ssl? ( >=dev-libs/openssl-0.9.6g:0= )
+	ssl? ( >=dev-libs/openssl-0.9.6g:0=[-bindist] )
 	sysquota? ( sys-fs/quota[-rpc] )
 	xinetd? ( virtual/inetd )"
 
 RDEPEND="${DEPEND}
+	dev-libs/libsodium
 	net-ftp/ftpbase
 	selinux? ( sec-policy/selinux-ftp )"
 
@@ -38,7 +41,8 @@ src_prepare() {
 src_configure() {
 	# adjust max user length to something more appropriate
 	# for virtual hosts. See bug #62472 for details.
-	sed -e "s:# define MAX_USER_LENGTH 32U:# define MAX_USER_LENGTH 127U:" -i "${S}/src/ftpd.h" || die "sed failed"
+	sed -e "s:# define MAX_USER_LENGTH 32U:# define MAX_USER_LENGTH 127U:" \
+		-i "${S}/src/ftpd.h" || die "sed failed"
 
 	local my_conf=""
 
@@ -51,6 +55,7 @@ src_configure() {
 	enable_extension_with		"paranoidmsg"		"paranoidmsg"		0
 	enable_extension_with		"pgsql"			"postgres"		0
 	enable_extension_with		"tls"			"ssl"			0
+	enable_extension_with		"implicittls"		"implicittls"		0
 	enable_extension_with		"virtualchroot"		"vchroot"		0
 	enable_extension_with		"sysquotas"		"sysquota"		0
 	enable_extension_without	"inetd"			"xinetd"
@@ -93,7 +98,12 @@ src_install() {
 
 	dodoc AUTHORS CONTACT ChangeLog FAQ HISTORY INSTALL README* NEWS
 
-	newconfd "${FILESDIR}/pure-ftpd.conf_d-3" pure-ftpd
+	newconfd "${FILESDIR}/pure-ftpd.conf_d-3" ${PN}
+
+	if use implicittls ; then
+		sed -i '/^SERVER/s@21@990@' "${ED}"/etc/conf.d/${PN} \
+			|| die "Adjusting default server port for implicittls usage failed!"
+	fi
 
 	newinitd "${FILESDIR}/pure-ftpd.rc11" pure-ftpd
 
@@ -114,15 +124,18 @@ src_install() {
 }
 
 pkg_postinst() {
-	elog
-	elog "Before starting Pure-FTPd, you have to edit the /etc/conf.d/pure-ftpd file!"
-	elog
-	ewarn "It's *really* important to read the README provided with Pure-FTPd!"
-	ewarn "Check out http://download.pureftpd.org/pub/pure-ftpd/doc/README for general info"
-	ewarn "and http://download.pureftpd.org/pub/pure-ftpd/doc/README.TLS for SSL/TLS info."
-	ewarn
-	if use charconv ; then
-		ewarn "Charset conversion is an *experimental* feature!"
-		ewarn "Remember to set a valid charset for your filesystem in the configuration!"
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		# This is a new installation
+		elog
+		elog "Before starting Pure-FTPd, you have to edit the /etc/conf.d/pure-ftpd file!"
+		elog
+		ewarn "It's *really* important to read the README provided with Pure-FTPd!"
+		ewarn "Check out http://download.pureftpd.org/pub/pure-ftpd/doc/README for general info"
+		ewarn "and http://download.pureftpd.org/pub/pure-ftpd/doc/README.TLS for SSL/TLS info."
+		ewarn
+		if use charconv ; then
+			ewarn "Charset conversion is an *experimental* feature!"
+			ewarn "Remember to set a valid charset for your filesystem in the configuration!"
+		fi
 	fi
 }