[gentoo-commits] repo/proj/guru:dev commit in: sys-auth/keystone/

2022-05-29 Thread Alessandro Barbieri
commit: e3d352d8fade400644367fdd2b2344f657c404a8
Author: Alessandro Barbieri  gmail  com>
AuthorDate: Sun May 29 23:02:15 2022 +
Commit: Alessandro Barbieri  gmail  com>
CommitDate: Sun May 29 23:02:15 2022 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=e3d352d8

sys-auth/keystone: use root perms for logrotate

Signed-off-by: Alessandro Barbieri  gmail.com>

 .../{keystone-21.0.0-r1.ebuild => keystone-21.0.0-r2.ebuild}| 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/sys-auth/keystone/keystone-21.0.0-r1.ebuild 
b/sys-auth/keystone/keystone-21.0.0-r2.ebuild
similarity index 100%
rename from sys-auth/keystone/keystone-21.0.0-r1.ebuild
rename to sys-auth/keystone/keystone-21.0.0-r2.ebuild
index bf0863462..4630d4695 100644
--- a/sys-auth/keystone/keystone-21.0.0-r1.ebuild
+++ b/sys-auth/keystone/keystone-21.0.0-r2.ebuild
@@ -100,6 +100,9 @@ python_compile_all() {
 python_install_all() {
distutils-r1_python_install_all
 
+   insinto /etc/logrotate.d
+   newins "${FILESDIR}/keystone.logrotate" keystone.conf
+
diropts -m 0750
keepdir /etc/keystone /var/log/keystone
insinto /etc/keystone
@@ -115,9 +118,6 @@ python_install_all() {
 
newtmpfiles "${FILESDIR}/keystone.tmpfile" keystone.conf
 
-   insinto /etc/logrotate.d
-   newins "${FILESDIR}/keystone.logrotate" keystone.conf
-
systemd_dounit "${FILESDIR}/openstack-keystone.service"
 
insinto /usr/lib/sysctl.d/



[gentoo-commits] repo/proj/guru:dev commit in: sys-auth/keystone/, sys-auth/keystone/files/

2022-04-19 Thread Alessandro Barbieri
commit: 30936a1cecd66be90b501a92d219e537d4bdda84
Author: Alessandro Barbieri  gmail  com>
AuthorDate: Tue Apr 19 00:22:07 2022 +
Commit: Alessandro Barbieri  gmail  com>
CommitDate: Tue Apr 19 18:31:26 2022 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=30936a1c

sys-auth/keystone: multiple improvements

systemd unit
sysctl conf
removed optional dependencies

Signed-off-by: Alessandro Barbieri  gmail.com>

 sys-auth/keystone/files/openstack-keystone.service | 13 ++
 sys-auth/keystone/files/openstack-keystone.sysctl  |  3 ++
 ...one-21.0.0.ebuild => keystone-21.0.0-r1.ebuild} | 51 --
 sys-auth/keystone/metadata.xml |  4 --
 4 files changed, 33 insertions(+), 38 deletions(-)

diff --git a/sys-auth/keystone/files/openstack-keystone.service 
b/sys-auth/keystone/files/openstack-keystone.service
new file mode 100644
index 0..f591c4500
--- /dev/null
+++ b/sys-auth/keystone/files/openstack-keystone.service
@@ -0,0 +1,13 @@
+[Unit]
+Description=OpenStack Identity Service (code-named Keystone)
+After=syslog.target network.target
+
+[Service]
+Type=notify
+NotifyAccess=all
+Restart=always
+User=keystone
+ExecStart=/usr/bin/keystone-all
+
+[Install]
+WantedBy=multi-user.target

diff --git a/sys-auth/keystone/files/openstack-keystone.sysctl 
b/sys-auth/keystone/files/openstack-keystone.sysctl
new file mode 100644
index 0..682c160e0
--- /dev/null
+++ b/sys-auth/keystone/files/openstack-keystone.sysctl
@@ -0,0 +1,3 @@
+# By default, keystone starts a service on IANA-assigned port 35357
+# 
http://www.iana.org/assignments/service-names-port-numbers/service-names-port-numbers.txt
+net.ipv4.ip_local_reserved_ports = 35357

diff --git a/sys-auth/keystone/keystone-21.0.0.ebuild 
b/sys-auth/keystone/keystone-21.0.0-r1.ebuild
similarity index 86%
rename from sys-auth/keystone/keystone-21.0.0.ebuild
rename to sys-auth/keystone/keystone-21.0.0-r1.ebuild
index b0be04ded..bf0863462 100644
--- a/sys-auth/keystone/keystone-21.0.0.ebuild
+++ b/sys-auth/keystone/keystone-21.0.0-r1.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 MYP="${P/_/}"
 PYTHON_COMPAT=( python3_{8..9} )
 
-inherit distutils-r1 tmpfiles
+inherit distutils-r1 optfeature systemd tmpfiles
 
 DESCRIPTION="The Openstack authentication, authorization, and service catalog"
 HOMEPAGE="
@@ -20,7 +20,6 @@ S="${WORKDIR}/${MYP}"
 KEYWORDS="~amd64"
 LICENSE="Apache-2.0"
 SLOT="0"
-IUSE="+sqlite ldap memcached mongo mysql postgres"
 
 RDEPEND="
>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
@@ -57,33 +56,8 @@ RDEPEND="
>=dev-python/osprofiler-1.4.0[${PYTHON_USEDEP}]
>=dev-python/pytz-2013.6[${PYTHON_USEDEP}]
 
-   ldap? (
-   >=dev-python/python-ldap-3.1.0[${PYTHON_USEDEP}]
-   >=dev-python/ldappool-2.3.1[${PYTHON_USEDEP}]
-   )
-   mysql? (
-   >=dev-python/pymysql-0.7.6[${PYTHON_USEDEP}]
-   >=dev-python/sqlalchemy-1.3.0[${PYTHON_USEDEP}]
-   )
-   memcached? (
-   >=dev-python/python-memcached-1.56[${PYTHON_USEDEP}]
-   )
-   mongo? (
-   >=dev-python/pymongo-3.0.2[${PYTHON_USEDEP}]
-   )
-   postgres? (
-   >=dev-python/psycopg-2.5.0[${PYTHON_USEDEP}]
-   >=dev-python/sqlalchemy-1.3.0[${PYTHON_USEDEP}]
-   )
-   sqlite? (
-   >=dev-python/sqlalchemy-1.3.0[sqlite,${PYTHON_USEDEP}]
-   )
+   >=dev-python/sqlalchemy-1.3.0[${PYTHON_USEDEP}]
 
-   || (
-   www-servers/uwsgi[python,${PYTHON_USEDEP}]
-   www-apache/mod_wsgi[${PYTHON_USEDEP}]
-   www-servers/gunicorn[${PYTHON_USEDEP}]
-   )
acct-user/keystone
acct-group/keystone
 "
@@ -101,14 +75,13 @@ BDEPEND="
>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
>=dev-python/tempest-17.1.0[${PYTHON_USEDEP}]
>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
+
+   >=dev-python/python-ldap-3.1.0[${PYTHON_USEDEP}]
+   >=dev-python/ldappool-2.3.1[${PYTHON_USEDEP}]
)
 "
 
 PATCHES=( "${FILESDIR}/${P}-no-usr-local-bin.patch" )
-REQUIRED_USE="
-   || ( mysql postgres sqlite )
-   test? ( ldap )
-"
 
 distutils_enable_tests pytest
 
@@ -145,6 +118,13 @@ python_install_all() {
insinto /etc/logrotate.d
newins "${FILESDIR}/keystone.logrotate" keystone.conf
 
+   systemd_dounit "${FILESDIR}/openstack-keystone.service"
+
+   insinto /usr/lib/sysctl.d/
+   newins "${FILESDIR}/openstack-keystone.sysctl" openstack-keystone.conf
+
+   newbin tools/sample_data.sh openstack-keystone-sample-data
+
rm -r "${ED}/usr/etc" || die
 }
 
@@ -156,10 +136,13 @@ pkg_postinst() {
elog "please do it by modifying /etc/ssl/openssl.cnf"
elog "BEFORE issuing the configuration command."
elog "Otherwise default values will be used."
-}
 
-pkg_postinst() {
tmpfiles_process keystone.conf
+
+   optfeat

[gentoo-commits] repo/proj/guru:dev commit in: sys-auth/keystone/files/

2022-04-16 Thread Alessandro Barbieri
commit: f23c7446af41a3118f3729888ac2197dbde1e732
Author: Alessandro Barbieri  gmail  com>
AuthorDate: Sat Apr 16 12:15:50 2022 +
Commit: Alessandro Barbieri  gmail  com>
CommitDate: Sat Apr 16 16:20:05 2022 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=f23c7446

sys-auth/keystone: rename patch

Closes: https://bugs.gentoo.org/838781
Signed-off-by: Alessandro Barbieri  gmail.com>

 ..._rc1-no-usr-local-bin.patch => keystone-21.0.0-no-usr-local-bin.patch} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)

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-no-usr-local-bin.patch
similarity index 100%
rename from sys-auth/keystone/files/keystone-21.0.0.0_rc1-no-usr-local-bin.patch
rename to sys-auth/keystone/files/keystone-21.0.0-no-usr-local-bin.patch



