gentoo resync : 15.09.2018

4 files changed, 15 insertions, 144 deletions

diff --git a/net-ftp/pure-ftpd/Manifest b/net-ftp/pure-ftpd/Manifest
index c961ddf78946..8b83ce456bfd 100644
--- a/net-ftp/pure-ftpd/Manifest
+++ b/net-ftp/pure-ftpd/Manifest
@@ -6,7 +6,6 @@ AUX pure-ftpd.rc11 1990 BLAKE2B a0f4bccad43ae3f767188326ec1853c516165c0268e31756
 AUX pure-ftpd.xinetd 247 BLAKE2B aa2b0f8b4b6ff45e9b8dd632af5ff680ddd5abe51647dda91ca78bf3cb9ba9a090b20433f460213e95b8e57958d711f4bd7fa594b3d33fae818b853ec5aaee5d SHA512 e8ac0527daf1e182e7514d17f04bd20e789231e627cc7228ac23a241a4c420204a61ef9438c57e63f402eb3608ae0acc15a72fe484c99bb4e172bbd5ece2b72d
 DIST pure-ftpd-1.0.45.tar.bz2 497695 BLAKE2B c905675253d992757e44baf1fae42d8363789ce3eb4d71d6f0e5c994a63efd307af69fb81aadb1875f0f2da952c0b3c8fbbc79c9c5c0b22c2d2f82029b417f11 SHA512 bb22b6b88778e2586411318905aa165e590185f7a87ac30761d6250f4de22a1deec6be5441926eae28011d3a5a923bad2ac366e237cc96a4d7932e3dbc9a1f2a
 DIST pure-ftpd-1.0.47.tar.bz2 489177 BLAKE2B 06e71ead47b87dedf47a84e488b2de127fcd297c2e9ca7a617c2ee2760cf55b816884763721826c512558d016cbd38a87a11ca0e8c2334d93145edc6f88d9287 SHA512 c1920a3f67f04635fde600fe226a7730b801e7e64658b25f1d9f9c0b35a704664be4adfb0b291594f7e0f10beade25eae9a5e6cc3b6777a3b413f3c2d9574e63
-EBUILD pure-ftpd-1.0.45-r2.ebuild 3945 BLAKE2B fcf652d9d3cf7e1e0619296bd04e035493ad0d8711da57f0820823ac38965b6baacc120843e0ab623e246a244d79581291b4de8fe1569b212e056cf9355cd106 SHA512 8d95be72f88c8d758a3272478a96d5ba8997e24f5d229df6ce2e65f8119631814191585120bb944d8198762b5661c106fd6ceade58c38b2766a319d2ea9e05a1
-EBUILD pure-ftpd-1.0.47-r1.ebuild 3915 BLAKE2B 0d216396715a08d42477a4b6fe8d846b08fcd941e704a870e8e9b4a4c8dc0f41f9ecfc52e148d2a954349fa77393b65c17bb8180c7a4ffa2e0cbb77055b1499e SHA512 85e3ff0ee728198655a72d85f363e13c806f2c5316c24e6434f7d52b643908b61289c5d38cc45f654797bc62d6e4420813764d0021ed57c5a8c800de1fc5272f
-EBUILD pure-ftpd-1.0.47.ebuild 3867 BLAKE2B 0c1930e2ddc0aa3efbbe1388d6017fcd5fe0e75b399819676c23c14b9b26eb4a9e2d124c086454fe522d56b2c75940e0fae6d6501ef26a82d8ae9d04c7289afa SHA512 02420399d83ba5e5d54fdca2b57dc87a28f23bd7a39f2ad28960feb30603a5b8ebc6614bae77fedc87a4a73f1ac3c75a5a878a815908a6440e0ed7a59df6d855
+EBUILD pure-ftpd-1.0.45-r3.ebuild 3989 BLAKE2B e04df8a23930d4a75bc721f033803d575208d5d3a7b9c054baee09551a3ccd6a1e1cab4d4c8e1fec87e670911f5fec11532b708ca44c488387e22eadb7c0f195 SHA512 71fba70f9dd1c0719c01230f93d9eeb37743d8a4ee7254685939043dfccdca18cbf377cee2b5adc5ac9ef2b9501b073062f0ebbdd22b3fab20a081a63d701f0b
+EBUILD pure-ftpd-1.0.47-r2.ebuild 3966 BLAKE2B 79b319b48e6cace1c1e6fb93f1c481634025e9d83c08e39165a968d860b97daae4ac1daf50209371bbaf9ab3869b2080f9eb60b5d72a60a8733336126488b2b2 SHA512 adedc9a5a2356cd871148cd42c2b2b371b12195ba68db42e5f775b4c5022c23dfc68d8cbb40100fdabcb7819be891f7c2ff361497352e0ef0c86bbd21253ea5c
 MISC metadata.xml 1233 BLAKE2B 02ea0260dacca81d5b2eef251f98756f151b03ee7abcf3ccc46832167848b8aa80dba90d855c118908b87ce7085921cae81f3a747402c5e0fb70401dd668150b SHA512 ce47470d3c8bfeba9c02f6d6638e7b0bb6e0ddeddd1aaf0362342aadf07e823f1093523a1432c703bd410c3b760049a1e1c32e3f36718844b3a1ba44144afea4
