vapier 15/05/24 03:42:06
Modified: metadata.xml iproute2-4.0.0-r2.ebuild
iproute2-9999.ebuild ChangeLog
Log:
Install `ip` with USE=minimal and document the flag #549988 by Mike Gilbert.
(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key
D2E96200)
Revision Changes Path
1.5 sys-apps/iproute2/metadata.xml
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/iproute2/metadata.xml?rev=1.5&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/iproute2/metadata.xml?rev=1.5&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/iproute2/metadata.xml?r1=1.4&r2=1.5
Index: metadata.xml
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/iproute2/metadata.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- metadata.xml 3 Mar 2013 03:33:51 -0000 1.4
+++ metadata.xml 24 May 2015 03:42:06 -0000 1.5
@@ -5,5 +5,6 @@
<use>
<flag name='berkdb'>build programs that use berkdb (just arpd)</flag>
<flag name='iptables'>include support for iptables filtering</flag>
+ <flag name='minimal'>only install ip and tc programs</flag>
</use>
</pkgmetadata>
1.2 sys-apps/iproute2/iproute2-4.0.0-r2.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/iproute2/iproute2-4.0.0-r2.ebuild?rev=1.2&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/iproute2/iproute2-4.0.0-r2.ebuild?rev=1.2&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/iproute2/iproute2-4.0.0-r2.ebuild?r1=1.1&r2=1.2
Index: iproute2-4.0.0-r2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/iproute2/iproute2-4.0.0-r2.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- iproute2-4.0.0-r2.ebuild 21 May 2015 02:22:03 -0000 1.1
+++ iproute2-4.0.0-r2.ebuild 24 May 2015 03:42:06 -0000 1.2
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header:
/var/cvsroot/gentoo-x86/sys-apps/iproute2/iproute2-4.0.0-r2.ebuild,v 1.1
2015/05/21 02:22:03 vapier Exp $
+# $Header:
/var/cvsroot/gentoo-x86/sys-apps/iproute2/iproute2-4.0.0-r2.ebuild,v 1.2
2015/05/24 03:42:06 vapier Exp $
EAPI="5"
@@ -23,7 +23,7 @@
RDEPEND="!net-misc/arpd
iptables? ( >=net-firewall/iptables-1.4.20:= )
- !minimal? ( berkdb? ( sys-libs/db:= ) )
+ berkdb? ( sys-libs/db:= )
atm? ( net-dialup/linux-atm )
selinux? ( sys-libs/libselinux )"
# We require newer linux-headers for ipset support #549948
@@ -62,7 +62,7 @@
# don't build arpd if USE=-berkdb #81660
use berkdb || sed -i '/^TARGETS=/s: arpd : :' misc/Makefile
- use minimal && sed -i -e '/^SUBDIRS=/s:=.*:=lib tc:' Makefile
+ use minimal && sed -i -e '/^SUBDIRS=/s:=.*:=lib tc ip:' Makefile
}
src_configure() {
@@ -93,6 +93,7 @@
if use minimal ; then
into /
dosbin tc/tc
+ dobin ip/ip
return 0
fi
1.25 sys-apps/iproute2/iproute2-9999.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/iproute2/iproute2-9999.ebuild?rev=1.25&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/iproute2/iproute2-9999.ebuild?rev=1.25&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/iproute2/iproute2-9999.ebuild?r1=1.24&r2=1.25
Index: iproute2-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/iproute2/iproute2-9999.ebuild,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- iproute2-9999.ebuild 18 Jan 2014 05:37:49 -0000 1.24
+++ iproute2-9999.ebuild 24 May 2015 03:42:06 -0000 1.25
@@ -1,16 +1,14 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/iproute2/iproute2-9999.ebuild,v
1.24 2014/01/18 05:37:49 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/iproute2/iproute2-9999.ebuild,v
1.25 2015/05/24 03:42:06 vapier Exp $
-EAPI="4"
+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
- SRC_URI=""
- #KEYWORDS=""
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"
@@ -21,30 +19,42 @@
LICENSE="GPL-2"
SLOT="0"
-IUSE="atm berkdb +iptables ipv6 minimal"
+IUSE="atm berkdb +iptables ipv6 minimal selinux"
RDEPEND="!net-misc/arpd
- iptables? ( >=net-firewall/iptables-1.4.5 )
- !minimal? ( berkdb? ( sys-libs/db ) )
- atm? ( net-dialup/linux-atm )"
+ 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
DEPEND="${RDEPEND}
app-arch/xz-utils
iptables? ( virtual/pkgconfig )
sys-devel/bison
sys-devel/flex
- >=sys-kernel/linux-headers-2.6.27
+ >=sys-kernel/linux-headers-3.7
elibc_glibc? ( >=sys-libs/glibc-2.7 )"
src_prepare() {
epatch "${FILESDIR}"/${PN}-3.1.0-mtu.patch #291907
- use ipv6 || epatch "${FILESDIR}"/${PN}-3.1.0-no-ipv6.patch #326849
+ epatch "${FILESDIR}"/${P}-tc-show-buffer-overflow.patch #546928
+ use ipv6 || epatch "${FILESDIR}"/${PN}-3.10.0-no-ipv6.patch #326849
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' \
+ ip/ipnetns.c \
+ 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
@@ -52,7 +62,7 @@
# don't build arpd if USE=-berkdb #81660
use berkdb || sed -i '/^TARGETS=/s: arpd : :' misc/Makefile
- use minimal && sed -i -e '/^SUBDIRS=/s:=.*:=lib tc:' Makefile
+ use minimal && sed -i -e '/^SUBDIRS=/s:=.*:=lib tc ip:' Makefile
}
src_configure() {
@@ -70,6 +80,9 @@
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_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)
@@ -79,7 +92,7 @@
src_install() {
if use minimal ; then
into /
- dosbin tc/tc
+ dosbin tc/tc ip/ip
return 0
fi
@@ -93,12 +106,18 @@
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
1.263 sys-apps/iproute2/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/iproute2/ChangeLog?rev=1.263&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/iproute2/ChangeLog?rev=1.263&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/iproute2/ChangeLog?r1=1.262&r2=1.263
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/iproute2/ChangeLog,v
retrieving revision 1.262
retrieving revision 1.263
diff -u -r1.262 -r1.263
--- ChangeLog 21 May 2015 02:22:03 -0000 1.262
+++ ChangeLog 24 May 2015 03:42:06 -0000 1.263
@@ -1,6 +1,10 @@
# ChangeLog for sys-apps/iproute2
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/iproute2/ChangeLog,v 1.262
2015/05/21 02:22:03 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/iproute2/ChangeLog,v 1.263
2015/05/24 03:42:06 vapier Exp $
+
+ 24 May 2015; Mike Frysinger <[email protected]> iproute2-4.0.0-r2.ebuild,
+ iproute2-9999.ebuild, metadata.xml:
+ Install `ip` with USE=minimal and document the flag #549988 by Mike Gilbert.
*iproute2-4.0.0-r2 (21 May 2015)
