summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichał Górny <mgorny@gentoo.org>2015-10-16 15:10:41 +0200
committerMichał Górny <mgorny@gentoo.org>2015-10-16 15:10:41 +0200
commit5aed275dd662ecd294a9ba54ab68b9a2b819f4b7 (patch)
tree6ea7ccaab6a5cc549127a657a4ee458b7dc6e5d7
parentdev-qt/qtchooser: Merge "add ~x86-fbsd keywords" (diff)
parentsys-freebsd/freebsd-usbin: Fix FreeBSD-SA-15:24.rpcbind v1.1. (diff)
downloadgentoo-5aed275dd662ecd294a9ba54ab68b9a2b819f4b7.tar.gz
gentoo-5aed275dd662ecd294a9ba54ab68b9a2b819f4b7.tar.bz2
gentoo-5aed275dd662ecd294a9ba54ab68b9a2b819f4b7.zip
sys-freebsd/freebsd-usbin: Merge FreeBSD-SA-15:24.rpcbind fix
Pull-Request: https://github.com/gentoo/gentoo/pull/223
-rw-r--r--sys-freebsd/freebsd-usbin/Manifest1
-rw-r--r--sys-freebsd/freebsd-usbin/freebsd-usbin-10.2-r4.ebuild (renamed from sys-freebsd/freebsd-usbin/freebsd-usbin-10.2-r3.ebuild)5
2 files changed, 4 insertions, 2 deletions
diff --git a/sys-freebsd/freebsd-usbin/Manifest b/sys-freebsd/freebsd-usbin/Manifest
index d12ce5e16741..0146e1e30d4a 100644
--- a/sys-freebsd/freebsd-usbin/Manifest
+++ b/sys-freebsd/freebsd-usbin/Manifest
@@ -21,4 +21,5 @@ DIST freebsd-usbin-8.2.tar.bz2 2443024 SHA256 aa7cabf10f5c3a9daabea32e4de24d04ec
DIST freebsd-usbin-9.1.tar.bz2 2670916 SHA256 b938c20b8c09aa9a610e13b69b9afeea72f561ab3636a59fba2bdac290f4db75 SHA512 21c234312f70eb35cd2926519efc1f61592892f5d0940786dbeb959c3c5ec7819a51ae95c6e8a1a06aa01f669350fe0fd3dd7c4ec8a84dd6b90f24cb192356ca WHIRLPOOL 7f6ad2eb5410cc5e685881654a788807848af026b1277a974682755ab7c9db28f576bfd1576441ea10c5f1e9edb7d30a4a23fb8eccd6d69d86ecc9ce4c9adc7e
DIST freebsd-usbin-EN-1513-vidcontrol.patch 497 SHA256 7de0a9693d8c014cd4bef842ab94408da1a07317d84ff779f9a3e9e2160d2527 SHA512 f141b763a85765b34a762aaa267cbaa10b51958a5947ac5d153cbe8a21bf32c4cbc2234687154988d080c668821aa87fa6777d41da243c52de3c6bda67645ac0 WHIRLPOOL b7df3d790a521cf28723a26e231d9d5f801736e5d215ef32c70e2e935b81db7f36b55b79c6bffa35fc9708272ea28f692d8fe26cb565e5a2432e6aa606e9fbae
DIST freebsd-usbin-EN-1516-pw.patch 540 SHA256 20f67f2ae87d87be0d60d817f57bf42f3721c88f4f99beec6e616992bc43fe41 SHA512 42eefb4bf76132eb14bf0a5abe8fab4b0b0859e81c59a4381912101fb9b942609f68406a713f2abcf50d05acf5c5bb6a51361c6065b79cbf9fa3e467747dd29d WHIRLPOOL cea498d3809274968c280b373631c1cf07c801bd5559e9c315e900c764dc6e767c399bf4f8e8726269f48530ee8d5846496895ad0030385cf3a8aaaf6d8efc1d
+DIST freebsd-usbin-SA-1524-rpcbind-00.patch 713 SHA256 7f10713bd0c3ff34f3ea71dd03b93faca1fa4d9a0127ec8bf39da11978e40737 SHA512 1e9dab75c487fbfcca0cc5fc8c7733db19ffdf7023649384e878551da73561cd5eaebc8fe3edf47a42907f361e19134609b3843b8591c36418a5879519a7bc97 WHIRLPOOL 872350990a7afbaa679ddc98eb8c12ae6388b480bf08cdff27c32fa8f38b8c0e455612934a12acee8f405f77996648a9c080f138b43aeceeef5033191dba791f
DIST freebsd-usbin-SA-1524-rpcbind.patch 1621 SHA256 f00e6a02cdb1a520a1cd1271ede77cde4e658d2cf336377af0f8f0589eed477f SHA512 c15f8d83e92ae6f6457831c182bcd022af8ad61e2c7c9f4240f3b50d494c59b6e923d01b932ce4878a27eb36b9d87bcefa41c15f123095be779b905ac0585cda WHIRLPOOL 0df3a1bd60fb43f639c51ee779b9ebe1468afe301323f1103cf1d56151d79667d7716df7e75a19aa57a03b699fe481d3a7da83327876cbcf60c9e114db21eca7
diff --git a/sys-freebsd/freebsd-usbin/freebsd-usbin-10.2-r3.ebuild b/sys-freebsd/freebsd-usbin/freebsd-usbin-10.2-r4.ebuild
index 54ce185c286b..00a5cb592e9f 100644
--- a/sys-freebsd/freebsd-usbin/freebsd-usbin-10.2-r3.ebuild
+++ b/sys-freebsd/freebsd-usbin/freebsd-usbin-10.2-r4.ebuild
@@ -12,7 +12,8 @@ SLOT="0"
# Security Advisory and Errata patches.
UPSTREAM_PATCHES=( "EN-15:13/vidcontrol.patch"
"EN-15:16/pw.patch"
- "SA-15:24/rpcbind.patch" )
+ "SA-15:24/rpcbind.patch"
+ "SA-15:24/rpcbind-00.patch" )
if [[ ${PV} != *9999* ]]; then
KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
@@ -40,7 +41,7 @@ fi
RDEPEND="=sys-freebsd/freebsd-lib-${RV}*[usb?,bluetooth?,netware?]
=sys-freebsd/freebsd-libexec-${RV}*
build? ( sys-apps/baselayout )
- ssl? ( dev-libs/openssl )
+ ssl? ( dev-libs/openssl:0 )
>=app-arch/libarchive-3
sys-apps/tcp-wrappers
dev-util/dialog