From: "Aric Belsito" <lluixhi@gmail.com>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/musl:master commit in: sys-apps/iproute2/
Date: Tue, 21 Feb 2017 18:25:47 +0000 (UTC) [thread overview]
Message-ID: <1487701513.e25406d3b4365bb9aa424500990d53c4eda1887a.lluixhi@gentoo> (raw)
commit: e25406d3b4365bb9aa424500990d53c4eda1887a
Author: Aric Belsito <lluixhi <AT> gmail <DOT> com>
AuthorDate: Tue Feb 21 18:25:13 2017 +0000
Commit: Aric Belsito <lluixhi <AT> gmail <DOT> com>
CommitDate: Tue Feb 21 18:25:13 2017 +0000
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=e25406d3
sys-apps/iproute2: version bump to 4.10.0
drop 4.3.0: no longer in tree
sys-apps/iproute2/Manifest | 8 +-
...proute2-4.9.0.ebuild => iproute2-4.10.0.ebuild} | 10 +-
sys-apps/iproute2/iproute2-4.3.0.ebuild | 131 ---------------------
sys-apps/iproute2/iproute2-4.4.0.ebuild | 10 +-
4 files changed, 13 insertions(+), 146 deletions(-)
diff --git a/sys-apps/iproute2/Manifest b/sys-apps/iproute2/Manifest
index a26ff8c..25bf29d 100644
--- a/sys-apps/iproute2/Manifest
+++ b/sys-apps/iproute2/Manifest
@@ -4,10 +4,8 @@ AUX iproute2-4.3.0-musl-noiptables.patch 1166 SHA256 1910d28fe0aa89ba71cd30bb38b
AUX iproute2-4.3.0-musl.patch 2989 SHA256 bf10609ba7dcb04cb134745dd7af4c8c66d6b667400dd30abb3325ebdfd446fb SHA512 8cf23bca01b111e2dfa26e944de151b35d6278833066276e603cd567f8084c16ee5b0dd527dd0626828f3099ae5907bdef4783672bfe23605f43ce9c3b4c2182 WHIRLPOOL 40d5bdb8dcd84e43a6798584aba35a11d1b5a79e54dcf80da0f465041330c5a76c2c4297fd78aa2a272181954407b404030bb9cca4dc74e4f7b36b5f98775cd7
AUX iproute2-4.4.0-missing-limits_h.patch 385 SHA256 dbbb3b18da78d6747e67ef922d7fcbceb48877776efa5a6ca25c6facdb3d6d22 SHA512 a3c2c22c89323dedcfbe79a19fa5e211e8d66d84ada62937b091850e26d5976eedcc3c4ea0eea3372b19e3c15191ee9af696b3683d6f107d43b24a57e601a889 WHIRLPOOL 72be26a1f393ac5d7664c6b6a393efdfceb7d66720cafd2c6250e5480ac77033d0abfa0b616413d0f03d0c3cada22e5c7afa33e5ceb4910f41753d6ddf1fb74f
AUX iproute2-4.8.0-musl.patch 3758 SHA256 737386e08312506528fda2e75410746acd282f00c9531e089bc1b06db79c1140 SHA512 fd35bd71fa26968ad5b1dd18597207d164a948999c3bf55a62054966cc95a0838c9ba5df0f7319672eec310bffd8f70101b7fd7c075aa20c77d4dc70490d8aff WHIRLPOOL 1e84ccf8a537b20e58ef1a48afc548eb4b81decdae8f0a5b94e835416aaac1b2256fcffac3e288d5b848cfe4d48bb31a3e667f56ce711ed3f31b337371eeeef8
-DIST iproute2-4.3.0.tar.xz 525364 SHA256 f03b1188dd6c039512424de82ff7a8f3b446680bd4e908ff42a7b9b137422995 SHA512 14736158e76cef3dfc3af1a881faf97901bce6dcc9ffe52de92c8a64ae466f2c8ceaa32349553215dbe371115e7cd5cedcbf9922a0d72da9e7ebe3a73fac3687 WHIRLPOOL cd772090f20bbb50e4556c609f28a07acc60ff344989f2ad112c13e1dbc6f60b09e9f5bc6bd29322b1b1635b6266d70aff1aa8f5c37ed458ae569697b7401c0e
+DIST iproute2-4.10.0.tar.xz 626944 SHA256 22b1e1c1fc704ad35837e5a66103739727b8b48ac90b48c13f79b7367ff0a9a8 SHA512 e54477e167455e7ef5da4adc168d63eaa96091b63dc987fffe918cbb005eceed18a62283ca99ee2512dc0e960f47ae21b39ffbe399c1612fd9cea147c34c581b WHIRLPOOL 7034f87835b13d275d2e065ee00d869060ae20c7dd325d8974da414db20328195e5968ede2f0b6925ddf67de3712b5945f54276c6ce5c8367ba28520c2adb859
DIST iproute2-4.4.0.tar.xz 528552 SHA256 bc91c367288a19f78ef800cd6840363be1f22da8436fbae88e1a7250490d6514 SHA512 48236fc6103a55d977efa4f93ad7fdfc0944df975ce771d57fd3dcfb13b761b0c05dbe749978ac86c7a471d023bee62a2f1648a6ca75f50da9252acfde174b69 WHIRLPOOL 7e90c98805e12b28de284bb998e5a27cf524a78d0bd7632c0d49a7ddff8f11f5229ac6867076e9fea6f21b6b31360bddb21138673d94de766bdf7324a09bc013
-DIST iproute2-4.9.0.tar.xz 613032 SHA256 c0f30f043f7767cc1b2cd2197b08d4e9b2392c95823fabe30bbce308c30116c4 SHA512 0d974d7c001eac75def0d90b628e432d9847024843d02a6cd27266ff30e3f7a9c874fa91115da74db5f321c2e815b486a847059ca6df3aa8ea49432ffa39a889 WHIRLPOOL 83c8d42ef43f42a58835ff3b1df7460c67db4de1ae9d5df775d8aa15bfe2c488a626dd40c4327c2772436ed88bea1a1f57a953cd6bf650955465e76aec9476a2
-EBUILD iproute2-4.3.0.ebuild 3842 SHA256 df102b2068e6f82a8120065f798d3b7b7413f7c70da779dd667c9afeb409ffda SHA512 7577a7323f9cf24645045924a93287e1299b1b7a1abdeeec073178828d30da77b76ce477950c207e7bd819c5cfe390e14ff1d91c3ae7578400ca5a19e350b337 WHIRLPOOL ea13875c2a5be3a07d7746ffd9444e8ec08d8bf921851f01cf76e13666fdd85dc65266e3cfc0466a8829e4ec81d7f03c2c79e35bbbbf90cfed68fde4df0fd058
-EBUILD iproute2-4.4.0.ebuild 3900 SHA256 efa73fc5b273c607754c16104b48b6a3ca7415eaa639ec3f7a16d2e324bd1599 SHA512 cc92549fb467798cdfb3e068535f86acfd110ab23d58f6cbfedb615fe036cabb13ccaafcde4ab3b9b8d3d1c2a5c0bc1bb474e14ec1d51866068c51e2e32d2468 WHIRLPOOL f61081bc113e6b0e42a59eafb53c6fe54ed9ed76efc6c6ff90837291439220044fe3c892accda3fa60a85b4ee26f72de89577fb8db6c80bfbc12918860ae3d10
-EBUILD iproute2-4.9.0.ebuild 3888 SHA256 a376521f4eb3791fd147e8f2eb658b10feef8c2ff12ddbaf2a44c4420e759d18 SHA512 16cb1871e79782a62699eeecf3672b39a3c9002bb6bcfc27cc61677a24fda7f952def8c2ffa68067ac07177c603c8446befd6176c14d760c32b6446681588fd8 WHIRLPOOL 6eb389f280f9bcbedbdb57fcfb9f93ae821a8885cf2aa511f1e989546d9bd6a5f3ec7882e0d868fb1ed3798593e4f09ed44f5ae298344457180e692df4256164
+EBUILD iproute2-4.10.0.ebuild 3969 SHA256 2eb3503dcfa35bb65220555c5a5d278c74b41bc909b5c2208f475a904d7a72f6 SHA512 16d20a55011d6f768182a561103eeb30f8d013105593556bedab3695cbea874903e3b6534b8bcf1c665469678d1bcdbf861949955c39eab4634c211180592a21 WHIRLPOOL d0814f70dbb854d7a210607549fcf93bd9ae797fe88bb4f8b7c6a7949ce169a16e7a48a5cbc24e12a4de0b93f063c2df6df3fb0280e049d1cdc56e7a7a312d00
+EBUILD iproute2-4.4.0.ebuild 3977 SHA256 e845c0f75b338afaa27b767181d8199e8f7179e703a5073a0d4c882e86ba73d3 SHA512 155be7eb501328d00459e1bfeec22a56387f48b7bdf0c16359839b9df15c2d7979341c6daae9494c5da321223f8add67cc1c000ee16c484148e907b12abb04d7 WHIRLPOOL 47918d2b0346662c8a676c83f1c89d0ba3070fd6d52ac5d5593ea07e250314bd5577f698011e4f963afe81fc6c3fd9e80278e61b7cdcc457ebc4e197fc7cc310
MISC metadata.xml 467 SHA256 54932243a153c9130ca1862f0dce70ac6fff517e9b5c22f10e6d044ac3679e86 SHA512 34c134b1a8ee152382b9fe9872df3d15d32ec3822ba215c8b21e948b8313e2e3d045468b873b7958681e92265d57ce25455e03f4d8e6be4e882943e54331cd7c WHIRLPOOL 188528c73a6a8b90a0e69bab32d24a05e41c6695f559da91ead84be331769f47864ca6e88a7f1a31619da51e53b7fdd8a23735ff576098998eac6f1a9d24feb1
diff --git a/sys-apps/iproute2/iproute2-4.9.0.ebuild b/sys-apps/iproute2/iproute2-4.10.0.ebuild
similarity index 90%
rename from sys-apps/iproute2/iproute2-4.9.0.ebuild
rename to sys-apps/iproute2/iproute2-4.10.0.ebuild
index d84e3b9..943d8cd 100644
--- a/sys-apps/iproute2/iproute2-4.9.0.ebuild
+++ b/sys-apps/iproute2/iproute2-4.10.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -79,10 +79,10 @@ src_configure() {
# This sure is ugly. Should probably move into toolchain-funcs at some point.
local setns
pushd "${T}" >/dev/null
- echo 'main(){return setns();};' > test.c
- ${CC} ${CFLAGS} ${LDFLAGS} test.c >&/dev/null && setns=y || setns=n
- echo 'main(){};' > test.c
- ${CC} ${CFLAGS} ${LDFLAGS} test.c -lresolv >&/dev/null || sed -i '/^LDLIBS/s:-lresolv::' "${S}"/Makefile
+ printf '#include <sched.h>\nint main(){return setns(0, 0);}\n' > test.c
+ ${CC} ${CFLAGS} ${CPPFLAGS} -D_GNU_SOURCE ${LDFLAGS} test.c >&/dev/null && setns=y || setns=n
+ echo 'int main(){return 0;}' > test.c
+ ${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} test.c -lresolv >&/dev/null || sed -i '/^LDLIBS/s:-lresolv::' "${S}"/Makefile
popd >/dev/null
cat <<-EOF > Config
diff --git a/sys-apps/iproute2/iproute2-4.3.0.ebuild b/sys-apps/iproute2/iproute2-4.3.0.ebuild
deleted file mode 100644
index 0685b63..0000000
--- a/sys-apps/iproute2/iproute2-4.3.0.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit eutils toolchain-funcs flag-o-matic multilib
-
-if [[ ${PV} == "9999" ]] ; then
- EGIT_REPO_URI="git://git.kernel.org/pub/scm/linux/kernel/git/shemminger/iproute2.git"
- inherit git-2
-else
- SRC_URI="mirror://kernel/linux/utils/net/${PN}/${P}.tar.xz"
- KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
-fi
-
-DESCRIPTION="kernel routing and traffic control utilities"
-HOMEPAGE="https://wiki.linuxfoundation.org/networking/iproute2"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="atm berkdb +iptables ipv6 minimal selinux"
-
-# We could make libmnl optional, but it's tiny, so eh
-RDEPEND="!net-misc/arpd
- !minimal? ( net-libs/libmnl )
- iptables? ( >=net-firewall/iptables-1.4.20:= )
- berkdb? ( sys-libs/db:= )
- atm? ( net-dialup/linux-atm )
- selinux? ( sys-libs/libselinux )"
-# We require newer linux-headers for ipset support #549948 and some defines #553876
-DEPEND="${RDEPEND}
- app-arch/xz-utils
- iptables? ( virtual/pkgconfig )
- sys-devel/bison
- sys-devel/flex
- >=sys-kernel/linux-headers-3.16
- elibc_glibc? ( >=sys-libs/glibc-2.7 )"
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-3.1.0-mtu.patch #291907
- use ipv6 || epatch "${FILESDIR}"/${PN}-4.2.0-no-ipv6.patch #326849
- epatch "${FILESDIR}"/${PN}-4.3.0-musl.patch
- epatch "${FILESDIR}"/${PN}-4.3.0-musl-noiptables.patch
-
- sed -i \
- -e '/^CC =/d' \
- -e "/^LIBDIR/s:=.*:=/$(get_libdir):" \
- -e "s:-O2:${CFLAGS} ${CPPFLAGS}:" \
- -e "/^HOSTCC/s:=.*:= $(tc-getBUILD_CC):" \
- -e "/^WFLAGS/s:-Werror::" \
- -e "/^DBM_INCLUDE/s:=.*:=${T}:" \
- Makefile || die
-
- # Use /run instead of /var/run.
- sed -i \
- -e 's:/var/run:/run:g' \
- include/namespace.h \
- man/man8/ip-netns.8 || die
-
- # build against system headers
- rm -r include/netinet #include/linux include/ip{,6}tables{,_common}.h include/libiptc
- sed -i 's:TCPI_OPT_ECN_SEEN:16:' misc/ss.c || die
-
- use minimal && sed -i -e '/^SUBDIRS=/s:=.*:=lib tc ip:' Makefile
-}
-
-src_configure() {
- tc-export AR CC PKG_CONFIG
-
- # This sure is ugly. Should probably move into toolchain-funcs at some point.
- local setns
- pushd "${T}" >/dev/null
- echo 'main(){return setns();};' > test.c
- ${CC} ${CFLAGS} ${LDFLAGS} test.c >&/dev/null && setns=y || setns=n
- echo 'main(){};' > test.c
- ${CC} ${CFLAGS} ${LDFLAGS} test.c -lresolv >&/dev/null || sed -i '/^LDLIBS/s:-lresolv::' "${S}"/Makefile
- popd >/dev/null
-
- cat <<-EOF > Config
- TC_CONFIG_ATM := $(usex atm y n)
- TC_CONFIG_XT := $(usex iptables y n)
- # We've locked in recent enough kernel headers #549948
- TC_CONFIG_IPSET := y
- HAVE_BERKELEY_DB := $(usex berkdb y n)
- HAVE_MNL := $(usex minimal n y)
- HAVE_SELINUX := $(usex selinux y n)
- IP_CONFIG_SETNS := ${setns}
- # Use correct iptables dir, #144265 #293709
- IPT_LIB_DIR := $(use iptables && ${PKG_CONFIG} xtables --variable=xtlibdir)
- EOF
-}
-
-src_install() {
- if use minimal ; then
- into /
- dosbin tc/tc
- dobin ip/ip
- return 0
- fi
-
- emake \
- DESTDIR="${D}" \
- LIBDIR="${EPREFIX}"/$(get_libdir) \
- SBINDIR="${EPREFIX}"/sbin \
- CONFDIR="${EPREFIX}"/etc/iproute2 \
- DOCDIR="${EPREFIX}"/usr/share/doc/${PF} \
- MANDIR="${EPREFIX}"/usr/share/man \
- ARPDDIR="${EPREFIX}"/var/lib/arpd \
- install
-
- rm "${ED}"/usr/share/doc/${PF}/*.{sgml,tex} || die #455988
-
- dodir /bin
- mv "${ED}"/{s,}bin/ip || die #330115
-
- dolib.a lib/libnetlink.a
- insinto /usr/include
- doins include/libnetlink.h
- # This local header pulls in a lot of linux headers it
- # doesn't directly need. Delete this header that requires
- # linux-headers-3.8 until that goes stable. #467716
- sed -i '/linux\/netconf.h/d' "${ED}"/usr/include/libnetlink.h || die
-
- if use berkdb ; then
- dodir /var/lib/arpd
- # bug 47482, arpd doesn't need to be in /sbin
- dodir /usr/bin
- mv "${ED}"/sbin/arpd "${ED}"/usr/bin/ || die
- fi
-}
diff --git a/sys-apps/iproute2/iproute2-4.4.0.ebuild b/sys-apps/iproute2/iproute2-4.4.0.ebuild
index 350906e..4f98a02 100644
--- a/sys-apps/iproute2/iproute2-4.4.0.ebuild
+++ b/sys-apps/iproute2/iproute2-4.4.0.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == "9999" ]] ; then
inherit git-2
else
SRC_URI="mirror://kernel/linux/utils/net/${PN}/${P}.tar.xz"
- KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
+ KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
fi
DESCRIPTION="kernel routing and traffic control utilities"
@@ -72,10 +72,10 @@ src_configure() {
# This sure is ugly. Should probably move into toolchain-funcs at some point.
local setns
pushd "${T}" >/dev/null
- echo 'main(){return setns();};' > test.c
- ${CC} ${CFLAGS} ${LDFLAGS} test.c >&/dev/null && setns=y || setns=n
- echo 'main(){};' > test.c
- ${CC} ${CFLAGS} ${LDFLAGS} test.c -lresolv >&/dev/null || sed -i '/^LDLIBS/s:-lresolv::' "${S}"/Makefile
+ printf '#include <sched.h>\nint main(){return setns(0, 0);}\n' > test.c
+ ${CC} ${CFLAGS} ${CPPFLAGS} -D_GNU_SOURCE ${LDFLAGS} test.c >&/dev/null && setns=y || setns=n
+ echo 'int main(){return 0;}' > test.c
+ ${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} test.c -lresolv >&/dev/null || sed -i '/^LDLIBS/s:-lresolv::' "${S}"/Makefile
popd >/dev/null
cat <<-EOF > Config
next reply other threads:[~2017-02-21 18:25 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-02-21 18:25 Aric Belsito [this message]
-- strict thread matches above, loose matches on Subject: below --
2020-01-30 7:42 [gentoo-commits] proj/musl:master commit in: sys-apps/iproute2/ Georgy Yakovlev
2019-07-25 3:09 Jory Pratt
2019-07-03 3:08 Jory Pratt
2019-02-11 11:44 Anthony G. Basile
2018-12-29 18:52 Anthony G. Basile
2018-10-31 23:58 Anthony G. Basile
2018-10-29 11:39 Anthony G. Basile
2018-09-23 18:29 Anthony G. Basile
2018-06-11 17:29 Aric Belsito
2017-12-22 3:28 Anthony G. Basile
2017-12-10 21:00 Anthony G. Basile
2017-11-29 19:01 Aric Belsito
2017-11-21 18:55 Aric Belsito
2017-09-06 16:09 Aric Belsito
2017-02-21 20:39 Aric Belsito
2016-01-03 16:26 Jory Pratt
2015-07-15 17:00 Anthony G. Basile
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1487701513.e25406d3b4365bb9aa424500990d53c4eda1887a.lluixhi@gentoo \
--to=lluixhi@gmail.com \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox