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