Fix FreeBSD-SA-15:18.bsdpatch. https://github.com/gentoo/gentoo-portage-rsync-mirror/pull/192 by nigoro.

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

3 files changed, 28 insertions, 19 deletions

diff --git a/sys-freebsd/freebsd-ubin/ChangeLog b/sys-freebsd/freebsd-ubin/ChangeLog
index a3347a9244f3..94e4cf5d234a 100644
--- a/sys-freebsd/freebsd-ubin/ChangeLog
+++ b/sys-freebsd/freebsd-ubin/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-freebsd/freebsd-ubin
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-ubin/ChangeLog,v 1.104 2015/07/29 12:09:34 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-ubin/ChangeLog,v 1.105 2015/08/06 10:43:28 mgorny Exp $
+
+*freebsd-ubin-10.1-r2 (06 Aug 2015)
+
+  06 Aug 2015; Michał Górny <mgorny@gentoo.org> +freebsd-ubin-10.1-r2.ebuild,
+  -freebsd-ubin-10.1-r1.ebuild:
+  Fix FreeBSD-SA-15:18.bsdpatch. https://github.com/gentoo/gentoo-portage-rsync-
+  mirror/pull/192 by nigoro.
 
 *freebsd-ubin-10.1-r1 (29 Jul 2015)
 
diff --git a/sys-freebsd/freebsd-ubin/Manifest b/sys-freebsd/freebsd-ubin/Manifest
index e9388c721fdf..45a957658fc2 100644
--- a/sys-freebsd/freebsd-ubin/Manifest
+++ b/sys-freebsd/freebsd-ubin/Manifest
@@ -45,28 +45,29 @@ DIST freebsd-sys-9.1.tar.bz2 32588103 SHA256 b93a7ac8334ac16cc9f60665048e5ef812c
 DIST freebsd-ubin-8.2.tar.bz2 1808012 SHA256 6b99554f3ad6ee052069b347eb6e6219b71598d7b222acb90a24cbfc805c7b68 SHA512 48d0103323e820c431aa4f62d3be40cb3b200fb62e3de01f36c88760395bf2ba3367c51f3fa72da4dbccc2812176a051a12ca5cb7e84125c3e0fc78d4cab2c29 WHIRLPOOL ea8f3a29a37b42c2b5bcc0f2c343fa1538522157ef075363c94606a4620a590e9a03f856ce2494e3e727935b62431991d0aa9fde71de699e78b4fe225bdf1c2c
 DIST freebsd-ubin-9.1.tar.bz2 1910472 SHA256 ff6e586f213534b6ec2e65002c0dee64063d76ddad515c12221b1a80a1815e48 SHA512 74ae0aceec8597aa66c3f1ab313f0685a3c63d7273c36ae7baf8794275ad9bca241c60c3f6281cccf6d531d250d7611099977d3b1a27279cef3586401b6af05e WHIRLPOOL c85a3c9cf2bceff2c60ff03556bcc81d3aca22b0bce3c9538990071ac0a907236eee5ae7743ad22c5fd309b047ebf392aaaf2fe177ef5790ea869aff3da7e2fe
 DIST freebsd-ubin-SA-1514-bsdpatch.patch 5692 SHA256 46c8f1d59e74660749e68c18ab688e4a36bef08390ecb8ded1910a1ec6616996 SHA512 eecc880909255eac05c0189fa40839fc9b76359f82de3a71320df417bea7ddb53aa0fcaca3c738755615f439c5d7158bcd6c217041ad6d64965c5fc644da5fa9 WHIRLPOOL 50e86baf24331417c207d25a57c339156efba87164a9026098cb76044a5130e454ab41da0980a9917c82cf07e95cf55435d992583ed2504443c8979d5e69a1fd
