1 |
commit: 769cbefca616b3d1498b576c6f5e9d11a64873b1 |
2 |
Author: Matthew Thode <prometheanfire <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Jan 26 21:42:33 2017 +0000 |
4 |
Commit: Matt Thode <prometheanfire <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Jan 26 21:43:45 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=769cbefc |
7 |
|
8 |
dev-python/oslo-middleware: stable for bug 606976 CVE-2017-2592 |
9 |
|
10 |
Package-Manager: portage-2.3.3 |
11 |
|
12 |
.../oslo-middleware-3.19.0-r1.ebuild | 2 +- |
13 |
.../oslo-middleware/oslo-middleware-3.19.0.ebuild | 57 --------------------- |
14 |
.../oslo-middleware-3.8.0-r1.ebuild | 58 ---------------------- |
15 |
.../oslo-middleware-3.8.0-r2.ebuild | 2 +- |
16 |
4 files changed, 2 insertions(+), 117 deletions(-) |
17 |
|
18 |
diff --git a/dev-python/oslo-middleware/oslo-middleware-3.19.0-r1.ebuild b/dev-python/oslo-middleware/oslo-middleware-3.19.0-r1.ebuild |
19 |
index 062868e..d219a88 100644 |
20 |
--- a/dev-python/oslo-middleware/oslo-middleware-3.19.0-r1.ebuild |
21 |
+++ b/dev-python/oslo-middleware/oslo-middleware-3.19.0-r1.ebuild |
22 |
@@ -14,7 +14,7 @@ S="${WORKDIR}/oslo.middleware-${PV}" |
23 |
|
24 |
LICENSE="Apache-2.0" |
25 |
SLOT="0" |
26 |
-KEYWORDS="~amd64 ~arm64 ~x86" |
27 |
+KEYWORDS="amd64 ~arm64 x86" |
28 |
IUSE="test" |
29 |
|
30 |
PATCHES=( "${FILESDIR}/cve-2017-2592-stable-newton.patch" ) |
31 |
|
32 |
diff --git a/dev-python/oslo-middleware/oslo-middleware-3.19.0.ebuild b/dev-python/oslo-middleware/oslo-middleware-3.19.0.ebuild |
33 |
deleted file mode 100644 |
34 |
index 7cdf258..00000000 |
35 |
--- a/dev-python/oslo-middleware/oslo-middleware-3.19.0.ebuild |
36 |
+++ /dev/null |
37 |
@@ -1,57 +0,0 @@ |
38 |
-# Copyright 1999-2016 Gentoo Foundation |
39 |
-# Distributed under the terms of the GNU General Public License v2 |
40 |
-# $Id$ |
41 |
- |
42 |
-EAPI=6 |
43 |
-PYTHON_COMPAT=( python2_7 python3_4 python3_5 ) |
44 |
- |
45 |
-inherit distutils-r1 |
46 |
- |
47 |
-DESCRIPTION="Components injected into wsgi pipelines to intercept request/response flows." |
48 |
-HOMEPAGE="https://pypi.python.org/pypi/oslo.middleware" |
49 |
-SRC_URI="mirror://pypi/${PN:0:1}/oslo.middleware/oslo.middleware-${PV}.tar.gz" |
50 |
-S="${WORKDIR}/oslo.middleware-${PV}" |
51 |
- |
52 |
-LICENSE="Apache-2.0" |
53 |
-SLOT="0" |
54 |
-KEYWORDS="amd64 ~arm64 x86" |
55 |
-IUSE="test" |
56 |
- |
57 |
-CDEPEND=" |
58 |
- >=dev-python/pbr-1.6[${PYTHON_USEDEP}] |
59 |
- <dev-python/pbr-2.0[${PYTHON_USEDEP}]" |
60 |
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}] |
61 |
- ${CDEPEND} |
62 |
- test? ( |
63 |
- >=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}] |
64 |
- >=dev-python/mock-2.0.0[${PYTHON_USEDEP}] |
65 |
- >=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}] |
66 |
- !~dev-python/oslo-sphinx-3.4.0[${PYTHON_USEDEP}] |
67 |
- >=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}] |
68 |
- >=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}] |
69 |
- !~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}] |
70 |
- <dev-python/sphinx-1.3.0[${PYTHON_USEDEP}] |
71 |
- >=dev-python/testtools-1.4.0[${PYTHON_USEDEP}] |
72 |
- >=dev-python/coverage-3.6[${PYTHON_USEDEP}] |
73 |
- )" |
74 |
-RDEPEND=" |
75 |
- ${CDEPEND} |
76 |
- >=dev-python/jinja-2.8[${PYTHON_USEDEP}] |
77 |
- >=dev-python/oslo-config-3.14.0[${PYTHON_USEDEP}] |
78 |
- >=dev-python/oslo-context-2.9.0[${PYTHON_USEDEP}] |
79 |
- >=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}] |
80 |
- >=dev-python/oslo-utils-3.16.0[${PYTHON_USEDEP}] |
81 |
- >=dev-python/six-1.9.0[${PYTHON_USEDEP}] |
82 |
- >=dev-python/stevedore-1.16.0[${PYTHON_USEDEP}] |
83 |
- >=dev-python/webob-1.2.3[${PYTHON_USEDEP}] |
84 |
- >=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}] |
85 |
-" |
86 |
- |
87 |
-python_prepare_all() { |
88 |
- sed -i '/^hacking/d' test-requirements.txt || die |
89 |
- distutils-r1_python_prepare_all |
90 |
-} |
91 |
- |
92 |
-python_test() { |
93 |
- nosetests tests/ || die "test failed under ${EPYTHON}" |
94 |
-} |
95 |
|
96 |
diff --git a/dev-python/oslo-middleware/oslo-middleware-3.8.0-r1.ebuild b/dev-python/oslo-middleware/oslo-middleware-3.8.0-r1.ebuild |
97 |
deleted file mode 100644 |
98 |
index 2a4fe06..00000000 |
99 |
--- a/dev-python/oslo-middleware/oslo-middleware-3.8.0-r1.ebuild |
100 |
+++ /dev/null |
101 |
@@ -1,58 +0,0 @@ |
102 |
-# Copyright 1999-2016 Gentoo Foundation |
103 |
-# Distributed under the terms of the GNU General Public License v2 |
104 |
-# $Id$ |
105 |
- |
106 |
-EAPI=5 |
107 |
-PYTHON_COMPAT=( python2_7 python3_4 python3_5 ) |
108 |
- |
109 |
-inherit distutils-r1 |
110 |
- |
111 |
-DESCRIPTION="Components injected into wsgi pipelines to intercept request/response flows." |
112 |
-HOMEPAGE="https://pypi.python.org/pypi/oslo.middleware" |
113 |
-SRC_URI="mirror://pypi/${PN:0:1}/oslo.middleware/oslo.middleware-${PV}.tar.gz" |
114 |
-S="${WORKDIR}/oslo.middleware-${PV}" |
115 |
- |
116 |
-LICENSE="Apache-2.0" |
117 |
-SLOT="0" |
118 |
-KEYWORDS="amd64 ~arm64 x86" |
119 |
-IUSE="test" |
120 |
- |
121 |
-CDEPEND=" |
122 |
- >=dev-python/pbr-1.6[${PYTHON_USEDEP}] |
123 |
- <dev-python/pbr-2.0[${PYTHON_USEDEP}]" |
124 |
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}] |
125 |
- ${CDEPEND} |
126 |
- test? ( |
127 |
- >=dev-python/fixtures-1.3.1[${PYTHON_USEDEP}] |
128 |
- >=dev-python/mock-1.2[${PYTHON_USEDEP}] |
129 |
- >=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}] |
130 |
- !~dev-python/oslo-sphinx-3.4.0[${PYTHON_USEDEP}] |
131 |
- >=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}] |
132 |
- >=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}] |
133 |
- !~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}] |
134 |
- <dev-python/sphinx-1.3.0[${PYTHON_USEDEP}] |
135 |
- >=dev-python/testtools-1.4.0[${PYTHON_USEDEP}] |
136 |
- >=dev-python/coverage-3.6[${PYTHON_USEDEP}] |
137 |
- )" |
138 |
-RDEPEND=" |
139 |
- ${CDEPEND} |
140 |
- >=dev-python/Babel-1.3[${PYTHON_USEDEP}] |
141 |
- >=dev-python/jinja-2.8[${PYTHON_USEDEP}] |
142 |
- >=dev-python/oslo-config-3.7.0[${PYTHON_USEDEP}] |
143 |
- >=dev-python/oslo-context-0.2.0[${PYTHON_USEDEP}] |
144 |
- >=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}] |
145 |
- >=dev-python/oslo-utils-3.5.0[${PYTHON_USEDEP}] |
146 |
- >=dev-python/six-1.9.0[${PYTHON_USEDEP}] |
147 |
- >=dev-python/stevedore-1.5.0[${PYTHON_USEDEP}] |
148 |
- >=dev-python/webob-1.2.3[${PYTHON_USEDEP}] |
149 |
- >=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}] |
150 |
-" |
151 |
- |
152 |
-python_prepare_all() { |
153 |
- sed -i '/^hacking/d' test-requirements.txt || die |
154 |
- distutils-r1_python_prepare_all |
155 |
-} |
156 |
- |
157 |
-python_test() { |
158 |
- nosetests tests/ || die "test failed under ${EPYTHON}" |
159 |
-} |
160 |
|
161 |
diff --git a/dev-python/oslo-middleware/oslo-middleware-3.8.0-r2.ebuild b/dev-python/oslo-middleware/oslo-middleware-3.8.0-r2.ebuild |
162 |
index 1a7e55b..f266e36 100644 |
163 |
--- a/dev-python/oslo-middleware/oslo-middleware-3.8.0-r2.ebuild |
164 |
+++ b/dev-python/oslo-middleware/oslo-middleware-3.8.0-r2.ebuild |
165 |
@@ -14,7 +14,7 @@ S="${WORKDIR}/oslo.middleware-${PV}" |
166 |
|
167 |
LICENSE="Apache-2.0" |
168 |
SLOT="0" |
169 |
-KEYWORDS="~amd64 ~arm64 ~x86" |
170 |
+KEYWORDS="amd64 ~arm64 x86" |
171 |
IUSE="test" |
172 |
|
173 |
FILES=( "${FILESDIR}/cve-2017-2592-stable-mitaka.patch" ) |