1 |
commit: 357835e5a56ae91c9bee9cf3ce2363a255d929be |
2 |
Author: Ian Delaney <idella4 <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Dec 3 13:12:34 2015 +0000 |
4 |
Commit: Ian Delaney <idella4 <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Dec 3 13:13:40 2015 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=357835e5 |
7 |
|
8 |
app-emulation/xen-tools: add missed sec patches to vn. 4.6.0-r3 |
9 |
|
10 |
Already added to xen-4.5.2-r1, fixes gentoo bug. |
11 |
Fix apparent typo re sec. patches in ebuild of 4.6.0-r3 only |
12 |
|
13 |
Gentoo bug: #567190 |
14 |
|
15 |
Package-Manager: portage-2.2.24 |
16 |
|
17 |
app-emulation/xen-tools/xen-tools-4.6.0-r3.ebuild | 12 +++++++----- |
18 |
1 file changed, 7 insertions(+), 5 deletions(-) |
19 |
|
20 |
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 |
21 |
index 156be8a..d13b307 100644 |
22 |
--- a/app-emulation/xen-tools/xen-tools-4.6.0-r3.ebuild |
23 |
+++ b/app-emulation/xen-tools/xen-tools-4.6.0-r3.ebuild |
24 |
@@ -45,7 +45,9 @@ else |
25 |
${OVMF_PATCHSET_URI} ) |
26 |
${UPSTREAM_PATCHSET_URI} |
27 |
${SECURITY_PATCHSET_URI} |
28 |
- ${GENTOO_PATCHSET_URI}" |
29 |
+ ${GENTOO_PATCHSET_URI} |
30 |
+ https://dev.gentoo.org/~idella4/distfiles/xen-security-patches-0.tar.gz" |
31 |
+ |
32 |
S="${WORKDIR}/xen-${MY_PV}" |
33 |
fi |
34 |
|
35 |
@@ -164,7 +166,7 @@ pkg_setup() { |
36 |
src_prepare() { |
37 |
# Upstream's patchset |
38 |
if [[ -n ${UPSTREAM_VER} ]]; then |
39 |
- einfo "Try to apply Xen Upstream patcheset" |
40 |
+ einfo "Try to apply Xen Upstream patch set" |
41 |
EPATCH_SUFFIX="patch" \ |
42 |
EPATCH_FORCE="yes" \ |
43 |
EPATCH_OPTS="-p1" \ |
44 |
@@ -173,7 +175,7 @@ src_prepare() { |
45 |
|
46 |
# Security patchset |
47 |
if [[ -n ${SECURITY_VER} ]]; then |
48 |
- einfo "Try to apply Xen Security patcheset" |
49 |
+ einfo "Try to apply Xen Security patch set" |
50 |
source "${WORKDIR}"/patches-security/${PV}.conf |
51 |
# apply main xen patches |
52 |
for i in ${XEN_SECURITY_MAIN}; do |
53 |
@@ -215,7 +217,7 @@ src_prepare() { |
54 |
|
55 |
# Gentoo's patchset |
56 |
if [[ -n ${GENTOO_VER} && -n ${GENTOO_GPV} ]]; then |
57 |
- einfo "Try to apply Gentoo specific patcheset" |
58 |
+ einfo "Try to apply Gentoo specific patch set" |
59 |
source "${FILESDIR}"/gentoo-patches.conf |
60 |
_gpv=_gpv_${PN/-/_}_${PV//./}_${GENTOO_GPV} |
61 |
for i in ${!_gpv}; do |
62 |
@@ -227,7 +229,7 @@ src_prepare() { |
63 |
|
64 |
# Ovmf's patchset |
65 |
if [[ -n ${OVMF_VER} ]] && use ovmf; then |
66 |
- einfo "Try to apply Ovmf patcheset" |
67 |
+ einfo "Try to apply Ovmf patch set" |
68 |
pushd "${WORKDIR}"/ovmf-*/ > /dev/null |
69 |
EPATCH_SUFFIX="patch" \ |
70 |
EPATCH_FORCE="yes" \ |