-EBUILD freebsd-ubin-10.1-r1.ebuild 5952 SHA256 7728eab3c87038668be294bba3f092acec25c3aafaa6ed662a23f9462d7213ec SHA512 486fe01ca714ddb9247517e65a8764a032062d4a140b6f58d83f3fd40929781bd735f20ca4c47cb2549d930b7b5d852642fbbe28e2f3a4920ba4399eb8daa8d3 WHIRLPOOL 5b5dd3b5f97550382df917c93da0dc05a157810dd59bcac3827126cb5465ecbb446295f53b20dc1f60015a0649bc16953ed0c8c0342cbdbc04d19e20b030ecbd
+DIST freebsd-ubin-SA-1518-bsdpatch.patch 1617 SHA256 4a0a30ee8369d09f5136edf127933892808d55b739b59cfba381a538d6f01ead SHA512 d18a6b65d9210cef2e3efa48c1eab5ec757cacf471bfeefb0bc59c6a3fca9b6ec32534a6e34d6f915b0e407d75e26073bc83d2ff9bd9bf24cdf57dbf19f2c657 WHIRLPOOL 04afc52ee73667432554482c232f604f96f948a7e1abce9f7b3ecf0d3f581819f50ad57f1eaa5ccf09fbc037ce5712a761a42aa153528d10cc1bef0eabad059a
+EBUILD freebsd-ubin-10.1-r2.ebuild 5979 SHA256 73ec7d1efd5f6c1ffdd5a216c6cbbad82d7eb0045a265a137d49642446081a41 SHA512 f32b5682176bc292a33d1dc99874eade3b4fa0ac2454ade33b18b03b11cd063f82a48dccf6566b42beb510f9bc3fb457a3a66d41ec310061ad686f8aa8b8001d WHIRLPOOL 93d4466674f0b4697c46f26fa4fc5bc6d7cf1239a1814fdf8728340748002de62484cc9b520514fd7efee3d5652d202d1e889db9a58d48089690f8081b9b4e3b
 EBUILD freebsd-ubin-8.2-r1.ebuild 4645 SHA256 aab17d095a0dfde25111ecceb6486e74d4ee71c0288d68b17f4b38f2019ec257 SHA512 6c28bec854a0e11e95664d2f57367a6e252920733f146832af4cf95674b4c8c34426dbaeeac1b87234da4ab1dc67b4d5bdc8b91c5c9787b03d6b6981f28efc43 WHIRLPOOL 95cf5e8a7342cbb216958898a7900087ae455bdd8ee9f58b7a0563b512cf7104b595b29211fe63d09ee4f60d0f324fa058a245f0f211ae66261caa5ec90e7dfb
 EBUILD freebsd-ubin-9.1-r2.ebuild 5572 SHA256 30ec2f63e03cb8056e0a6a0fa3db871645346217d8d3c96aa7f420b52ba3b5e8 SHA512 727231a1ff44c5e41500354857f4b3c50d6e43b6011bbb2a8d7161c7a8843085a5410092c87f46e7bb6a51f7101d2656278c438b3f83c04822e6c3d13db4d940 WHIRLPOOL ea873f009cbfec41d3d287a2a427d5d486eb7bc91b1e1ca09670d5f76b0f75f58e26a51a38e92ec389803346282e5be4735c99d352ce337fcc11e24eed574b74
 EBUILD freebsd-ubin-9.1-r3.ebuild 5579 SHA256 d342ec4329a960b07636c55b4d9350f93592574a58d8612bb77019af514d98c1 SHA512 69dc9af63da2ac71c9cd81fdb2e75368e97ad7efc44a4edd65f8a0faca6704b111d98280670b0b53f6548e961501b8eddda01a34ae3209c21b3a146b3bb63dc2 WHIRLPOOL 828e50b0309684852664b2d5ad579252027febaccd9ecfabb1f5b6b9303191e6549ca74f402288b0bc83508ee4571267dcb68f134bce1fe2b38abb9a22d9ab86
