From 121ed4eec41fbf03e1998d09eede1bf449da63b9 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 19 Jul 2019 22:05:27 +0100 Subject: gentoo resync : 19.07.2019 --- sys-cluster/torque/Manifest | 2 + .../torque/files/torque-6.0.4-no-openssl.patch | 60 +++++++ sys-cluster/torque/torque-6.0.4-r1.ebuild | 176 +++++++++++++++++++++ 3 files changed, 238 insertions(+) create mode 100644 sys-cluster/torque/files/torque-6.0.4-no-openssl.patch create mode 100644 sys-cluster/torque/torque-6.0.4-r1.ebuild (limited to 'sys-cluster/torque') diff --git a/sys-cluster/torque/Manifest b/sys-cluster/torque/Manifest index 20d5db9834e7..eb31a38a5a60 100644 --- a/sys-cluster/torque/Manifest +++ b/sys-cluster/torque/Manifest @@ -9,6 +9,7 @@ AUX torque-4.2-dont-mess-with-cflags.patch 806 BLAKE2B d4be6b841f354c5ab9eca24cd AUX torque-4.2-use-NULL-instead-of-char0.patch 3898 BLAKE2B 9d693f6fc8a7dc4d9a3e3517c41ece9cde8f4567cf75439b47bfbf1041cf043b69c7666eb44a477ca6dac79415bd396782ee62535f7f4c32aa3caac4431d2347 SHA512 af6bb3e257f8f4c232c83ed8d0a4a4b8a451acb42bfec36aa1caa3191ab242109f1712bbd639219254e5ab42fa518990343b917ebf9d21406eb23e8b7c9141f3 AUX torque-4.2.9-tcl8.6.patch 2702 BLAKE2B c1444b5f4da1d37e21fe5a8970e188926080805db83406f5caca2cf27dddebf069d9d9747c33e3a1e2b0ec5f36e95d80d1c69151129967d432cd2d11c5e1ecf8 SHA512 9844a1f633f049a66cf31d3721f6a5e205ede26186da1357e0b0aa2c0c4d064cbdff45e2f7e685d6c4afd09d961e59ff1759163e4a2ae349fa866e960c1bcf77 AUX torque-6.0.3-fix-emptystring-comparison.patch 542 BLAKE2B c5acba0cfb1a4ca40a77710563fe42b928052253c3569d9e130357142a0456601bbf671d61db32f54881498f4bc77b588d0cfef3431a35b30c3e3858a6aed002 SHA512 0303c49ef2a407773b9cd14f15e825d13e9a5c9ae91118ed770d81ccb59bbe01fb3614e6865b1be81e6f9618fba3a09cc4fe447a0e6684f1e142c49e17970189 +AUX torque-6.0.4-no-openssl.patch 1926 BLAKE2B 387843f6117ebdb1a9ca0f9fe3363dd2b2ab45aced82e3e9c60cb11009fef1dd97afeb9e525a3a5d70885b6cd19cc20333dc9d009453ade63bad8c39fb82d578 SHA512 1370c280860eb31d2a7e09b7bef6d9f2d6d7651ba0c67db7c7c912ec72b78f6ca33f7f5b716afc69a10f8c3efd55d5702f8e894596de78a91a346ec28d83e5dc AUX torque-conf.d 649 BLAKE2B 819a53a96a35d77b45d3c536278a088845cbbbd4ac1606b7d822ae36909477428c692975edcd69b519e348fa2cfc7d01c013db33daae65b9a0ba169456324443 SHA512 b82f6c1d661bed03a32c3761530c4b303715167a317e467371091b11d3ae0e19e9784b1588577ee5f65397cb0699818ed5f621aeb66d3f2d218df12d0cf39bde AUX torque-conf.d-munge 784 BLAKE2B fe4fc64377da0ed0232961462bd92fea4fae68760dd698cf2759105f75686c5c77c3cff2c3fac3531c4b4905244cbc9df0fe67fe62a410a63b35008429dd1261 SHA512 a78634a6f2bdf3c24e8c99d3cd7a9634daa32d69244a9ddfcc26199f4d04e901abbfa79ad057f5a4e4c492c9e21bc0c65edd8465ac6935fb7c67c8c639e75d68 AUX torque-env.d 240 BLAKE2B 49ef384c36369e02f11575b40f881efcbc3605dc7c52eb1694f721e15055542296c064628a9ed605638600a1319c6ec18691e5f3e3e94304ada8b7596997765f SHA512 275ce5ccf9f138bcee504a9996c9d838cd34714d352d4b7ac2d631d0fca662bf38a2ef7e8745605d9b3847049015e0791c937340cfdacbf44800482ce73bb042 @@ -18,5 +19,6 @@ DIST torque-4.2.10-gh-20150517.tar.gz 5836286 BLAKE2B 7108f1adcb6f674526b7db97df DIST torque-6.0.4-gh-20170829.tar.gz 6182495 BLAKE2B f9156ae4ffe388a7f3fa0df142e5f2d48c16fd7b8c148a3a80cd1c977eb0c1ef4a455da275f993100867be043422526ed05c53734e707851083d6d23ee1a2cc4 SHA512 8f1101adb89e06617de501f7956e126633b78b495baeb7980d3c534d34537cc604a3cf0a7c23c48eb2554b26cc13672b0e00c75d0f722d63ac4d42d57388ed94 EBUILD torque-4.1.7-r1.ebuild 7491 BLAKE2B d4c4a0be3c07eca1ae0a79fbe52ea153c4c013155426aa9cba4d4f2cc70086883c3b5345026450cd5608ae4e26773dabb9a70742cf9e7cf7dc968a7cc8210380 SHA512 e7213e0df29564fa24a48bf8b96e59a69fbd56abf5c470b794eb19fbdefe705ead880d9d908f006c9c79eeab325b0f6ccc3ae64973cb1e50061c2020c64aa816 EBUILD torque-4.2.10-r1.ebuild 6086 BLAKE2B c685ce4e6b5b7f58c040f0b16779bb59540aa0c80fe9a55b76d603e336e63a5186d543d664caa0f6184c3145c9608b31fed379b2e827bdcd62e6e53f8334b5cc SHA512 2c64f7dfaa26e1648e32283c1dcc31df0dba8bf3c4177fdafbe713d408d931ca83c2386d3548b47e1d6d90552e4c5ceeadf96c50089f2d17eb56d79312dc70f8 +EBUILD torque-6.0.4-r1.ebuild 5428 BLAKE2B cc1a8ada29520b3af36457e25f639ed70d9c8d9f724702be6bf8cdad5c125ed8303fec67450c79f233a890340d5ff904982e89b2e2b22003bc69d81b197b915f SHA512 21fabe1c45f965af746e722b54478a183d48f4f3934f65e312bb57b1ada6024044cc966e0d729e05b3c3e83b75092687b2a5bd20acf47376deeb58b38503b0fb EBUILD torque-6.0.4.ebuild 5463 BLAKE2B b6202d1c5679637d7d305bef8ec3a5f6d09d6e61eb0dc42093fade8349bd014f30304b6d82f0dcab6267d5d1f5102c3c3246e41e68329e3c9219ccdc9ad5126c SHA512 710971b3b72dc388b7631cba09a46096b45022a803bd1570774cc276d416c6f6426bbb8304d56a30d49de9c940cac6574d1e20e324c42d5aa95813ceda035fdf MISC metadata.xml 988 BLAKE2B 257e838c8bde7ceea876a84631c248fce2e3a347794459bbfd4ae23210c779f69e606e120438351783ebf1cdeab7bd5e5df196ee9af31306bebd6130a08bb46f SHA512 46f2eb41303c17e84aacf5b8548b645772ab923bf9a4847892260cc5c6aaf354acc0bb0128186acf312ed77a24d9429c97f18914d759c7c5c97c19ad62489a43 diff --git a/sys-cluster/torque/files/torque-6.0.4-no-openssl.patch b/sys-cluster/torque/files/torque-6.0.4-no-openssl.patch new file mode 100644 index 000000000000..3b7e3cd49188 --- /dev/null +++ b/sys-cluster/torque/files/torque-6.0.4-no-openssl.patch @@ -0,0 +1,60 @@ +From 840bee84bff9529f2f7de4293cf7d5f567985123 Mon Sep 17 00:00:00 2001 +From: Matt Ezell +Date: Thu, 8 Oct 2015 15:32:30 -0400 +Subject: [PATCH] Remove unnecessary dependency on openssl-devel + +Closes #219 +--- + README.building_40 | 3 --- + configure.ac | 10 ---------- + src/daemon_client/Makefile.am | 2 +- + 3 files changed, 1 insertion(+), 14 deletions(-) + +diff --git a/README.building_40 b/README.building_40 +index bd2af03070..4b3a8c5f8a 100644 +--- a/README.building_40 ++++ b/README.building_40 +@@ -14,9 +14,6 @@ automake + libtool + pkg-config + +-Non-standard packages required for building the source: +-libssl-dev (name may vary among OSes) +- + *** For admins that use cpusets in any form *** + hwloc version 1.1 or greater is now required for building TORQUE with cpusets, as pbs_mom now uses the + hwloc API to create the cpusets instead of creating them manually. +diff --git a/configure.ac b/configure.ac +index 14f238a519..636575c1b4 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -745,16 +745,6 @@ AC_CHECK_LIB(pthread, pthread_create, + LIBS="$LIBS $PTHREAD_LIBS" + + +-dnl we need -lssl and -lcrypto, lets make sure they exist +-AC_CHECK_LIB(ssl, SSL_accept, +- [], +- [AC_MSG_ERROR([TORQUE needs lib openssl-devel in order to build]) ]) +-AC_CHECK_LIB(crypto, BN_init, +- [], +- [AC_MSG_ERROR([TORQUE needs lib crypto (often openssl-devel) in order to build]) ]) +- +- +- + dnl + dnl we need libxml2 + dnl +diff --git a/src/daemon_client/Makefile.am b/src/daemon_client/Makefile.am +index e39f5e70b2..fe9d592b06 100644 +--- a/src/daemon_client/Makefile.am ++++ b/src/daemon_client/Makefile.am +@@ -5,7 +5,7 @@ CLEANFILES = *.gcda *.gcno *.gcov + + include_HEADERS = trq_auth_daemon.h + +-AM_CFLAGS = -DPBS_SERVER_HOME=\"$(PBS_SERVER_HOME)\" -Wall -pthread -ldl -lrt -lssl -lcrypto ++AM_CFLAGS = -DPBS_SERVER_HOME=\"$(PBS_SERVER_HOME)\" -Wall -pthread -ldl -lrt + + sbin_PROGRAMS = trqauthd + diff --git a/sys-cluster/torque/torque-6.0.4-r1.ebuild b/sys-cluster/torque/torque-6.0.4-r1.ebuild new file mode 100644 index 000000000000..bc520dc0ace3 --- /dev/null +++ b/sys-cluster/torque/torque-6.0.4-r1.ebuild @@ -0,0 +1,176 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit autotools flag-o-matic linux-info + +DESCRIPTION="Resource manager and queuing system based on OpenPBS" +HOMEPAGE="http://www.adaptivecomputing.com/products/open-source/torque" +SRC_URI="https://github.com/adaptivecomputing/torque/archive/6a0b37f85c7d644e9217cbab1542792d646f59a6.tar.gz -> ${P}-gh-20170829.tar.gz" + +LICENSE="torque-2.5" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" +IUSE="autorun cgroups cpusets +crypt doc drmaa kernel_linux libressl munge nvidia quickcommit server +syslog tk" + +DEPEND_COMMON=" + sys-libs/zlib + sys-libs/readline:0= + dev-libs/libxml2 + >=dev-libs/boost-1.41 + 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=( + "${FILESDIR}"/${PN}-6.0.3-fix-emptystring-comparison.patch + "${FILESDIR}"/${P}-no-openssl.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 "${ROOT}${PBS_SERVER_HOME}/server_name" ]; then + PBS_SERVER_NAME="$(<${ROOT}${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() { + econf \ + $(use_enable tk gui) \ + $(use_enable tk tcl-qstat) \ + $(use_enable syslog) \ + $(use_enable server) \ + $(use_enable 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 cpusets geometry-request) --disable-geometry-request) \ + $(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_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 "${ROOT}etc/pbs_environment" ]]; then + cp "${ROOT}etc/pbs_environment" "${ED}"/etc/pbs_environment || die + fi + + if use server && [[ -f "${ROOT}${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/${PN//./-}/adminGuide/help.htm#topics/torque/1-installConfig/initializeConfigOnServer.htm" + fi +} -- cgit v1.2.3