vapier 15/07/07 16:07:02 Modified: ChangeLog Added: iproute2-4.1.1.ebuild Log: Version bump and revise libmnl handling. (Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key D2E96200)
Revision Changes Path 1.268 sys-apps/iproute2/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/iproute2/ChangeLog?rev=1.268&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/iproute2/ChangeLog?rev=1.268&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/iproute2/ChangeLog?r1=1.267&r2=1.268 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/sys-apps/iproute2/ChangeLog,v retrieving revision 1.267 retrieving revision 1.268 diff -u -r1.267 -r1.268 --- ChangeLog 7 Jul 2015 10:29:38 -0000 1.267 +++ ChangeLog 7 Jul 2015 16:07:02 -0000 1.268 @@ -1,6 +1,11 @@ # 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.267 2015/07/07 10:29:38 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/iproute2/ChangeLog,v 1.268 2015/07/07 16:07:02 vapier Exp $ + +*iproute2-4.1.1 (07 Jul 2015) + + 07 Jul 2015; Mike Frysinger <vap...@gentoo.org> +iproute2-4.1.1.ebuild: + Version bump and revise libmnl handling. 07 Jul 2015; Mike Frysinger <vap...@gentoo.org> iproute2-3.19.0.ebuild, iproute2-4.0.0-r2.ebuild, iproute2-4.1.0.ebuild, iproute2-9999.ebuild: 1.1 sys-apps/iproute2/iproute2-4.1.1.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/iproute2/iproute2-4.1.1.ebuild?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/iproute2/iproute2-4.1.1.ebuild?rev=1.1&content-type=text/plain Index: iproute2-4.1.1.ebuild =================================================================== # 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.1.1.ebuild,v 1.1 2015/07/07 16:07:02 vapier Exp $ 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="http://www.linuxfoundation.org/collaborate/workgroups/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}-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' \ 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 # 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 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_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 }