-MISC ChangeLog 21040 SHA256 c5149fac7e3c3f42efcc8cfb30f9d1d0d21cf513cf8f36edecb87da57cef2a02 SHA512 0eab96313ad9e5b058785d94d1b20e6ad6574fd7408f50bcedc5b889a17ac552683f85cd5b9f0598517577206499ddd49b9b77e462845fc3274fba272ef4132a WHIRLPOOL 758389407ea7a60070faa2acd412a41edc8772ea75344f02c7b4cbc278c286f8ae6e6955538172c4dd5b2d79c637121dda874ef58cc681ee87ab364a58bb2410
+MISC ChangeLog 21300 SHA256 0a85cc6b3f1163e5545522da864fe54a8a6f9a216b366eeb2b12a6c6bf882f1d SHA512 f5b675b1b97227d93be1ca9fae809ec8a5ec6d636aff49d909676cacd2f81faa738aa51a76ef1c4a32f97732ea9e40fe19734b4bb6ea569f36c32b025164092b WHIRLPOOL 08549e9019904a0fd2829a3ab1aac0074a5114d6553965e4d0dc4ab5a75710fe3f15a5448ffcc8cfbbc076b5336ab196989ff696527074f4c0213b240331714b
 MISC metadata.xml 692 SHA256 9d7a61c414fb50713568dc2782c2de6460bac1eff7ca6a9f8a2d25979b48e811 SHA512 8bc469bb79edb0c34e5fb03f4a53c12b0f3741f06a20e1fc1b58772e594f259cc91368157ced396f8843b6e4398bffd1e5b5b8c694d5bec324e89966e4e618d6 WHIRLPOOL 026491842e88460c5fb80acdf7b26e274c74c6d0ced8c23e16382b82a9b99d9657b96a5ecbca2d95ecd0dfef463dfa012f7aeb3acd8e655df859ab6aada0d312
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQJ8BAEBCABmBQJVuMKBXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJVwzpTXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOJvkQAKZDXJJOtI/9cZy/aOxZfhGS
-hjwhZTNqPnvprjPqD2wIDam6os/LdysXoqaUxf5RKoKK3zT1N/qQOH1VmFUgJdwy
-JJVUQ6GXfN9ZIwJ6Edxl3teWBng3Fez8iQ0fnRvtOWjHbrTyITMsUK0qptuvxq4u
-Pia0UsHBOQS7Lv92WSeq7LJ0Wy90LbgnN9MOm5mgXXelGfKasDmI6IqbMCItOXU5
-bduHmx7xhlo0cVwUd67VOkZT+ff1zL2OD9GPN/pjTVB+Pk4dVYIp4yVoFtSeOUCL
-qD94LHFl/VD33+bZodvlEI/NMlGK3zUaFqe0VHC2rHyNvcZIp+LyD59MNk1ircEE
-oRuXbfwUj+p8nXo+mfuqkpu4NKfhj08ca0uO9rU3DObIqeyXO0BGV7K2Osl37Elh
-/bwTk/+cf2go77h0WaW7lfyq1gvunm+epUj6Hnltxn9WfluIssIJ85fG9GVyh0er
-TiXLPrM1JLJ1x2T9CSjoBCQIMSIscBuLfzW3kxpte3GNycq2Ehyt9koMuHsiGNzO
-VcnFdoTYtwlYS6Cy/bmywu5zmJ5VfmoUvHUBlNgz7SRSJaCXv7paTtDWeda5onEP
-VHPjPPqw52u9LEbXuQMs4wjQ5WNtFXh6EY8nz12/wEm2hDy4UWd5mqjI9CKTrtgg
-CLxPhbJ7D3Yi2BuaHAdt
-=YSop
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOZs8QAI1p8+4dnUdoTlIndO7ERT3P
+I6zEUj/lBspb3SYejOVFj6SchDvaytwaD7sYAwchFLUbPcMNpbFkVTcIFyFyn4+R
+lyAKPborVm0FXYzvyfiyBK3y20vnKVZrt790WQIo91rn2lPaGfV/+afzss06JqW2
+5ItJcbl0PNKaNwp75NGarMxDwIrzoWFgrjre9y4YfLAFgZWrE7hheX+ok0LIuWM7
+di7ytB5KvUroc6ee7pFySnBu6vh0/YE+/yrmlXqlFDDB2w0FyK7g4dXOr6Aw4GJh
+rHuGiLGOMZNM/o1oDQui8bG4Il+4b3L8mIkf2gbhTtQ0H7L9bm9jHZgdirgKAqPD
+ujc0xyBATTIPC5M397GcXyAeZlf9IEQqzJMLtNBqh5G+f+jkVw4AhXvZN/ipzuO9
+vr9Rugnxj2vI+3R66nvU8iylMDeUZ36s5LnTMjBXLJ0Ywd7WpdjZSHseDYTm9/Ar
+MTYGpxR8Q7BiZHrfW5toxDUMZridoH6BIYkQmLSOaiAV5ncVkLTaiaVZq0pK2WQU
+7L05YBxgCUrHpJqcOy2xffeCTghD/poeh4Ydb1+nse+BRVyvU1Qx7rXhmwU9vgrG
+CIGBj/CKnj4s4CH8R1bRU83w+mjAb3akHAsQFRqIwLIj4KD/fe6quVbcK4dNfqH7
+iU7Q274hXZaJ0VjLj2kW
+=Nshs
 -----END PGP SIGNATURE-----
diff --git a/sys-freebsd/freebsd-ubin/freebsd-ubin-10.1-r1.ebuild b/sys-freebsd/freebsd-ubin/freebsd-ubin-10.1-r2.ebuild
index fbf31e235512..5d9c7054e2e2 100644
--- a/sys-freebsd/freebsd-ubin/freebsd-ubin-10.1-r1.ebuild
+++ b/sys-freebsd/freebsd-ubin/freebsd-ubin-10.1-r2.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-ubin/freebsd-ubin-10.1-r1.ebuild,v 1.1 2015/07/29 12:09:34 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-ubin/freebsd-ubin-10.1-r2.ebuild,v 1.1 2015/08/06 10:43:28 mgorny Exp $
 
 EAPI=5
 
@@ -12,7 +12,8 @@ IUSE="ar atm audit bluetooth ipv6 kerberos netware nis ssl usb build zfs"
 LICENSE="BSD zfs? ( CDDL )"
 
 # Security Advisory and Errata patches.
-UPSTREAM_PATCHES=( "SA-15:14/bsdpatch.patch" )
+UPSTREAM_PATCHES=( "SA-15:14/bsdpatch.patch"
+	"SA-15:18/bsdpatch.patch" )
 
 if [[ ${PV} != *9999* ]]; then
 	KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"