gentoo resync : 30.06.2019

5 files changed, 44 insertions, 4 deletions

diff --git a/net-ftp/Manifest.gz b/net-ftp/Manifest.gz
index 5db5cc9849c6..cf993b8130f9 100644
--- a/net-ftp/Manifest.gz
+++ b/net-ftp/Manifest.gz
diff --git a/net-ftp/filezilla/Manifest b/net-ftp/filezilla/Manifest
index 4f4c2c8ed70e..6f6c2bd5ba8d 100644
--- a/net-ftp/filezilla/Manifest
+++ b/net-ftp/filezilla/Manifest
@@ -2,11 +2,11 @@ AUX filezilla-3.22.1-debug.patch 349 BLAKE2B 2a38aba4ddc49cbe97d3d6ce1348d94588a
 DIST FileZilla_3.39.0_src.tar.bz2 4995713 BLAKE2B d89aaa1f57187cd926ae1c4dd34624b404baa291334c652293d2dcfaedc4a5dffb401f8727b5d5d1fb483bdd503f35124efb75bdd7dd750d68e517fcb57fb8c0 SHA512 a0360634517ffd07878082abae024dbb4896035edcbd9abe6d8adfc9d37b73d01d95f6c5ca031175d88b6e4badefafcc43b5ddce3d9dbddde4deab5f0cc97e83
 DIST FileZilla_3.40.0_src.tar.bz2 4997647 BLAKE2B 88ff2461d33369c435645f1dd5afa98c566141bf825e74898f870bd4c09cc7b47a70f605afbaf7be28855385812a28ea24303b6ec7f0ba605a793160c3b76027 SHA512 7aeb0c340111a47c435e8d8cbf379e83d2fc6c0a94038e085664df34c2fe1f8ef8496ea894f5e4cfd576d034e8935fe29661bb9eff9f22416032f45f5a66db2f
 DIST FileZilla_3.41.2_src.tar.bz2 4994803 BLAKE2B 34f8331d3dfe3bdf483d234a0473074e17954b7d16abb7276ee6276221091f085c802d8cb0d397e00159b408d2737f5e23f2e50ad19d344c82472c09eea4dcd1 SHA512 c4b8284896942ba46f8f88fc5d60c6893c719e28ab94463848060850b6f9b2f4d3d13f580551dc3b21ab25ffc0cb1f43a2750500b5be2117952e14512a7ee40c
-DIST FileZilla_3.42.0_src.tar.bz2 4985999 BLAKE2B 3713b732d9021fa61c71bfa0fae04e9ee743cc887c3807311a8d5fee5d6ee4e67159a0e6cf6b5048df3f68f44ddcb22744b6f5c7c74c90bf4103c1b85cf9afb4 SHA512 d3a273fc17d53785de693c67bfc318f281ee73694a136b440049f4efb32ee1e1f8a625141353ac33b5404303a786adb38d6b44659dda6b83788f39f7001342fd
 DIST FileZilla_3.42.1_src.tar.bz2 4987250 BLAKE2B 8cc6fd0a0cec336f34793520fe4be52a36a91ba5a4a3d41092d78c00a25899f73abd03f8d6339da40bc98a618dbae98063de2844a83cacb1431fc53f3b962383 SHA512 0dc9b3a6347803f60a71c56bb759700fb2b1b019dc29794aa639ce892ccd1ae53041112987f9d5e8e75ec7e07702a5aac8e1c131796bbc5f210d75d286276deb
