5 files changed, 102 insertions, 0 deletions
diff --git a/net-ftp/Manifest.gz b/net-ftp/Manifest.gz
index c78d50ed5844..06b3a8e47748 100644
--- a/net-ftp/Manifest.gz
+++ b/net-ftp/Manifest.gz
diff --git a/net-ftp/atftp/Manifest b/net-ftp/atftp/Manifest
index a6c95f4d1a73..8a632ca2eba4 100644
--- a/net-ftp/atftp/Manifest
+++ b/net-ftp/atftp/Manifest
@@ -1,8 +1,12 @@
 AUX atftp-0.7.5-CFLAGS.patch 637 BLAKE2B c73bc1edf2ca1206da54c2c3b6881bc011c45dd69af5715723c1ec62ded7376bab032c842c63714cbd06c9f8513a69bd3c32f3dad65ea8b23d7c1dfcb424524f SHA512 eb6a30659da36033ce52ceb9de6609044def40260cd1c98746463f3b3852c62e650f90fa3258854342bb40d26e7ec1aeec49373af3420ff8fe9fdca69cd586a7
+AUX atftp-0.8.0-test-sh-declare-local.patch 683 BLAKE2B 86f37e33b7c9c8e49891b95abe1d3eba12fbe1e74973b337488848928184e14a080c00b8ea22f98febf23e1dd9b2185cb759cfdbfd31111a04da83d641ec93c5 SHA512 5bdf3902fef2b07a2c7fc57d059e1b458d1ce79eecd201fde8899e5c332e29949de73cb377b3c8dfdb40d3a9c76c496e2288ba616080eeda06a8408cd0ae32f4
+AUX atftp-fix-test.patch 681 BLAKE2B de8dcb599dde9360b4121f6190c600691911268a02c86d5d138ecbacf025e49762437b0c3cc9ed91034a76b0faccbb93786f831d0f302ad45bf305db5a9dec67 SHA512 829032d7ac04895df63f1f6e9e3e182acab25dd12836d6d38d6a66f421fe0b4cde331657258602ec1dc7f32796e57666171d5335e3b807b8732befc6f76364da
 AUX atftp.confd 105 BLAKE2B 6672479bce2240d4c34c70853227a769fa45c06e4b5c04f7d5aebdbceb0987316a9ec906182cacf5337fce5190aeac3bfc4cda0be72b8d48e99a5b2cbc2eca0e SHA512 cdbd63df16c2cee7491209de8ec44e05e10beccc6286cf7cb1c5dc7731c616d41bc94ce4d6c020b4ac8bb77b27956e9ee36d9b5703dcd3477e8b14927d154b91
 AUX atftp.init 438 BLAKE2B 1783431801dbf04353bde6c3766c7d0acdd06b8ec853c8fba5cf1bbfe6c7020b55305f44992e3921a63654f290a28c28373dd94f925188c72105c8a3dd047dca SHA512 b64f78658d2da17a4fe4237835c0a6a0cc59d0b7278e8f6f49673ffd8a97a9473e4773b43bcc70d312043ee4324d8105c50f0cfcf6055c0755ce598c9d7e5a23
 AUX atftp.service 233 BLAKE2B 4c9a1a8041ffc4cdf71a24800494f340121beb9bde9760fa090b9e515ef0b2aa7dd73173543c75fde465dbf9cc229b04acc9e72c296fa27cace2063128de06c6 SHA512 533372c4863e39d6139ddc491c2b2b2051f1094a90d9854879f28bae7975c8dc997696318794cd1136f9cc542a8f418ad8361b87dd6b3455445d8528d2cc993a
 AUX atftp.service.conf 45 BLAKE2B dd52bd3ef0d72f28d2e317282026d354b6023f8b51634d0374623c782afacae1284f5385967dfa91026553845f9283be59b4c7d96031da85261067b7be6544f7 SHA512 661befb6873eee6c0ed25fd5cb156e3d7c4ef801d2f58cda8df0f0c5fd851c7eb28089a9399529164c61505963e9d10143df2195d57ff66f85ad0e2750fbbd57
 DIST atftp-0.7.5.tar.gz 253626 BLAKE2B aa0a0311d29fd52b77f8ae021407221f815a39fe85cabac36ee18dce8918a5b0accda455e2df5fecf34f09e93e583bfbc86162b60a7237bd6d34b0c658ec2970 SHA512 457101136e59f7a1657ce591e9ea678ab9091a59219d41b6c522fad4a3555c5cbcb8c9e0c3267fd871940d99b5f8673ab4ce5ec9737dee52f017e5c80a4e59d7
+DIST atftp-0.8.0.tar.gz 133417 BLAKE2B 6c0ec29c78f345f24adb65fd162e4572bd5b91e067c8db1ff6600ed2ea9a8461693bb6635c2edf09c77693dc6227689406a97b1d6e86a742ffbe3849ab9d3ee3 SHA512 b700b3e4182970fb494ffabd49e39d3622b1aff5f69882549eff0b52a01c8c47babe51b451c4829f9b833ea2ea7c590a2f3819f8e3508176fa7d1b5c0e152b68
 EBUILD atftp-0.7.5.ebuild 1452 BLAKE2B adde7d73031fbfa0bdddd4755b8bc0835eba3c2fadfb41c8e7bc127f625576241652c6924c501a40cbffb5ca9d13c0c365d72e81cebebc729a8f4c6cacef06e4 SHA512 b547a622c18051067effa2ef59d10c0982efb1deeea00cbdf6303b5d8cc757cc61739360fcca22134a59ca245e9e471b35c8f8c01e7ec0f6ff7bc8207d024419