diff --git a/net-ftp/pure-ftpd/pure-ftpd-1.0.45-r2.ebuild b/net-ftp/pure-ftpd/pure-ftpd-1.0.45-r3.ebuild
index 496333d7e7e8..045d7c6b7ed4 100644
--- a/net-ftp/pure-ftpd/pure-ftpd-1.0.45-r2.ebuild
+++ b/net-ftp/pure-ftpd/pure-ftpd-1.0.45-r3.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit eutils flag-o-matic
+EAPI=7
+
+inherit flag-o-matic
 
 KEYWORDS="alpha amd64 arm ~hppa ia64 ppc ppc64 sparc x86"
 
@@ -21,7 +22,10 @@ REQUIRED_USE="implicittls? ( ssl )"
 DEPEND="caps? ( sys-libs/libcap )
 	charconv? ( virtual/libiconv )
 	ldap? ( >=net-nds/openldap-2.0.25 )
-	mysql? ( virtual/mysql )
+	mysql? ( || (
+		dev-db/mariadb-connector-c
+		dev-db/mysql-connector-c
+	) )
 	pam? ( virtual/pam )
 	postgres? ( dev-db/postgresql:= )
 	ssl? (
diff --git a/net-ftp/pure-ftpd/pure-ftpd-1.0.47-r1.ebuild b/net-ftp/pure-ftpd/pure-ftpd-1.0.47-r2.ebuild
index 412951b81a3a..15f2259bad7b 100644
--- a/net-ftp/pure-ftpd/pure-ftpd-1.0.47-r1.ebuild
+++ b/net-ftp/pure-ftpd/pure-ftpd-1.0.47-r2.ebuild
@@ -1,7 +1,8 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
+
 inherit flag-o-matic
 
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
@@ -21,7 +22,10 @@ REQUIRED_USE="implicittls? ( ssl )"
 DEPEND="caps? ( sys-libs/libcap )
 	charconv? ( virtual/libiconv )
 	ldap? ( >=net-nds/openldap-2.0.25 )
-	mysql? ( virtual/mysql )
+	mysql? ( || (
+		dev-db/mariadb-connector-c
+		dev-db/mysql-connector-c
+	) )
 	pam? ( virtual/pam )
 	postgres? ( dev-db/postgresql:= )
 	ssl? (
diff --git a/net-ftp/pure-ftpd/pure-ftpd-1.0.47.ebuild b/net-ftp/pure-ftpd/pure-ftpd-1.0.47.ebuild
deleted file mode 100644
index 230c6974a75f..000000000000
--- a/net-ftp/pure-ftpd/pure-ftpd-1.0.47.ebuild
+++ /dev/null
@@ -1,136 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit flag-o-matic
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-DESCRIPTION="Fast, production-quality, standard-conformant FTP server"
-HOMEPAGE="http://www.pureftpd.org/"
-SRC_URI="ftp://ftp.pureftpd.org/pub/${PN}/releases/${P}.tar.bz2
-	http://download.pureftpd.org/pub/${PN}/releases/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-
-IUSE="anondel anonperm anonren anonres caps charconv implicittls ldap libressl mysql noiplog pam paranoidmsg postgres resolveids selinux ssl sysquota vchroot xinetd"
-
-REQUIRED_USE="implicittls? ( ssl )"
-
-DEPEND="caps? ( sys-libs/libcap )
-	charconv? ( virtual/libiconv )
-	ldap? ( >=net-nds/openldap-2.0.25 )
-	mysql? ( virtual/mysql )
-	pam? ( virtual/pam )
-	postgres? ( dev-db/postgresql:= )
-	ssl? (
-		!libressl? ( >=dev-libs/openssl-0.9.6g:0=[-bindist] )
-		libressl? ( dev-libs/libressl:= )
-	)
-	sysquota? ( sys-fs/quota[-rpc] )
-	xinetd? ( virtual/inetd )"
-
-RDEPEND="${DEPEND}
-	dev-libs/libsodium:=
-	net-ftp/ftpbase
-	selinux? ( sec-policy/selinux-ftp )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.0.28-pam.patch
-)
-
-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"
-
-	# Those features are only configurable like this, see bug #179375.
-	use anondel && append-cppflags -DANON_CAN_DELETE
-	use anonperm && append-cppflags -DANON_CAN_CHANGE_PERMS
-	use anonren && append-cppflags -DANON_CAN_RENAME
-	use anonres && append-cppflags -DANON_CAN_RESUME
-	use resolveids && append-cppflags -DALWAYS_RESOLVE_IDS
-
-	# Do not auto-use SSP -- let the user select this.
-	export ax_cv_check_cflags___fstack_protector_all=no
-
-	local myeconfargs=(
-		--enable-largefile
-		--with-altlog
-		--with-cookie
-		--with-diraliases
-		--with-extauth
-		--with-ftpwho
-		--with-language=${PUREFTPD_LANG:=english}
-		--with-peruserlimits
-		--with-privsep
-		--with-puredb
-		--with-quotas
-		--with-ratios
-		--with-throttling
-		--with-uploadscript
-		--with-virtualhosts
-		$(use_with charconv rfc2640)
-		$(use_with ldap)
-		$(use_with mysql)
-		$(use_with pam)
-		$(use_with paranoidmsg)
-		$(use_with postgres pgsql)
-		$(use_with ssl tls)
-		$(use_with implicittls)
-		$(use_with vchroot virtualchroot)
-		$(use_with sysquota sysquotas)
-		$(usex caps '' '--without-capabilities')
-		$(usex noiplog '--without-iplogging' '')
-		$(usex xinetd '' '--without-inetd')
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	local DOCS=( AUTHORS CONTACT ChangeLog FAQ HISTORY INSTALL README* NEWS )
-
-	default
-
-	newinitd "${FILESDIR}/pure-ftpd.rc11" ${PN}
-	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
-
-	keepdir /var/lib/run/${PN}
-
-	if use xinetd ; then
-		insinto /etc/xinetd.d
-		newins "${FILESDIR}/pure-ftpd.xinetd" ${PN}
-	fi
-
-	if use ldap ; then
-		insinto /etc/openldap/schema
-		doins pureftpd.schema
-		insinto /etc/openldap
-		insopts -m 0600
-		doins pureftpd-ldap.conf
-	fi
-}
-
-pkg_postinst() {
-	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
-}