+DIST FileZilla_3.43.0_src.tar.bz2 4544635 BLAKE2B 13c99918dd7674fe3f2f0217b39ebe7aa89effe411e3cf90e08c9177278ce143ac84a021e49be0bc0772af29a5c34c33b03ce93d54f0b9918e4ea1001875ea48 SHA512 12c518616508e1cbd7ab60f1b94f8c876c885bc4399674c4b2df34235141fde1297a1edc686078c0f93b040ea6e42984c22ace00c4da201c7f99b4c9b71f5bc1
 EBUILD filezilla-3.39.0.ebuild 1802 BLAKE2B f15137701d47484e96588c8f306511d913e6fb23077e5a72680adbbde91a004ae59bc6f4b084df90a782fcd9fd852845ca0ddbf7457e7f0088631643bca5175d SHA512 f858b3d7b283a215e4a2eeba84f8a1f64959eff1b7c55e14f3eae219cfe3688f3ce319b7c3b924ac6d1c8e49f85397c2e91f85f5726ae325abe04b0d76af8d17
 EBUILD filezilla-3.40.0.ebuild 1804 BLAKE2B 2ed7f491b4667124b32cf4045d2ee681d5b662e44e134ec00f1297eb320025c655d2ddd36a9341e5fb66dd3d96a1b76f5dc4b39f6eb4cbfef313458e7cdb5f36 SHA512 51ce67a0f1b896c8aa2098f1d7b3021482ec2eb1c7c2039ccb57efd2fe3773f8225300c29b7a59d0f5ff134b4464ee51a072c1f4f57dcffd069e360d471a314f
 EBUILD filezilla-3.41.2.ebuild 1857 BLAKE2B 31fdd12cd442bc32b70f8b1625ff41e0a97d0e1706bd1f5ab7d1c1d39ee9ba1add619acfc9068e8b8baf500ab5d11af042b254fa660db184f75a26ac6009903b SHA512 b1cbdef23ac4f5eb596fa809584e10285b151b4b2beb3817f2b8f44424ee13047a3dab5c8e2372dc5f89c87b5601e2bf66ee74b0dbd6dd2744487eae8863c6be
-EBUILD filezilla-3.42.0.ebuild 1856 BLAKE2B b8f950120a699ed5b773f58dbae9b82d93cf5b5e4f2a030a28ee0e796db51c4dee1da5e363eeb70c14d280acfd33d7a4cc00be410e57eb0b040c9bf244d98141 SHA512 1d207f94ce3a81463bdb79f6d027643c06b0c92bb9697e0bba3217f481a458cf7627e2454d66196de77ca28edcf2cf27f599bdcb5f6635ba74e0912373766eba
 EBUILD filezilla-3.42.1.ebuild 1856 BLAKE2B b8f950120a699ed5b773f58dbae9b82d93cf5b5e4f2a030a28ee0e796db51c4dee1da5e363eeb70c14d280acfd33d7a4cc00be410e57eb0b040c9bf244d98141 SHA512 1d207f94ce3a81463bdb79f6d027643c06b0c92bb9697e0bba3217f481a458cf7627e2454d66196de77ca28edcf2cf27f599bdcb5f6635ba74e0912373766eba
+EBUILD filezilla-3.43.0.ebuild 1856 BLAKE2B 2ad0b83621a4f350b915bfa058a85bbf478d219bbd10bea8ad0358f1a887b23ee871f2fb922219f74f993d3e4a93fe2d0ce2bb487298df26c561b6353b9b4220 SHA512 e4e992bfed08b5df44658debd65c3f7730ca1cd5dc5264506143af885313761237a749f86a2ad5c0cfb44b5a0bc499eec9f8d36fe53bbc3b30599ec5dd260f11
 MISC metadata.xml 562 BLAKE2B ef75eb5e07f57db7de0a8e90dc2ad86c84b65776c674a1e282443029101d05c3292bf0d5786ab97d846de984aedc6ed59640a256dcce29c65aef537adf18c348 SHA512 a69afbf6f03dec20a4ec61e39bcfbc964e09e0d74496b383a348764a61d83e54fea2cd715a4bcc239ca0f3ed0c2e1c5d46dcfeb99f7cc4feea488663a0931544
diff --git a/net-ftp/filezilla/filezilla-3.42.0.ebuild b/net-ftp/filezilla/filezilla-3.43.0.ebuild
index e4f7d03cf422..fcb905143ffe 100644
--- a/net-ftp/filezilla/filezilla-3.42.0.ebuild
+++ b/net-ftp/filezilla/filezilla-3.43.0.ebuild
@@ -23,8 +23,8 @@ IUSE="dbus nls test"
 RDEPEND=">=app-eselect/eselect-wxwidgets-0.7-r1
 	>=dev-libs/nettle-3.1:=
 	>=dev-db/sqlite-3.7
-	>=dev-libs/libfilezilla-0.16.0
-	<dev-libs/libfilezilla-0.17.0
+	>=dev-libs/libfilezilla-0.17.1
+	<dev-libs/libfilezilla-0.18.0
 	>=dev-libs/pugixml-1.7
 	>=net-libs/gnutls-3.5.7
 	>=x11-libs/wxGTK-3.0.4:${WX_GTK_VER}[X]
