commit: b31081eeb6c2b2ea7d22f79ff10710dab6400a0c
Author: Tobias Klausmann <klausman <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 16 12:46:28 2020 +0000
Commit: Tobias Klausmann <klausman <AT> gentoo <DOT> org>
CommitDate: Sun Feb 16 12:46:28 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b31081ee
net-ftp/atftp: Clean up deps and remove old
This drops the superfluous netkit-tftp blocker, removes unnecessary +x
bit on the init script and removes the old version 0.7-r6.
Package-Manager: Portage-2.3.87, Repoman-2.3.20
Signed-off-by: Tobias Klausmann <klausman <AT> gentoo.org>
net-ftp/atftp/Manifest | 1 -
net-ftp/atftp/atftp-0.7-r5.ebuild | 73 ----------------------
.../{atftp-0.7.2.ebuild => atftp-0.7.2-r1.ebuild} | 3 +-
net-ftp/atftp/files/atftp.init | 0
4 files changed, 1 insertion(+), 76 deletions(-)
diff --git a/net-ftp/atftp/Manifest b/net-ftp/atftp/Manifest
index 0b5c7deb106..37c22b68977 100644
--- a/net-ftp/atftp/Manifest
+++ b/net-ftp/atftp/Manifest
@@ -1,4 +1,3 @@
DIST atftp-0.7.2.tar.gz 248038 BLAKE2B
3ca44624bf989009c2ebd0ae97927b0784e3c617a79a1bd00212a72a185302cf84f51c8bcda2012981d67cfed4d241b70f8719e78155207608f07a2227e6c437
SHA512
d602bb69451175a36e619abcff412ab1f6d0e7baf8c3f9a2b32081530fbc5816157404b80d42a8b6caa89cc83675b5cbeefcd57a5d98b8f5b43c6254b20ef28b
DIST atftp-0.7.dfsg.tar.gz 187992 BLAKE2B
8196c333ea8042879196ca9f9c656b4d60a332ed1d64a5738870e1d4fd5f108716da6769bf52759626ad3efce11946b5d6285ac9fbe46cb63e6e2d051fc7aeb3
SHA512
40d231c0bc0478fedb3eff9b4c540c62dd9bd6c40d9738e2db1813797a5d48e201720d43a48970ce250f1bb5b15460bb9b3d631c06f96c1a74775ecfb6d13f82
-DIST atftp-0.7.tar.gz 202234 BLAKE2B
65ff486b6ef2b42b2a4737f121c2c36e8ff73838f3c10592c11020acdf2afdf0883fda8b39613e1cc35b47141fd29543a7ef2c3e2ead857033ad4f7181c91d04
SHA512
81c51b613a640f7db4d26da0fb891bda345d11d3f39e0af37f393d2abf619094c1de83f92f04ac75367f546cc70e37d7d47c1535c241c941036fd4df7863a440
DIST atftp_0.7-11.diff.gz 26055 BLAKE2B
c9be58836b5a7e3943dd28dd4661abab5e86b1941c9a2b58786eebe702ab515cf1bc08bf44c8ab4157584a437e861e24eb0c833c1fa1bc774f7f8a2134b6cd27
SHA512
28747f8f3ef2fc3b122361f682fe26ba93acf09b190f61efb3cfcbb6bdeef78cfe1348aeaf1699003a7e02586579be670d85b65baad1b1165a4bec9a9279adb5
diff --git a/net-ftp/atftp/atftp-0.7-r5.ebuild
b/net-ftp/atftp/atftp-0.7-r5.ebuild
deleted file mode 100644
index c72eba363ad..00000000000
--- a/net-ftp/atftp/atftp-0.7-r5.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools flag-o-matic systemd
-
-DEBIAN_PV="11"
-DEBIAN_A="${PN}_${PV}-${DEBIAN_PV}.diff"
-
-DESCRIPTION="Advanced TFTP implementation client/server"
-HOMEPAGE="ftp://ftp.mamalinux.com/pub/atftp/";
-SRC_URI="ftp://ftp.mamalinux.com/pub/atftp/${P}.tar.gz
- mirror://debian/pool/main/a/${PN}/${DEBIAN_A}.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm ppc ppc64 ~s390 sparc x86"
-IUSE="selinux tcpd readline pcre"
-
-DEPEND="tcpd? ( sys-apps/tcp-wrappers )
- readline? ( sys-libs/readline:0= )
- pcre? ( dev-libs/libpcre )"
-RDEPEND="${DEPEND}
- !net-ftp/netkit-tftp
- !net-ftp/tftp-hpa
- !net-ftp/uftpd
- selinux? ( sec-policy/selinux-tftp )"
-
-PATCHES=(
- "${WORKDIR}/${DEBIAN_A}"
- "${FILESDIR}/${P}-pcre.patch"
- "${FILESDIR}/${P}-password.patch"
- "${FILESDIR}/${P}-tests.patch"
- "${FILESDIR}/${P}-glibc24.patch"
- "${FILESDIR}/${P}-blockno.patch"
- "${FILESDIR}/${P}-spaced_filename.patch"
- "${FILESDIR}/${P}-illreply.patch"
- "${FILESDIR}/${P}-CFLAGS.patch"
-)
-
-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/atftp-0.7.2.ebuild
b/net-ftp/atftp/atftp-0.7.2-r1.ebuild
similarity index 96%
rename from net-ftp/atftp/atftp-0.7.2.ebuild
rename to net-ftp/atftp/atftp-0.7.2-r1.ebuild
index 7f0d4df1b2b..5a2c3723d44 100644
--- a/net-ftp/atftp/atftp-0.7.2.ebuild
+++ b/net-ftp/atftp/atftp-0.7.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019 Gentoo Authors
+# Copyright 2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -17,7 +17,6 @@ DEPEND="tcpd? ( sys-apps/tcp-wrappers )
readline? ( sys-libs/readline:0= )
pcre? ( dev-libs/libpcre )"
RDEPEND="${DEPEND}
- !net-ftp/netkit-tftp
!net-ftp/tftp-hpa
!net-ftp/uftpd
selinux? ( sec-policy/selinux-tftp )"
diff --git a/net-ftp/atftp/files/atftp.init b/net-ftp/atftp/files/atftp.init
old mode 100755
new mode 100644