[gentoo-commits] repo/proj/guru:dev commit in: sys-auth/keystone/

2022-04-04 Thread Alessandro Barbieri
commit: 85ef5e1f3a6567e0bce34a14c0a6472397ce1cfe
Author: Alessandro Barbieri  gmail  com>
AuthorDate: Mon Apr  4 19:05:16 2022 +
Commit: Alessandro Barbieri  gmail  com>
CommitDate: Mon Apr  4 19:32:03 2022 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=85ef5e1f

sys-auth/keystone: add 21.0.0

Signed-off-by: Alessandro Barbieri  gmail.com>

 sys-auth/keystone/Manifest   |   1 +
 sys-auth/keystone/keystone-21.0.0.ebuild | 169 +++
 2 files changed, 170 insertions(+)

diff --git a/sys-auth/keystone/Manifest b/sys-auth/keystone/Manifest
index aed973eb6..03002791a 100644
--- a/sys-auth/keystone/Manifest
+++ b/sys-auth/keystone/Manifest
@@ -1 +1,2 @@
 DIST keystone-21.0.0.0rc1.tar.gz 1698152 BLAKE2B 
703fb7b56a12cc3909a8990a2c21df2fca056f5eda43bd562ff8dcaeb06aa61db60b6d2ba6010d5c987f74f8d529eb66f086e648cbef25f96867e6c6b2644b29
 SHA512 
