1 |
commit: 6bee848810f08d65215e15fd87c2405f3bf09540 |
2 |
Author: Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com> |
3 |
AuthorDate: Tue Mar 29 20:47:04 2022 +0000 |
4 |
Commit: Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com> |
5 |
CommitDate: Tue Mar 29 20:53:28 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=6bee8488 |
7 |
|
8 |
sys-auth/keystone: add 21.0.0.0_rc1, drop 20.0.0.0_rc1 |
9 |
|
10 |
Signed-off-by: Alessandro Barbieri <lssndrbarbieri <AT> gmail.com> |
11 |
|
12 |
sys-auth/keystone/Manifest | 3 +- |
13 |
.../keystone-21.0.0.0_rc1-no-usr-local-bin.patch | 47 ++++++++++++++ |
14 |
...0.0_rc1.ebuild => keystone-21.0.0.0_rc1.ebuild} | 71 +++++++++++----------- |
15 |
3 files changed, 84 insertions(+), 37 deletions(-) |
16 |
|
17 |
diff --git a/sys-auth/keystone/Manifest b/sys-auth/keystone/Manifest |
18 |
index 3ab51e8c4..aed973eb6 100644 |
19 |
--- a/sys-auth/keystone/Manifest |
20 |
+++ b/sys-auth/keystone/Manifest |
21 |
@@ -1,2 +1 @@ |
22 |
-DIST keystone-20.0.0.0rc1.tar.gz 1729520 BLAKE2B 69d870dacf786a8e7ef8474027e83e15950432d232f221715f850ae731dcc6d6620684c6118d95333d674de1a7e2790919ffc1f09e553e25b2eedb999c5c38d3 SHA512 9ff450d80270f9fe037f0e21f8322de10a0f80c51b59226b8c62f3dc8b07e5af49c63aa33c6682203e295c1eb54842332a02c9ad7b4e9dd64653d1ee4536944e |
23 |
-DIST keystone.conf.sample-20.0.0.0_rc1 107458 BLAKE2B c1d826acdd671638fc4542864811bda8baa237cfbf24438fa0cedc12e6f29047178cfb1b837c0aef035410848ce3e473e58b51f0eadee4c61eb75f214c65c35a SHA512 6488a1c3eac0d1376db0950cda65c62ba04dc03d896a6c0465ea09b870e5d077ed5012a84657defb9f63db25ce320c884f72c4083e4a233f18930120194ba73b |
24 |
+DIST keystone-21.0.0.0rc1.tar.gz 1698152 BLAKE2B 703fb7b56a12cc3909a8990a2c21df2fca056f5eda43bd562ff8dcaeb06aa61db60b6d2ba6010d5c987f74f8d529eb66f086e648cbef25f96867e6c6b2644b29 SHA512 290e7ce13de1d7a232ef41166d51585460f6be745daf5477b8d83a8537f09eaecb82d6fabf554be777108b4a281ffb2e65457fe815a0405355a9e19c6f31f442 |
25 |
|
26 |
diff --git a/sys-auth/keystone/files/keystone-21.0.0.0_rc1-no-usr-local-bin.patch b/sys-auth/keystone/files/keystone-21.0.0.0_rc1-no-usr-local-bin.patch |
27 |
new file mode 100644 |
28 |
index 000000000..cef46b2d3 |
29 |
--- /dev/null |
30 |
+++ b/sys-auth/keystone/files/keystone-21.0.0.0_rc1-no-usr-local-bin.patch |
31 |
@@ -0,0 +1,47 @@ |
32 |
+--- a/httpd/keystone-uwsgi-admin.ini |
33 |
++++ b/httpd/keystone-uwsgi-admin.ini |
34 |
+@@ -1,5 +1,5 @@ |
35 |
+ [uwsgi] |
36 |
+-wsgi-file = /usr/local/bin/keystone-wsgi-admin |
37 |
++wsgi-file = /usr/bin/keystone-wsgi-admin |
38 |
+ |
39 |
+ # Versions of mod_proxy_uwsgi>=2.0.6 should use a UNIX socket, see |
40 |
+ # http://uwsgi-docs.readthedocs.org/en/latest/Apache.html#mod-proxy-uwsgi |
41 |
+--- a/httpd/keystone-uwsgi-public.ini |
42 |
++++ b/httpd/keystone-uwsgi-public.ini |
43 |
+@@ -1,5 +1,5 @@ |
44 |
+ [uwsgi] |
45 |
+-wsgi-file = /usr/local/bin/keystone-wsgi-public |
46 |
++wsgi-file = /usr/bin/keystone-wsgi-public |
47 |
+ |
48 |
+ # Versions of mod_proxy_uwsgi>=2.0.6 should use a UNIX socket, see |
49 |
+ # http://uwsgi-docs.readthedocs.org/en/latest/Apache.html#mod-proxy-uwsgi |
50 |
+--- a/httpd/wsgi-keystone.conf |
51 |
++++ b/httpd/wsgi-keystone.conf |
52 |
+@@ -3,7 +3,7 @@ |
53 |
+ <VirtualHost *:5000> |
54 |
+ WSGIDaemonProcess keystone-public processes=5 threads=1 user=keystone group=keystone display-name=%{GROUP} |
55 |
+ WSGIProcessGroup keystone-public |
56 |
+- WSGIScriptAlias / /usr/local/bin/keystone-wsgi-public |
57 |
++ WSGIScriptAlias / /usr/bin/keystone-wsgi-public |
58 |
+ WSGIApplicationGroup %{GLOBAL} |
59 |
+ WSGIPassAuthorization On |
60 |
+ LimitRequestBody 114688 |
61 |
+@@ -13,7 +13,7 @@ |
62 |
+ ErrorLog /var/log/apache2/keystone.log |
63 |
+ CustomLog /var/log/apache2/keystone_access.log combined |
64 |
+ |
65 |
+- <Directory /usr/local/bin> |
66 |
++ <Directory /usr/bin> |
67 |
+ <IfVersion >= 2.4> |
68 |
+ Require all granted |
69 |
+ </IfVersion> |
70 |
+@@ -24,7 +24,7 @@ |
71 |
+ </Directory> |
72 |
+ </VirtualHost> |
73 |
+ |
74 |
+-Alias /identity /usr/local/bin/keystone-wsgi-public |
75 |
++Alias /identity /usr/bin/keystone-wsgi-public |
76 |
+ <Location /identity> |
77 |
+ SetHandler wsgi-script |
78 |
+ Options +ExecCGI |
79 |
|
80 |
diff --git a/sys-auth/keystone/keystone-20.0.0.0_rc1.ebuild b/sys-auth/keystone/keystone-21.0.0.0_rc1.ebuild |
81 |
similarity index 84% |
82 |
rename from sys-auth/keystone/keystone-20.0.0.0_rc1.ebuild |
83 |
rename to sys-auth/keystone/keystone-21.0.0.0_rc1.ebuild |
84 |
index 878d5f905..715dc5765 100644 |
85 |
--- a/sys-auth/keystone/keystone-20.0.0.0_rc1.ebuild |
86 |
+++ b/sys-auth/keystone/keystone-21.0.0.0_rc1.ebuild |
87 |
@@ -1,10 +1,10 @@ |
88 |
-# Copyright 1999-2021 Gentoo Authors |
89 |
+# Copyright 1999-2022 Gentoo Authors |
90 |
# Distributed under the terms of the GNU General Public License v2 |
91 |
|
92 |
EAPI=8 |
93 |
|
94 |
MYP="${P/_/}" |
95 |
-PYTHON_COMPAT=( python3_8 ) |
96 |
+PYTHON_COMPAT=( python3_{8..9} ) |
97 |
|
98 |
inherit distutils-r1 |
99 |
|
100 |
@@ -12,12 +12,9 @@ DESCRIPTION="The Openstack authentication, authorization, and service catalog" |
101 |
HOMEPAGE=" |
102 |
https://opendev.org/openstack/keystone |
103 |
https://launchpad.net/keystone |
104 |
- https://pypi.org/project/keystone |
105 |
-" |
106 |
-SRC_URI=" |
107 |
- https://dev.gentoo.org/~prometheanfire/dist/openstack/keystone/victoria/keystone.conf.sample -> keystone.conf.sample-${PV} |
108 |
- https://tarballs.openstack.org/${PN}/${MYP}.tar.gz |
109 |
+ https://pypi.org/project/keystone/ |
110 |
" |
111 |
+SRC_URI="https://tarballs.openstack.org/${PN}/${MYP}.tar.gz" |
112 |
S="${WORKDIR}/${MYP}" |
113 |
|
114 |
KEYWORDS="~amd64" |
115 |
@@ -26,21 +23,11 @@ SLOT="0" |
116 |
IUSE="+sqlite ldap memcached mongo mysql postgres" |
117 |
|
118 |
RDEPEND=" |
119 |
+ >=dev-python/pbr-2.0.0[${PYTHON_USEDEP}] |
120 |
>=dev-python/webob-1.7.1[${PYTHON_USEDEP}] |
121 |
>=dev-python/flask-1.0.2[${PYTHON_USEDEP}] |
122 |
>=dev-python/flask-restful-0.3.5[${PYTHON_USEDEP}] |
123 |
>=dev-python/cryptography-2.7[${PYTHON_USEDEP}] |
124 |
- sqlite? ( |
125 |
- >=dev-python/sqlalchemy-1.3.0[sqlite,${PYTHON_USEDEP}] |
126 |
- ) |
127 |
- mysql? ( |
128 |
- >=dev-python/pymysql-0.7.6[${PYTHON_USEDEP}] |
129 |
- >=dev-python/sqlalchemy-1.3.0[${PYTHON_USEDEP}] |
130 |
- ) |
131 |
- postgres? ( |
132 |
- >=dev-python/psycopg-2.5.0[${PYTHON_USEDEP}] |
133 |
- >=dev-python/sqlalchemy-1.3.0[${PYTHON_USEDEP}] |
134 |
- ) |
135 |
>=dev-python/sqlalchemy-migrate-0.13.0[${PYTHON_USEDEP}] |
136 |
>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}] |
137 |
>=dev-python/passlib-1.7.0[${PYTHON_USEDEP}] |
138 |
@@ -69,16 +56,29 @@ RDEPEND=" |
139 |
>=dev-python/msgpack-0.5.0[${PYTHON_USEDEP}] |
140 |
>=dev-python/osprofiler-1.4.0[${PYTHON_USEDEP}] |
141 |
>=dev-python/pytz-2013.6[${PYTHON_USEDEP}] |
142 |
+ |
143 |
+ ldap? ( |
144 |
+ >=dev-python/python-ldap-3.1.0[${PYTHON_USEDEP}] |
145 |
+ >=dev-python/ldappool-2.3.1[${PYTHON_USEDEP}] |
146 |
+ ) |
147 |
+ mysql? ( |
148 |
+ >=dev-python/pymysql-0.7.6[${PYTHON_USEDEP}] |
149 |
+ >=dev-python/sqlalchemy-1.3.0[${PYTHON_USEDEP}] |
150 |
+ ) |
151 |
memcached? ( |
152 |
>=dev-python/python-memcached-1.56[${PYTHON_USEDEP}] |
153 |
) |
154 |
mongo? ( |
155 |
>=dev-python/pymongo-3.0.2[${PYTHON_USEDEP}] |
156 |
) |
157 |
- ldap? ( |
158 |
- >=dev-python/python-ldap-3.1.0[${PYTHON_USEDEP}] |
159 |
- >=dev-python/ldappool-2.3.1[${PYTHON_USEDEP}] |
160 |
+ postgres? ( |
161 |
+ >=dev-python/psycopg-2.5.0[${PYTHON_USEDEP}] |
162 |
+ >=dev-python/sqlalchemy-1.3.0[${PYTHON_USEDEP}] |
163 |
) |
164 |
+ sqlite? ( |
165 |
+ >=dev-python/sqlalchemy-1.3.0[sqlite,${PYTHON_USEDEP}] |
166 |
+ ) |
167 |
+ |
168 |
|| ( |
169 |
www-servers/uwsgi[python,${PYTHON_USEDEP}] |
170 |
www-apache/mod_wsgi[${PYTHON_USEDEP}] |
171 |
@@ -87,9 +87,8 @@ RDEPEND=" |
172 |
acct-user/keystone |
173 |
acct-group/keystone |
174 |
" |
175 |
-DEPEND=" |
176 |
- ${RDEPEND} |
177 |
- >=dev-python/pbr-2.0.0[${PYTHON_USEDEP}] |
178 |
+DEPEND="${RDEPEND}" |
179 |
+BDEPEND=" |
180 |
test? ( |
181 |
>=dev-python/bashate-0.5.1[${PYTHON_USEDEP}] |
182 |
>=dev-python/freezegun-0.3.6[${PYTHON_USEDEP}] |
183 |
@@ -105,6 +104,7 @@ DEPEND=" |
184 |
) |
185 |
" |
186 |
|
187 |
+PATCHES=( "${FILESDIR}/${P}-no-usr-local-bin.patch" ) |
188 |
REQUIRED_USE=" |
189 |
|| ( mysql postgres sqlite ) |
190 |
test? ( ldap ) |
191 |
@@ -113,32 +113,33 @@ REQUIRED_USE=" |
192 |
distutils_enable_tests pytest |
193 |
|
194 |
python_prepare_all() { |
195 |
- # it's in git, but not in the tarball..... |
196 |
sed -i '/^hacking/d' test-requirements.txt || die |
197 |
- mkdir -p ${PN}/tests/tmp/ || die |
198 |
- sed -i 's|/usr/local|/usr|g' httpd/keystone-uwsgi-* || die |
199 |
- sed -i 's|python|python27|g' httpd/keystone-uwsgi-* || die |
200 |
- # allow useage of renamed msgpack |
201 |
+ # allow usage of renamed msgpack |
202 |
sed -i '/^msgpack/d' requirements.txt || die |
203 |
distutils-r1_python_prepare_all |
204 |
} |
205 |
|
206 |
+python_compile_all() { |
207 |
+ oslo-config-generator --config-file=config-generator/keystone.conf || die |
208 |
+ oslopolicy-sample-generator --config-file config-generator/keystone-policy-generator.conf || die |
209 |
+} |
210 |
+ |
211 |
python_install_all() { |
212 |
distutils-r1_python_install_all |
213 |
|
214 |
diropts -m 0750 |
215 |
keepdir /etc/keystone /var/log/keystone |
216 |
insinto /etc/keystone |
217 |
- insopts -m0640 -okeystone -gkeystone |
218 |
- newins "${DISTDIR}/keystone.conf.sample-${PV}" keystone.conf.sample |
219 |
+ insopts -m 0640 -o keystone -g keystone |
220 |
+ doins etc/nova/keystone.conf.sample |
221 |
+ doins etc/nova/policy.yaml.sample |
222 |
doins etc/logging.conf.sample |
223 |
doins etc/default_catalog.templates |
224 |
-# doins etc/policy.v3cloudsample.json |
225 |
insinto /etc/keystone/httpd |
226 |
doins httpd/* |
227 |
|
228 |
fowners keystone:keystone /etc/keystone /etc/keystone/httpd /var/log/keystone |
229 |
- # stupid python doing stupid things |
230 |
+ |
231 |
rm -r "${ED}/usr/etc" || die |
232 |
} |
233 |
|
234 |
@@ -153,10 +154,10 @@ pkg_postinst() { |
235 |
} |
236 |
|
237 |
pkg_config() { |
238 |
- if [ ! -d "${ROOT}"/etc/keystone/ssl ] ; then |
239 |
+ if [ ! -d "${ROOT}/etc/keystone/ssl" ] ; then |
240 |
einfo "Press ENTER to configure the keystone PKI, or Control-C to abort now..." |
241 |
read |
242 |
- "${ROOT}"/usr/bin/keystone-manage pki_setup --keystone-user keystone --keystone-group keystone |
243 |
+ "${ROOT}/usr/bin/keystone-manage" pki_setup --keystone-user keystone --keystone-group keystone |
244 |
else |
245 |
einfo "keystone PKI certificates directory already present, skipping configuration" |
246 |
fi |