commit: 95d65ae3cb74117f390e1e5143231f13cc58f10d Author: Patrick McLean <chutzpah <AT> gentoo <DOT> org> AuthorDate: Thu Mar 24 18:24:41 2016 +0000 Commit: Patrick McLean <chutzpah <AT> gentoo <DOT> org> CommitDate: Thu Mar 24 18:24:41 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=95d65ae3
app-emulation/ganeti: Revision bump, make gnt-noded and gnd-mond run as root Upstream documentation states that these must run as root, but the code has them running as whatever user the other daemons are running as. Package-Manager: portage-2.2.28 .../files/ganeti-2.15-noded-must-run-as-root.patch | 50 ++++ app-emulation/ganeti/ganeti-2.15.2-r1.ebuild | 310 +++++++++++++++++++++ 2 files changed, 360 insertions(+) diff --git a/app-emulation/ganeti/files/ganeti-2.15-noded-must-run-as-root.patch b/app-emulation/ganeti/files/ganeti-2.15-noded-must-run-as-root.patch new file mode 100644 index 0000000..22413e3 --- /dev/null +++ b/app-emulation/ganeti/files/ganeti-2.15-noded-must-run-as-root.patch @@ -0,0 +1,50 @@ +diff --git a/configure.ac b/configure.ac +index 9b5d06f..d099bd2 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -343,8 +343,8 @@ AC_ARG_WITH([user-prefix], + user_wconfd="${withval}masterd"; + user_kvmd="$user_default"; + user_luxid="${withval}masterd"; +- user_noded="$user_default"; +- user_mond="$user_default"], ++ user_noded="root"; ++ user_mond="root"], + [user_masterd="$user_default"; + user_metad="$user_default"; + user_rapi="$user_default"; +@@ -352,8 +352,8 @@ AC_ARG_WITH([user-prefix], + user_wconfd="$user_default"; + user_kvmd="$user_default"; + user_luxid="$user_default"; +- user_noded="$user_default"; +- user_mond="$user_default"]) ++ user_noded="root"; ++ user_mond="root"]) + AC_SUBST(MASTERD_USER, $user_masterd) + AC_SUBST(METAD_USER, $user_metad) + AC_SUBST(RAPI_USER, $user_rapi) +@@ -379,9 +379,9 @@ AC_ARG_WITH([group-prefix], + group_luxid="${withval}luxid"; + group_masterd="${withval}masterd"; + group_metad="$group_default"; +- group_noded="$group_default"; ++ group_noded="root"; + group_daemons="${withval}daemons"; +- group_mond="$group_default"], ++ group_mond="root"], + [group_rapi="$group_default"; + group_admin="$group_default"; + group_confd="$group_default"; +@@ -390,9 +390,9 @@ AC_ARG_WITH([group-prefix], + group_luxid="$group_default"; + group_masterd="$group_default"; + group_metad="$group_default"; +- group_noded="$group_default"; ++ group_noded="root"; + group_daemons="$group_default"; +- group_mond="$group_default"]) ++ group_mond="root"]) + AC_SUBST(RAPI_GROUP, $group_rapi) + AC_SUBST(ADMIN_GROUP, $group_admin) + AC_SUBST(CONFD_GROUP, $group_confd) diff --git a/app-emulation/ganeti/ganeti-2.15.2-r1.ebuild b/app-emulation/ganeti/ganeti-2.15.2-r1.ebuild new file mode 100644 index 0000000..b220af7 --- /dev/null +++ b/app-emulation/ganeti/ganeti-2.15.2-r1.ebuild @@ -0,0 +1,310 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +PYTHON_COMPAT=(python2_7) +PYTHON_REQ_USE="ipv6(+)?" + +inherit eutils user autotools bash-completion-r1 python-single-r1 versionator + +MY_PV="${PV/_rc/~rc}" +MY_PV="${MY_PV/_beta/~beta}" +MY_P="${PN}-${MY_PV}" +SERIES="$(get_version_component_range 1-2)" + +if [[ ${PV} =~ [9]{4,} ]] ; then + EGIT_REPO_URI="git://git.ganeti.org/ganeti.git" + inherit git-2 + KEYWORDS="" + GIT_DEPEND="dev-python/docutils + dev-python/sphinx[${PYTHON_USEDEP}] + media-gfx/graphviz + media-fonts/urw-fonts" +else + SRC_URI="http://downloads.ganeti.org/releases/${SERIES}/${MY_P}.tar.gz" + KEYWORDS="~amd64 ~x86" +fi + +DESCRIPTION="Ganeti is a virtual server management software tool" +HOMEPAGE="http://www.ganeti.org/" + +LICENSE="GPL-2" +SLOT="0" +IUSE="drbd haskell-daemons htools ipv6 kvm lxc monitoring multiple-users rbd syslog test xen" +REQUIRED_USE="|| ( kvm xen lxc ) test? ( ipv6 ) ${PYTHON_REQUIRED_USE}" + +USER_PREFIX="${GANETI_USER_PREFIX:-"gnt-"}" +GROUP_PREFIX="${GANETI_GROUP_PREFIX:-"${USER_PREFIX}"}" + +DOC_DEPEND="dev-python/sphinx[${PYTHON_USEDEP}] + media-fonts/urw-fonts + media-gfx/graphviz" + +DEPEND=" + dev-libs/openssl:0 + dev-python/paramiko[${PYTHON_USEDEP}] + dev-python/pyopenssl[${PYTHON_USEDEP}] + dev-python/simplejson[${PYTHON_USEDEP}] + dev-python/pyparsing[${PYTHON_USEDEP}] + dev-python/pyinotify[${PYTHON_USEDEP}] + dev-python/pycurl[${PYTHON_USEDEP}] + dev-python/ipaddr[${PYTHON_USEDEP}] + dev-python/bitarray[${PYTHON_USEDEP}] + dev-python/docutils[${PYTHON_USEDEP}] + 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 + >=sys-apps/baselayout-2.0 + dev-lang/ghc + dev-haskell/cabal:0= + dev-haskell/cabal-install: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/attoparsec-0.13:0 + >=dev-haskell/base64-bytestring-1.0.0.1:0= + <dev-haskell/base64-bytestring-1.1:0= + >=dev-haskell/crypto-4.2.4:0= + <dev-haskell/crypto-4.3:0= + >=dev-haskell/curl-1.3.7:0= + <dev-haskell/curl-1.4:0= + >=dev-haskell/hinotify-0.3.2:0= + <dev-haskell/hinotify-0.4:0= + >=dev-haskell/hslogger-1.1.4:0= + <dev-haskell/hslogger-1.3:0= + >=dev-haskell/json-0.5:0= + <dev-haskell/json-0.9:0= + >=dev-haskell/lens-3.10:0= + <dev-haskell/lens-4.8:0= + >=dev-haskell/lifted-base-0.2.0.3:0= + <dev-haskell/lifted-base-0.3:0= + >=dev-haskell/monad-control-0.3.1.3:0= + <dev-haskell/monad-control-1.1:0= + >=dev-haskell/network-2.3.0.13:0= + <dev-haskell/network-2.7:0= + >=dev-haskell/parallel-3.2.0.2:3= + <dev-haskell/parallel-3.3:3= + >=dev-haskell/temporary-1.1.2.3:0= + <dev-haskell/temporary-1.3:0= + >=dev-haskell/regex-pcre-0.94.2:0= + <dev-haskell/regex-pcre-0.95:0= + >=dev-haskell/transformers-base-0.4.1:0= + <dev-haskell/transformers-base-0.5:0= + >=dev-haskell/utf8-string-0.3.7:0= + <dev-haskell/utf8-string-0.4:0= + >=dev-haskell/zlib-0.5.3.3:0= + <dev-haskell/zlib-0.6:0= + + >=dev-haskell/psqueue-1.1:0= + <dev-haskell/psqueue-1.2:0= + >=dev-haskell/snap-core-0.8.1:0= + <dev-haskell/snap-core-0.10:0= + >=dev-haskell/snap-server-0.8.1:0= + <dev-haskell/snap-server-0.10:0= + >=dev-haskell/case-insensitive-0.4.0.1 + + dev-haskell/vector:0= + <dev-haskell/semigroupoids-4.1:0= + <dev-haskell/contravariant-0.6 + <dev-haskell/transformers-compat-0.4[three] + xen? ( >=app-emulation/xen-3.0 ) + kvm? ( + dev-python/psutil + app-emulation/qemu + ) + lxc? ( app-emulation/lxc ) + drbd? ( + || ( + <sys-cluster/drbd-8.5 + sys-cluster/drbd-utils + ) + ) + rbd? ( sys-cluster/ceph ) + ipv6? ( net-misc/ndisc6 ) + ${PYTHON_DEPS} + ${GIT_DEPEND}" +RDEPEND="${DEPEND} + !app-emulation/ganeti-htools" +DEPEND+="sys-devel/m4 + app-text/pandoc + >=dev-haskell/test-framework-0.6:0= + <dev-haskell/test-framework-0.9:0= + >=dev-haskell/test-framework-hunit-0.2.7:0= + <dev-haskell/test-framework-hunit-0.4:0= + >=dev-haskell/test-framework-quickcheck2-0.2.12.1:0= + <dev-haskell/test-framework-quickcheck2-0.4:0= + test? ( + dev-python/mock + dev-python/pyyaml + dev-haskell/haddock:0= + >=dev-haskell/hunit-1.2.4.2:0= + <dev-haskell/hunit-1.3:0= + >=dev-haskell/quickcheck-2.4.2:2= + <dev-haskell/quickcheck-2.8:2= + sys-apps/fakeroot + net-misc/socat + dev-util/shelltestrunner + ${DOC_DEPEND} + )" + +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" +) + +REQUIRED_USE="kvm? ( || ( amd64 x86 ) )" + +S="${WORKDIR}/${MY_P}" + +QA_WX_LOAD=" + usr/lib*/${PN}/${SERIES}/usr/sbin/ganeti-*d + usr/lib*/${PN}/${SERIES}/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 + epatch "${PATCHES[@]}" + + # 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' + + [[ ${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 \ + --docdir=/usr/share/doc/${P} \ + --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 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" '' '' '') +} + +src_install () { + emake V=1 DESTDIR="${D}" install || die "emake install failed" + + newinitd "${FILESDIR}"/ganeti.initd-r3 ${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} + + dodoc INSTALL UPGRADE NEWS README doc/*.rst + dohtml -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 || die "emake check failed" +}