290e7ce13de1d7a232ef41166d51585460f6be745daf5477b8d83a8537f09eaecb82d6fabf554be777108b4a281ffb2e65457fe815a0405355a9e19c6f31f442
+DIST keystone-21.0.0.tar.gz 1697791 BLAKE2B 
e7c81ffa3d94ff12bd3aaeeaf4d8d7238b6d62c124419af9c8572ac47ace6eaa290bf922642d3c517dbd7ffab8b4a65705868ccea2c3715d85373bd830894961
 SHA512 
2214a96e058e553da5ab61423f3ebe3ba0e56a4a431d8109f845c2b967c4f2b98f5f1a15102b3b0c68ec48ebb1a3397b96576be98e991db601e916ff4e947043

diff --git a/sys-auth/keystone/keystone-21.0.0.ebuild 
b/sys-auth/keystone/keystone-21.0.0.ebuild
new file mode 100644
index 0..662dd4ae7
--- /dev/null
+++ b/sys-auth/keystone/keystone-21.0.0.ebuild
@@ -0,0 +1,169 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MYP="${P/_/}"
+PYTHON_COMPAT=( python3_{8..9} )
+
+inherit distutils-r1 tmpfiles
+
+DESCRIPTION="The Openstack authentication, authorization, and service catalog"
+HOMEPAGE="
+   https://opendev.org/openstack/keystone
+   https://launchpad.net/keystone
+   https://pypi.org/project/keystone/
+"
+SRC_URI="https://tarballs.openstack.org/${PN}/${MYP}.tar.gz";
+S="${WORKDIR}/${MYP}"
+
+KEYWORDS="~amd64"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="+sqlite ldap memcached mongo mysql postgres"
+
+RDEPEND="
+   >=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+   >=dev-python/webob-1.7.1[${PYTHON_USEDEP}]
+   >=dev-python/flask-1.0.2[${PYTHON_USEDEP}]
+   >=dev-python/flask-restful-0.3.5[${PYTHON_USEDEP}]
+   >=dev-python/cryptography-2.7[${PYTHON_USEDEP}]
+   >=dev-python/sqlalchemy-migrate-0.13.0[${PYTHON_USEDEP}]
+   >=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
+   >=dev-python/passlib-1.7.0[${PYTHON_USEDEP}]
+   >=dev-python/python-keystoneclient-3.8.0[${PYTHON_USEDEP}]
+   >=dev-python/keystonemiddleware-7.0.0[${PYTHON_USEDEP}]
+   >=dev-python/bcrypt-3.1.3[${PYTHON_USEDEP}]
+   >=dev-python/scrypt-0.8.0[${PYTHON_USEDEP}]
+   >=dev-python/oslo-cache-1.26.0[${PYTHON_USEDEP}]
+   >=dev-python/oslo-config-6.8.0[${PYTHON_USEDEP}]
+   >=dev-python/oslo-context-2.22.0[${PYTHON_USEDEP}]
+   >=dev-python/oslo-messaging-5.29.0[${PYTHON_USEDEP}]
+   >=dev-python/oslo-db-6.0.0[${PYTHON_USEDEP}]
+   >=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
+   >=dev-python/oslo-log-3.44.0[${PYTHON_USEDEP}]
+   >=dev-python/oslo-middleware-3.31.0[${PYTHON_USEDEP}]
+   >=dev-python/oslo-policy-3.7.0[${PYTHON_USEDEP}]
+   >=dev-python/oslo-serialization-2.18.0[${PYTHON_USEDEP}]
+   >=dev-python/oslo-upgradecheck-1.3.0[${PYTHON_USEDEP}]
+   >=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
+   >=dev-python/oauthlib-0.6.2[${PYTHON_USEDEP}]
+   >=dev-python/pysaml2-5.0.0[${PYTHON_USEDEP}]
+   >=dev-python/pyjwt-1.6.1[${PYTHON_USEDEP}]
+   >=dev-python/dogpile-cache-1.0.2[${PYTHON_USEDEP}]
+   >=dev-python/jsonschema-3.2.0[${PYTHON_USEDEP}]
+   >=dev-python/pycadf-1.1.0[${PYTHON_USEDEP}]
+   >=dev-python/msgpack-0.5.0[${PYTHON_USEDEP}]
+   >=dev-python/osprofiler-1.4.0[${PYTHON_USEDEP}]
+   >=dev-python/pytz-2013.6[${PYTHON_USEDEP}]
+
+   ldap? (
+   >=dev-python/python-ldap-3.1.0[${PYTHON_USEDEP}]
+   >=dev-python/ldappool-2.3.1[${PYTHON_USEDEP}]
+   )
+   mysql? (
+   >=dev-python/pymysql-0.7.6[${PYTHON_USEDEP}]
+   >=dev-python/sqlalchemy-1.3.0[${PYTHON_USEDEP}]
+   )
+   memcached? (
+   >=dev-python/python-memcached-1.56[${PYTHON_USEDEP}]
+   )
+   mongo? (
+   >=dev-python/pymongo-3.0.2[${PYTHON_USEDEP}]
+   )
+   postgres? (
+   >=dev-python/psycopg-2.5.0[${PYTHON_USEDEP}]
+   >=dev-python/sqlalchemy-1.3.0[${PYTHON_USEDEP}]
+   )
+   sqlite? (
+   >=dev-python/sqlalchemy-1.3.0[sqlite,${PYTHON_USEDEP}]
+   )
+
+   || (
+   www-servers/uwsgi[python,${PYTHON_USEDEP}]
+   www-apache/mod_wsgi[${PYTHON_USEDEP}]
+   www-servers/gunicorn[

[gentoo-commits] repo/proj/guru:dev commit in: sys-auth/keystone/, sys-auth/keystone/files/

2022-03-30 Thread Alessandro Barbieri
commit: 9dd644c92d9feb00643d419dd516d1c8d3ff5d6d
Author: Alessandro Barbieri  gmail  com>
AuthorDate: Wed Mar 30 10:22:30 2022 +
Commit: Alessandro Barbieri  gmail  com>
CommitDate: Wed Mar 30 10:26:30 2022 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=9dd644c9

sys-auth/keystone: logrotate and tmpfile

Signed-off-by: Alessandro Barbieri  gmail.com>

 sys-auth/keystone/files/keystone.logrotate|  8 
 sys-auth/keystone/files/keystone.tmpfile  |  1 +
 ...ne-21.0.0.0_rc1.ebuild => keystone-21.0.0.0_rc1-r1.ebuild} | 11 ---
 3 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/sys-auth/keystone/files/keystone.logrotate 
b/sys-auth/keystone/files/keystone.logrotate
new file mode 100644
index 0..2709c72aa
--- /dev/null
+++ b/sys-auth/keystone/files/keystone.logrotate
@@ -0,0 +1,8 @@
+/var/log/keystone/*.log {
+daily
+missingok
+rotate 5
+compress
+minsize 100k
+copytruncate
+}
\ No newline at end of file

diff --git a/sys-auth/keystone/files/keystone.tmpfile 
b/sys-auth/keystone/files/keystone.tmpfile
new file mode 100644
index 0..70745ce2f
--- /dev/null
+++ b/sys-auth/keystone/files/keystone.tmpfile
@@ -0,0 +1 @@
+d /run/keystone 0755 keystone keystone -

diff --git a/sys-auth/keystone/keystone-21.0.0.0_rc1.ebuild 
b/sys-auth/keystone/keystone-21.0.0.0_rc1-r1.ebuild
similarity index 95%
rename from sys-auth/keystone/keystone-21.0.0.0_rc1.ebuild
rename to sys-auth/keystone/keystone-21.0.0.0_rc1-r1.ebuild
index 715dc5765..662dd4ae7 100644
--- a/sys-auth/keystone/keystone-21.0.0.0_rc1.ebuild
+++ b/sys-auth/keystone/keystone-21.0.0.0_rc1-r1.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 MYP="${P/_/}"
 PYTHON_COMPAT=( python3_{8..9} )
 
-inherit distutils-r1
+inherit distutils-r1 tmpfiles
 
 DESCRIPTION="The Openstack authentication, authorization, and service catalog"
 HOMEPAGE="
@@ -131,8 +131,8 @@ python_install_all() {
keepdir /etc/keystone /var/log/keystone
insinto /etc/keystone
insopts -m 0640 -o keystone -g keystone
-   doins etc/nova/keystone.conf.sample
-   doins etc/nova/policy.yaml.sample
+   doins etc/keystone.conf.sample
+   doins etc/keystone.policy.yaml.sample
doins etc/logging.conf.sample
doins etc/default_catalog.templates
insinto /etc/keystone/httpd
@@ -140,6 +140,11 @@ python_install_all() {
 
fowners keystone:keystone /etc/keystone /etc/keystone/httpd 
/var/log/keystone
 
+   newtmpfiles "${FILESDIR}/keystone.tmpfile" keystone.conf
+
+   insinto /etc/logrotate.d
+   newins "${FILESDIR}/keystone.logrotate" keystone.conf
+
rm -r "${ED}/usr/etc" || die
 }
 



[gentoo-commits] repo/proj/guru:dev commit in: sys-auth/keystone/, sys-auth/keystone/files/

2022-03-29 Thread Alessandro Barbieri
commit: 6bee848810f08d65215e15fd87c2405f3bf09540
Author: Alessandro Barbieri  gmail  com>
AuthorDate: Tue Mar 29 20:47:04 2022 +
Commit: Alessandro Barbieri  gmail  com>
CommitDate: Tue Mar 29 20:53:28 2022 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=6bee8488

sys-auth/keystone: add 21.0.0.0_rc1, drop 20.0.0.0_rc1

Signed-off-by: Alessandro Barbieri  gmail.com>

 sys-auth/keystone/Manifest |  3 +-
 .../keystone-21.0.0.0_rc1-no-usr-local-bin.patch   | 47 ++
 ...0.0_rc1.ebuild => keystone-21.0.0.0_rc1.ebuild} | 71 +++---
 3 files changed, 84 insertions(+), 37 deletions(-)

diff --git a/sys-auth/keystone/Manifest b/sys-auth/keystone/Manifest
index 3ab51e8c4..aed973eb6 100644
--- a/sys-auth/keystone/Manifest
+++ b/sys-auth/keystone/Manifest
@@ -1,2 +1 @@
-DIST keystone-20.0.0.0rc1.tar.gz 1729520 BLAKE2B 
69d870dacf786a8e7ef8474027e83e15950432d232f221715f850ae731dcc6d6620684c6118d95333d674de1a7e2790919ffc1f09e553e25b2eedb999c5c38d3
 SHA512 
9ff450d80270f9fe037f0e21f8322de10a0f80c51b59226b8c62f3dc8b07e5af49c63aa33c6682203e295c1eb54842332a02c9ad7b4e9dd64653d1ee4536944e
-DIST keystone.conf.sample-20.0.0.0_rc1 107458 BLAKE2B 
c1d826acdd671638fc4542864811bda8baa237cfbf24438fa0cedc12e6f29047178cfb1b837c0aef035410848ce3e473e58b51f0eadee4c61eb75f214c65c35a
 SHA512 
6488a1c3eac0d1376db0950cda65c62ba04dc03d896a6c0465ea09b870e5d077ed5012a84657defb9f63db25ce320c884f72c4083e4a233f18930120194ba73b
+DIST keystone-21.0.0.0rc1.tar.gz 1698152 BLAKE2B 
703fb7b56a12cc3909a8990a2c21df2fca056f5eda43bd562ff8dcaeb06aa61db60b6d2ba6010d5c987f74f8d529eb66f086e648cbef25f96867e6c6b2644b29
 SHA512 
290e7ce13de1d7a232ef41166d51585460f6be745daf5477b8d83a8537f09eaecb82d6fabf554be777108b4a281ffb2e65457fe815a0405355a9e19c6f31f442

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
new file mode 100644
index 0..cef46b2d3
--- /dev/null
+++ b/sys-auth/keystone/files/keystone-21.0.0.0_rc1-no-usr-local-bin.patch
@@ -0,0 +1,47 @@
+--- a/httpd/keystone-uwsgi-admin.ini
 b/httpd/keystone-uwsgi-admin.ini
+@@ -1,5 +1,5 @@
+ [uwsgi]
+-wsgi-file = /usr/local/bin/keystone-wsgi-admin
++wsgi-file = /usr/bin/keystone-wsgi-admin
+ 
+ # Versions of mod_proxy_uwsgi>=2.0.6 should use a UNIX socket, see
+ # http://uwsgi-docs.readthedocs.org/en/latest/Apache.html#mod-proxy-uwsgi
+--- a/httpd/keystone-uwsgi-public.ini
 b/httpd/keystone-uwsgi-public.ini
+@@ -1,5 +1,5 @@
+ [uwsgi]
+-wsgi-file = /usr/local/bin/keystone-wsgi-public
++wsgi-file = /usr/bin/keystone-wsgi-public
+ 
+ # Versions of mod_proxy_uwsgi>=2.0.6 should use a UNIX socket, see
+ # http://uwsgi-docs.readthedocs.org/en/latest/Apache.html#mod-proxy-uwsgi
+--- a/httpd/wsgi-keystone.conf
 b/httpd/wsgi-keystone.conf
+@@ -3,7 +3,7 @@
+ 
+ WSGIDaemonProcess keystone-public processes=5 threads=1 user=keystone 
group=keystone display-name=%{GROUP}
+ WSGIProcessGroup keystone-public
+-WSGIScriptAlias / /usr/local/bin/keystone-wsgi-public
++WSGIScriptAlias / /usr/bin/keystone-wsgi-public
+ WSGIApplicationGroup %{GLOBAL}
+ WSGIPassAuthorization On
+ LimitRequestBody 114688
+@@ -13,7 +13,7 @@
+ ErrorLog /var/log/apache2/keystone.log
+ CustomLog /var/log/apache2/keystone_access.log combined
+ 
+-
++
+ = 2.4>
+ Require all granted
+ 
+@@ -24,7 +24,7 @@
+ 
+ 
+ 
+-Alias /identity /usr/local/bin/keystone-wsgi-public
++Alias /identity /usr/bin/keystone-wsgi-public
+ 
+ SetHandler wsgi-script
+ Options +ExecCGI

diff --git a/sys-auth/keystone/keystone-20.0.0.0_rc1.ebuild 
b/sys-auth/keystone/keystone-21.0.0.0_rc1.ebuild
similarity index 84%
rename from sys-auth/keystone/keystone-20.0.0.0_rc1.ebuild
rename to sys-auth/keystone/keystone-21.0.0.0_rc1.ebuild
index 878d5f905..715dc5765 100644
--- a/sys-auth/keystone/keystone-20.0.0.0_rc1.ebuild
+++ b/sys-auth/keystone/keystone-21.0.0.0_rc1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 MYP="${P/_/}"
-PYTHON_COMPAT=( python3_8 )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
@@ -12,12 +12,9 @@ DESCRIPTION="The Openstack authentication, authorization, 
and service catalog"
 HOMEPAGE="
https://opendev.org/openstack/keystone
https://launchpad.net/keystone
-   https://pypi.org/project/keystone
-"
-SRC_URI="
-   
https://dev.gentoo.org/~prometheanfire/dist/openstack/keystone/victoria/keystone.conf.sample
 -> keystone.conf.sample-${PV}
-   https://tarballs.openstack.org/${PN}/${MYP}.tar.gz
+   https://pypi.org/project/keystone/
 "
+SRC_URI="https://tarballs.openstack.org/${PN}/${MYP}.tar.gz";
 S="${WORKDIR}/${MYP}"
 
 KEYWORDS="~amd64"
@@ -26,21 +23,11 @@ SLOT="0"
 IUSE="+sqlite ldap memcached mongo mysql pos

[gentoo-commits] repo/proj/guru:dev commit in: sys-auth/keystone/

2021-10-06 Thread Alessandro Barbieri
commit: 5ff1bd8a40dbd7a428ddc0dc0acf535d6fd336ba
Author: Alessandro Barbieri  gmail  com>
AuthorDate: Wed Oct  6 14:12:17 2021 +
Commit: Alessandro Barbieri  gmail  com>
CommitDate: Wed Oct  6 22:15:37 2021 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=5ff1bd8a

sys-auth/keystone: fix distutilssetuptools

Closes: https://bugs.gentoo.org/815577
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Alessandro Barbieri  gmail.com>

 sys-auth/keystone/keystone-20.0.0.0_rc1.ebuild | 1 -
 1 file changed, 1 deletion(-)

diff --git a/sys-auth/keystone/keystone-20.0.0.0_rc1.ebuild 
b/sys-auth/keystone/keystone-20.0.0.0_rc1.ebuild
index 2dd4e531d..c39641d35 100644
--- a/sys-auth/keystone/keystone-20.0.0.0_rc1.ebuild
+++ b/sys-auth/keystone/keystone-20.0.0.0_rc1.ebuild
@@ -3,7 +3,6 @@
 
 EAPI=8
 
-DISTUTILS_USE_SETUPTOOLS=rdepend
 MYP="${P/_/}"
 PYTHON_COMPAT=( python3_8 )
 



[gentoo-commits] repo/proj/guru:dev commit in: sys-auth/keystone/

2021-09-26 Thread Alessandro Barbieri
commit: a9c94f7789a47ea350aa5de7b099d9970c0764fb
Author: Alessandro Barbieri  gmail  com>
AuthorDate: Sun Sep 26 19:32:33 2021 +
Commit: Alessandro Barbieri  gmail  com>
CommitDate: Sun Sep 26 19:32:33 2021 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=a9c94f77

sys-auth/keystone: unkeyword 18.0.0 for ~arm64, ~x86

Signed-off-by: Alessandro Barbieri  gmail.com>

 sys-auth/keystone/keystone-18.0.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-auth/keystone/keystone-18.0.0.ebuild 
b/sys-auth/keystone/keystone-18.0.0.ebuild
index 84b361a7c..c30bc0bea 100644
--- a/sys-auth/keystone/keystone-18.0.0.ebuild
+++ b/sys-auth/keystone/keystone-18.0.0.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == * ]];then
 else

SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/keystone/victoria/keystone.conf.sample
 -> keystone.conf.sample-${PV}
https://tarballs.openstack.org/${PN}/${P}.tar.gz";
-   KEYWORDS="~amd64 ~arm64 ~x86"
+   KEYWORDS="~amd64"
 fi
 
 LICENSE="Apache-2.0"