diff options
15 files changed, 312 insertions, 129 deletions
diff --git a/app-emulation/diskimage-builder/Manifest b/app-emulation/diskimage-builder/Manifest index 460336958df5..f4f03079460b 100644 --- a/app-emulation/diskimage-builder/Manifest +++ b/app-emulation/diskimage-builder/Manifest @@ -3,4 +3,4 @@ DIST diskimage-builder-2.3.3.tar.gz 294768 SHA256 227943d8702a66c9ed08d59362324b DIST diskimage-builder-2.4.0.tar.gz 308467 SHA256 ae9bc8b0dde17d422785d0099152997a15a4c051c484f3efff17594d8bb8d34c SHA512 2936d88f13dcebe67133400c20fa355349c33eb1d89045c38ffa4c2942152d9ca4b7fadefa622bf1c0055f8903a68d958f3b3db21fb3472da7b6ec7fd5c01267 WHIRLPOOL 6cd869d5a8fd31e3aa154d76eaa2543644c254eb90b12df80ce649c331759fbc5e4c8912a7753099a32c15c6dc98db256080d02d16e1d1d82377b293a7af49f0 DIST diskimage-builder-2.4.1.tar.gz 304969 SHA256 9a01eabc73bde93da3fde598249cc273c6cc744e8e6b850a0f7dd7e69c076543 SHA512 32ef8b7cae08c90691256be4b8b65c986de00306d935919c7d9ecba21722534da8bb00ab887b810bfff35e60c1e943641de576a7c4b29a6ff3d15315b55fb307 WHIRLPOOL a4e9a30452e2e0785e371968d463a95a04d5e9a7316decc2a00e27038b3606ca03515535b76e721eb12b8072567c91f9a6372d780fb60ab983d81071f88974e4 DIST diskimage-builder-2.5.0.tar.gz 312486 SHA256 5c665dbd6b8e3f24be26e65159a560b34e2250111adb4c7569db453d4bbbdf6c SHA512 b254b5ca9d56ace54fcdd90ec35065bb67312a203529b94d24ff6629a159e6918bae291b2bc2f8218b38caa8fe65369ebaf8c286994b060c4f62342e6a192bea WHIRLPOOL 31f3f4867dcd7543c7e6006717dc13de0d0d00f23a96126ce1cfac20bd24b17803422099a5737dd7b4aea1ddf53c9b9b6d3ad702fb0ace72bcb4ddb03d33acd1 -DIST diskimage-builder-2.6.0.tar.gz 313588 SHA256 8fbfe1f3bdbb53b80b21349cba54bd574b5e0976a752018f2833400eb9206402 SHA512 f4572cc5b9725633a8ed6f0a4c552014010d8eff1a0f52c72c0e873b59d20df621dce828b35a26a87b17ccfc05f3673f2b225b3cddd4d20d3a82e3fb4650c06e WHIRLPOOL 3e0338776b1a705c82c93192c9db71ed2764b0b1443d03ba4637f7fb3daeaecd8241bf8609326226ba63dd4d941f5b780464a7ef2ddc042a19db9838c3b9e434 +DIST diskimage-builder-2.6.1.tar.gz 312190 SHA256 4f5a9405c3b6599afe2ed037ef3dc72727a539a8b902dd23f1905dd772ab2ad1 SHA512 d79ec6b0cc7962b8dbd4a3f8d5193907f89c39e15a73fd5cd9cf5203792df2de7ced6b0acbe53e9d1cb7e100751f36c1bc77db2be1f25ab9472ca759f54bdc4b WHIRLPOOL 234308ec76126f8b1002e47a72eec3590b39997acfd6e9ea8c0ebdddfee01ab6a9dd249a5e245d58475f067ef0635d783ee9cc82344c9061d69dce38fa4ae888 diff --git a/app-emulation/diskimage-builder/diskimage-builder-2.6.0.ebuild b/app-emulation/diskimage-builder/diskimage-builder-2.6.1.ebuild index f8a2aaffcd34..f8a2aaffcd34 100644 --- a/app-emulation/diskimage-builder/diskimage-builder-2.6.0.ebuild +++ b/app-emulation/diskimage-builder/diskimage-builder-2.6.1.ebuild diff --git a/app-emulation/docker-machine-kvm/Manifest b/app-emulation/docker-machine-kvm/Manifest index 5afb9245cf3b..f768cf77576f 100644 --- a/app-emulation/docker-machine-kvm/Manifest +++ b/app-emulation/docker-machine-kvm/Manifest @@ -1,6 +1,3 @@ -DIST docker-machine-0.8.2.tar.gz 2928577 SHA256 6ca75b2995f57505901da2f45ce422c782b73d89054cc10868100b3404ccfd05 SHA512 3fa683f74466e30616495b8e635e28be0c7557e17940bc4f3f8598a755463b5ae75e64405281325e2028aee5a3e06744329d9bf0a7b6ade200f3d3c51ba2fe80 WHIRLPOOL 37d9ddd2a946ee890bb771b304be692385e0ef1f53ef8ed100f2860e7cab7b825093a2d7b4c3bfa8b78193df1ab7ec9d16817aef1985a48ae1b97b666051cf96 DIST docker-machine-kvm-0.10.0.tar.gz 12183 SHA256 9e3c5ddeac2cabcf0a604b7032020cfee9b16b3d1cb27697d2ec4491cc18688f SHA512 d4725531e43814ae2b8c3826ad695cc853177d09aeae9c97aa24b5c0de8732bdef67b12f7218244cf44cdd589bb9878058e587c946e13481ba57cb418c535e9e WHIRLPOOL 7ce0fb4c2c23e8c7a882359be251359af75f1e60b3646b0f1b26bccf9cc48b9ff78f0a11eb2b733bfe969136b63b8f2eed57ea7250acd0945f0ba4d368a741cf -DIST docker-machine-kvm-0.7.0.tar.gz 6975 SHA256 25fae12f952faa155e1141e2f0ab196ebcd22b7691848e1022d54faa806e998f SHA512 8b58806d3afc58f28d483df8644d3d734407c931a9e6b2c055589d500de115b88693928f73fccb9f2ebe7b01cdd1b473e3e3654c9867d102f60d0fa72ff97d4e WHIRLPOOL dbd0d6048d202b548d45a3261d6c4cf129dad5beeb61108a220ba6b4939e57f04c054624c95c3121a3fc964be02ea4edbc14b9b762bbe9317cb9c8cac21ded00 DIST github.com-docker-machine-v0.10.0.tar.gz 1605832 SHA256 ed64698723436e68341a1ebd8486006293eac306bfa8628e924b38bfcb5b039d SHA512 337ed74474b5e55e10ccd7c8bb3b778d06fc2c56c1646678715548ddeb41a0b7320212d498ad96cbdd08137f78013506b569c4e0aa0a2f28169264d64d814f7c WHIRLPOOL 06802376ba23ec1706ad09c784e3ceb70aab439d88523c2845a69a895e9a31911737bbf889f91627caae79e31cf8039265382183f7112987f0de6aea58adf138 DIST github.com-libvirt-libvirt-go-c3209e4ba8b8dda65c85ca0ac04302e55895caf7.tar.gz 100068 SHA256 0f512d56f02fc0369037e17d7598793cb6e79321c82c53fac788f8cfec1b669d SHA512 7ac5964349c90ac45f627f9c714b04c3ff07428ca2ef7edb1bd173cb7264040ddb49f9df57249a7dbc5f3500c7e1b4011b40faf4b8104f1ef56a1833cb020ab3 WHIRLPOOL 2a40fb3c5ad07fa4fcdf5beff98a79f6939246815ad4c845a364810b1fccd2d312e9fc39964f446da76e5d3a2e37d6d9bf4fb94204e808cedbde77f4eba1c720 -DIST libvirt-go-2.13.0.tar.gz 42994 SHA256 e75d5fa2509f10fb2d5a88e7570397cb7de69ecd8424a2859bd73abc4495d864 SHA512 5a5c8a2fc57c2818455fdb0ea13f98abc7d15c139ccdc692e562fddfd7152653635f1955ebad61b94202a706b94b45cb783a9e6387eef0a00c528cb2f0663fb0 WHIRLPOOL 8ff6553ac55805234a4496d21c0a2d7782d20c301c7f4271b92a14b538ad5bb5c27f9b98eac868815f691fed05f579f95d6638b923a7c2c2788f02169a09deb8 diff --git a/app-emulation/docker-machine-kvm/docker-machine-kvm-0.7.0.ebuild b/app-emulation/docker-machine-kvm/docker-machine-kvm-0.7.0.ebuild deleted file mode 100644 index 8b62f95fd5f8..000000000000 --- a/app-emulation/docker-machine-kvm/docker-machine-kvm-0.7.0.ebuild +++ /dev/null @@ -1,69 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit golang-base - -KEYWORDS="~amd64" -DESCRIPTION="KVM driver for docker-machine" -EGO_PN="github.com/dhiltgen/${PN}/..." -HOMEPAGE="http://${EGO_PN%/*}" -LICENSE="Apache-2.0" -SLOT="0" -IUSE="" -COMMON_DEPEND="app-emulation/libvirt:=[qemu,virt-network]" -DEPEND=">=dev-lang/go-1.6:= - ${COMMON_DEPEND}" -RDEPEND="${COMMON_DEPEND}" - -SRC_URI="https://${EGO_PN%/*}/archive/v${PV}.tar.gz -> ${P}.tar.gz - https://github.com/rgbkrk/libvirt-go/archive/v2.13.0.tar.gz -> libvirt-go-2.13.0.tar.gz - https://github.com/docker/machine/archive/v0.8.2.tar.gz -> docker-machine-0.8.2.tar.gz" - -get_archive_go_package() { - local archive=${1} uri x - for x in ${SRC_URI}; do - if [[ ${x} == http* ]]; then - uri=${x} - elif [[ ${x} == ${archive} ]]; then - break - fi - done - uri=${uri#https://} - echo ${uri%/archive/*} -} - -unpack_go_packages() { - local go_package x - # Unpack packages to appropriate locations for GOPATH - for x in ${A}; do - unpack ${x} - if [[ ${x} == *.tar.gz ]]; then - go_package=$(get_archive_go_package ${x}) - mkdir -p src/${go_package%/*} - mv ${go_package##*/}-* src/${go_package} || die - fi - done -} - -src_unpack() { - mkdir "${S}" && cd "${S}" || die - unpack_go_packages -} - -src_prepare() { - eapply_user - sed -e 's|alexzorin|rgbkrk|g' -i src/${EGO_PN%/*}/kvm.go || die -} - -src_compile() { - export GOPATH=${S} - cd "${S}"/src/${EGO_PN%/*}/bin || die - emake || die -} - -src_install() { - dobin "${S}/src/${EGO_PN%/*}/bin/${PN/kvm/driver-kvm}" - dodoc "${S}/src/${EGO_PN%/*}/README.md" -} diff --git a/dev-python/oslo-rootwrap/Manifest b/dev-python/oslo-rootwrap/Manifest index 70b6b5da9313..f254d86481e0 100644 --- a/dev-python/oslo-rootwrap/Manifest +++ b/dev-python/oslo-rootwrap/Manifest @@ -1,2 +1 @@ -DIST oslo.rootwrap-5.4.0.tar.gz 40741 SHA256 8b3c1c5726e0845fcd00d9f951f012bdd3405380acf125428268fba4f70f3c00 SHA512 9848d9f18b7a4063f74d170615b99dc3ebcbcba1ff1f0a10f42b2af9284dd58a65a6b483bed20d176de00170ad60ac7b847cf5a31b950fcd7bf06ecbaecb1823 WHIRLPOOL 0996255270825040156767ae1b08a82aa8df87cabd9122522866ce38e99278c72242d1dfae5e0417267d1dd683b5e3d4ba0d3dcbc75e4449df2a01b267ea24b2 DIST oslo.rootwrap-5.4.1.tar.gz 42202 SHA256 a76cf545515c1cf6d4d9b1a01a339c1356d1eb78ff3b2190e168dafead3c7e7d SHA512 71980ea266703c7880834cf75b69be9f7bee834a3be314f13ade1bb9903ecf6337237a32a1ed06d020c2fdd3807642af1dd676b6736052d4e57784942782d960 WHIRLPOOL 321a2e9774e3702015510d608e4e145d9fc69c4069865dd5215ad6e94e3692e7e56e029298e908fc007f487d54737d3cd4218dfc93d0625c6950edba45da56b2 diff --git a/dev-python/oslo-rootwrap/oslo-rootwrap-5.4.0.ebuild b/dev-python/oslo-rootwrap/oslo-rootwrap-5.4.0.ebuild deleted file mode 100644 index 82a554a79ab4..000000000000 --- a/dev-python/oslo-rootwrap/oslo-rootwrap-5.4.0.ebuild +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -PYTHON_COMPAT=( python2_7 python3_4 python3_5 ) - -inherit distutils-r1 - -DESCRIPTION="Allows fine filtering of shell commands to run as root from OpenStack services" -HOMEPAGE="https://pypi.python.org/pypi/oslo.config" -SRC_URI="mirror://pypi/${PN:0:1}/oslo.rootwrap/oslo.rootwrap-${PV}.tar.gz" -S="${WORKDIR}/oslo.rootwrap-${PV}" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="amd64 ~arm64 x86" -IUSE="test" - -CDEPEND=" - >=dev-python/pbr-1.8[${PYTHON_USEDEP}]" -DEPEND="dev-python/setuptools[${PYTHON_USEDEP}] - ${CDEPEND} - test? ( - >=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}] - >=dev-python/subunit-0.0.18[${PYTHON_USEDEP}] - >=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}] - >=dev-python/testscenarios-0.4[${PYTHON_USEDEP}] - >=dev-python/testtools-1.4.0[${PYTHON_USEDEP}] - >=dev-python/sphinx-1.2.1[${PYTHON_USEDEP}] - <dev-python/sphinx-1.4[${PYTHON_USEDEP}] - >=dev-python/oslo-sphinx-4.7.0[${PYTHON_USEDEP}] - >=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}] - >=dev-python/mock-2.0.0[${PYTHON_USEDEP}] - >=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}] - >=dev-python/reno-1.8.0[${PYTHON_USEDEP}] - dev-python/nose[${PYTHON_USEDEP}] )" -RDEPEND=">=dev-python/six-1.9.0[${PYTHON_USEDEP}]" - -python_prepare_all() { - sed -i '/^hacking/d' test-requirements.txt || die - distutils-r1_python_prepare_all -} - -python_test() { - sed -i 's/sbin\/ip/bin\/ip/g' tests/test_rootwrap.py - nosetests tests/ || die "test failed under ${EPYTHON}" -} diff --git a/dev-python/oslo-rootwrap/oslo-rootwrap-5.4.1.ebuild b/dev-python/oslo-rootwrap/oslo-rootwrap-5.4.1.ebuild index 42e6fb2940bd..82a554a79ab4 100644 --- a/dev-python/oslo-rootwrap/oslo-rootwrap-5.4.1.ebuild +++ b/dev-python/oslo-rootwrap/oslo-rootwrap-5.4.1.ebuild @@ -13,7 +13,7 @@ S="${WORKDIR}/oslo.rootwrap-${PV}" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="~amd64 ~arm64 ~x86" +KEYWORDS="amd64 ~arm64 x86" IUSE="test" CDEPEND=" diff --git a/dev-python/pbr/Manifest b/dev-python/pbr/Manifest index b1c569f1cd5b..a71215b4393f 100644 --- a/dev-python/pbr/Manifest +++ b/dev-python/pbr/Manifest @@ -5,4 +5,4 @@ DIST pbr-1.9.1.tar.gz 113439 SHA256 3997406c90894ebf3d1371811c1e099721440a901f94 DIST pbr-2.0.0.tar.gz 98568 SHA256 0ccd2db529afd070df815b1521f01401d43de03941170f8a800e7531faba265d SHA512 39540f54de674d4e50d6e9239328c0ac11ae6218a1483b023ab282efb797fc143d22334f60697ba81e2309c525860525ed0ce4858d66b187d2581fab9fae6b7d WHIRLPOOL 049df8e4fee3c65c04362cbbcda88047f9fa672caa1d1319bac5dfdf2452ddfd442e9e46bc832fad57831844eed1f0da4267fe3ae40b148948a9413aa5b155a2 DIST pbr-2.1.0.tar.gz 100858 SHA256 f71359a7e2de2f5ea1eceea7c1e3222f2560ee48e21eef6f96957bb5c2ebb94a SHA512 a4a7b1c96545bd25f63a439608f22bc04309c518f78f0044d18f10ce7c9ceeca3da97be527f0330c65d875900a3729dea99dade95787fb2ea75c3ae387b36938 WHIRLPOOL f82152ebb34ed21438853289c66ce326d39a57f6da7c28a31b9e43c26ab2a54ed9978cd398d5e7f28cdd94abcdc0017557d15af3458ec8f66b181fd5ef6de836 DIST pbr-3.0.1.tar.gz 100518 SHA256 d7e8917458094002b9a2e0030ba60ba4c834c456071f2d0c1ccb5265992ada91 SHA512 30ffb8f0c0184c7613add7094ff065d709d9c83e829f7e65ea60f5d1e0fbd267c3067aed8eff0c7767110b079e118141743f4f63185f8617925566ff14a40412 WHIRLPOOL eca2d4335399c2fe10ba7d5dd0ccda28d57d6c0ce8890f625765eab1e593c5b1a200a3cf433355ef898a9d2d5b9a67ce99ab88a13591a9cc363b0c6ee8b4fb40 -DIST pbr-3.1.0.tar.gz 102185 SHA256 b8af6ec309f4f3ab419b998b22073d66da55b36414e0b729cb04a408f6d73697 SHA512 23c69210485768e4acade72eff1c5be3168495c252d91d3c19128b73d4038e25f4e9a2516f61f0112f5f9ca327b1a4b8d3132cc272d93823129b4f563682d0b5 WHIRLPOOL 5608426a0e76d3507ec8b79f95eca0f15750ecb460e90fcc7ce42e7eed6b81efc1c7c9f15a486d84aecc5be1b358d4c063c1ae455b58c5405b348aa3977b3f9f +DIST pbr-3.1.1.tar.gz 102665 SHA256 05f61c71aaefc02d8e37c0a3eeb9815ff526ea28b3b76324769e6158d7f95be1 SHA512 c01fb83678f8fc3acddc153dd341a17ed9d602b6770f0ff244b1c5b54c37d4ddcbd0c3d726f7d7020865819e02797c1c79a0c15e9ee2ae5c1510fce7112b2a3a WHIRLPOOL 00c980b8499c2418e4e2847cbb85fccf921ffa15e1c32c3b3053a46468efd2578faf224334ce81c24177705d66c1c1a2f9d5d8de7c0a0ce4b45adddd017e02da diff --git a/dev-python/pbr/pbr-3.1.0.ebuild b/dev-python/pbr/pbr-3.1.1.ebuild index be0c6f6a4594..be0c6f6a4594 100644 --- a/dev-python/pbr/pbr-3.1.0.ebuild +++ b/dev-python/pbr/pbr-3.1.1.ebuild diff --git a/media-sound/spotify/Manifest b/media-sound/spotify/Manifest index ec97c8cf254e..c76db9f285ad 100644 --- a/media-sound/spotify/Manifest +++ b/media-sound/spotify/Manifest @@ -1,4 +1,4 @@ DIST spotify-client_1.0.49.125.g72ee7853-111_amd64.deb 73404932 SHA256 1d6d1cccfb7f996b835f21c8dbabc16ca4bd214878e06738dba7886640470050 SHA512 f6152f71fae3827e1f9dfb07cbe30319f090db151702ca02f3566f3deeec369da0c70f9995a548e0df92d655b593de520ab387a011201317753d3def70741e24 WHIRLPOOL b5111509c902068bd2559267bfd2febfab8b4464d73e54a302d23807338e796045901fe14b9c229e6a412553f7cfe84e903ddfc4c4c3e9a60609b23a7ecf2c3c DIST spotify-client_1.0.49.125.g72ee7853-22_i386.deb 74637938 SHA256 96c02fdc77991feb0797089d701744c2de4584322f966a1c070b559df27f9b04 SHA512 4a8aab47b6b0c2ac9b349c858e4728451e713c466bcff9c1eac9c6215259ad9325a51b0fc8bd2afcfa141a6ad518f97d408b5d779a126f2ac62c9e8be93f5f93 WHIRLPOOL 9bd02e73731cc4d2e55c43b08d1bea1d3fcfecb13ebdf8fe591aa5be6961423e3463a2fd625745561ebb7f33c902246a84f406bcc1dd3f7f47ffad6b98daa451 -DIST spotify-client_1.0.55.487.g256699aa-16_amd64.deb 91060768 SHA256 20073ba6fdf7d960361d4cb2afa6453e7a2108bd84df8f9cdf2cdf7225a83027 SHA512 c709a24d7980c61916faf55ed7be037dd0c9fbd5f00259004fe1e1e429056009f17c8f18c7eb07c738ce16fae31ea79f2329a703ba18709aa0ca691c08ad06d4 WHIRLPOOL dcc9c90cfa398103c26aa0bfaf194132e3fa323697648d6eef088f2d9d83f513b0efcfa29e51f535405a216f190b486497cd5fedbc1f4618463c6a608e4fa96b -DIST spotify-client_1.0.55.487.g256699aa-16_i386.deb 90692680 SHA256 183f87b930b75d85ecb34cef2b26b0355a3a18ffa38e0e0a476bfb190972b74d SHA512 bdb9d50a554b7c60fc8f1c261c68bdadd706523ab3ad6b4dec6fe2494c48136c9f6bea731fb9cee0519692f1de94589e2f13b272f1c5be5c152f5ed1a9b10b0d WHIRLPOOL 0cd7b0dbd6c5ea6fa64c70e11821be041f4098d61740c0b508c5a1f2ccfbcfe6cc3dbb19624a97a9a2825a163ccb90dc60f80408fe3e1a76f0c5ee0fbfd1cde2 +DIST spotify-client_1.0.57.474.gca9c9538-30_amd64.deb 91837192 SHA256 fe46f2084c45c756bee366f744d2821d79e82866b19942e30bb2a20c1e597437 SHA512 53b6777c4f64dd0dc368ac33765ec763baa33130e273335accb29db5717bc0cf9c46a26ee59abceea1794967ca070735cdfcb53a43b7622d7d9efbc065b30de4 WHIRLPOOL f920813b084d694a0ecf0582c3cb3596736a4689ca3662b03036ee179df0402a0d3224641885bc5257b0a3912b85248227a1e74acd4c55ea50c49a86b359a59c +DIST spotify-client_1.0.57.474.gca9c9538-30_i386.deb 91527492 SHA256 8f2f4e6c71fe923512062e1c0378424a74651f5c107c05e8daf3b7bf67fd6de1 SHA512 d66ef257a2f05060d60a66a03607ce7c2906436578207282f941e6279dd73dd3fc00af3a245e3d45ea293c79930a0c8f1347bda63c8fd647b8e29ff07a7a82bd WHIRLPOOL 4d499ca70271c386708c71959d04beeff0be42141a310a1d5acf5ba6ec77316e2818620f2b176dc997cb7efdd4aebf626e4d04f9f3d4006e9f9ae9d29d917312 diff --git a/media-sound/spotify/spotify-1.0.55.ebuild b/media-sound/spotify/spotify-1.0.57.ebuild index 4c42ea31192b..2cd3b61d5564 100644 --- a/media-sound/spotify/spotify-1.0.55.ebuild +++ b/media-sound/spotify/spotify-1.0.57.ebuild @@ -6,10 +6,10 @@ inherit eutils fdo-mime gnome2-utils pax-utils unpacker DESCRIPTION="Spotify is a social music platform" HOMEPAGE="https://www.spotify.com/ch-de/download/previews/" -BUILD_ID="487.g256699aa" +BUILD_ID="474.gca9c9538" SRC_BASE="http://repository.spotify.com/pool/non-free/${PN:0:1}/${PN}-client/" -SRC_URI="amd64? ( ${SRC_BASE}${PN}-client_${PV}.${BUILD_ID}-16_amd64.deb ) - x86? ( ${SRC_BASE}${PN}-client_${PV}.${BUILD_ID}-16_i386.deb )" +SRC_URI="amd64? ( ${SRC_BASE}${PN}-client_${PV}.${BUILD_ID}-30_amd64.deb ) + x86? ( ${SRC_BASE}${PN}-client_${PV}.${BUILD_ID}-30_i386.deb )" LICENSE="Spotify" SLOT="0" KEYWORDS="~amd64 ~x86" diff --git a/net-nds/openldap/files/openldap-2.4.45-fix-lmpasswd-gnutls-symbols.patch b/net-nds/openldap/files/openldap-2.4.45-fix-lmpasswd-gnutls-symbols.patch new file mode 100644 index 000000000000..0859d53caef9 --- /dev/null +++ b/net-nds/openldap/files/openldap-2.4.45-fix-lmpasswd-gnutls-symbols.patch @@ -0,0 +1,109 @@ +If GnuTLS is used, the lmpasswd module for USE=samba does not compile. +Forward-port an old Debian patch that upstream never applied. + +Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> +Signed-off-by: Steffen Hau <steffen@hauihau.de> +X-Gentoo-Bug: http://bugs.gentoo.org/show_bug.cgi?id=233633 +X-Upstream-Bug: http://www.openldap.org/its/index.cgi/Software%20Enhancements?id=4997 +X-Debian-Bug: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=245341 + +--- openldap-2.4.17.orig/libraries/liblutil/passwd.c 2009-07-27 18:59:19.635995474 -0700 ++++ openldap-2.4.17/libraries/liblutil/passwd.c 2009-07-27 19:01:13.588069010 -0700 +@@ -51,6 +51,26 @@ typedef unsigned char des_data_block[8]; + typedef PK11Context *des_context[1]; + #define DES_ENCRYPT CKA_ENCRYPT + ++#elif defined(HAVE_GNUTLS_GNUTLS_H) && !defined(DES_ENCRYPT) ++# include <gcrypt.h> ++static int gcrypt_init = 0; ++ ++typedef const void* des_key; ++typedef unsigned char DES_cblock[8]; ++typedef des_cblock des_data_block; ++typedef int DES_key_schedule; /* unused */ ++typedef DES_key_schedule des_context; /* unused */ ++#define des_failed(encrypted) 0 ++#define des_finish(key, schedule) ++ ++#define DES_set_key_unchecked( key, key_sched ) \ ++ gcry_cipher_setkey( hd, key, 8 ) ++ ++#define DES_ecb_encrypt( input, output, key_sched, enc ) \ ++ gcry_cipher_encrypt( hd, *output, 8, *input, 8 ) ++ ++#define DES_set_odd_parity( key ) do {} while(0) ++ + #endif + + #endif /* SLAPD_LMHASH */ +@@ -651,7 +671,7 @@ static int chk_md5( + + #ifdef SLAPD_LMHASH + +-#if defined(HAVE_OPENSSL) ++#if defined(HAVE_OPENSSL) || defined(HAVE_GNUTLS_GNUTLS_H) + + /* + * abstract away setting the parity. +@@ -841,6 +861,19 @@ static int chk_lanman( + des_data_block StdText = "KGS!@#$%"; + des_data_block PasswordHash1, PasswordHash2; + char PasswordHash[33], storedPasswordHash[33]; ++ ++#if defined(HAVE_GNUTLS_GNUTLS_H) && !defined(DES_ENCRYPT) ++ gcry_cipher_hd_t hd; ++ ++ if ( !gcrypt_init ) { ++ gcry_check_version( GCRYPT_VERSION ); ++ gcrypt_init = 1; ++ } ++ ++ schedule = schedule; /* unused - avoid warning */ ++ ++ gcry_cipher_open( &hd, GCRY_CIPHER_DES, GCRY_CIPHER_MODE_ECB, 0 ); ++#endif /* HAVE_GNUTLS_GNUTLS_H && !DES_ENCRYPT */ + + for( i=0; i<cred->bv_len; i++) { + if(cred->bv_val[i] == '\0') { +@@ -883,6 +916,10 @@ static int chk_lanman( + strncpy( storedPasswordHash, passwd->bv_val, 32 ); + storedPasswordHash[32] = '\0'; + ldap_pvt_str2lower( storedPasswordHash ); ++ ++#if defined(HAVE_GNUTLS_GNUTLS_H) && !defined(DES_ENCRYPT) ++ gcry_cipher_close( hd ); ++#endif /* HAVE_GNUTLS_GNUTLS_H && !DES_ENCRYPT */ + + return memcmp( PasswordHash, storedPasswordHash, 32) ? LUTIL_PASSWD_ERR : LUTIL_PASSWD_OK; + } +@@ -1138,6 +1175,19 @@ static int hash_lanman( + des_data_block PasswordHash1, PasswordHash2; + char PasswordHash[33]; + ++#if defined(HAVE_GNUTLS_GNUTLS_H) && !defined(DES_ENCRYPT) ++ gcry_cipher_hd_t hd; ++ ++ if ( !gcrypt_init ) { ++ gcry_check_version( GCRYPT_VERSION ); ++ gcrypt_init = 1; ++ } ++ ++ schedule = schedule; /* unused - avoid warning */ ++ ++ gcry_cipher_open( &hd, GCRY_CIPHER_DES, GCRY_CIPHER_MODE_ECB, 0 ); ++#endif /* HAVE_GNUTLS_GNUTLS_H && !DES_ENCRYPT */ ++ + for( i=0; i<passwd->bv_len; i++) { + if(passwd->bv_val[i] == '\0') { + return LUTIL_PASSWD_ERR; /* NUL character in password */ +@@ -1168,6 +1218,10 @@ static int hash_lanman( + + hash->bv_val = PasswordHash; + hash->bv_len = 32; ++ ++#if defined(HAVE_GNUTLS_GNUTLS_H) && !defined(DES_ENCRYPT) ++ gcry_cipher_close( hd ); ++#endif /* HAVE_GNUTLS_GNUTLS_H && !DES_ENCRYPT */ + + return pw_string( scheme, hash ); + } diff --git a/net-nds/openldap/openldap-2.4.45.ebuild b/net-nds/openldap/openldap-2.4.45.ebuild index 23c66c3db530..b2493271ba45 100644 --- a/net-nds/openldap/openldap-2.4.45.ebuild +++ b/net-nds/openldap/openldap-2.4.45.ebuild @@ -330,7 +330,7 @@ src_prepare() { epatch "${FILESDIR}"/${PN}-2.4.11-libldap_r.patch # bug #233633 - epatch "${FILESDIR}"/${PN}-2.4.17-fix-lmpasswd-gnutls-symbols.patch + epatch "${FILESDIR}"/${PN}-2.4.45-fix-lmpasswd-gnutls-symbols.patch # bug #281495 epatch "${FILESDIR}"/${PN}-2.4.28-gnutls-gcrypt.patch diff --git a/sys-cluster/cinder/Manifest b/sys-cluster/cinder/Manifest index 083e0408a12d..3d2a239550fe 100644 --- a/sys-cluster/cinder/Manifest +++ b/sys-cluster/cinder/Manifest @@ -1,4 +1,5 @@ DIST cinder-10.0.2.tar.gz 4605687 SHA256 8abeee27419679127fd0292240981bcdbcf6af1ec2604f1e37e939692d766eed SHA512 29c7670add87c1465ed2c5a0e8c264f9fd8c0b36baa7ce2f71ca052be7b3be56cd60beea9452881cbd4285fa1dc556815ff360fe15daaca1b5ae816e24c7ec50 WHIRLPOOL 26427c0bb789e9a668d66048129d68f71de527443d0da1346cb887ef85bfc2f67cd8e1283e8d24531297537575af01c9f87315373810cce86f31d36251a19635 +DIST cinder-10.0.3.tar.gz 4620868 SHA256 53e7538299e3c72c809112e85a065581b38e752ec19a0dbc0c918554eedd6789 SHA512 e22fca956c751a70e2248cab42cca4a0671d8a52537083dc97db4ba2279678f08e894cffba3e6f7c8b32f5313bdccd2af890948c463683ac64e4cf0a3313cc3b WHIRLPOOL b904908c13ade48db737f2491c5afd864ac77fce5f249b8a66b60cde51573b3b43475d0292d6e99509f95f681a347225572944a5eb5451498e2e31fc01fa24f5 DIST cinder-9.1.4.tar.gz 4195597 SHA256 ee8a2ca264a41c8f4ed48094722d683cffae99cee910f19a140b0d1d0f5251a4 SHA512 8039d5208296ea54fc869fb05dd91451ac3575eb3dd2ed97d0c63120d18b67b02b835a849cd1ec3dae349920895e13665c15a6daa53f67138823053c49ab87a9 WHIRLPOOL f2fd2bbba72d2f74f1395f2b280ed3304ecec37c9bcdc7b73a104d19698dad123ffdbce58249c426245c68584eb7a10a640f38a9192933d8db30a7f45b79c48e DIST newton-cinder-policy.json 6412 SHA256 3a140134201452c52a97eae9f4c45ea30a3a21cc7a30ee619ed37ab0723b6479 SHA512 3473b5790487bd037d54e4a1a89bab9d145bc34d137d52da2b6b311d2dfee2344fec75c6c96bc518a3e0b175fbd6cde71fb546406c0ef835898e3c1c88eb6d56 WHIRLPOOL f34dc729425fd82ddd9905c675fca9b765b4535dc87ec9d94acd1781c331e466f8688aace4954532e376e704cf3f1c8f4103f22e6838d4403c10311358e1ed2b DIST newton-cinder-volume.filters 11025 SHA256 c36bdb9abb4d97350db9971dae1c44a713911920362a0c6c5bc3cfe2701dd4f6 SHA512 311a636180a18bb45867d55f9d33f1eff053cc7b278b41149c58a14450ff8e6d2016d749cc3fb81d1976c4ab78f7701a908bd9c81eb6e9da31c20820a4eaff3d WHIRLPOOL 7496fffec8e42eb1c3bea39563cef8d48cb607b7de1ba8a4ac9a831b6def3dcbcfdf7d485aa81f52aa9bdf7600a51ba07ff85fbf88c5c70091ad88f8c01ca37e diff --git a/sys-cluster/cinder/cinder-10.0.3.ebuild b/sys-cluster/cinder/cinder-10.0.3.ebuild new file mode 100644 index 000000000000..0889f3683161 --- /dev/null +++ b/sys-cluster/cinder/cinder-10.0.3.ebuild @@ -0,0 +1,193 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +PYTHON_COMPAT=( python2_7 python3_4 ) + +inherit distutils-r1 eutils linux-info user + +DESCRIPTION="Cinder is the OpenStack Block storage service, a spin out of nova-volumes" +HOMEPAGE="https://launchpad.net/cinder" +SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/cinder/ocata/cinder.conf.sample -> ocata-cinder.conf.sample +https://dev.gentoo.org/~prometheanfire/dist/openstack/cinder/ocata/policy.json -> ocata-cinder-policy.json +https://dev.gentoo.org/~prometheanfire/dist/openstack/cinder/ocata/volume.filters -> ocata-cinder-volume.filters +https://tarballs.openstack.org/${PN}/${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~x86" +IUSE="+api +scheduler +volume infiniband iscsi lvm mysql +memcached postgres rdma sqlite +tcp test +tgt" +REQUIRED_USE="|| ( mysql postgres sqlite ) iscsi? ( tgt ) infiniband? ( rdma )" + +CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]" +DEPEND="dev-python/setuptools[${PYTHON_USEDEP}] + ${CDEPEND} + app-admin/sudo" + +RDEPEND=" + ${CDEPEND} + >=dev-python/Babel-2.3.4[${PYTHON_USEDEP}] + >=dev-python/decorator-3.4.0[${PYTHON_USEDEP}] + dev-python/enum34[$(python_gen_usedep 'python2_7')] + >=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}] + >=dev-python/greenlet-0.3.2[${PYTHON_USEDEP}] + >=dev-python/httplib2-0.7.5[${PYTHON_USEDEP}] + >=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}] + virtual/python-ipaddress[${PYTHON_USEDEP}] + >=dev-python/keystoneauth-2.18.0[${PYTHON_USEDEP}] + >=dev-python/keystonemiddleware-4.12.0[${PYTHON_USEDEP}] + >=dev-python/lxml-2.3[${PYTHON_USEDEP}] + !~dev-python/lxml-3.7.0[${PYTHON_USEDEP}] + >=dev-python/oauth2client-1.5.0[${PYTHON_USEDEP}] + >=dev-python/oslo-config-3.14.0[${PYTHON_USEDEP}] + !~dev-python/oslo-config-3.18.0[${PYTHON_USEDEP}] + >=dev-python/oslo-concurrency-3.8.0[${PYTHON_USEDEP}] + >=dev-python/oslo-context-2.9.0[${PYTHON_USEDEP}] + >=dev-python/oslo-db-4.15.0[${PYTHON_USEDEP}] + >=dev-python/oslo-log-3.11.0[${PYTHON_USEDEP}] + >=dev-python/oslo-messaging-5.14.0[${PYTHON_USEDEP}] + >=dev-python/oslo-middleware-3.0.0[${PYTHON_USEDEP}] + >=dev-python/oslo-policy-1.17.0[${PYTHON_USEDEP}] + >=dev-python/oslo-privsep-1.9.0[${PYTHON_USEDEP}] + >=dev-python/oslo-reports-0.6.0[${PYTHON_USEDEP}] + >=dev-python/oslo-rootwrap-5.0.0[${PYTHON_USEDEP}] + >=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}] + >=dev-python/oslo-service-1.10.0[${PYTHON_USEDEP}] + >=dev-python/oslo-utils-3.18.0[${PYTHON_USEDEP}] + >=dev-python/oslo-versionedobjects-1.17.0[${PYTHON_USEDEP}] + >=dev-python/osprofiler-1.4.0[${PYTHON_USEDEP}] + >=dev-python/paramiko-2.0[${PYTHON_USEDEP}] + dev-python/paste[${PYTHON_USEDEP}] + >=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}] + >=dev-python/psutil-3.0.1[${PYTHON_USEDEP}] + >=dev-python/pycrypto-2.6[${PYTHON_USEDEP}] + >=dev-python/pyparsing-2.1.0[${PYTHON_USEDEP}] + >=dev-python/python-barbicanclient-4.0.0[${PYTHON_USEDEP}] + >=dev-python/python-glanceclient-2.5.0[${PYTHON_USEDEP}] + >=dev-python/python-keystoneclient-3.8.0[${PYTHON_USEDEP}] + >=dev-python/python-novaclient-6.0.0[${PYTHON_USEDEP}] + !~dev-python/python-novaclient-7.0.0[${PYTHON_USEDEP}] + >=dev-python/python-swiftclient-3.2.0[${PYTHON_USEDEP}] + >=dev-python/pytz-2013.6[${PYTHON_USEDEP}] + >=dev-python/requests-2.10.0[${PYTHON_USEDEP}] + !~dev-python/requests-2.12.2[${PYTHON_USEDEP}] + >=dev-python/retrying-1.2.3[${PYTHON_USEDEP}] + !~dev-python/retrying-1.3.0[${PYTHON_USEDEP}] + >=dev-python/routes-1.12.3[${PYTHON_USEDEP}] + !~dev-python/routes-2.0[${PYTHON_USEDEP}] + !~dev-python/routes-2.1[$(python_gen_usedep 'python2_7')] + !~dev-python/routes-2.3[${PYTHON_USEDEP}] + >=dev-python/taskflow-2.7.0[${PYTHON_USEDEP}] + >=dev-python/rtslib-fb-2.1.43[${PYTHON_USEDEP}] + !~dev-python/rtslib-fb-2.1.60[${PYTHON_USEDEP}] + !~dev-python/rtslib-fb-2.1.61[${PYTHON_USEDEP}] + >=dev-python/simplejson-2.2.0[${PYTHON_USEDEP}] + >=dev-python/six-1.9.0[${PYTHON_USEDEP}] + sqlite? ( + >=dev-python/sqlalchemy-1.0.10[sqlite,${PYTHON_USEDEP}] + <dev-python/sqlalchemy-1.1.0[sqlite,${PYTHON_USEDEP}] + ) + mysql? ( + >=dev-python/pymysql-0.7.6[${PYTHON_USEDEP}] + !~dev-python/pymysql-0.7.7[${PYTHON_USEDEP}] + >=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}] + <dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}] + ) + postgres? ( + >=dev-python/psycopg-2.5.0 + >=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}] + <dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}] + ) + >=dev-python/sqlalchemy-migrate-0.9.6[${PYTHON_USEDEP}] + >=dev-python/stevedore-1.17.1[${PYTHON_USEDEP}] + ~dev-python/suds-0.6[${PYTHON_USEDEP}] + >=dev-python/webob-1.6.0[${PYTHON_USEDEP}] + >=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}] + >=dev-python/oslo-vmware-2.17.0[${PYTHON_USEDEP}] + >=dev-python/os-brick-1.8.0[${PYTHON_USEDEP}] + >=dev-python/os-win-1.4.0[${PYTHON_USEDEP}] + >=dev-python/tooz-1.47.0[${PYTHON_USEDEP}] + >=dev-python/google-api-python-client-1.4.2[${PYTHON_USEDEP}] + >=dev-python/castellan-0.4.0[${PYTHON_USEDEP}] + iscsi? ( + tgt? ( sys-block/tgt ) + sys-block/open-iscsi + ) + lvm? ( sys-fs/lvm2 ) + memcached? ( net-misc/memcached ) + app-emulation/qemu + sys-fs/sysfsutils" +# qemu is needed for image conversion + +#PATCHES=( +#) + +pkg_pretend() { + linux-info_pkg_setup + CONFIG_CHECK_MODULES="" + if use tcp; then + CONFIG_CHECK_MODULES+="SCSI_ISCSI_ATTRS ISCSI_TCP " + fi + if use rdma; then + CONFIG_CHECK_MODULES+="INFINIBAND_ISER " + fi + if use infiniband; then + CONFIG_CHECK_MODULES+="INFINIBAND_IPOIB INFINIBAND_USER_MAD INFINIBAND_USER_ACCESS" + fi + if linux_config_exists; then + for module in ${CONFIG_CHECK_MODULES}; do + linux_chkconfig_present ${module} || ewarn "${module} needs to be enabled" + done + fi +} + +pkg_setup() { + enewgroup cinder + enewuser cinder -1 -1 /var/lib/cinder cinder +} + +python_prepare_all() { + sed -i '/^hacking/d' test-requirements.txt || die + distutils-r1_python_prepare_all +} + +python_test() { + # Let's track progress of this # https://bugs.launchpad.net/swift/+bug/1249727 + nosetests -I test_wsgi.py cinder/tests/ || die "tests failed under python2.7" +} + +python_install_all() { + distutils-r1_python_install_all + keepdir /etc/cinder + dodir /etc/cinder/rootwrap.d + + for svc in api scheduler volume; do + newinitd "${FILESDIR}/cinder.initd" cinder-${svc} + done + + insinto /etc/cinder + insopts -m0640 -o cinder -g cinder + doins "etc/cinder/api-httpd.conf" + doins "etc/cinder/logging_sample.conf" + doins "etc/cinder/rootwrap.conf" + doins "etc/cinder/api-paste.ini" + newins "${DISTDIR}/ocata-cinder-policy.json" "policy.json" + newins "${DISTDIR}/ocata-cinder.conf.sample" "cinder.conf.sample" + insinto /etc/cinder/rootwrap.d + newins "${DISTDIR}/ocata-cinder-volume.filters" "volume.filters" + + dodir /var/log/cinder + fowners cinder:cinder /var/log/cinder + + #add sudoers definitions for user nova + insinto /etc/sudoers.d/ + insopts -m 0440 -o root -g root + newins "${FILESDIR}/cinder.sudoersd" cinder +} + +pkg_postinst() { + if use iscsi ; then + elog "Cinder needs tgtd to be installed and running to work with iscsi" + elog "it also needs 'include /var/lib/cinder/volumes/*' in /etc/tgt/targets.conf" + fi +} |