From 7d62bd9b52d9f381b905e93927640f49dd38021d Mon Sep 17 00:00:00 2001 From: Nick Owens Date: Wed, 14 Oct 2015 10:27:17 -0700 Subject: [PATCH] bump(net-misc/iputils): sync with upstream --- .../md5-cache/net-misc/iputils-20101006-r2 | 13 - .../md5-cache/net-misc/iputils-20121221 | 6 +- .../md5-cache/net-misc/iputils-20121221-r1 | 10 +- .../md5-cache/net-misc/iputils-20121221-r2 | 13 + .../md5-cache/net-misc/iputils-20150815 | 14 + .../md5-cache/net-misc/iputils-20150815-r1 | 14 + .../md5-cache/net-misc/iputils-99999999 | 12 +- .../portage-stable/net-misc/iputils/ChangeLog | 98 +++++- .../portage-stable/net-misc/iputils/Manifest | 58 ++-- .../iputils/files/iputils-20070202-idn.patch | 158 ---------- .../files/iputils-20071127-infiniband.patch | 280 ------------------ .../iputils-20071127-kernel-ifaddr.patch | 55 ---- .../files/iputils-20100418-aliasing.patch | 93 ------ .../files/iputils-20100418-makefile.patch | 35 --- .../files/iputils-20100418-openssl.patch | 35 --- .../files/iputils-20100418-printf-size.patch | 62 ---- .../files/iputils-20100418-proper-libs.patch | 20 -- .../files/iputils-20101006-owl-pingsock.diff | 224 -------------- .../files/iputils-20121221-parallel-doc.patch | 74 +++++ .../files/iputils-20121221-strtod.patch | 45 +++ .../files/iputils-20121221-tftpd-setid.patch | 34 +++ .../files/iputils-20121221-tftpd-syslog.patch | 38 +++ .../iputils-20150815-nonroot-floodping.patch | 11 + .../files/iputils-20150815-ping6_crypto.patch | 29 ++ .../iputils-20150815-ping_default_ipv4.patch | 65 ++++ .../files/iputils-99999999-openssl.patch | 97 ++++++ .../files/iputils-99999999-tftpd-syslog.patch | 38 +++ .../net-misc/iputils/files/rarpd.conf.d | 8 + .../net-misc/iputils/files/rarpd.init.d | 20 ++ .../iputils/iputils-20101006-r2.ebuild | 94 ------ .../iputils/iputils-20121221-r1.ebuild | 19 +- .../iputils/iputils-20121221-r2.ebuild | 151 ++++++++++ .../net-misc/iputils/iputils-20121221.ebuild | 8 +- .../iputils/iputils-20150815-r1.ebuild | 166 +++++++++++ .../net-misc/iputils/iputils-20150815.ebuild | 163 ++++++++++ .../net-misc/iputils/iputils-99999999.ebuild | 107 +++++-- .../net-misc/iputils/metadata.xml | 10 + 37 files changed, 1214 insertions(+), 1163 deletions(-) delete mode 100644 sdk_container/src/third_party/portage-stable/metadata/md5-cache/net-misc/iputils-20101006-r2 create mode 100644 sdk_container/src/third_party/portage-stable/metadata/md5-cache/net-misc/iputils-20121221-r2 create mode 100644 sdk_container/src/third_party/portage-stable/metadata/md5-cache/net-misc/iputils-20150815 create mode 100644 sdk_container/src/third_party/portage-stable/metadata/md5-cache/net-misc/iputils-20150815-r1 delete mode 100644 sdk_container/src/third_party/portage-stable/net-misc/iputils/files/iputils-20070202-idn.patch delete mode 100644 sdk_container/src/third_party/portage-stable/net-misc/iputils/files/iputils-20071127-infiniband.patch delete mode 100644 sdk_container/src/third_party/portage-stable/net-misc/iputils/files/iputils-20071127-kernel-ifaddr.patch delete mode 100644 sdk_container/src/third_party/portage-stable/net-misc/iputils/files/iputils-20100418-aliasing.patch delete mode 100644 sdk_container/src/third_party/portage-stable/net-misc/iputils/files/iputils-20100418-makefile.patch delete mode 100644 sdk_container/src/third_party/portage-stable/net-misc/iputils/files/iputils-20100418-openssl.patch delete mode 100644 sdk_container/src/third_party/portage-stable/net-misc/iputils/files/iputils-20100418-printf-size.patch delete mode 100644 sdk_container/src/third_party/portage-stable/net-misc/iputils/files/iputils-20100418-proper-libs.patch delete mode 100644 sdk_container/src/third_party/portage-stable/net-misc/iputils/files/iputils-20101006-owl-pingsock.diff create mode 100644 sdk_container/src/third_party/portage-stable/net-misc/iputils/files/iputils-20121221-parallel-doc.patch create mode 100644 sdk_container/src/third_party/portage-stable/net-misc/iputils/files/iputils-20121221-strtod.patch create mode 100644 sdk_container/src/third_party/portage-stable/net-misc/iputils/files/iputils-20121221-tftpd-setid.patch create mode 100644 sdk_container/src/third_party/portage-stable/net-misc/iputils/files/iputils-20121221-tftpd-syslog.patch create mode 100644 sdk_container/src/third_party/portage-stable/net-misc/iputils/files/iputils-20150815-nonroot-floodping.patch create mode 100644 sdk_container/src/third_party/portage-stable/net-misc/iputils/files/iputils-20150815-ping6_crypto.patch create mode 100644 sdk_container/src/third_party/portage-stable/net-misc/iputils/files/iputils-20150815-ping_default_ipv4.patch create mode 100644 sdk_container/src/third_party/portage-stable/net-misc/iputils/files/iputils-99999999-openssl.patch create mode 100644 sdk_container/src/third_party/portage-stable/net-misc/iputils/files/iputils-99999999-tftpd-syslog.patch create mode 100644 sdk_container/src/third_party/portage-stable/net-misc/iputils/files/rarpd.conf.d create mode 100644 sdk_container/src/third_party/portage-stable/net-misc/iputils/files/rarpd.init.d delete mode 100644 sdk_container/src/third_party/portage-stable/net-misc/iputils/iputils-20101006-r2.ebuild create mode 100644 sdk_container/src/third_party/portage-stable/net-misc/iputils/iputils-20121221-r2.ebuild create mode 100644 sdk_container/src/third_party/portage-stable/net-misc/iputils/iputils-20150815-r1.ebuild create mode 100644 sdk_container/src/third_party/portage-stable/net-misc/iputils/iputils-20150815.ebuild diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/net-misc/iputils-20101006-r2 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/net-misc/iputils-20101006-r2 deleted file mode 100644 index 0b22ce22e1..0000000000 --- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/net-misc/iputils-20101006-r2 +++ /dev/null @@ -1,13 +0,0 @@ -DEFINED_PHASES=compile install prepare -DEPEND=!net-misc/rarpd ssl? ( dev-libs/openssl ) idn? ( net-dns/libidn ) virtual/os-headers -DESCRIPTION=Network monitoring tools including ping and ping6 -EAPI=2 -HOMEPAGE=http://www.linuxfoundation.org/collaborate/workgroups/networking/iputils -IUSE=doc idn ipv6 SECURITY_HAZARD ssl static -KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux -LICENSE=BSD -RDEPEND=!net-misc/rarpd ssl? ( dev-libs/openssl ) idn? ( net-dns/libidn ) -SLOT=0 -SRC_URI=http://www.skbuff.net/iputils/iputils-s20101006.tar.bz2 mirror://gentoo/iputils-s20101006-manpages.tar.bz2 -_eclasses_=eutils 9fb270e417e0e83d64ca52586c4a79de flag-o-matic c9602887773166fe300444712fc7ff98 multilib 62927b3db3a589b0806255f3a002d5d3 toolchain-funcs 42408102d713fbad60ca21349865edb4 -_md5_=779a2e738fa1e9639a4eeac43ea41ecc diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/net-misc/iputils-20121221 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/net-misc/iputils-20121221 index a4eefaa117..d55209d6a0 100644 --- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/net-misc/iputils-20121221 +++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/net-misc/iputils-20121221 @@ -4,10 +4,10 @@ DESCRIPTION=Network monitoring tools including ping and ping6 EAPI=4 HOMEPAGE=http://www.linuxfoundation.org/collaborate/workgroups/networking/iputils IUSE=caps doc gnutls idn ipv6 SECURITY_HAZARD ssl static -KEYWORDS=alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux -LICENSE=BSD +KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux +LICENSE=BSD-4 RDEPEND=!net-misc/rarpd !static? ( caps? ( sys-libs/libcap ) idn? ( net-dns/libidn ) ipv6? ( gnutls? ( net-libs/gnutls ) ssl? ( dev-libs/openssl:0 ) ) ) SLOT=0 SRC_URI=http://www.skbuff.net/iputils/iputils-s20121221.tar.bz2 mirror://gentoo/iputils-s20121221-manpages.tar.bz2 _eclasses_=eutils 9fb270e417e0e83d64ca52586c4a79de flag-o-matic c9602887773166fe300444712fc7ff98 multilib 62927b3db3a589b0806255f3a002d5d3 toolchain-funcs 42408102d713fbad60ca21349865edb4 -_md5_=6b84a2abeced2e716720550e4ffab7a4 +_md5_=8e26ba81e4ef84ce4578e4696351f858 diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/net-misc/iputils-20121221-r1 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/net-misc/iputils-20121221-r1 index c5eaa3b9b7..85b7ff1b08 100644 --- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/net-misc/iputils-20121221-r1 +++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/net-misc/iputils-20121221-r1 @@ -1,13 +1,13 @@ DEFINED_PHASES=compile install postinst prepare -DEPEND=!net-misc/rarpd !static? ( caps? ( sys-libs/libcap ) idn? ( net-dns/libidn ) ipv6? ( gnutls? ( net-libs/gnutls ) ssl? ( dev-libs/openssl:0 ) ) ) static? ( caps? ( sys-libs/libcap[static-libs(+)] ) idn? ( net-dns/libidn[static-libs(+)] ) ipv6? ( gnutls? ( net-libs/gnutls[static-libs(+)] ) ssl? ( dev-libs/openssl:0[static-libs(+)] ) ) ) virtual/os-headers filecaps? ( sys-libs/libcap ) +DEPEND=!net-misc/rarpd !static? ( caps? ( sys-libs/libcap ) idn? ( net-dns/libidn ) ipv6? ( ssl? ( gnutls? ( net-libs/gnutls[openssl(+)] net-libs/gnutls ) !gnutls? ( dev-libs/openssl:0 ) ) ) ) static? ( caps? ( sys-libs/libcap[static-libs(+)] ) idn? ( net-dns/libidn[static-libs(+)] ) ipv6? ( ssl? ( gnutls? ( net-libs/gnutls[openssl(+)] net-libs/gnutls[static-libs(+)] ) !gnutls? ( dev-libs/openssl:0[static-libs(+)] ) ) ) ) virtual/os-headers filecaps? ( sys-libs/libcap ) DESCRIPTION=Network monitoring tools including ping and ping6 EAPI=4 HOMEPAGE=http://www.linuxfoundation.org/collaborate/workgroups/networking/iputils IUSE=caps doc gnutls idn ipv6 SECURITY_HAZARD ssl static +filecaps -KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux -LICENSE=BSD -RDEPEND=!net-misc/rarpd !static? ( caps? ( sys-libs/libcap ) idn? ( net-dns/libidn ) ipv6? ( gnutls? ( net-libs/gnutls ) ssl? ( dev-libs/openssl:0 ) ) ) +KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux +LICENSE=BSD-4 +RDEPEND=!net-misc/rarpd !static? ( caps? ( sys-libs/libcap ) idn? ( net-dns/libidn ) ipv6? ( ssl? ( gnutls? ( net-libs/gnutls[openssl(+)] net-libs/gnutls ) !gnutls? ( dev-libs/openssl:0 ) ) ) ) SLOT=0 SRC_URI=http://www.skbuff.net/iputils/iputils-s20121221.tar.bz2 mirror://gentoo/iputils-s20121221-manpages.tar.bz2 _eclasses_=eutils 9fb270e417e0e83d64ca52586c4a79de fcaps eeefea88d5fef2853d4c1e3770340302 flag-o-matic c9602887773166fe300444712fc7ff98 multilib 62927b3db3a589b0806255f3a002d5d3 toolchain-funcs 42408102d713fbad60ca21349865edb4 -_md5_=ee9648b1fc69fbb5b2a0aafa4cf6af6c +_md5_=cd3d8297ede7c3e848877398d9737cd8 diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/net-misc/iputils-20121221-r2 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/net-misc/iputils-20121221-r2 new file mode 100644 index 0000000000..ff6abad420 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/net-misc/iputils-20121221-r2 @@ -0,0 +1,13 @@ +DEFINED_PHASES=compile configure install postinst prepare +DEPEND=arping? ( !net-misc/arping ) rarpd? ( !net-misc/rarpd ) traceroute? ( !net-misc/traceroute ) !static? ( caps? ( sys-libs/libcap ) idn? ( net-dns/libidn ) ipv6? ( ssl? ( gnutls? ( net-libs/gnutls[openssl(+)] net-libs/gnutls ) !gnutls? ( dev-libs/openssl:0 ) ) ) ) static? ( caps? ( sys-libs/libcap[static-libs(+)] ) idn? ( net-dns/libidn[static-libs(+)] ) ipv6? ( ssl? ( gnutls? ( net-libs/gnutls[openssl(+)] net-libs/gnutls[static-libs(+)] ) !gnutls? ( dev-libs/openssl:0[static-libs(+)] ) ) ) ) virtual/os-headers filecaps? ( sys-libs/libcap ) +DESCRIPTION=Network monitoring tools including ping and ping6 +EAPI=4 +HOMEPAGE=http://www.linuxfoundation.org/collaborate/workgroups/networking/iputils +IUSE=arping caps clockdiff doc gnutls idn ipv6 rarpd rdisc SECURITY_HAZARD ssl static tftpd tracepath traceroute +filecaps +KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux +LICENSE=BSD-4 +RDEPEND=arping? ( !net-misc/arping ) rarpd? ( !net-misc/rarpd ) traceroute? ( !net-misc/traceroute ) !static? ( caps? ( sys-libs/libcap ) idn? ( net-dns/libidn ) ipv6? ( ssl? ( gnutls? ( net-libs/gnutls[openssl(+)] net-libs/gnutls ) !gnutls? ( dev-libs/openssl:0 ) ) ) ) +SLOT=0 +SRC_URI=http://www.skbuff.net/iputils/iputils-s20121221.tar.bz2 mirror://gentoo/iputils-s20121221-manpages.tar.bz2 +_eclasses_=eutils 9fb270e417e0e83d64ca52586c4a79de fcaps eeefea88d5fef2853d4c1e3770340302 flag-o-matic c9602887773166fe300444712fc7ff98 multilib 62927b3db3a589b0806255f3a002d5d3 toolchain-funcs 42408102d713fbad60ca21349865edb4 +_md5_=95ca196e5c942a6949795382c877be32 diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/net-misc/iputils-20150815 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/net-misc/iputils-20150815 new file mode 100644 index 0000000000..e1672b6f67 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/net-misc/iputils-20150815 @@ -0,0 +1,14 @@ +DEFINED_PHASES=compile configure install postinst prepare +DEPEND=arping? ( !net-misc/arping ) rarpd? ( !net-misc/rarpd ) traceroute? ( !net-misc/traceroute ) !static? ( caps? ( sys-libs/libcap ) idn? ( net-dns/libidn ) ipv6? ( ssl? ( gcrypt? ( dev-libs/libgcrypt ) nettle? ( dev-libs/nettle ) openssl? ( dev-libs/openssl:0 ) ) ) ) static? ( caps? ( sys-libs/libcap[static-libs(+)] ) idn? ( net-dns/libidn[static-libs(+)] ) ipv6? ( ssl? ( gcrypt? ( dev-libs/libgcrypt[static-libs(+)] ) nettle? ( dev-libs/nettle[static-libs(+)] ) openssl? ( dev-libs/openssl:0[static-libs(+)] ) ) ) ) virtual/os-headers filecaps? ( sys-libs/libcap ) +DESCRIPTION=Network monitoring tools including ping and ping6 +EAPI=4 +HOMEPAGE=http://www.linuxfoundation.org/collaborate/workgroups/networking/iputils +IUSE=arping caps clockdiff doc gcrypt idn ipv6 nettle +openssl rarpd rdisc SECURITY_HAZARD ssl static tftpd tracepath traceroute +filecaps +KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux +LICENSE=BSD-4 +RDEPEND=arping? ( !net-misc/arping ) rarpd? ( !net-misc/rarpd ) traceroute? ( !net-misc/traceroute ) !static? ( caps? ( sys-libs/libcap ) idn? ( net-dns/libidn ) ipv6? ( ssl? ( gcrypt? ( dev-libs/libgcrypt ) nettle? ( dev-libs/nettle ) openssl? ( dev-libs/openssl:0 ) ) ) ) +REQUIRED_USE=ipv6? ( ssl? ( ^^ ( gcrypt nettle openssl ) ) ) +SLOT=0 +SRC_URI=https://github.com/iputils/iputils/archive/s20150815.tar.gz -> iputils-20150815.tar.gz https://dev.gentoo.org/~polynomial-c/iputils-s20150815-manpages.tar.xz +_eclasses_=eutils 9fb270e417e0e83d64ca52586c4a79de fcaps eeefea88d5fef2853d4c1e3770340302 flag-o-matic c9602887773166fe300444712fc7ff98 multilib 62927b3db3a589b0806255f3a002d5d3 toolchain-funcs 42408102d713fbad60ca21349865edb4 +_md5_=0e499038e50d8d266079b478fdd1b02c diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/net-misc/iputils-20150815-r1 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/net-misc/iputils-20150815-r1 new file mode 100644 index 0000000000..398f03b7c5 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/net-misc/iputils-20150815-r1 @@ -0,0 +1,14 @@ +DEFINED_PHASES=compile configure install postinst prepare +DEPEND=arping? ( !net-misc/arping ) rarpd? ( !net-misc/rarpd ) traceroute? ( !net-misc/traceroute ) !static? ( caps? ( sys-libs/libcap ) idn? ( net-dns/libidn ) ipv6? ( ssl? ( gcrypt? ( dev-libs/libgcrypt ) nettle? ( dev-libs/nettle ) openssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) ) ) ) static? ( caps? ( sys-libs/libcap[static-libs(+)] ) idn? ( net-dns/libidn[static-libs(+)] ) ipv6? ( ssl? ( 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(+)] ) ) ) ) ) virtual/os-headers filecaps? ( sys-libs/libcap ) +DESCRIPTION=Network monitoring tools including ping and ping6 +EAPI=4 +HOMEPAGE=http://www.linuxfoundation.org/collaborate/workgroups/networking/iputils +IUSE=arping caps clockdiff doc gcrypt idn ipv6 libressl nettle +openssl rarpd rdisc SECURITY_HAZARD ssl static tftpd tracepath traceroute +filecaps +KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux +LICENSE=BSD-4 +RDEPEND=arping? ( !net-misc/arping ) rarpd? ( !net-misc/rarpd ) traceroute? ( !net-misc/traceroute ) !static? ( caps? ( sys-libs/libcap ) idn? ( net-dns/libidn ) ipv6? ( ssl? ( gcrypt? ( dev-libs/libgcrypt ) nettle? ( dev-libs/nettle ) openssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) ) ) ) +REQUIRED_USE=ipv6? ( ssl? ( ^^ ( gcrypt nettle openssl ) ) ) +SLOT=0 +SRC_URI=https://github.com/iputils/iputils/archive/s20150815.tar.gz -> iputils-20150815.tar.gz https://dev.gentoo.org/~polynomial-c/iputils-s20150815-manpages.tar.xz +_eclasses_=eutils 9fb270e417e0e83d64ca52586c4a79de fcaps eeefea88d5fef2853d4c1e3770340302 flag-o-matic c9602887773166fe300444712fc7ff98 multilib 62927b3db3a589b0806255f3a002d5d3 toolchain-funcs 42408102d713fbad60ca21349865edb4 +_md5_=52aa3c680d3d1ae9ee245fe3c33421f7 diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/net-misc/iputils-99999999 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/net-misc/iputils-99999999 index efd87bb2b1..2385e0d7b7 100644 --- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/net-misc/iputils-99999999 +++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/net-misc/iputils-99999999 @@ -1,11 +1,11 @@ -DEFINED_PHASES=compile install postinst prepare unpack -DEPEND=!net-misc/rarpd !static? ( caps? ( sys-libs/libcap ) idn? ( net-dns/libidn ) ipv6? ( gnutls? ( net-libs/gnutls ) ssl? ( dev-libs/openssl:0 ) ) ) static? ( caps? ( sys-libs/libcap[static-libs(+)] ) idn? ( net-dns/libidn[static-libs(+)] ) ipv6? ( gnutls? ( net-libs/gnutls[static-libs(+)] ) ssl? ( dev-libs/openssl:0[static-libs(+)] ) ) ) virtual/os-headers app-text/openjade dev-perl/SGMLSpm app-text/docbook-sgml-dtd app-text/docbook-sgml-utils filecaps? ( sys-libs/libcap ) dev-vcs/git +DEFINED_PHASES=compile configure install postinst prepare unpack +DEPEND=arping? ( !net-misc/arping ) rarpd? ( !net-misc/rarpd ) traceroute? ( !net-misc/traceroute ) !static? ( caps? ( sys-libs/libcap ) idn? ( net-dns/libidn ) ipv6? ( ssl? ( gnutls? ( net-libs/gnutls[openssl(+)] net-libs/gnutls ) !gnutls? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) ) ) ) static? ( caps? ( sys-libs/libcap[static-libs(+)] ) idn? ( net-dns/libidn[static-libs(+)] ) ipv6? ( ssl? ( gnutls? ( net-libs/gnutls[openssl(+)] net-libs/gnutls[static-libs(+)] ) !gnutls? ( !libressl? ( dev-libs/openssl:0[static-libs(+)] ) libressl? ( dev-libs/libressl[static-libs(+)] ) ) ) ) ) virtual/os-headers app-text/openjade dev-perl/SGMLSpm app-text/docbook-sgml-dtd app-text/docbook-sgml-utils filecaps? ( sys-libs/libcap ) dev-vcs/git DESCRIPTION=Network monitoring tools including ping and ping6 EAPI=4 HOMEPAGE=http://www.linuxfoundation.org/collaborate/workgroups/networking/iputils -IUSE=caps doc gnutls idn ipv6 SECURITY_HAZARD ssl static +filecaps -LICENSE=BSD -RDEPEND=!net-misc/rarpd !static? ( caps? ( sys-libs/libcap ) idn? ( net-dns/libidn ) ipv6? ( gnutls? ( net-libs/gnutls ) ssl? ( dev-libs/openssl:0 ) ) ) +IUSE=arping caps clockdiff doc gnutls idn ipv6 libressl rarpd rdisc SECURITY_HAZARD ssl static tftpd tracepath traceroute +filecaps +LICENSE=BSD-4 +RDEPEND=arping? ( !net-misc/arping ) rarpd? ( !net-misc/rarpd ) traceroute? ( !net-misc/traceroute ) !static? ( caps? ( sys-libs/libcap ) idn? ( net-dns/libidn ) ipv6? ( ssl? ( gnutls? ( net-libs/gnutls[openssl(+)] net-libs/gnutls ) !gnutls? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) ) ) ) SLOT=0 _eclasses_=eutils 9fb270e417e0e83d64ca52586c4a79de fcaps eeefea88d5fef2853d4c1e3770340302 flag-o-matic c9602887773166fe300444712fc7ff98 git-2 e28f0d8a9b321431b1e699782851b827 multilib 62927b3db3a589b0806255f3a002d5d3 toolchain-funcs 42408102d713fbad60ca21349865edb4 -_md5_=9a47d5b0d8dfcde37f2390b3ef13ffd9 +_md5_=53eb8d5037caac56d64aa38d2a31084c diff --git a/sdk_container/src/third_party/portage-stable/net-misc/iputils/ChangeLog b/sdk_container/src/third_party/portage-stable/net-misc/iputils/ChangeLog index e5193a907b..3ac5cb669e 100644 --- a/sdk_container/src/third_party/portage-stable/net-misc/iputils/ChangeLog +++ b/sdk_container/src/third_party/portage-stable/net-misc/iputils/ChangeLog @@ -1,6 +1,100 @@ # ChangeLog for net-misc/iputils -# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/iputils/ChangeLog,v 1.123 2013/06/09 23:01:13 vapier Exp $ +# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/net-misc/iputils/ChangeLog,v 1.145 2015/05/04 02:35:57 vapier Exp $ + + 04 May 2015; Mike Frysinger iputils-20121221-r2.ebuild, + iputils-99999999.ebuild: + Fix install of clockdiff #547752 by Robert Sebastian Gerus. + + 25 Apr 2015; Mike Frysinger iputils-20121221-r2.ebuild, + iputils-99999999.ebuild: + Fix install of arping and add blocker against net-misc/arping. + +*iputils-20121221-r2 (25 Apr 2015) + + 25 Apr 2015; Mike Frysinger + +files/iputils-20121221-parallel-doc.patch, + +files/iputils-20121221-tftpd-setid.patch, + +files/iputils-20121221-tftpd-syslog.patch, +iputils-20121221-r2.ebuild, + iputils-99999999.ebuild, metadata.xml: + Add fix from upstream for checking tftpd set*id calls. Add USE flags to + control all the utils (other than ping) as they are all fairly uncommon. Drop + ipg entirely as it is a pretty useless script. Re-add support for traceroute + via the new USE flag. + + 25 Apr 2015; Mike Frysinger +files/rarpd.conf.d, + +files/rarpd.init.d, iputils-99999999.ebuild: + Add init.d script for rarpd #312623 by Weeve. + + 25 Apr 2015; Mike Frysinger + +files/iputils-20121221-strtod.patch, iputils-99999999.ebuild: + Fix -i number parsing in some locales #472592 by Sergey Fionov. + + 25 Apr 2015; Mike Frysinger iputils-20121221-r1.ebuild, + iputils-99999999.ebuild: + Require gnutls be built w/USE=openssl #546116 by Patrick Lauer. + + 25 Apr 2015; Mike Frysinger + +files/iputils-99999999-openssl.patch, + +files/iputils-99999999-tftpd-syslog.patch, -files/iputils-20070202-idn.patch, + -files/iputils-20071127-infiniband.patch, + -files/iputils-20071127-kernel-ifaddr.patch, + -files/iputils-20100418-aliasing.patch, + -files/iputils-20100418-makefile.patch, -files/iputils-20100418-openssl.patch, + -files/iputils-20100418-printf-size.patch, + -files/iputils-20100418-proper-libs.patch, + -files/iputils-20101006-owl-pingsock.diff, iputils-99999999.ebuild: + Update patches against latest git. + + 04 Apr 2015; Mike Frysinger iputils-20121221-r1.ebuild: + Mark arm64/m68k/s390/sh stable. + + 07 Dec 2014; Markus Meier iputils-20121221-r1.ebuild: + arm stable, bug #517720 + + 06 Dec 2014; Agostino Sarubbo iputils-20121221-r1.ebuild: + Stable for ia64, wrt bug #517720 + + 04 Dec 2014; Agostino Sarubbo iputils-20121221-r1.ebuild: + Stable for ppc64, wrt bug #517720 + + 03 Dec 2014; Agostino Sarubbo iputils-20121221-r1.ebuild: + Stable for ppc, wrt bug #517720 + + 02 Dec 2014; Agostino Sarubbo iputils-20121221-r1.ebuild: + Stable for alpha, wrt bug #517720 + + 01 Dec 2014; Agostino Sarubbo iputils-20121221-r1.ebuild: + Stable for sparc, wrt bug #517720 + + 25 Nov 2014; Agostino Sarubbo iputils-20121221-r1.ebuild: + Stable for x86, wrt bug #517720 + + 22 Nov 2014; Mikle Kolyada iputils-20121221-r1.ebuild: + amd64 stable wrt bug #517720 + + 22 Nov 2014; Jeroen Roovers iputils-20121221-r1.ebuild: + Stable for HPPA (bug #517720). + + 03 Nov 2014; Mike Frysinger iputils-20121221.ebuild: + Mark m68k stable. + + 25 Aug 2014; Christopher Reffett <2011creffett@gentoo.org> + -iputils-20101006-r2.ebuild: + Security cleanup wrt bug 408183 + + 29 Apr 2014; Mike Frysinger iputils-20121221-r1.ebuild, + iputils-99999999.ebuild: + Put USE=gnutls behind USE=ssl since only one of openssl/gnutls can be used at + a time #509100 by David Heidelberger. + + 18 Jan 2014; Mike Frysinger iputils-20121221-r1.ebuild, + iputils-20121221.ebuild, iputils-99999999.ebuild: + Add arm64 love. + + 26 Oct 2013; Mike Frysinger iputils-20101006-r2.ebuild, + iputils-20121221-r1.ebuild, iputils-20121221.ebuild, iputils-99999999.ebuild: + Fix license to reflect source -- BSD-4. 09 Jun 2013; Mike Frysinger metadata.xml: Add upstream CPE tag (security info) from ChromiumOS. diff --git a/sdk_container/src/third_party/portage-stable/net-misc/iputils/Manifest b/sdk_container/src/third_party/portage-stable/net-misc/iputils/Manifest index cb2bd7e2b0..f7f14140dc 100644 --- a/sdk_container/src/third_party/portage-stable/net-misc/iputils/Manifest +++ b/sdk_container/src/third_party/portage-stable/net-misc/iputils/Manifest @@ -1,47 +1,31 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 - AUX 021109-uclibc-no-ether_ntohost.patch 635 SHA256 cf8135fd380918890a1da8de438d5283111f1e9ea0754b4f5c78bb703fcf617b SHA512 29ccbbf19bd40e9c929af403227f49586a4cb79d7ef948710b34b0813d116017530ef1bf0082b093b4179edff1daa275906cfb9a565f61dd5bed10f24b66fd38 WHIRLPOOL e5390a41b0764d78cda651dd6fff2ebd4f206dc6f5b34da370c19cee7d44f373035fc1efa2bf90924b5a06ca48f344f80a2c902abe04eb588d01e0a9d59bf79d -AUX iputils-20070202-idn.patch 3303 SHA256 449e356a14aee6ad27ac4581055d489da764403447df8f2a50ecb1c4ac71e533 SHA512 42037984cf29e1166cca31fd4325e3deed5739a5aa9ba3632a201f06bb5ae76b291a10350f6cff037cfa158c5573a5f6c9bb420c21041779669497760d5d232d WHIRLPOOL 3183deb53d6773c884b46efc86ddf231b934b91d34742158b17d4901f4b8aab292ac9e18414816d611f922ecf2d252d76c7b2f49a0f7489ff031f8b9022d99c9 -AUX iputils-20071127-infiniband.patch 7748 SHA256 98336a7656f2b0e1f080223395658ac57f545ef47644d68e989664a184c769d5 SHA512 9b74062ff74551b4de1cedcf4854e77759e3936b54e2db5fd9cdbbc8028a55495a2a2c10fc0514fc374343a644bf0c9706076480703e45a41c9f552846d93a51 WHIRLPOOL 6a0cd3df4080c7937c2f6de8fa3ea8eb8da5e5337d1c28ae706e81678373f4064c74f4da46dca0a3cdf461fce92948b58ea2629d2573b4098c712bfdeedbc08e -AUX iputils-20071127-kernel-ifaddr.patch 1467 SHA256 24d24c86676c8d6febb52650e53f202051ec9f185932b87d8400eee0f77f569e SHA512 a7cfd4f660a0742509d6e7b3985d81404ebef453fd32fd2a28118bc7304ba957e8306c6acd16609d88c41918fa49c9ae9c83c59e16fedd951cbdcbff544b17b7 WHIRLPOOL 89958a184cd4f4ff59b880c17f995bf16a4957ba163f3989d3ea2d99e8d2c1a603101ee9194c3f17970dc452fc52d8cf251da75e259846da9fcf4e20a9e8893f AUX iputils-20071127-nonroot-floodping.patch 497 SHA256 f0c7c2d4843873da96f795fb766a65ed39b6d8ab74ae4aa5a47444c9a3db0e52 SHA512 96ea32977cdb2e3c98341b75214a35e88296600d14bc929f7691951325be8e90e8ff6ccf83fb2419db3c910a8169fb2a4348000fab33679039ec5cf2d07a3ee8 WHIRLPOOL 1f880978cf70188d0d59e79396f8c5962655c00cbf7f7c7adb800316dea1b6748ddbc788681c9831edf0fbb1153e85b5ca35e0e3c131b0a5b4884fa511119c0c -AUX iputils-20100418-aliasing.patch 2897 SHA256 8df8b1c510a1630d06d71f801d57c9182729f0308545026b999868ad55469914 SHA512 d50595a1c4a6f4b54099050569cde2fb1e5ebe553cca7d45d6cc674b075086b7d1fc54816ca92bc5856dc14e62b6d20b5ebc1c39cc1786f46a96b7e08bdca3ad WHIRLPOOL 129ff37eff62a115cfdbfe6ae5a6b529cb290a909dace4d5e71ffd37aa7707d3313c0de1e7bf31a41c9ec0b7365ef05d9a406c85cb96dbffe418b3e78e62c6c7 -AUX iputils-20100418-makefile.patch 974 SHA256 910914b0184a65aa15d42979bb7e3d272697310231005673cf2f46648deb6a4b SHA512 c3c9096cd2587e39afdd0a78291a4f67249e2fc75c303cd648a795f7c88dc7e9e2c27f3f56fe6d7d40bdcb0d179dfd35f1c991ba8fd3524149f8cbb94d9ef0ca WHIRLPOOL b4fa577f4b52792165abda924a1980fb1101c7f5a15714b4a9647535e5be622c54e6ef0f731212a74b1a6fc1ddfcf54f98e5c0a0c540e0113823e7646dd6df8a -AUX iputils-20100418-openssl.patch 628 SHA256 4e009a36451b599b2717ec6c6d7d9adb4723d7629fffaf07a5926ee80af9a3ea SHA512 c7bf0317e893386172e65679ead3e1eebcb7805f96f99de4170df495fc9ed573b03b51a1ab69bc0390705914cba72b61e5e33a454eb8ec43a7fd07ae50ffb3dc WHIRLPOOL a3b53d485d948a50dc988af65eaafa73fc08d88cbc2731061ae5607e110f01af3cd009e2287a9a633728768def7702392fae7ccb17e322bee214bee76c958553 -AUX iputils-20100418-printf-size.patch 1658 SHA256 95ce6cdf73cd5dbfbd962131fc1f6513713d4874ca161f5b24eaed21d58a1cfc SHA512 556237d39043815f196b0f22ec552bfb52ad2d45b2faf67e26712361bc11acd21cec42b8241ccf72778b421b9f456a37e9466dbfc03c0df2be1e1bb5ae48a92e WHIRLPOOL 80d03f09a6b023413845f5fe12e6decd87e70c143ad79215d66b1fd29c42bf7b61580addac910dd2134c9d4bf41432f21c7a63184e76aa1bdd936621da6b12d6 -AUX iputils-20100418-proper-libs.patch 427 SHA256 6566f7dd311df08ed51a03758ef3137a24b1883452f86df1821bc266c6d1616f SHA512 b6f42a1dda591ccde770a665387ff3a0c0fe925180487ef57852ad5a76f1bd781d56e3266894e8868d84a7016f7d6fecf1068e4ced7b1e104a9a54b08ed4427c WHIRLPOOL d2f7bb97bb2871b2a84412da5303b87cdefa0b3d5fe115fbaad6fb6b58907c83f39c04e3573e7cef76401f66beee698ac0676f0fdfadeaff6ab79b2d3a6476b7 AUX iputils-20100418-so_mark.patch 597 SHA256 3c0c3e93d3b458a02f856be3681c2dd5bfb18933e4752e90dc277cdd353b3576 SHA512 453ef3f8c53e2c2cef54f19219b892e51a83a6109f73a4f10712aec729509f02e6b830ab7ca85843a70f3d9c9860f084b256290f638741d573a5205ba89fe469 WHIRLPOOL 502e9ee110555644fd7d19d64afba3d2777844faca6fe0111b4b7356e3262c011b8de13475db1e70dff9225e3883d7e3e27d1f96f240a80d4c5c9ab0a29c9560 -AUX iputils-20101006-owl-pingsock.diff 6390 SHA256 1425efd6d30e6c9682569ff1de731922351048f81df44a2ebad30cca85fc51c9 SHA512 0e609aa8088572244a57d719124df2719d5b0a3b37861afb08aa434192c1801e03617254b7caca8f47749cf72c2da8c52f007eb0c136a64f5abd44ad9960cc1d WHIRLPOOL dc9824a7761fd384e8a5c991d02201cb18b4aeb666a0d83ca18ce0e59216a46831a219629d796beacb048fb647841d178d64f478288b8e9d2766e10f2d129a10 AUX iputils-20121221-crypto-build.patch 1325 SHA256 cafc281c70d46f2964489b4c19c981bcf203b4c6266d4f49437c3fe67e2027b2 SHA512 922daa01f00c19f8237515b2d3ab73b87daa957cfc491382def2ce1c098ffed943ad4952c94134f3155570f64353abf5348523ea773ce7eb457578f975cc92d2 WHIRLPOOL a39c7dbb9b37849cc3560dc1f814a8c18a9ff9b55e19c3587a7c49286d55323f96d42d33c6f2723d3868506c252272e1d2d6bc3370eb935b479c89514f03c9c5 AUX iputils-20121221-makefile.patch 1791 SHA256 779632822e3440f3b898a50955cb8fb72177f0d1623c9da7c0a8afa68313435f SHA512 5899942b73d4d13e0ff85f22a81e9107b2a04c82cac6b59559a521c5d0bf25007e34b61b2dfdb40c21b221a108f6ba72c1a51fa59359a400ad045c9394c176db WHIRLPOOL c0c13046265ad44d23bde66cf48f64803591b4577861fde0ad7873001cbd9284c8593ce277a39d077b5bab635d0f8aa53ad124ea724bbc4584db36570028f90f AUX iputils-20121221-openssl.patch 2378 SHA256 cc1af5ccdd593b4fa43273cf7de8b9552f0a5d33a72a35fcc4f94cf2c6fc9a44 SHA512 05240c00d0a1f9f878a9826d54cbd0128c2ed5ce7cab4685907956156c3cf2131ccd563812b64490bf915a75f52851396966a590027fc4c1886b2d19f421718b WHIRLPOOL 66052233f933cf30fe1572578012faa380f53580307e880e9a94c001ea14e585b3e28693c8e3883ee6350bb6af04a6931732ebaa284c4e3851b64081e042d081 AUX iputils-20121221-owl-pingsock.diff 6374 SHA256 915e18ee5a03f5636b408ff34a5576ad8899a3d93d5fe8182984c3565bd94375 SHA512 2f2577230d8bc864adc562c4c5bf33cde3bbabfde633406165b2b61df4e13e2dba74c8561f70d88c3932fc49a41a0276533b715ade208c8608348e4d065c8395 WHIRLPOOL 205179fa205e8bd88a9077cf628ec1a060189ee01d55c45dbe754f3bc36a496531cb9eab120507eff5d72140c934a7480d6a015fa6020f7dcecdfbc6ef590443 +AUX iputils-20121221-parallel-doc.patch 2042 SHA256 151aed9018976387d4001050b41ad5e28630a6e8ab88a0f8501ceb5c9424620e SHA512 cc3a0416c1380d4b799412769270f8fa522a8f931706b318f33add4b02b82e76b177ae6c976408405a83a6c84036f918a41cb3008ee17bf39ea30e8d1f5dc46d WHIRLPOOL adf1b6f7351dd3a255403529268b0c805198905123d6663ef860c72c6bf848029158419b701be39ce144f575de76b76140836ae30259aef2662df9e1c2a57659 AUX iputils-20121221-printf-size.patch 1671 SHA256 a1ed939d0e008bca06208ae34e3f17a0ddc66b50f1679f82a630b52cdfbd111a SHA512 ff5491ad5a0396bee41fcbfc1384699d396c24da093bd2209dead67f52efcec462dbfb4a43008083742d0139da7bd52e922499b5f7eae028384c74930453dd33 WHIRLPOOL 8582495e9c58a01c3aafe6d0c968df910e672af20d420980ba7503800ad75e308c62cd53f86b5aaa8ef9d232ee7a0a4ea7bb3d9cd9735045ae0f6a21f8e419ee -DIST iputils-s20101006-manpages.tar.bz2 21638 SHA256 071b13a9154070168204ff49fa2564b56e4a1706020a2923ba9d3198f317d954 SHA512 313f11bd59b89b4be33eb613140b23ead87c731abfb82944bde16fbb46d0c29f896d3c1a06f6bf0f92f103b5f867d25b361dbb4bba364a1393945e9c94ebe2ca WHIRLPOOL d0b394a21b660fa014b31c90dce28d2b28ccc72e4223ad0e206609f5e167ed21fc514dcc956f9545771f44649c75d9bf996b51a5d058ef59d7e12cb18f8dc64e -DIST iputils-s20101006.tar.bz2 94386 SHA256 fd3af46c80ebb99607c2ca1f2a3608b6fe828e25bbec6e54f2afd25f6ddb6ee7 SHA512 3a001e7a69074c6c48bd328c57ba9bd5e465bcc0005a03187ccd127d74ed4d083e76e43c34b123eb6cf246e16716b1e56613ffd611aa2eea83e70337a95e0360 WHIRLPOOL 4a9e95ef95806bcae74ebbb6716229a1326a2e7323318af6e242690ff359e51323aaefed5c8838605fdc9f977b48dca293c7b8db88bc629a4433d865297db19e +AUX iputils-20121221-strtod.patch 1133 SHA256 461a883439a09854b483bce02187aa78eb16cb88364a834257d52f00ca4941cc SHA512 2e4dc1bdc8192c7c028bacb7f82fc13de2529f1dfdba71bbb05f04b468a609b343f8e1798bf991a1326d03a701428256960b2c0b7601bc84b50076b64c5ee946 WHIRLPOOL c781f7cab0d0910a48f91eb24647c0fda29b986ed11d35b1f275fb9cc6c1c2e53c0ea062668fed2d560a6bac751d7fa7f50b907324a79bbe560cffc65078833a +AUX iputils-20121221-tftpd-setid.patch 815 SHA256 8b1351b43b69a9147b93a0744e57d2634c1fd2abf99856a7447d633bde9cbce4 SHA512 55f7fe0d7312429dd1ec3a9232a4e6436b1115b1b555d5af52f5ee04fe54fdf782dbb018d0dbae1c2e38913057bfa42261a2e57d90c0063b8259029adfa08123 WHIRLPOOL df55138a63fb1b1998e5957eb33f8dfd008dbf9d0701f89dc1bb56a9841b4b9e66ec8d76b83652409655e9b4a953f858eec005fe19463283437a2e477f4ac448 +AUX iputils-20121221-tftpd-syslog.patch 1075 SHA256 8502f11dd440a9df42da52e3426fa93aa4e4d879093be723601a4adf52c62d2b SHA512 43fa506475f138e92d04bd6a4417511caa3ed1636f6dea5d3930b6dca164a809338ab1f24b4bf084581ff849189a8240929182fa24897e252994851a6aae5188 WHIRLPOOL b32d3eeb0dd48012e8e5ed6ad14d603c1280e7203ce5ba6f465bfc005bb44b5fcac23eced9a6b7353966749541ab75380b347c98e46805e3e542562474f024df +AUX iputils-20150815-nonroot-floodping.patch 406 SHA256 0a2409e1dd040620adc88720f1bb3955d2121762dc600865167332f9b90f3f57 SHA512 4f63d788d4aeccd66c410b6cc3352934a9b7d9b1222dedbcd7688c2b884b620a308b44e2dc777421cef20365a6ae371d59ad349f76bc5fcc751f90169a8f0d34 WHIRLPOOL 56d86953105832e589e2b75ea6a806c09ae21d8b9f82e6734cd0b5522b7dfb0291c6f65fdd4baffa120281dc176dd6a5d0bf6f730bd35147a6e654feb02eb5cf +AUX iputils-20150815-ping6_crypto.patch 921 SHA256 3fb3a7ba52ce48c8bd85e37877923ec38a32638d9f05e4dbb6cbde1ed4d28545 SHA512 091f89607cf47877df2b7df4539f66754efa559a3009dedc8a75cea6a2335ee6d7dfcdb24bc7f5cf8eac3c14c6e913d0bae56b64a4e944b60bcc116e196e4941 WHIRLPOOL 6f23a247b4d0909d53d2a5e53fbf37f551e666e157097370cd0409905703fc53e5844069c6551993f7711fbcbc7c72d04aeeb54fc0a9075e1babbfa7f8ff4e6c +AUX iputils-20150815-ping_default_ipv4.patch 1744 SHA256 f00e3a2fdc2dcc4cbdf1aef0cc8cf839a96b6b1db3369655e47d691c811f0417 SHA512 3cfd2e15acfc3e5caf15e3a52d52b5e1dd13f780ff0899a63d4660ecde36a29fd962fc7f45b7cb081175aeedbed06220bc5c39d2883f818359371cdeef6aa797 WHIRLPOOL 1e85775c63c4db7cfed6ff18ca19bd41c477c8a7d82120a1821733bc3f328d9030a74e8b898e6274047e9034ab9986007db77929dfe1bfb958d4220136c0262d +AUX iputils-99999999-openssl.patch 2532 SHA256 0ffcce81badea00e84bdaf49929bc657ab574e98824a65ea3cd9015421372644 SHA512 2f782d93466d2db7d01295c7ec7c24fdb529e28f76c703c112d5dc8b4600402a68d4caf3c1df4f8879149e6fa52bb208dd14879cb01741544ccd49552e017afb WHIRLPOOL f51c56cbf23076f3db504a008e1eb732c9f961c86f815af57dfde96627fd2f15cc9fccae26481bb39a4365d3333e9080984f46bbd9370b9cfbfaf52625b5dfe3 +AUX iputils-99999999-tftpd-syslog.patch 1075 SHA256 8502f11dd440a9df42da52e3426fa93aa4e4d879093be723601a4adf52c62d2b SHA512 43fa506475f138e92d04bd6a4417511caa3ed1636f6dea5d3930b6dca164a809338ab1f24b4bf084581ff849189a8240929182fa24897e252994851a6aae5188 WHIRLPOOL b32d3eeb0dd48012e8e5ed6ad14d603c1280e7203ce5ba6f465bfc005bb44b5fcac23eced9a6b7353966749541ab75380b347c98e46805e3e542562474f024df +AUX rarpd.conf.d 250 SHA256 86e79f5a4be44f8b15a8743b4b3128f2bcc40a553f81ebfd902c590f82d12a60 SHA512 8ff4c38b4f51f92ec6d66a446272e0cd9d958c3075162c5a4aa47eb54bb69f27045b888f8a547394ab3de51bdb69f14b8df528785a8c967fa33ab0c4db329338 WHIRLPOOL bf9e8b6d15dfaa4e76e0af91781cfa675b6db547e9293ea67f0ced50ed2e7ccd880bcbdffac12a197f85f1d643148cb806a10ce9d586c89be1f26248c1fc6aaf +AUX rarpd.init.d 589 SHA256 122795e0a588358a9a7d7b1cd6ab85f0a09eea78d390dd6ad7943037510430c9 SHA512 b073185b1c0d68bd5b9c8638072ae61bfb4c4744c351b17ab009c02c710bdfceccb621830f879b6175d50b1c5ea35bc809463cb9d4b4d38561b83b931c906bf2 WHIRLPOOL e099828b016ab23d4e501a18bab064ea21fed6b6a837c97918c64ae1c4305ed06fcf60b6f7c48cfba8c957eccb78a8c52b040d6175b821245a32238d12f2292e +DIST iputils-20150815.tar.gz 194508 SHA256 1f9c11783e9db90b3ebc43145e412160d989fb133a573638745379957c73c082 SHA512 ce899b1fa4b4a423c0430831d77eed660f7fdb98a0bf0532fd8dfa11f4b5f90c7b7d8199dd265fc0ac0e318f3ef2ef353f61bbd290cce77746df646a29edf85a WHIRLPOOL 763bc8b886d1678428be2dedb3060358ef06beeb7297c4197a4e7772d5919183a90ac35a8f933222d880edb60e169817128b605286379636acf63bc2d78e32f4 DIST iputils-s20121221-manpages.tar.bz2 23778 SHA256 6fc7ed7d281b7a2ee00e4f75e5465c90498c685bcc988afdff74db4eaa736d1c SHA512 006be62e61bf1555c99dbd5aac270cbd8d1074a3016fdde3aeed47e5c9b1acd326aa30a596c532d6688827f7f61966a6e3141eaa3b6f4f943eb21ac227282d8c WHIRLPOOL da0ccb577c4b2189553419df2c093404752fb2865eb3e0bfececfc242d930ceb44f96b32d945cfdd0c9ca060359651b2ec8479db5cc9220cda412dfeee5e910d DIST iputils-s20121221.tar.bz2 155344 SHA256 450f549fc5b620c23c5929aa6d54b7ddfc7ee1cb1e8efdc5e8bb21d8d0c5319f SHA512 693d240becd766c345c3af2053fc0699b9358e54d667d40738c21d731b70e779112d81476a220d8300ca54250120385414a13610d445996f95a90571047389f4 WHIRLPOOL 64529180eb4b8e2f7a60c18df7cac49e10a4b7702514252d418b16dcdc10a85ccb0a7f8beb51274cc9d708be2026c4c136e720986795fd39d314e4f9d5590ec9 -EBUILD iputils-20101006-r2.ebuild 2887 SHA256 1b9c683f1532748b27ef1d14c462ee254234c755629135371815c7930ebb395e SHA512 6a2accea1c49891e3bcb483dd16ea6d0801c6eb59babdbb1ff488f40c940b76d2a56cefb46208836c67f1b18de4d090a72e36e37893cc1bccd3f68da75afc356 WHIRLPOOL c8301bed7a59a1422a75a4afa6723e2535e2ce522f4c2edc1cd82b1005dfc678647fc00f7a411d8a3faa0fa170b212b8cd49dbc8ddb7fed4b46f64084d73d994 -EBUILD iputils-20121221-r1.ebuild 2889 SHA256 520da2bc12db2296d988d9df5774036a21e57dac66c4607c6b5581081d00e73f SHA512 b177d82fcc2f52e836ad09f98f588241c5a14a5a8cb0a9ddda6e2c1f90730bc26faa7ff78c56acd3a2266dfa728aa9d215af0c35e8cef9acb9e4b8c2f9217417 WHIRLPOOL 637dc3dd10ce5bc0c5375071b2725ea2bd784c369099c15b0e586e04f96b0159258430c5ace56ea90cd3adf4ae635ce0b290750a34168e89336f384dabcb958b -EBUILD iputils-20121221.ebuild 2842 SHA256 65fa7a954b98dfd3e87e9403d3c3fbb1494fb04ea57144415fe246d78e7277be SHA512 278d77f3bc47e913228052dac430e475680c7429c83ea46f944f9c71cb2a7b568d628eb56e8a538ac32d37db0260a69da6d7aa6ce9ff4c3bde150f53a518510a WHIRLPOOL ffb59c1a117e3cca54463589b66ba7bafc84cf1f76a021c1d3163f3723dbaea88296b431bbba368bc08c4845d250822661e99fd13527d5dfd445dcddf80dff62 -EBUILD iputils-99999999.ebuild 2831 SHA256 a17029468a76c652a88da3b34f6ea6de7f359dae6a7eb2b6bbe76733739e10fe SHA512 f6888eab731f7ff50ca4ec28f16db00a60ef4f2b003d42d42bfc11d2b1fc6fae7fa80bebacd89ebe0e303f4a4871297d902f84534de8c64b406d94a1b3a45188 WHIRLPOOL 04602c5675494881f3b6bd78b08f13c82d3ca4e7f37c97b6fd32a0a9061b3a237fb3a6b9862e43ce0b1791b6fa4c122011efcec290bcc0d06358306a01033b85 -MISC ChangeLog 18507 SHA256 2abedecccf1c2f83c2718e3ca6927d4b943ad204827e75ef3ec07fca640b0109 SHA512 a03eac9f891b92757e3948e0a49e007b5b91d37f54810eb9d96fe2145f3751403b5dac0890b7eab5c97d827d6917d3a4e3b8bb5db1dc0b3b34b6b44818ce5acd WHIRLPOOL 933a85b4a7a5c579e9b3b745d5cdf81706eae133b628ef45876091d2733a5a06e04361b0ce70f0d1ae459b86778a34f2fcef03bed1054c7df8143b593fdc0f9c -MISC metadata.xml 386 SHA256 36462bcda28f18d127af12e2c6fdf58a813f3a5018a9151695892c1b706da52d SHA512 d7529383e575fbdbae4c96123530672192198cf1c4fc3a22097c42ddb3d179b8c99c67e274fbade85c68fc742d5792fb5286f40993f1099dc4694b1cf9942224 WHIRLPOOL 24417ef5492727316830ab0f208138c8ba41ae3e51b46e398297b1ed823f7d801e1cb4bb2ca6d87035f37a4072919073bd99dd8677cb67f3263258cb72184764 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.19 (GNU/Linux) - -iQIcBAEBCAAGBQJRtQk/AAoJELEHsLL7fEFWN3oQAI9jJr06b42bp5FWJ/y/T0/i -XRzI9/PophNo1JvUrImGZ29QpDCcjQCrm4Xla/Aw8Jbf/6xdvIkDXiy6oBK8ebKc -6vDpOU0rSBJ1TO7Graou1rjd/yKihVHD/VcE8plirqnguOkbVTvEH1rUesyP3+rE -f2qQI3ZPXN3D2UvYnx49q29mqOGGBn6ddPy6Zy1SNg2Fk3LxfjXZ8gcpNksE/9pZ -DvQn9CaQiii+LsKotsWrkgf87sMjrCJKV+AUuci2V7unlr2Iks717Og1s14tNu4V -sxC+fJWhnUROblEok0wv4kMCKYNJZEVSeokLf2xN6UPE8VsEC8pCoLKp8tNV6xGE -7KS3FIo/P+l+qGZdFFWEBa4oDNLhUK6Wmta98Syg2CaIfyoCNLyU8KiOdQMDsFmw -iTPGnBka3ffm8HH1vHoIfeG4pqJJoB++A1UCHahllZ7S84l8zR5LypWonSmy4l5U -aXCWigrL/2+vsmuEL9BSgHZN23taHKhMlIDzGrN1H6GS9KHX0id+LmHalU6LxfDi -PDfxZXmSVkGGNlzyy/CmpwD/8m1hMH+fHGHgY1eBqZyac8mN1Z/cBVBC6/Lk1ofz -gZ/4hd/VZiIPulWy2c4mr0vhDziahKUND6eyFsXX2V4YIZIjV2r2Cc3DF5JVYOXM -7Qxe1OyEBRI2W/AkjOeD -=RyE/ ------END PGP SIGNATURE----- +DIST iputils-s20150815-manpages.tar.xz 22508 SHA256 d82fac64808f9a3f8dee114a62bc0a652243522bf8e535605eaf46d886c2febe SHA512 cb57758203aa49874cc14b4a92db8566775a62da6e50caa55f98e362348fe026898de7aded09f62b4c26e245e89ffde4a37a6810bdaa6619480071917009b1bb WHIRLPOOL f4616abf8857a46420a115ef2f3b6918ab36a1e5160ee8422e985d669672505a7c259a38dc09742405a467b3caa5d552653cfb3e07c15eab97e1326181cbfd99 +EBUILD iputils-20121221-r1.ebuild 2823 SHA256 18221323f1267a0fb814e01726a19beb0a80d22b00d2f0a705beb1d3f34091b8 SHA512 9e02c7d71f597db483a59dd54432b90042d71a45a8bb6d8963e86d23a15e2f866815bea546b7a9b6b1e69064bdbb43876e0c20c1f781668605fb56b9c67636e5 WHIRLPOOL 2b265e7a769d856fe276d0594f5e63443302a41cf7704f625eaa8f83c8e6d7253264ef83deddbed06d50b2680a7af24ca1d57de67f24c5ad1c78c6afc7267761 +EBUILD iputils-20121221-r2.ebuild 3983 SHA256 3de96dec854f23be26a4fa589609e3b3dc2af359461e9694259e1380dbb3b5d0 SHA512 d9bf4a7e6eaf5d4eb131ed31823688d12b30bfca99b1e3f825f387d9761231a414fbdeeddc0fccb302f1ee86fa18516424fb339a4b5d2771e2eabc6a839fad2c WHIRLPOOL d1e33a3ca9324ff2b7e41fa4f099548650d1578285d61428798d181bbdf9300b8b50fb9f0a8d79bf972943177433b048a6c6645786f893c89d3fb5e6e2833c66 +EBUILD iputils-20121221.ebuild 2743 SHA256 eb8f5c741e7b4232f7b9c55e89725924c4bdde5872cf289c6e1da5fb0bb73bbc SHA512 aa681940591c9761c2219f6ed0d1baa9a73694c7fbc8098ffb362b5e011b8c4a489e4028d01a803fb3031a9950884367dbdcbcc0dd57951755d1d764ab39e9fa WHIRLPOOL b72040f158e57cc51a441fd899c3e5e1eec147390f18bd1e8e91bca6719e00e1677340ec98697f88a9e63800cce77b4bb376b5c6c7e905a13b5dafb3f02f6ab0 +EBUILD iputils-20150815-r1.ebuild 3928 SHA256 53b8e6985a7f00a121c5609801c40f11c91ea0a40849cba9b4a491d79da7b0f1 SHA512 065b380da0eaa122307842c531d161a8f2d55333b89891dcc70f4ed835b562a2696e962c8dab741447eaa4e47d02bae8e7bf2f995a908e3f3e35d72ee779c744 WHIRLPOOL 8323b72c5afeb9c8be660863ecd11c2f7580dacb6de1ef22f0789ea1d2261039029c66aa96b42a67d6236a7541be45810aab01e2408d0a9615a9a67c339ec99e +EBUILD iputils-20150815.ebuild 3848 SHA256 0c448b2e4540cb15c313978b3e0f0131fb038c4e215633b87a5d6b39b9a5b687 SHA512 91abae29b0f5e2af17ed7b07e3bdb682315f376deecc68d9f6df69854dc021737dd4171bf054ad26089840c78ddc025955266b58a6d701381b72c08a20091315 WHIRLPOOL e4e8648048d67cbeb1093e06f972d88df75f646d75ac6391c58b9f117761789daaf16d5592cbb24a3df8934dcb2af8e7f8db96a28f68144368b74b81e7076908 +EBUILD iputils-99999999.ebuild 3783 SHA256 cfb6634701b3ab82d908bcc0f39475c9380a1d31f1d6378a711af12155f0d9b6 SHA512 d62d68018370ed2fce97ff00eddfe167ea6eb7683078da8922683d2e34fd4d347b6c4dd94b2de3ea013a6489e13837c45c7f9e999c8ef19cbc971374d0898982 WHIRLPOOL 7c25792f8b234dfcf987f34b50f756c9edd4b7560bafe5ebe28a492b34eea247bbc89c5762285a15c4ad654a71133957bb33134bffe8ba1e770cc7adbe7a0dc6 +MISC ChangeLog 22418 SHA256 9558c8a0c5143189ef51deae9371d71bd200f5f08a8aff2de94786c42a06b400 SHA512 01a5bbc5d9f4cadd403c4a455d029792278e23c5d78c830fcc685e5706bc19ec240e3807e48da80d0ed84e103e7ddf465f7b9500af42b31bd6fb8d22465e76cb WHIRLPOOL 3aa152858f0cca507036021355ce50823635655e932d51c3f4e7915b1239385931f07385d19a0e04e6795b628f356cdf8a7e6b39b20280c9de7eaf7e4cf6fade +MISC metadata.xml 1544 SHA256 3d3b11c6a26a85655a73649b3544ad66a8e2bec0e53d1823f4384bc146556778 SHA512 4142c8d96113854441d8780c0271f1318cbec3b8110c1dfb81b1b98729cd6d3456971113af5efdb81694e7f692b2e8eebdc77165667e4f8828c93e14c829e2fc WHIRLPOOL c4afeb85fe99fd2e6e998a1eec979b4bee1611e5355d77a1f19f1d5468afd8c53615a4f096b5925dc359c3b40a5b82b040eb798276578fdbce39e75b59b3f01e diff --git a/sdk_container/src/third_party/portage-stable/net-misc/iputils/files/iputils-20070202-idn.patch b/sdk_container/src/third_party/portage-stable/net-misc/iputils/files/iputils-20070202-idn.patch deleted file mode 100644 index 98dc3ce545..0000000000 --- a/sdk_container/src/third_party/portage-stable/net-misc/iputils/files/iputils-20070202-idn.patch +++ /dev/null @@ -1,158 +0,0 @@ -sniped from Fedora and made to not suck - -http://bugs.gentoo.org/218638 - ---- iputils-s20070202/Makefile -+++ iputils-s20070202/Makefile -@@ -22,6 +22,11 @@ - - all: $(TARGETS) - -+ifeq ($(IDN),yes) -+CPPFLAGS += -DIDN -+ping: LDLIBS += -lidn -+ping6: LDLIBS += -lidn -+endif - - tftpd: tftpd.o tftpsubs.o - ping: ping.o ping_common.o ---- iputils-s20070202/ping.c -+++ iputils-s20070202/ping.c -@@ -58,6 +58,11 @@ - * This program has to run SUID to ROOT to access the ICMP socket. - */ - -+#ifdef IDN -+#include -+#include -+#endif -+ - #include "ping_common.h" - - #include -@@ -122,6 +128,12 @@ - char *target, hnamebuf[MAXHOSTNAMELEN]; - char rspace[3 + 4 * NROUTES + 1]; /* record route space */ - -+#ifdef IDN -+ char *idn; -+ int rc = 0; -+ setlocale(LC_ALL, ""); -+#endif -+ - icmp_sock = socket(AF_INET, SOCK_RAW, IPPROTO_ICMP); - socket_errno = errno; - -@@ -242,13 +254,35 @@ - if (argc == 1) - options |= F_NUMERIC; - } else { -+#ifdef IDN -+ rc = idna_to_ascii_lz (target, &idn, 0); -+ if (rc == IDNA_SUCCESS) -+ hp = gethostbyname (idn); -+ else { -+ fprintf(stderr, "ping: IDN encoding of '%s' failed with error code %d\n", target, rc); -+ exit(2); -+ } -+ free(idn); -+#else - hp = gethostbyname(target); -+#endif - if (!hp) { - fprintf(stderr, "ping: unknown host %s\n", target); - exit(2); - } - memcpy(&whereto.sin_addr, hp->h_addr, 4); -+#ifdef IDN -+ rc = idna_to_unicode_lzlz (hp->h_name, &idn, 0); -+ if (rc == IDNA_SUCCESS) -+ strncpy(hnamebuf, idn, sizeof(hnamebuf) - 1); -+ else { -+ fprintf(stderr, "ping: IDN encoding of '%s' failed with error code %d\n", hp->h_name, rc); -+ exit(2); -+ } -+ free(idn); -+#else - strncpy(hnamebuf, hp->h_name, sizeof(hnamebuf) - 1); -+#endif - hnamebuf[sizeof(hnamebuf) - 1] = 0; - hostname = hnamebuf; - } ---- iputils-s20070202/ping6.c -+++ iputils-s20070202/ping6.c -@@ -66,6 +66,13 @@ - * More statistics could always be gathered. - * This program has to run SUID to ROOT to access the ICMP socket. - */ -+#ifdef IDN -+#ifndef _GNU_SOURCE -+#define _GNU_SOURCE -+#endif -+#include -+#endif -+ - #include "ping_common.h" - - #include -@@ -210,6 +216,10 @@ - int err, csum_offset, sz_opt; - static uint32_t scope_id = 0; - -+#ifdef IDN -+ setlocale(LC_ALL, ""); -+#endif -+ - icmp_sock = socket(AF_INET6, SOCK_RAW, IPPROTO_ICMPV6); - socket_errno = errno; - -@@ -296,6 +306,9 @@ - - memset(&hints, 0, sizeof(hints)); - hints.ai_family = AF_INET6; -+#ifdef IDN -+ hints.ai_flags = AI_IDN; -+#endif - gai = getaddrinfo(target, NULL, &hints, &ai); - if (gai) { - fprintf(stderr, "unknown host\n"); -@@ -328,6 +341,9 @@ - - memset(&hints, 0, sizeof(hints)); - hints.ai_family = AF_INET6; -+#ifdef IDN -+ hints.ai_flags = AI_IDN; -+#endif - gai = getaddrinfo(target, NULL, &hints, &ai); - if (gai) { - fprintf(stderr, "unknown host\n"); ---- iputils-s20070202/ping_common.c -+++ iputils-s20070202/ping_common.c -@@ -1,3 +1,7 @@ -+#ifdef IDN -+#include -+#endif -+ - #include "ping_common.h" - #include - #include -@@ -97,6 +102,9 @@ - - void common_options(int ch) - { -+#ifdef IDN -+ setlocale(LC_ALL, "C"); -+#endif - switch(ch) { - case 'a': - options |= F_AUDIBLE; -@@ -222,6 +230,9 @@ - default: - abort(); - } -+#ifdef IDN -+ setlocale(LC_ALL, ""); -+#endif - } - - diff --git a/sdk_container/src/third_party/portage-stable/net-misc/iputils/files/iputils-20071127-infiniband.patch b/sdk_container/src/third_party/portage-stable/net-misc/iputils/files/iputils-20071127-infiniband.patch deleted file mode 100644 index 2bf06a2045..0000000000 --- a/sdk_container/src/third_party/portage-stable/net-misc/iputils/files/iputils-20071127-infiniband.patch +++ /dev/null @@ -1,280 +0,0 @@ -Otherwise same as Fedora patch except for the Makefile part - -http://bugs.gentoo.org/show_bug.cgi?id=377687 -http://pkgs.fedoraproject.org/gitweb/?p=iputils.git;a=blob_plain;f=iputils-20071127-infiniband.patch;hb=HEAD - ---- arping.c -+++ arping.c -@@ -32,8 +32,6 @@ - #include - #include - --#include -- - #include "SNAPSHOT.h" - - static void usage(void) __attribute__((noreturn)); -@@ -52,14 +50,22 @@ int unicasting; - int s; - int broadcast_only; - --struct sockaddr_storage me; --struct sockaddr_storage he; -+struct sockaddr_ll *me=NULL; -+struct sockaddr_ll *he=NULL; - - struct timeval start, last; - - int sent, brd_sent; - int received, brd_recv, req_recv; - -+#define SYSFS_MNT_PATH "/sys" -+#define SYSFS_CLASS "class" -+#define SYSFS_NET "net" -+#define SYSFS_BROADCAST "broadcast" -+#define SYSFS_PATH_ENV "SYSFS_PATH" -+#define SYSFS_PATH_LEN 256 -+#define SOCKADDR_LEN (2 * sizeof(struct sockaddr_ll)) -+ - #define MS_TDIFF(tv1,tv2) ( ((tv1).tv_sec-(tv2).tv_sec)*1000 + \ - ((tv1).tv_usec-(tv2).tv_usec)/1000 ) - -@@ -166,6 +172,10 @@ void finish(void) - printf("\n"); - fflush(stdout); - } -+ -+ free(me); -+ free(he); -+ - if (dad) - exit(!!received); - if (unsolicited) -@@ -186,8 +196,7 @@ void catcher(void) - finish(); - - if (last.tv_sec==0 || MS_TDIFF(tv,last) > 500) { -- send_pack(s, src, dst, -- (struct sockaddr_ll *)&me, (struct sockaddr_ll *)&he); -+ send_pack(s, src, dst, me, he); - if (count == 0 && unsolicited) - finish(); - } -@@ -234,7 +243,7 @@ int recv_pack(unsigned char *buf, int le - return 0; - if (ah->ar_pln != 4) - return 0; -- if (ah->ar_hln != ((struct sockaddr_ll *)&me)->sll_halen) -+ if (ah->ar_hln != me->sll_halen) - return 0; - if (len < sizeof(*ah) + 2*(4 + ah->ar_hln)) - return 0; -@@ -245,7 +254,7 @@ int recv_pack(unsigned char *buf, int le - return 0; - if (src.s_addr != dst_ip.s_addr) - return 0; -- if (memcmp(p+ah->ar_hln+4, ((struct sockaddr_ll *)&me)->sll_addr, ah->ar_hln)) -+ if (memcmp(p+ah->ar_hln+4, me->sll_addr, ah->ar_hln)) - return 0; - } else { - /* DAD packet was: -@@ -263,7 +272,7 @@ int recv_pack(unsigned char *buf, int le - */ - if (src_ip.s_addr != dst.s_addr) - return 0; -- if (memcmp(p, ((struct sockaddr_ll *)&me)->sll_addr, ((struct sockaddr_ll *)&me)->sll_halen) == 0) -+ if (memcmp(p, me->sll_addr, me->sll_halen) == 0) - return 0; - if (src.s_addr && src.s_addr != dst_ip.s_addr) - return 0; -@@ -279,7 +288,7 @@ int recv_pack(unsigned char *buf, int le - printf("for %s ", inet_ntoa(dst_ip)); - s_printed = 1; - } -- if (memcmp(p+ah->ar_hln+4, ((struct sockaddr_ll *)&me)->sll_addr, ah->ar_hln)) { -+ if (memcmp(p+ah->ar_hln+4, me->sll_addr, ah->ar_hln)) { - if (!s_printed) - printf("for "); - printf("["); -@@ -305,40 +314,67 @@ int recv_pack(unsigned char *buf, int le - if (quit_on_reply) - finish(); - if(!broadcast_only) { -- memcpy(((struct sockaddr_ll *)&he)->sll_addr, p, ((struct sockaddr_ll *)&me)->sll_halen); -+ memcpy(he->sll_addr, p, me->sll_halen); - unicasting=1; - } - return 1; - } - --void set_device_broadcast(char *device, unsigned char *ba, size_t balen) -+int get_sysfs_mnt_path(char *mnt_path, size_t len) - { -- struct sysfs_class_device *dev; -- struct sysfs_attribute *brdcast; -- unsigned char *p; -- int ch; -+ const char *sysfs_path_env; -+ int pth_len=0; - -- dev = sysfs_open_class_device("net", device); -- if (!dev) { -- perror("sysfs_open_class_device(net)"); -- exit(2); -- } -+ if (len == 0 || mnt_path == NULL) -+ return -1; - -- brdcast = sysfs_get_classdev_attr(dev, "broadcast"); -- if (!brdcast) { -- perror("sysfs_get_classdev_attr(broadcast)"); -- exit(2); -- } -+ /* possible overrride of real mount path */ -+ sysfs_path_env = getenv(SYSFS_PATH_ENV); -+ memset(mnt_path, 0, len); -+ strncpy(mnt_path, -+ sysfs_path_env != NULL ? sysfs_path_env : SYSFS_MNT_PATH, -+ len-1); - -- if (sysfs_read_attribute(brdcast)) { -- perror("sysfs_read_attribute"); -- exit(2); -- } -+ if ((pth_len = strlen(mnt_path)) > 0 && mnt_path[pth_len-1] == '/') -+ mnt_path[pth_len-1] = '\0'; -+ -+ return 0; -+} -+ -+int make_sysfs_broadcast_path(char *broadcast_path, size_t len) -+{ -+ char mnt_path[SYSFS_PATH_LEN]; -+ -+ if (get_sysfs_mnt_path(mnt_path, len) != 0) -+ return -1; - -- for (p = ba, ch = 0; p < ba + balen; p++, ch += 3) -- *p = strtoul(brdcast->value + ch, NULL, 16); -+ snprintf(broadcast_path, len, -+ "%s/" SYSFS_CLASS "/" SYSFS_NET "/%s/" SYSFS_BROADCAST, -+ mnt_path, device); - -- return; -+ return 0; -+} -+ -+char * read_sysfs_broadcast(char *brdcast_path) -+{ -+ int fd; -+ int len_to_read; -+ char *brdcast = NULL; -+ -+ if ((fd = open(brdcast_path, O_RDONLY)) > -1) { -+ len_to_read = lseek(fd, 0L, SEEK_END); -+ if ((brdcast = malloc(len_to_read+1)) != NULL) { -+ lseek(fd, 0L, SEEK_SET); -+ memset(brdcast, 0, len_to_read+1); -+ if (read(fd, brdcast, len_to_read) == -1) { -+ free(brdcast); -+ brdcast = NULL; -+ } -+ } -+ close(fd); -+ } -+ -+ return brdcast; - } - - int -@@ -356,6 +392,17 @@ main(int argc, char **argv) - exit(-1); - } - -+ me = malloc(SOCKADDR_LEN); -+ if (!me) { -+ fprintf(stderr, "arping: could not allocate memory\n"); -+ exit(1); -+ } -+ he = malloc(SOCKADDR_LEN); -+ if (!he) { -+ fprintf(stderr, "arping: could not allocate memory\n"); -+ exit(1); -+ } -+ - while ((ch = getopt(argc, argv, "h?bfDUAqc:w:s:I:V")) != EOF) { - switch(ch) { - case 'b': -@@ -504,34 +551,51 @@ main(int argc, char **argv) - close(probe_fd); - }; - -- ((struct sockaddr_ll *)&me)->sll_family = AF_PACKET; -- ((struct sockaddr_ll *)&me)->sll_ifindex = ifindex; -- ((struct sockaddr_ll *)&me)->sll_protocol = htons(ETH_P_ARP); -- if (bind(s, (struct sockaddr*)&me, sizeof(me)) == -1) { -+ me->sll_family = AF_PACKET; -+ me->sll_ifindex = ifindex; -+ me->sll_protocol = htons(ETH_P_ARP); -+ if (bind(s, (struct sockaddr*)me, SOCKADDR_LEN) == -1) { - perror("bind"); - exit(2); - } - - if (1) { -- socklen_t alen = sizeof(me); -- if (getsockname(s, (struct sockaddr*)&me, &alen) == -1) { -+ socklen_t alen = SOCKADDR_LEN; -+ if (getsockname(s, (struct sockaddr*)me, &alen) == -1) { - perror("getsockname"); - exit(2); - } - } -- if (((struct sockaddr_ll *)&me)->sll_halen == 0) { -+ if (me->sll_halen == 0) { - if (!quiet) - printf("Interface \"%s\" is not ARPable (no ll address)\n", device); - exit(dad?0:2); - } - -- he = me; -+ memcpy(he, me, SOCKADDR_LEN); - - #if 1 -- set_device_broadcast(device, ((struct sockaddr_ll *)&he)->sll_addr, -- ((struct sockaddr_ll *)&he)->sll_halen); -+ char brdcast_path[SYSFS_PATH_LEN]; -+ char *brdcast_val=NULL; -+ char *next_ch; -+ -+ if (make_sysfs_broadcast_path(brdcast_path, sizeof brdcast_path) != 0) { -+ perror("sysfs attribute broadcast"); -+ exit(2); -+ } -+ -+ if ((brdcast_val = read_sysfs_broadcast(brdcast_path)) == NULL) { -+ perror("sysfs read broadcast value"); -+ exit(2); -+ } -+ -+ for (ch=0; chsll_halen; ch++) { -+ he->sll_addr[ch] = strtol(brdcast_val + (ch*3), &next_ch, 16); -+ } -+ -+ free(brdcast_val); - #else -- memset(((struct sockaddr_ll *)&he)->sll_addr, -1, ((struct sockaddr_ll *)&he)->sll_halen); -+ memset(he->sll_addr, -1, he->sll_halen); - #endif - - if (!quiet) { ---- Makefile -+++ Makefile -@@ -28,7 +28,6 @@ - ping6: LDLIBS += -lidn - endif - --arping: LDLIBS += -lsysfs - ping6: LDLIBS += -lresolv -lcrypto - - tftpd: tftpd.o tftpsubs.o diff --git a/sdk_container/src/third_party/portage-stable/net-misc/iputils/files/iputils-20071127-kernel-ifaddr.patch b/sdk_container/src/third_party/portage-stable/net-misc/iputils/files/iputils-20071127-kernel-ifaddr.patch deleted file mode 100644 index af5587fa6f..0000000000 --- a/sdk_container/src/third_party/portage-stable/net-misc/iputils/files/iputils-20071127-kernel-ifaddr.patch +++ /dev/null @@ -1,55 +0,0 @@ ---- rarpd.c -+++ rarpd.c -@@ -55,10 +55,10 @@ struct iflink - unsigned char lladdr[16]; - char name[IFNAMSIZ]; -- struct ifaddr *ifa_list; -+ struct kern_ifaddr *ifa_list; - } *ifl_list; - --struct ifaddr -+struct kern_ifaddr - { -- struct ifaddr *next; -+ struct kern_ifaddr *next; - __u32 prefix; - __u32 mask; -@@ -92,5 +92,5 @@ void load_if(void) - struct ifreq *ifrp, *ifend; - struct iflink *ifl; -- struct ifaddr *ifa; -+ struct kern_ifaddr *ifa; - struct ifconf ifc; - struct ifreq ibuf[256]; -@@ -183,5 +183,5 @@ void load_if(void) - if (mask == 0 || prefix == 0) - continue; -- ifa = (struct ifaddr*)malloc(sizeof(*ifa)); -+ ifa = (struct kern_ifaddr*)malloc(sizeof(*ifa)); - memset(ifa, 0, sizeof(*ifa)); - ifa->local = addr; -@@ -239,8 +239,8 @@ int bootable(__u32 addr) - } - --struct ifaddr *select_ipaddr(int ifindex, __u32 *sel_addr, __u32 **alist) -+struct kern_ifaddr *select_ipaddr(int ifindex, __u32 *sel_addr, __u32 **alist) - { - struct iflink *ifl; -- struct ifaddr *ifa; -+ struct kern_ifaddr *ifa; - int retry = 0; - int i; -@@ -298,5 +298,5 @@ struct rarp_map *rarp_lookup(int ifindex - if (r == NULL) { - if (hatype == ARPHRD_ETHER && halen == 6) { -- struct ifaddr *ifa; -+ struct kern_ifaddr *ifa; - struct hostent *hp; - char ename[256]; -@@ -371,5 +371,5 @@ int put_myipaddr(unsigned char **ptr_p, - __u32 laddr = 0; - struct iflink *ifl; -- struct ifaddr *ifa; -+ struct kern_ifaddr *ifa; - - for (ifl=ifl_list; ifl; ifl = ifl->next) diff --git a/sdk_container/src/third_party/portage-stable/net-misc/iputils/files/iputils-20100418-aliasing.patch b/sdk_container/src/third_party/portage-stable/net-misc/iputils/files/iputils-20100418-aliasing.patch deleted file mode 100644 index 48fb4d3bc2..0000000000 --- a/sdk_container/src/third_party/portage-stable/net-misc/iputils/files/iputils-20100418-aliasing.patch +++ /dev/null @@ -1,93 +0,0 @@ -From f36fbe8c85223def663f46499d0b6b9a75939aaa Mon Sep 17 00:00:00 2001 -From: Mike Frysinger -Date: Sat, 14 Aug 2010 01:34:13 -0400 -Subject: [PATCH] fix up strict-aliasing warnings - -Current build of some tools results in gcc warning about strict-aliasing -violations. So change those freaky casts to memcpy's. When the pointer -types work out, gcc will optimize this away anyways. - -Signed-off-by: Mike Frysinger ---- - ping6.c | 13 +++++++++---- - tracepath.c | 2 +- - tracepath6.c | 2 +- - 3 files changed, 11 insertions(+), 6 deletions(-) - -diff --git a/ping6.c b/ping6.c -index c5ff881..86f9216 100644 ---- a/ping6.c -+++ b/ping6.c -@@ -1104,18 +1104,21 @@ int build_niquery(__u8 *_nih) - { - struct ni_hdr *nih; - int cc; -+ __u16 this_nonce; - - nih = (struct ni_hdr *)_nih; - nih->ni_cksum = 0; - -- CLR(ntohs((*(__u16*)(nih->ni_nonce))) % mx_dup_ck); -+ memcpy(&this_nonce, &nih->ni_nonce, sizeof(this_nonce)); -+ CLR(ntohs(this_nonce) % mx_dup_ck); - - nih->ni_type = ICMPV6_NI_QUERY; - cc = sizeof(*nih); - datalen = 0; - - memcpy(nih->ni_nonce, ni_nonce, sizeof(nih->ni_nonce)); -- *(__u16*)(nih->ni_nonce) = htons(ntransmitted + 1); -+ this_nonce = htons(ntransmitted + 1); -+ memcpy(&nih->ni_nonce, &this_nonce, sizeof(this_nonce)); - - nih->ni_code = ni_subject_type; - nih->ni_qtype = htons(ni_query); -@@ -1331,7 +1334,7 @@ parse_reply(struct msghdr *msg, int cc, void *addr, struct timeval *tv) - #endif - if (c->cmsg_len < CMSG_LEN(sizeof(int))) - continue; -- hops = *(int*)CMSG_DATA(c); -+ memcpy(&hops, CMSG_DATA(c), sizeof(int)); - } - } - -@@ -1355,7 +1358,9 @@ parse_reply(struct msghdr *msg, int cc, void *addr, struct timeval *tv) - return 0; - } else if (icmph->icmp6_type == ICMPV6_NI_REPLY) { - struct ni_hdr *nih = (struct ni_hdr *)icmph; -- __u16 seq = ntohs(*(__u16 *)nih->ni_nonce); -+ __u16 seq; -+ memcpy(&seq, &nih->ni_nonce, sizeof(seq)); -+ seq = ntohs(seq); - if (memcmp(&nih->ni_nonce[2], &ni_nonce[2], sizeof(ni_nonce) - sizeof(__u16))) - return 1; - if (gather_statistics((__u8*)icmph, sizeof(*icmph), cc, -diff --git a/tracepath.c b/tracepath.c -index ca84a69..0a14b1b 100644 ---- a/tracepath.c -+++ b/tracepath.c -@@ -142,7 +142,7 @@ restart: - if (cmsg->cmsg_type == IP_RECVERR) { - e = (struct sock_extended_err *) CMSG_DATA(cmsg); - } else if (cmsg->cmsg_type == IP_TTL) { -- rethops = *(int*)CMSG_DATA(cmsg); -+ memcpy(&rethops, CMSG_DATA(cmsg), sizeof(int)); - } else { - printf("cmsg:%d\n ", cmsg->cmsg_type); - } -diff --git a/tracepath6.c b/tracepath6.c -index 5c2db8f..77a3563 100644 ---- a/tracepath6.c -+++ b/tracepath6.c -@@ -170,7 +170,7 @@ restart: - #ifdef IPV6_2292HOPLIMIT - case IPV6_2292HOPLIMIT: - #endif -- rethops = *(int*)CMSG_DATA(cmsg); -+ memcpy(&rethops, CMSG_DATA(cmsg), sizeof(int)); - break; - default: - printf("cmsg6:%d\n ", cmsg->cmsg_type); --- -1.7.1.1 - diff --git a/sdk_container/src/third_party/portage-stable/net-misc/iputils/files/iputils-20100418-makefile.patch b/sdk_container/src/third_party/portage-stable/net-misc/iputils/files/iputils-20100418-makefile.patch deleted file mode 100644 index 50a0e81c13..0000000000 --- a/sdk_container/src/third_party/portage-stable/net-misc/iputils/files/iputils-20100418-makefile.patch +++ /dev/null @@ -1,35 +0,0 @@ ---- Makefile -+++ Makefile -@@ -1,20 +1,17 @@ - # Path to parent kernel include files directory - LIBC_INCLUDE=/usr/include - --DEFINES= -- - #options if you have a bind>=4.9.4 libresolv (or, maybe, glibc) - LDLIBS= --ADDLIB= - - #options if you compile with libc5, and without a bind>=4.9.4 libresolv - # NOT AVAILABLE. Please, use libresolv. - --CC=gcc - # What a pity, all new gccs are buggy and -Werror does not work. Sigh. - #CCOPT=-D_GNU_SOURCE -O2 -Wstrict-prototypes -Wall -g -Werror --CCOPT=-D_GNU_SOURCE -O2 -Wstrict-prototypes -Wall -g --CFLAGS=$(CCOPT) $(GLIBCFIX) $(DEFINES) -+CFLAGS ?= -O2 -g -+CFLAGS += -Wstrict-prototypes -Wall -+CPPFLAGS += -D_GNU_SOURCE - - IPV4_TARGETS=tracepath ping clockdiff rdisc arping tftpd rarpd - IPV6_TARGETS=tracepath6 traceroute6 ping6 -@@ -35,7 +32,7 @@ - rdisc_srv: rdisc_srv.o - - rdisc_srv.o: rdisc.c -- $(CC) $(CFLAGS) -DRDISC_SERVER -o rdisc_srv.o rdisc.c -+ $(CC) $(CFLAGS) $(CPPFLAGS) -DRDISC_SERVER -o rdisc_srv.o rdisc.c - - - check-kernel: diff --git a/sdk_container/src/third_party/portage-stable/net-misc/iputils/files/iputils-20100418-openssl.patch b/sdk_container/src/third_party/portage-stable/net-misc/iputils/files/iputils-20100418-openssl.patch deleted file mode 100644 index db09ac0e65..0000000000 --- a/sdk_container/src/third_party/portage-stable/net-misc/iputils/files/iputils-20100418-openssl.patch +++ /dev/null @@ -1,35 +0,0 @@ -make openssl optional - -https://bugs.gentoo.org/335436 - ---- ping6.c -+++ ping6.c -@@ -161,7 +161,9 @@ - - static int icmp_sock; - -+#ifdef HAVE_OPENSSL - #include -+#endif - - /* Node Information query */ - int ni_query = -1; -@@ -478,6 +480,7 @@ - - char *ni_groupaddr(const char *name) - { -+#ifdef HAVE_OPENSSL - MD5_CTX ctxt; - __u8 digest[16]; - static char nigroup_buf[INET6_ADDRSTRLEN + 1 + IFNAMSIZ]; -@@ -518,6 +521,10 @@ - if (q) - strcat(nigroup_buf, q); - return nigroup_buf; -+#else -+ fprintf(stderr, "ping6: function not available; openssl disabled\n"); -+ exit(1); -+#endif - } - - int main(int argc, char *argv[]) diff --git a/sdk_container/src/third_party/portage-stable/net-misc/iputils/files/iputils-20100418-printf-size.patch b/sdk_container/src/third_party/portage-stable/net-misc/iputils/files/iputils-20100418-printf-size.patch deleted file mode 100644 index edde65b591..0000000000 --- a/sdk_container/src/third_party/portage-stable/net-misc/iputils/files/iputils-20100418-printf-size.patch +++ /dev/null @@ -1,62 +0,0 @@ -From 6ccd3b91c18d8b13bc468ef962a9ef9dfc6c4515 Mon Sep 17 00:00:00 2001 -From: Mike Frysinger -Date: Sat, 14 Aug 2010 01:16:42 -0400 -Subject: [PATCH] tracepath: re-use printf return in print_host - -The printf funcs take an int for field widths, not a size_t. Also, since -the printf funcs already return the length of chars displayed, use that -value instead of re-calculating the length with strlen. - -Signed-off-by: Mike Frysinger ---- - tracepath.c | 11 ++++------- - tracepath6.c | 11 ++++------- - 2 files changed, 8 insertions(+), 14 deletions(-) - -diff --git a/tracepath.c b/tracepath.c -index 81c22e9..ca84a69 100644 ---- a/tracepath.c -+++ b/tracepath.c -@@ -68,13 +68,10 @@ void data_wait(int fd) - - void print_host(const char *a, const char *b, int both) - { -- size_t plen = 0; -- printf("%s", a); -- plen = strlen(a); -- if (both) { -- printf(" (%s)", b); -- plen += strlen(b) + 3; -- } -+ int plen; -+ plen = printf("%s", a); -+ if (both) -+ plen += printf(" (%s)", b); - if (plen >= HOST_COLUMN_SIZE) - plen = HOST_COLUMN_SIZE - 1; - printf("%*s", HOST_COLUMN_SIZE - plen, ""); -diff --git a/tracepath6.c b/tracepath6.c -index 5cc7424..5c2db8f 100644 ---- a/tracepath6.c -+++ b/tracepath6.c -@@ -80,13 +80,10 @@ void data_wait(int fd) - - void print_host(const char *a, const char *b, int both) - { -- size_t plen = 0; -- printf("%s", a); -- plen = strlen(a); -- if (both) { -- printf(" (%s)", b); -- plen += strlen(b) + 3; -- } -+ int plen; -+ plen = printf("%s", a); -+ if (both) -+ plen += printf(" (%s)", b); - if (plen >= HOST_COLUMN_SIZE) - plen = HOST_COLUMN_SIZE - 1; - printf("%*s", HOST_COLUMN_SIZE - plen, ""); --- -1.7.1.1 - diff --git a/sdk_container/src/third_party/portage-stable/net-misc/iputils/files/iputils-20100418-proper-libs.patch b/sdk_container/src/third_party/portage-stable/net-misc/iputils/files/iputils-20100418-proper-libs.patch deleted file mode 100644 index 96e529b1b8..0000000000 --- a/sdk_container/src/third_party/portage-stable/net-misc/iputils/files/iputils-20100418-proper-libs.patch +++ /dev/null @@ -1,20 +0,0 @@ -http://bugs.gentoo.org/332703 - ---- Makefile -+++ Makefile -@@ -28,10 +28,13 @@ - ping6: LDLIBS += -lidn - endif - -+arping: LDLIBS += -lsysfs -+ping6: LDLIBS += -lresolv -lcrypto -+ - tftpd: tftpd.o tftpsubs.o --arping: arping.o -lsysfs -+arping: arping.o - ping: ping.o ping_common.o --ping6: ping6.o ping_common.o -lresolv -lcrypto -+ping6: ping6.o ping_common.o - ping.o ping6.o ping_common.o: ping_common.h - tftpd.o tftpsubs.o: tftp.h - diff --git a/sdk_container/src/third_party/portage-stable/net-misc/iputils/files/iputils-20101006-owl-pingsock.diff b/sdk_container/src/third_party/portage-stable/net-misc/iputils/files/iputils-20101006-owl-pingsock.diff deleted file mode 100644 index 86c85bcaa2..0000000000 --- a/sdk_container/src/third_party/portage-stable/net-misc/iputils/files/iputils-20101006-owl-pingsock.diff +++ /dev/null @@ -1,224 +0,0 @@ -http://openwall.info/wiki/people/segoon/ping - ---- iputils-s20101006/ping.c -+++ iputils-s20101006/ping.c -@@ -88,6 +88,7 @@ struct sockaddr_in whereto; /* who to pi - int optlen = 0; - int settos = 0; /* Set TOS, Precendence or other QOS options */ - int icmp_sock; /* socket file descriptor */ -+int using_ping_socket = 0; - u_char outpack[0x10000]; - int maxpacket = sizeof(outpack); - -@@ -123,7 +124,11 @@ main(int argc, char **argv) - char *target, hnamebuf[MAX_HOSTNAMELEN]; - char rspace[3 + 4 * NROUTES + 1]; /* record route space */ - -- icmp_sock = socket(AF_INET, SOCK_RAW, IPPROTO_ICMP); -+ icmp_sock = socket(AF_INET, SOCK_DGRAM, IPPROTO_ICMP); -+ if (icmp_sock != -1) -+ using_ping_socket = 1; -+ else -+ icmp_sock = socket(AF_INET, SOCK_RAW, IPPROTO_ICMP); - socket_errno = errno; - - uid = getuid(); -@@ -377,13 +382,35 @@ main(int argc, char **argv) - } - } - -- if ((options&F_STRICTSOURCE) && -- bind(icmp_sock, (struct sockaddr*)&source, sizeof(source)) == -1) { -- perror("bind"); -- exit(2); -+ if (!using_ping_socket) { -+ if ((options&F_STRICTSOURCE) && -+ bind(icmp_sock, (struct sockaddr*)&source, sizeof(source)) == -1) { -+ perror("bind"); -+ exit(2); -+ } -+ } else { -+ struct sockaddr_in sa; -+ socklen_t sl; -+ -+ sa.sin_family = AF_INET; -+ sa.sin_port = 0; -+ sa.sin_addr.s_addr = (options&F_STRICTSOURCE) ? -+ source.sin_addr.s_addr : 0; -+ sl = sizeof(sa); -+ -+ if (bind(icmp_sock, (struct sockaddr *) &sa, sl) == -1) { -+ perror("bind"); -+ exit(2); -+ } -+ -+ if (getsockname(icmp_sock, (struct sockaddr *) &sa, &sl) == -1) { -+ perror("getsockname"); -+ exit(2); -+ } -+ ident = sa.sin_port; - } - -- if (1) { -+ if (!using_ping_socket) { - struct icmp_filter filt; - filt.data = ~((1<ee_origin == SO_EE_ORIGIN_ICMP) { - struct sockaddr_in *sin = (struct sockaddr_in*)(e+1); -+ int error_pkt; - - if (res < sizeof(icmph) || - target.sin_addr.s_addr != whereto.sin_addr.s_addr || -@@ -576,9 +610,18 @@ int receive_error_msg() - goto out; - } - -- acknowledge(ntohs(icmph.un.echo.sequence)); -+ error_pkt = (e->ee_type != ICMP_REDIRECT && -+ e->ee_type != ICMP_SOURCE_QUENCH); -+ if (error_pkt) { -+ acknowledge(ntohs(icmph.un.echo.sequence)); -+ net_errors++; -+ nerrors++; -+ } -+ else { -+ saved_errno = 0; -+ } - -- if (!working_recverr) { -+ if (!using_ping_socket && !working_recverr) { - struct icmp_filter filt; - working_recverr = 1; - /* OK, it works. Add stronger filter. */ -@@ -589,15 +632,14 @@ int receive_error_msg() - perror("\rWARNING: setsockopt(ICMP_FILTER)"); - } - -- net_errors++; -- nerrors++; - if (options & F_QUIET) - goto out; - if (options & F_FLOOD) { -- write(STDOUT_FILENO, "\bE", 2); -+ if (error_pkt) -+ write(STDOUT_FILENO, "\bE", 2); - } else { - print_timestamp(); -- printf("From %s icmp_seq=%u ", pr_addr(sin->sin_addr.s_addr), ntohs(icmph.un.echo.sequence)); -+ printf("From %s: icmp_seq=%u ", pr_addr(sin->sin_addr.s_addr), ntohs(icmph.un.echo.sequence)); - pr_icmph(e->ee_type, e->ee_code, e->ee_info, NULL); - fflush(stdout); - } -@@ -695,15 +737,41 @@ parse_reply(struct msghdr *msg, int cc, - struct iphdr *ip; - int hlen; - int csfailed; -+ struct cmsghdr *cmsg; -+ int ttl; -+ __u8 *opts; -+ int optlen; - - /* Check the IP header */ - ip = (struct iphdr *)buf; -- hlen = ip->ihl*4; -- if (cc < hlen + 8 || ip->ihl < 5) { -- if (options & F_VERBOSE) -- fprintf(stderr, "ping: packet too short (%d bytes) from %s\n", cc, -- pr_addr(from->sin_addr.s_addr)); -- return 1; -+ if (!using_ping_socket) { -+ hlen = ip->ihl*4; -+ if (cc < hlen + 8 || ip->ihl < 5) { -+ if (options & F_VERBOSE) -+ fprintf(stderr, "ping: packet too short (%d bytes) from %s\n", cc, -+ pr_addr(from->sin_addr.s_addr)); -+ return 1; -+ } -+ ttl = ip->ttl; -+ opts = buf + sizeof(struct iphdr); -+ optlen = hlen - sizeof(struct iphdr); -+ } else { -+ hlen = 0; -+ ttl = 0; -+ opts = buf; -+ optlen = 0; -+ for (cmsg = CMSG_FIRSTHDR(msg); cmsg; cmsg = CMSG_NXTHDR(msg, cmsg)) { -+ if (cmsg->cmsg_level != SOL_IP) -+ continue; -+ if (cmsg->cmsg_type == IP_TTL) { -+ if (cmsg->cmsg_len < sizeof(int)) -+ continue; -+ ttl = *(int *) CMSG_DATA(cmsg); -+ } else if (cmsg->cmsg_type == IP_RETOPTS) { -+ opts = (__u8 *) CMSG_DATA(cmsg); -+ optlen = cmsg->cmsg_len; -+ } -+ } - } - - /* Now the ICMP part */ -@@ -716,7 +784,7 @@ parse_reply(struct msghdr *msg, int cc, - return 1; /* 'Twas not our ECHO */ - if (gather_statistics((__u8*)icp, sizeof(*icp), cc, - ntohs(icp->un.echo.sequence), -- ip->ttl, 0, tv, pr_addr(from->sin_addr.s_addr), -+ ttl, 0, tv, pr_addr(from->sin_addr.s_addr), - pr_echo_reply)) - return 0; - } else { -@@ -807,7 +875,7 @@ parse_reply(struct msghdr *msg, int cc, - } - - if (!(options & F_FLOOD)) { -- pr_options(buf + sizeof(struct iphdr), hlen); -+ pr_options(opts, optlen + sizeof(struct iphdr)); - - if (options & F_AUDIBLE) - putchar('\a'); -@@ -916,8 +984,7 @@ void pr_icmph(__u8 type, __u8 code, __u3 - printf("Redirect, Bad Code: %d", code); - break; - } -- if (icp) -- printf("(New nexthop: %s)\n", pr_addr(icp->un.gateway)); -+ printf("(New nexthop: %s)\n", pr_addr(icp ? icp->un.gateway : info)); - if (icp && (options & F_VERBOSE)) - pr_iph((struct iphdr*)(icp + 1)); - break; -@@ -1217,7 +1284,7 @@ void install_filter(void) - insns - }; - -- if (once) -+ if (once || using_ping_socket) - return; - once = 1; - ---- iputils-s20101006/ping_common.c -+++ iputils-s20101006/ping_common.c -@@ -515,7 +515,8 @@ void setup(int icmp_sock) - *p++ = i; - } - -- ident = htons(getpid() & 0xFFFF); -+ if (!ident) -+ ident = htons(getpid() & 0xFFFF); - - set_signal(SIGINT, sigexit); - set_signal(SIGALRM, sigexit); diff --git a/sdk_container/src/third_party/portage-stable/net-misc/iputils/files/iputils-20121221-parallel-doc.patch b/sdk_container/src/third_party/portage-stable/net-misc/iputils/files/iputils-20121221-parallel-doc.patch new file mode 100644 index 0000000000..22bfb8811e --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/net-misc/iputils/files/iputils-20121221-parallel-doc.patch @@ -0,0 +1,74 @@ +From 4e322b85a12ba3ef5e8118724e3442b2ebb0f6d6 Mon Sep 17 00:00:00 2001 +From: Mike Frysinger +Date: Wed, 1 Aug 2012 11:43:34 -0400 +Subject: [PATCH iputils] doc: fix parallel build of html/man pages + +The use of the same tempdir prevents building of these files in parallel. +So build all of them in unique tempdirs so we can do them in parallel. + +Signed-off-by: Mike Frysinger +--- + doc/Makefile | 37 ++++++++++++++++++++++++------------- + 1 file changed, 24 insertions(+), 13 deletions(-) + +diff --git a/doc/Makefile b/doc/Makefile +index 7ec4f1c..4f930a3 100644 +--- a/doc/Makefile ++++ b/doc/Makefile +@@ -12,29 +12,40 @@ man: $(MANFILES) + # lots of some strange temporary junk directories and files. + # So, scope it to a temporary dir and clean all after each run. + +-$(HTMLFILES): index.db +- @-rm -rf tmp.db2html +- @mkdir tmp.db2html +- @set -e; cd tmp.db2html; docbook2html ../$< ; mv *.html .. +- @-rm -rf tmp.db2html ++SETUP_TMPDIR = \ ++ t="tmp.db2html.$@"; \ ++ rm -rf $$t; \ ++ mkdir $$t; \ ++ cd $$t ++CLEAN_TMPDIR = \ ++ cd ..; \ ++ rm -rf $$t ++ ++MAKE_HTML = \ ++ @set -e; \ ++ $(SETUP_TMPDIR); \ ++ docbook2html ../$<; \ ++ mv *.html ..; \ ++ $(CLEAN_TMPDIR) + ++$(HTMLFILES): index.db ++ $(MAKE_HTML) + iputils.html: iputils.db +- @-rm -rf tmp.db2html +- @mkdir tmp.db2html +- @set -e; cd tmp.db2html; docbook2html -u -o html ../$< ; mv html/$@ .. +- @-rm -rf tmp.db2html ++ $(MAKE_HTML) + + # docbook2man produces utterly ugly output and I did not find + # any way to customize this but hacking backend perl script a little. + # Well, hence... + + $(MANFILES): index.db +- @-mkdir tmp.db2man +- @set -e; cd tmp.db2man; nsgmls ../$< | sgmlspl ../docbook2man-spec.pl ; mv $@ .. +- @-rm -rf tmp.db2man ++ @set -e; \ ++ $(SETUP_TMPDIR); \ ++ nsgmls ../$< | sgmlspl ../docbook2man-spec.pl; \ ++ mv $@ ..; \ ++ $(CLEAN_TMPDIR) + + clean: +- @rm -rf $(MANFILES) $(HTMLFILES) iputils.html tmp.db2html tmp.db2man ++ @rm -rf $(MANFILES) $(HTMLFILES) iputils.html tmp.db2html* tmp.db2man* + + snapshot: + @date "+%y%m%d" > snapshot.db +-- +2.3.5 + diff --git a/sdk_container/src/third_party/portage-stable/net-misc/iputils/files/iputils-20121221-strtod.patch b/sdk_container/src/third_party/portage-stable/net-misc/iputils/files/iputils-20121221-strtod.patch new file mode 100644 index 0000000000..303acf5c42 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/net-misc/iputils/files/iputils-20121221-strtod.patch @@ -0,0 +1,45 @@ +https://bugs.gentoo.org/472592 + +From dd0aa192626f94d08e399fc2a743ee72c50853fb Mon Sep 17 00:00:00 2001 +From: Mike Frysinger +Date: Fri, 24 Apr 2015 20:41:31 -0400 +Subject: [PATCH iputils] ping: fix -i number parsing in locales + +Always use #.# format for the -i flag even when the current locale uses +a different separator. Locale de_DE which uses #,# normally. + +Simple testcase: +$ make USE_IDN=1 +$ LANG=de_DE.UTF8 ./ping -i 0.5 localhost + +Reported-by: Sergey Fionov +Signed-off-by: Mike Frysinger +--- + ping_common.c | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/ping_common.c b/ping_common.c +index 62f53a6..0a37e09 100644 +--- a/ping_common.c ++++ b/ping_common.c +@@ -269,9 +269,17 @@ void common_options(int ch) + double dbl; + char *ep; + ++#ifdef USE_IDN ++ setlocale(LC_ALL, "C"); ++#endif ++ + errno = 0; + dbl = strtod(optarg, &ep); + ++#ifdef USE_IDN ++ setlocale(LC_ALL, ""); ++#endif ++ + if (errno || *ep != '\0' || + !finite(dbl) || dbl < 0.0 || dbl >= (double)INT_MAX / 1000 - 1.0) { + fprintf(stderr, "ping: bad timing interval\n"); +-- +2.3.5 + diff --git a/sdk_container/src/third_party/portage-stable/net-misc/iputils/files/iputils-20121221-tftpd-setid.patch b/sdk_container/src/third_party/portage-stable/net-misc/iputils/files/iputils-20121221-tftpd-setid.patch new file mode 100644 index 0000000000..0ea56685d2 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/net-misc/iputils/files/iputils-20121221-tftpd-setid.patch @@ -0,0 +1,34 @@ +From d81a44625b04d487c895473aa77af13420b7afdd Mon Sep 17 00:00:00 2001 +From: YOSHIFUJI Hideaki +Date: Thu, 19 Jun 2014 17:25:49 +0900 +Subject: [PATCH iputils] tftpd: Exit if setuid()/setgid() failed. + +Signed-off-by: YOSHIFUJI Hideaki +--- + tftpd.c | 10 ++++++++-- + 1 file changed, 8 insertions(+), 2 deletions(-) + +diff --git a/tftpd.c b/tftpd.c +index 2a39ec4..e3af2f4 100644 +--- a/tftpd.c ++++ b/tftpd.c +@@ -111,8 +111,14 @@ int main(int ac, char **av) + + /* Sanity. If parent forgot to setuid() on us. */ + if (geteuid() == 0) { +- setgid(65534); +- setuid(65534); ++ if (setgid(65534)) { ++ syslog(LOG_ERR, "setgid"); ++ exit(1); ++ } ++ if (setuid(65534)) { ++ syslog(LOG_ERR, "setuid"); ++ exit(1); ++ } + } + + ac--; av++; +-- +2.3.5 + diff --git a/sdk_container/src/third_party/portage-stable/net-misc/iputils/files/iputils-20121221-tftpd-syslog.patch b/sdk_container/src/third_party/portage-stable/net-misc/iputils/files/iputils-20121221-tftpd-syslog.patch new file mode 100644 index 0000000000..ad34f3b5f6 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/net-misc/iputils/files/iputils-20121221-tftpd-syslog.patch @@ -0,0 +1,38 @@ +From e88ed3752872d7c7ca37d95eb4d434ca4d3c4eae Mon Sep 17 00:00:00 2001 +From: Mike Frysinger +Date: Sat, 19 Apr 2014 10:39:39 -0400 +Subject: [PATCH iputils] tftpd: fix syslog setup + +Commit d81a44625b04d487c895473aa77af13420b7afdd added support for checking +the set*id calls, but would call syslog() before it had called openlog(). +Move the call up earlier to fix that. + +Signed-off-by: Mike Frysinger +--- + tftpd.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/tftpd.c b/tftpd.c +index e3af2f4..7ddc8eb 100644 +--- a/tftpd.c ++++ b/tftpd.c +@@ -109,6 +109,8 @@ int main(int ac, char **av) + register int n = 0; + int on = 1; + ++ openlog("tftpd", LOG_PID, LOG_DAEMON); ++ + /* Sanity. If parent forgot to setuid() on us. */ + if (geteuid() == 0) { + if (setgid(65534)) { +@@ -125,7 +127,6 @@ int main(int ac, char **av) + while (ac-- > 0 && n < MAXARG) + dirs[n++] = *av++; + +- openlog("tftpd", LOG_PID, LOG_DAEMON); + if (ioctl(0, FIONBIO, &on) < 0) { + syslog(LOG_ERR, "ioctl(FIONBIO): %m\n"); + exit(1); +-- +2.3.5 + diff --git a/sdk_container/src/third_party/portage-stable/net-misc/iputils/files/iputils-20150815-nonroot-floodping.patch b/sdk_container/src/third_party/portage-stable/net-misc/iputils/files/iputils-20150815-nonroot-floodping.patch new file mode 100644 index 0000000000..50e108b09e --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/net-misc/iputils/files/iputils-20150815-nonroot-floodping.patch @@ -0,0 +1,11 @@ +--- iputils-s20150815/ping.h ++++ iputils-s20150815/ping.h +@@ -61,7 +61,7 @@ + + #define MAXWAIT 10 /* max seconds to wait for response */ + #define MININTERVAL 10 /* Minimal interpacket gap */ +-#define MINUSERINTERVAL 200 /* Minimal allowed interval for non-root */ ++#define MINUSERINTERVAL 0 /* Minimal allowed interval for non-root */ + + #define SCHINT(a) (((a) <= MININTERVAL) ? MININTERVAL : (a)) + diff --git a/sdk_container/src/third_party/portage-stable/net-misc/iputils/files/iputils-20150815-ping6_crypto.patch b/sdk_container/src/third_party/portage-stable/net-misc/iputils/files/iputils-20150815-ping6_crypto.patch new file mode 100644 index 0000000000..1e236eed1f --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/net-misc/iputils/files/iputils-20150815-ping6_crypto.patch @@ -0,0 +1,29 @@ +From a45b719645960c9bacb430e452192d6ffac5be19 Mon Sep 17 00:00:00 2001 +From: Lars Wendler +Date: Thu, 20 Aug 2015 13:43:47 +0200 +Subject: [PATCH] Let ping6 use crypto if enabled. + +Signed-off-by: Lars Wendler +--- + Makefile | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/Makefile b/Makefile +index e34be5b..d4cb6c0 100644 +--- a/Makefile ++++ b/Makefile +@@ -159,9 +159,9 @@ LIB_clockdiff = $(LIB_CAP) + + # ping / ping6 + DEF_ping_common = $(DEF_CAP) $(DEF_IDN) +-DEF_ping6_common = $(DEF_CAP) $(DEF_IDN) ++DEF_ping6_common = $(DEF_CAP) $(DEF_IDN) $(DEF_CRYPTO) + DEF_ping = $(DEF_CAP) $(DEF_IDN) $(DEF_WITHOUT_IFADDRS) $(DEF_IPV4) +-LIB_ping = $(LIB_CAP) $(LIB_IDN) $(LIB_RESOLV) ++LIB_ping = $(LIB_CAP) $(LIB_IDN) $(LIB_RESOLV) $(LIB_CRYPTO) + + ping: ping_common.o ping6_common.o + ping.o ping_common.o ping6_common.o: ping.h in6_flowlabel.h +-- +2.5.0 + diff --git a/sdk_container/src/third_party/portage-stable/net-misc/iputils/files/iputils-20150815-ping_default_ipv4.patch b/sdk_container/src/third_party/portage-stable/net-misc/iputils/files/iputils-20150815-ping_default_ipv4.patch new file mode 100644 index 0000000000..71d32f0f4a --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/net-misc/iputils/files/iputils-20150815-ping_default_ipv4.patch @@ -0,0 +1,65 @@ +From 8d4d34eea9fbd25d0103975f366799764bbc4a2f Mon Sep 17 00:00:00 2001 +From: Lars Wendler +Date: Thu, 20 Aug 2015 11:47:22 +0200 +Subject: [PATCH] Add possibility to make ping use IPv4 by default. + +Using ping with a linux kernel without IPv6 capability yields to the +following problem: + +> ping www.google.de +ping: socket: Address family not supported by protocol (raw socket +required by specified options). +> + +because ping is using IPv6 by default when -4 option is omitted. + +Signed-off-by: Lars Wendler +--- + Makefile | 7 ++++++- + ping.c | 5 +++++ + 2 files changed, 11 insertions(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index 8b37c42..e34be5b 100644 +--- a/Makefile ++++ b/Makefile +@@ -114,6 +114,11 @@ ifeq ($(ENABLE_PING6_RTHDR),RFC3542) + endif + endif + ++# DEFAULT TO IPV4 ++ifneq ($(IPV4_DEFAULT),no) ++ DEF_IPV4 = -DIPV4_DEFAULT ++endif ++ + # ------------------------------------- + TARGETS=ping tracepath tracepath6 traceroute6 clockdiff rdisc arping tftpd rarpd + +@@ -155,7 +160,7 @@ LIB_clockdiff = $(LIB_CAP) + # ping / ping6 + DEF_ping_common = $(DEF_CAP) $(DEF_IDN) + DEF_ping6_common = $(DEF_CAP) $(DEF_IDN) +-DEF_ping = $(DEF_CAP) $(DEF_IDN) $(DEF_WITHOUT_IFADDRS) ++DEF_ping = $(DEF_CAP) $(DEF_IDN) $(DEF_WITHOUT_IFADDRS) $(DEF_IPV4) + LIB_ping = $(LIB_CAP) $(LIB_IDN) $(LIB_RESOLV) + + ping: ping_common.o ping6_common.o +diff --git a/ping.c b/ping.c +index ec9708e..a08a03e 100644 +--- a/ping.c ++++ b/ping.c +@@ -439,6 +439,11 @@ main(int argc, char **argv) + + target = argv[argc-1]; + ++#ifdef IPV4_DEFAULT ++ if (hints.ai_family == AF_UNSPEC) ++ hints.ai_family = AF_INET; ++#endif ++ + /* Create sockets */ + enable_capability_raw(); + if (hints.ai_family != AF_INET6) +-- +2.5.0 + diff --git a/sdk_container/src/third_party/portage-stable/net-misc/iputils/files/iputils-99999999-openssl.patch b/sdk_container/src/third_party/portage-stable/net-misc/iputils/files/iputils-99999999-openssl.patch new file mode 100644 index 0000000000..13f5639a6f --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/net-misc/iputils/files/iputils-99999999-openssl.patch @@ -0,0 +1,97 @@ +From 321d64b9f94653322e678e34ac214ddb73a71db8 Mon Sep 17 00:00:00 2001 +From: Mike Frysinger +Date: Thu, 24 Jan 2013 23:32:39 -0500 +Subject: [PATCH iputils] ping6: allow disabling of openssl support + +Signed-off-by: Mike Frysinger +--- + Makefile | 5 ++++- + iputils_md5dig.h | 4 +++- + ping6.c | 10 ++++++++++ + 3 files changed, 17 insertions(+), 2 deletions(-) + +diff --git a/Makefile b/Makefile +index 54e5a6d..7147f08 100644 +--- a/Makefile ++++ b/Makefile +@@ -36,7 +36,7 @@ ARPING_DEFAULT_DEVICE= + + # Libgcrypt (for MD5) for ping6 [yes|no|static] + USE_GCRYPT=yes +-# Crypto library for ping6 [shared|static] ++# Crypto library for ping6 [shared|static|no] + USE_CRYPTO=shared + # Resolv library for ping6 [yes|static] + USE_RESOLV=yes +@@ -63,7 +63,10 @@ ifneq ($(USE_GCRYPT),no) + LIB_CRYPTO = $(call FUNC_LIB,$(USE_GCRYPT),$(LDFLAG_GCRYPT)) + DEF_CRYPTO = -DUSE_GCRYPT + else ++ifneq ($(USE_CRYPTO),no) + LIB_CRYPTO = $(call FUNC_LIB,$(USE_CRYPTO),$(LDFLAG_CRYPTO)) ++ DEF_CRYPTO = -DUSE_OPENSSL ++endif + endif + + # USE_RESOLV: LIB_RESOLV +diff --git a/iputils_md5dig.h b/iputils_md5dig.h +index 4cec866..d6c4d46 100644 +--- a/iputils_md5dig.h ++++ b/iputils_md5dig.h +@@ -5,8 +5,10 @@ + # include + # include + # define IPUTILS_MD5DIG_LEN 16 +-#else ++# define USE_CRYPTO ++#elif defined(USE_OPENSSL) + # include ++# define USE_CRYPTO + #endif + + #ifdef USE_GCRYPT +diff --git a/ping6.c b/ping6.c +index 7085f31..7b7c1af 100644 +--- a/ping6.c ++++ b/ping6.c +@@ -324,6 +324,7 @@ static void niquery_init_nonce(void) + #if !PING6_NONCE_MEMORY + static int niquery_nonce(__u8 *nonce, int fill) + { ++# ifdef USE_CRYPTO + static __u8 digest[MD5_DIGEST_LENGTH]; + static int seq = -1; + +@@ -346,6 +347,10 @@ static int niquery_nonce(__u8 *nonce, int fill) + return -1; + return ntohsp((__u16 *)nonce); + } ++# else ++ fprintf(stderr, "ping6: function not available; crypto disabled\n"); ++ exit(3); ++# endif + } + #endif + +@@ -500,6 +505,7 @@ static int niquery_option_subject_addr_handler(int index, const char *arg) + + static int niquery_option_subject_name_handler(int index, const char *arg) + { ++#ifdef USE_CRYPTO + static char nigroup_buf[INET6_ADDRSTRLEN + 1 + IFNAMSIZ]; + unsigned char *dnptrs[2], **dpp, **lastdnptr; + int n; +@@ -625,6 +631,10 @@ errexit: + free(idn); + free(name); + exit(1); ++#else ++ fprintf(stderr, "ping6: function not available; crypto disabled\n"); ++ exit(3); ++#endif + } + + int niquery_option_help_handler(int index, const char *arg) +-- +2.3.5 + diff --git a/sdk_container/src/third_party/portage-stable/net-misc/iputils/files/iputils-99999999-tftpd-syslog.patch b/sdk_container/src/third_party/portage-stable/net-misc/iputils/files/iputils-99999999-tftpd-syslog.patch new file mode 100644 index 0000000000..ad34f3b5f6 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/net-misc/iputils/files/iputils-99999999-tftpd-syslog.patch @@ -0,0 +1,38 @@ +From e88ed3752872d7c7ca37d95eb4d434ca4d3c4eae Mon Sep 17 00:00:00 2001 +From: Mike Frysinger +Date: Sat, 19 Apr 2014 10:39:39 -0400 +Subject: [PATCH iputils] tftpd: fix syslog setup + +Commit d81a44625b04d487c895473aa77af13420b7afdd added support for checking +the set*id calls, but would call syslog() before it had called openlog(). +Move the call up earlier to fix that. + +Signed-off-by: Mike Frysinger +--- + tftpd.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/tftpd.c b/tftpd.c +index e3af2f4..7ddc8eb 100644 +--- a/tftpd.c ++++ b/tftpd.c +@@ -109,6 +109,8 @@ int main(int ac, char **av) + register int n = 0; + int on = 1; + ++ openlog("tftpd", LOG_PID, LOG_DAEMON); ++ + /* Sanity. If parent forgot to setuid() on us. */ + if (geteuid() == 0) { + if (setgid(65534)) { +@@ -125,7 +127,6 @@ int main(int ac, char **av) + while (ac-- > 0 && n < MAXARG) + dirs[n++] = *av++; + +- openlog("tftpd", LOG_PID, LOG_DAEMON); + if (ioctl(0, FIONBIO, &on) < 0) { + syslog(LOG_ERR, "ioctl(FIONBIO): %m\n"); + exit(1); +-- +2.3.5 + diff --git a/sdk_container/src/third_party/portage-stable/net-misc/iputils/files/rarpd.conf.d b/sdk_container/src/third_party/portage-stable/net-misc/iputils/files/rarpd.conf.d new file mode 100644 index 0000000000..ef7fc48e17 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/net-misc/iputils/files/rarpd.conf.d @@ -0,0 +1,8 @@ +# Config file for /etc/init.d/rarpd + +# You probably want to select the interface for this to listen on. +# By default it uses loopback which most likely won't help. +RARPD_IFACE="lo" + +# See the rarpd(8) manpage for more info. +RARPD_OPTS="-b /tftpboot" diff --git a/sdk_container/src/third_party/portage-stable/net-misc/iputils/files/rarpd.init.d b/sdk_container/src/third_party/portage-stable/net-misc/iputils/files/rarpd.init.d new file mode 100644 index 0000000000..155b0d10f1 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/net-misc/iputils/files/rarpd.init.d @@ -0,0 +1,20 @@ +#!/sbin/runscript +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +pidfile="/var/run/rarpd.pid" +command="/usr/sbin/rarpd" +# The -d option keeps it from forking. This way s-s-d can do the fork and +# set up the pidfile with the right value below. +command_args="-d ${RARPD_OPTS} ${RARPD_IFACE}" +start_stop_daemon_args="--background --make-pidfile" + +start_pre() { + if [ ! -f /etc/ethers ] ; then + eerror "Please create /etc/ethers with the following content:" + eerror "[MAC address] [name or IP]" + return 1 + fi + return 0 +} diff --git a/sdk_container/src/third_party/portage-stable/net-misc/iputils/iputils-20101006-r2.ebuild b/sdk_container/src/third_party/portage-stable/net-misc/iputils/iputils-20101006-r2.ebuild deleted file mode 100644 index 8358e82f33..0000000000 --- a/sdk_container/src/third_party/portage-stable/net-misc/iputils/iputils-20101006-r2.ebuild +++ /dev/null @@ -1,94 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/iputils/iputils-20101006-r2.ebuild,v 1.8 2013/01/25 05:28:28 vapier Exp $ - -# For released versions, we precompile the man/html pages and store -# them in a tarball on our mirrors. This avoids ugly issues while -# building stages, and when the jade/sgml packages are broken (which -# seems to be more common than would be nice). - -EAPI="2" - -inherit flag-o-matic eutils toolchain-funcs -if [[ ${PV} == "99999999" ]] ; then - EGIT_REPO_URI="git://www.linux-ipv6.org/gitroot/iputils" - inherit git-2 -else - SRC_URI="http://www.skbuff.net/iputils/iputils-s${PV}.tar.bz2 - mirror://gentoo/iputils-s${PV}-manpages.tar.bz2" - KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux" -fi - -DESCRIPTION="Network monitoring tools including ping and ping6" -HOMEPAGE="http://www.linuxfoundation.org/collaborate/workgroups/networking/iputils" - -LICENSE="BSD" -SLOT="0" -IUSE="doc idn ipv6 SECURITY_HAZARD ssl static" - -RDEPEND="!net-misc/rarpd - ssl? ( dev-libs/openssl ) - idn? ( net-dns/libidn )" -DEPEND="${RDEPEND} - virtual/os-headers" -if [[ ${PV} == "99999999" ]] ; then - DEPEND+=" - app-text/openjade - dev-perl/SGMLSpm - app-text/docbook-sgml-dtd - app-text/docbook-sgml-utils - " -fi - -S=${WORKDIR}/${PN}-s${PV} - -src_prepare() { - epatch "${FILESDIR}"/021109-uclibc-no-ether_ntohost.patch - epatch "${FILESDIR}"/${PN}-20100418-openssl.patch #335436 - epatch "${FILESDIR}"/${PN}-20100418-so_mark.patch #335347 - epatch "${FILESDIR}"/${PN}-20100418-makefile.patch - epatch "${FILESDIR}"/${PN}-20100418-proper-libs.patch #332703 - epatch "${FILESDIR}"/${PN}-20100418-printf-size.patch - epatch "${FILESDIR}"/${PN}-20100418-aliasing.patch - epatch "${FILESDIR}"/${PN}-20071127-kernel-ifaddr.patch - epatch "${FILESDIR}"/${PN}-20070202-idn.patch #218638 - epatch "${FILESDIR}"/${PN}-20071127-infiniband.patch #377687 - epatch "${FILESDIR}"/${PN}-20101006-owl-pingsock.diff - use SECURITY_HAZARD && epatch "${FILESDIR}"/${PN}-20071127-nonroot-floodping.patch - use static && append-ldflags -static - use ssl && append-cppflags -DHAVE_OPENSSL - use ipv6 || sed -i -e 's:IPV6_TARGETS=:#IPV6_TARGETS=:' Makefile - export IDN=$(use idn && echo yes) -} - -src_compile() { - tc-export CC - emake || die - - if [[ ${PV} == "99999999" ]] ; then - emake -j1 html man || die - fi -} - -src_install() { - into / - dobin ping || die - use ipv6 && dobin ping6 - dosbin arping || die - into /usr - dosbin tracepath || die - use ipv6 && dosbin trace{path,route}6 - dosbin clockdiff rarpd rdisc ipg tftpd || die - - fperms 4711 /bin/ping - use ipv6 && fperms 4711 /bin/ping6 /usr/sbin/traceroute6 - - dodoc INSTALL RELNOTES - use ipv6 \ - && dosym ping.8 /usr/share/man/man8/ping6.8 \ - || rm -f doc/*6.8 - rm -f doc/setkey.8 - doman doc/*.8 - - use doc && dohtml doc/*.html -} diff --git a/sdk_container/src/third_party/portage-stable/net-misc/iputils/iputils-20121221-r1.ebuild b/sdk_container/src/third_party/portage-stable/net-misc/iputils/iputils-20121221-r1.ebuild index ce8e33fa6e..93ec07836f 100644 --- a/sdk_container/src/third_party/portage-stable/net-misc/iputils/iputils-20121221-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/net-misc/iputils/iputils-20121221-r1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/iputils/iputils-20121221-r1.ebuild,v 1.3 2013/01/28 20:05:01 vapier Exp $ +# $Id$ # For released versions, we precompile the man/html pages and store # them in a tarball on our mirrors. This avoids ugly issues while @@ -16,22 +16,25 @@ if [[ ${PV} == "99999999" ]] ; then else SRC_URI="http://www.skbuff.net/iputils/iputils-s${PV}.tar.bz2 mirror://gentoo/iputils-s${PV}-manpages.tar.bz2" - KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux" + KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux" fi DESCRIPTION="Network monitoring tools including ping and ping6" HOMEPAGE="http://www.linuxfoundation.org/collaborate/workgroups/networking/iputils" -LICENSE="BSD" +LICENSE="BSD-4" SLOT="0" IUSE="caps doc gnutls idn ipv6 SECURITY_HAZARD ssl static" LIB_DEPEND="caps? ( sys-libs/libcap[static-libs(+)] ) idn? ( net-dns/libidn[static-libs(+)] ) - ipv6? ( - gnutls? ( net-libs/gnutls[static-libs(+)] ) - ssl? ( dev-libs/openssl:0[static-libs(+)] ) - )" + ipv6? ( ssl? ( + gnutls? ( + net-libs/gnutls[openssl(+)] + net-libs/gnutls[static-libs(+)] + ) + !gnutls? ( dev-libs/openssl:0[static-libs(+)] ) + ) )" RDEPEND="!net-misc/rarpd !static? ( ${LIB_DEPEND//\[static-libs(+)]} )" DEPEND="${RDEPEND} diff --git a/sdk_container/src/third_party/portage-stable/net-misc/iputils/iputils-20121221-r2.ebuild b/sdk_container/src/third_party/portage-stable/net-misc/iputils/iputils-20121221-r2.ebuild new file mode 100644 index 0000000000..965b833c24 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/net-misc/iputils/iputils-20121221-r2.ebuild @@ -0,0 +1,151 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +# For released versions, we precompile the man/html pages and store +# them in a tarball on our mirrors. This avoids ugly issues while +# building stages, and when the jade/sgml packages are broken (which +# seems to be more common than would be nice). + +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 +else + SRC_URI="http://www.skbuff.net/iputils/iputils-s${PV}.tar.bz2 + mirror://gentoo/iputils-s${PV}-manpages.tar.bz2" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux" +fi + +DESCRIPTION="Network monitoring tools including ping and ping6" +HOMEPAGE="http://www.linuxfoundation.org/collaborate/workgroups/networking/iputils" + +LICENSE="BSD-4" +SLOT="0" +IUSE="arping caps clockdiff doc gnutls idn ipv6 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(+)] + ) + !gnutls? ( dev-libs/openssl:0[static-libs(+)] ) + ) )" +RDEPEND="arping? ( !net-misc/arping ) + rarpd? ( !net-misc/rarpd ) + traceroute? ( !net-misc/traceroute ) + !static? ( ${LIB_DEPEND//\[static-libs(+)]} )" +DEPEND="${RDEPEND} + static? ( ${LIB_DEPEND} ) + virtual/os-headers" +if [[ ${PV} == "99999999" ]] ; then + DEPEND+=" + app-text/openjade + dev-perl/SGMLSpm + app-text/docbook-sgml-dtd + app-text/docbook-sgml-utils + " +fi + +S=${WORKDIR}/${PN}-s${PV} + +src_prepare() { + epatch "${FILESDIR}"/021109-uclibc-no-ether_ntohost.patch + epatch "${FILESDIR}"/${PN}-20121221-openssl.patch #335436 + epatch "${FILESDIR}"/${PN}-20121221-crypto-build.patch + epatch "${FILESDIR}"/${PN}-20100418-so_mark.patch #335347 + epatch "${FILESDIR}"/${PN}-20121221-tftpd-setid.patch + epatch "${FILESDIR}"/${PN}-20121221-tftpd-syslog.patch + epatch "${FILESDIR}"/${PN}-20121221-makefile.patch + epatch "${FILESDIR}"/${PN}-20121221-parallel-doc.patch + epatch "${FILESDIR}"/${PN}-20121221-printf-size.patch + epatch "${FILESDIR}"/${PN}-20121221-owl-pingsock.diff + epatch "${FILESDIR}"/${PN}-20121221-strtod.patch #472592 + use SECURITY_HAZARD && epatch "${FILESDIR}"/${PN}-20071127-nonroot-floodping.patch +} + +src_configure() { + use static && append-ldflags -static + + IPV4_TARGETS=( + ping + $(for v in arping clockdiff rarpd rdisc tftpd tracepath ; do usev ${v} ; done) + ) + IPV6_TARGETS=( + ping6 + $(usex tracepath 'tracepath6' '') + $(usex traceroute 'traceroute6' '') + ) + use ipv6 || IPV6_TARGETS=() +} + +src_compile() { + tc-export CC + 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[*]}" + + if [[ ${PV} == "99999999" ]] ; then + emake html man + fi +} + +src_install() { + into / + dobin ping $(usex ipv6 'ping6' '') + use ipv6 && dosym ping.8 "${EPREFIX}"/usr/share/man/man8/ping6.8 + doman doc/ping.8 + + if use arping ; then + dobin arping + doman doc/arping.8 + fi + + into /usr + + local u + for u in clockdiff rarpd rdisc tftpd tracepath ; do + if use ${u} ; then + case ${u} in + clockdiff) dobin ${u};; + *) dosbin ${u};; + esac + doman doc/${u}.8 + fi + done + + if use tracepath && use ipv6 ; then + dosbin tracepath6 + dosym tracepath.8 "${EPREFIX}"/usr/share/man/man8/tracepath6.8 + fi + + if use traceroute && use ipv6 ; then + dosbin traceroute6 + doman doc/traceroute6.8 + fi + + if use rarpd ; then + newinitd "${FILESDIR}"/rarpd.init.d rarpd + newconfd "${FILESDIR}"/rarpd.conf.d rarpd + fi + + dodoc INSTALL RELNOTES + + use doc && dohtml doc/*.html +} + +pkg_postinst() { + fcaps cap_net_raw \ + bin/ping \ + $(usex ipv6 'bin/ping6' '') \ + $(usex arping 'bin/arping' '') \ + $(usex clockdiff 'usr/bin/clockdiff' '') +} diff --git a/sdk_container/src/third_party/portage-stable/net-misc/iputils/iputils-20121221.ebuild b/sdk_container/src/third_party/portage-stable/net-misc/iputils/iputils-20121221.ebuild index 949de46adf..be378b2b23 100644 --- a/sdk_container/src/third_party/portage-stable/net-misc/iputils/iputils-20121221.ebuild +++ b/sdk_container/src/third_party/portage-stable/net-misc/iputils/iputils-20121221.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/iputils/iputils-20121221.ebuild,v 1.14 2013/02/08 16:47:03 ago Exp $ +# $Id$ # For released versions, we precompile the man/html pages and store # them in a tarball on our mirrors. This avoids ugly issues while @@ -16,13 +16,13 @@ if [[ ${PV} == "99999999" ]] ; then else SRC_URI="http://www.skbuff.net/iputils/iputils-s${PV}.tar.bz2 mirror://gentoo/iputils-s${PV}-manpages.tar.bz2" - KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux" + KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux" fi DESCRIPTION="Network monitoring tools including ping and ping6" HOMEPAGE="http://www.linuxfoundation.org/collaborate/workgroups/networking/iputils" -LICENSE="BSD" +LICENSE="BSD-4" SLOT="0" IUSE="caps doc gnutls idn ipv6 SECURITY_HAZARD ssl static" diff --git a/sdk_container/src/third_party/portage-stable/net-misc/iputils/iputils-20150815-r1.ebuild b/sdk_container/src/third_party/portage-stable/net-misc/iputils/iputils-20150815-r1.ebuild new file mode 100644 index 0000000000..a23f1b9e39 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/net-misc/iputils/iputils-20150815-r1.ebuild @@ -0,0 +1,166 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +# For released versions, we precompile the man/html pages and store +# them in a tarball on our mirrors. This avoids ugly issues while +# building stages, and when the jade/sgml packages are broken (which +# seems to be more common than would be nice). + +EAPI="4" + +inherit flag-o-matic eutils toolchain-funcs fcaps +if [[ ${PV} == "99999999" ]] ; then + EGIT_REPO_URI="https://github.com/iputils/iputils.git" + inherit git-r3 +else + 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 + +DESCRIPTION="Network monitoring tools including ping and ping6" +HOMEPAGE="http://www.linuxfoundation.org/collaborate/workgroups/networking/iputils" + +LICENSE="BSD-4" +SLOT="0" +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? ( + 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(+)] ) + ) + ) )" +RDEPEND="arping? ( !net-misc/arping ) + rarpd? ( !net-misc/rarpd ) + traceroute? ( !net-misc/traceroute ) + !static? ( ${LIB_DEPEND//\[static-libs(+)]} )" +DEPEND="${RDEPEND} + static? ( ${LIB_DEPEND} ) + virtual/os-headers" +if [[ ${PV} == "99999999" ]] ; then + DEPEND+=" + app-text/openjade + dev-perl/SGMLSpm + app-text/docbook-sgml-dtd + app-text/docbook-sgml-utils + " +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 ${PATCHES[@]} + use SECURITY_HAZARD && epatch "${FILESDIR}"/${PN}-20150815-nonroot-floodping.patch +} + +src_configure() { + use static && append-ldflags -static + + TARGETS=( + ping + $(for v in arping clockdiff rarpd rdisc tftpd tracepath ; do usev ${v} ; done) + ) + if use ipv6 ; then + TARGETS+=( + $(usex tracepath 'tracepath6' '') + $(usex traceroute 'traceroute6' '') + ) + fi + + myconf=( + USE_CRYPTO=no + USE_GCRYPT=no + USE_NETTLE=no + ) + + if use ipv6 && use ssl ; then + myconf=( + USE_CRYPTO=$(usex openssl) + USE_GCRYPT=$(usex gcrypt) + USE_NETTLE=$(usex nettle) + ) + fi +} + +src_compile() { + tc-export CC + emake \ + USE_CAP=$(usex caps) \ + USE_IDN=$(usex idn) \ + IPV4_DEFAULT=$(usex ipv6 'no' 'yes') \ + TARGETS="${TARGETS[*]}" \ + ${myconf[@]} + + if [[ ${PV} == "99999999" ]] ; then + emake html man + fi +} + +src_install() { + into / + 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 + dobin arping + doman doc/arping.8 + fi + + into /usr + + local u + for u in clockdiff rarpd rdisc tftpd tracepath ; do + if use ${u} ; then + case ${u} in + clockdiff) dobin ${u};; + *) dosbin ${u};; + esac + doman doc/${u}.8 + fi + done + + if use tracepath && use ipv6 ; then + dosbin tracepath6 + dosym tracepath.8 "${EPREFIX}"/usr/share/man/man8/tracepath6.8 + fi + + if use traceroute && use ipv6 ; then + dosbin traceroute6 + doman doc/traceroute6.8 + fi + + if use rarpd ; then + newinitd "${FILESDIR}"/rarpd.init.d rarpd + newconfd "${FILESDIR}"/rarpd.conf.d rarpd + fi + + dodoc INSTALL RELNOTES + + use doc && dohtml doc/*.html +} + +pkg_postinst() { + fcaps cap_net_raw \ + bin/ping \ + $(usex arping 'bin/arping' '') \ + $(usex clockdiff 'usr/bin/clockdiff' '') +} diff --git a/sdk_container/src/third_party/portage-stable/net-misc/iputils/iputils-20150815.ebuild b/sdk_container/src/third_party/portage-stable/net-misc/iputils/iputils-20150815.ebuild new file mode 100644 index 0000000000..d69470ef15 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/net-misc/iputils/iputils-20150815.ebuild @@ -0,0 +1,163 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +# For released versions, we precompile the man/html pages and store +# them in a tarball on our mirrors. This avoids ugly issues while +# building stages, and when the jade/sgml packages are broken (which +# seems to be more common than would be nice). + +EAPI="4" + +inherit flag-o-matic eutils toolchain-funcs fcaps +if [[ ${PV} == "99999999" ]] ; then + EGIT_REPO_URI="https://github.com/iputils/iputils.git" + inherit git-r3 +else + 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 + +DESCRIPTION="Network monitoring tools including ping and ping6" +HOMEPAGE="http://www.linuxfoundation.org/collaborate/workgroups/networking/iputils" + +LICENSE="BSD-4" +SLOT="0" +IUSE="arping caps clockdiff doc gcrypt idn ipv6 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? ( + gcrypt? ( dev-libs/libgcrypt[static-libs(+)] ) + nettle? ( dev-libs/nettle[static-libs(+)] ) + openssl? ( dev-libs/openssl:0[static-libs(+)] ) + ) )" +RDEPEND="arping? ( !net-misc/arping ) + rarpd? ( !net-misc/rarpd ) + traceroute? ( !net-misc/traceroute ) + !static? ( ${LIB_DEPEND//\[static-libs(+)]} )" +DEPEND="${RDEPEND} + static? ( ${LIB_DEPEND} ) + virtual/os-headers" +if [[ ${PV} == "99999999" ]] ; then + DEPEND+=" + app-text/openjade + dev-perl/SGMLSpm + app-text/docbook-sgml-dtd + app-text/docbook-sgml-utils + " +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 ${PATCHES[@]} + use SECURITY_HAZARD && epatch "${FILESDIR}"/${PN}-20150815-nonroot-floodping.patch +} + +src_configure() { + use static && append-ldflags -static + + TARGETS=( + ping + $(for v in arping clockdiff rarpd rdisc tftpd tracepath ; do usev ${v} ; done) + ) + if use ipv6 ; then + TARGETS+=( + $(usex tracepath 'tracepath6' '') + $(usex traceroute 'traceroute6' '') + ) + fi + + myconf=( + USE_CRYPTO=no + USE_GCRYPT=no + USE_NETTLE=no + ) + + if use ipv6 && use ssl ; then + myconf=( + USE_CRYPTO=$(usex openssl) + USE_GCRYPT=$(usex gcrypt) + USE_NETTLE=$(usex nettle) + ) + fi +} + +src_compile() { + tc-export CC + emake \ + USE_CAP=$(usex caps) \ + USE_IDN=$(usex idn) \ + IPV4_DEFAULT=$(usex ipv6 'no' 'yes') \ + TARGETS="${TARGETS[*]}" \ + ${myconf[@]} + + if [[ ${PV} == "99999999" ]] ; then + emake html man + fi +} + +src_install() { + into / + 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 + dobin arping + doman doc/arping.8 + fi + + into /usr + + local u + for u in clockdiff rarpd rdisc tftpd tracepath ; do + if use ${u} ; then + case ${u} in + clockdiff) dobin ${u};; + *) dosbin ${u};; + esac + doman doc/${u}.8 + fi + done + + if use tracepath && use ipv6 ; then + dosbin tracepath6 + dosym tracepath.8 "${EPREFIX}"/usr/share/man/man8/tracepath6.8 + fi + + if use traceroute && use ipv6 ; then + dosbin traceroute6 + doman doc/traceroute6.8 + fi + + if use rarpd ; then + newinitd "${FILESDIR}"/rarpd.init.d rarpd + newconfd "${FILESDIR}"/rarpd.conf.d rarpd + fi + + dodoc INSTALL RELNOTES + + use doc && dohtml doc/*.html +} + +pkg_postinst() { + fcaps cap_net_raw \ + bin/ping \ + $(usex arping 'bin/arping' '') \ + $(usex clockdiff 'usr/bin/clockdiff' '') +} diff --git a/sdk_container/src/third_party/portage-stable/net-misc/iputils/iputils-99999999.ebuild b/sdk_container/src/third_party/portage-stable/net-misc/iputils/iputils-99999999.ebuild index cf69c182af..013519142a 100644 --- a/sdk_container/src/third_party/portage-stable/net-misc/iputils/iputils-99999999.ebuild +++ b/sdk_container/src/third_party/portage-stable/net-misc/iputils/iputils-99999999.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/iputils/iputils-99999999.ebuild,v 1.10 2013/01/28 20:05:01 vapier Exp $ +# $Id$ # For released versions, we precompile the man/html pages and store # them in a tarball on our mirrors. This avoids ugly issues while @@ -16,23 +16,31 @@ if [[ ${PV} == "99999999" ]] ; then else SRC_URI="http://www.skbuff.net/iputils/iputils-s${PV}.tar.bz2 mirror://gentoo/iputils-s${PV}-manpages.tar.bz2" - KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux" fi DESCRIPTION="Network monitoring tools including ping and ping6" HOMEPAGE="http://www.linuxfoundation.org/collaborate/workgroups/networking/iputils" -LICENSE="BSD" +LICENSE="BSD-4" SLOT="0" -IUSE="caps doc gnutls idn ipv6 SECURITY_HAZARD ssl static" +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(+)] ) - ipv6? ( - gnutls? ( net-libs/gnutls[static-libs(+)] ) - ssl? ( dev-libs/openssl:0[static-libs(+)] ) - )" -RDEPEND="!net-misc/rarpd + ipv6? ( ssl? ( + gnutls? ( + net-libs/gnutls[openssl(+)] + net-libs/gnutls[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 ) + traceroute? ( !net-misc/traceroute ) !static? ( ${LIB_DEPEND//\[static-libs(+)]} )" DEPEND="${RDEPEND} static? ( ${LIB_DEPEND} ) @@ -50,13 +58,27 @@ S=${WORKDIR}/${PN}-s${PV} src_prepare() { epatch "${FILESDIR}"/021109-uclibc-no-ether_ntohost.patch - epatch "${FILESDIR}"/${PN}-20121221-openssl.patch #335436 - epatch "${FILESDIR}"/${PN}-20100418-so_mark.patch #335347 + epatch "${FILESDIR}"/${PN}-99999999-openssl.patch #335436 + epatch "${FILESDIR}"/${PN}-99999999-tftpd-syslog.patch epatch "${FILESDIR}"/${PN}-20121221-makefile.patch - epatch "${FILESDIR}"/${PN}-20121221-printf-size.patch - epatch "${FILESDIR}"/${PN}-20121221-owl-pingsock.diff + epatch "${FILESDIR}"/${PN}-20121221-parallel-doc.patch + epatch "${FILESDIR}"/${PN}-20121221-strtod.patch #472592 use SECURITY_HAZARD && epatch "${FILESDIR}"/${PN}-20071127-nonroot-floodping.patch +} + +src_configure() { use static && append-ldflags -static + + IPV4_TARGETS=( + ping + $(for v in arping clockdiff rarpd rdisc tftpd tracepath ; do usev ${v} ; done) + ) + IPV6_TARGETS=( + ping6 + $(usex tracepath 'tracepath6' '') + $(usex traceroute 'traceroute6' '') + ) + use ipv6 || IPV6_TARGETS=() } src_compile() { @@ -66,35 +88,62 @@ src_compile() { USE_IDN=$(usex idn) \ USE_GNUTLS=$(usex gnutls) \ USE_CRYPTO=$(usex ssl) \ - $(use ipv6 || echo IPV6_TARGETS=) + IPV4_TARGETS="${IPV4_TARGETS[*]}" \ + IPV6_TARGETS="${IPV6_TARGETS[*]}" if [[ ${PV} == "99999999" ]] ; then - emake -j1 html man + emake html man fi } -ipv6() { usex ipv6 "$*" '' ; } - src_install() { into / - dobin arping ping $(ipv6 ping6) + dobin ping $(usex ipv6 'ping6' '') + use ipv6 && dosym ping.8 "${EPREFIX}"/usr/share/man/man8/ping6.8 + doman doc/ping.8 + + if use arping ; then + dobin arping + doman doc/arping.8 + fi + into /usr - dobin clockdiff - dosbin rarpd rdisc ipg tftpd tracepath $(ipv6 tracepath6) + + local u + for u in clockdiff rarpd rdisc tftpd tracepath ; do + if use ${u} ; then + case ${u} in + clockdiff) dobin ${u};; + *) dosbin ${u};; + esac + doman doc/${u}.8 + fi + done + + if use tracepath && use ipv6 ; then + dosbin tracepath6 + dosym tracepath.8 "${EPREFIX}"/usr/share/man/man8/tracepath6.8 + fi + + if use traceroute && use ipv6 ; then + dosbin traceroute6 + doman doc/traceroute6.8 + fi + + if use rarpd ; then + newinitd "${FILESDIR}"/rarpd.init.d rarpd + newconfd "${FILESDIR}"/rarpd.conf.d rarpd + fi dodoc INSTALL RELNOTES - use ipv6 \ - && dosym ping.8 /usr/share/man/man8/ping6.8 \ - || rm -f doc/*6.8 - rm -f doc/{setkey,traceroute6}.8 - doman doc/*.8 use doc && dohtml doc/*.html } pkg_postinst() { fcaps cap_net_raw \ - bin/{ar,}ping \ - $(ipv6 bin/ping6) \ - usr/bin/clockdiff + bin/ping \ + $(usex ipv6 'bin/ping6' '') \ + $(usex arping 'bin/arping' '') \ + $(usex clockdiff 'usr/bin/clockdiff' '') } diff --git a/sdk_container/src/third_party/portage-stable/net-misc/iputils/metadata.xml b/sdk_container/src/third_party/portage-stable/net-misc/iputils/metadata.xml index 5c2d8fe5f6..183d454a96 100644 --- a/sdk_container/src/third_party/portage-stable/net-misc/iputils/metadata.xml +++ b/sdk_container/src/third_party/portage-stable/net-misc/iputils/metadata.xml @@ -3,6 +3,16 @@ base-system + Build and install arping -- tool for sending ARP requests to peers (see also net-analyzer/arping) + Build and install clockdiff -- tool for comparing clocks via ICMP packets + Use dev-libs/libgcrypt for md5 support + Use dev-libs/nettle for md5 support + Use dev-libs/openssl for md5 support + Build and install rarpd -- server for handling RARP (reverse ARP) requests; generally only used by old systems + Build and install rdisc -- server for the client side of the ICMP router discover protocol + Build and install tftpd -- server for the Trivial File Transfer Protocol (see also net-ftp/tftp-hpa) + Build and install tracepath -- tool for tracing network paths for discovering MTU values + Build and install traceroute -- tool for tracing network paths (see also net-analyzer/traceroute) Allow non-root users to flood (ping -f). This is generally a very bad idea.