[gentoo-commits] repo/gentoo:master commit in: net-ftp/tftp-hpa/
commit: a9d65c5dad33dc18990195d3f388f787c70ab24b
Author: Tim Harder gentoo org>
AuthorDate: Thu Aug 31 16:48:45 2017 +
Commit: Tim Harder gentoo org>
CommitDate: Thu Aug 31 17:37:29 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a9d65c5d
net-ftp/tftp-hpa: remove old
net-ftp/tftp-hpa/tftp-hpa-5.2.ebuild | 47
1 file changed, 47 deletions(-)
diff --git a/net-ftp/tftp-hpa/tftp-hpa-5.2.ebuild
b/net-ftp/tftp-hpa/tftp-hpa-5.2.ebuild
deleted file mode 100644
index 9ce0f1d2230..000
--- a/net-ftp/tftp-hpa/tftp-hpa-5.2.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit toolchain-funcs
-
-DESCRIPTION="port of the OpenBSD TFTP server"
-HOMEPAGE="https://www.kernel.org/pub/software/network/tftp/";
-SRC_URI="mirror://kernel/software/network/tftp/${PN}/${P}.tar.xz"
-
-LICENSE="BSD-4"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86
~x86-fbsd ~ppc-macos"
-IUSE="ipv6 readline selinux tcpd"
-
-RDEPEND="selinux? ( sec-policy/selinux-tftp )
- readline? ( sys-libs/readline )
- tcpd? ( sys-apps/tcp-wrappers )
- !net-ftp/atftp
- !net-ftp/netkit-tftp"
-DEPEND="${RDEPEND}
- app-arch/xz-utils"
-
-src_prepare() {
- sed -i "/^AR/s:ar:$(tc-getAR):" MCONFIG.in || die
-}
-
-src_configure() {
- econf \
- $(use_with ipv6) \
- $(use_with tcpd tcpwrappers) \
- $(use_with readline)
-}
-
-src_install() {
- emake INSTALLROOT="${D}" install
- dodoc README* CHANGES tftpd/sample.rules
-
- # iputils installs this
- rm "${ED}"/usr/share/man/man8/tftpd.8 || die
-
- newconfd "${FILESDIR}"/in.tftpd.confd-0.44 in.tftpd
- newinitd "${FILESDIR}"/in.tftpd.rc6 in.tftpd
- insinto /etc/xinetd.d
- newins "${FILESDIR}"/tftp.xinetd tftp
-}
[gentoo-commits] repo/gentoo:master commit in: net-ftp/tftp-hpa/
commit: bd2322d1d7187d3adfe318600e1e57ad352e87c9
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Wed Apr 21 19:05:06 2021 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Fri Apr 30 19:01:53 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bd2322d1
net-ftp/tftp-hpa: Drop 5.2-r1, EAPI5--
Closes: https://bugs.gentoo.org/783723
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner gentoo.org>
net-ftp/tftp-hpa/tftp-hpa-5.2-r1.ebuild | 57 -
1 file changed, 57 deletions(-)
diff --git a/net-ftp/tftp-hpa/tftp-hpa-5.2-r1.ebuild
b/net-ftp/tftp-hpa/tftp-hpa-5.2-r1.ebuild
deleted file mode 100644
index b9c900575cf..000
--- a/net-ftp/tftp-hpa/tftp-hpa-5.2-r1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit systemd epatch toolchain-funcs
-
-DESCRIPTION="Port of the OpenBSD TFTP server"
-HOMEPAGE="https://www.kernel.org/pub/software/network/tftp/";
-SRC_URI="https://www.kernel.org/pub/software/network/tftp/${PN}/${P}.tar.xz";
-
-LICENSE="BSD-4"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86
~ppc-macos"
-IUSE="ipv6 readline selinux tcpd"
-
-CDEPEND="
- readline? ( sys-libs/readline:0= )
- tcpd? ( sys-apps/tcp-wrappers )
- !net-ftp/atftp
- !net-ftp/netkit-tftp"
-DEPEND="${CDEPEND}
- app-arch/xz-utils"
-RDEPEND="${CDEPEND}
- selinux? ( sec-policy/selinux-tftp )
-"
-
-src_prepare() {
- epatch "${FILESDIR}"/tftp-hpa-5.2-gcc-10.patch
- epatch_user
-
- sed -i "/^AR/s:ar:$(tc-getAR):" MCONFIG.in || die
-}
-
-src_configure() {
- econf \
- $(use_with ipv6) \
- $(use_with tcpd tcpwrappers) \
- $(use_with readline)
-}
-
-src_install() {
- emake INSTALLROOT="${D}" install
- dodoc README* CHANGES tftpd/sample.rules
-
- # iputils installs this
- rm "${ED}"/usr/share/man/man8/tftpd.8 || die
-
- newconfd "${FILESDIR}"/in.tftpd.confd-0.44 in.tftpd
- newinitd "${FILESDIR}"/in.tftpd.rc6 in.tftpd
-
- systemd_dounit "${FILESDIR}"/tftp.service
- systemd_dounit "${FILESDIR}"/tftp.socket
-
- insinto /etc/xinetd.d
- newins "${FILESDIR}"/tftp.xinetd tftp
-}
[gentoo-commits] repo/gentoo:master commit in: net-ftp/tftp-hpa/
commit: 3d8acecf8a4943b9d1d43aeb8da399a09c716cd7
Author: Sam James gentoo org>
AuthorDate: Sun Apr 3 02:48:30 2022 +
Commit: Sam James gentoo org>
CommitDate: Sun Apr 3 02:48:30 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3d8acecf
net-ftp/tftp-hpa: adapt to iputils tftpd removal
Signed-off-by: Sam James gentoo.org>
net-ftp/tftp-hpa/{tftp-hpa-5.2-r2.ebuild => tftp-hpa-5.2-r3.ebuild} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/net-ftp/tftp-hpa/tftp-hpa-5.2-r2.ebuild
b/net-ftp/tftp-hpa/tftp-hpa-5.2-r3.ebuild
similarity index 95%
rename from net-ftp/tftp-hpa/tftp-hpa-5.2-r2.ebuild
rename to net-ftp/tftp-hpa/tftp-hpa-5.2-r3.ebuild
index 30a1a4c26456..54d062e02d68 100644
--- a/net-ftp/tftp-hpa/tftp-hpa-5.2-r2.ebuild
+++ b/net-ftp/tftp-hpa/tftp-hpa-5.2-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
@@ -23,7 +23,7 @@ RDEPEND="${DEPEND}
selinux? ( sec-policy/selinux-tftp )
!net-ftp/atftp
server? (
- !net-misc/iputils[tftpd(+)]
+ !net-misc/iputils[tftpd(-)]
!net-ftp/uftpd
)
"
[gentoo-commits] repo/gentoo:master commit in: net-ftp/tftp-hpa/
commit: 2d7639ba6234094cc3bb52220e45e7e5a4717ef8
Author: Sam James gentoo org>
AuthorDate: Fri Apr 16 10:13:06 2021 +
Commit: David Seifert gentoo org>
CommitDate: Fri Apr 16 10:13:06 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2d7639ba
net-ftp/tftp-hpa: explicitly inherit epatch
Signed-off-by: Sam James gentoo.org>
Signed-off-by: David Seifert gentoo.org>
net-ftp/tftp-hpa/tftp-hpa-5.2-r1.ebuild | 4 ++--
net-ftp/tftp-hpa/tftp-hpa-5.2-r2.ebuild | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/net-ftp/tftp-hpa/tftp-hpa-5.2-r1.ebuild
b/net-ftp/tftp-hpa/tftp-hpa-5.2-r1.ebuild
index 5f9d6bc5416..b9c900575cf 100644
--- a/net-ftp/tftp-hpa/tftp-hpa-5.2-r1.ebuild
+++ b/net-ftp/tftp-hpa/tftp-hpa-5.2-r1.ebuild
@@ -3,9 +3,9 @@
EAPI="5"
-inherit systemd eutils toolchain-funcs
+inherit systemd epatch toolchain-funcs
-DESCRIPTION="port of the OpenBSD TFTP server"
+DESCRIPTION="Port of the OpenBSD TFTP server"
HOMEPAGE="https://www.kernel.org/pub/software/network/tftp/";
SRC_URI="https://www.kernel.org/pub/software/network/tftp/${PN}/${P}.tar.xz";
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 b242ee02119..3cb6247a321 100644
--- a/net-ftp/tftp-hpa/tftp-hpa-5.2-r2.ebuild
+++ b/net-ftp/tftp-hpa/tftp-hpa-5.2-r2.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
inherit systemd toolchain-funcs
-DESCRIPTION="port of the OpenBSD TFTP server"
+DESCRIPTION="Port of the OpenBSD TFTP server"
HOMEPAGE="https://www.kernel.org/pub/software/network/tftp/";
SRC_URI="https://www.kernel.org/pub/software/network/tftp/${PN}/${P}.tar.xz";
[gentoo-commits] repo/gentoo:master commit in: net-ftp/tftp-hpa/
commit: 51e49c68111e468bc5d6983bd9af6472b3ba42df
Author: Sam James gentoo org>
AuthorDate: Mon Apr 19 04:31:19 2021 +
Commit: Sam James gentoo org>
CommitDate: Mon Apr 19 04:31:19 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=51e49c68
net-ftp/tftp-hpa: Stabilize 5.2-r2 arm64, #783723
Signed-off-by: Sam James gentoo.org>
net-ftp/tftp-hpa/tftp-hpa-5.2-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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 3cb6247a321..d80c8f8b12d 100644
--- a/net-ftp/tftp-hpa/tftp-hpa-5.2-r2.ebuild
+++ b/net-ftp/tftp-hpa/tftp-hpa-5.2-r2.ebuild
@@ -11,7 +11,7 @@
SRC_URI="https://www.kernel.org/pub/software/network/tftp/${PN}/${P}.tar.xz";
LICENSE="BSD-4"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc
~x86 ~ppc-macos"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc
~x86 ~ppc-macos"
IUSE="ipv6 readline selinux tcpd +client +server"
DEPEND="
[gentoo-commits] repo/gentoo:master commit in: net-ftp/tftp-hpa/
commit: 4a913bc40c6333aa9875edb399ef72ea3b0267fb
Author: Sam James gentoo org>
AuthorDate: Mon Apr 19 19:09:01 2021 +
Commit: Sam James gentoo org>
CommitDate: Mon Apr 19 19:12:23 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4a913bc4
net-ftp/tftp-hpa: Stabilize 5.2-r2 arm, #783723
Signed-off-by: Sam James gentoo.org>
net-ftp/tftp-hpa/tftp-hpa-5.2-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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 d80c8f8b12d..5f46c5934cb 100644
--- a/net-ftp/tftp-hpa/tftp-hpa-5.2-r2.ebuild
+++ b/net-ftp/tftp-hpa/tftp-hpa-5.2-r2.ebuild
@@ -11,7 +11,7 @@
SRC_URI="https://www.kernel.org/pub/software/network/tftp/${PN}/${P}.tar.xz";
LICENSE="BSD-4"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc
~x86 ~ppc-macos"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc
~x86 ~ppc-macos"
IUSE="ipv6 readline selinux tcpd +client +server"
DEPEND="
[gentoo-commits] repo/gentoo:master commit in: net-ftp/tftp-hpa/
commit: 0e9e8ebd786b9dff04e0da15d47583f6cbe78097
Author: Rolf Eike Beer sf-mail de>
AuthorDate: Tue Apr 20 13:44:17 2021 +
Commit: Sergei Trofimovich gentoo org>
CommitDate: Tue Apr 20 17:05:41 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0e9e8ebd
net-ftp/tftp-hpa: stable 5.2-r2 for sparc, bug #783723
Package-Manager: Portage-3.0.17, Repoman-3.0.2
RepoMan-Options: --include-arches="sparc"
Signed-off-by: Rolf Eike Beer sf-mail.de>
Signed-off-by: Sergei Trofimovich gentoo.org>
net-ftp/tftp-hpa/tftp-hpa-5.2-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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 5f46c5934cb..78fb72ecb2c 100644
--- a/net-ftp/tftp-hpa/tftp-hpa-5.2-r2.ebuild
+++ b/net-ftp/tftp-hpa/tftp-hpa-5.2-r2.ebuild
@@ -11,7 +11,7 @@
SRC_URI="https://www.kernel.org/pub/software/network/tftp/${PN}/${P}.tar.xz";
LICENSE="BSD-4"
SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc
~x86 ~ppc-macos"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc
~x86 ~ppc-macos"
IUSE="ipv6 readline selinux tcpd +client +server"
DEPEND="
[gentoo-commits] repo/gentoo:master commit in: net-ftp/tftp-hpa/
commit: 75930a2eba735904eaff0a2f035bb3963a56ad9f
Author: Sam James gentoo org>
AuthorDate: Tue Apr 20 23:30:53 2021 +
Commit: Sam James gentoo org>
CommitDate: Tue Apr 20 23:34:44 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=75930a2e
net-ftp/tftp-hpa: Stabilize 5.2-r2 ppc64, #783723
Signed-off-by: Sam James gentoo.org>
net-ftp/tftp-hpa/tftp-hpa-5.2-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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 78fb72ecb2c..fe2e783bb94 100644
--- a/net-ftp/tftp-hpa/tftp-hpa-5.2-r2.ebuild
+++ b/net-ftp/tftp-hpa/tftp-hpa-5.2-r2.ebuild
@@ -11,7 +11,7 @@
SRC_URI="https://www.kernel.org/pub/software/network/tftp/${PN}/${P}.tar.xz";
LICENSE="BSD-4"
SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc
~x86 ~ppc-macos"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 sparc
~x86 ~ppc-macos"
IUSE="ipv6 readline selinux tcpd +client +server"
DEPEND="
[gentoo-commits] repo/gentoo:master commit in: net-ftp/tftp-hpa/
commit: 50acbca18cb32bf777c53b39aa7e0685845900e2
Author: Sam James gentoo org>
AuthorDate: Tue Apr 20 23:31:41 2021 +
Commit: Sam James gentoo org>
CommitDate: Tue Apr 20 23:34:53 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=50acbca1
net-ftp/tftp-hpa: Stabilize 5.2-r2 ppc, #783723
Signed-off-by: Sam James gentoo.org>
net-ftp/tftp-hpa/tftp-hpa-5.2-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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 fe2e783bb94..644056eca39 100644
--- a/net-ftp/tftp-hpa/tftp-hpa-5.2-r2.ebuild
+++ b/net-ftp/tftp-hpa/tftp-hpa-5.2-r2.ebuild
@@ -11,7 +11,7 @@
SRC_URI="https://www.kernel.org/pub/software/network/tftp/${PN}/${P}.tar.xz";
LICENSE="BSD-4"
SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 sparc
~x86 ~ppc-macos"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc ~x86
~ppc-macos"
IUSE="ipv6 readline selinux tcpd +client +server"
DEPEND="
[gentoo-commits] repo/gentoo:master commit in: net-ftp/tftp-hpa/
commit: 73a80f6bac6db6f43261fef113c33ab27162e2e5
Author: Sam James gentoo org>
AuthorDate: Wed Apr 21 18:51:28 2021 +
Commit: Sam James gentoo org>
CommitDate: Wed Apr 21 18:51:28 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=73a80f6b
net-ftp/tftp-hpa: Stabilize 5.2-r2 x86, #783723
Signed-off-by: Sam James gentoo.org>
net-ftp/tftp-hpa/tftp-hpa-5.2-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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 644056eca39..9c6bb0e9b20 100644
--- a/net-ftp/tftp-hpa/tftp-hpa-5.2-r2.ebuild
+++ b/net-ftp/tftp-hpa/tftp-hpa-5.2-r2.ebuild
@@ -11,7 +11,7 @@
SRC_URI="https://www.kernel.org/pub/software/network/tftp/${PN}/${P}.tar.xz";
LICENSE="BSD-4"
SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc ~x86
~ppc-macos"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86
~ppc-macos"
IUSE="ipv6 readline selinux tcpd +client +server"
DEPEND="
[gentoo-commits] repo/gentoo:master commit in: net-ftp/tftp-hpa/
commit: 1e73a5738963f112cffad49b2e2cac4e3a263c4b
Author: Sam James gentoo org>
AuthorDate: Wed Apr 21 18:52:19 2021 +
Commit: Sam James gentoo org>
CommitDate: Wed Apr 21 18:52:19 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e73a573
net-ftp/tftp-hpa: Stabilize 5.2-r2 amd64, #783723
Signed-off-by: Sam James gentoo.org>
net-ftp/tftp-hpa/tftp-hpa-5.2-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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 9c6bb0e9b20..30a1a4c2645 100644
--- a/net-ftp/tftp-hpa/tftp-hpa-5.2-r2.ebuild
+++ b/net-ftp/tftp-hpa/tftp-hpa-5.2-r2.ebuild
@@ -11,7 +11,7 @@
SRC_URI="https://www.kernel.org/pub/software/network/tftp/${PN}/${P}.tar.xz";
LICENSE="BSD-4"
SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86
~ppc-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86
~ppc-macos"
IUSE="ipv6 readline selinux tcpd +client +server"
DEPEND="
[gentoo-commits] repo/gentoo:master commit in: net-ftp/tftp-hpa/
commit: cb6c02fd20c75955c7f9b21b528b3db2b91f75a5
Author: Oz N Tiram gmail com>
AuthorDate: Fri Sep 4 07:37:38 2020 +
Commit: Sam James gentoo org>
CommitDate: Tue Sep 29 20:37:12 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cb6c02fd
net-ftp/tftp-hpa: fix collision with uftpd
tftp-hpa client can still be installed along side with uftpd.
Package-Manager: Portage-3.0.4, Repoman-2.3.23
Signed-off-by: Oz Tiram gmail.com>
Signed-off-by: Sam James gentoo.org>
net-ftp/tftp-hpa/tftp-hpa-5.2-r2.ebuild | 6 --
1 file changed, 4 insertions(+), 2 deletions(-)
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 3381ec42a76..b242ee02119 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=(
[gentoo-commits] repo/gentoo:master commit in: net-ftp/tftp-hpa/
commit: 3c6b2db93a64564c572eceed7ca627b062c2aa5d
Author: Mike Gilbert gentoo org>
AuthorDate: Wed Aug 26 17:49:37 2020 +
Commit: Mike Gilbert gentoo org>
CommitDate: Wed Aug 26 17:49:55 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3c6b2db9
net-ftp/tftp-hpa: several fixes
Fix dependencies.
Add blocker on net-misc/iputils[tftpd].
Apply patches correctly.
Use an array in src_configure.
Prevent automagic dep on libbsd for bsd_signal().
Install man page.
Signed-off-by: Mike Gilbert gentoo.org>
net-ftp/tftp-hpa/tftp-hpa-5.2-r2.ebuild | 28 ++--
1 file changed, 14 insertions(+), 14 deletions(-)
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 239a1184ef6..3381ec42a76 100644
--- a/net-ftp/tftp-hpa/tftp-hpa-5.2-r2.ebuild
+++ b/net-ftp/tftp-hpa/tftp-hpa-5.2-r2.ebuild
@@ -14,33 +14,35 @@ SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc
~x86 ~ppc-macos"
IUSE="ipv6 readline selinux tcpd +client +server"
-CDEPEND="
+DEPEND="
readline? ( sys-libs/readline:0= )
tcpd? ( sys-apps/tcp-wrappers )
- "
+"
-DEPEND="${CDEPEND}
- app-arch/xz-utils
+RDEPEND="${DEPEND}
+ selinux? ( sec-policy/selinux-tftp )
!net-ftp/atftp
- !net-ftp/uftpd"
-
-RDEPEND="${CDEPEND}
- selinux? ( sec-policy/selinux-tftp )"
+ !net-ftp/uftpd
+ server? ( !net-misc/iputils[tftpd(+)] )
+"
PATCHES=(
"${FILESDIR}"/tftp-hpa-5.2-gcc-10.patch
)
src_prepare() {
- eapply_user
+ default
sed -i "/^AR/s:ar:$(tc-getAR):" MCONFIG.in || die
}
src_configure() {
- econf \
- $(use_with ipv6) \
- $(use_with tcpd tcpwrappers) \
+ local myconf=(
+ ac_cv_search_bsd_signal=no
+ $(use_with ipv6)
+ $(use_with tcpd tcpwrappers)
$(use_with readline)
+ )
+ econf "${myconf[@]}"
}
src_compile() {
@@ -64,8 +66,6 @@ src_install() {
if use server; then
emake INSTALLROOT="${D}" -C tftpd install
- rm "${ED}"/usr/share/man/man8/tftpd.8 || die
-
newconfd "${FILESDIR}"/in.tftpd.confd-0.44 in.tftpd
newinitd "${FILESDIR}"/in.tftpd.rc6 in.tftpd
[gentoo-commits] repo/gentoo:master commit in: net-ftp/tftp-hpa/
commit: fe9f358f88c12896b1dd4203aeb14f280282c014
Author: Oz N Tiram gmail com>
AuthorDate: Wed Aug 5 20:45:38 2020 +
Commit: Mike Gilbert gentoo org>
CommitDate: Wed Aug 26 17:49:54 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fe9f358f
net-ftp/tftp-hpa: bump EAPI and split the package
Now a user can install either the tftp client or the tftp server
or both. This is controlled by use flags. By default both are installed,
so this keeps backwards compatibility.
Closes: https://github.com/gentoo/gentoo/pull/17023
Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Oz Tiram gmail.com>
Signed-off-by: Mike Gilbert gentoo.org>
net-ftp/tftp-hpa/metadata.xml | 4 ++
net-ftp/tftp-hpa/tftp-hpa-5.2-r2.ebuild | 78 +
2 files changed, 82 insertions(+)
diff --git a/net-ftp/tftp-hpa/metadata.xml b/net-ftp/tftp-hpa/metadata.xml
index 56c12441305..e56bfe22863 100644
--- a/net-ftp/tftp-hpa/metadata.xml
+++ b/net-ftp/tftp-hpa/metadata.xml
@@ -5,4 +5,8 @@
base-sys...@gentoo.org
Gentoo Base System
+
+ Compile and install the tftp client
+ Compile and install the tftp server
+
diff --git a/net-ftp/tftp-hpa/tftp-hpa-5.2-r2.ebuild
b/net-ftp/tftp-hpa/tftp-hpa-5.2-r2.ebuild
new file mode 100644
index 000..239a1184ef6
--- /dev/null
+++ b/net-ftp/tftp-hpa/tftp-hpa-5.2-r2.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit systemd toolchain-funcs
+
+DESCRIPTION="port of the OpenBSD TFTP server"
+HOMEPAGE="https://www.kernel.org/pub/software/network/tftp/";
+SRC_URI="https://www.kernel.org/pub/software/network/tftp/${PN}/${P}.tar.xz";
+
+LICENSE="BSD-4"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc
~x86 ~ppc-macos"
+IUSE="ipv6 readline selinux tcpd +client +server"
+
+CDEPEND="
+ readline? ( sys-libs/readline:0= )
+ tcpd? ( sys-apps/tcp-wrappers )
+ "
+
+DEPEND="${CDEPEND}
+ app-arch/xz-utils
+ !net-ftp/atftp
+ !net-ftp/uftpd"
+
+RDEPEND="${CDEPEND}
+ selinux? ( sec-policy/selinux-tftp )"
+
+PATCHES=(
+ "${FILESDIR}"/tftp-hpa-5.2-gcc-10.patch
+)
+
+src_prepare() {
+ eapply_user
+ sed -i "/^AR/s:ar:$(tc-getAR):" MCONFIG.in || die
+}
+
+src_configure() {
+ econf \
+ $(use_with ipv6) \
+ $(use_with tcpd tcpwrappers) \
+ $(use_with readline)
+}
+
+src_compile() {
+ emake version.h
+ emake -C lib
+ emake -C common
+ if use client; then
+ emake -C tftp
+ fi
+ if use server; then
+ emake -C tftpd
+ fi
+}
+
+src_install() {
+ dodoc README* CHANGES tftpd/sample.rules
+
+ if use client; then
+ emake INSTALLROOT="${D}" -C tftp install
+ fi
+ if use server; then
+ emake INSTALLROOT="${D}" -C tftpd install
+
+ rm "${ED}"/usr/share/man/man8/tftpd.8 || die
+
+ newconfd "${FILESDIR}"/in.tftpd.confd-0.44 in.tftpd
+ newinitd "${FILESDIR}"/in.tftpd.rc6 in.tftpd
+
+ systemd_dounit "${FILESDIR}"/tftp.service
+ systemd_dounit "${FILESDIR}"/tftp.socket
+
+ insinto /etc/xinetd.d
+ newins "${FILESDIR}"/tftp.xinetd tftp
+ fi
+}
[gentoo-commits] repo/gentoo:master commit in: net-ftp/tftp-hpa/, net-ftp/tftp-hpa/files/
commit: 863c825a497d3614d35a73cb2c4c1de95a709ca4
Author: Mike Gilbert gentoo org>
AuthorDate: Tue Jan 28 17:00:37 2020 +
Commit: Mike Gilbert gentoo org>
CommitDate: Tue Jan 28 17:00:56 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=863c825a
net-ftp/tftp-hpa: fix build with gcc-10
Closes: https://bugs.gentoo.org/705834
Package-Manager: Portage-2.3.85_p2, Repoman-2.3.20_p36
Signed-off-by: Mike Gilbert gentoo.org>
net-ftp/tftp-hpa/files/tftp-hpa-5.2-gcc-10.patch | 42
net-ftp/tftp-hpa/tftp-hpa-5.2-r1.ebuild | 4 ++-
2 files changed, 45 insertions(+), 1 deletion(-)
diff --git a/net-ftp/tftp-hpa/files/tftp-hpa-5.2-gcc-10.patch
b/net-ftp/tftp-hpa/files/tftp-hpa-5.2-gcc-10.patch
new file mode 100644
index 000..ff2488d5dfb
--- /dev/null
+++ b/net-ftp/tftp-hpa/files/tftp-hpa-5.2-gcc-10.patch
@@ -0,0 +1,42 @@
+From 7afd5aa65fdabaa4583f6e1a84936eb9bdd33c65 Mon Sep 17 00:00:00 2001
+From: Sergei Trofimovich
+Date: Tue, 21 Jan 2020 23:10:46 +
+Subject: [PATCH] tftp-hpa: fix build failure against gcc-10
+
+On gcc-10 (and gcc-9 -fno-common) build fails as:
+
+```
+x86_64-pc-linux-gnu-gcc -Wl,-O1 -Wl,--as-needed -Wl,--hash-style=gnu tftp.o
main.o ../common/libcommon.a -lreadline -liberty -o tftp
+ld: main.o:(.bss+0x40):
+ multiple definition of `toplevel'; tftp.o:(.bss+0x100): first defined here
+collect2: error: ld returned 1 exit status
+make[1]: *** [Makefile:12: tftp] Error 1
+```
+
+gcc-10 will change the default from -fcommon to fno-common:
+https://gcc.gnu.org/PR85678.
+
+The error also happens if CFLAGS=-fno-common passed explicitly.
+
+Bug: https://bugs.gentoo.org/705834
+Signed-off-by: Sergei Trofimovich
+---
+ tftp/tftp.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tftp/tftp.c b/tftp/tftp.c
+index d15da22..d067f96 100644
+--- a/tftp/tftp.c
b/tftp/tftp.c
+@@ -48,7 +48,7 @@ extern int maxtimeout;
+ #define PKTSIZESEGSIZE+4
+ char ackbuf[PKTSIZE];
+ int timeout;
+-sigjmp_buf toplevel;
++extern sigjmp_buf toplevel;
+ sigjmp_buf timeoutbuf;
+
+ static void nak(int, const char *);
+--
+2.25.0
+
diff --git a/net-ftp/tftp-hpa/tftp-hpa-5.2-r1.ebuild
b/net-ftp/tftp-hpa/tftp-hpa-5.2-r1.ebuild
index cafb4a38548..78723b2d830 100644
--- a/net-ftp/tftp-hpa/tftp-hpa-5.2-r1.ebuild
+++ b/net-ftp/tftp-hpa/tftp-hpa-5.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="5"
@@ -24,7 +24,9 @@ DEPEND="${CDEPEND}
RDEPEND="${CDEPEND}
selinux? ( sec-policy/selinux-tftp )
"
+
src_prepare() {
+ epatch "${FILESDIR}"/tftp-hpa-5.2-gcc-10.patch
epatch_user
sed -i "/^AR/s:ar:$(tc-getAR):" MCONFIG.in || die
