commit: 1b11970eed843e35971308ae52e1d8b5c591d432 Author: Aric Belsito <lluixhi <AT> gmail <DOT> com> AuthorDate: Mon Apr 16 17:07:32 2018 +0000 Commit: Aric Belsito <lluixhi <AT> gmail <DOT> com> CommitDate: Mon Apr 16 17:07:32 2018 +0000 URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=1b11970e
sys-apps/iproute2: version bump to 4.16.0-r1 sync with upstream .../files/iproute2-4.16.0-keep-family.patch | 25 ++++++++++++++++++++++ sys-apps/iproute2/iproute2-4.14.1-r4.ebuild | 1 - sys-apps/iproute2/iproute2-4.15.0.ebuild | 1 - ...te2-4.16.0.ebuild => iproute2-4.16.0-r1.ebuild} | 2 +- sys-apps/iproute2/iproute2-4.16.0.ebuild | 1 - 5 files changed, 26 insertions(+), 4 deletions(-) diff --git a/sys-apps/iproute2/files/iproute2-4.16.0-keep-family.patch b/sys-apps/iproute2/files/iproute2-4.16.0-keep-family.patch new file mode 100644 index 0000000..d2940c9 --- /dev/null +++ b/sys-apps/iproute2/files/iproute2-4.16.0-keep-family.patch @@ -0,0 +1,25 @@ +Bug: https://bugs.gentoo.org/652986 + +https://marc.info/?l=linux-netdev&m=152363743818340&w=2 + +--- a/lib/utils.c ++++ b/lib/utils.c +@@ -568,7 +568,7 @@ static int __get_addr_1(inet_prefix *addr, const char *name, int family) + if (strcmp(name, "default") == 0) { + if ((family == AF_DECnet) || (family == AF_MPLS)) + return -1; +- addr->family = (family != AF_UNSPEC) ? family : AF_INET; ++ addr->family = family; + addr->bytelen = af_byte_len(addr->family); + addr->bitlen = -2; + addr->flags |= PREFIXLEN_SPECIFIED; +@@ -579,7 +579,7 @@ static int __get_addr_1(inet_prefix *addr, const char *name, int family) + strcmp(name, "any") == 0) { + if ((family == AF_DECnet) || (family == AF_MPLS)) + return -1; +- addr->family = AF_UNSPEC; ++ addr->family = family; + addr->bytelen = 0; + addr->bitlen = -2; + return 0; +-- diff --git a/sys-apps/iproute2/iproute2-4.14.1-r4.ebuild b/sys-apps/iproute2/iproute2-4.14.1-r4.ebuild index 8e877b0..6679ba7 100644 --- a/sys-apps/iproute2/iproute2-4.14.1-r4.ebuild +++ b/sys-apps/iproute2/iproute2-4.14.1-r4.ebuild @@ -62,7 +62,6 @@ src_prepare() { -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 diff --git a/sys-apps/iproute2/iproute2-4.15.0.ebuild b/sys-apps/iproute2/iproute2-4.15.0.ebuild index 4b485e8..a8c212b 100644 --- a/sys-apps/iproute2/iproute2-4.15.0.ebuild +++ b/sys-apps/iproute2/iproute2-4.15.0.ebuild @@ -61,7 +61,6 @@ src_prepare() { -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 diff --git a/sys-apps/iproute2/iproute2-4.16.0.ebuild b/sys-apps/iproute2/iproute2-4.16.0-r1.ebuild similarity index 98% copy from sys-apps/iproute2/iproute2-4.16.0.ebuild copy to sys-apps/iproute2/iproute2-4.16.0-r1.ebuild index 842de0b..dd450e4 100644 --- a/sys-apps/iproute2/iproute2-4.16.0.ebuild +++ b/sys-apps/iproute2/iproute2-4.16.0-r1.ebuild @@ -44,6 +44,7 @@ DEPEND=" PATCHES=( "${FILESDIR}"/${PN}-3.1.0-mtu.patch #291907 "${FILESDIR}"/${PN}-4.16.0-configure-nomagic.patch # bug 643722 + "${FILESDIR}"/${P}-keep-family.patch # bug 652986 "${FILESDIR}"/${PN}-4.15.0-musl.patch ) @@ -61,7 +62,6 @@ src_prepare() { -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 diff --git a/sys-apps/iproute2/iproute2-4.16.0.ebuild b/sys-apps/iproute2/iproute2-4.16.0.ebuild index 842de0b..7157a09 100644 --- a/sys-apps/iproute2/iproute2-4.16.0.ebuild +++ b/sys-apps/iproute2/iproute2-4.16.0.ebuild @@ -61,7 +61,6 @@ src_prepare() { -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
