7 files changed, 79 insertions, 7 deletions
diff --git a/net-ftp/Manifest.gz b/net-ftp/Manifest.gz
index 16e24ebf8f33..6af7fa8ae61e 100644
--- a/net-ftp/Manifest.gz
+++ b/net-ftp/Manifest.gz
diff --git a/net-ftp/ncftp/Manifest b/net-ftp/ncftp/Manifest
index e71b68b2f700..9e47ae20d3ee 100644
--- a/net-ftp/ncftp/Manifest
+++ b/net-ftp/ncftp/Manifest
@@ -1,4 +1,4 @@
 AUX ncftp-3.2.6-fno-common.patch 1818 BLAKE2B 620e3fbc7e297d3186fe9eef8855e2a663a5abcd680269101d5547ab9f6b9addcfe6040ba35e16e8e540784796e34304a9377b1149f7ac00fe0859627a141200 SHA512 c6bf0cc4324583d9aae3f3a57c900437a78d30138d0b9da06fea66cd5fbf57a79ea420afe33536a5bbcf2ace61aaca30ea04155df638daeae125ed9ca90b1c25
 DIST ncftp-3.2.6-src.tar.xz 420564 BLAKE2B ce6d8d2bf06761f884e9edfe6d0bb0230f5d515078a787c4e6faf7716b760166acdd0accf3de1e1f5f3d892c8c86348cdbbefeac6be05e6806011a3e8f4c9b02 SHA512 8e6091ce2ea1eb463edea322d1b5dde813475fd22096d67f0bfd2f5101ae09747ff25d38816d0b9b1077e6a5a256078361691f816aa2eefa38638aa523b4b382
 EBUILD ncftp-3.2.6-r4.ebuild 1137 BLAKE2B 122bbe66f3611d353bd9f0d3786953f55a1a7be641d746f121fbf6cb8c8da0f9e7ffb5c10aa46547f85ea61e1d50a4c83bc082b2c3dca1769ae1f4253ad36a33 SHA512 a744fd7ac84b8e5cdbaf10cca9955ed19c52318cb1c4cf22bc38476cb06b22098b47e68868c3d53edc66313460398bcbdd65eab1d4abdf230443f9a535a805c2
-MISC metadata.xml 901 BLAKE2B fe2e37f11f7dc951509759b8f2954b99db7296843928ad0cd5efafaa84e0e284cef9fbb584ec272b0938b3baaf84cd2702cab8c3ae4287aa5d1fe2efad57a811 SHA512 d5617d76fcda26a6ad44b5869102fca50793d59518f8095bcaf390269eb2a99448bcea37dbed0f58458f6a47958d3a2f926509347f70efee48b071c58d89a758
+MISC metadata.xml 747 BLAKE2B eb28ac0c7249544d1519dc534092dc0f8575c3f68cd24d9dc1654e0d9ffaabf8359fd64ee7ec321878b31e4e65a1c3767528a9f91301809e07f187867f52f09a SHA512 2d672c6901cf721df89f79f420f61ad709d3570fa0d762cae4becbb7f2426abf7a2812d9899fdee75daab20aab80fa80f796295dd3bbae588fe4eac93204b1f7
diff --git a/net-ftp/ncftp/metadata.xml b/net-ftp/ncftp/metadata.xml
index 454915700044..234eba7af6c8 100644
--- a/net-ftp/ncftp/metadata.xml
+++ b/net-ftp/ncftp/metadata.xml
@@ -1,14 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person" proxied="yes">
-		<email>ceamac.paragon@gmail.com</email>
+	<maintainer type="person">
+		<email>ceamac@gentoo.org</email>
 		<name>Viorel Munteanu</name>
 	</maintainer>
-	<maintainer type="project" proxied="proxy">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
 	<longdescription>
 NcFTP Client (also known as just NcFTP) is a set of FREE application 
 programs implementing the File Transfer Protocol (FTP).
diff --git a/net-ftp/uftpd/Manifest b/net-ftp/uftpd/Manifest
index f31794228d03..679c6784f7ee 100644
--- a/net-ftp/uftpd/Manifest
+++ b/net-ftp/uftpd/Manifest
@@ -1,3 +1,6 @@
+AUX uftpd.confd 112 BLAKE2B b51a61fcbc5c4951e28fe9290c0cdb49c4aa11e6f7396a4ea2d93584dcf0db62d656e19bce5a2ee523cf3c414a9b77bba795979feb05c7c9d191be88de919cff SHA512 7afd4d693fc2cab75be367158f85f14fb794caa5e876f96102748c453455510cddf08aa81d66f7001c4f4ce0721f81e6e42e69165084a58869084cecb0dd8c2e
+AUX uftpd.init 418 BLAKE2B bbe66fe4a90e923cdd152034ed03015f7eb49cd130fda556298ac11e06371030f6b07cdcbde06f6a37b76616fea02744b4ca43b0a767aa91c334824ae76028d5 SHA512 b10267b29c380044ca787a5f0297a7d40a4142bfcd9be41b6bf7d7ddf279c314c7ddb892adbec55f2dd402abd97e05f1d95c786db9ef8b5cb66ef832f51a3f39
 DIST uftpd-2.15.tar.xz 102820 BLAKE2B 19f80fb1cfa1194a154950c885cd26bf216014b3abae42d164e2c080dc7bf9c3810409bc989eec2a1ce559f0935415458cbd19abbd52dbf3816538d9463b754e SHA512 eaa867b6fe9b86786c8aec47224bda6aef5120845b67fa786c1663ec0b8437e5a0099fab8753db47feb9ab3a93de2d6519dba9dfb3d6ebefc8c4482113df45c1
