From deba8115d2c2af26df42966b91ef04ff4dd79cde Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 14 May 2020 11:09:11 +0100 Subject: gentoo resync : 14.05.2020 --- app-emulation/ganeti/Manifest | 5 +- .../files/ganeti-2.15.2-check-man-warnings.patch | 13 + .../files/ganeti-2.15.2-ftbfs-sphinx-warning.patch | 41 +++ .../ganeti/files/ganeti-2.15.2-pyopenssl.patch | 33 ++ app-emulation/ganeti/ganeti-2.15.2-r10.ebuild | 386 +++++++++++++++++++++ app-emulation/ganeti/ganeti-2.15.2-r9.ebuild | 383 -------------------- 6 files changed, 477 insertions(+), 384 deletions(-) create mode 100644 app-emulation/ganeti/files/ganeti-2.15.2-check-man-warnings.patch create mode 100644 app-emulation/ganeti/files/ganeti-2.15.2-ftbfs-sphinx-warning.patch create mode 100644 app-emulation/ganeti/files/ganeti-2.15.2-pyopenssl.patch create mode 100644 app-emulation/ganeti/ganeti-2.15.2-r10.ebuild delete mode 100644 app-emulation/ganeti/ganeti-2.15.2-r9.ebuild (limited to 'app-emulation/ganeti') diff --git a/app-emulation/ganeti/Manifest b/app-emulation/ganeti/Manifest index 368bb2d1db43..fa168ffe880d 100644 --- a/app-emulation/ganeti/Manifest +++ b/app-emulation/ganeti/Manifest @@ -18,6 +18,9 @@ AUX ganeti-2.15-python-mock.patch 869 BLAKE2B 0be8ccb3c193cb363a71175022f2c31554 AUX ganeti-2.15-respect-HFLAGS.patch 332 BLAKE2B 360b7473870d9e803aa958f58ddad8e5de1e5c33f6d669014ebd71fc9e3b96608987ea3e7357e26782a3b9fcd62fb7b84b9024e8c68c1db0067fc92c8dc45c6a SHA512 f9d223a072ca7c842ca688b9d7ab6ab2d514647c9346d01fed4f8c5e1111e1531a0a16cfa2f6b1600a8e72cba06abc7d81f0789f1c68c48991c260b8d6a88f94 AUX ganeti-2.15-use-balloon-device.patch 711 BLAKE2B 23eb3434a0a24905fb3fdc49e129bdb6d044f2ee0b72bc9ec1994e355fa4df662b04194c20829f9afbdd93635bfd34c8c0a3a6bd32d64052a875dfd38bfb48f6 SHA512 e3f90d71dc595de554ead6ec21a79404b6a1098f3157fb3c6bcb95e8f27044c78451531e5e38ffc04b19e26ccd89ff14672d35b6a5e61c180e43fe95425d0794 AUX ganeti-2.15.2-bdev_py.patch 601 BLAKE2B 95ee87cf14344a5fdb224e8972ac64431beed8b7d90d08e615d4012d11d23c6df55a8c6bde1d217e86b926bd5d2a939ccabb81a0ed9080b8e9e2b110d4b783fa SHA512 b8c4ab1d67c8b1a0ef4b9581776b5f70178f501d476c3b1a3891a7d4633fd0146b2ac3f95e2a19584e7cc3422c67ef1169a65a57498ccd5d5c18b5196060201f +AUX ganeti-2.15.2-check-man-warnings.patch 612 BLAKE2B c2044184c048466bd8a1b7a92ccfb940728f7cbe26a218b386681b6711cf07c60df7f3bd610184dedebfca63050287aeab7acf2e3630bfff990d2bfc5692a596 SHA512 9f43e20f2fd14a066920cba8f99392710b0eb074cec60c5d940fb30256b772f2ca21d301cec2d6feaacebfe71e16b4df4f8c959c520cdd9d16e9dc6020dbe31c +AUX ganeti-2.15.2-ftbfs-sphinx-warning.patch 2029 BLAKE2B 129bd181ae44599ac362efc79caf0617b2037995d063236eed88e0f0925ae2362205652d41fb12d6a774069e5cd2c0bb292c58bf69f8a546d57d61daed3f0e95 SHA512 510c60e8bbc3f4e27bf17c109611d32a0c3baf21e7c167dd228e7a185524d7955b534687207e74b7c3785af314e6382dd8718f8bab2be58ac2a343e82cb15c52 +AUX ganeti-2.15.2-pyopenssl.patch 948 BLAKE2B 72a7df325e5bdc1b1de56c7bacb0b0443c2e13552616d72b47a9ce1d6559a04c4ff65dee966a5424b6584fd99670061cab291b07f111aac2615138ed4166e4a7 SHA512 d7a843f12a723750228ac5b06331277a2bf263e461f5b74c0c37e7e91ac4021b036ad61aa19e3896310020db848bbffea234d6752f16afaa2a56bcecc18d642d AUX ganeti-2.15.2-remove-sandbox-failing-tests.patch 2641 BLAKE2B ecf41445e52160a754fb9a433fad59141ae0058ed5a86d9cd0981b7ee952015528b85467b77226d70f4cd1847dbc813efbd8198e6424b1405835ea256e983448 SHA512 51e8f10a8a20100dbe290023d3cfd9d585052f441d79daeb18188940977f19401ffe46924df88118b662a26b2423ca119968e8de9c8664cde531b9d7ea23af93 AUX ganeti-2.16-kvmd-run-as-daemon-user.patch 1257 BLAKE2B 43766f2cf5fd18ca23ed4072258a3973c343dd92fbfcba51e62b3a7533b720092042a8bbc2f371cfab515085c54d349eecbd13f044cd18e3ee99c3869e848333 SHA512 c913ea0ba2af8d73342f105990234b4cfe4060a41cee1530d3dfe828a3e048d5c7cb473de22094330ab3efe9d2ade64bc15d98585a56d1d0f10e0b13b95485a5 AUX ganeti-2.16-noded-must-run-as-root.patch 917 BLAKE2B 102d39e0483e71caef350ea2d56d709a23ac3092dba6e0dfc8972abb0b08080e7ffcb2001f42cd6e9c5277b8f225ab9e7c87b800f85e8eeee3a5159efc110d74 SHA512 69c51f88d3f5628fa17852425d8dc18e98a1a1d6b51ef7219c88efa29b01909bffec2df43dc40801bf7332d3252834b3034a8db56a2d9f283b62e2295c156746 @@ -35,7 +38,7 @@ DIST ganeti-2.15_2.15.2-11.debian.tar.xz 67652 BLAKE2B d10f83a59a1c2d05fa6704dfd DIST ganeti-2.16.0~rc1.tar.gz 4794934 BLAKE2B 867d7d48e98d4490db8279b83b44006e0afc1a421592d523db2d04b4b04636090686773ef890c89df41f0311cbf3c4d5a2c314c39c4429f50b07a7a6d1a9616f SHA512 a4bed40e48ecd8ee1f3f8137faf28aea38ffb8955f48bbd233be17660035679fa27d0ef6f8fe20507d34ca9e1dd594e564c9c53412364b6cc05dc8ed2f5602be DIST ganeti-2.17.0~beta1.tar.gz 4880091 BLAKE2B bd094ac421b8b49abcd7643641aa4c2d62aa2f8a4ab55289711cef8c47cc32634bf06b99adbf9383de3945766112a1838d2191dfb51013dc4fba81676e264e64 SHA512 d836444ea5696c9689ee0fae56192720ef79b2a4a8962c031abacc7ef02ebbb9e9cdadd15aa5d315c2d3da6cbe5043b6c22b9ed94fd13883b5dfa23e08a2867e DIST ganeti_2.16.0~rc1-1.debian.tar.xz 41892 BLAKE2B 3220b9a071259cee3a86771b6f4d312c23392f428e1e0452f17f48140b6df5193447dd0fa1b5185d6866cfe48c8eb3dd6d22f01f930499471eab7044ca9b7268 SHA512 4501bc058b65adee6285c3d0dcf76ee8bfc4759af6bb11b0414503c6990c7d09942f3cc8e08d270e76bcf13211cc113f44304393dadd2bb8588d9b15230538af -EBUILD ganeti-2.15.2-r9.ebuild 12220 BLAKE2B 9afceba7d515ed36d740f255aefa6424a8666e9bf61b608d3e0c79848500a95d1d098c78e8a9c12a6a260720a9ff039c86cfc9bcc0b17901d80280f8a9eb6678 SHA512 39c34793b7e13b67821ce9c7eaf50e35decf395898dc93318bd97e326ddd40f1d717ff7ffab3ad22d99c1481c208a44fe24dc7a74cfeed6733bb2a8ae8e24967 +EBUILD ganeti-2.15.2-r10.ebuild 12375 BLAKE2B a08ec6e74df047d59339b56920ca84ac6bc018d20420482a11fad142d4b7383798a78bd07aceae4a5793d49cab01c7fced528323e48ca87fb71002d3ca09e19e SHA512 5e24ab704ce3a12e9d4d7ade712251d843c79b2bd8a8ebb7dc9788d885745cb034195caec920698e62d17995dda6670114d059bb5d3cd80c21f1a5e008e9490a EBUILD ganeti-2.16.0_rc1.ebuild 10619 BLAKE2B 6f3a4aca5ac36c41671ce34a489e79fd6382055683722e34aee736c2baf9fa3ec4cb60e90eab9c2d9a7fed57391c84a793bfdd855a664238876a58931166e141 SHA512 a11bf679646bcd6081efb028fc1333e3e98c6551cefeff4d9336f585990050533ef57ba2ca5cb7ef3aa0f966afa0c9e532b999c169df30b453cedb03bd638801 EBUILD ganeti-2.17.0_beta1.ebuild 10646 BLAKE2B 75c7e1d72d0a778dbaa0c5703c7a41ea7df3f3b1b20f4744d62e130be022d030953c1b3636f3f8d9e58a71d4c6ac4863f2cc4ed493db0e66eab95b5cb529e5a0 SHA512 77da930bdf819620f06c3e722b02a0afa4bfb4beed918a88f9f330d11605c9b8fdbb413f8af9f791a6c7e1c1071720f89966d52b958fe790209efe4582cf773f MISC metadata.xml 1961 BLAKE2B 1c7cc03a3dd655f75b8f9249c3b0b70a738af06a9a0529afb7c73abf6344b112e5daf610f6f6780acf0c3b14e916590c20c6f8837bb333e7da0cad6df7ba8520 SHA512 547dcaaf4392b13c5629e5555d17ba2d4e504b6ce0e043fdf440fce3d857477009aeab0af52cb92cc494ecb3e6e1a7e026fabbe6e24b9323fe47c2fc15175896 diff --git a/app-emulation/ganeti/files/ganeti-2.15.2-check-man-warnings.patch b/app-emulation/ganeti/files/ganeti-2.15.2-check-man-warnings.patch new file mode 100644 index 000000000000..913033dde4b4 --- /dev/null +++ b/app-emulation/ganeti/files/ganeti-2.15.2-check-man-warnings.patch @@ -0,0 +1,13 @@ +# https://bugs.gentoo.org/719846 +# Redirecting both stdout and stderr to /dev/null leaves nothing for grep to search +# Given that there aren't any warnings in the manpages, no need to filter, either +--- a/autotools/check-man-warnings 2020-04-30 23:10:08.140721582 +0000 ++++ b/autotools/check-man-warnings 2020-04-30 23:21:06.708945592 +0000 +@@ -37,6 +37,4 @@ + fi + + LANG="$loc" LC_ALL="$loc" MANWIDTH=80 \ +- man --warnings --encoding=utf8 --local-file "$1" 2>&1 >/dev/null | \ +- grep -v -e "cannot adjust line" -e "can't break line" | \ +- grep . ++ man --warnings --encoding=utf8 --local-file "$1" >/dev/null diff --git a/app-emulation/ganeti/files/ganeti-2.15.2-ftbfs-sphinx-warning.patch b/app-emulation/ganeti/files/ganeti-2.15.2-ftbfs-sphinx-warning.patch new file mode 100644 index 000000000000..3da34eed165f --- /dev/null +++ b/app-emulation/ganeti/files/ganeti-2.15.2-ftbfs-sphinx-warning.patch @@ -0,0 +1,41 @@ +# https://bugs.gentoo.org/719846 +# Probably related to https://github.com/sphinx-doc/sphinx/issues/4225 +# +# Warning, treated as error: +# /var/tmp/portage/app-emulation/ganeti-2.15.2-r9/temp/gntbuild.tiR1shJ6/doc/design-impexp2.rst:512:Could not lex literal_block as "python". Highlighting skipped. + +--- a/doc/design-impexp2.rst 2020-04-30 23:40:50.121698365 +0000 ++++ b/doc/design-impexp2.rst 2020-04-30 23:41:05.692129339 +0000 +@@ -507,32 +507,6 @@ + respective system (measured for the CGI/FastCGI program using ``time + -v``). + +-:: +- +- ---------------------------------------------------------------------- +- Block size 4 KB 64 KB 128 KB 1 MB 4 MB +- ====================================================================== +- Plain CGI script reading 83 174 180 122 120 +- from ``/dev/zero`` +- 0.6/3.9 0.1/2.4 0.1/2.2 0.0/1.9 0.0/2.1 +- ---------------------------------------------------------------------- +- FastCGI with ``fcgiwrap``, 86 167 170 177 174 +- ``dd`` reading from +- ``/dev/zero`` 1.1/5 0.5/2.9 0.5/2.7 0.7/3.1 0.7/2.8 +- ---------------------------------------------------------------------- +- FastCGI with ``fcgiwrap``, 68 146 150 170 170 +- Python script copying from +- ``/dev/zero`` to stdout +- 1.3/5.1 0.8/3.7 0.7/3.3 0.9/2.9 0.8/3 +- ---------------------------------------------------------------------- +- FastCGI, Python script using 31 48 47 5 1 +- ``flup`` library (version +- 1.0.2) reading from +- ``/dev/zero`` +- 23.5/9.8 14.3/8.5 16.1/8 - - +- ---------------------------------------------------------------------- +- +- + It should be mentioned that the ``flup`` library is not implemented in + the most efficient way, but even with some changes it doesn't get much + faster. It is fine for small amounts of data, but not for huge diff --git a/app-emulation/ganeti/files/ganeti-2.15.2-pyopenssl.patch b/app-emulation/ganeti/files/ganeti-2.15.2-pyopenssl.patch new file mode 100644 index 000000000000..882c4f19acbe --- /dev/null +++ b/app-emulation/ganeti/files/ganeti-2.15.2-pyopenssl.patch @@ -0,0 +1,33 @@ +--- a/lib/http/__init__.py ++++ b/lib/http/__init__.py +@@ -88,6 +88,12 @@ + # send/receive quantum + SOCK_BUF_SIZE = 32768 + ++# OpenSSL.SSL.ConnectionType was deprecated in pyopenssl-19.1.0: ++try: ++ ssl_conn_type = OpenSSL.SSL.Connection ++except AttributeError: ++ ssl_conn_type = OpenSSL.SSL.ConnectionType ++ + + class HttpError(Exception): + """Internal exception for HTTP errors. +@@ -377,7 +383,7 @@ + + # Handshake is only supported by SSL sockets + if (op == SOCKOP_HANDSHAKE and +- not isinstance(sock, OpenSSL.SSL.ConnectionType)): ++ not isinstance(sock, ssl_conn_type)): + return + + # No override by default +@@ -414,7 +420,7 @@ + return sock.recv(arg1) + + elif op == SOCKOP_SHUTDOWN: +- if isinstance(sock, OpenSSL.SSL.ConnectionType): ++ if isinstance(sock, ssl_conn_type): + # PyOpenSSL's shutdown() doesn't take arguments + return sock.shutdown() + else: diff --git a/app-emulation/ganeti/ganeti-2.15.2-r10.ebuild b/app-emulation/ganeti/ganeti-2.15.2-r10.ebuild new file mode 100644 index 000000000000..4427da82567e --- /dev/null +++ b/app-emulation/ganeti/ganeti-2.15.2-r10.ebuild @@ -0,0 +1,386 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +PYTHON_COMPAT=(python2_7) +PYTHON_REQ_USE="ipv6(+)?" + +inherit user autotools bash-completion-r1 python-single-r1 + +MY_PV="${PV/_rc/~rc}" +MY_PV="${MY_PV/_beta/~beta}" +MY_P="${PN}-${MY_PV}" +SERIES="$(ver_cut 1-2)" + +DEBIAN_PATCH=11 +SRC_URI=" + http://downloads.ganeti.org/releases/${SERIES}/${MY_P}.tar.gz + mirror://debian/pool/main/g/ganeti-${SERIES}/ganeti-${SERIES}_${PV}-${DEBIAN_PATCH}.debian.tar.xz +" +KEYWORDS="~amd64 ~x86" +PATCHES=( + "${FILESDIR}"/ganeti-2.15-use-balloon-device.patch + "${WORKDIR}"/debian/patches/do-not-backup-export-dir.patch + "${WORKDIR}"/debian/patches/Makefile.am-use-C.UTF-8 + "${WORKDIR}"/debian/patches/relax-deps + "${WORKDIR}"/debian/patches/zlib-0.6-compatibility + "${WORKDIR}"/debian/patches/fix_FTBFS_with_sphinx-1.3.5 + "${WORKDIR}"/debian/patches/fix_ftbfs_with_sphinx_1.4 + "${WORKDIR}"/debian/patches/use-proper-cabal-dev.patch + "${WORKDIR}"/debian/patches/0001-Drop-dependency-on-MonadCatchIO-transformers.patch + "${WORKDIR}"/debian/patches/0001-GHC-8-support.patch + "${WORKDIR}"/debian/patches/ghc8-fixes + "${WORKDIR}"/debian/patches/snap-server-1.0-compat + "${WORKDIR}"/debian/patches/non-DSA-SSH-key-support.patch + "${WORKDIR}"/debian/patches/fix-ssh-key-renewal-on-single-node-clusters.patch + "${WORKDIR}"/debian/patches/set-defaults-for-ssh-type-bits.patch + "${WORKDIR}"/debian/patches/use-hv-class-to-check-for-migration.patch + "${WORKDIR}"/debian/patches/do-not-specify-socat-ssl-method.patch + "${WORKDIR}"/debian/patches/fix-ftbfs-with-sphinx-1.5.patch + "${WORKDIR}"/debian/patches/fix-failover-from-dead-node.patch + "${WORKDIR}"/debian/patches/fix-cpu-affinity.patch + "${WORKDIR}"/debian/patches/fix-fcntl-i386.patch + "${WORKDIR}"/debian/patches/fix-ovf-test-path.patch + "${WORKDIR}"/debian/patches/fix-qa-ssconf-race.patch + "${WORKDIR}"/debian/patches/relax-sphinx-version-check.patch + #"${WORKDIR}"/debian/patches/THH-2.12.patch + "${WORKDIR}"/debian/patches/sphinx-1.7.patch + "${WORKDIR}"/debian/patches/ca-use-sha256-md.patch + "${WORKDIR}"/debian/patches/impexpd-fix-certificate-verification-with-new-socat.patch + "${WORKDIR}"/debian/patches/impexpd-fix-certificate-verification-with-new-socat-2.patch +) + +DESCRIPTION="Ganeti is a virtual server management software tool" +HOMEPAGE="http://www.ganeti.org/" + +LICENSE="GPL-2" +SLOT="0" +IUSE="drbd experimental haskell-daemons htools ipv6 kvm lxc monitoring multiple-users rbd syslog test xen restricted-commands" +RESTRICT="!test? ( test )" + +REQUIRED_USE="|| ( kvm xen lxc ) + test? ( ipv6 ) + kvm? ( || ( amd64 x86 ) ) + ${PYTHON_REQUIRED_USE}" + +USER_PREFIX="${GANETI_USER_PREFIX:-"gnt-"}" +GROUP_PREFIX="${GANETI_GROUP_PREFIX:-"${USER_PREFIX}"}" + +DEPEND=" + dev-libs/openssl:0 + $(python_gen_cond_dep ' + dev-python/paramiko[${PYTHON_MULTI_USEDEP}] + dev-python/pyopenssl[${PYTHON_MULTI_USEDEP}] + dev-python/simplejson[${PYTHON_MULTI_USEDEP}] + dev-python/pyparsing[${PYTHON_MULTI_USEDEP}] + dev-python/pyinotify[${PYTHON_MULTI_USEDEP}] + dev-python/pycurl[${PYTHON_MULTI_USEDEP}] + dev-python/ipaddr[${PYTHON_MULTI_USEDEP}] + dev-python/bitarray[${PYTHON_MULTI_USEDEP}] + dev-python/docutils[${PYTHON_MULTI_USEDEP}] + dev-python/fdsend[${PYTHON_MULTI_USEDEP}] + ') + || ( + net-misc/iputils[arping] + net-analyzer/arping + ) + net-analyzer/fping + net-misc/bridge-utils + net-misc/curl[ssl] + net-misc/openssh + net-misc/socat + sys-apps/iproute2 + >=sys-fs/lvm2-2.02.181 + >=sys-apps/baselayout-2.0 + >=dev-lang/ghc-8.0:0= + =dev-haskell/mtl-2.1.1:0= + >=dev-haskell/old-time-1.1.0.0:0= + >=dev-haskell/random-1.0.1.1:0= + haskell-daemons? ( >=dev-haskell/text-0.11.1.13:0= ) + >=dev-haskell/transformers-0.3.0.0:0= + + >=dev-haskell/attoparsec-0.10.1.1:0= + =dev-haskell/base64-bytestring-1.0.0.1:0= + =dev-haskell/crypto-4.2.4:0= + =dev-haskell/curl-1.3.7:0= + =dev-haskell/hinotify-0.3.2:0= + =dev-haskell/hslogger-1.1.4:0= + =dev-haskell/json-0.5:0= + >=dev-haskell/lens-3.10:0= + >=dev-haskell/lifted-base-0.2.0.3:0= + =dev-haskell/monad-control-1.0.1.0:0= + =dev-haskell/network-2.3.0.13:0= + =dev-haskell/parallel-3.2.0.2:3= + =dev-haskell/temporary-1.1.2.3:0= + =dev-haskell/regex-pcre-0.94.2:0= + =dev-haskell/transformers-base-0.4:0= + =dev-haskell/utf8-string-0.3.7:0= + >=dev-haskell/zlib-0.5.3.3:0= + =dev-haskell/psqueue-1.1:0= + =dev-haskell/snap-core-1.0.1:0= + =dev-haskell/snap-server-1.0.1:0= + =dev-haskell/case-insensitive-0.4.0.1 + + dev-haskell/vector:0= + xen? ( >=app-emulation/xen-3.0 ) + kvm? ( + dev-python/psutil + app-emulation/qemu + ) + lxc? ( app-emulation/lxc ) + drbd? ( sys-cluster/drbd-utils ) + rbd? ( sys-cluster/ceph ) + ipv6? ( net-misc/ndisc6 ) + ${PYTHON_DEPS}" +RDEPEND="${DEPEND} + !app-emulation/ganeti-htools" +DEPEND+=" + sys-devel/m4 + app-text/pandoc + $(python_gen_cond_dep ' + dev-python/sphinx[${PYTHON_MULTI_USEDEP}] + ') + media-fonts/urw-fonts + media-gfx/graphviz + >=dev-haskell/test-framework-0.6:0= + =dev-haskell/test-framework-hunit-0.2.7:0= + =dev-haskell/test-framework-quickcheck2-0.2.12.1:0= + =dev-haskell/hunit-1.2.4.2:0= + =dev-haskell/quickcheck-2.4.2:2= + =net-misc/socat-1.7 + dev-util/shelltestrunner + )" + +PATCHES+=( + "${FILESDIR}/${PN}-2.12-start-stop-daemon-args.patch" + "${FILESDIR}/${PN}-2.11-add-pgrep.patch" + "${FILESDIR}/${PN}-2.15-daemon-util.patch" + "${FILESDIR}/${PN}-2.9-disable-root-tests.patch" + "${FILESDIR}/${PN}-2.9-skip-cli-test.patch" + "${FILESDIR}/${PN}-2.10-rundir.patch" + "${FILESDIR}/${PN}-2.12-qemu-enable-kvm.patch" + "${FILESDIR}/${PN}-2.11-tests.patch" + "${FILESDIR}/${PN}-lockdir.patch" + "${FILESDIR}/${PN}-2.11-dont-nest-libdir.patch" + "${FILESDIR}/${PN}-2.11-dont-print-man-help.patch" + "${FILESDIR}/${PN}-2.11-daemon-util-tests.patch" + "${FILESDIR}/${PN}-2.13-process_unittest.patch" + "${FILESDIR}/${PN}-2.15-python-mock.patch" + "${FILESDIR}/${PN}-2.15.2-remove-sandbox-failing-tests.patch" + "${FILESDIR}/${PN}-2.15-noded-must-run-as-root.patch" + "${FILESDIR}/${PN}-2.15-kvmd-run-as-daemon-user.patch" + "${FILESDIR}/${PN}-2.15-dont-invert-return-values-for-man-warnings.patch" + "${FILESDIR}/${PN}-2.15-respect-HFLAGS.patch" + "${FILESDIR}/ganeti-2.15.2-bdev_py.patch" + "${FILESDIR}/ganeti-2.15.2-check-man-warnings.patch" + "${FILESDIR}/ganeti-2.15.2-ftbfs-sphinx-warning.patch" + "${FILESDIR}/ganeti-2.15.2-pyopenssl.patch" +) + +S="${WORKDIR}/${MY_P}" + +QA_WX_LOAD=" + usr/lib*/${PN}/${SERIES}/usr/sbin/ganeti-*d + usr/lib*/${PN}/${SERIES}/usr/bin/htools +" +# haskell... +QA_FLAGS_IGNORED=" + /usr/lib64/ganeti/2.15/usr/sbin/ganeti-metad + /usr/lib64/ganeti/2.15/usr/sbin/ganeti-wconfd + /usr/lib64/ganeti/2.15/usr/sbin/ganeti-confd + /usr/lib64/ganeti/2.15/usr/sbin/ganeti-luxid + /usr/lib64/ganeti/2.15/usr/sbin/ganeti-kvmd + /usr/lib64/ganeti/2.15/usr/bin/htools +" + +pkg_setup() { + local user + python-single-r1_pkg_setup + + if use multiple-users; then + for user in gnt-{masterd,confd,luxid,rapi,daemons,admin}; do + enewgroup ${user} + enewuser ${user} -1 -1 -1 ${user} + done + fi +} + +src_prepare() { + local testfile + if has_version '>=dev-lang/ghc-7.10'; then + # Breaks the build on 7.8 + PATCHES+=( + "${WORKDIR}"/debian/patches/ghc-7.10-compatibility.patch + ) + fi + if use experimental; then + ewarn "Experimental patches have been applied! RPC between daemons with different patches applied may cause breakage!" + PATCHES+=( + # QEMU Agent accepted upstream for 2.16, not yet in a tagged release + # backport available for 2.15, but refused upstream due to RPC breakage. + "${FILESDIR}"/0001-kvm-use_guest_agent-QEMU-Guest-Agent-sup.stable-2.15.patch + ) + fi + eapply "${PATCHES[@]}" + # Upstream commits: + # 4c3c2ca2a97a69c0287a3d23e064bc17978105eb + # 24618882737fd7c189adf99f4acc767d48f572c3 + sed -i \ + -e '/QuickCheck/s,< 2.8,< 2.8.3,g' \ + cabal/ganeti.template.cabal + # Neuter -Werror + sed -i \ + -e '/^if DEVELOPER_MODE/,/^endif/s/-Werror//' \ + Makefile.am + + # not sure why these tests are failing + # should remove this on next version bump if possible + for testfile in test/py/import-export_unittest.bash; do + printf '#!/bin/bash\ntrue\n' > "${testfile}" + done + + # take the sledgehammer approach to bug #526270 + grep -lr '/bin/sh' "${S}" | xargs -r -- sed -i 's:/bin/sh:/bin/bash:g' + + sed "s:%LIBDIR%:$(get_libdir):g" "${FILESDIR}/ganeti.initd-r4" \ + > "${T}/ganeti.initd" + + eapply_user + + [[ ${PV} =~ [9]{4,} ]] && ./autogen.sh + rm autotools/missing + eautoreconf +} + +src_configure() { + # this is kind of a hack to work around the removal of the qemu-kvm wrapper + local kvm_arch + + if use amd64; then + kvm_arch=x86_64 + elif use x86; then + kvm_arch=i386 + elif use kvm; then + die "Could not determine qemu system to use for kvm" + fi + + econf --localstatedir=/var \ + --sharedstatedir=/var \ + --disable-symlinks \ + --with-ssh-initscript=/etc/init.d/sshd \ + --with-export-dir=/var/lib/ganeti-storage/export \ + --with-os-search-path=/usr/share/${PN}/os \ + $(use_enable restricted-commands) \ + $(use_enable test haskell-tests) \ + $(usex multiple-users "--with-default-user=" "" "gnt-daemons" "") \ + $(usex multiple-users "--with-user-prefix=" "" "${USER_PREFIX}" "") \ + $(usex multiple-users "--with-default-group=" "" "gnt-daemons" "") \ + $(usex multiple-users "--with-group-prefix=" "" "${GROUP_PREFIX}" "") \ + $(use_enable syslog) \ + $(use_enable monitoring) \ + $(usex kvm '--with-kvm-path=' '' "/usr/bin/qemu-system-${kvm_arch}" '') \ + $(usex haskell-daemons "--enable-confd=haskell" '' '' '') \ + --with-haskell-flags="-optl -Wl,-z,relro -optl -Wl,--as-needed" \ + --enable-socat-escape \ + --enable-socat-compress +} + +src_install() { + emake V=1 DESTDIR="${D}" install + + newinitd "${T}"/ganeti.initd ${PN} + newconfd "${FILESDIR}"/ganeti.confd-r2 ${PN} + + if use kvm; then + newinitd "${FILESDIR}"/ganeti-kvm-poweroff.initd ganeti-kvm-poweroff + newconfd "${FILESDIR}"/ganeti-kvm-poweroff.confd ganeti-kvm-poweroff + fi + + # ganeti installs it's own docs in a generic location + rm -rf "${D}"/{usr/share/doc/${PN},run} + + sed -i "s:/usr/$(get_libdir)/${PN}/tools/burnin:burnin:" doc/examples/bash_completion + newbashcomp doc/examples/bash_completion gnt-instance + bashcomp_alias gnt-instance burnin ganeti-{cleaner,confd} \ + h{space,check,scan,info,ail,arep,roller,squeeze,bal} \ + gnt-{os,job,filter,debug,storage,group,node,network,backup,cluster} + + use monitoring && bashcomp_alias gnt-instance mon-collector + + dodoc INSTALL UPGRADE NEWS README doc/*.rst + + docinto html + dodoc -r doc/html/* doc/css/*.css + + docinto examples + dodoc doc/examples/{ganeti.cron,gnt-config-backup} doc/examples/*.ocf + + docinto examples/hooks + dodoc doc/examples/hooks/{ipsec,ethers} + + insinto /etc/cron.d + newins doc/examples/ganeti.cron ${PN} + + insinto /etc/logrotate.d + newins doc/examples/ganeti.logrotate ${PN} + + # need to dodir rather than keepdir here (bug #552482) + dodir /var/lib/${PN} + + keepdir /var/log/${PN}/ + keepdir /usr/share/${PN}/${SERIES}/os/ + keepdir /var/lib/ganeti-storage/{export,file,shared}/ + + dosym ${SERIES} "/usr/share/${PN}/default" + dosym ${SERIES} "/usr/$(get_libdir)/${PN}/default" + + python_fix_shebang "${ED}" "${D}"/usr/"$(get_libdir)"/${PN}/${SERIES} +} + +pkg_postinst() { + if use multiple-users; then + elog "You have enable multiple user support, the users for this must" + elog "be created. You can use the provided tool for this, which is" + elog "located at:" + elog " /usr/$(get_libdir)/${PN}/tools/users-setup" + fi +} + +src_test() { + PATH="${S}/scripts:${S}/src:${PATH}" \ + TMPDIR="/tmp" \ + GANETI_MASTER="$(hostname -f)" \ + emake check +} diff --git a/app-emulation/ganeti/ganeti-2.15.2-r9.ebuild b/app-emulation/ganeti/ganeti-2.15.2-r9.ebuild deleted file mode 100644 index 385e68848589..000000000000 --- a/app-emulation/ganeti/ganeti-2.15.2-r9.ebuild +++ /dev/null @@ -1,383 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=(python2_7) -PYTHON_REQ_USE="ipv6(+)?" - -inherit user autotools bash-completion-r1 python-single-r1 - -MY_PV="${PV/_rc/~rc}" -MY_PV="${MY_PV/_beta/~beta}" -MY_P="${PN}-${MY_PV}" -SERIES="$(ver_cut 1-2)" - -DEBIAN_PATCH=11 -SRC_URI=" - http://downloads.ganeti.org/releases/${SERIES}/${MY_P}.tar.gz - mirror://debian/pool/main/g/ganeti-${SERIES}/ganeti-${SERIES}_${PV}-${DEBIAN_PATCH}.debian.tar.xz -" -KEYWORDS="~amd64 ~x86" -PATCHES=( - "${FILESDIR}"/ganeti-2.15-use-balloon-device.patch - "${WORKDIR}"/debian/patches/do-not-backup-export-dir.patch - "${WORKDIR}"/debian/patches/Makefile.am-use-C.UTF-8 - "${WORKDIR}"/debian/patches/relax-deps - "${WORKDIR}"/debian/patches/zlib-0.6-compatibility - "${WORKDIR}"/debian/patches/fix_FTBFS_with_sphinx-1.3.5 - "${WORKDIR}"/debian/patches/fix_ftbfs_with_sphinx_1.4 - "${WORKDIR}"/debian/patches/use-proper-cabal-dev.patch - "${WORKDIR}"/debian/patches/0001-Drop-dependency-on-MonadCatchIO-transformers.patch - "${WORKDIR}"/debian/patches/0001-GHC-8-support.patch - "${WORKDIR}"/debian/patches/ghc8-fixes - "${WORKDIR}"/debian/patches/snap-server-1.0-compat - "${WORKDIR}"/debian/patches/non-DSA-SSH-key-support.patch - "${WORKDIR}"/debian/patches/fix-ssh-key-renewal-on-single-node-clusters.patch - "${WORKDIR}"/debian/patches/set-defaults-for-ssh-type-bits.patch - "${WORKDIR}"/debian/patches/use-hv-class-to-check-for-migration.patch - "${WORKDIR}"/debian/patches/do-not-specify-socat-ssl-method.patch - "${WORKDIR}"/debian/patches/fix-ftbfs-with-sphinx-1.5.patch - "${WORKDIR}"/debian/patches/fix-failover-from-dead-node.patch - "${WORKDIR}"/debian/patches/fix-cpu-affinity.patch - "${WORKDIR}"/debian/patches/fix-fcntl-i386.patch - "${WORKDIR}"/debian/patches/fix-ovf-test-path.patch - "${WORKDIR}"/debian/patches/fix-qa-ssconf-race.patch - "${WORKDIR}"/debian/patches/relax-sphinx-version-check.patch - #"${WORKDIR}"/debian/patches/THH-2.12.patch - "${WORKDIR}"/debian/patches/sphinx-1.7.patch - "${WORKDIR}"/debian/patches/ca-use-sha256-md.patch - "${WORKDIR}"/debian/patches/impexpd-fix-certificate-verification-with-new-socat.patch - "${WORKDIR}"/debian/patches/impexpd-fix-certificate-verification-with-new-socat-2.patch -) - -DESCRIPTION="Ganeti is a virtual server management software tool" -HOMEPAGE="http://www.ganeti.org/" - -LICENSE="GPL-2" -SLOT="0" -IUSE="drbd experimental haskell-daemons htools ipv6 kvm lxc monitoring multiple-users rbd syslog test xen restricted-commands" -RESTRICT="!test? ( test )" - -REQUIRED_USE="|| ( kvm xen lxc ) - test? ( ipv6 ) - kvm? ( || ( amd64 x86 ) ) - ${PYTHON_REQUIRED_USE}" - -USER_PREFIX="${GANETI_USER_PREFIX:-"gnt-"}" -GROUP_PREFIX="${GANETI_GROUP_PREFIX:-"${USER_PREFIX}"}" - -DEPEND=" - dev-libs/openssl:0 - $(python_gen_cond_dep ' - dev-python/paramiko[${PYTHON_MULTI_USEDEP}] - dev-python/pyopenssl[${PYTHON_MULTI_USEDEP}] - dev-python/simplejson[${PYTHON_MULTI_USEDEP}] - dev-python/pyparsing[${PYTHON_MULTI_USEDEP}] - dev-python/pyinotify[${PYTHON_MULTI_USEDEP}] - dev-python/pycurl[${PYTHON_MULTI_USEDEP}] - dev-python/ipaddr[${PYTHON_MULTI_USEDEP}] - dev-python/bitarray[${PYTHON_MULTI_USEDEP}] - dev-python/docutils[${PYTHON_MULTI_USEDEP}] - dev-python/fdsend[${PYTHON_MULTI_USEDEP}] - ') - || ( - net-misc/iputils[arping] - net-analyzer/arping - ) - net-analyzer/fping - net-misc/bridge-utils - net-misc/curl[ssl] - net-misc/openssh - net-misc/socat - sys-apps/iproute2 - >=sys-fs/lvm2-2.02.181 - >=sys-apps/baselayout-2.0 - >=dev-lang/ghc-8.0:0= - =dev-haskell/mtl-2.1.1:0= - >=dev-haskell/old-time-1.1.0.0:0= - >=dev-haskell/random-1.0.1.1:0= - haskell-daemons? ( >=dev-haskell/text-0.11.1.13:0= ) - >=dev-haskell/transformers-0.3.0.0:0= - - >=dev-haskell/attoparsec-0.10.1.1:0= - =dev-haskell/base64-bytestring-1.0.0.1:0= - =dev-haskell/crypto-4.2.4:0= - =dev-haskell/curl-1.3.7:0= - =dev-haskell/hinotify-0.3.2:0= - =dev-haskell/hslogger-1.1.4:0= - =dev-haskell/json-0.5:0= - >=dev-haskell/lens-3.10:0= - >=dev-haskell/lifted-base-0.2.0.3:0= - =dev-haskell/monad-control-1.0.1.0:0= - =dev-haskell/network-2.3.0.13:0= - =dev-haskell/parallel-3.2.0.2:3= - =dev-haskell/temporary-1.1.2.3:0= - =dev-haskell/regex-pcre-0.94.2:0= - =dev-haskell/transformers-base-0.4:0= - =dev-haskell/utf8-string-0.3.7:0= - >=dev-haskell/zlib-0.5.3.3:0= - =dev-haskell/psqueue-1.1:0= - =dev-haskell/snap-core-1.0.1:0= - =dev-haskell/snap-server-1.0.1:0= - =dev-haskell/case-insensitive-0.4.0.1 - - dev-haskell/vector:0= - xen? ( >=app-emulation/xen-3.0 ) - kvm? ( - dev-python/psutil - app-emulation/qemu - ) - lxc? ( app-emulation/lxc ) - drbd? ( sys-cluster/drbd-utils ) - rbd? ( sys-cluster/ceph ) - ipv6? ( net-misc/ndisc6 ) - ${PYTHON_DEPS}" -RDEPEND="${DEPEND} - !app-emulation/ganeti-htools" -DEPEND+=" - sys-devel/m4 - app-text/pandoc - $(python_gen_cond_dep ' - dev-python/sphinx[${PYTHON_MULTI_USEDEP}] - ') - media-fonts/urw-fonts - media-gfx/graphviz - >=dev-haskell/test-framework-0.6:0= - =dev-haskell/test-framework-hunit-0.2.7:0= - =dev-haskell/test-framework-quickcheck2-0.2.12.1:0= - =dev-haskell/hunit-1.2.4.2:0= - =dev-haskell/quickcheck-2.4.2:2= - =net-misc/socat-1.7 - dev-util/shelltestrunner - )" - -PATCHES+=( - "${FILESDIR}/${PN}-2.12-start-stop-daemon-args.patch" - "${FILESDIR}/${PN}-2.11-add-pgrep.patch" - "${FILESDIR}/${PN}-2.15-daemon-util.patch" - "${FILESDIR}/${PN}-2.9-disable-root-tests.patch" - "${FILESDIR}/${PN}-2.9-skip-cli-test.patch" - "${FILESDIR}/${PN}-2.10-rundir.patch" - "${FILESDIR}/${PN}-2.12-qemu-enable-kvm.patch" - "${FILESDIR}/${PN}-2.11-tests.patch" - "${FILESDIR}/${PN}-lockdir.patch" - "${FILESDIR}/${PN}-2.11-dont-nest-libdir.patch" - "${FILESDIR}/${PN}-2.11-dont-print-man-help.patch" - "${FILESDIR}/${PN}-2.11-daemon-util-tests.patch" - "${FILESDIR}/${PN}-2.13-process_unittest.patch" - "${FILESDIR}/${PN}-2.15-python-mock.patch" - "${FILESDIR}/${PN}-2.15.2-remove-sandbox-failing-tests.patch" - "${FILESDIR}/${PN}-2.15-noded-must-run-as-root.patch" - "${FILESDIR}/${PN}-2.15-kvmd-run-as-daemon-user.patch" - "${FILESDIR}/${PN}-2.15-dont-invert-return-values-for-man-warnings.patch" - "${FILESDIR}/${PN}-2.15-respect-HFLAGS.patch" - "${FILESDIR}/ganeti-2.15.2-bdev_py.patch" -) - -S="${WORKDIR}/${MY_P}" - -QA_WX_LOAD=" - usr/lib*/${PN}/${SERIES}/usr/sbin/ganeti-*d - usr/lib*/${PN}/${SERIES}/usr/bin/htools -" -# haskell... -QA_FLAGS_IGNORED=" - /usr/lib64/ganeti/2.15/usr/sbin/ganeti-metad - /usr/lib64/ganeti/2.15/usr/sbin/ganeti-wconfd - /usr/lib64/ganeti/2.15/usr/sbin/ganeti-confd - /usr/lib64/ganeti/2.15/usr/sbin/ganeti-luxid - /usr/lib64/ganeti/2.15/usr/sbin/ganeti-kvmd - /usr/lib64/ganeti/2.15/usr/bin/htools -" - -pkg_setup() { - local user - python-single-r1_pkg_setup - - if use multiple-users; then - for user in gnt-{masterd,confd,luxid,rapi,daemons,admin}; do - enewgroup ${user} - enewuser ${user} -1 -1 -1 ${user} - done - fi -} - -src_prepare() { - local testfile - if has_version '>=dev-lang/ghc-7.10'; then - # Breaks the build on 7.8 - PATCHES+=( - "${WORKDIR}"/debian/patches/ghc-7.10-compatibility.patch - ) - fi - if use experimental; then - ewarn "Experimental patches have been applied! RPC between daemons with different patches applied may cause breakage!" - PATCHES+=( - # QEMU Agent accepted upstream for 2.16, not yet in a tagged release - # backport available for 2.15, but refused upstream due to RPC breakage. - "${FILESDIR}"/0001-kvm-use_guest_agent-QEMU-Guest-Agent-sup.stable-2.15.patch - ) - fi - eapply "${PATCHES[@]}" - # Upstream commits: - # 4c3c2ca2a97a69c0287a3d23e064bc17978105eb - # 24618882737fd7c189adf99f4acc767d48f572c3 - sed -i \ - -e '/QuickCheck/s,< 2.8,< 2.8.3,g' \ - cabal/ganeti.template.cabal - # Neuter -Werror - sed -i \ - -e '/^if DEVELOPER_MODE/,/^endif/s/-Werror//' \ - Makefile.am - - # not sure why these tests are failing - # should remove this on next version bump if possible - for testfile in test/py/import-export_unittest.bash; do - printf '#!/bin/bash\ntrue\n' > "${testfile}" - done - - # take the sledgehammer approach to bug #526270 - grep -lr '/bin/sh' "${S}" | xargs -r -- sed -i 's:/bin/sh:/bin/bash:g' - - sed "s:%LIBDIR%:$(get_libdir):g" "${FILESDIR}/ganeti.initd-r4" \ - > "${T}/ganeti.initd" - - eapply_user - - [[ ${PV} =~ [9]{4,} ]] && ./autogen.sh - rm autotools/missing - eautoreconf -} - -src_configure() { - # this is kind of a hack to work around the removal of the qemu-kvm wrapper - local kvm_arch - - if use amd64; then - kvm_arch=x86_64 - elif use x86; then - kvm_arch=i386 - elif use kvm; then - die "Could not determine qemu system to use for kvm" - fi - - econf --localstatedir=/var \ - --sharedstatedir=/var \ - --disable-symlinks \ - --with-ssh-initscript=/etc/init.d/sshd \ - --with-export-dir=/var/lib/ganeti-storage/export \ - --with-os-search-path=/usr/share/${PN}/os \ - $(use_enable restricted-commands) \ - $(use_enable test haskell-tests) \ - $(usex multiple-users "--with-default-user=" "" "gnt-daemons" "") \ - $(usex multiple-users "--with-user-prefix=" "" "${USER_PREFIX}" "") \ - $(usex multiple-users "--with-default-group=" "" "gnt-daemons" "") \ - $(usex multiple-users "--with-group-prefix=" "" "${GROUP_PREFIX}" "") \ - $(use_enable syslog) \ - $(use_enable monitoring) \ - $(usex kvm '--with-kvm-path=' '' "/usr/bin/qemu-system-${kvm_arch}" '') \ - $(usex haskell-daemons "--enable-confd=haskell" '' '' '') \ - --with-haskell-flags="-optl -Wl,-z,relro -optl -Wl,--as-needed" \ - --enable-socat-escape \ - --enable-socat-compress -} - -src_install() { - emake V=1 DESTDIR="${D}" install - - newinitd "${T}"/ganeti.initd ${PN} - newconfd "${FILESDIR}"/ganeti.confd-r2 ${PN} - - if use kvm; then - newinitd "${FILESDIR}"/ganeti-kvm-poweroff.initd ganeti-kvm-poweroff - newconfd "${FILESDIR}"/ganeti-kvm-poweroff.confd ganeti-kvm-poweroff - fi - - # ganeti installs it's own docs in a generic location - rm -rf "${D}"/{usr/share/doc/${PN},run} - - sed -i "s:/usr/$(get_libdir)/${PN}/tools/burnin:burnin:" doc/examples/bash_completion - newbashcomp doc/examples/bash_completion gnt-instance - bashcomp_alias gnt-instance burnin ganeti-{cleaner,confd} \ - h{space,check,scan,info,ail,arep,roller,squeeze,bal} \ - gnt-{os,job,filter,debug,storage,group,node,network,backup,cluster} - - use monitoring && bashcomp_alias gnt-instance mon-collector - - dodoc INSTALL UPGRADE NEWS README doc/*.rst - - docinto html - dodoc -r doc/html/* doc/css/*.css - - docinto examples - dodoc doc/examples/{ganeti.cron,gnt-config-backup} doc/examples/*.ocf - - docinto examples/hooks - dodoc doc/examples/hooks/{ipsec,ethers} - - insinto /etc/cron.d - newins doc/examples/ganeti.cron ${PN} - - insinto /etc/logrotate.d - newins doc/examples/ganeti.logrotate ${PN} - - # need to dodir rather than keepdir here (bug #552482) - dodir /var/lib/${PN} - - keepdir /var/log/${PN}/ - keepdir /usr/share/${PN}/${SERIES}/os/ - keepdir /var/lib/ganeti-storage/{export,file,shared}/ - - dosym ${SERIES} "/usr/share/${PN}/default" - dosym ${SERIES} "/usr/$(get_libdir)/${PN}/default" - - python_fix_shebang "${ED}" "${D}"/usr/"$(get_libdir)"/${PN}/${SERIES} -} - -pkg_postinst() { - if use multiple-users; then - elog "You have enable multiple user support, the users for this must" - elog "be created. You can use the provided tool for this, which is" - elog "located at:" - elog " /usr/$(get_libdir)/${PN}/tools/users-setup" - fi -} - -src_test() { - PATH="${S}/scripts:${S}/src:${PATH}" \ - TMPDIR="/tmp" \ - GANETI_MASTER="$(hostname -f)" \ - emake check -} -- cgit v1.2.3