[gentoo-commits] repo/gentoo:master commit in: app-emulation/xen-tools/

[Ian Delaney]

commit:     357835e5a56ae91c9bee9cf3ce2363a255d929be
Author:     Ian Delaney <idella4 <AT> gentoo <DOT> org>
AuthorDate: Thu Dec  3 13:12:34 2015 +0000
Commit:     Ian Delaney <idella4 <AT> gentoo <DOT> org>
CommitDate: Thu Dec  3 13:13:40 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=357835e5

app-emulation/xen-tools: add missed sec patches to vn. 4.6.0-r3

Already added to xen-4.5.2-r1, fixes gentoo bug.
Fix apparent typo re sec. patches in ebuild of 4.6.0-r3 only

Gentoo bug: #567190

Package-Manager: portage-2.2.24

 app-emulation/xen-tools/xen-tools-4.6.0-r3.ebuild | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/app-emulation/xen-tools/xen-tools-4.6.0-r3.ebuild 
b/app-emulation/xen-tools/xen-tools-4.6.0-r3.ebuild
index 156be8a..d13b307 100644
--- a/app-emulation/xen-tools/xen-tools-4.6.0-r3.ebuild
+++ b/app-emulation/xen-tools/xen-tools-4.6.0-r3.ebuild
@@ -45,7 +45,9 @@ else
                ${OVMF_PATCHSET_URI} )
        ${UPSTREAM_PATCHSET_URI}
        ${SECURITY_PATCHSET_URI}
-       ${GENTOO_PATCHSET_URI}"
+       ${GENTOO_PATCHSET_URI}
+       https://dev.gentoo.org/~idella4/distfiles/xen-security-patches-0.tar.gz";
+
        S="${WORKDIR}/xen-${MY_PV}"
 fi
 
@@ -164,7 +166,7 @@ pkg_setup() {
 src_prepare() {
        # Upstream's patchset
        if [[ -n ${UPSTREAM_VER} ]]; then
-               einfo "Try to apply Xen Upstream patcheset"
+               einfo "Try to apply Xen Upstream patch set"
                EPATCH_SUFFIX="patch" \
                EPATCH_FORCE="yes" \
                EPATCH_OPTS="-p1" \
@@ -173,7 +175,7 @@ src_prepare() {
 
        # Security patchset
        if [[ -n ${SECURITY_VER} ]]; then
-               einfo "Try to apply Xen Security patcheset"
+               einfo "Try to apply Xen Security patch set"
                source "${WORKDIR}"/patches-security/${PV}.conf
                # apply main xen patches
                for i in ${XEN_SECURITY_MAIN}; do
@@ -215,7 +217,7 @@ src_prepare() {
 
        # Gentoo's patchset
        if [[ -n ${GENTOO_VER} && -n ${GENTOO_GPV} ]]; then
-               einfo "Try to apply Gentoo specific patcheset"
+               einfo "Try to apply Gentoo specific patch set"
                source "${FILESDIR}"/gentoo-patches.conf
                _gpv=_gpv_${PN/-/_}_${PV//./}_${GENTOO_GPV}
                for i in ${!_gpv}; do
@@ -227,7 +229,7 @@ src_prepare() {
 
        # Ovmf's patchset
        if [[ -n ${OVMF_VER} ]] && use ovmf; then
-               einfo "Try to apply Ovmf patcheset"
+               einfo "Try to apply Ovmf patch set"
                pushd "${WORKDIR}"/ovmf-*/ > /dev/null
                EPATCH_SUFFIX="patch" \
                EPATCH_FORCE="yes" \