diff --git a/net-ftp/ftpbase/Manifest b/net-ftp/ftpbase/Manifest
index a99d9c91b914..d32611268bab 100644
--- a/net-ftp/ftpbase/Manifest
+++ b/net-ftp/ftpbase/Manifest
@@ -2,4 +2,5 @@ AUX ftp-pamd 700 BLAKE2B c867c659cac367c51021504dd4da0a9dc90609564613f580a0a01a9
 AUX ftp-pamd-include 632 BLAKE2B 28aa913499698f136e784e8ed420748fe1415d0ddeb64761b8ed71b869e4b9afb6b86df4b8a8a748ec3a740d99c000fcc4789ee45c3a302f81ffbaab07c7e106 SHA512 adc59c544b815bd88b7e91a43cb5620008d1f83d15a08620f56242d74991ba413e56b31bcca8e5fcfe71f05362bbad89b02d5289260f08649d38965c8951ec76
 AUX ftpusers 300 BLAKE2B 02489b8eed29bfd4cea148b1b4214ac5ba798faa44da1be68cea06c18680e44f0054c952107810e4a199398b6ba382c649a481cf9d7388cd5caa10ace50e06d3 SHA512 29a8bdca1a6bb516c5189e6c69969cba3c220ea878e352e78bb6ea5cb2ac7476306736240155dc6d3f7512aac48164354db68721ea952d1010639e8ae14635e0
 EBUILD ftpbase-0.01-r2.ebuild 1458 BLAKE2B a2763b32a7389ca38bb21ab08ecc5c57e21d780b19ab15376b691a5b2ca69d8d89f6b3700d2c7dbcfac0c1433e7bfc6dd2d34e2f722d11a320fc03b59a3a167c SHA512 805822794d7e960d2862f95a07b376426351b0a6b6d1d2ef26fcb9fd54b4908900fd1dd0fafae4c917eefd321299d5ae064af0b9e2dea2dfea9cb39302daa696
+EBUILD ftpbase-0.01-r3.ebuild 937 BLAKE2B 1c906ffa3a167f9adeb77833eeabbd92126d0982480b355d0374bfaad71b894a8efb24d276011911f37a01dbc5df8adc5e79d1beb11b0ed8658039285e7e27a5 SHA512 9d178d78df945d6404e67b9f2fe77c0a30f6cc60ed714442d2ef511f7c992dfa7c59b021cb351703a9cdb13a92f9894c7ecb355389717a8ed94c0163ff994012
 MISC metadata.xml 235 BLAKE2B da947ee7650abf01b4eee1667349a14d2d8d496ec234acd60db66c1059d42d6e9a1d30403068b7977a397f4e0a2934fe4e7c2c04d356b2c23a5e8a87ac7266a1 SHA512 fa78af8197737bd5d9b44305bac24dacac9034fd96284af1e3c89428fc418e17a4bea91fa53f07dce02e6ab8afe6455343db364d031ab342225a26d0364c23da
diff --git a/net-ftp/ftpbase/ftpbase-0.01-r3.ebuild b/net-ftp/ftpbase/ftpbase-0.01-r3.ebuild
new file mode 100644
index 000000000000..c333840faa18
--- /dev/null
+++ b/net-ftp/ftpbase/ftpbase-0.01-r3.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit eutils pam user
+
+DESCRIPTION="FTP layout package"
+HOMEPAGE="https://www.gentoo.org/"
+SRC_URI=""
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="pam"
+
+DEPEND="pam? ( virtual/pam )
+	!<net-ftp/proftpd-1.2.10-r6
+	!<net-ftp/pure-ftpd-1.0.20-r2
+	!<net-ftp/vsftpd-2.0.3-r1"
+RDEPEND="
+	acct-group/ftp
+	acct-user/ftp"
+
+S=${WORKDIR}
+
+src_install() {
+	# The ftpusers file is a list of people who are NOT allowed
+	# to use the ftp service.
+	insinto /etc
+	doins "${FILESDIR}/ftpusers" || die
+
+	cp "${FILESDIR}/ftp-pamd-include" "${T}" || die
+	if use elibc_FreeBSD; then
+		sed -i -e "/pam_listfile.so/s/^.*$/account  required  pam_ftpusers.so no_warn disallow/" \
+			"${T}"/ftp-pamd-include || die
+	fi
+	newpamd "${T}"/ftp-pamd-include ftp
+}