Fix FreeBSD-SA-15:19.routed. https://github.com/gentoo/gentoo-portage-rsync-mirror/pull/193 by nigoro.

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0xEFB4464E!

3 files changed, 31 insertions, 18 deletions

diff --git a/sys-freebsd/freebsd-sbin/ChangeLog b/sys-freebsd/freebsd-sbin/ChangeLog
index 066ea8fbe49f..a9fe1b4ab63a 100644
--- a/sys-freebsd/freebsd-sbin/ChangeLog
+++ b/sys-freebsd/freebsd-sbin/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-freebsd/freebsd-sbin
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sbin/ChangeLog,v 1.85 2015/06/05 16:43:55 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sbin/ChangeLog,v 1.86 2015/08/06 10:44:24 mgorny Exp $
+
+*freebsd-sbin-10.1-r1 (06 Aug 2015)
+
+  06 Aug 2015; Michał Górny <mgorny@gentoo.org> +freebsd-sbin-10.1-r1.ebuild,
+  -freebsd-sbin-10.1.ebuild:
+  Fix FreeBSD-SA-15:19.routed. https://github.com/gentoo/gentoo-portage-rsync-
+  mirror/pull/193 by nigoro.
 
   05 Jun 2015; Michał Górny <mgorny@gentoo.org> freebsd-sbin-10.1.ebuild:
   Bump to EAPI=5. Use upstream tarballs.
diff --git a/sys-freebsd/freebsd-sbin/Manifest b/sys-freebsd/freebsd-sbin/Manifest
index 9b18d68322e5..d6a667737489 100644
--- a/sys-freebsd/freebsd-sbin/Manifest
+++ b/sys-freebsd/freebsd-sbin/Manifest
@@ -25,32 +25,33 @@ DIST freebsd-libexec-8.2.tar.bz2 289147 SHA256 10b996d1d8cd044ee2e7a877e5e6ad2bf
 DIST freebsd-libexec-9.1.tar.bz2 304592 SHA256 71e6e9e41328c2148c54b81ad9b59f912a1d5f0d52e17ac07f223aa7a94b82be SHA512 7baa4160dda2610250dd52f445e24478e0f1ea10bce21fcd0e5d1b856f399b896adc334114de0c7f61a5637e4349bb1688fdbe5c72798d8568ae791114710b92 WHIRLPOOL d800f477ac5c9ad6dae3e0091c83e107609b5a1e3aa79e9533fcd10a8dd34ff7733ab9523eae7c292310fe94f6a529209cae6b9e8bac6b47244e59834593e74b
 DIST freebsd-sbin-8.2.tar.bz2 1211665 SHA256 8b7e21a66b4696e8763d29b8b02b2d35f29fc51820a194d1e469e7cace84c527 SHA512 c6643c29ab62344c98d8991708798730ee1c17e6478071718beeaa79788300a1f4ed2e6aeb8e39e3c216877d4ed2ac85b2a9531d534f1ac5125a508927898959 WHIRLPOOL 2a21cd0f15f95d66718031680ac87f1fe73f1e1b03cb012e1db1dd1bd2fe2bb7897457a8ba2f5a28c8806775611dca542cbadec16566c47ab9efa673e2cb53f3
 DIST freebsd-sbin-9.1.tar.bz2 1273913 SHA256 45008b0733b232ef03707ef5fa3e5c889e3b3728393d736bd9a869ea83be6447 SHA512 9f186602b7de96f268c352ca386986652fddf5570e7eca1afa8c0d2bdc83b57df1198efe47f36dd5c7a6abf4f9c935f1c8207a4a12a6b2153bd6c3c6292719dc WHIRLPOOL 20920dfa9607a0ce854319cef29bbd77fb1b31f6f6cfd5ac60cbd678169e43929e215743fe636d0c224443f3e6149a8f07c292d647f7f901592795ac292699f9
