From 02930d1eb5af78d32b1597af6af24163895d9e0f Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 11 May 2023 23:47:37 +0100 Subject: gentoo auto-resync : 11:05:2023 - 23:47:37 --- sys-cluster/Manifest.gz | Bin 11551 -> 11547 bytes sys-cluster/torque/Manifest | 4 +- sys-cluster/torque/torque-6.0.4-r2.ebuild | 191 ---------------------------- sys-cluster/torque/torque-6.0.4-r3.ebuild | 200 ------------------------------ sys-cluster/torque/torque-6.0.4-r4.ebuild | 191 ++++++++++++++++++++++++++++ sys-cluster/torque/torque-6.0.4-r5.ebuild | 200 ++++++++++++++++++++++++++++++ sys-cluster/vzctl/Manifest | 2 +- sys-cluster/vzctl/vzctl-4.9.4-r1.ebuild | 85 +++++++++++++ sys-cluster/vzctl/vzctl-4.9.4.ebuild | 85 ------------- 9 files changed, 479 insertions(+), 479 deletions(-) delete mode 100644 sys-cluster/torque/torque-6.0.4-r2.ebuild delete mode 100644 sys-cluster/torque/torque-6.0.4-r3.ebuild create mode 100644 sys-cluster/torque/torque-6.0.4-r4.ebuild create mode 100644 sys-cluster/torque/torque-6.0.4-r5.ebuild create mode 100644 sys-cluster/vzctl/vzctl-4.9.4-r1.ebuild delete mode 100644 sys-cluster/vzctl/vzctl-4.9.4.ebuild (limited to 'sys-cluster') diff --git a/sys-cluster/Manifest.gz b/sys-cluster/Manifest.gz index 61d549453c3b..dab8b9eb9faa 100644 Binary files a/sys-cluster/Manifest.gz and b/sys-cluster/Manifest.gz differ diff --git a/sys-cluster/torque/Manifest b/sys-cluster/torque/Manifest index 4702d389093f..db646f7873d9 100644 --- a/sys-cluster/torque/Manifest +++ b/sys-cluster/torque/Manifest @@ -14,6 +14,6 @@ AUX trqauthd-init.d 477 BLAKE2B fe62bfae07d1d9fe08352ba4d99ab5d46185a74b10497f32 DIST torque-6.0.4-gcc7.patch 50412 BLAKE2B 43748e9bfd3811abdfeb56f93dd517fcb07a6902194120e2c9e16bbe5bbe0f04afd3f898616d46e0310902a6376671be0c8f3865e8f7dd5381fca46e7ad62fc8 SHA512 430ae6a80ebbfb2066831326f8ce25a34cb6fc17c1fbe4a202c495baceb2b7011c9f6782da31b78c34287f26765c76c587611d689791523b8bd53d634e3681b6 DIST torque-6.0.4-gh-20170829.tar.gz 6182495 BLAKE2B f9156ae4ffe388a7f3fa0df142e5f2d48c16fd7b8c148a3a80cd1c977eb0c1ef4a455da275f993100867be043422526ed05c53734e707851083d6d23ee1a2cc4 SHA512 8f1101adb89e06617de501f7956e126633b78b495baeb7980d3c534d34537cc604a3cf0a7c23c48eb2554b26cc13672b0e00c75d0f722d63ac4d42d57388ed94 DIST torque-6.0.4-glibc-2.34-pthread.patch.bz2 6266 BLAKE2B b5175b8bfe2deabe86b067f1ec5269770bcf096c6e875b8fd3cb404a976c9cb550ddcbe6e4ebb1e59c96044f95c285519e70fb4acd5c9db86c3050093ff65b3b SHA512 dbe0bd6000c140e1fe9b36e55c1a844701406a563bd178b9c972793b83282f3434e2160da5280666dcc0934c2b88e36c0a2b9518ffe7695b23d73fce0a07388d -EBUILD torque-6.0.4-r2.ebuild 6007 BLAKE2B 4f4831fdd044af2936b44e5fed7426541e3f0a84c76ffd70d23bf2ea92371e0af3ec58f1bea24f138981579b781e002dd79f79786bc9fe85e8f4377d1353797a SHA512 d495a66dffad869968fe8f0e183cda3c8dbd34fb9e15bfb041e46ec332a2c987a184f7b3f046143e5b9d69bd68428385aaf9766341dd28922ea7bd5d6670797f -EBUILD torque-6.0.4-r3.ebuild 6054 BLAKE2B eb1090c62a049ac82d600a35930584d81de3e9f735e682c1e3e962bf076510abf813d0d3267e6b5f3ed71fe8e3dc014cca58d363e216730d755ab261407977be SHA512 11e5c606321f8d13c6e49f8de8e2fb41b23ab854f53d308bc739d79c796e8c4d693073575f7795368fca0cfdb38e6309ef316e061ac467652e32c366ee69de7b +EBUILD torque-6.0.4-r4.ebuild 6006 BLAKE2B b268bf6bbebf75bf5cfea18f9e5333d91779c21dd0ac1bbce6059c71975ee655d38c49598e332f30af8dee22ecf69b126cadd80b9ce6f57e9754672a0f5b8493 SHA512 994031561921ab22d03a91bd0586b5d95615584c9a805b7d40e58cb228ef2a1b5052789a00075857991387795dc7540d6757f7a61f3504becb7dd535321448a0 +EBUILD torque-6.0.4-r5.ebuild 6053 BLAKE2B a0aa464211880bd0cbeaec2512c799858b316657c02650c861c817fbcf56c9fb666d3f0ef95399ed84b9897da05da4f764e7a32e4d2a847f2353d5b3fc04a210 SHA512 4d9be20f645e7bd2f47494af99bc4578091b2ff0e974b2eef80e0d780b6978aedc78c7f9d9d102bf303bfe6245d44783b8690990fe418c9526cdc45358355f80 MISC metadata.xml 854 BLAKE2B 77be0da422efef3efbe4a151f45b82f3cc5efdb2da91345bd245d23b1b3f93e8e9bbfff40c7aa4ab149a66574f8113360bf6cce8f630fa3ff17bbcf7a580c896 SHA512 a296b3a82abc530aff7672cf70fe06b26c61dff95476ca33a6692fb7cb5fabaa3873e6e1666721b8066ff524273ea6ebf20681a8418e849f94995b4493d4496f diff --git a/sys-cluster/torque/torque-6.0.4-r2.ebuild b/sys-cluster/torque/torque-6.0.4-r2.ebuild deleted file mode 100644 index b4fd6981da11..000000000000 --- a/sys-cluster/torque/torque-6.0.4-r2.ebuild +++ /dev/null @@ -1,191 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -MY_COMMIT="6a0b37f85c7d644e9217cbab1542792d646f59a6" -inherit autotools flag-o-matic linux-info toolchain-funcs - -DESCRIPTION="Resource manager and queuing system based on OpenPBS" -HOMEPAGE="https://adaptivecomputing.com/cherry-services/torque-resource-manager/ https://github.com/adaptivecomputing/torque/" -SRC_URI="https://github.com/adaptivecomputing/torque/archive/${MY_COMMIT}.tar.gz -> ${P}-gh-20170829.tar.gz - https://dev.gentoo.org/~juippis/distfiles/tmp/torque-6.0.4-gcc7.patch - https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-6.0.4-glibc-2.34-pthread.patch.bz2" - -LICENSE="torque-2.5" -SLOT="0" -KEYWORDS="~alpha amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" -IUSE="autorun cgroups cpusets +crypt doc munge nvidia quickcommit server +syslog tk" - -DEPEND_COMMON=" - sys-libs/zlib - sys-libs/readline:0= - dev-libs/libxml2 - dev-libs/boost - cpusets? ( sys-apps/hwloc:= ) - munge? ( sys-auth/munge ) - nvidia? ( >=x11-drivers/nvidia-drivers-275 ) - tk? ( - dev-lang/tk:0= - dev-lang/tcl:0= - ) - syslog? ( virtual/logger ) - !!games-util/qstat" - -# libncurses.so is only needed for configure check on readline -DEPEND="${DEPEND_COMMON} - sys-libs/ncurses:* - !!sys-cluster/slurm" - -RDEPEND="${DEPEND_COMMON} - crypt? ( net-misc/openssh ) - !crypt? ( net-misc/netkit-rsh ) - !dev-libs/uthash" - -# Torque should depend on dev-libs/uthash but that's pretty much impossible -# to patch in as they ship with a broken configure such that files referenced -# by the configure.ac and Makefile.am are missing. -# http://www.supercluster.org/pipermail/torquedev/2014-October/004773.html - -S="${WORKDIR}"/${PN}-6a0b37f85c7d644e9217cbab1542792d646f59a6 - -PATCHES=( - "${DISTDIR}"/${P}-gcc7.patch - "${FILESDIR}"/${PN}-6.0.3-fix-emptystring-comparison.patch - "${FILESDIR}"/${P}-no-openssl.patch - "${FILESDIR}"/${P}-error_buf_overflow_prevent.patch - "${WORKDIR}"/${P}-glibc-2.34-pthread.patch - "${FILESDIR}"/${P}-pthreads-deux.patch -) - -pkg_setup() { - PBS_SERVER_HOME="${PBS_SERVER_HOME:-/var/spool/${PN}}" - - # Find a Torque server to use. Check environment, then - # current setup (if any), and fall back on current hostname. - if [[ -z "${PBS_SERVER_NAME}" ]]; then - if [ -f "${EROOT}/${PBS_SERVER_HOME}/server_name" ]; then - PBS_SERVER_NAME="$(<${EROOT}/${PBS_SERVER_HOME}/server_name)" - else - PBS_SERVER_NAME=$(hostname -f) - fi - fi - - if use cpusets || use cgroups; then - if ! use kernel_linux; then - einfo - elog " Torque currently only has support for cpusets and cgroups in linux." - elog "Assuming you didn't really want this USE flag and ignoring its state." - einfo - else - linux-info_pkg_setup - if ! linux_config_exists || ! linux_chkconfig_present CPUSETS; then - einfo - elog " Torque support for cpusets will require that you recompile" - elog "your kernel with CONFIG_CPUSETS enabled." - einfo - fi - fi - fi -} - -src_prepare() { - default - # We install to a valid location, no need to muck with ld.so.conf - # --without-loadlibfile is supposed to do this for us... - sed -i '/mk_default_ld_lib_file || return 1/d' buildutils/pbs_mkdirs.in || die - eautoreconf -} - -src_configure() { - append-cflags "-fpermissive" - - # Force Bash for configure as there's a lot of issues with configure.ac and such here - CONFIG_SHELL="${BROOT}/bin/bash" econf \ - $(use_enable tk gui) \ - $(use_enable tk tcl-qstat) \ - $(use_enable syslog) \ - $(use_enable server) \ - --disable-drmaa \ - $(use_enable munge munge-auth) \ - $(use_enable nvidia nvidia-gpus) \ - $(usex crypt "--with-rcp=scp" "--with-rcp=mom_rcp") \ - $(usex kernel_linux $(use_enable cpusets cpuset) --disable-cpuset) \ - $(usex kernel_linux $(use_enable cgroups) --disable-cgroups) \ - $(use_enable autorun) \ - $(use_enable quickcommit) \ - --with-server-home=${PBS_SERVER_HOME} \ - --with-environ=/etc/pbs_environment \ - --with-default-server=${PBS_SERVER_NAME} \ - --disable-gcc-warnings \ - --disable-silent-rules \ - --with-tcp-retry-limit=2 \ - --without-loadlibfile -} - -src_compile() { - # The .c files are C++, and $(CC) is misused. - emake CC="$(tc-getCXX)" -} - -src_install() { - local dir - - DOCS=( CHANGELOG README.* Release_Notes ) - use doc && DOCS+=( doc/admin_guide.ps doc/*.pdf ) - - default - - # The build script isn't alternative install location friendly, - # So we have to fix some hard-coded paths in tclIndex for xpbs* to work - for file in $(find "${ED}" -iname tclIndex); do - sed \ - -e "s/${ED//\// }/ /" \ - -i "${file}" || die - done - - for dir in $(find "${ED}/${PBS_SERVER_HOME}" -type d); do - keepdir "${dir#${ED}}" - done - - if use server; then - newinitd "${FILESDIR}"/pbs_server-init.d-munge pbs_server - newinitd "${FILESDIR}"/pbs_sched-init.d pbs_sched - fi - - newinitd "${FILESDIR}"/pbs_mom-init.d-munge pbs_mom - newconfd "${FILESDIR}"/${PN}-conf.d-munge ${PN} - newinitd "${FILESDIR}"/trqauthd-init.d trqauthd - newenvd "${FILESDIR}"/${PN}-env.d 25${PN} -} - -pkg_preinst() { - if [[ -f "${EROOT}/etc/pbs_environment" ]]; then - cp "${EROOT}/etc/pbs_environment" "${ED}"/etc/pbs_environment || die - fi - - if use server && [[ -f "${EROOT}/${PBS_SERVER_HOME}/server_priv/nodes" ]]; then - cp \ - "${EROOT}/${PBS_SERVER_HOME}/server_priv/nodes" \ - "${ED}/${PBS_SERVER_HOME}/server_priv/nodes" || die - fi - - echo "${PBS_SERVER_NAME}" > "${ED}${PBS_SERVER_HOME}/server_name" || die - - # Fix up the env.d file to use our set server home. - sed \ - -e "s:/var/spool/${PN}:${PBS_SERVER_HOME}:g" \ - -i "${ED}"/etc/env.d/25${PN} || die - - if use munge; then - sed -i 's,\(PBS_USE_MUNGE=\).*,\11,' "${ED}"/etc/conf.d/${PN} || die - fi -} - -pkg_postinst() { - if [[ -z "${REPLACING_VERSIONS}" ]] ; then - elog "If this is the first time torque has been installed, then you are not" - elog "ready to start the server. Please refer to the documentation located at:" - elog "http://docs.adaptivecomputing.com/torque/${PV//./-}/adminGuide/torquehelp.htm#topics/torque/1-installConfig/initializeConfigOnServer.htm" - fi -} diff --git a/sys-cluster/torque/torque-6.0.4-r3.ebuild b/sys-cluster/torque/torque-6.0.4-r3.ebuild deleted file mode 100644 index 268b518c340b..000000000000 --- a/sys-cluster/torque/torque-6.0.4-r3.ebuild +++ /dev/null @@ -1,200 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -MY_COMMIT="6a0b37f85c7d644e9217cbab1542792d646f59a6" -inherit autotools flag-o-matic linux-info toolchain-funcs - -DESCRIPTION="Resource manager and queuing system based on OpenPBS" -HOMEPAGE="https://adaptivecomputing.com/cherry-services/torque-resource-manager/ https://github.com/adaptivecomputing/torque/" -SRC_URI=" - https://github.com/adaptivecomputing/torque/archive/${MY_COMMIT}.tar.gz -> ${P}-gh-20170829.tar.gz - https://dev.gentoo.org/~juippis/distfiles/tmp/torque-6.0.4-gcc7.patch - https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-glibc-2.34-pthread.patch.bz2 -" - -LICENSE="torque-2.5" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" -IUSE="autorun cgroups cpusets +crypt doc munge nvidia quickcommit server +syslog tk" - -DEPEND_COMMON=" - sys-libs/zlib - sys-libs/readline:0= - dev-libs/libxml2 - dev-libs/boost - cpusets? ( sys-apps/hwloc:= ) - munge? ( sys-auth/munge ) - nvidia? ( >=x11-drivers/nvidia-drivers-275 ) - tk? ( - dev-lang/tk:0= - dev-lang/tcl:0= - ) - syslog? ( virtual/logger ) - !!games-util/qstat -" - -# libncurses.so is only needed for configure check on readline -DEPEND=" - ${DEPEND_COMMON} - sys-libs/ncurses:* - !!sys-cluster/slurm -" - -RDEPEND=" - ${DEPEND_COMMON} - crypt? ( net-misc/openssh ) - !crypt? ( net-misc/netkit-rsh ) - !dev-libs/uthash -" - -# Torque should depend on dev-libs/uthash but that's pretty much impossible -# to patch in as they ship with a broken configure such that files referenced -# by the configure.ac and Makefile.am are missing. -# http://www.supercluster.org/pipermail/torquedev/2014-October/004773.html - -S="${WORKDIR}"/${PN}-6a0b37f85c7d644e9217cbab1542792d646f59a6 - -PATCHES=( - "${DISTDIR}"/${P}-gcc7.patch - "${FILESDIR}"/${PN}-6.0.3-fix-emptystring-comparison.patch - "${FILESDIR}"/${P}-no-openssl.patch - "${FILESDIR}"/${P}-error_buf_overflow_prevent.patch - "${WORKDIR}"/${P}-glibc-2.34-pthread.patch - "${FILESDIR}"/${P}-pthreads-deux.patch -) - -pkg_setup() { - PBS_SERVER_HOME="${PBS_SERVER_HOME:-/var/spool/${PN}}" - - # Find a Torque server to use. Check environment, then - # current setup (if any), and fall back on current hostname. - if [[ -z "${PBS_SERVER_NAME}" ]]; then - if [ -f "${EROOT}/${PBS_SERVER_HOME}/server_name" ]; then - PBS_SERVER_NAME="$(<${EROOT}/${PBS_SERVER_HOME}/server_name)" - else - PBS_SERVER_NAME=$(hostname -f) - fi - fi - - if use cpusets || use cgroups; then - if ! use kernel_linux; then - einfo - elog " Torque currently only has support for cpusets and cgroups in linux." - elog "Assuming you didn't really want this USE flag and ignoring its state." - einfo - else - linux-info_pkg_setup - if ! linux_config_exists || ! linux_chkconfig_present CPUSETS; then - einfo - elog " Torque support for cpusets will require that you recompile" - elog "your kernel with CONFIG_CPUSETS enabled." - einfo - fi - fi - fi -} - -src_prepare() { - default - # We install to a valid location, no need to muck with ld.so.conf - # --without-loadlibfile is supposed to do this for us... - sed -i '/mk_default_ld_lib_file || return 1/d' buildutils/pbs_mkdirs.in || die - eautoreconf -} - -src_configure() { - append-cflags "-fpermissive" - - # Force Bash for configure as there's a lot of issues with configure.ac and such here - CONFIG_SHELL="${BROOT}/bin/bash" econf \ - $(use_enable tk gui) \ - $(use_enable tk tcl-qstat) \ - $(use_enable syslog) \ - $(use_enable server) \ - --disable-drmaa \ - $(use_enable munge munge-auth) \ - $(use_enable nvidia nvidia-gpus) \ - $(usex crypt "--with-rcp=scp" "--with-rcp=mom_rcp") \ - $(usex kernel_linux $(use_enable cpusets cpuset) --disable-cpuset) \ - $(usex kernel_linux $(use_enable cgroups) --disable-cgroups) \ - $(use_enable autorun) \ - $(use_enable quickcommit) \ - --with-server-home=${PBS_SERVER_HOME} \ - --with-environ=/etc/pbs_environment \ - --with-default-server=${PBS_SERVER_NAME} \ - --disable-gcc-warnings \ - --disable-silent-rules \ - --with-tcp-retry-limit=2 \ - --without-loadlibfile -} - -src_compile() { - # The .c files are C++, and $(CC) is misused. - emake CC="$(tc-getCXX)" -} - -src_install() { - local dir - - DOCS=( CHANGELOG README.* Release_Notes ) - use doc && DOCS+=( doc/admin_guide.ps doc/*.pdf ) - - default - - # The build script isn't alternative install location friendly, - # So we have to fix some hard-coded paths in tclIndex for xpbs* to work - for file in $(find "${ED}" -iname tclIndex); do - sed \ - -e "s/${ED//\// }/ /" \ - -i "${file}" || die - done - - for dir in $(find "${ED}/${PBS_SERVER_HOME}" -type d); do - keepdir "${dir#${ED}}" - done - - if use server; then - newinitd "${FILESDIR}"/pbs_server-init.d-munge pbs_server - newinitd "${FILESDIR}"/pbs_sched-init.d pbs_sched - fi - - newinitd "${FILESDIR}"/pbs_mom-init.d-munge pbs_mom - newconfd "${FILESDIR}"/${PN}-conf.d-munge ${PN} - newinitd "${FILESDIR}"/trqauthd-init.d trqauthd - newenvd "${FILESDIR}"/${PN}-env.d 25${PN} - - find "${ED}" -name '*.la' -delete || die -} - -pkg_preinst() { - if [[ -f "${EROOT}/etc/pbs_environment" ]]; then - cp "${EROOT}/etc/pbs_environment" "${ED}"/etc/pbs_environment || die - fi - - if use server && [[ -f "${EROOT}/${PBS_SERVER_HOME}/server_priv/nodes" ]]; then - cp \ - "${EROOT}/${PBS_SERVER_HOME}/server_priv/nodes" \ - "${ED}/${PBS_SERVER_HOME}/server_priv/nodes" || die - fi - - echo "${PBS_SERVER_NAME}" > "${ED}${PBS_SERVER_HOME}/server_name" || die - - # Fix up the env.d file to use our set server home. - sed \ - -e "s:/var/spool/${PN}:${PBS_SERVER_HOME}:g" \ - -i "${ED}"/etc/env.d/25${PN} || die - - if use munge; then - sed -i 's,\(PBS_USE_MUNGE=\).*,\11,' "${ED}"/etc/conf.d/${PN} || die - fi -} - -pkg_postinst() { - if [[ -z "${REPLACING_VERSIONS}" ]] ; then - elog "If this is the first time torque has been installed, then you are not" - elog "ready to start the server. Please refer to the documentation located at:" - elog "http://docs.adaptivecomputing.com/torque/${PV//./-}/adminGuide/torquehelp.htm#topics/torque/1-installConfig/initializeConfigOnServer.htm" - fi -} diff --git a/sys-cluster/torque/torque-6.0.4-r4.ebuild b/sys-cluster/torque/torque-6.0.4-r4.ebuild new file mode 100644 index 000000000000..00bf710749ed --- /dev/null +++ b/sys-cluster/torque/torque-6.0.4-r4.ebuild @@ -0,0 +1,191 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +MY_COMMIT="6a0b37f85c7d644e9217cbab1542792d646f59a6" +inherit autotools flag-o-matic linux-info toolchain-funcs + +DESCRIPTION="Resource manager and queuing system based on OpenPBS" +HOMEPAGE="https://adaptivecomputing.com/cherry-services/torque-resource-manager/ https://github.com/adaptivecomputing/torque/" +SRC_URI="https://github.com/adaptivecomputing/torque/archive/${MY_COMMIT}.tar.gz -> ${P}-gh-20170829.tar.gz + https://dev.gentoo.org/~juippis/distfiles/tmp/torque-6.0.4-gcc7.patch + https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-6.0.4-glibc-2.34-pthread.patch.bz2" + +LICENSE="torque-2.5" +SLOT="0" +KEYWORDS="~alpha amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" +IUSE="autorun cgroups cpusets +crypt doc munge nvidia quickcommit server +syslog tk" + +DEPEND_COMMON=" + sys-libs/zlib + sys-libs/readline:0= + dev-libs/libxml2 + dev-libs/boost + cpusets? ( sys-apps/hwloc:= ) + munge? ( sys-auth/munge ) + nvidia? ( >=x11-drivers/nvidia-drivers-275 ) + tk? ( + dev-lang/tk:0= + dev-lang/tcl:0= + ) + syslog? ( virtual/logger ) + !!games-util/qstat" + +# libncurses.so is only needed for configure check on readline +DEPEND="${DEPEND_COMMON} + sys-libs/ncurses:* + !!sys-cluster/slurm" + +RDEPEND="${DEPEND_COMMON} + crypt? ( virtual/openssh ) + !crypt? ( net-misc/netkit-rsh ) + !dev-libs/uthash" + +# Torque should depend on dev-libs/uthash but that's pretty much impossible +# to patch in as they ship with a broken configure such that files referenced +# by the configure.ac and Makefile.am are missing. +# http://www.supercluster.org/pipermail/torquedev/2014-October/004773.html + +S="${WORKDIR}"/${PN}-6a0b37f85c7d644e9217cbab1542792d646f59a6 + +PATCHES=( + "${DISTDIR}"/${P}-gcc7.patch + "${FILESDIR}"/${PN}-6.0.3-fix-emptystring-comparison.patch + "${FILESDIR}"/${P}-no-openssl.patch + "${FILESDIR}"/${P}-error_buf_overflow_prevent.patch + "${WORKDIR}"/${P}-glibc-2.34-pthread.patch + "${FILESDIR}"/${P}-pthreads-deux.patch +) + +pkg_setup() { + PBS_SERVER_HOME="${PBS_SERVER_HOME:-/var/spool/${PN}}" + + # Find a Torque server to use. Check environment, then + # current setup (if any), and fall back on current hostname. + if [[ -z "${PBS_SERVER_NAME}" ]]; then + if [ -f "${EROOT}/${PBS_SERVER_HOME}/server_name" ]; then + PBS_SERVER_NAME="$(<${EROOT}/${PBS_SERVER_HOME}/server_name)" + else + PBS_SERVER_NAME=$(hostname -f) + fi + fi + + if use cpusets || use cgroups; then + if ! use kernel_linux; then + einfo + elog " Torque currently only has support for cpusets and cgroups in linux." + elog "Assuming you didn't really want this USE flag and ignoring its state." + einfo + else + linux-info_pkg_setup + if ! linux_config_exists || ! linux_chkconfig_present CPUSETS; then + einfo + elog " Torque support for cpusets will require that you recompile" + elog "your kernel with CONFIG_CPUSETS enabled." + einfo + fi + fi + fi +} + +src_prepare() { + default + # We install to a valid location, no need to muck with ld.so.conf + # --without-loadlibfile is supposed to do this for us... + sed -i '/mk_default_ld_lib_file || return 1/d' buildutils/pbs_mkdirs.in || die + eautoreconf +} + +src_configure() { + append-cflags "-fpermissive" + + # Force Bash for configure as there's a lot of issues with configure.ac and such here + CONFIG_SHELL="${BROOT}/bin/bash" econf \ + $(use_enable tk gui) \ + $(use_enable tk tcl-qstat) \ + $(use_enable syslog) \ + $(use_enable server) \ + --disable-drmaa \ + $(use_enable munge munge-auth) \ + $(use_enable nvidia nvidia-gpus) \ + $(usex crypt "--with-rcp=scp" "--with-rcp=mom_rcp") \ + $(usex kernel_linux $(use_enable cpusets cpuset) --disable-cpuset) \ + $(usex kernel_linux $(use_enable cgroups) --disable-cgroups) \ + $(use_enable autorun) \ + $(use_enable quickcommit) \ + --with-server-home=${PBS_SERVER_HOME} \ + --with-environ=/etc/pbs_environment \ + --with-default-server=${PBS_SERVER_NAME} \ + --disable-gcc-warnings \ + --disable-silent-rules \ + --with-tcp-retry-limit=2 \ + --without-loadlibfile +} + +src_compile() { + # The .c files are C++, and $(CC) is misused. + emake CC="$(tc-getCXX)" +} + +src_install() { + local dir + + DOCS=( CHANGELOG README.* Release_Notes ) + use doc && DOCS+=( doc/admin_guide.ps doc/*.pdf ) + + default + + # The build script isn't alternative install location friendly, + # So we have to fix some hard-coded paths in tclIndex for xpbs* to work + for file in $(find "${ED}" -iname tclIndex); do + sed \ + -e "s/${ED//\// }/ /" \ + -i "${file}" || die + done + + for dir in $(find "${ED}/${PBS_SERVER_HOME}" -type d); do + keepdir "${dir#${ED}}" + done + + if use server; then + newinitd "${FILESDIR}"/pbs_server-init.d-munge pbs_server + newinitd "${FILESDIR}"/pbs_sched-init.d pbs_sched + fi + + newinitd "${FILESDIR}"/pbs_mom-init.d-munge pbs_mom + newconfd "${FILESDIR}"/${PN}-conf.d-munge ${PN} + newinitd "${FILESDIR}"/trqauthd-init.d trqauthd + newenvd "${FILESDIR}"/${PN}-env.d 25${PN} +} + +pkg_preinst() { + if [[ -f "${EROOT}/etc/pbs_environment" ]]; then + cp "${EROOT}/etc/pbs_environment" "${ED}"/etc/pbs_environment || die + fi + + if use server && [[ -f "${EROOT}/${PBS_SERVER_HOME}/server_priv/nodes" ]]; then + cp \ + "${EROOT}/${PBS_SERVER_HOME}/server_priv/nodes" \ + "${ED}/${PBS_SERVER_HOME}/server_priv/nodes" || die + fi + + echo "${PBS_SERVER_NAME}" > "${ED}${PBS_SERVER_HOME}/server_name" || die + + # Fix up the env.d file to use our set server home. + sed \ + -e "s:/var/spool/${PN}:${PBS_SERVER_HOME}:g" \ + -i "${ED}"/etc/env.d/25${PN} || die + + if use munge; then + sed -i 's,\(PBS_USE_MUNGE=\).*,\11,' "${ED}"/etc/conf.d/${PN} || die + fi +} + +pkg_postinst() { + if [[ -z "${REPLACING_VERSIONS}" ]] ; then + elog "If this is the first time torque has been installed, then you are not" + elog "ready to start the server. Please refer to the documentation located at:" + elog "http://docs.adaptivecomputing.com/torque/${PV//./-}/adminGuide/torquehelp.htm#topics/torque/1-installConfig/initializeConfigOnServer.htm" + fi +} diff --git a/sys-cluster/torque/torque-6.0.4-r5.ebuild b/sys-cluster/torque/torque-6.0.4-r5.ebuild new file mode 100644 index 000000000000..4148d1591d59 --- /dev/null +++ b/sys-cluster/torque/torque-6.0.4-r5.ebuild @@ -0,0 +1,200 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +MY_COMMIT="6a0b37f85c7d644e9217cbab1542792d646f59a6" +inherit autotools flag-o-matic linux-info toolchain-funcs + +DESCRIPTION="Resource manager and queuing system based on OpenPBS" +HOMEPAGE="https://adaptivecomputing.com/cherry-services/torque-resource-manager/ https://github.com/adaptivecomputing/torque/" +SRC_URI=" + https://github.com/adaptivecomputing/torque/archive/${MY_COMMIT}.tar.gz -> ${P}-gh-20170829.tar.gz + https://dev.gentoo.org/~juippis/distfiles/tmp/torque-6.0.4-gcc7.patch + https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-glibc-2.34-pthread.patch.bz2 +" + +LICENSE="torque-2.5" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" +IUSE="autorun cgroups cpusets +crypt doc munge nvidia quickcommit server +syslog tk" + +DEPEND_COMMON=" + sys-libs/zlib + sys-libs/readline:0= + dev-libs/libxml2 + dev-libs/boost + cpusets? ( sys-apps/hwloc:= ) + munge? ( sys-auth/munge ) + nvidia? ( >=x11-drivers/nvidia-drivers-275 ) + tk? ( + dev-lang/tk:0= + dev-lang/tcl:0= + ) + syslog? ( virtual/logger ) + !!games-util/qstat +" + +# libncurses.so is only needed for configure check on readline +DEPEND=" + ${DEPEND_COMMON} + sys-libs/ncurses:* + !!sys-cluster/slurm +" + +RDEPEND=" + ${DEPEND_COMMON} + crypt? ( virtual/openssh ) + !crypt? ( net-misc/netkit-rsh ) + !dev-libs/uthash +" + +# Torque should depend on dev-libs/uthash but that's pretty much impossible +# to patch in as they ship with a broken configure such that files referenced +# by the configure.ac and Makefile.am are missing. +# http://www.supercluster.org/pipermail/torquedev/2014-October/004773.html + +S="${WORKDIR}"/${PN}-6a0b37f85c7d644e9217cbab1542792d646f59a6 + +PATCHES=( + "${DISTDIR}"/${P}-gcc7.patch + "${FILESDIR}"/${PN}-6.0.3-fix-emptystring-comparison.patch + "${FILESDIR}"/${P}-no-openssl.patch + "${FILESDIR}"/${P}-error_buf_overflow_prevent.patch + "${WORKDIR}"/${P}-glibc-2.34-pthread.patch + "${FILESDIR}"/${P}-pthreads-deux.patch +) + +pkg_setup() { + PBS_SERVER_HOME="${PBS_SERVER_HOME:-/var/spool/${PN}}" + + # Find a Torque server to use. Check environment, then + # current setup (if any), and fall back on current hostname. + if [[ -z "${PBS_SERVER_NAME}" ]]; then + if [ -f "${EROOT}/${PBS_SERVER_HOME}/server_name" ]; then + PBS_SERVER_NAME="$(<${EROOT}/${PBS_SERVER_HOME}/server_name)" + else + PBS_SERVER_NAME=$(hostname -f) + fi + fi + + if use cpusets || use cgroups; then + if ! use kernel_linux; then + einfo + elog " Torque currently only has support for cpusets and cgroups in linux." + elog "Assuming you didn't really want this USE flag and ignoring its state." + einfo + else + linux-info_pkg_setup + if ! linux_config_exists || ! linux_chkconfig_present CPUSETS; then + einfo + elog " Torque support for cpusets will require that you recompile" + elog "your kernel with CONFIG_CPUSETS enabled." + einfo + fi + fi + fi +} + +src_prepare() { + default + # We install to a valid location, no need to muck with ld.so.conf + # --without-loadlibfile is supposed to do this for us... + sed -i '/mk_default_ld_lib_file || return 1/d' buildutils/pbs_mkdirs.in || die + eautoreconf +} + +src_configure() { + append-cflags "-fpermissive" + + # Force Bash for configure as there's a lot of issues with configure.ac and such here + CONFIG_SHELL="${BROOT}/bin/bash" econf \ + $(use_enable tk gui) \ + $(use_enable tk tcl-qstat) \ + $(use_enable syslog) \ + $(use_enable server) \ + --disable-drmaa \ + $(use_enable munge munge-auth) \ + $(use_enable nvidia nvidia-gpus) \ + $(usex crypt "--with-rcp=scp" "--with-rcp=mom_rcp") \ + $(usex kernel_linux $(use_enable cpusets cpuset) --disable-cpuset) \ + $(usex kernel_linux $(use_enable cgroups) --disable-cgroups) \ + $(use_enable autorun) \ + $(use_enable quickcommit) \ + --with-server-home=${PBS_SERVER_HOME} \ + --with-environ=/etc/pbs_environment \ + --with-default-server=${PBS_SERVER_NAME} \ + --disable-gcc-warnings \ + --disable-silent-rules \ + --with-tcp-retry-limit=2 \ + --without-loadlibfile +} + +src_compile() { + # The .c files are C++, and $(CC) is misused. + emake CC="$(tc-getCXX)" +} + +src_install() { + local dir + + DOCS=( CHANGELOG README.* Release_Notes ) + use doc && DOCS+=( doc/admin_guide.ps doc/*.pdf ) + + default + + # The build script isn't alternative install location friendly, + # So we have to fix some hard-coded paths in tclIndex for xpbs* to work + for file in $(find "${ED}" -iname tclIndex); do + sed \ + -e "s/${ED//\// }/ /" \ + -i "${file}" || die + done + + for dir in $(find "${ED}/${PBS_SERVER_HOME}" -type d); do + keepdir "${dir#${ED}}" + done + + if use server; then + newinitd "${FILESDIR}"/pbs_server-init.d-munge pbs_server + newinitd "${FILESDIR}"/pbs_sched-init.d pbs_sched + fi + + newinitd "${FILESDIR}"/pbs_mom-init.d-munge pbs_mom + newconfd "${FILESDIR}"/${PN}-conf.d-munge ${PN} + newinitd "${FILESDIR}"/trqauthd-init.d trqauthd + newenvd "${FILESDIR}"/${PN}-env.d 25${PN} + + find "${ED}" -name '*.la' -delete || die +} + +pkg_preinst() { + if [[ -f "${EROOT}/etc/pbs_environment" ]]; then + cp "${EROOT}/etc/pbs_environment" "${ED}"/etc/pbs_environment || die + fi + + if use server && [[ -f "${EROOT}/${PBS_SERVER_HOME}/server_priv/nodes" ]]; then + cp \ + "${EROOT}/${PBS_SERVER_HOME}/server_priv/nodes" \ + "${ED}/${PBS_SERVER_HOME}/server_priv/nodes" || die + fi + + echo "${PBS_SERVER_NAME}" > "${ED}${PBS_SERVER_HOME}/server_name" || die + + # Fix up the env.d file to use our set server home. + sed \ + -e "s:/var/spool/${PN}:${PBS_SERVER_HOME}:g" \ + -i "${ED}"/etc/env.d/25${PN} || die + + if use munge; then + sed -i 's,\(PBS_USE_MUNGE=\).*,\11,' "${ED}"/etc/conf.d/${PN} || die + fi +} + +pkg_postinst() { + if [[ -z "${REPLACING_VERSIONS}" ]] ; then + elog "If this is the first time torque has been installed, then you are not" + elog "ready to start the server. Please refer to the documentation located at:" + elog "http://docs.adaptivecomputing.com/torque/${PV//./-}/adminGuide/torquehelp.htm#topics/torque/1-installConfig/initializeConfigOnServer.htm" + fi +} diff --git a/sys-cluster/vzctl/Manifest b/sys-cluster/vzctl/Manifest index 455126a94727..e5ac7e426bc1 100644 --- a/sys-cluster/vzctl/Manifest +++ b/sys-cluster/vzctl/Manifest @@ -1,5 +1,5 @@ AUX vzctl-4.9.4-glibc225-2.patch 1196 BLAKE2B 4560cb8fc78163b0c397cbf89545aca9c7005f67d31eb41b6dcc2d6c0ab064298655d30eeb958e007320828d5ef7bd7bcb89e44e1b7f5b36c7d327f866f66d6f SHA512 70ec27c9067bdd7fa1e3e2aa32b32649aca8a2d357ffa583c29132d7339f52bbc19195fc9be304f977ee82d96978f3a51bc9cca23d124ce4946c48b6129bd714 AUX vzctl-4.9.4-glibc225.patch 406 BLAKE2B abee2fcb861f755bd75840eb29ee4921c8580f18d5243cb9ac19bf4fe25e44474cb490d0f673e80a3bff8f17b8c93dd96c3b8b0e2e38dbda5721262b2f610d16 SHA512 db7778a15785e6d9d22d1102cb341647834b6b9eeb4fc26b6cbaa86af7317931d3571a2b7f03a3b419338e11427482dd831374144a67dda2f2f4fe11ff020f45 DIST vzctl-4.9.4.tar.bz2 550370 BLAKE2B 173d6cfe93b15aef6cb1903a5d711e29190964479c146625a3f9d2ff872161c51b7632213a5f0d47d5a14ec34d7d80499c1bc17f11cfbb80318c26630c05fd71 SHA512 651aa7882ba77442666a09441769f821a7374f417199380667b27c9980203597575dfe12ad5c261da22941b6a2bc6e032d3f9c2d88dcb03af6412634cc5b4706 -EBUILD vzctl-4.9.4.ebuild 2004 BLAKE2B f2a24d6137c99fd8a57c46e7fb2e8c7789e2ebb687d5e086dcc789ca58f45e3463a4cee22a6b7e7e103ab802101d8b1457dd88fb38593674136137e264f77f77 SHA512 f598c0735dd00a7c107402147e4c8522d9522538860f4d51efb053c6adf27cc75a1058646cabe949a6d1c90dbdb8280b581fa7fc99daddc876e4dd7a0dc8de56 +EBUILD vzctl-4.9.4-r1.ebuild 2003 BLAKE2B 9d0bc8cdd4726975925881bea76b97df6ea429b4c7ed1e3e744e177f0a822d5938432a215f60daf0a3587faa7e72a0c0dfecfdc6159a8f179d2e943bc6527414 SHA512 cc07cc3996cdced38dd3f103e5e8f4091264b260ff52be02921959c448c2199bde67f535f886c904e93c54a373a4b572f9643111ca9c96627ec834b52cbbf502 MISC metadata.xml 477 BLAKE2B 6292b1317da3d2b3480f07ee1b4763caab61458fb554e1faeb781f3ed3010771f20d27087f47a84b67cef7f06caf6283ecb4b1903c76bd82bda902236948c51d SHA512 0b87d0c3ca82ebbf48da333992abd750ce470761ac3240fad5c1a7919918fc79f76abaae57f1950cbdc8637eaa32329cbd5e09c05f04a8071f8aba93cb0df36e diff --git a/sys-cluster/vzctl/vzctl-4.9.4-r1.ebuild b/sys-cluster/vzctl/vzctl-4.9.4-r1.ebuild new file mode 100644 index 000000000000..78cbf1b65933 --- /dev/null +++ b/sys-cluster/vzctl/vzctl-4.9.4-r1.ebuild @@ -0,0 +1,85 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit bash-completion-r1 optfeature udev + +DESCRIPTION="OpenVZ ConTainers control utility" +HOMEPAGE="https://openvz.org/" +SRC_URI="https://download.openvz.org/utils/${PN}/${PV}/src/${P}.tar.bz2" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="amd64 ~ppc64 x86" +IUSE="+ploop +vzmigrate" + +BDEPEND="virtual/pkgconfig" +RDEPEND=" + >=dev-libs/libcgroup-0.38 + net-firewall/iptables + sys-apps/attr + sys-apps/ed + >=sys-apps/iproute2-3.3.0 + >=sys-fs/vzquota-3.1 + virtual/udev + ploop? ( + dev-libs/libxml2 + sys-block/parted + >=sys-cluster/ploop-1.13 + sys-fs/quota + ) + vzmigrate? ( + app-alternatives/awk + app-arch/tar[xattr,acl] + net-misc/rsync[xattr,acl] + net-misc/bridge-utils + virtual/openssh + ) +" +DEPEND="${RDEPEND}" + +PATCHES=( + "${FILESDIR}"/${P}-glibc225.patch + "${FILESDIR}"/${P}-glibc225-2.patch +) + +src_prepare() { + # Set default OSTEMPLATE on gentoo + sed -i -e 's:=redhat-:=gentoo-:' etc/dists/default || die 'sed on etc/dists/default failed' + # Set proper udev directory + sed -i -e "s:/lib/udev:$(get_udevdir):" src/lib/dev.c || die 'sed on src/lib/dev.c failed' + + default +} + +src_configure() { + econf \ + --localstatedir=/var \ + --enable-udev \ + --enable-bashcomp \ + --enable-logrotate \ + --with-vz \ + $(use_with ploop) \ + --with-cgroup +} + +src_install() { + emake DESTDIR="${D}" udevdir="$(get_udevdir)"/rules.d install install-gentoo + + # install the bash-completion script into the right location + rm -rf "${ED}"/etc/bash_completion.d || die + newbashcomp etc/bash_completion.d/vzctl.sh ${PN} + + # We need to keep some dirs + keepdir /vz/{dump,lock,root,private,template/cache} + keepdir /etc/vz/names /var/lib/vzctl/veip +} + +pkg_postinst() { + einfo "This vzctl release requires a kernel above 2.6.32.92" + + optfeature "Checkpoint suspend/restore support (experimental)" sys-process/criu + optfeature "Compressed .xz templates" app-arch/xz-utils + optfeature "Signed templates" app-crypt/gnupg +} diff --git a/sys-cluster/vzctl/vzctl-4.9.4.ebuild b/sys-cluster/vzctl/vzctl-4.9.4.ebuild deleted file mode 100644 index fc75cfa78c5f..000000000000 --- a/sys-cluster/vzctl/vzctl-4.9.4.ebuild +++ /dev/null @@ -1,85 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit bash-completion-r1 optfeature udev - -DESCRIPTION="OpenVZ ConTainers control utility" -HOMEPAGE="https://openvz.org/" -SRC_URI="https://download.openvz.org/utils/${PN}/${PV}/src/${P}.tar.bz2" - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="amd64 ~ppc64 x86" -IUSE="+ploop +vzmigrate" - -BDEPEND="virtual/pkgconfig" -RDEPEND=" - >=dev-libs/libcgroup-0.38 - net-firewall/iptables - sys-apps/attr - sys-apps/ed - >=sys-apps/iproute2-3.3.0 - >=sys-fs/vzquota-3.1 - virtual/udev - ploop? ( - dev-libs/libxml2 - sys-block/parted - >=sys-cluster/ploop-1.13 - sys-fs/quota - ) - vzmigrate? ( - app-arch/tar[xattr,acl] - net-misc/openssh - net-misc/rsync[xattr,acl] - net-misc/bridge-utils - app-alternatives/awk - ) -" -DEPEND="${RDEPEND}" - -PATCHES=( - "${FILESDIR}"/${P}-glibc225.patch - "${FILESDIR}"/${P}-glibc225-2.patch -) - -src_prepare() { - # Set default OSTEMPLATE on gentoo - sed -i -e 's:=redhat-:=gentoo-:' etc/dists/default || die 'sed on etc/dists/default failed' - # Set proper udev directory - sed -i -e "s:/lib/udev:$(get_udevdir):" src/lib/dev.c || die 'sed on src/lib/dev.c failed' - - default -} - -src_configure() { - econf \ - --localstatedir=/var \ - --enable-udev \ - --enable-bashcomp \ - --enable-logrotate \ - --with-vz \ - $(use_with ploop) \ - --with-cgroup -} - -src_install() { - emake DESTDIR="${D}" udevdir="$(get_udevdir)"/rules.d install install-gentoo - - # install the bash-completion script into the right location - rm -rf "${ED}"/etc/bash_completion.d || die - newbashcomp etc/bash_completion.d/vzctl.sh ${PN} - - # We need to keep some dirs - keepdir /vz/{dump,lock,root,private,template/cache} - keepdir /etc/vz/names /var/lib/vzctl/veip -} - -pkg_postinst() { - einfo "This vzctl release requires a kernel above 2.6.32.92" - - optfeature "Checkpoint suspend/restore support (experimental)" sys-process/criu - optfeature "Compressed .xz templates" app-arch/xz-utils - optfeature "Signed templates" app-crypt/gnupg -} -- cgit v1.2.3