commit: d16540096668893d848cc45e93ba7e389d08b070
Author: Julian Ospald <hasufell <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 5 08:35:17 2015 +0000
Commit: Julian Ospald <hasufell <AT> gentoo <DOT> org>
CommitDate: Mon Oct 5 08:45:13 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d1654009
net-misc/iputils: add libressl support
...-99999999.ebuild => iputils-20150815-r1.ebuild} | 78 ++++++++++++++--------
net-misc/iputils/iputils-99999999.ebuild | 7 +-
2 files changed, 54 insertions(+), 31 deletions(-)
diff --git a/net-misc/iputils/iputils-99999999.ebuild
b/net-misc/iputils/iputils-20150815-r1.ebuild
similarity index 62%
copy from net-misc/iputils/iputils-99999999.ebuild
copy to net-misc/iputils/iputils-20150815-r1.ebuild
index 3957639..699c2d2 100644
--- a/net-misc/iputils/iputils-99999999.ebuild
+++ b/net-misc/iputils/iputils-20150815-r1.ebuild
@@ -11,11 +11,11 @@ EAPI="4"
inherit flag-o-matic eutils toolchain-funcs fcaps
if [[ ${PV} == "99999999" ]] ; then
- EGIT_REPO_URI="git://www.linux-ipv6.org/gitroot/iputils"
- inherit git-2
+ EGIT_REPO_URI="https://github.com/iputils/iputils.git";
+ inherit git-r3
else
- SRC_URI="http://www.skbuff.net/iputils/iputils-s${PV}.tar.bz2
- mirror://gentoo/iputils-s${PV}-manpages.tar.bz2"
+ SRC_URI="https://github.com/iputils/iputils/archive/s${PV}.tar.gz ->
${P}.tar.gz
+
https://dev.gentoo.org/~polynomial-c/iputils-s${PV}-manpages.tar.xz";
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64
~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux"
fi
@@ -24,16 +24,17 @@
HOMEPAGE="http://www.linuxfoundation.org/collaborate/workgroups/networking/iputi
LICENSE="BSD-4"
SLOT="0"
-IUSE="arping caps clockdiff doc gnutls idn ipv6 rarpd rdisc SECURITY_HAZARD
ssl static tftpd tracepath traceroute"
+IUSE="arping caps clockdiff doc gcrypt idn ipv6 libressl nettle +openssl rarpd
rdisc SECURITY_HAZARD ssl static tftpd tracepath traceroute"
LIB_DEPEND="caps? ( sys-libs/libcap[static-libs(+)] )
idn? ( net-dns/libidn[static-libs(+)] )
ipv6? ( ssl? (
- gnutls? (
- net-libs/gnutls[openssl(+)]
- net-libs/gnutls[static-libs(+)]
+ gcrypt? ( dev-libs/libgcrypt[static-libs(+)] )
+ nettle? ( dev-libs/nettle[static-libs(+)] )
+ openssl? (
+ !libressl? ( dev-libs/openssl:0[static-libs(+)] )
+ libressl? ( dev-libs/libressl[static-libs] )
)
- !gnutls? ( dev-libs/openssl:0[static-libs(+)] )
) )"
RDEPEND="arping? ( !net-misc/arping )
rarpd? ( !net-misc/rarpd )
@@ -51,31 +52,48 @@ if [[ ${PV} == "99999999" ]] ; then
"
fi
+REQUIRED_USE="ipv6? ( ssl? ( ^^ ( gcrypt nettle openssl ) ) )"
+
S=${WORKDIR}/${PN}-s${PV}
+PATCHES=(
+ "${FILESDIR}/021109-uclibc-no-ether_ntohost.patch"
+ "${FILESDIR}/${PN}-20150815-ping_default_ipv4.patch"
+ "${FILESDIR}/${PN}-20150815-ping6_crypto.patch"
+)
+
src_prepare() {
- epatch "${FILESDIR}"/021109-uclibc-no-ether_ntohost.patch
- epatch "${FILESDIR}"/${PN}-99999999-openssl.patch #335436
- epatch "${FILESDIR}"/${PN}-99999999-tftpd-syslog.patch
- epatch "${FILESDIR}"/${PN}-20121221-makefile.patch
- epatch "${FILESDIR}"/${PN}-20121221-parallel-doc.patch
- epatch "${FILESDIR}"/${PN}-20121221-strtod.patch #472592
- use SECURITY_HAZARD && epatch
"${FILESDIR}"/${PN}-20071127-nonroot-floodping.patch
+ epatch ${PATCHES[@]}
+ use SECURITY_HAZARD && epatch
"${FILESDIR}"/${PN}-20150815-nonroot-floodping.patch
}
src_configure() {
use static && append-ldflags -static
- IPV4_TARGETS=(
+ TARGETS=(
ping
$(for v in arping clockdiff rarpd rdisc tftpd tracepath ; do
usev ${v} ; done)
)
- IPV6_TARGETS=(
- ping6
- $(usex tracepath 'tracepath6' '')
- $(usex traceroute 'traceroute6' '')
+ if use ipv6 ; then
+ TARGETS+=(
+ $(usex tracepath 'tracepath6' '')
+ $(usex traceroute 'traceroute6' '')
+ )
+ fi
+
+ myconf=(
+ USE_CRYPTO=no
+ USE_GCRYPT=no
+ USE_NETTLE=no
)
- use ipv6 || IPV6_TARGETS=()
+
+ if use ipv6 && use ssl ; then
+ myconf=(
+ USE_CRYPTO=$(usex openssl)
+ USE_GCRYPT=$(usex gcrypt)
+ USE_NETTLE=$(usex nettle)
+ )
+ fi
}
src_compile() {
@@ -83,10 +101,9 @@ src_compile() {
emake \
USE_CAP=$(usex caps) \
USE_IDN=$(usex idn) \
- USE_GNUTLS=$(usex gnutls) \
- USE_CRYPTO=$(usex ssl) \
- IPV4_TARGETS="${IPV4_TARGETS[*]}" \
- IPV6_TARGETS="${IPV6_TARGETS[*]}"
+ IPV4_DEFAULT=$(usex ipv6 'no' 'yes') \
+ TARGETS="${TARGETS[*]}" \
+ ${myconf[@]}
if [[ ${PV} == "99999999" ]] ; then
emake html man
@@ -95,8 +112,12 @@ src_compile() {
src_install() {
into /
- dobin ping $(usex ipv6 'ping6' '')
- use ipv6 && dosym ping.8 "${EPREFIX}"/usr/share/man/man8/ping6.8
+ dobin ping
+ dosym ping "${EPREFIX}"/bin/ping4
+ if use ipv6 ; then
+ dosym ping "${EPREFIX}"/bin/ping6
+ dosym ping.8 "${EPREFIX}"/usr/share/man/man8/ping6.8
+ fi
doman doc/ping.8
if use arping ; then
@@ -140,7 +161,6 @@ src_install() {
pkg_postinst() {
fcaps cap_net_raw \
bin/ping \
- $(usex ipv6 'bin/ping6' '') \
$(usex arping 'bin/arping' '') \
$(usex clockdiff 'usr/bin/clockdiff' '')
}
diff --git a/net-misc/iputils/iputils-99999999.ebuild
b/net-misc/iputils/iputils-99999999.ebuild
index 3957639..604bd94 100644
--- a/net-misc/iputils/iputils-99999999.ebuild
+++ b/net-misc/iputils/iputils-99999999.ebuild
@@ -24,7 +24,7 @@
HOMEPAGE="http://www.linuxfoundation.org/collaborate/workgroups/networking/iputi
LICENSE="BSD-4"
SLOT="0"
-IUSE="arping caps clockdiff doc gnutls idn ipv6 rarpd rdisc SECURITY_HAZARD
ssl static tftpd tracepath traceroute"
+IUSE="arping caps clockdiff doc gnutls idn ipv6 libressl rarpd rdisc
SECURITY_HAZARD ssl static tftpd tracepath traceroute"
LIB_DEPEND="caps? ( sys-libs/libcap[static-libs(+)] )
idn? ( net-dns/libidn[static-libs(+)] )
@@ -33,7 +33,10 @@ LIB_DEPEND="caps? ( sys-libs/libcap[static-libs(+)] )
net-libs/gnutls[openssl(+)]
net-libs/gnutls[static-libs(+)]
)
- !gnutls? ( dev-libs/openssl:0[static-libs(+)] )
+ !gnutls? (
+ !libressl? ( dev-libs/openssl:0[static-libs(+)] )
+ libressl? ( dev-libs/libressl[static-libs] )
+ )
) )"
RDEPEND="arping? ( !net-misc/arping )
rarpd? ( !net-misc/rarpd )