+DIST freebsd-sbin-SA-1519-routed.patch 554 SHA256 e4f90b10ddb18f046ff340ec1bf1d5fdf0c330fe4966bd9e47fb0cb0a1fbe842 SHA512 6d09c517bd10f9f19b220ae11100d7cdd41e7943a48632c77c254dbc86e4b4a72f8d34925ee65e0a192c37fc49ef0718ad16556de8ca508c118060e286087192 WHIRLPOOL a9ad3c2bdc968e71b7c21e0897d5ab10b9f1e178116f71a77c6c389a25c256165908ae0862f975c2c491e9bf0d509f6c4fd75452853234e96e69f55fabc14e8e
 DIST freebsd-src-10.1.tar.xz 115049476 SHA256 f919287a5ef51d4f133f27c99c54f2e8054f408d3dd53bc60f4e233cc75ec03d SHA512 4ded32b451e2807e24a06305502f88ea633b2899a7ccd9cab3dc98fc865ef91324c93c512a08cf6e295313a8d7e79aa9d7af07da40e7276d986b06419b984152 WHIRLPOOL 1eff9419d89b8a70f064171883d92e160b250cd637972eb9107a19d7b3c904b554c4f51eaa9ff9642ef2c4234bde05cf9aef16d0c39280b55084f831700dea80
 DIST freebsd-sys-8.2.tar.bz2 25835329 SHA256 0c6c7b61aae94db2931f985d5899f3bca78fc8ffab6b598fbaa158142d676f16 SHA512 6ea4516a5c52e25c4f993f7acb875463a5caea93dbdf250c5d48eee95fff226956e9f030cab7e341b5e6a132325bc3dbf93dcb4b1185acb011918e50b1a22be3 WHIRLPOOL 870deeff877c6b9fc812a4260e4fdbb6715a5dc2065cab3bfbf2a42d876f6654703ccb124275a4e2c410cef48f3db02b63cc76059eccf9cf90244826f35b7a15
 DIST freebsd-sys-9.1.tar.bz2 32588103 SHA256 b93a7ac8334ac16cc9f60665048e5ef812c0a6c62f10d0b0a674aec3f56516a8 SHA512 7dc9d9e00dde8f592bb171f4386d02b655b73cb4f153fe5ec063d010a148ef0639eae0dcdb3eeb09ecd1e3653c69e49a2d261329fa6d0381d2ddabe258ddde6d WHIRLPOOL c8348344dfb14bad64bd3a78ee615ddd29203175b292233254f8ba175e7a3fb7218af6f95f7b4dbf394c0354bafe9d8bb0c21cdf0ceaeb697214964b280469b3
 DIST freebsd-usbin-8.2.tar.bz2 2443024 SHA256 aa7cabf10f5c3a9daabea32e4de24d04ec312247842981476da666eff5054603 SHA512 bcb8ff3df54848b9107bbb52e5ced7a91e24bb181f06769b6997221729b8064ec17652eaf7500de3268cbcb63ff5760beb54d15fc78c27b02687b5b1067c74a6 WHIRLPOOL 20f5278e2a1dd387a75b44f10507958d6c0e84a2faa1bddbf808c14ab86d8dd14a956192911bbc1880f5f5f7bd05972dcbb4aec85d241f0dcf91bf4246883f0a
 DIST freebsd-usbin-9.1.tar.bz2 2670916 SHA256 b938c20b8c09aa9a610e13b69b9afeea72f561ab3636a59fba2bdac290f4db75 SHA512 21c234312f70eb35cd2926519efc1f61592892f5d0940786dbeb959c3c5ec7819a51ae95c6e8a1a06aa01f669350fe0fd3dd7c4ec8a84dd6b90f24cb192356ca WHIRLPOOL 7f6ad2eb5410cc5e685881654a788807848af026b1277a974682755ab7c9db28f576bfd1576441ea10c5f1e9edb7d30a4a23fb8eccd6d69d86ecc9ce4c9adc7e
