From 623ee73d661e5ed8475cb264511f683407d87365 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 12 Apr 2020 03:41:30 +0100 Subject: gentoo Easter resync : 12.04.2020 --- sys-cluster/swift/Manifest | 10 +-- sys-cluster/swift/metadata.xml | 4 - sys-cluster/swift/swift-2.22.0-r1.ebuild | 123 ----------------------------- sys-cluster/swift/swift-2.23.1-r1.ebuild | 123 ----------------------------- sys-cluster/swift/swift-2.23.1-r2.ebuild | 119 ++++++++++++++++++++++++++++ sys-cluster/swift/swift-2.24.0-r1.ebuild | 2 +- sys-cluster/swift/swift-2019.2.9999.ebuild | 7 +- 7 files changed, 127 insertions(+), 261 deletions(-) delete mode 100644 sys-cluster/swift/swift-2.22.0-r1.ebuild delete mode 100644 sys-cluster/swift/swift-2.23.1-r1.ebuild create mode 100644 sys-cluster/swift/swift-2.23.1-r2.ebuild (limited to 'sys-cluster/swift') diff --git a/sys-cluster/swift/Manifest b/sys-cluster/swift/Manifest index d44b6ab276db..959213b1cdfa 100644 --- a/sys-cluster/swift/Manifest +++ b/sys-cluster/swift/Manifest @@ -2,11 +2,9 @@ AUX swift-account.initd 867 BLAKE2B 12a01902f520b2c25261a229e1239c3f85ba05dd708e AUX swift-container.initd 877 BLAKE2B f45f04d6d6d4fefdf153d40d1480535cb6552daa812854328e845ff8afb96ffd4f947a0a38437ec401a10c493701f328667e1b7e314ea39510c957ec3e7be2bc SHA512 46ae66806db3cb8b9416ccde1a08f0f8af5dd1bbeeda23fc547f8ed29f979c554b47ff0c9ca13f8944ec8c3f4c2d0ffd0616bead4ac9b42078ffaf0ba238d52b AUX swift-object.initd 862 BLAKE2B 2a062873ab613e7d98d78758ccae793d8d952cb66922d900353a516738014cfe72f98a6830d0af523757e15b432b88f991753572a3e1b8e248af8e1bf43d2b70 SHA512 a977e3d81e22785b4999e5dbe6c51c020f98fe4ba08d52ff971477fca606a7fbd8e80f4c45ac6ba6afa213ddca7b81acc6238d91bb5c45635cc68c174575aa05 AUX swift-proxy.initd 1379 BLAKE2B 56453a557c0abfd6b07f65778ef14d8920bedc4133e0efa1aa4a5466a72103e9b57b361f481e0b5cb816471161196755de7794bd3ea3d6f5120cc1f159489c22 SHA512 dd32e4249686b51d2ed6add8e2e91eb9e520c662ebdf068f68b4e52faf4d508d3c87e996c6c2f7ba2a7d1f5fdf639d08e1e6878cd4c9918408e007ccbd7c84ec -DIST swift-2.22.0.tar.gz 3070436 BLAKE2B 53049ba901cf5a46d4567c7fa3620b0ad486d88897beb75887d81c5beb747a08ff52e7eba93eab9e9e087c82447d99f0fd85c97211fb4e930ce5b27a1bba41f1 SHA512 855f9d35399251ac86d687b652a9372da4d2f03dff8dee1743357c14c79f6ea8903b7c67d99fed08b6b4cdfa2cfd6ecb78b010b2ee83195eda30c4a9463a5a0c DIST swift-2.23.1.tar.gz 3044545 BLAKE2B b3b06aefa7c58b718f7d9c1c1b9bc92f442b83202b8d5c2dbbb777650088f2d939f5e9d0fbe83cea38fd6635d072cd8bb3894d64ed9767dde203064c1b81cfdb SHA512 48aa82b178f5e3901363c2b9eeeedeea12a58b1ba86cc46937dd9ec074ecc005b04a6ce732d4e9fce2497c6c62b659038da40ed43550256584bb371df4e596fb DIST swift-2.24.0.tar.gz 3177018 BLAKE2B f465f0e8f58cc097b5b1fdbe5c9736ee3e2247d13d8ae1beeb7e736dd1246e7d8820cb7241afb67e651ad85c269a48d9dbeda3479dadd773bfc1fe3278731afe SHA512 f8e3b0fec06776e095067b2c12f782a9a787c814cea8039ec32930c562be5c74b4b2bf4cb9dad3481953e5163bd051fe32f3074be7776fd1af0be94982d113b6 -EBUILD swift-2.22.0-r1.ebuild 3804 BLAKE2B 1c7081b788f4da4ea97a5f887201f753301d83c0970d20ac841bd816b6728177cf671e95a0b1bad65e5853c283e100668e93db9662dec22d185c3ae6121f3cbe SHA512 1614de090b295474d6c3c9acf844b88ec857cd6b610683922c5db909dc296799459577e7d4676d6e4007a1261740b8e4615bdfaa3f7706ea0e13a876d70a74a8 -EBUILD swift-2.23.1-r1.ebuild 3805 BLAKE2B 619a072a04ce20ad0757cbf047cdf6684c42eed448132de651db9c066f643b25bd1ba20738d9cbabc6270d39453ea7f3caf9f68b3aea554171ff5ef9ff3ad6e7 SHA512 997d0ff187e617dcbe32bfac47661ebcbe2f08b81de89869d6d0ae32a2967cc2ec3d715c1640f2a8beafa6125672c5cde2495086d0302bb7387b187c5b596fa5 -EBUILD swift-2.24.0-r1.ebuild 3787 BLAKE2B b09da5a79610d9fa84b60c6cfd694a98f9bf14eb5a1183803f0cf804e50f8f1ad3d6ca40b193070f67122904ca80abd470b4fc227cfe35bd89fd97fa666ffd2b SHA512 4985cea1d149f77c2579d1e67205def3b8162bf5c2b9e7e6592dcbe642a3d9c72cb627d1f4a3a8ac1ed47ced7a40d80661e8ecffb8f9e1198ddf133abd60abed -EBUILD swift-2019.2.9999.ebuild 3787 BLAKE2B b09da5a79610d9fa84b60c6cfd694a98f9bf14eb5a1183803f0cf804e50f8f1ad3d6ca40b193070f67122904ca80abd470b4fc227cfe35bd89fd97fa666ffd2b SHA512 4985cea1d149f77c2579d1e67205def3b8162bf5c2b9e7e6592dcbe642a3d9c72cb627d1f4a3a8ac1ed47ced7a40d80661e8ecffb8f9e1198ddf133abd60abed -MISC metadata.xml 898 BLAKE2B 3d502769ba44cdc1e3a500929d60a1ed82d8540297b2dfddb6d6745ec9b5b56bd9fe7130a738858b9bac653b49634efae1841600325194d69ec30222b2e8b3f2 SHA512 3f9d2cf7538fe32010b811d3a49802eb085dde793b29d9590fe3032d63a743f620e3c1dcf1226b59aa5938ea239f440997a3d4d489f9887816621879e19a0c4c +EBUILD swift-2.23.1-r2.ebuild 3785 BLAKE2B 1d270fdd6d8184a967f41b5c6cd27b8fe7a2bf9cb0938b95b9ec7e44e84857c893214aefac59429b3cd624310579eaa15ff149789a9549c13067ee111cc2624b SHA512 48b18dee61c17bf0d70b2818d8c0ed6430341b10c4930414090f00413d3b0b2ec21ed319b1b5b09d8b3142f96b86ab400b6084bcc602180e4306f34c22c090c5 +EBUILD swift-2.24.0-r1.ebuild 3785 BLAKE2B 1d270fdd6d8184a967f41b5c6cd27b8fe7a2bf9cb0938b95b9ec7e44e84857c893214aefac59429b3cd624310579eaa15ff149789a9549c13067ee111cc2624b SHA512 48b18dee61c17bf0d70b2818d8c0ed6430341b10c4930414090f00413d3b0b2ec21ed319b1b5b09d8b3142f96b86ab400b6084bcc602180e4306f34c22c090c5 +EBUILD swift-2019.2.9999.ebuild 3768 BLAKE2B 10f16a798b087da87a17262da8c21a470c78bd801496c2a1fd3f58c43a815eacb11a975935099e29b0148945488d8cdca80538973fea2b91f3e123cb9c6f53dd SHA512 0e99713271b137db2a4760a875167ae3c8b39a8b336e7d3d0a91c45dd08a7a1a71c7fd16f890918a87a7d2b12397b414896391baa5fd8fe3f72b11031ae3e140 +MISC metadata.xml 758 BLAKE2B 8b1f494e6c40f469c01b494154d32702dc9b848939ea67005d8065c39661fcb97b5ca9cdee524ca66f0e74af5f9c522ca236b628a9b0289eef4f808e5f32461e SHA512 94a6af6b29a7f968d1e23a70decb908b9de10f792f1bd0711b95ea18abf59595d42017da6f278ed4991695ebbe0941d8907c160412e20758697597179fc3bb19 diff --git a/sys-cluster/swift/metadata.xml b/sys-cluster/swift/metadata.xml index 14aa35f3e4a6..6a12c88d2a76 100644 --- a/sys-cluster/swift/metadata.xml +++ b/sys-cluster/swift/metadata.xml @@ -16,10 +16,6 @@ openstack@gentoo.org Openstack - - Swift is a highly available, distributed, eventually consistent object/blob - store. - swift diff --git a/sys-cluster/swift/swift-2.22.0-r1.ebuild b/sys-cluster/swift/swift-2.22.0-r1.ebuild deleted file mode 100644 index 84ba4cd0845d..000000000000 --- a/sys-cluster/swift/swift-2.22.0-r1.ebuild +++ /dev/null @@ -1,123 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -PYTHON_COMPAT=( python3_6 python3_7 ) - -inherit distutils-r1 eutils linux-info user - -DESCRIPTION="A highly available, distributed, and eventually consistent object/blob store" -HOMEPAGE="https://launchpad.net/swift" -if [[ ${PV} == *9999 ]];then - inherit git-r3 - EGIT_REPO_URI="https://github.com/openstack/swift.git" - EGIT_BRANCH="stable/stein" -else - SRC_URI="https://tarballs.openstack.org/${PN}/${P}.tar.gz" - KEYWORDS="amd64 ~arm64 x86" -fi - -LICENSE="Apache-2.0" -SLOT="0" -IUSE="account container doc +memcached object proxy" -REQUIRED_USE="|| ( proxy account container object )" - -CDEPEND=">=dev-python/pbr-1.8.0[${PYTHON_USEDEP}]" -DEPEND=" - dev-python/setuptools[${PYTHON_USEDEP}] - ${CDEPEND}" - -RDEPEND=" - ${CDEPEND} - >=dev-python/eventlet-0.25.0[${PYTHON_USEDEP}] - >=dev-python/greenlet-0.3.1[${PYTHON_USEDEP}] - >=dev-python/netifaces-0.8[${PYTHON_USEDEP}] - !~dev-python/netifaces-0.10.0[${PYTHON_USEDEP}] - !~dev-python/netifaces-0.10.1[${PYTHON_USEDEP}] - >=dev-python/pastedeploy-1.3.3[${PYTHON_USEDEP}] - >=dev-python/six-1.9.0[${PYTHON_USEDEP}] - dev-python/pyxattr[${PYTHON_USEDEP}] - >=dev-python/PyECLib-1.3.1[${PYTHON_USEDEP}] - >=dev-python/cryptography-2.0.2[${PYTHON_USEDEP}] - memcached? ( net-misc/memcached ) - net-misc/rsync[xattr]" - -pkg_pretend() { - linux-info_pkg_setup - CONFIG_CHECK="~EXT3_FS_XATTR ~SQUASHFS_XATTR ~CIFS_XATTR ~JFFS2_FS_XATTR - ~TMPFS_XATTR ~UBIFS_FS_XATTR ~EXT2_FS_XATTR ~REISERFS_FS_XATTR ~EXT4_FS_XATTR - ~ZFS" - if linux_config_exists; then - for module in ${CONFIG_CHECK}; do - linux_chkconfig_present ${module} || ewarn "${module} needs to be enabled" - done - fi -} - -pkg_setup() { - enewuser swift - enewgroup swift -} - -src_prepare() { - sed -i 's/xattr/pyxattr/g' requirements.txt || die - sed -i '/^hacking/d' test-requirements.txt || die - distutils-r1_python_prepare_all -} - -src_test() { - # https://bugs.launchpad.net/swift/+bug/1249727 - find . \( -name test_wsgi.py -o -name test_locale.py -o -name test_utils.py \) -delete || die - SKIP_PIP_INSTALL=1 PBR_VERSION=0.6.0 sh .unittests || die -} - -python_install_all() { - distutils-r1_python_install_all - keepdir /etc/swift - insinto /etc/swift - - newins "etc/swift.conf-sample" "swift.conf" - newins "etc/rsyncd.conf-sample" "rsyncd.conf" - newins "etc/mime.types-sample" "mime.types-sample" - newins "etc/memcache.conf-sample" "memcache.conf-sample" - newins "etc/drive-audit.conf-sample" "drive-audit.conf-sample" - newins "etc/dispersion.conf-sample" "dispersion.conf-sample" - - if use proxy; then - newinitd "${FILESDIR}/swift-proxy.initd" "swift-proxy" - newins "etc/proxy-server.conf-sample" "proxy-server.conf" - if use memcached; then - sed -i '/depend/a\ - need memcached' "${D}/etc/init.d/swift-proxy" - fi - fi - if use account; then - newinitd "${FILESDIR}/swift-account.initd" "swift-account" - newins "etc/account-server.conf-sample" "account-server.conf" - fi - if use container; then - newinitd "${FILESDIR}/swift-container.initd" "swift-container" - newins "etc/container-server.conf-sample" "container-server.conf" - fi - if use object; then - newinitd "${FILESDIR}/swift-object.initd" "swift-object" - newins "etc/object-server.conf-sample" "object-server.conf" - newins "etc/object-expirer.conf-sample" "object-expirer.conf" - fi - - if use doc; then - doman doc/manpages/* - dodoc -r doc/{s3api,saio,source} - fi - - fowners root:swift "/etc/swift" - fperms 0750 /etc/swift -} - -pkg_postinst() { - elog "Openstack swift will default to using insecure http unless a" - elog "certificate is created in /etc/swift/cert.crt and the associated key" - elog "in /etc/swift/cert.key. These can be created with the following:" - elog " * cd /etc/swift" - elog " * openssl req -new -x509 -nodes -out cert.crt -keyout cert.key" -} diff --git a/sys-cluster/swift/swift-2.23.1-r1.ebuild b/sys-cluster/swift/swift-2.23.1-r1.ebuild deleted file mode 100644 index 81130d620e21..000000000000 --- a/sys-cluster/swift/swift-2.23.1-r1.ebuild +++ /dev/null @@ -1,123 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -PYTHON_COMPAT=( python3_6 python3_7 ) - -inherit distutils-r1 eutils linux-info user - -DESCRIPTION="A highly available, distributed, and eventually consistent object/blob store" -HOMEPAGE="https://launchpad.net/swift" -if [[ ${PV} == *9999 ]];then - inherit git-r3 - EGIT_REPO_URI="https://github.com/openstack/swift.git" - EGIT_BRANCH="stable/train" -else - SRC_URI="https://tarballs.openstack.org/${PN}/${P}.tar.gz" - KEYWORDS="amd64 ~arm64 x86" -fi - -LICENSE="Apache-2.0" -SLOT="0" -IUSE="account container doc +memcached object proxy" -REQUIRED_USE="|| ( proxy account container object )" - -CDEPEND=">=dev-python/pbr-1.8.0[${PYTHON_USEDEP}]" -DEPEND=" - dev-python/setuptools[${PYTHON_USEDEP}] - ${CDEPEND}" - -RDEPEND=" - ${CDEPEND} - >=dev-python/eventlet-0.25.0[${PYTHON_USEDEP}] - >=dev-python/greenlet-0.3.2[${PYTHON_USEDEP}] - >=dev-python/netifaces-0.8[${PYTHON_USEDEP}] - !~dev-python/netifaces-0.10.0[${PYTHON_USEDEP}] - !~dev-python/netifaces-0.10.1[${PYTHON_USEDEP}] - >=dev-python/pastedeploy-1.3.3[${PYTHON_USEDEP}] - >=dev-python/six-1.10.0[${PYTHON_USEDEP}] - dev-python/pyxattr[${PYTHON_USEDEP}] - >=dev-python/PyECLib-1.3.1[${PYTHON_USEDEP}] - >=dev-python/cryptography-2.0.2[${PYTHON_USEDEP}] - memcached? ( net-misc/memcached ) - net-misc/rsync[xattr]" - -pkg_pretend() { - linux-info_pkg_setup - CONFIG_CHECK="~EXT3_FS_XATTR ~SQUASHFS_XATTR ~CIFS_XATTR ~JFFS2_FS_XATTR - ~TMPFS_XATTR ~UBIFS_FS_XATTR ~EXT2_FS_XATTR ~REISERFS_FS_XATTR ~EXT4_FS_XATTR - ~ZFS" - if linux_config_exists; then - for module in ${CONFIG_CHECK}; do - linux_chkconfig_present ${module} || ewarn "${module} needs to be enabled" - done - fi -} - -pkg_setup() { - enewuser swift - enewgroup swift -} - -src_prepare() { - sed -i 's/xattr/pyxattr/g' requirements.txt || die - sed -i '/^hacking/d' test-requirements.txt || die - distutils-r1_python_prepare_all -} - -src_test() { - # https://bugs.launchpad.net/swift/+bug/1249727 - find . \( -name test_wsgi.py -o -name test_locale.py -o -name test_utils.py \) -delete || die - SKIP_PIP_INSTALL=1 PBR_VERSION=0.6.0 sh .unittests || die -} - -python_install_all() { - distutils-r1_python_install_all - keepdir /etc/swift - insinto /etc/swift - - newins "etc/swift.conf-sample" "swift.conf" - newins "etc/rsyncd.conf-sample" "rsyncd.conf" - newins "etc/mime.types-sample" "mime.types-sample" - newins "etc/memcache.conf-sample" "memcache.conf-sample" - newins "etc/drive-audit.conf-sample" "drive-audit.conf-sample" - newins "etc/dispersion.conf-sample" "dispersion.conf-sample" - - if use proxy; then - newinitd "${FILESDIR}/swift-proxy.initd" "swift-proxy" - newins "etc/proxy-server.conf-sample" "proxy-server.conf" - if use memcached; then - sed -i '/depend/a\ - need memcached' "${D}/etc/init.d/swift-proxy" - fi - fi - if use account; then - newinitd "${FILESDIR}/swift-account.initd" "swift-account" - newins "etc/account-server.conf-sample" "account-server.conf" - fi - if use container; then - newinitd "${FILESDIR}/swift-container.initd" "swift-container" - newins "etc/container-server.conf-sample" "container-server.conf" - fi - if use object; then - newinitd "${FILESDIR}/swift-object.initd" "swift-object" - newins "etc/object-server.conf-sample" "object-server.conf" - newins "etc/object-expirer.conf-sample" "object-expirer.conf" - fi - - if use doc; then - doman doc/manpages/* - dodoc -r doc/{s3api,saio,source} - fi - - fowners root:swift "/etc/swift" - fperms 0750 /etc/swift -} - -pkg_postinst() { - elog "Openstack swift will default to using insecure http unless a" - elog "certificate is created in /etc/swift/cert.crt and the associated key" - elog "in /etc/swift/cert.key. These can be created with the following:" - elog " * cd /etc/swift" - elog " * openssl req -new -x509 -nodes -out cert.crt -keyout cert.key" -} diff --git a/sys-cluster/swift/swift-2.23.1-r2.ebuild b/sys-cluster/swift/swift-2.23.1-r2.ebuild new file mode 100644 index 000000000000..0209967c131d --- /dev/null +++ b/sys-cluster/swift/swift-2.23.1-r2.ebuild @@ -0,0 +1,119 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +PYTHON_COMPAT=( python3_6 python3_7 ) + +inherit distutils-r1 eutils linux-info + +DESCRIPTION="A highly available, distributed, and eventually consistent object/blob store" +HOMEPAGE="https://launchpad.net/swift" +if [[ ${PV} == *9999 ]];then + inherit git-r3 + EGIT_REPO_URI="https://github.com/openstack/swift.git" + EGIT_BRANCH="stable/train" +else + SRC_URI="https://tarballs.openstack.org/${PN}/${P}.tar.gz" + KEYWORDS="amd64 ~arm64 x86" +fi + +LICENSE="Apache-2.0" +SLOT="0" +IUSE="account container doc +memcached +object proxy" +REQUIRED_USE="|| ( proxy account container object )" + +CDEPEND=">=dev-python/pbr-1.8.0[${PYTHON_USEDEP}]" +DEPEND=" + dev-python/setuptools[${PYTHON_USEDEP}] + ${CDEPEND}" + +RDEPEND=" + ${CDEPEND} + >=dev-python/eventlet-0.25.0[${PYTHON_USEDEP}] + >=dev-python/greenlet-0.3.2[${PYTHON_USEDEP}] + >=dev-python/netifaces-0.8[${PYTHON_USEDEP}] + !~dev-python/netifaces-0.10.0[${PYTHON_USEDEP}] + !~dev-python/netifaces-0.10.1[${PYTHON_USEDEP}] + >=dev-python/pastedeploy-1.3.3[${PYTHON_USEDEP}] + >=dev-python/six-1.10.0[${PYTHON_USEDEP}] + dev-python/pyxattr[${PYTHON_USEDEP}] + >=dev-python/PyECLib-1.3.1[${PYTHON_USEDEP}] + >=dev-python/cryptography-2.0.2[${PYTHON_USEDEP}] + memcached? ( net-misc/memcached ) + net-misc/rsync[xattr] + acct-user/swift + acct-group/swift" + +pkg_pretend() { + linux-info_pkg_setup + CONFIG_CHECK="~EXT3_FS_XATTR ~SQUASHFS_XATTR ~CIFS_XATTR ~JFFS2_FS_XATTR + ~TMPFS_XATTR ~UBIFS_FS_XATTR ~EXT2_FS_XATTR ~REISERFS_FS_XATTR ~EXT4_FS_XATTR + ~ZFS" + if linux_config_exists; then + for module in ${CONFIG_CHECK}; do + linux_chkconfig_present ${module} || ewarn "${module} needs to be enabled" + done + fi +} + +src_prepare() { + sed -i 's/xattr/pyxattr/g' requirements.txt || die + sed -i '/^hacking/d' test-requirements.txt || die + distutils-r1_python_prepare_all +} + +src_test() { + # https://bugs.launchpad.net/swift/+bug/1249727 + find . \( -name test_wsgi.py -o -name test_locale.py -o -name test_utils.py \) -delete || die + SKIP_PIP_INSTALL=1 PBR_VERSION=0.6.0 sh .unittests || die +} + +python_install_all() { + distutils-r1_python_install_all + keepdir /etc/swift + insinto /etc/swift + + newins "etc/swift.conf-sample" "swift.conf" + newins "etc/rsyncd.conf-sample" "rsyncd.conf" + newins "etc/mime.types-sample" "mime.types-sample" + newins "etc/memcache.conf-sample" "memcache.conf-sample" + newins "etc/drive-audit.conf-sample" "drive-audit.conf-sample" + newins "etc/dispersion.conf-sample" "dispersion.conf-sample" + + if use proxy; then + newinitd "${FILESDIR}/swift-proxy.initd" "swift-proxy" + newins "etc/proxy-server.conf-sample" "proxy-server.conf" + if use memcached; then + sed -i '/depend/a\ need memcached' "${D}/etc/init.d/swift-proxy" + fi + fi + if use account; then + newinitd "${FILESDIR}/swift-account.initd" "swift-account" + newins "etc/account-server.conf-sample" "account-server.conf" + fi + if use container; then + newinitd "${FILESDIR}/swift-container.initd" "swift-container" + newins "etc/container-server.conf-sample" "container-server.conf" + fi + if use object; then + newinitd "${FILESDIR}/swift-object.initd" "swift-object" + newins "etc/object-server.conf-sample" "object-server.conf" + newins "etc/object-expirer.conf-sample" "object-expirer.conf" + fi + + if use doc; then + doman doc/manpages/* + dodoc -r doc/{s3api,saio,source} + fi + + fowners root:swift "/etc/swift" + fperms 0750 /etc/swift +} + +pkg_postinst() { + elog "Openstack swift will default to using insecure http unless a" + elog "certificate is created in /etc/swift/cert.crt and the associated key" + elog "in /etc/swift/cert.key. These can be created with the following:" + elog " * cd /etc/swift" + elog " * openssl req -new -x509 -nodes -out cert.crt -keyout cert.key" +} diff --git a/sys-cluster/swift/swift-2.24.0-r1.ebuild b/sys-cluster/swift/swift-2.24.0-r1.ebuild index dfb4786356f7..0209967c131d 100644 --- a/sys-cluster/swift/swift-2.24.0-r1.ebuild +++ b/sys-cluster/swift/swift-2.24.0-r1.ebuild @@ -14,7 +14,7 @@ if [[ ${PV} == *9999 ]];then EGIT_BRANCH="stable/train" else SRC_URI="https://tarballs.openstack.org/${PN}/${P}.tar.gz" - KEYWORDS="~amd64 ~arm64 ~x86" + KEYWORDS="amd64 ~arm64 x86" fi LICENSE="Apache-2.0" diff --git a/sys-cluster/swift/swift-2019.2.9999.ebuild b/sys-cluster/swift/swift-2019.2.9999.ebuild index dfb4786356f7..afeeb15cce38 100644 --- a/sys-cluster/swift/swift-2019.2.9999.ebuild +++ b/sys-cluster/swift/swift-2019.2.9999.ebuild @@ -46,12 +46,11 @@ RDEPEND=" pkg_pretend() { linux-info_pkg_setup - CONFIG_CHECK="~EXT3_FS_XATTR ~SQUASHFS_XATTR ~CIFS_XATTR ~JFFS2_FS_XATTR - ~TMPFS_XATTR ~UBIFS_FS_XATTR ~EXT2_FS_XATTR ~REISERFS_FS_XATTR ~EXT4_FS_XATTR - ~ZFS" + CONFIG_CHECK="~EXT3_FS_XATTR ~CIFS_XATTR ~TMPFS_XATTR ~UBIFS_FS_XATTR + ~EXT2_FS_XATTR ~REISERFS_FS_XATTR ~EXT4_FS_XATTR ~ZFS" if linux_config_exists; then for module in ${CONFIG_CHECK}; do - linux_chkconfig_present ${module} || ewarn "${module} needs to be enabled" + linux_chkconfig_present ${module} || ewarn "you may want to enable the ${module} module" done fi } -- cgit v1.2.3