+EBUILD atftp-0.8.0.ebuild 1567 BLAKE2B 4575159bdb3980406419eff6dfcf638f524a052af756d80602428d0575348994b6561806a7b42b166627ade62a829c1d31d5266d8e62389c602546902b96d04b SHA512 4f97d78c5695f8dbbc7a6600730358fd5eb6e08e0ce7f22a13de231b48a38e01535190db1819154399fbc6fea14c2c27c9f005a117ab1a4fd16adb9f594c8b7a
 MISC metadata.xml 369 BLAKE2B bda58276c6f791d7acca2ad53faa8411be0fecf3f63966d7c940926b4bf66c9e6bc1657d3b3bcd2a43fc83bcb3d767aa558a373682d7236d9ce68a9020e22e6f SHA512 d12e08830646352971bf624cfeda13895436eb6e35cd751fa043edc3909574e3dcd62b3afe578c9f3e94d3ec68541dafc48ee71db631d4b458e7fea0cbb84607
diff --git a/net-ftp/atftp/atftp-0.8.0.ebuild b/net-ftp/atftp/atftp-0.8.0.ebuild
new file mode 100644
index 000000000000..aab4115beae9
--- /dev/null
+++ b/net-ftp/atftp/atftp-0.8.0.ebuild
@@ -0,0 +1,63 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools flag-o-matic systemd
+
+DESCRIPTION="Advanced TFTP implementation client/server"
+HOMEPAGE="https://sourceforge.net/projects/atftp/"
+SRC_URI="mirror://sourceforge/atftp/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="selinux tcpd readline pcre"
+
+DEPEND="tcpd? ( sys-apps/tcp-wrappers )
+	readline? ( sys-libs/readline:0= )
+	pcre? ( dev-libs/libpcre2:= )"
+RDEPEND="${DEPEND}
+	!net-ftp/tftp-hpa
+	!net-ftp/uftpd
+	selinux? ( sec-policy/selinux-tftp )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.7.5-CFLAGS.patch"
+	"${FILESDIR}/${PN}-0.8.0-test-sh-declare-local.patch" # https://sourceforge.net/p/atftp/bugs/12/
+	"${FILESDIR}/${PN}-fix-test.patch" # https://sourceforge.net/p/atftp/bugs/11/
+)
+
+src_prepare() {
+	append-cppflags -D_REENTRANT -DRATE_CONTROL
+	# fix #561720 by restoring pre-GCC5 inline semantics
+	append-cflags -std=gnu89
+
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable tcpd libwrap) \
+		$(use_enable readline libreadline) \
+		$(use_enable pcre libpcre) \
+		--enable-mtftp
+}
+
+src_install() {
+	default
+
+	newinitd "${FILESDIR}"/atftp.init atftp
+	newconfd "${FILESDIR}"/atftp.confd atftp
+
+	systemd_dounit "${FILESDIR}"/atftp.service
+	systemd_install_serviced "${FILESDIR}"/atftp.service.conf
+
+	dodoc README* BUGS FAQ Changelog INSTALL TODO
+	dodoc "${S}"/docs/*
+
+	docinto test
+	cd "${S}"/test || die
+	dodoc load.sh mtftp.conf pcre_pattern.txt test.sh test_suite.txt
+}
diff --git a/net-ftp/atftp/files/atftp-0.8.0-test-sh-declare-local.patch b/net-ftp/atftp/files/atftp-0.8.0-test-sh-declare-local.patch
new file mode 100644
index 000000000000..de63fc03a626
--- /dev/null
+++ b/net-ftp/atftp/files/atftp-0.8.0-test-sh-declare-local.patch
@@ -0,0 +1,18 @@
+From a718243fe78fe9002b4145a158e02801e907399b Mon Sep 17 00:00:00 2001
+From: Florian Schmaus <flo@geekplace.eu>
+Date: Sun, 2 Oct 2022 19:47:47 +0200
+Subject: [PATCH 1/2] Declare variable D as local in stop_and_clean
+
+This also fixes tests in Gentoo, where src_test() has already declare
+a variable D, containing the path of the temporary install
+directory (aka. DESTDIR).
+--- a/test/test.sh
++++ b/test/test.sh
+@@ -576,6 +576,7 @@ stop_and_clean(){
+     ## +3 is for "Test tsize option ..." and "Test PCRE mapped download ... "
+     ## +2 for diskspace tests:
+     local M=$(grep "/tmp/" "$TDIR"/multicast*.log | wc -l)
++    local D
+     $INTERACTIVE && D=2
+     cat <<EOF
+ Expected:
diff --git a/net-ftp/atftp/files/atftp-fix-test.patch b/net-ftp/atftp/files/atftp-fix-test.patch
new file mode 100644
index 000000000000..1b2eba57c49f
--- /dev/null
+++ b/net-ftp/atftp/files/atftp-fix-test.patch
@@ -0,0 +1,17 @@
+From f7ccbf188cd682f7210a2253187e460f0fe5d647 Mon Sep 17 00:00:00 2001
+From: Martin Dummer <martin.dummer@gmx.net>
+Date: Sun, 2 Oct 2022 19:49:44 +0200
+Subject: [PATCH 2/2] test.sh: redirect stderr to /dev/null when counting lines
+
+To avoid counting stderr lines, redirect the output to /dev/null.
+--- a/test/test.sh
++++ b/test/test.sh
+@@ -575,7 +575,7 @@ stop_and_clean(){
+     echo
+     ## +3 is for "Test tsize option ..." and "Test PCRE mapped download ... "
+     ## +2 for diskspace tests:
+-    local M=$(grep "/tmp/" "$TDIR"/multicast*.log | wc -l)
++    local M=$(grep "/tmp/" "$TDIR"/multicast*.log 2> /dev/null | wc -l)
+     local D
+     $INTERACTIVE && D=2
+     cat <<EOF