+EBUILD uftpd-2.15-r1.ebuild 828 BLAKE2B 3590d5e75aec18d6e3fddb472a214d79f6ce3bd45c69d51ce71e6f21c5c9a16f1e752c7929b0e3bc1178336d3eb98a38727277459e08105887753b88adb1c25c SHA512 5d7dc6acac25bce45094ed1f6e89db89b619a1165b539a9460f5b06ae66dbe3c64de6dab7c98075c9467486c89e7c247c571be058454b093fe5887fc428d4b41
 EBUILD uftpd-2.15.ebuild 689 BLAKE2B 1132e912c778b92803cbcbf1f147d4ced5e535227fb0285dd655f937c4613e7843074310fc0ad347529740c0c4ca461fb685f71bffd844b0491a25bb445cb265 SHA512 12f03f887548694dd40584d51d741c1ce7816070a07afa2aae393209a8ee3e13eded5e3dd955e597d7418792c42a157e4c4a56401b8c56ae4de08c7b9c1e7815
 MISC metadata.xml 950 BLAKE2B 5da7bb19224f7a2386728b9a90e42dfda8ee90fc96c0dc012502143bfe8f6ad5003d3167aa20b6b7daa6ed42a7ed13a070a9e8a4cdb18d4edc4e65dda5a097b8 SHA512 7323f067065158453afaf690bac53dbe4046985fe1a10c6baa2a57f2c301918028579b0c6c31a7d127bbc4e24f3e6bb9dfcdbd1b87a525cb7cc284d5bef9dea3
diff --git a/net-ftp/uftpd/files/uftpd.confd b/net-ftp/uftpd/files/uftpd.confd
new file mode 100644
index 000000000000..356ad42f59aa
--- /dev/null
+++ b/net-ftp/uftpd/files/uftpd.confd
@@ -0,0 +1,5 @@
+# Config file for uftpd server
+
+# make sure you create the root directory
+UFTPD_ROOT="/uftpdroot"
+UFTDP_OPTS=""
diff --git a/net-ftp/uftpd/files/uftpd.init b/net-ftp/uftpd/files/uftpd.init
new file mode 100644
index 000000000000..8a2c7c659a49
--- /dev/null
+++ b/net-ftp/uftpd/files/uftpd.init
@@ -0,0 +1,27 @@
+#!/sbin/openrc-run
+
+depend() {
+	use logger
+	need net
+}
+
+checkconfig() {
+	if [ ! -d ${UFTPD_ROOT} ]
+	then
+		eerror "You need a UFTPD root directory"
+		return 1
+	fi
+}
+
+start() {
+	checkconfig || return 1
+	ebegin "Starting uftpd"
+	start-stop-daemon --start --exec /usr/sbin/uftpd ${UFTPD_ROOT} ${UFTPD_OPTS}
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping uftpd"
+	start-stop-daemon --stop --quiet --exec /usr/sbin/uftpd
+	eend $?
+}
diff --git a/net-ftp/uftpd/uftpd-2.15-r1.ebuild b/net-ftp/uftpd/uftpd-2.15-r1.ebuild
new file mode 100644
index 000000000000..d936b50b56a2
--- /dev/null
+++ b/net-ftp/uftpd/uftpd-2.15-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="The no nonsense TFTP/FTP server"
+HOMEPAGE="https://github.com/troglobit/uftpd"
+SRC_URI="https://github.com/troglobit/${PN}/releases/download/v${PV}/${P}.tar.xz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	>=dev-libs/libite-1.5
+	>=dev-libs/libuev-2.2"
+RDEPEND="
+	${DEPEND}
+	!net-misc/uftp
+	!net-ftp/atftp
+	!net-ftp/tftp-hpa[server(+)]"
+BDEPEND="
+	virtual/pkgconfig
+	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
+}
+
+src_install() {
+	default
+	newinitd "${FILESDIR}"/uftpd.init uftpd
+	newconfd "${FILESDIR}"/uftpd.confd uftpd
+}