-EBUILD freebsd-sbin-10.1.ebuild 2638 SHA256 73dbabb90b576bd579fd079389935804f6cad7c160a123200efd0830c99aeae6 SHA512 e69dc551aef60a1e52fec7451b72c3e46341459b0a1d27cdd9be997e04d48d5eda6926e99a2f76146b34af863078777280549795f2297c6dfe5914ca472e7236 WHIRLPOOL c183f19a006270e5df678133cbad1d7da677abb1995449e45fe80b7c8e4096cc9d78188dfbcd72ae54a0c08780eaad51a6008486757506f5f0c48744b42f6cb4
+EBUILD freebsd-sbin-10.1-r1.ebuild 2779 SHA256 7492a1cae82886bd2b981bee75e99b7facebfdec12596da6c1c32fb3052a9e8d SHA512 f27b90c574d36ef0d33835866bc878b514a5e486192830d6297b453dce8ff589359f29eb6533ee941d46075d6ae4b496998cfc7892ad56dce6eaa88da427d428 WHIRLPOOL 4f6e8515b09b607fc024a0ecaa3a217ab84c5b756484dda41f23c7f0db2c29453f572bc60692de694a7caf49cf10cca7bc671099eb0d837031f60a6c6f3c3c08
 EBUILD freebsd-sbin-8.2-r1.ebuild 2679 SHA256 05c692580eb9493a591ccfa76c4d75f4c912ac940792c6300601e06e1a198313 SHA512 9ea2258b423fb6634430e6f20e2927051fd5bed1915920f8518aa7ef04c02246fe7c67b43311b476dfc45f0dd65ded8c20c5717ae619bfa4c9605ab70cff6569 WHIRLPOOL f0ffdc4d2a065740c10a2f047aae64a7e2fbce9020f4cb17bdef7c11fd7719da93532e6ecf2db0b155d88f42c7856fc4d080085a9d8b136c7f114dd78c127fe5
 EBUILD freebsd-sbin-9.1.ebuild 2790 SHA256 aeed2a899c110610a8908513d65524d74c6617e43deb5ce06e5786007a3f801a SHA512 79b7be626792796773feab118d3e90d42531ac15e274b0493089990dc6a0a5c36775a1f21a85708ba533dd5b544c1cf2f88347998d66036097d749ffe973fb41 WHIRLPOOL e9d46ccae4d91753d37430814101d8c344673aedf6f32f46f0c2fa4f0482be910ad8f4039bd602586ce7d79579360917a28856e16c75fa0e96c106d2fea413c0
-MISC ChangeLog 16208 SHA256 847277b846917be5028aaed1b81af10a9ab57ee01f1314a3f75eceda190bb396 SHA512 3cd0466f7751bb516ca22b793a7464c9053e737f251c990443637fdc06c573d5e2b917e18322880cf52e7ae418176b9f33f07208ab8f432cd00918447a842d6a WHIRLPOOL 5f0e5d07604fb625cc871ebae02558053c29fc08cf4e15ec47f52654166eb97f2cdb1bb46b485c88cc13a5a9cabb283c7e4b331b379b454115ab0811c351f38b
+MISC ChangeLog 16463 SHA256 5222a4fc2db748e9a3407a67c960ed6f3fc43bbaef543481e75d792e1b6a22e5 SHA512 681d0d4702acf96951f21baadf713e11f2222c9f79693346811afae880351575c4a8b71c034d8abd153cd2108b94a80735c630f2da4201464a33ed15191077d3 WHIRLPOOL d94e0cf0d03450daa97abeb244d07265d58b67fb2665dbb9f6530586005d7a138058373d625b713f51c5f32b83c97b8eb720f4b746a1daaaf8a30987087558d3
 MISC metadata.xml 473 SHA256 b13f1868fdc53bc53952bb41f6b68a5f320d36c493329ddf1b940f0fd5bafa8e SHA512 bf69dfade6ba52de900634d131d0aacfd36f9bb94a11f81c7256b144b2a90daa9b5f5bfa1a6c028314c8bb763fc59a4c0a9e8332a24d6732995fdebb3964b6dc WHIRLPOOL 32e9ac1cbaac74edd43d97d8d8069f61f29179f93904d126c32e4cb3504683f118c5027e1a42b1b456bb31dd68ffbdb0ce23c7b84806edcd03b80af9a34db96a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQJ8BAEBCABmBQJVcdHdXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJVwzqJXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOEFEP/Rhu4l4QXn4ijnPLd0eXsh2A
