summaryrefslogtreecommitdiff
path: root/net-ftp
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2020-09-30 17:27:54 +0100
committerV3n3RiX <venerix@redcorelinux.org>2020-09-30 17:27:54 +0100
commitf70a1bfc721336d4fc7dfb711c2f518a6b18cf16 (patch)
treee907cb121b30e3c1df1710719c0ddf4029597a47 /net-ftp
parentdb063b515939ab15261136b24e4bc44386335c0c (diff)
gentoo resync : 30.09.2020
Diffstat (limited to 'net-ftp')
-rw-r--r--net-ftp/Manifest.gzbin3682 -> 3676 bytes
-rw-r--r--net-ftp/tftp-hpa/Manifest2
-rw-r--r--net-ftp/tftp-hpa/tftp-hpa-5.2-r2.ebuild6
-rw-r--r--net-ftp/uftpd/Manifest2
-rw-r--r--net-ftp/uftpd/uftpd-2.13.ebuild24
5 files changed, 24 insertions, 10 deletions
diff --git a/net-ftp/Manifest.gz b/net-ftp/Manifest.gz
index a284ee7c7bc7..0a40e07381c7 100644
--- a/net-ftp/Manifest.gz
+++ b/net-ftp/Manifest.gz
Binary files differ
diff --git a/net-ftp/tftp-hpa/Manifest b/net-ftp/tftp-hpa/Manifest
index 77baa1f22f4a..db68a420209c 100644
--- a/net-ftp/tftp-hpa/Manifest
+++ b/net-ftp/tftp-hpa/Manifest
@@ -6,5 +6,5 @@ AUX tftp.socket 112 BLAKE2B 11e8c6e77819ba772b709843af11449e768db16fe866dc67e420
AUX tftp.xinetd 219 BLAKE2B d348f13fdfa749b10ec765d5cd90a65a46d266a132dde47dad00fbd1ef4046c250cd9246e7b1fe9590e974a2bc7fcc817535fd2e9447a10c5286f7c4148eec93 SHA512 26883a4feffe8f66fe2c21c05892beeb93fa4511ca5ce18e92273badd4b93afefb0d9cef48e07503037ca37b2ff0cdb24d35e5c24d2e32d8027a5e74c49426f5
DIST tftp-hpa-5.2.tar.xz 89564 BLAKE2B 45917ca3d710f8a4b584dbe1e9a912e06fd181e4ffcfd8fba13008f08dbbce0fe339b61fb6f97236b8012e755025d05700214e365adac81dfce42b0edd636e80 SHA512 a5198e923a6e58281f749dc77b3f3ed8579e56b6f0fd6a17482cc88bdc8d34b6702c7c709717885b9b937ecae459d9a832328a49a2e3536dc7432cdb39d2a394
EBUILD tftp-hpa-5.2-r1.ebuild 1359 BLAKE2B 8d23615339df9e236c357bc31ec30787fb41910abc4806e4bdb411aec60c2294d357e9a3fa580eec8c3708046eab84eac507b2327ed71bc11f59bddd73e69236 SHA512 7ab446cc7bef3cd7a6826e85e0967a32d2819537c48146412aa9b54562ff0bda3c6a3e63706ffc1836a6c89611263b1e4ab5749204cc00178f467b802fac1b52
-EBUILD tftp-hpa-5.2-r2.ebuild 1619 BLAKE2B 3b6709d1c7ec574a4815a5f587063488b5a1b4f274ea7e9a9204549e89366510d7061011ee17f89eeecbad15d55dfdade8dcd122f5e40b017597acd17e4c208c SHA512 560062a79372b0ad40ca5fab781e0947fef99e884a719d4d932a31509b087911871e8b2d16de8cd5a6f2e2d2afe9a8200a37c5ca93a7fa211fa180987ead7348
+EBUILD tftp-hpa-5.2-r2.ebuild 1623 BLAKE2B 6e10533dab6e9ae828a32a3a510d9e7988f8d6d46ee95e4d0d2e2a1dd1c25843b93c581efd65bcda92a9bce014cf1d2fecb1e10ef5f92603d8cc6ff1be1c78cb SHA512 9d7ffca2a535b93bf827c5b55f29acd3de0d51f03d9f79a0a84e7c43b71723f7391dfbf08d06a78ca7bdee26309addcfc128e1f89de9f4c4c5f08e559272536c
MISC metadata.xml 394 BLAKE2B 87202528ec85f2d4931e861cbb0ee6a69653502c2ab33ae5def46e32786cff1fa90b5102546254a03f71c84c970757591da6f883e49f63580ccca837f8c5181e SHA512 0a866135a65f2c41c97a5991a4f041989a5c9b13c74cf327a3a6ec66d1589da64f31f2d8ec2f3848ecd32faebb790092a39a33f1806335b2f267e41501209321
diff --git a/net-ftp/tftp-hpa/tftp-hpa-5.2-r2.ebuild b/net-ftp/tftp-hpa/tftp-hpa-5.2-r2.ebuild
index 3381ec42a76b..b242ee021199 100644
--- a/net-ftp/tftp-hpa/tftp-hpa-5.2-r2.ebuild
+++ b/net-ftp/tftp-hpa/tftp-hpa-5.2-r2.ebuild
@@ -22,8 +22,10 @@ DEPEND="
RDEPEND="${DEPEND}
selinux? ( sec-policy/selinux-tftp )
!net-ftp/atftp
- !net-ftp/uftpd
- server? ( !net-misc/iputils[tftpd(+)] )
+ server? (
+ !net-misc/iputils[tftpd(+)]
+ !net-ftp/uftpd
+ )
"
PATCHES=(
diff --git a/net-ftp/uftpd/Manifest b/net-ftp/uftpd/Manifest
index 5b1f2bb2bc13..a465396fb869 100644
--- a/net-ftp/uftpd/Manifest
+++ b/net-ftp/uftpd/Manifest
@@ -1,3 +1,3 @@
DIST uftpd-2.13.tar.xz 101128 BLAKE2B 2a948b993ed827b0bb53433c6dd9b49a7ddeb4d0b0a8e1e0061d417c9082094ab17e6116244af625de5ee2cbec4570eaa15ab0a68db95a959b471caade2b7aa2 SHA512 91152129ce1deb4db8e929aa75ffa88d69fe2d0ee1fd90242d1ecf02ee31a64bd3389d7d6699f9dab957d86389db87ecd9bc16dd37d0f8d0684007b43aa8a05c
-EBUILD uftpd-2.13.ebuild 454 BLAKE2B c72336d1ad331c59c67f40167cb966dc9d9ffe4bf51b58bc567c0ae775c650df75b55cc6926744515f73918422c0489bd7b7c32180a2e951472d587c80bcecd7 SHA512 bc3c6f1b80b80e975f659ea52514c3485f1103d1ebdea2e868ba88e7f6388643072985bf96eb06e92abd9003fe48fe90668df8b61c8f87d7ce5692fb6edebc3c
+EBUILD uftpd-2.13.ebuild 682 BLAKE2B 258f20398d63700df6c5dc1d25bd41df4de752f0252414a79707ae59c5dcb4ea48b7d51e437b5de62649e8212964a9717677e182cfd1a27a5fbfde22bd8f4da5 SHA512 1ab3852309f42125a7187982ea90398582db2ef6f9381f8e82cd313b2c4f65657ce6648ba21f54608742ade2dc4f92e645c4d8dd375256d0ac03781099ea217f
MISC metadata.xml 919 BLAKE2B b8bb2ddc64dc727547cf908e62df335d5cdf71132a2292e14a7e995d48364de64adde5d0035af3ddbdbdd8b64640b929cd3de0cdd62f49e2480154b1e5d543e4 SHA512 fec60605c1a67eee40734f15395129e76cfd0d0fbde24e977a61973e960704cd5be83e68094d45b0b2ce9b688c5d27cf41c4fb540094b7be532e1563ab622d31
diff --git a/net-ftp/uftpd/uftpd-2.13.ebuild b/net-ftp/uftpd/uftpd-2.13.ebuild
index fc8503685308..f6666d43c1ee 100644
--- a/net-ftp/uftpd/uftpd-2.13.ebuild
+++ b/net-ftp/uftpd/uftpd-2.13.ebuild
@@ -9,14 +9,26 @@ SRC_URI="https://github.com/troglobit/${PN}/releases/download/v${PV}/${P}.tar.xz
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
+KEYWORDS="~amd64"
+IUSE="test"
+RESTRICT="!test? ( test )"
-DEPEND="
+RDEPEND="
>=dev-libs/libite-1.5
>=dev-libs/libuev-2.2"
-RDEPEND="
- ${DEPEND}
+DEPEND="
+ ${RDEPEND}
!net-misc/uftp
- !net-ftp/atftp"
+ !net-ftp/atftp
+ !net-ftp/tftp-hpa[server(+)]
+ test? (
+ net-ftp/ftp
+ net-ftp/tnftp
+ >=net-ftp/tftp-hpa-5.2-r2[client]
+ )"
+
+src_test() {
+ # can't run the tests in parallel since the order matters
+ emake -j 1 check
+}