1 |
polynomial-c 15/06/30 07:45:44 |
2 |
|
3 |
Modified: ChangeLog |
4 |
Added: iproute2-4.1.0.ebuild |
5 |
Removed: iproute2-4.0.0-r1.ebuild iproute2-4.0.0.ebuild |
6 |
Log: |
7 |
Version bump. Removed old |
8 |
|
9 |
(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key 0x981CA6FC) |
10 |
|
11 |
Revision Changes Path |
12 |
1.264 sys-apps/iproute2/ChangeLog |
13 |
|
14 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/iproute2/ChangeLog?rev=1.264&view=markup |
15 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/iproute2/ChangeLog?rev=1.264&content-type=text/plain |
16 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/iproute2/ChangeLog?r1=1.263&r2=1.264 |
17 |
|
18 |
Index: ChangeLog |
19 |
=================================================================== |
20 |
RCS file: /var/cvsroot/gentoo-x86/sys-apps/iproute2/ChangeLog,v |
21 |
retrieving revision 1.263 |
22 |
retrieving revision 1.264 |
23 |
diff -u -r1.263 -r1.264 |
24 |
--- ChangeLog 24 May 2015 03:42:06 -0000 1.263 |
25 |
+++ ChangeLog 30 Jun 2015 07:45:44 -0000 1.264 |
26 |
@@ -1,6 +1,12 @@ |
27 |
# ChangeLog for sys-apps/iproute2 |
28 |
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 |
29 |
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/iproute2/ChangeLog,v 1.263 2015/05/24 03:42:06 vapier Exp $ |
30 |
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/iproute2/ChangeLog,v 1.264 2015/06/30 07:45:44 polynomial-c Exp $ |
31 |
+ |
32 |
+*iproute2-4.1.0 (30 Jun 2015) |
33 |
+ |
34 |
+ 30 Jun 2015; Lars Wendler <polynomial-c@g.o> -iproute2-4.0.0.ebuild, |
35 |
+ -iproute2-4.0.0-r1.ebuild, +iproute2-4.1.0.ebuild: |
36 |
+ Version bump. Removed old. |
37 |
|
38 |
24 May 2015; Mike Frysinger <vapier@g.o> iproute2-4.0.0-r2.ebuild, |
39 |
iproute2-9999.ebuild, metadata.xml: |
40 |
|
41 |
|
42 |
|
43 |
1.1 sys-apps/iproute2/iproute2-4.1.0.ebuild |
44 |
|
45 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/iproute2/iproute2-4.1.0.ebuild?rev=1.1&view=markup |
46 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/iproute2/iproute2-4.1.0.ebuild?rev=1.1&content-type=text/plain |
47 |
|
48 |
Index: iproute2-4.1.0.ebuild |
49 |
=================================================================== |
50 |
# Copyright 1999-2015 Gentoo Foundation |
51 |
# Distributed under the terms of the GNU General Public License v2 |
52 |
# $Header: /var/cvsroot/gentoo-x86/sys-apps/iproute2/iproute2-4.1.0.ebuild,v 1.1 2015/06/30 07:45:44 polynomial-c Exp $ |
53 |
|
54 |
EAPI="5" |
55 |
|
56 |
inherit eutils toolchain-funcs flag-o-matic multilib |
57 |
|
58 |
if [[ ${PV} == "9999" ]] ; then |
59 |
EGIT_REPO_URI="git://git.kernel.org/pub/scm/linux/kernel/git/shemminger/iproute2.git" |
60 |
inherit git-2 |
61 |
else |
62 |
SRC_URI="mirror://kernel/linux/utils/net/${PN}/${P}.tar.xz" |
63 |
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" |
64 |
fi |
65 |
|
66 |
DESCRIPTION="kernel routing and traffic control utilities" |
67 |
HOMEPAGE="http://www.linuxfoundation.org/collaborate/workgroups/networking/iproute2" |
68 |
|
69 |
LICENSE="GPL-2" |
70 |
SLOT="0" |
71 |
IUSE="atm berkdb +iptables ipv6 minimal selinux" |
72 |
|
73 |
RDEPEND="!net-misc/arpd |
74 |
iptables? ( >=net-firewall/iptables-1.4.20:= ) |
75 |
berkdb? ( sys-libs/db:= ) |
76 |
atm? ( net-dialup/linux-atm ) |
77 |
selinux? ( sys-libs/libselinux )" |
78 |
# We require newer linux-headers for ipset support #549948 |
79 |
DEPEND="${RDEPEND} |
80 |
app-arch/xz-utils |
81 |
iptables? ( virtual/pkgconfig ) |
82 |
sys-devel/bison |
83 |
sys-devel/flex |
84 |
>=sys-kernel/linux-headers-3.7 |
85 |
elibc_glibc? ( >=sys-libs/glibc-2.7 )" |
86 |
|
87 |
src_prepare() { |
88 |
epatch "${FILESDIR}"/${PN}-3.1.0-mtu.patch #291907 |
89 |
use ipv6 || epatch "${FILESDIR}"/${PN}-3.10.0-no-ipv6.patch #326849 |
90 |
|
91 |
sed -i \ |
92 |
-e '/^CC =/d' \ |
93 |
-e "/^LIBDIR/s:=.*:=/$(get_libdir):" \ |
94 |
-e "s:-O2:${CFLAGS} ${CPPFLAGS}:" \ |
95 |
-e "/^HOSTCC/s:=.*:= $(tc-getBUILD_CC):" \ |
96 |
-e "/^WFLAGS/s:-Werror::" \ |
97 |
-e "/^DBM_INCLUDE/s:=.*:=${T}:" \ |
98 |
Makefile || die |
99 |
|
100 |
# Use /run instead of /var/run. |
101 |
sed -i \ |
102 |
-e 's:/var/run:/run:g' \ |
103 |
ip/ipnetns.c \ |
104 |
man/man8/ip-netns.8 || die |
105 |
|
106 |
# build against system headers |
107 |
rm -r include/netinet #include/linux include/ip{,6}tables{,_common}.h include/libiptc |
108 |
sed -i 's:TCPI_OPT_ECN_SEEN:16:' misc/ss.c || die |
109 |
|
110 |
# don't build arpd if USE=-berkdb #81660 |
111 |
use berkdb || sed -i '/^TARGETS=/s: arpd : :' misc/Makefile |
112 |
|
113 |
use minimal && sed -i -e '/^SUBDIRS=/s:=.*:=lib tc ip:' Makefile |
114 |
} |
115 |
|
116 |
src_configure() { |
117 |
tc-export AR CC PKG_CONFIG |
118 |
|
119 |
# This sure is ugly. Should probably move into toolchain-funcs at some point. |
120 |
local setns |
121 |
pushd "${T}" >/dev/null |
122 |
echo 'main(){return setns();};' > test.c |
123 |
${CC} ${CFLAGS} ${LDFLAGS} test.c >&/dev/null && setns=y || setns=n |
124 |
echo 'main(){};' > test.c |
125 |
${CC} ${CFLAGS} ${LDFLAGS} test.c -lresolv >&/dev/null || sed -i '/^LDLIBS/s:-lresolv::' "${S}"/Makefile |
126 |
popd >/dev/null |
127 |
|
128 |
cat <<-EOF > Config |
129 |
TC_CONFIG_ATM := $(usex atm y n) |
130 |
TC_CONFIG_XT := $(usex iptables y n) |
131 |
# We've locked in recent enough kernel headers #549948 |
132 |
TC_CONFIG_IPSET := y |
133 |
HAVE_SELINUX := $(usex selinux y n) |
134 |
IP_CONFIG_SETNS := ${setns} |
135 |
# Use correct iptables dir, #144265 #293709 |
136 |
IPT_LIB_DIR := $(use iptables && ${PKG_CONFIG} xtables --variable=xtlibdir) |
137 |
EOF |
138 |
} |
139 |
|
140 |
src_install() { |
141 |
if use minimal ; then |
142 |
into / |
143 |
dosbin tc/tc |
144 |
dobin ip/ip |
145 |
return 0 |
146 |
fi |
147 |
|
148 |
emake \ |
149 |
DESTDIR="${D}" \ |
150 |
LIBDIR="${EPREFIX}"/$(get_libdir) \ |
151 |
SBINDIR="${EPREFIX}"/sbin \ |
152 |
CONFDIR="${EPREFIX}"/etc/iproute2 \ |
153 |
DOCDIR="${EPREFIX}"/usr/share/doc/${PF} \ |
154 |
MANDIR="${EPREFIX}"/usr/share/man \ |
155 |
ARPDDIR="${EPREFIX}"/var/lib/arpd \ |
156 |
install |
157 |
|
158 |
rm "${ED}"/usr/share/doc/${PF}/*.{sgml,tex} || die #455988 |
159 |
|
160 |
dodir /bin |
161 |
mv "${ED}"/{s,}bin/ip || die #330115 |
162 |
|
163 |
dolib.a lib/libnetlink.a |
164 |
insinto /usr/include |
165 |
doins include/libnetlink.h |
166 |
# This local header pulls in a lot of linux headers it |
167 |
# doesn't directly need. Delete this header that requires |
168 |
# linux-headers-3.8 until that goes stable. #467716 |
169 |
sed -i '/linux\/netconf.h/d' "${ED}"/usr/include/libnetlink.h || die |
170 |
|
171 |
if use berkdb ; then |
172 |
dodir /var/lib/arpd |
173 |
# bug 47482, arpd doesn't need to be in /sbin |
174 |
dodir /usr/bin |
175 |
mv "${ED}"/sbin/arpd "${ED}"/usr/bin/ || die |
176 |
fi |
177 |
} |