-u02+UuADWvGXCntTXd9N5ba87y2IXO2izL17RHb8c3MyZPUIDfvZL3FTwp57JBpS
-RWd7mrovqMrjypgc4RLjiUUXzLzF28eQ45VyE91ZB7hKMZfozJymAiEDB7WvIojM
-ntHn1dPZVfWSmCPo2Ktv+uIUp8eB7YjgBRrTWNLoNpKsPBSxWesW071SdV0cznun
-hTpmpbUbGU3Bg+5LOEdOSogV1Zkeqbbnl68xKwaMuNbsIOdS4JNGllrmn2mRWucy
-f9t6IbHnt6sDz61Q3ck3KhKHJRJY/lE42PAGulVd9E2OxJi6HaYK4akJyQ2QFQeO
-WAn8ioiurbn7icyObQ6xpgdJsl8VPvk4qqQIRabR04Q2fftof6pxO7qUvgDQMqiB
-+jRMyYs23MEaVX5gX3drjnjUY2J14sXyQ1A/qLq85Oz2/4aQ8Ub6lpsylZnVL5M7
-WTG8gi8UK+RsZRCzPDa1qamdWZUO/XSXn65Qir2p8F7C8+hP2ssNmRxqt1rHx3kN
-oEPzszmXCgJ01OdqxsDOEaBKmDshYD9krJcA+yNzVP9hrYW3O5rPbh8KtA1dLs6N
-Bb16b548cL9+EUdnxp8KwmS72LHbpPo4Pjciz9TVpE57GyWxNij1iknC+MpR3/8u
-EJHWxYX+DAaVltQe/hhd
-=HN2H
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOSiwQALamTRHxZ6cQeSuCM8IXqyyz
+vLL4XAYI4kGj9iWOYk2l65e8WMrO5eu1OpaLsgJrriARvNY2pxqb2jYkzl4bYRTA
+QTJ6jnmRPUGeu9v8oH9p8AMqqZoNf19rq64/W/H5Pj/caHQs391jPVUSgbnwOwcV
+TMi84osxkvGWp7RqPhYs0ccnvYIXv90Q4L2mtbmpAqGiuX2mb472IMzqG99b51mf
++33L0k36Rgztv/VuOUczhBIBJZXVU/ycF++FNYEusPTWiocPmaKRU300t16yOSaJ
+cVu4YPilN4O+keAvZMreEG0OEHZbup0QYMs+ltU0bWe2dkRSRz5I8iHT0HNl/GOu
+RoYi2IIj1VuR7T4tFiYyGfusqVtUFaTHVCCnndTAJDNNAv2WjVLTd/F4Cy/HPi/i
+TyDoxRdt2yIEHGr2p7mysKEr8PN+1sTLDTpMsPJ7xg6uOaVQaiSgA4ThCzRVA96S
+LB0OvOepURGtyaWwLE9cgi6ZdlEbmVkB6ubgoL/8TNtpvj8f94phz/zUnitEI0uM
+0wjLpk6K8y+aoy0NbN4jCCeDdMz/UltXC9z+hQGKJ49QGwWvw0zIf96JFQzJPhdz
+bn8ScwMqJn2nV35oVfW9AnokEGR6pnp6ZaoZx/9ryJEM4ZeYqGoguO5Yk+SVWz01
+zis8noWtBb9hPXULPbha
+=o7RY
 -----END PGP SIGNATURE-----
diff --git a/sys-freebsd/freebsd-sbin/freebsd-sbin-10.1.ebuild b/sys-freebsd/freebsd-sbin/freebsd-sbin-10.1-r1.ebuild
index b3936ba7e48e..84c7061994cf 100644
--- a/sys-freebsd/freebsd-sbin/freebsd-sbin-10.1.ebuild
+++ b/sys-freebsd/freebsd-sbin/freebsd-sbin-10.1-r1.ebuild
@@ -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-freebsd/freebsd-sbin/freebsd-sbin-10.1.ebuild,v 1.2 2015/06/05 16:43:55 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sbin/freebsd-sbin-10.1-r1.ebuild,v 1.1 2015/08/06 10:44:24 mgorny Exp $
 
 EAPI=5
 
@@ -9,8 +9,13 @@ inherit bsdmk freebsd multilib
 DESCRIPTION="FreeBSD sbin utils"
 SLOT="0"
 
+# Security Advisory and Errata patches.
+UPSTREAM_PATCHES=( "SA-15:19/routed.patch" )
+
 if [[ ${PV} != *9999* ]]; then
 	KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+	SRC_URI="${SRC_URI}
+		$(freebsd_upstream_patches)"
 fi
 
 EXTRACTONLY="