[gentoo-commits] repo/gentoo:master commit in: sys-cluster/torque/
commit: 2bf156fb65cc27c6d2a2e0310ce9e892e0361b48 Author: Sam James gentoo org> AuthorDate: Wed Aug 2 13:18:39 2023 + Commit: Sam James gentoo org> CommitDate: Wed Aug 2 13:18:39 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2bf156fb sys-cluster/torque: Stabilize 6.0.4-r6 amd64, #909658 Signed-off-by: Sam James gentoo.org> sys-cluster/torque/torque-6.0.4-r6.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-cluster/torque/torque-6.0.4-r6.ebuild b/sys-cluster/torque/torque-6.0.4-r6.ebuild index 3e838b63737d..56c733157562 100644 --- a/sys-cluster/torque/torque-6.0.4-r6.ebuild +++ b/sys-cluster/torque/torque-6.0.4-r6.ebuild @@ -16,7 +16,7 @@ SRC_URI=" LICENSE="torque-2.5" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" +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="
[gentoo-commits] repo/gentoo:master commit in: sys-cluster/torque/
commit: a241313aab5e249e3709bf378b451718b189844a Author: David Seifert gentoo org> AuthorDate: Mon May 8 20:56:04 2023 + Commit: Sam James gentoo org> CommitDate: Thu May 11 20:03:40 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a241313a sys-cluster/torque: switch to virtual/openssh Signed-off-by: David Seifert gentoo.org> Signed-off-by: Sam James gentoo.org> sys-cluster/torque/{torque-6.0.4-r2.ebuild => torque-6.0.4-r4.ebuild} | 2 +- sys-cluster/torque/{torque-6.0.4-r3.ebuild => torque-6.0.4-r5.ebuild} | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sys-cluster/torque/torque-6.0.4-r2.ebuild b/sys-cluster/torque/torque-6.0.4-r4.ebuild similarity index 99% rename from sys-cluster/torque/torque-6.0.4-r2.ebuild rename to sys-cluster/torque/torque-6.0.4-r4.ebuild index b4fd6981da11..00bf710749ed 100644 --- a/sys-cluster/torque/torque-6.0.4-r2.ebuild +++ b/sys-cluster/torque/torque-6.0.4-r4.ebuild @@ -38,7 +38,7 @@ DEPEND="${DEPEND_COMMON} !!sys-cluster/slurm" RDEPEND="${DEPEND_COMMON} - crypt? ( net-misc/openssh ) + crypt? ( virtual/openssh ) !crypt? ( net-misc/netkit-rsh ) !dev-libs/uthash" diff --git a/sys-cluster/torque/torque-6.0.4-r3.ebuild b/sys-cluster/torque/torque-6.0.4-r5.ebuild similarity index 99% rename from sys-cluster/torque/torque-6.0.4-r3.ebuild rename to sys-cluster/torque/torque-6.0.4-r5.ebuild index 268b518c340b..4148d1591d59 100644 --- a/sys-cluster/torque/torque-6.0.4-r3.ebuild +++ b/sys-cluster/torque/torque-6.0.4-r5.ebuild @@ -44,7 +44,7 @@ DEPEND=" RDEPEND=" ${DEPEND_COMMON} - crypt? ( net-misc/openssh ) + crypt? ( virtual/openssh ) !crypt? ( net-misc/netkit-rsh ) !dev-libs/uthash "
[gentoo-commits] repo/gentoo:master commit in: sys-cluster/torque/
commit: a69a6f22169f6190713f6202f3a068d88fbaeebd Author: Marco Scardovi icloud com> AuthorDate: Wed Dec 28 00:34:05 2022 + Commit: Sam James gentoo org> CommitDate: Wed Dec 28 21:00:55 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a69a6f22 sys-cluster/torque: revbump, fix .la error Closes: https://bugs.gentoo.org/852089 Signed-off-by: Marco Scardovi icloud.com> Closes: https://github.com/gentoo/gentoo/pull/28868 Signed-off-by: Sam James gentoo.org> sys-cluster/torque/torque-6.0.4-r3.ebuild | 200 ++ 1 file changed, 200 insertions(+) diff --git a/sys-cluster/torque/torque-6.0.4-r3.ebuild b/sys-cluster/torque/torque-6.0.4-r3.ebuild new file mode 100644 index ..6799806e325e --- /dev/null +++ b/sys-cluster/torque/torque-6.0.4-r3.ebuild @@ -0,0 +1,200 @@ +# Copyright 1999-2022 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="http://www.adaptivecomputing.com/products/open-source/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) \ +
[gentoo-commits] repo/gentoo:master commit in: sys-cluster/torque/
commit: 1d2eedbdf40f9d5b439501b49b94282b254453f0 Author: Marco Scardovi icloud com> AuthorDate: Wed Dec 28 00:26:40 2022 + Commit: Sam James gentoo org> CommitDate: Wed Dec 28 21:00:55 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1d2eedbd sys-cluster/torque: add github upstream metadata Signed-off-by: Marco Scardovi icloud.com> Signed-off-by: Sam James gentoo.org> sys-cluster/torque/metadata.xml | 29 - 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/sys-cluster/torque/metadata.xml b/sys-cluster/torque/metadata.xml index afd1ec84a4a9..4ce5f5914612 100644 --- a/sys-cluster/torque/metadata.xml +++ b/sys-cluster/torque/metadata.xml @@ -1,17 +1,20 @@ https://www.gentoo.org/dtd/metadata.dtd;> - -clus...@gentoo.org -Gentoo Cluster Project - - -Enable the AUTORUN_JOBS codebase -Enable pbs_mom to use linux cgroups to isolate jobs -Enable pbs_mom to utilize linux cpusets if available -Enable authentication via munge -Enable management of Nvidia GPUs -Enable the QUICKCOMMIT codebase -Enable compilation of pbs_server and pbs_sched - + + clus...@gentoo.org + Gentoo Cluster Project + + + Enable the AUTORUN_JOBS codebase + Enable pbs_mom to use linux cgroups to isolate jobs + Enable pbs_mom to utilize linux cpusets if available + Enable authentication via munge + Enable management of Nvidia GPUs + Enable the QUICKCOMMIT codebase + Enable compilation of pbs_server and pbs_sched + + + adaptivecomputing/torque +
[gentoo-commits] repo/gentoo:master commit in: sys-cluster/torque/
commit: 726262fb39d0220b2a19552f323504c8d68a7831 Author: Sam James gentoo org> AuthorDate: Fri Sep 30 23:22:28 2022 + Commit: Sam James gentoo org> CommitDate: Fri Sep 30 23:24:28 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=726262fb sys-cluster/torque: use variable for snapshot commit Was going to fix version but tags have.. disappeared? Signed-off-by: Sam James gentoo.org> sys-cluster/torque/torque-6.0.4-r2.ebuild | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys-cluster/torque/torque-6.0.4-r2.ebuild b/sys-cluster/torque/torque-6.0.4-r2.ebuild index 9019fab049ec..b3886f93053d 100644 --- a/sys-cluster/torque/torque-6.0.4-r2.ebuild +++ b/sys-cluster/torque/torque-6.0.4-r2.ebuild @@ -3,11 +3,12 @@ EAPI=8 +MY_COMMIT="6a0b37f85c7d644e9217cbab1542792d646f59a6" inherit autotools flag-o-matic linux-info toolchain-funcs 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 +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;
[gentoo-commits] repo/gentoo:master commit in: sys-cluster/torque/
commit: 1a785d4a142bc1b8dc49d559bba5da18d56e9ab0 Author: David Seifert gentoo org> AuthorDate: Sun Sep 4 13:03:34 2022 + Commit: David Seifert gentoo org> CommitDate: Sun Sep 4 13:03:34 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1a785d4a sys-cluster/torque: remove stale boost lower bounds Signed-off-by: David Seifert gentoo.org> sys-cluster/torque/torque-6.0.4-r2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-cluster/torque/torque-6.0.4-r2.ebuild b/sys-cluster/torque/torque-6.0.4-r2.ebuild index c6014ac21c1a..9019fab049ec 100644 --- a/sys-cluster/torque/torque-6.0.4-r2.ebuild +++ b/sys-cluster/torque/torque-6.0.4-r2.ebuild @@ -20,7 +20,7 @@ DEPEND_COMMON=" sys-libs/zlib sys-libs/readline:0= dev-libs/libxml2 - >=dev-libs/boost-1.41 + dev-libs/boost cpusets? ( sys-apps/hwloc:= ) munge? ( sys-auth/munge ) nvidia? ( >=x11-drivers/nvidia-drivers-275 )
[gentoo-commits] repo/gentoo:master commit in: sys-cluster/torque/
commit: c893375b79b2873c2819f7c41267eee3d3d7f7ca Author: Sam James gentoo org> AuthorDate: Mon Mar 7 03:42:30 2022 + Commit: Sam James gentoo org> CommitDate: Mon Mar 7 03:42:30 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c893375b sys-cluster/torque: fix UnusedLocalUse Signed-off-by: Sam James gentoo.org> sys-cluster/torque/metadata.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/sys-cluster/torque/metadata.xml b/sys-cluster/torque/metadata.xml index 012610ab3874..afd1ec84a4a9 100644 --- a/sys-cluster/torque/metadata.xml +++ b/sys-cluster/torque/metadata.xml @@ -9,7 +9,6 @@ Enable the AUTORUN_JOBS codebase Enable pbs_mom to use linux cgroups to isolate jobs Enable pbs_mom to utilize linux cpusets if available -Enable the Distributed Resource Management Application API Enable authentication via munge Enable management of Nvidia GPUs Enable the QUICKCOMMIT codebase
[gentoo-commits] repo/gentoo:master commit in: sys-cluster/torque/files/, sys-cluster/torque/
commit: b438445baa9df2af43e0374efa49179b004b720d Author: Sam James gentoo org> AuthorDate: Mon Mar 7 03:28:54 2022 + Commit: Sam James gentoo org> CommitDate: Mon Mar 7 03:28:54 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b438445b sys-cluster/torque: drop 4.1.7-r2, 4.2.10-r2 Closes: https://bugs.gentoo.org/689876 Signed-off-by: Sam James gentoo.org> sys-cluster/torque/Manifest| 2 - sys-cluster/torque/files/CVE-2013-4495.4.1.patch | 343 - .../torque/files/torque-4.1.5.1-tcl8.6.patch | 93 -- .../files/torque-4.2-dont-mess-with-cflags.patch | 27 -- .../torque-4.2-use-NULL-instead-of-char0.patch | 140 - sys-cluster/torque/files/torque-4.2.9-tcl8.6.patch | 99 -- sys-cluster/torque/torque-4.1.7-r2.ebuild | 232 -- sys-cluster/torque/torque-4.2.10-r2.ebuild | 193 8 files changed, 1129 deletions(-) diff --git a/sys-cluster/torque/Manifest b/sys-cluster/torque/Manifest index 8c324318e59e..7de947362c2a 100644 --- a/sys-cluster/torque/Manifest +++ b/sys-cluster/torque/Manifest @@ -1,5 +1,3 @@ -DIST torque-4.1.7.tar.gz 6218108 BLAKE2B 6c1ad0f1bb3f364603ad7f498999bd910491910fa5632b9f6b82e08b3afb8c54e8775c38bc8e5c959aa99d0647c54c7c348cd07bcbe11add8bfab5f3f06a4c80 SHA512 5a085c0a7b205fed075bff4599db90ca5c4bb5f22d87d76fd56539d5cc1935bb8eeffcd4d18ba84401bd4ca128718070b69c8b91ab6814a4638622ba351654e6 -DIST torque-4.2.10-gh-20150517.tar.gz 5836286 BLAKE2B 7108f1adcb6f674526b7db97df4ebcee04ae5c818d4f35ed1230a4e72e52ec0bc3b44e17334a143b21bcd3acccefc3927eca4f98d54d37745c8bb46a75e07045 SHA512 600bb5389b6a4161732b7aa82627f1ebeae238d7091aa2e223d9a14c44bf4668662f664b976f62ba3f1d8a366f90fb6058a8c904e20c26432dccd6abcd9c57fa 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 diff --git a/sys-cluster/torque/files/CVE-2013-4495.4.1.patch b/sys-cluster/torque/files/CVE-2013-4495.4.1.patch deleted file mode 100644 index 810a4f0944a5.. --- a/sys-cluster/torque/files/CVE-2013-4495.4.1.patch +++ /dev/null @@ -1,343 +0,0 @@ -From 2aad72c3d2ac612ecbb66828ac6ed5ab51eff5f3 Mon Sep 17 00:00:00 2001 -From: David Beer -Date: Mon, 11 Nov 2013 11:55:58 -0700 -Subject: [PATCH] Fix CVE 2013-4495. Note: this patch has been verified as - fixing this security hole but has not received other regression testing. - Could not cherry-pick as 2.5 and 4.1 are very different. - - src/server/svr_mail.c | 265 -- - 1 file changed, 170 insertions(+), 95 deletions(-) - -diff --git a/src/server/svr_mail.c b/src/server/svr_mail.c -index b269e82..52f2f1f 100644 a/src/server/svr_mail.c -+++ b/src/server/svr_mail.c -@@ -89,6 +89,7 @@ - #include - #include - #include -+#include - #include "list_link.h" - #include "attribute.h" - #include "server_limits.h" -@@ -136,6 +137,77 @@ void free_mail_info( - - - -+void add_body_info( -+ -+ char *bodyfmtbuf /* I */, -+ mail_info *mi /* I */) -+ -+ { -+ char *bodyfmt = NULL; -+ bodyfmt = strcpy(bodyfmtbuf, "PBS Job Id: %i\n" -+ "Job Name: %j\n"); -+ if (mi->exec_host != NULL) -+{ -+strcat(bodyfmt, "Exec host: %h\n"); -+} -+ -+ strcat(bodyfmt, "%m\n"); -+ -+ if (mi->text != NULL) -+{ -+strcat(bodyfmt, "%d\n"); -+} -+ } -+ -+ -+/* -+ * write_email() -+ * -+ * In emailing, the mail body is written to a pipe connected to -+ * standard input for sendmail. This function supplies the body -+ * of the message. -+ * -+ */ -+void write_email( -+ -+ FILE *outmail_input, -+ mail_info *mi) -+ -+ { -+ char *bodyfmt = NULL; -+ char *subjectfmt = NULL; -+ -+ /* Pipe in mail headers: To: and Subject: */ -+ fprintf(outmail_input, "To: %s\n", mi->mailto); -+ -+ /* mail subject line formating statement */ -+ get_svr_attr_str(SRV_ATR_MailSubjectFmt, (char **)); -+ if (subjectfmt == NULL) -+{ -+subjectfmt = "PBS JOB %i"; -+} -+ -+ fprintf(outmail_input, "Subject: "); -+
[gentoo-commits] repo/gentoo:master commit in: sys-cluster/torque/
commit: 3aa8ff69e3c60516b404e79439be5b19d3af2abf Author: Sam James gentoo org> AuthorDate: Mon Mar 7 01:55:16 2022 + Commit: Sam James gentoo org> CommitDate: Mon Mar 7 01:55:16 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3aa8ff69 sys-cluster/torque: Stabilize 6.0.4-r2 amd64, #689876 Signed-off-by: Sam James gentoo.org> sys-cluster/torque/torque-6.0.4-r2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-cluster/torque/torque-6.0.4-r2.ebuild b/sys-cluster/torque/torque-6.0.4-r2.ebuild index 41b0211bd754..c6014ac21c1a 100644 --- a/sys-cluster/torque/torque-6.0.4-r2.ebuild +++ b/sys-cluster/torque/torque-6.0.4-r2.ebuild @@ -13,7 +13,7 @@ SRC_URI="https://github.com/adaptivecomputing/torque/archive/6a0b37f85c7d644e921 LICENSE="torque-2.5" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" +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="
[gentoo-commits] repo/gentoo:master commit in: sys-cluster/torque/files/, sys-cluster/torque/
commit: 33650b0188bc349f12c62bab24856c2d3ccf9bdb Author: Sam James gentoo org> AuthorDate: Mon Mar 7 01:54:21 2022 + Commit: Sam James gentoo org> CommitDate: Mon Mar 7 01:54:52 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=33650b01 sys-cluster/torque: fix more pthread issues Possibly only an issue with glibc 2.33 (not 2.34) somehow? Fixed now anyway. Bug: https://bugs.gentoo.org/827474 Bug: https://bugs.gentoo.org/689876 Signed-off-by: Sam James gentoo.org> sys-cluster/torque/files/torque-6.0.4-pthreads-deux.patch | 13 + sys-cluster/torque/torque-6.0.4-r2.ebuild | 4 +++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/sys-cluster/torque/files/torque-6.0.4-pthreads-deux.patch b/sys-cluster/torque/files/torque-6.0.4-pthreads-deux.patch new file mode 100644 index ..f9b7046daeac --- /dev/null +++ b/sys-cluster/torque/files/torque-6.0.4-pthreads-deux.patch @@ -0,0 +1,13 @@ +Additional pthread/glibc 2.34 patch. + +https://bugs.gentoo.org/827474 +--- a/src/lib/Libpbs/Makefile.am b/src/lib/Libpbs/Makefile.am +@@ -7,6 +7,7 @@ CLEANFILES = *.gcda *.gcno *.gcov + lib_LTLIBRARIES = libtorque.la + + libtorque_la_LDFLAGS = -version-info 2:0:0 ++libtorque_la_LIBADD = $(PTHREAD_LIBS) + + libtorque_la_SOURCES = ../Libcsv/csv.c ../Libdis/dis.c \ + ../Libdis/discui_.c ../Libdis/discul_.c \ diff --git a/sys-cluster/torque/torque-6.0.4-r2.ebuild b/sys-cluster/torque/torque-6.0.4-r2.ebuild index a9c2d9cf37c6..41b0211bd754 100644 --- a/sys-cluster/torque/torque-6.0.4-r2.ebuild +++ b/sys-cluster/torque/torque-6.0.4-r2.ebuild @@ -54,6 +54,7 @@ PATCHES=( "${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() { @@ -98,7 +99,8 @@ src_prepare() { src_configure() { append-cflags "-fpermissive" - econf \ + # 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) \
[gentoo-commits] repo/gentoo:master commit in: sys-cluster/torque/
commit: 0fa5efd95174940319fc65e53bf30ea29aa408e8 Author: Sam James gentoo org> AuthorDate: Wed Feb 2 06:20:51 2022 + Commit: Sam James gentoo org> CommitDate: Wed Feb 2 06:20:51 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0fa5efd9 sys-cluster/torque: Keyword 6.0.4-r2 arm64, #829381 Signed-off-by: Sam James gentoo.org> sys-cluster/torque/torque-6.0.4-r2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-cluster/torque/torque-6.0.4-r2.ebuild b/sys-cluster/torque/torque-6.0.4-r2.ebuild index ad1d843840bc..a9c2d9cf37c6 100644 --- a/sys-cluster/torque/torque-6.0.4-r2.ebuild +++ b/sys-cluster/torque/torque-6.0.4-r2.ebuild @@ -13,7 +13,7 @@ SRC_URI="https://github.com/adaptivecomputing/torque/archive/6a0b37f85c7d644e921 LICENSE="torque-2.5" SLOT="0" -KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" +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="
[gentoo-commits] repo/gentoo:master commit in: sys-cluster/torque/
commit: a279fc20a5d8d1c869c71edb5e066753909d86ae Author: Sam James gentoo org> AuthorDate: Sun Jan 23 16:58:21 2022 + Commit: Sam James gentoo org> CommitDate: Sun Jan 23 16:59:18 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a279fc20 sys-cluster/torque: update EAPI 6 -> 8 Signed-off-by: Sam James gentoo.org> sys-cluster/torque/torque-6.0.4-r2.ebuild | 17 + 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/sys-cluster/torque/torque-6.0.4-r2.ebuild b/sys-cluster/torque/torque-6.0.4-r2.ebuild index 4bedb3628c5b..ad1d843840bc 100644 --- a/sys-cluster/torque/torque-6.0.4-r2.ebuild +++ b/sys-cluster/torque/torque-6.0.4-r2.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 inherit autotools flag-o-matic linux-info toolchain-funcs @@ -61,9 +61,9 @@ pkg_setup() { # 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)" + 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 @@ -149,6 +149,7 @@ src_install() { 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 @@ -156,13 +157,13 @@ src_install() { } pkg_preinst() { - if [[ -f "${ROOT}etc/pbs_environment" ]]; then - cp "${ROOT}etc/pbs_environment" "${ED}"/etc/pbs_environment || die + if [[ -f "${EROOT}/etc/pbs_environment" ]]; then + cp "${EROOT}/etc/pbs_environment" "${ED}"/etc/pbs_environment || die fi - if use server && [[ -f "${ROOT}${PBS_SERVER_HOME}/server_priv/nodes" ]]; then + if use server && [[ -f "${EROOT}/${PBS_SERVER_HOME}/server_priv/nodes" ]]; then cp \ - "${EROOT}${PBS_SERVER_HOME}/server_priv/nodes" \ + "${EROOT}/${PBS_SERVER_HOME}/server_priv/nodes" \ "${ED}/${PBS_SERVER_HOME}/server_priv/nodes" || die fi
[gentoo-commits] repo/gentoo:master commit in: sys-cluster/torque/
commit: ac47de30a1d630a0fdc9979f41425600feda7f58 Author: Sam James gentoo org> AuthorDate: Sun Jan 23 16:56:52 2022 + Commit: Sam James gentoo org> CommitDate: Sun Jan 23 16:56:52 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ac47de30 sys-cluster/torque: fix IndirectInherits Signed-off-by: Sam James gentoo.org> sys-cluster/torque/torque-6.0.4-r2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-cluster/torque/torque-6.0.4-r2.ebuild b/sys-cluster/torque/torque-6.0.4-r2.ebuild index cbf64c077648..4bedb3628c5b 100644 --- a/sys-cluster/torque/torque-6.0.4-r2.ebuild +++ b/sys-cluster/torque/torque-6.0.4-r2.ebuild @@ -3,7 +3,7 @@ EAPI=6 -inherit autotools flag-o-matic linux-info +inherit autotools flag-o-matic linux-info toolchain-funcs DESCRIPTION="Resource manager and queuing system based on OpenPBS" HOMEPAGE="http://www.adaptivecomputing.com/products/open-source/torque;
[gentoo-commits] repo/gentoo:master commit in: sys-cluster/torque/
commit: 55542ecffa3a87159287157e9514795b27c41799 Author: Sam James gentoo org> AuthorDate: Sun Jan 23 16:55:44 2022 + Commit: Sam James gentoo org> CommitDate: Sun Jan 23 16:56:29 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=55542ecf sys-cluster/torque: fix multiple build issues - Pull in Fedora patch which sorts out autoconf quoting problems - Build with CC=CXX given odd upstream naming (.c is C++ there) - Fix glibc-2.34 build too Closes: https://bugs.gentoo.org/827474 Signed-off-by: Sam James gentoo.org> sys-cluster/torque/Manifest | 1 + sys-cluster/torque/torque-6.0.4-r2.ebuild | 9 - 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/sys-cluster/torque/Manifest b/sys-cluster/torque/Manifest index 712c69b3f5a5..8c324318e59e 100644 --- a/sys-cluster/torque/Manifest +++ b/sys-cluster/torque/Manifest @@ -2,3 +2,4 @@ DIST torque-4.1.7.tar.gz 6218108 BLAKE2B 6c1ad0f1bb3f364603ad7f498999bd910491910 DIST torque-4.2.10-gh-20150517.tar.gz 5836286 BLAKE2B 7108f1adcb6f674526b7db97df4ebcee04ae5c818d4f35ed1230a4e72e52ec0bc3b44e17334a143b21bcd3acccefc3927eca4f98d54d37745c8bb46a75e07045 SHA512 600bb5389b6a4161732b7aa82627f1ebeae238d7091aa2e223d9a14c44bf4668662f664b976f62ba3f1d8a366f90fb6058a8c904e20c26432dccd6abcd9c57fa 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 diff --git a/sys-cluster/torque/torque-6.0.4-r2.ebuild b/sys-cluster/torque/torque-6.0.4-r2.ebuild index feb8fad349fe..cbf64c077648 100644 --- a/sys-cluster/torque/torque-6.0.4-r2.ebuild +++ b/sys-cluster/torque/torque-6.0.4-r2.ebuild @@ -8,7 +8,8 @@ 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 - https://dev.gentoo.org/~juippis/distfiles/tmp/torque-6.0.4-gcc7.patch; + 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" @@ -52,6 +53,7 @@ PATCHES=( "${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 ) pkg_setup() { @@ -118,6 +120,11 @@ src_configure() { --without-loadlibfile } +src_compile() { + # The .c files are C++, and $(CC) is misused. + emake CC="$(tc-getCXX)" +} + src_install() { local dir
[gentoo-commits] repo/gentoo:master commit in: sys-cluster/torque/
commit: 0b89563ac6dc41357e636b6d5d83940b2ef279e6 Author: David Seifert gentoo org> AuthorDate: Tue Jan 4 10:29:58 2022 + Commit: David Seifert gentoo org> CommitDate: Tue Jan 4 10:29:58 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0b89563a sys-cluster/torque: remove implicit kernel_linux Signed-off-by: David Seifert gentoo.org> sys-cluster/torque/torque-4.1.7-r2.ebuild | 4 ++-- sys-cluster/torque/torque-4.2.10-r2.ebuild | 4 ++-- sys-cluster/torque/torque-6.0.4-r2.ebuild | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/sys-cluster/torque/torque-4.1.7-r2.ebuild b/sys-cluster/torque/torque-4.1.7-r2.ebuild index 1b91e3e2602d..c6ced6d96c39 100644 --- a/sys-cluster/torque/torque-4.1.7-r2.ebuild +++ b/sys-cluster/torque/torque-4.1.7-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -14,7 +14,7 @@ SRC_URI="http://www.adaptivecomputing.com/index.php?wpfb_dl=1690 -> ${P}.tar.gz" LICENSE="torque-2.5" SLOT="0" KEYWORDS="~alpha amd64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86" -IUSE="cpusets +crypt doc drmaa kernel_linux munge nvidia server +syslog tk" +IUSE="cpusets +crypt doc drmaa munge nvidia server +syslog tk" DEPEND_COMMON=" sys-libs/zlib diff --git a/sys-cluster/torque/torque-4.2.10-r2.ebuild b/sys-cluster/torque/torque-4.2.10-r2.ebuild index 3366b0f28533..07f2642850af 100644 --- a/sys-cluster/torque/torque-4.2.10-r2.ebuild +++ b/sys-cluster/torque/torque-4.2.10-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -15,7 +15,7 @@ SRC_URI="https://github.com/adaptivecomputing/torque/archive/ddf5c4f40091b615716 LICENSE="torque-2.5" SLOT="0" KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" -IUSE="cpusets +crypt doc drmaa kernel_linux munge nvidia server +syslog tk" +IUSE="cpusets +crypt doc drmaa munge nvidia server +syslog tk" DEPEND_COMMON=" sys-libs/zlib diff --git a/sys-cluster/torque/torque-6.0.4-r2.ebuild b/sys-cluster/torque/torque-6.0.4-r2.ebuild index 982514daa400..feb8fad349fe 100644 --- a/sys-cluster/torque/torque-6.0.4-r2.ebuild +++ b/sys-cluster/torque/torque-6.0.4-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -13,7 +13,7 @@ SRC_URI="https://github.com/adaptivecomputing/torque/archive/6a0b37f85c7d644e921 LICENSE="torque-2.5" SLOT="0" KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" -IUSE="autorun cgroups cpusets +crypt doc kernel_linux munge nvidia quickcommit server +syslog tk" +IUSE="autorun cgroups cpusets +crypt doc munge nvidia quickcommit server +syslog tk" DEPEND_COMMON=" sys-libs/zlib
[gentoo-commits] repo/gentoo:master commit in: sys-cluster/torque/
commit: e2aac6d8fbc7c5809f384d5251323995da94081a Author: Sam James gentoo org> AuthorDate: Fri Oct 29 22:40:08 2021 + Commit: Sam James gentoo org> CommitDate: Fri Oct 29 22:43:41 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e2aac6d8 sys-cluster/torque: add hwloc subslot operator Signed-off-by: Sam James gentoo.org> sys-cluster/torque/{torque-4.1.7-r1.ebuild => torque-4.1.7-r2.ebuild} | 2 +- sys-cluster/torque/{torque-4.2.10-r1.ebuild => torque-4.2.10-r2.ebuild} | 2 +- sys-cluster/torque/{torque-6.0.4-r1.ebuild => torque-6.0.4-r2.ebuild} | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sys-cluster/torque/torque-4.1.7-r1.ebuild b/sys-cluster/torque/torque-4.1.7-r2.ebuild similarity index 99% rename from sys-cluster/torque/torque-4.1.7-r1.ebuild rename to sys-cluster/torque/torque-4.1.7-r2.ebuild index 4246e10b66c..1b91e3e2602 100644 --- a/sys-cluster/torque/torque-4.1.7-r1.ebuild +++ b/sys-cluster/torque/torque-4.1.7-r2.ebuild @@ -20,7 +20,7 @@ DEPEND_COMMON=" sys-libs/zlib sys-libs/readline:0= dev-libs/openssl:0= - cpusets? ( sys-apps/hwloc ) + cpusets? ( sys-apps/hwloc:= ) munge? ( sys-auth/munge ) nvidia? ( >=x11-drivers/nvidia-drivers-275 ) tk? ( diff --git a/sys-cluster/torque/torque-4.2.10-r1.ebuild b/sys-cluster/torque/torque-4.2.10-r2.ebuild similarity index 99% rename from sys-cluster/torque/torque-4.2.10-r1.ebuild rename to sys-cluster/torque/torque-4.2.10-r2.ebuild index 682843cf7e6..3366b0f2853 100644 --- a/sys-cluster/torque/torque-4.2.10-r1.ebuild +++ b/sys-cluster/torque/torque-4.2.10-r2.ebuild @@ -22,7 +22,7 @@ DEPEND_COMMON=" sys-libs/readline:0= dev-libs/libxml2 dev-libs/openssl:0= - cpusets? ( sys-apps/hwloc ) + cpusets? ( sys-apps/hwloc:= ) munge? ( sys-auth/munge ) nvidia? ( >=x11-drivers/nvidia-drivers-275 ) tk? ( diff --git a/sys-cluster/torque/torque-6.0.4-r1.ebuild b/sys-cluster/torque/torque-6.0.4-r2.ebuild similarity index 99% rename from sys-cluster/torque/torque-6.0.4-r1.ebuild rename to sys-cluster/torque/torque-6.0.4-r2.ebuild index 0ec3060e1d8..982514daa40 100644 --- a/sys-cluster/torque/torque-6.0.4-r1.ebuild +++ b/sys-cluster/torque/torque-6.0.4-r2.ebuild @@ -20,7 +20,7 @@ DEPEND_COMMON=" sys-libs/readline:0= dev-libs/libxml2 >=dev-libs/boost-1.41 - cpusets? ( sys-apps/hwloc ) + cpusets? ( sys-apps/hwloc:= ) munge? ( sys-auth/munge ) nvidia? ( >=x11-drivers/nvidia-drivers-275 ) tk? (
[gentoo-commits] repo/gentoo:master commit in: sys-cluster/torque/
commit: f232d851252f75f2a0c88f4fec781630e2808fd6 Author: Marek Szuba gentoo org> AuthorDate: Mon Jul 5 15:55:04 2021 + Commit: Marek Szuba gentoo org> CommitDate: Mon Jul 5 16:53:19 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f232d851 sys-cluster/torque: keyword 6.0.4-r1 for ~riscv Signed-off-by: Marek Szuba gentoo.org> sys-cluster/torque/torque-6.0.4-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-cluster/torque/torque-6.0.4-r1.ebuild b/sys-cluster/torque/torque-6.0.4-r1.ebuild index 3def8e696c1..0ec3060e1d8 100644 --- a/sys-cluster/torque/torque-6.0.4-r1.ebuild +++ b/sys-cluster/torque/torque-6.0.4-r1.ebuild @@ -12,7 +12,7 @@ SRC_URI="https://github.com/adaptivecomputing/torque/archive/6a0b37f85c7d644e921 LICENSE="torque-2.5" SLOT="0" -KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" +KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" IUSE="autorun cgroups cpusets +crypt doc kernel_linux munge nvidia quickcommit server +syslog tk" DEPEND_COMMON="
[gentoo-commits] repo/gentoo:master commit in: sys-cluster/torque/
commit: bb6c46a340049c9fd74df1a0ec88553868ed5453 Author: Mikle Kolyada gentoo org> AuthorDate: Sat May 1 07:15:34 2021 + Commit: Mikle Kolyada gentoo org> CommitDate: Sat May 1 07:15:34 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bb6c46a3 sys-cluster/torque: remove libressl support Package-Manager: Portage-3.0.18, Repoman-3.0.2 Signed-off-by: Mikle Kolyada gentoo.org> sys-cluster/torque/torque-4.1.7-r1.ebuild | 5 ++--- sys-cluster/torque/torque-4.2.10-r1.ebuild | 5 ++--- sys-cluster/torque/torque-6.0.4-r1.ebuild | 4 ++-- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/sys-cluster/torque/torque-4.1.7-r1.ebuild b/sys-cluster/torque/torque-4.1.7-r1.ebuild index ea5c56333ff..4246e10b66c 100644 --- a/sys-cluster/torque/torque-4.1.7-r1.ebuild +++ b/sys-cluster/torque/torque-4.1.7-r1.ebuild @@ -14,13 +14,12 @@ SRC_URI="http://www.adaptivecomputing.com/index.php?wpfb_dl=1690 -> ${P}.tar.gz" LICENSE="torque-2.5" SLOT="0" KEYWORDS="~alpha amd64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86" -IUSE="cpusets +crypt doc drmaa kernel_linux libressl munge nvidia server +syslog tk" +IUSE="cpusets +crypt doc drmaa kernel_linux munge nvidia server +syslog tk" DEPEND_COMMON=" sys-libs/zlib sys-libs/readline:0= - libressl? ( dev-libs/libressl:0= ) - !libressl? ( dev-libs/openssl:0= ) + dev-libs/openssl:0= cpusets? ( sys-apps/hwloc ) munge? ( sys-auth/munge ) nvidia? ( >=x11-drivers/nvidia-drivers-275 ) diff --git a/sys-cluster/torque/torque-4.2.10-r1.ebuild b/sys-cluster/torque/torque-4.2.10-r1.ebuild index 46e0fd38f96..682843cf7e6 100644 --- a/sys-cluster/torque/torque-4.2.10-r1.ebuild +++ b/sys-cluster/torque/torque-4.2.10-r1.ebuild @@ -15,14 +15,13 @@ SRC_URI="https://github.com/adaptivecomputing/torque/archive/ddf5c4f40091b615716 LICENSE="torque-2.5" SLOT="0" KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" -IUSE="cpusets +crypt doc drmaa kernel_linux libressl munge nvidia server +syslog tk" +IUSE="cpusets +crypt doc drmaa kernel_linux munge nvidia server +syslog tk" DEPEND_COMMON=" sys-libs/zlib sys-libs/readline:0= dev-libs/libxml2 - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) + dev-libs/openssl:0= cpusets? ( sys-apps/hwloc ) munge? ( sys-auth/munge ) nvidia? ( >=x11-drivers/nvidia-drivers-275 ) diff --git a/sys-cluster/torque/torque-6.0.4-r1.ebuild b/sys-cluster/torque/torque-6.0.4-r1.ebuild index b551a3e0669..3def8e696c1 100644 --- a/sys-cluster/torque/torque-6.0.4-r1.ebuild +++ b/sys-cluster/torque/torque-6.0.4-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -13,7 +13,7 @@ SRC_URI="https://github.com/adaptivecomputing/torque/archive/6a0b37f85c7d644e921 LICENSE="torque-2.5" SLOT="0" KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" -IUSE="autorun cgroups cpusets +crypt doc kernel_linux libressl munge nvidia quickcommit server +syslog tk" +IUSE="autorun cgroups cpusets +crypt doc kernel_linux munge nvidia quickcommit server +syslog tk" DEPEND_COMMON=" sys-libs/zlib
[gentoo-commits] repo/gentoo:master commit in: sys-cluster/torque/, sys-cluster/torque/files/
commit: 0c4b62b4f66782541d7a7fbb579a078e7661f38f Author: Joonas Niilola gentoo org> AuthorDate: Sun Nov 15 13:54:18 2020 + Commit: Joonas Niilola gentoo org> CommitDate: Sun Nov 15 15:31:18 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0c4b62b4 sys-cluster/torque: fix SizeViolation issue Closes: https://bugs.gentoo.org/748216 Signed-off-by: Joonas Niilola gentoo.org> sys-cluster/torque/Manifest |1 + sys-cluster/torque/files/torque-6.0.4-gcc7.patch | 1606 -- sys-cluster/torque/torque-6.0.4-r1.ebuild|5 +- 3 files changed, 4 insertions(+), 1608 deletions(-) diff --git a/sys-cluster/torque/Manifest b/sys-cluster/torque/Manifest index 14f7f301012..712c69b3f5a 100644 --- a/sys-cluster/torque/Manifest +++ b/sys-cluster/torque/Manifest @@ -1,3 +1,4 @@ DIST torque-4.1.7.tar.gz 6218108 BLAKE2B 6c1ad0f1bb3f364603ad7f498999bd910491910fa5632b9f6b82e08b3afb8c54e8775c38bc8e5c959aa99d0647c54c7c348cd07bcbe11add8bfab5f3f06a4c80 SHA512 5a085c0a7b205fed075bff4599db90ca5c4bb5f22d87d76fd56539d5cc1935bb8eeffcd4d18ba84401bd4ca128718070b69c8b91ab6814a4638622ba351654e6 DIST torque-4.2.10-gh-20150517.tar.gz 5836286 BLAKE2B 7108f1adcb6f674526b7db97df4ebcee04ae5c818d4f35ed1230a4e72e52ec0bc3b44e17334a143b21bcd3acccefc3927eca4f98d54d37745c8bb46a75e07045 SHA512 600bb5389b6a4161732b7aa82627f1ebeae238d7091aa2e223d9a14c44bf4668662f664b976f62ba3f1d8a366f90fb6058a8c904e20c26432dccd6abcd9c57fa +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 diff --git a/sys-cluster/torque/files/torque-6.0.4-gcc7.patch b/sys-cluster/torque/files/torque-6.0.4-gcc7.patch deleted file mode 100644 index 340eb9e1bfc..000 --- a/sys-cluster/torque/files/torque-6.0.4-gcc7.patch +++ /dev/null @@ -1,1606 +0,0 @@ -From 8a0b748d3644dde30372ee25c4fe05bec10b2166 Mon Sep 17 00:00:00 2001 -From: Chad Vizino -Date: Fri, 29 Mar 2019 09:23:08 -0600 -Subject: [PATCH] TRQ-4330 - fix gcc/g++ 7 compile issues - - src/cmds/qdel.c| 6 +- - src/cmds/qsub_functions.c | 12 ++-- - src/cmds/qterm.c | 2 + - src/include/array.h| 2 +- - src/include/attribute.h| 4 +- - src/lib/Libattr/attr_fn_acl.c | 4 +- - src/lib/Libattr/attr_fn_arst.c | 4 +- - src/lib/Libcmds/cvtdate.c | 8 +-- - src/lib/Libdis/disrsc.c| 2 + - src/lib/Libdis/disrsi.c| 2 + - src/lib/Libdis/disrsl.c| 2 + - src/lib/Libdis/disrss.c| 2 + - src/lib/Libnet/net_client.c| 4 +- - src/lib/Libnet/net_common.c| 1 + - src/lib/Libutils/jsoncpp.cpp | 9 +++ - src/lib/Libutils/numa_chip.cpp | 10 +-- - src/resmom/checkpoint.c| 59 ++-- - src/resmom/generate_alps_status.c | 7 +- - src/resmom/linux/mom_mach.c| 79 + - src/resmom/mom_main.c | 16 ++--- - src/resmom/mom_req_quejob.c| 12 ++-- - src/resmom/mom_server.c| 41 +-- - src/resmom/parse_config.c | 4 +- - src/resmom/requests.c | 8 +-- - src/scheduler.cc/samples/fifo/dedtime.c| 2 +- - src/server/array_func.c| 6 +- - src/server/array_func.h| 2 +- - src/server/geteusernam.c | 2 +- - src/server/job_func.c | 28 ++-- - src/server/node_attr_def.c | 16 ++--- - src/server/node_manager.c | 5 +- - src/server/pbsd_init.c | 2 + - src/server/process_request.c | 18 ++--- - src/server/req_jobobit.c | 16 - - src/server/req_quejob.c| 2 +- - src/server/req_runjob.c| 10 ++- - src/server/req_stat.c | 2 +- - src/server/svr_chk_owner.c | 47 + - src/server/svr_jobfunc.c | 80 +++--- - src/test/catch_child/scaffolding.c | 1 + - src/test/geteusernam/scaffolding.c | 2 +- - src/test/node_manager/test_uut.c | 4 +- - src/test/pbs_log/scaffolding.c | 3 +- - src/test/pbsd_main/scaffolding.c
[gentoo-commits] repo/gentoo:master commit in: sys-cluster/torque/
commit: 133b4c5bd87f478f8445cdc73d079617dcb0a66b Author: Sergei Trofimovich gentoo org> AuthorDate: Fri May 22 18:50:31 2020 + Commit: Sergei Trofimovich gentoo org> CommitDate: Fri May 22 18:50:37 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=133b4c5b sys-cluster/torque: use integer comparison, bug #705278 Use integer comparison instead of lexicographical one. Bug: https://bugs.gentoo.org/705278 Package-Manager: Portage-2.3.99, Repoman-2.3.22 Signed-off-by: Sergei Trofimovich gentoo.org> sys-cluster/torque/torque-4.2.10-r1.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys-cluster/torque/torque-4.2.10-r1.ebuild b/sys-cluster/torque/torque-4.2.10-r1.ebuild index bf8705f64b4..c992fb2b62c 100644 --- a/sys-cluster/torque/torque-4.2.10-r1.ebuild +++ b/sys-cluster/torque/torque-4.2.10-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -184,7 +184,7 @@ pkg_postinst() { fi done fi - if [[ ${showmessage} > 0 ]]; then + if [[ ${showmessage} -gt 0 ]]; then elog "Important v4.x changes:" elog " - The on-wire protocol version has been changed." elog "Versions of Torque before 4.0.0 are no longer able to communicate."
[gentoo-commits] repo/gentoo:master commit in: sys-cluster/torque/
commit: ca6424f438c1e888a7cf643b65927b03864e14c2 Author: Sergei Trofimovich gentoo org> AuthorDate: Sun Apr 19 14:23:19 2020 + Commit: Sergei Trofimovich gentoo org> CommitDate: Sun Apr 19 14:23:26 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ca6424f4 sys-cluster/torque: drop lexicographical version compare torque < 4 is not in tree for a while. Let's just drop dead code. Closes: https://bugs.gentoo.org/705278 Package-Manager: Portage-2.3.99, Repoman-2.3.22 Signed-off-by: Sergei Trofimovich gentoo.org> sys-cluster/torque/torque-4.1.7-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-cluster/torque/torque-4.1.7-r1.ebuild b/sys-cluster/torque/torque-4.1.7-r1.ebuild index 6e27735c337..12099f7e7c5 100644 --- a/sys-cluster/torque/torque-4.1.7-r1.ebuild +++ b/sys-cluster/torque/torque-4.1.7-r1.ebuild @@ -174,7 +174,7 @@ pkg_postinst() { echo "" elog "For a basic setup, you may use emerge --config ${PN}" echo "" - if [[ -z "${REPLACING_VERSIONS}" ]] || [[ ${REPLACING_VERSIONS} < 4 ]]; then + if [[ -z "${REPLACING_VERSIONS}" ]]; then elog "Important 4.0+ updates" elog " - The on-wire protocol version has been changed." elog "Versions of Torque before 4.0.0 are no longer able to communicate."
[gentoo-commits] repo/gentoo:master commit in: sys-cluster/torque/
commit: e9eca8ffeb8fb002255605616789264880d3a2d2 Author: Ian Stakenvicius gentoo org> AuthorDate: Thu Mar 5 19:15:56 2020 + Commit: Ian Stakenvicius gentoo org> CommitDate: Thu Mar 5 19:16:28 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e9eca8ff sys-cluster/torque: drop broken USE=drmaa, fix doc and econf warn -Fixed the documentation link in pkg_postinst -Dropped USE=drmaa as its broken and upstream hasn't done anything with the code since torque-2 -Removed the --disable-geometry-request config option Closes: https://bugs.gentoo.org/697124 Package-Manager: Portage-2.3.79, Repoman-2.3.16 Signed-off-by: Ian Stakenvicius gentoo.org> sys-cluster/torque/torque-6.0.4-r1.ebuild | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sys-cluster/torque/torque-6.0.4-r1.ebuild b/sys-cluster/torque/torque-6.0.4-r1.ebuild index 456675c959f..6f18c025266 100644 --- a/sys-cluster/torque/torque-6.0.4-r1.ebuild +++ b/sys-cluster/torque/torque-6.0.4-r1.ebuild @@ -12,7 +12,7 @@ SRC_URI="https://github.com/adaptivecomputing/torque/archive/6a0b37f85c7d644e921 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" +IUSE="autorun cgroups cpusets +crypt doc kernel_linux libressl munge nvidia quickcommit server +syslog tk" DEPEND_COMMON=" sys-libs/zlib @@ -100,12 +100,11 @@ src_configure() { $(use_enable tk tcl-qstat) \ $(use_enable syslog) \ $(use_enable server) \ - $(use_enable drmaa) \ + --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 cpusets geometry-request) --disable-geometry-request) \ $(usex kernel_linux $(use_enable cgroups) --disable-cgroups) \ $(use_enable autorun) \ $(use_enable quickcommit) \ @@ -113,6 +112,7 @@ src_configure() { --with-environ=/etc/pbs_environment \ --with-default-server=${PBS_SERVER_NAME} \ --disable-gcc-warnings \ + --disable-silent-rules \ --with-tcp-retry-limit=2 \ --without-loadlibfile } @@ -174,6 +174,6 @@ 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; + elog "http://docs.adaptivecomputing.com/torque/${PV//./-}/adminGuide/torquehelp.htm#topics/torque/1-installConfig/initializeConfigOnServer.htm; fi }
[gentoo-commits] repo/gentoo:master commit in: sys-cluster/torque/, sys-cluster/torque/files/
commit: 9af2199057ca2caed5237c4b9f9af2bbcbb71612 Author: Ian Stakenvicius gentoo org> AuthorDate: Tue Oct 22 17:02:55 2019 + Commit: Ian Stakenvicius gentoo org> CommitDate: Tue Oct 22 17:06:18 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9af21990 sys-cluster/torque: fix build issues with newer toolchains Backported upstream patch for 6.1.3 codebase to fix "gcc-7 errors", which resolves build errors from using C++ standards newer than 03. Also removed unpatch torque-6.0.4 ebuild as it no longer builds Package-Manager: Portage-2.3.69, Repoman-2.3.16 Signed-off-by: Ian Stakenvicius gentoo.org> .../torque-6.0.3-fix-emptystring-comparison.patch | 49 + .../torque-6.0.4-error_buf_overflow_prevent.patch | 11 + sys-cluster/torque/files/torque-6.0.4-gcc7.patch | 1606 sys-cluster/torque/torque-6.0.4-r1.ebuild |4 +- sys-cluster/torque/torque-6.0.4.ebuild | 177 --- 5 files changed, 1668 insertions(+), 179 deletions(-) diff --git a/sys-cluster/torque/files/torque-6.0.3-fix-emptystring-comparison.patch b/sys-cluster/torque/files/torque-6.0.3-fix-emptystring-comparison.patch index 0666eda1593..6584f0ea8b3 100644 --- a/sys-cluster/torque/files/torque-6.0.3-fix-emptystring-comparison.patch +++ b/sys-cluster/torque/files/torque-6.0.3-fix-emptystring-comparison.patch @@ -19,3 +19,52 @@ while ((current != NULL) && (*current != '\0')) { +--- a/src/cmds/qsub_functions.c2017-01-24 18:35:27.0 -0500 b/src/cmds/qsub_functions.c2017-11-21 13:40:27.201964749 -0500 +@@ -900,7 +900,7 @@ + else + { + char *tmp_host = pbs_default(); +-if (tmp_host == '\0') ++if (*tmp_host == '\0') + hash_add_or_exit(job_attr, ATTR_pbs_o_server, qsub_host, LOGIC_DATA); + else + hash_add_or_exit(job_attr, ATTR_pbs_o_server, tmp_host, LOGIC_DATA); +--- a/src/cmds/pbsnodes.c 2017-01-24 18:35:27.0 -0500 b/src/cmds/pbsnodes.c 2017-11-21 13:40:27.201964749 -0500 +@@ -900,7 +900,7 @@ + { + nodeargs = (char **)calloc(2, sizeof(char *)); + nodeargs[0] = strdup(""); +-nodeargs[1] = '\0'; ++nodeargs[1] = NULL; + } + } + } +@@ -1020,7 +1020,7 @@ + + MXMLCreateE(, "Data"); + +-for (lindex = 0;nodeargs[lindex] != '\0';lindex++) ++for (lindex = 0;nodeargs[lindex] != NULL;lindex++) + { + bstatus = statnode(con, nodeargs[lindex]); + +@@ -1041,7 +1041,7 @@ + } + else + { +-for (lindex = 0;nodeargs[lindex] != '\0';lindex++) ++for (lindex = 0;nodeargs[lindex] != NULL;lindex++) + { + bstatus = statnode(con, nodeargs[lindex]); + +@@ -1065,7 +1065,7 @@ + + /* list any node that is DOWN, OFFLINE, or UNKNOWN */ + +- for (lindex = 0;nodeargs[lindex] != '\0';lindex++) ++ for (lindex = 0;nodeargs[lindex] != NULL;lindex++) + { + bstatus = statnode(con, nodeargs[lindex]); + diff --git a/sys-cluster/torque/files/torque-6.0.4-error_buf_overflow_prevent.patch b/sys-cluster/torque/files/torque-6.0.4-error_buf_overflow_prevent.patch new file mode 100644 index 000..639f4f0662f --- /dev/null +++ b/sys-cluster/torque/files/torque-6.0.4-error_buf_overflow_prevent.patch @@ -0,0 +1,11 @@ +--- a/src/daemon_client/trq_auth_daemon.c 2017-08-29 18:25:11.0 -0400 b/src/daemon_client/trq_auth_daemon.c 2019-10-21 13:58:47.441212099 -0400 +@@ -134,7 +134,7 @@ + { +openlog("daemonize_trqauthd", LOG_PID | LOG_NOWAIT, LOG_DAEMON); +syslog(LOG_ALERT, "Failed to create client_logs directory: %s errno: %d error message: %s", path_log, errno, strerror(errno)); +- sprintf(error_buf,"Failed to create client_logs directory: %s, error message: %s",path_log,strerror(errno)); ++ snprintf(error_buf,sizeof(error_buf),"Failed to create client_logs directory: %s, error message: %s",path_log,strerror(errno)); +log_err(errno,__func__,error_buf); +closelog(); +return(PBSE_SYSTEM); diff --git a/sys-cluster/torque/files/torque-6.0.4-gcc7.patch b/sys-cluster/torque/files/torque-6.0.4-gcc7.patch new file mode 100644 index 000..340eb9e1bfc --- /dev/null +++ b/sys-cluster/torque/files/torque-6.0.4-gcc7.patch @@ -0,0 +1,1606 @@ +From 8a0b748d3644dde30372ee25c4fe05bec10b2166 Mon Sep 17 00:00:00 2001 +From: Chad Vizino +Date: Fri, 29 Mar 2019 09:23:08 -0600 +Subject: [PATCH] TRQ-4330 - fix gcc/g++ 7 compile issues + +--- + src/cmds/qdel.c| 6 +- + src/cmds/qsub_functions.c | 12 ++-- + src/cmds/qterm.c | 2 + + src/include/array.h| 2 +- + src/include/attribute.h| 4 +- + src/lib/Libattr/attr_fn_acl.c | 4 +- + src/lib/Libattr/attr_fn_arst.c | 4 +- + src/lib/Libcmds/cvtdate.c
[gentoo-commits] repo/gentoo:master commit in: sys-cluster/torque/
commit: 625bf1cca355fde685db06db9325a7cf7c50219c Author: Ian Stakenvicius gentoo org> AuthorDate: Tue Oct 15 20:43:34 2019 + Commit: Ian Stakenvicius gentoo org> CommitDate: Tue Oct 15 20:44:33 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=625bf1cc sys-cluster/torque: adjust flags for modern toolchains This is a workaround patch that supports building toqrue on an at-time-of-commit stable stage3 environment. Package-Manager: Portage-2.3.69, Repoman-2.3.16 Signed-off-by: Ian Stakenvicius gentoo.org> sys-cluster/torque/torque-6.0.4-r1.ebuild | 4 1 file changed, 4 insertions(+) diff --git a/sys-cluster/torque/torque-6.0.4-r1.ebuild b/sys-cluster/torque/torque-6.0.4-r1.ebuild index bc520dc0ace..1607c10d62d 100644 --- a/sys-cluster/torque/torque-6.0.4-r1.ebuild +++ b/sys-cluster/torque/torque-6.0.4-r1.ebuild @@ -91,6 +91,10 @@ src_prepare() { } src_configure() { + append-cflags "-fpermissive" + use kernel_linux && append-cflags "-Dlinux" + append-cxxflags "-std=c++03" + econf \ $(use_enable tk gui) \ $(use_enable tk tcl-qstat) \
[gentoo-commits] repo/gentoo:master commit in: sys-cluster/torque/
commit: d03fd226cd4766b5f090433aae8c288187f1a7a6 Author: Hans de Graaff gentoo org> AuthorDate: Sun Jul 14 10:25:43 2019 + Commit: Hans de Graaff gentoo org> CommitDate: Sun Jul 14 18:27:41 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d03fd226 sys-cluster/torque: also drop actual dependencies Signed-off-by: Hans de Graaff gentoo.org> Package-Manager: Portage-2.3.66, Repoman-2.3.11 sys-cluster/torque/torque-6.0.4-r1.ebuild | 2 -- 1 file changed, 2 deletions(-) diff --git a/sys-cluster/torque/torque-6.0.4-r1.ebuild b/sys-cluster/torque/torque-6.0.4-r1.ebuild index 4cfac4df5ce..bc520dc0ace 100644 --- a/sys-cluster/torque/torque-6.0.4-r1.ebuild +++ b/sys-cluster/torque/torque-6.0.4-r1.ebuild @@ -19,8 +19,6 @@ DEPEND_COMMON=" sys-libs/readline:0= dev-libs/libxml2 >=dev-libs/boost-1.41 - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) cpusets? ( sys-apps/hwloc ) munge? ( sys-auth/munge ) nvidia? ( >=x11-drivers/nvidia-drivers-275 )
[gentoo-commits] repo/gentoo:master commit in: sys-cluster/torque/files/, sys-cluster/torque/
commit: b0315a1c158e7d652da3d55da025e7f33df82b99 Author: Hans de Graaff gentoo org> AuthorDate: Sun Jul 14 09:54:20 2019 + Commit: Hans de Graaff gentoo org> CommitDate: Sun Jul 14 09:54:42 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b0315a1c sys-cluster/torque: avoid unneeded openssl dependency Fixes: https://bugs.gentoo.org/677736 Signed-off-by: Hans de Graaff gentoo.org> Package-Manager: Portage-2.3.66, Repoman-2.3.11 .../torque/files/torque-6.0.4-no-openssl.patch | 60 +++ sys-cluster/torque/torque-6.0.4-r1.ebuild | 178 + 2 files changed, 238 insertions(+) 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 000..3b7e3cd4918 --- /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 000..4cfac4df5ce --- /dev/null +++ b/sys-cluster/torque/torque-6.0.4-r1.ebuild @@ -0,0 +1,178 @@ +# 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 + !libressl? ( dev-libs/openssl:0= ) + libressl? ( dev-libs/libressl:0= ) + 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 +
[gentoo-commits] repo/gentoo:master commit in: sys-cluster/torque/
commit: caea5bc25186343247d5a68dfac73c3a0430ba58 Author: Ian Stakenvicius gentoo org> AuthorDate: Wed Feb 27 17:22:26 2019 + Commit: Ian Stakenvicius gentoo org> CommitDate: Thu Mar 7 17:37:43 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=caea5bc2 sys-cluster/torque: fix documentation URLs in postinst message Closes: https://bugs.gentoo.org/666224 Signed-off-by: Ian Stakenvicius gentoo.org> Package-Manager: Portage-2.3.49, Repoman-2.3.11 sys-cluster/torque/torque-4.2.10-r1.ebuild | 2 +- sys-cluster/torque/torque-6.0.3.ebuild | 16 +--- 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/sys-cluster/torque/torque-4.2.10-r1.ebuild b/sys-cluster/torque/torque-4.2.10-r1.ebuild index 7c06eb30b27..bf8705f64b4 100644 --- a/sys-cluster/torque/torque-4.2.10-r1.ebuild +++ b/sys-cluster/torque/torque-4.2.10-r1.ebuild @@ -175,7 +175,7 @@ pkg_postinst() { showmessage=0; 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//./-}/Content/topics/1-installConfig/initializeConfigOnServer.htm; + elog "http://docs.adaptivecomputing.com/torque/${PN//./-}/help.htm#topics/1-installConfig/initializeConfigOnServer.htm; elog else for i in ${REPLACING_VERSIONS} ; do diff --git a/sys-cluster/torque/torque-6.0.3.ebuild b/sys-cluster/torque/torque-6.0.3.ebuild index ec9563e95bf..75508148652 100644 --- a/sys-cluster/torque/torque-6.0.3.ebuild +++ b/sys-cluster/torque/torque-6.0.3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -165,15 +165,9 @@ pkg_preinst() { } pkg_postinst() { - 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//./-}/Content/topics/1-installConfig/initializeConfigOnServer.htm; - if [[ -z "${REPLACING_VERSIONS}" ]] || [[ ${REPLACING_VERSIONS} < 4 ]]; then - echo - elog "Important 4.0+ updates" - elog " - The on-wire protocol version has been changed." - elog "Versions of Torque before 4.0.0 are no longer able to communicate." - elog " - pbs_iff has been replaced by trqauthd, you will now need to add" - elog "trqauthd to your default runlevel." +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 }
[gentoo-commits] repo/gentoo:master commit in: sys-cluster/torque/files/
commit: f6a2e18a206684aaba8de78d3c2997d9f18a92cb Author: Ian Stakenvicius gentoo org> AuthorDate: Thu Mar 7 17:36:52 2019 + Commit: Ian Stakenvicius gentoo org> CommitDate: Thu Mar 7 17:37:47 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f6a2e18a sys-cluster/torque: cleanup filesdir Signed-off-by: Ian Stakenvicius gentoo.org> Package-Manager: Portage-2.3.51, Repoman-2.3.11 .../files/CVE-2013-4319-2.x-root-submit-fix.patch | 40 -- sys-cluster/torque/files/CVE-2013-4495.patch | 32 - sys-cluster/torque/files/CVE-2014-0749.patch | 32 - ...mit-tm_adopt-to-only-adopt-a-session-id-t.patch | 134 - sys-cluster/torque/files/tcl8.6.patch | 87 - 5 files changed, 325 deletions(-) diff --git a/sys-cluster/torque/files/CVE-2013-4319-2.x-root-submit-fix.patch b/sys-cluster/torque/files/CVE-2013-4319-2.x-root-submit-fix.patch deleted file mode 100644 index aa53239f157..000 --- a/sys-cluster/torque/files/CVE-2013-4319-2.x-root-submit-fix.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 5dee0365a56dd2cc4cfd0b182bc843b4f32c086c Mon Sep 17 00:00:00 2001 -From: Justin Bronder -Date: Mon, 23 Dec 2013 12:40:27 -0500 -Subject: [PATCH] CVE-2013-4319: 2.x root submit fix - -https://bugs.gentoo.org/show_bug.cgi?id=484320 -http://nvd.nist.gov/nvd.cfm?cvename=CVE-2013-4319\ - src/server/process_request.c | 15 +++ - 1 file changed, 15 insertions(+) - -diff --git a/src/server/process_request.c b/src/server/process_request.c -index d4a3c92..b06a333 100644 a/src/server/process_request.c -+++ b/src/server/process_request.c -@@ -640,6 +640,21 @@ void process_request( - log_buffer); - } - -+if (svr_conn[sfds].cn_authen != PBS_NET_CONN_FROM_PRIVIL) -+ { -+ sprintf(log_buffer, "request type %s from host %s rejected (connection not privileged)", -+reqtype_to_txt(request->rq_type), -+request->rq_host); -+ -+ log_record(PBSEVENT_JOB, PBS_EVENTCLASS_JOB, id, log_buffer); -+ -+ req_reject(PBSE_BADHOST, 0, request, NULL, "request not authorized"); -+ -+ close_client(sfds); -+ -+ return; -+ } -+ - if (!tfind(svr_conn[sfds].cn_addr, )) - { - sprintf(log_buffer, "request type %s from host %s rejected (host not authorized)", --- -1.8.3.2 - diff --git a/sys-cluster/torque/files/CVE-2013-4495.patch b/sys-cluster/torque/files/CVE-2013-4495.patch deleted file mode 100644 index 41232c07ec7..000 --- a/sys-cluster/torque/files/CVE-2013-4495.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 8246d967bbcf174482ef01b1bf4920a5944b1011 Mon Sep 17 00:00:00 2001 -From: David Beer -Date: Wed, 13 Nov 2013 10:47:48 -0700 -Subject: [PATCH] Use Michael Jenning's patch for CVE 2013-4495 instead of the - original. This one is being used because 2.5 should face the minimal possible - change. - - src/server/svr_mail.c | 6 ++ - 1 file changed, 2 insertions(+), 4 deletions(-) - -diff --git a/src/server/svr_mail.c b/src/server/svr_mail.c -index 26b6dd7..241bdfc 100644 a/src/server/svr_mail.c -+++ b/src/server/svr_mail.c -@@ -372,11 +372,9 @@ void svr_mailowner( - exit(1); - } - -- sprintf(cmdbuf, "%s -f %s %s", -- -+ sprintf(cmdbuf, "%s -t -f %s", - SENDMAIL_CMD, -- mailfrom, -- mailto); -+ mailfrom); - - outmail = (FILE *)popen(cmdbuf, "w"); - --- -1.8.3.2 - diff --git a/sys-cluster/torque/files/CVE-2014-0749.patch b/sys-cluster/torque/files/CVE-2014-0749.patch deleted file mode 100644 index 52131edcf7e..000 --- a/sys-cluster/torque/files/CVE-2014-0749.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 3ed749263abe3d69fa3626d142a5789dcb5a5684 Mon Sep 17 00:00:00 2001 -From: David Beer -Date: Fri, 23 Aug 2013 15:53:09 -0600 -Subject: [PATCH] Merge pull request #171 into 2.5-fixes. - - src/lib/Libdis/disrsi_.c | 9 + - 1 file changed, 9 insertions(+) - -diff --git a/src/lib/Libdis/disrsi_.c b/src/lib/Libdis/disrsi_.c -index 69edd28..154514c 100644 a/src/lib/Libdis/disrsi_.c -+++ b/src/lib/Libdis/disrsi_.c -@@ -112,6 +112,15 @@ int disrsi_( - if (dis_umaxd == 0) - disiui_(); - -+ if (count >= dis_umaxd) -+{ -+if (count > dis_umaxd) -+ goto overflow; -+ -+if (memcmp(scratch, dis_umax, dis_umaxd) > 0) -+ goto overflow; -+} -+ - switch (c = (*dis_getc)(stream)) - { - --- -1.8.3.2 - diff --git a/sys-cluster/torque/files/TRQ-2885-limit-tm_adopt-to-only-adopt-a-session-id-t.patch b/sys-cluster/torque/files/TRQ-2885-limit-tm_adopt-to-only-adopt-a-session-id-t.patch deleted file mode 100644 index 63713a0bc16..000 --- a/sys-cluster/torque/files/TRQ-2885-limit-tm_adopt-to-only-adopt-a-session-id-t.patch +++ /dev/null @@ -1,134 +0,0 @@ -From f2f4c950f3d461a249111c8826da3beaafccace9 Mon Sep 17 00:00:00 2001 -From: Chad Vizino -Date: Tue, 23 Sep 2014 17:40:59 -0600 -Subject: [PATCH 1/2] TRQ-2885 - limit
[gentoo-commits] repo/gentoo:master commit in: sys-cluster/torque/
commit: ce0f064025bf0d46de8c07f3372f32569a4e80b2 Author: Ian Stakenvicius gentoo org> AuthorDate: Thu Mar 7 17:16:51 2019 + Commit: Ian Stakenvicius gentoo org> CommitDate: Thu Mar 7 17:37:45 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ce0f0640 sys-cluster/torque: bump to 6.0.4 Source tarball is from latest 6.0 github commit, snapshot from 2018-08-29 Signed-off-by: Ian Stakenvicius gentoo.org> Package-Manager: Portage-2.3.51, Repoman-2.3.11 sys-cluster/torque/Manifest| 2 +- .../{torque-6.0.3.ebuild => torque-6.0.4.ebuild} | 18 +++--- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/sys-cluster/torque/Manifest b/sys-cluster/torque/Manifest index 7126d842443..14f7f301012 100644 --- a/sys-cluster/torque/Manifest +++ b/sys-cluster/torque/Manifest @@ -1,3 +1,3 @@ DIST torque-4.1.7.tar.gz 6218108 BLAKE2B 6c1ad0f1bb3f364603ad7f498999bd910491910fa5632b9f6b82e08b3afb8c54e8775c38bc8e5c959aa99d0647c54c7c348cd07bcbe11add8bfab5f3f06a4c80 SHA512 5a085c0a7b205fed075bff4599db90ca5c4bb5f22d87d76fd56539d5cc1935bb8eeffcd4d18ba84401bd4ca128718070b69c8b91ab6814a4638622ba351654e6 DIST torque-4.2.10-gh-20150517.tar.gz 5836286 BLAKE2B 7108f1adcb6f674526b7db97df4ebcee04ae5c818d4f35ed1230a4e72e52ec0bc3b44e17334a143b21bcd3acccefc3927eca4f98d54d37745c8bb46a75e07045 SHA512 600bb5389b6a4161732b7aa82627f1ebeae238d7091aa2e223d9a14c44bf4668662f664b976f62ba3f1d8a366f90fb6058a8c904e20c26432dccd6abcd9c57fa -DIST torque-6.0.3-1485300822_19e79ad.tar.gz 41660338 BLAKE2B 5e6c2e4bfffbe96d3a3e441f4c4420b4cb81a882bc498c4bf9474cf15a6808234f444183876a5ccfd46b6a9e4113d404cf72359ab3166146c3040854485f807d SHA512 40531f2e7732a11ffc224c536f61adc48ce5699a7caebb8aa1fbe7536b5ca4ed66c8436420bc918f7538ef980818141888aa26390a5a2c8185c8cc57373a0ac1 +DIST torque-6.0.4-gh-20170829.tar.gz 6182495 BLAKE2B f9156ae4ffe388a7f3fa0df142e5f2d48c16fd7b8c148a3a80cd1c977eb0c1ef4a455da275f993100867be043422526ed05c53734e707851083d6d23ee1a2cc4 SHA512 8f1101adb89e06617de501f7956e126633b78b495baeb7980d3c534d34537cc604a3cf0a7c23c48eb2554b26cc13672b0e00c75d0f722d63ac4d42d57388ed94 diff --git a/sys-cluster/torque/torque-6.0.3.ebuild b/sys-cluster/torque/torque-6.0.4.ebuild similarity index 92% rename from sys-cluster/torque/torque-6.0.3.ebuild rename to sys-cluster/torque/torque-6.0.4.ebuild index 75508148652..42f1f078421 100644 --- a/sys-cluster/torque/torque-6.0.3.ebuild +++ b/sys-cluster/torque/torque-6.0.4.ebuild @@ -1,14 +1,13 @@ # Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=6 -inherit flag-o-matic eutils linux-info +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; -DISTFILEHASH="1485300822_19e79ad" -SRC_URI="http://wpfilebase.s3.amazonaws.com/torque/${P}-${DISTFILEHASH}.tar.gz; +SRC_URI="https://github.com/adaptivecomputing/torque/archive/6a0b37f85c7d644e9217cbab1542792d646f59a6.tar.gz -> ${P}-gh-20170829.tar.gz" LICENSE="torque-2.5" SLOT="0" @@ -47,7 +46,11 @@ RDEPEND="${DEPEND_COMMON} # by the configure.ac and Makefile.am are missing. # http://www.supercluster.org/pipermail/torquedev/2014-October/004773.html -S="${WORKDIR}"/${P}-${DISTFILEHASH} +S="${WORKDIR}"/${PN}-6a0b37f85c7d644e9217cbab1542792d646f59a6 + +PATCHES=( + "${FILESDIR}"/${PN}-6.0.3-fix-emptystring-comparison.patch +) pkg_setup() { PBS_SERVER_HOME="${PBS_SERVER_HOME:-/var/spool/${PN}}" @@ -81,10 +84,11 @@ pkg_setup() { } src_prepare() { - epatch "${FILESDIR}"/${P}-fix-emptystring-comparison.patch + 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() { @@ -165,7 +169,7 @@ pkg_preinst() { } pkg_postinst() { -if [[ -z "${REPLACING_VERSIONS}" ]] ; then + 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;
[gentoo-commits] repo/gentoo:master commit in: sys-cluster/torque/
commit: 0a2e7d8868e0456a25b56f0a52724c8d5ca12f3c Author: Ian Stakenvicius gentoo org> AuthorDate: Mon Feb 25 21:01:33 2019 + Commit: Ian Stakenvicius gentoo org> CommitDate: Thu Mar 7 17:37:41 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0a2e7d88 sys-cluster/torque: cleanup old - Dropped buggy 4.2.9-r5 - Dropped very old 2.5 series Signed-off-by: Ian Stakenvicius gentoo.org> Package-Manager: Portage-2.3.49, Repoman-2.3.11 sys-cluster/torque/Manifest| 2 - sys-cluster/torque/torque-2.5.13-r1.ebuild | 253 - sys-cluster/torque/torque-4.2.9-r5.ebuild | 183 - 3 files changed, 438 deletions(-) diff --git a/sys-cluster/torque/Manifest b/sys-cluster/torque/Manifest index 7b5ca3a6350..7126d842443 100644 --- a/sys-cluster/torque/Manifest +++ b/sys-cluster/torque/Manifest @@ -1,5 +1,3 @@ -DIST torque-2.5.13.tar.gz 5854910 BLAKE2B 47fa519cbd2d9aeecb3bc323ba3f08f871b2259eb9c83335449a1f7c0d382fdffd0ced4f3ef09707c50a222d77ca0e5a39536b5c0f734bee37d3b50aec710430 SHA512 e08ddf3950bb32177f4bc504a502fae3928a616739c28ca9687c5207606817d4589583306508a2c568cf19fc8c5617dc4a9decc81576c2875660b715c256cfcf DIST torque-4.1.7.tar.gz 6218108 BLAKE2B 6c1ad0f1bb3f364603ad7f498999bd910491910fa5632b9f6b82e08b3afb8c54e8775c38bc8e5c959aa99d0647c54c7c348cd07bcbe11add8bfab5f3f06a4c80 SHA512 5a085c0a7b205fed075bff4599db90ca5c4bb5f22d87d76fd56539d5cc1935bb8eeffcd4d18ba84401bd4ca128718070b69c8b91ab6814a4638622ba351654e6 DIST torque-4.2.10-gh-20150517.tar.gz 5836286 BLAKE2B 7108f1adcb6f674526b7db97df4ebcee04ae5c818d4f35ed1230a4e72e52ec0bc3b44e17334a143b21bcd3acccefc3927eca4f98d54d37745c8bb46a75e07045 SHA512 600bb5389b6a4161732b7aa82627f1ebeae238d7091aa2e223d9a14c44bf4668662f664b976f62ba3f1d8a366f90fb6058a8c904e20c26432dccd6abcd9c57fa -DIST torque-4.2.9.tar.gz 6294022 BLAKE2B 2a57bebd7d9160deb3c610c21e1014a813c6e53771aadd65241d5fc623d41dca314e7b391cb218e0c9e917936c0547d1ba4c184442c20cef8bb62f98072537cc SHA512 898703fa1d02310c22e2a02b86d67ca52ebed46684597931944edebb39f8293746739c8dca9cd10e07c2e7274c3dd7f65a5664d1980817e3feec58952c4cf4d1 DIST torque-6.0.3-1485300822_19e79ad.tar.gz 41660338 BLAKE2B 5e6c2e4bfffbe96d3a3e441f4c4420b4cb81a882bc498c4bf9474cf15a6808234f444183876a5ccfd46b6a9e4113d404cf72359ab3166146c3040854485f807d SHA512 40531f2e7732a11ffc224c536f61adc48ce5699a7caebb8aa1fbe7536b5ca4ed66c8436420bc918f7538ef980818141888aa26390a5a2c8185c8cc57373a0ac1 diff --git a/sys-cluster/torque/torque-2.5.13-r1.ebuild b/sys-cluster/torque/torque-2.5.13-r1.ebuild deleted file mode 100644 index 7a45fb1c900..000 --- a/sys-cluster/torque/torque-2.5.13-r1.ebuild +++ /dev/null @@ -1,253 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit autotools-utils eutils 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="http://www.adaptivecomputing.com/index.php?wpfb_dl=1643 -> ${P}.tar.gz" - -LICENSE="torque-2.5" - -SLOT="0" -KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86" -IUSE="cpusets +crypt doc drmaa kernel_linux munge server static-libs +syslog threads tk xml" - -# ed is used by makedepend-sh -DEPEND_COMMON=" - sys-libs/readline:0= - munge? ( sys-auth/munge ) - tk? ( - dev-lang/tk:0= - dev-lang/tcl:0= - ) - syslog? ( virtual/logger ) - !!games-util/qstat" - -# libncurses.so is just needed so that configure will pass for the readline check -DEPEND="${DEPEND_COMMON} - sys-libs/ncurses:* - sys-apps/ed - !!sys-cluster/slurm" - -RDEPEND="${DEPEND_COMMON} - crypt? ( net-misc/openssh ) - !crypt? ( net-misc/netkit-rsh )" - -DOCS=( Release_Notes ) - -AUTOTOOLS_IN_SOURCE_BUILD=1 - -pkg_setup() { - PBS_SERVER_HOME="${PBS_SERVER_HOME:-/var/spool/torque}" - - # 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; then - if ! use kernel_linux; then - einfo - elog "Torque currently only has support for cpusets in linux." - elog "Assuming you didn't really want this USE flag and ignoring." - einfo - else - linux-info_pkg_setup - einfo - elog "Torque support for cpusets is still in development, you may" -
[gentoo-commits] repo/gentoo:master commit in: sys-cluster/torque/files/, sys-cluster/torque/
commit: 26611d6eaebddfe64f6412e5a7c5be2a952e95a4 Author: Ian Stakenvicius gentoo org> AuthorDate: Mon Feb 25 20:32:40 2019 + Commit: Ian Stakenvicius gentoo org> CommitDate: Thu Mar 7 17:37:39 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=26611d6e sys-cluster/torque: updated 4.2.10 Switched the distfile to a snapshot of the latest from 4.2.10 branch in github, which includes a large number of changes and bug fixes. Also included a patch to address -fpermissive compilation errors sometimes experienced with newer toolchains. Signed-off-by: Ian Stakenvicius gentoo.org> Package-Manager: Portage-2.3.49, Repoman-2.3.11 sys-cluster/torque/Manifest| 2 +- .../torque-4.2-use-NULL-instead-of-char0.patch | 140 + ...orque-4.2.10.ebuild => torque-4.2.10-r1.ebuild} | 14 +-- 3 files changed, 147 insertions(+), 9 deletions(-) diff --git a/sys-cluster/torque/Manifest b/sys-cluster/torque/Manifest index 27f557e822d..7b5ca3a6350 100644 --- a/sys-cluster/torque/Manifest +++ b/sys-cluster/torque/Manifest @@ -1,5 +1,5 @@ DIST torque-2.5.13.tar.gz 5854910 BLAKE2B 47fa519cbd2d9aeecb3bc323ba3f08f871b2259eb9c83335449a1f7c0d382fdffd0ced4f3ef09707c50a222d77ca0e5a39536b5c0f734bee37d3b50aec710430 SHA512 e08ddf3950bb32177f4bc504a502fae3928a616739c28ca9687c5207606817d4589583306508a2c568cf19fc8c5617dc4a9decc81576c2875660b715c256cfcf DIST torque-4.1.7.tar.gz 6218108 BLAKE2B 6c1ad0f1bb3f364603ad7f498999bd910491910fa5632b9f6b82e08b3afb8c54e8775c38bc8e5c959aa99d0647c54c7c348cd07bcbe11add8bfab5f3f06a4c80 SHA512 5a085c0a7b205fed075bff4599db90ca5c4bb5f22d87d76fd56539d5cc1935bb8eeffcd4d18ba84401bd4ca128718070b69c8b91ab6814a4638622ba351654e6 -DIST torque-4.2.10.tar.gz 6294022 BLAKE2B 2a57bebd7d9160deb3c610c21e1014a813c6e53771aadd65241d5fc623d41dca314e7b391cb218e0c9e917936c0547d1ba4c184442c20cef8bb62f98072537cc SHA512 898703fa1d02310c22e2a02b86d67ca52ebed46684597931944edebb39f8293746739c8dca9cd10e07c2e7274c3dd7f65a5664d1980817e3feec58952c4cf4d1 +DIST torque-4.2.10-gh-20150517.tar.gz 5836286 BLAKE2B 7108f1adcb6f674526b7db97df4ebcee04ae5c818d4f35ed1230a4e72e52ec0bc3b44e17334a143b21bcd3acccefc3927eca4f98d54d37745c8bb46a75e07045 SHA512 600bb5389b6a4161732b7aa82627f1ebeae238d7091aa2e223d9a14c44bf4668662f664b976f62ba3f1d8a366f90fb6058a8c904e20c26432dccd6abcd9c57fa DIST torque-4.2.9.tar.gz 6294022 BLAKE2B 2a57bebd7d9160deb3c610c21e1014a813c6e53771aadd65241d5fc623d41dca314e7b391cb218e0c9e917936c0547d1ba4c184442c20cef8bb62f98072537cc SHA512 898703fa1d02310c22e2a02b86d67ca52ebed46684597931944edebb39f8293746739c8dca9cd10e07c2e7274c3dd7f65a5664d1980817e3feec58952c4cf4d1 DIST torque-6.0.3-1485300822_19e79ad.tar.gz 41660338 BLAKE2B 5e6c2e4bfffbe96d3a3e441f4c4420b4cb81a882bc498c4bf9474cf15a6808234f444183876a5ccfd46b6a9e4113d404cf72359ab3166146c3040854485f807d SHA512 40531f2e7732a11ffc224c536f61adc48ce5699a7caebb8aa1fbe7536b5ca4ed66c8436420bc918f7538ef980818141888aa26390a5a2c8185c8cc57373a0ac1 diff --git a/sys-cluster/torque/files/torque-4.2-use-NULL-instead-of-char0.patch b/sys-cluster/torque/files/torque-4.2-use-NULL-instead-of-char0.patch new file mode 100644 index 000..a1cb85327d7 --- /dev/null +++ b/sys-cluster/torque/files/torque-4.2-use-NULL-instead-of-char0.patch @@ -0,0 +1,140 @@ +--- a/src/cmds/pbsnodes.c 2015-03-17 16:43:36.0 -0400 b/src/cmds/pbsnodes.c 2019-02-25 12:33:37.824638386 -0500 +@@ -693,7 +693,7 @@ + /* -N n is the same as -N "" -- it clears the note */ + + if (!strcmp(note, "n")) +- *note = '\0'; ++ *note = NULL; + + if (strlen(note) > MAX_NOTE) + { +@@ -821,7 +821,7 @@ + { + nodeargs = (char **)calloc(2, sizeof(char **)); + nodeargs[0] = strdup(""); +-nodeargs[1] = '\0'; ++nodeargs[1] = NULL; + } + } + } +@@ -901,7 +901,7 @@ + + MXMLCreateE(, "Data"); + +-for (lindex = 0;nodeargs[lindex] != '\0';lindex++) ++for (lindex = 0;nodeargs[lindex] != NULL;lindex++) + { + bstatus = statnode(con, nodeargs[lindex]); + +@@ -922,7 +922,7 @@ + } + else + { +-for (lindex = 0;nodeargs[lindex] != '\0';lindex++) ++for (lindex = 0;nodeargs[lindex] != NULL;lindex++) + { + bstatus = statnode(con, nodeargs[lindex]); + +@@ -946,7 +946,7 @@ + + /* list any node that is DOWN, OFFLINE, or UNKNOWN */ + +- for (lindex = 0;nodeargs[lindex] != '\0';lindex++) ++ for (lindex = 0;nodeargs[lindex] != NULL;lindex++) + { + bstatus = statnode(con, nodeargs[lindex]); + +--- a/src/cmds/qsub_functions.c2015-03-17 16:43:36.0 -0400 b/src/cmds/qsub_functions.c2019-02-25 12:32:00.442982091 -0500 +@@ -542,7 +542,7 @@ + static char tmpLine[65536]; + + /* we've reached the end */ +- if ((start == NULL) && (*tok_ptr == '\0')) ++ if
[gentoo-commits] repo/gentoo:master commit in: sys-cluster/torque/, sys-cluster/torque/files/
commit: d6f144825d2c355ac84e6d24631d170a8502f064 Author: Ian Stakenvicius gentoo org> AuthorDate: Tue Nov 21 19:31:11 2017 + Commit: Ian Stakenvicius gentoo org> CommitDate: Tue Nov 21 19:31:50 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d6f14482 sys-cluster/torque-6.0.3: fix an empty-string comparison error Bug: http://bugs.gentoo.org/638346 Package-Manager: Portage-2.3.13, Repoman-2.3.3 .../torque-6.0.3-fix-emptystring-comparison.patch | 21 + sys-cluster/torque/torque-6.0.3.ebuild | 1 + 2 files changed, 22 insertions(+) diff --git a/sys-cluster/torque/files/torque-6.0.3-fix-emptystring-comparison.patch b/sys-cluster/torque/files/torque-6.0.3-fix-emptystring-comparison.patch new file mode 100644 index 000..0666eda1593 --- /dev/null +++ b/sys-cluster/torque/files/torque-6.0.3-fix-emptystring-comparison.patch @@ -0,0 +1,21 @@ +--- a/src/lib/Libattr/req.cpp 2017-01-24 18:35:27.0 -0500 b/src/lib/Libattr/req.cpp 2017-11-21 13:40:27.201964749 -0500 +@@ -1037,17 +1037,17 @@ + error = "Bad tasks value: '"; + error += submission_str; + error += "'"; + return(PBSE_BAD_PARAMETER); + } + + if (*current == ':') + current++; +- else if (current != '\0') ++ else if (*current != '\0') + { + error = "Invalid task specification"; + return(PBSE_BAD_PARAMETER); + } + + while ((current != NULL) && + (*current != '\0')) + { diff --git a/sys-cluster/torque/torque-6.0.3.ebuild b/sys-cluster/torque/torque-6.0.3.ebuild index 74409b48eef..ec9563e95bf 100644 --- a/sys-cluster/torque/torque-6.0.3.ebuild +++ b/sys-cluster/torque/torque-6.0.3.ebuild @@ -81,6 +81,7 @@ pkg_setup() { } src_prepare() { + epatch "${FILESDIR}"/${P}-fix-emptystring-comparison.patch # 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
[gentoo-commits] repo/gentoo:master commit in: sys-cluster/torque/, sys-cluster/torque/files/
commit: c4fc03c06cfa8a1c3f4b22fee2a3688ea48046be Author: Ian Stakenvicius gentoo org> AuthorDate: Wed May 24 14:33:44 2017 + Commit: Ian Stakenvicius gentoo org> CommitDate: Wed May 24 14:35:10 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c4fc03c0 sys-cluster/torque: fix CFLAGS munging on version bump to 4.2.10 This commit also bumps to EAPI6 and adjusts some other minor issues (REPLACING_VERSIONS checks, etc). Bug: http://bugs.gentoo.org/619436 Package-Manager: Portage-2.3.3, Repoman-2.3.1 sys-cluster/torque/Manifest| 1 + .../files/torque-4.2-dont-mess-with-cflags.patch | 27 +++ sys-cluster/torque/torque-4.2.10.ebuild| 196 + 3 files changed, 224 insertions(+) diff --git a/sys-cluster/torque/Manifest b/sys-cluster/torque/Manifest index dd1e9790410..e3b475c54f4 100644 --- a/sys-cluster/torque/Manifest +++ b/sys-cluster/torque/Manifest @@ -1,4 +1,5 @@ DIST torque-2.5.13.tar.gz 5854910 SHA256 ab59d4c8e8b45383ddd8202fa83956816175e348bb955a4ad5f7e3cd4dde5ff9 SHA512 e08ddf3950bb32177f4bc504a502fae3928a616739c28ca9687c5207606817d4589583306508a2c568cf19fc8c5617dc4a9decc81576c2875660b715c256cfcf WHIRLPOOL 29eefb89d1eb9d6a81735aa117922a1eb0b72e14eeccab7dbd70cdcf01431b7ecd9c3927e1c5c28b7f42d6739b28f45386740b92adb790ccdf9803e4c6e38534 DIST torque-4.1.7.tar.gz 6218108 SHA256 3c86b2d84589f54ac222e81dd1953d153e1d836163d2000412369fefd25fb2af SHA512 5a085c0a7b205fed075bff4599db90ca5c4bb5f22d87d76fd56539d5cc1935bb8eeffcd4d18ba84401bd4ca128718070b69c8b91ab6814a4638622ba351654e6 WHIRLPOOL cae9216f0cebc22927eec2d1f007b1a3c4a6cc619f2926c40a5f46e0bd0eec19691f9aafcad4fe727e2c5ed2485d11c972603cca613269f82147ff1dc41f1ba4 +DIST torque-4.2.10.tar.gz 6294022 SHA256 46f1f319683af6d3820e18cda69ce59113c9a5c192e1f07826007be69385889b SHA512 898703fa1d02310c22e2a02b86d67ca52ebed46684597931944edebb39f8293746739c8dca9cd10e07c2e7274c3dd7f65a5664d1980817e3feec58952c4cf4d1 WHIRLPOOL e65be66b056a519ebd1c30c2c1ae2ddf43bc4e617a52d3caced1e6dfd2b0d8b2a83c26a0f2e6e41cfae791aca68b6f91424745b2baffa2085fccc8f6ae9b8e04 DIST torque-4.2.9.tar.gz 6294022 SHA256 46f1f319683af6d3820e18cda69ce59113c9a5c192e1f07826007be69385889b SHA512 898703fa1d02310c22e2a02b86d67ca52ebed46684597931944edebb39f8293746739c8dca9cd10e07c2e7274c3dd7f65a5664d1980817e3feec58952c4cf4d1 WHIRLPOOL e65be66b056a519ebd1c30c2c1ae2ddf43bc4e617a52d3caced1e6dfd2b0d8b2a83c26a0f2e6e41cfae791aca68b6f91424745b2baffa2085fccc8f6ae9b8e04 DIST torque-6.0.3-1485300822_19e79ad.tar.gz 41660338 SHA256 dcbc806379596848f9887ff3b518d4ca7031e888d29d0b12e4e270c0e677dd80 SHA512 40531f2e7732a11ffc224c536f61adc48ce5699a7caebb8aa1fbe7536b5ca4ed66c8436420bc918f7538ef980818141888aa26390a5a2c8185c8cc57373a0ac1 WHIRLPOOL f504106f33a031f9e578b5aa9992423ecc50fad88ec0b380e10284007d1271aeee10da494b32d9a3f7da5a012eeaadbbae2f91f0180ef0abcda9309942eb diff --git a/sys-cluster/torque/files/torque-4.2-dont-mess-with-cflags.patch b/sys-cluster/torque/files/torque-4.2-dont-mess-with-cflags.patch new file mode 100644 index 000..aec54aff030 --- /dev/null +++ b/sys-cluster/torque/files/torque-4.2-dont-mess-with-cflags.patch @@ -0,0 +1,27 @@ +--- a/configure.ac 2014-09-10 21:06:26.0 -0400 b/configure.ac 2017-05-23 10:43:59.051759539 -0400 +@@ -703,24 +703,6 @@ + AC_HELP_STRING([--with-debug], [compile with debugging symbols]), + DEBUG_SYMBOLS=$withval, DEBUG_SYMBOLS="yes") + AC_MSG_RESULT([DEBUG_SYMBOLS=$DEBUG_SYMBOLS]) +-dnl remove -O* and add -g +-if test "$DEBUG_SYMBOLS" = 'yes'; then +- AC_MSG_RESULT([before tweak CFLAGS=$CFLAGS]) +- CFLAGS=`echo $CFLAGS | sed 's/ \?-O[[^ ]]*//g'` +- AC_MSG_RESULT([mid tweak CFLAGS=$CFLAGS]) +- case $CFLAGS in +-*-g*) +- ;; +-*) +- if test "$CFLAGS" = ''; then +-CFLAGS="-g" +- else +-CFLAGS="-g $CFLAGS" +- fi +- ;; +- esac +- AC_MSG_RESULT([after tweak CFLAGS=$CFLAGS]) +-fi + + dnl if using gcc, we can be very strict + AC_ARG_ENABLE(gcc_warnings, [ diff --git a/sys-cluster/torque/torque-4.2.10.ebuild b/sys-cluster/torque/torque-4.2.10.ebuild new file mode 100644 index 000..769264fd387 --- /dev/null +++ b/sys-cluster/torque/torque-4.2.10.ebuild @@ -0,0 +1,196 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit autotools eutils linux-info + +DESCRIPTION="Resource manager and queuing system based on OpenPBS" +HOMEPAGE="http://www.adaptivecomputing.com/products/open-source/torque; +# TODO: hopefully moving to github tags soon +# http://www.supercluster.org/pipermail/torquedev/2013-May/004519.html +SRC_URI="http://www.adaptivecomputing.com/index.php?wpfb_dl=2849 -> ${P}.tar.gz" + +LICENSE="torque-2.5" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" +IUSE="cpusets +crypt doc drmaa kernel_linux libressl munge nvidia server +syslog tk" +
[gentoo-commits] repo/gentoo:master commit in: sys-cluster/torque/
commit: 91549ddad6a280e772bd4d1557e7c026c287b8e8 Author: Ian Stakenvicius gentoo org> AuthorDate: Thu Apr 27 03:14:54 2017 + Commit: Ian Stakenvicius gentoo org> CommitDate: Thu Apr 27 03:15:23 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91549dda sys-cluster/torque: version bump, fix boost dependency, add some new flags Added USE flags to enable AUTORUN_JOBS and QUICKCOMMIT code Fixed missing boost dependency, bug 616520 Package-Manager: Portage-2.3.3, Repoman-2.3.1 sys-cluster/torque/Manifest | 2 +- sys-cluster/torque/metadata.xml | 2 ++ .../torque/{torque-6.0.1.ebuild => torque-6.0.3.ebuild} | 17 ++--- 3 files changed, 13 insertions(+), 8 deletions(-) diff --git a/sys-cluster/torque/Manifest b/sys-cluster/torque/Manifest index 7b157794bdf..dd1e9790410 100644 --- a/sys-cluster/torque/Manifest +++ b/sys-cluster/torque/Manifest @@ -1,4 +1,4 @@ DIST torque-2.5.13.tar.gz 5854910 SHA256 ab59d4c8e8b45383ddd8202fa83956816175e348bb955a4ad5f7e3cd4dde5ff9 SHA512 e08ddf3950bb32177f4bc504a502fae3928a616739c28ca9687c5207606817d4589583306508a2c568cf19fc8c5617dc4a9decc81576c2875660b715c256cfcf WHIRLPOOL 29eefb89d1eb9d6a81735aa117922a1eb0b72e14eeccab7dbd70cdcf01431b7ecd9c3927e1c5c28b7f42d6739b28f45386740b92adb790ccdf9803e4c6e38534 DIST torque-4.1.7.tar.gz 6218108 SHA256 3c86b2d84589f54ac222e81dd1953d153e1d836163d2000412369fefd25fb2af SHA512 5a085c0a7b205fed075bff4599db90ca5c4bb5f22d87d76fd56539d5cc1935bb8eeffcd4d18ba84401bd4ca128718070b69c8b91ab6814a4638622ba351654e6 WHIRLPOOL cae9216f0cebc22927eec2d1f007b1a3c4a6cc619f2926c40a5f46e0bd0eec19691f9aafcad4fe727e2c5ed2485d11c972603cca613269f82147ff1dc41f1ba4 DIST torque-4.2.9.tar.gz 6294022 SHA256 46f1f319683af6d3820e18cda69ce59113c9a5c192e1f07826007be69385889b SHA512 898703fa1d02310c22e2a02b86d67ca52ebed46684597931944edebb39f8293746739c8dca9cd10e07c2e7274c3dd7f65a5664d1980817e3feec58952c4cf4d1 WHIRLPOOL e65be66b056a519ebd1c30c2c1ae2ddf43bc4e617a52d3caced1e6dfd2b0d8b2a83c26a0f2e6e41cfae791aca68b6f91424745b2baffa2085fccc8f6ae9b8e04 -DIST torque-6.0.1.tar.gz 41229268 SHA256 39623e364a87976a8d657fa47965703ca7ae7c32110ff18eccc6282dc609f3de SHA512 63251ec163feb8d6be788db79de497b2bb1cb98b0d62e2c43fa50d1a4b25b0f8075072c22c3aa4535d6a83a6be987c6cddda47829778bbef3b5006bba936ed87 WHIRLPOOL 98aaf09965416a8e227ef3cdae59f690e4581a2ecde6c5c6e5aa5e99f08ac14012ffb8611b29624f6302098495b94f8e79084fa8478160d71c07f8343ec81839 +DIST torque-6.0.3-1485300822_19e79ad.tar.gz 41660338 SHA256 dcbc806379596848f9887ff3b518d4ca7031e888d29d0b12e4e270c0e677dd80 SHA512 40531f2e7732a11ffc224c536f61adc48ce5699a7caebb8aa1fbe7536b5ca4ed66c8436420bc918f7538ef980818141888aa26390a5a2c8185c8cc57373a0ac1 WHIRLPOOL f504106f33a031f9e578b5aa9992423ecc50fad88ec0b380e10284007d1271aeee10da494b32d9a3f7da5a012eeaadbbae2f91f0180ef0abcda9309942eb diff --git a/sys-cluster/torque/metadata.xml b/sys-cluster/torque/metadata.xml index b1e48d8659e..ce0da419e92 100644 --- a/sys-cluster/torque/metadata.xml +++ b/sys-cluster/torque/metadata.xml @@ -10,11 +10,13 @@ Ian Stakenvicius +Enable the AUTORUN_JOBS codebase Enable pbs_mom to use linux cgroups to isolate jobs Enable pbs_mom to utilize linux cpusets if available Enable the Distributed Resource Management Application API Enable authentication via munge Enable management of Nvidia GPUs +Enable the QUICKCOMMIT codebase Enable compilation of pbs_server and pbs_sched diff --git a/sys-cluster/torque/torque-6.0.1.ebuild b/sys-cluster/torque/torque-6.0.3.ebuild similarity index 90% rename from sys-cluster/torque/torque-6.0.1.ebuild rename to sys-cluster/torque/torque-6.0.3.ebuild index 81660c9a75b..74409b48eef 100644 --- a/sys-cluster/torque/torque-6.0.1.ebuild +++ b/sys-cluster/torque/torque-6.0.3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -7,19 +7,19 @@ inherit flag-o-matic eutils linux-info DESCRIPTION="Resource manager and queuing system based on OpenPBS" HOMEPAGE="http://www.adaptivecomputing.com/products/open-source/torque; -# TODO: hopefully moving to github tags soon -# http://www.supercluster.org/pipermail/torquedev/2013-May/004519.html -SRC_URI="http://www.adaptivecomputing.com/index.php?wpfb_dl=3032 -> ${P}.tar.gz" +DISTFILEHASH="1485300822_19e79ad" +SRC_URI="http://wpfilebase.s3.amazonaws.com/torque/${P}-${DISTFILEHASH}.tar.gz; LICENSE="torque-2.5" SLOT="0" KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" -IUSE="cgroups cpusets +crypt doc drmaa kernel_linux libressl munge nvidia server +syslog tk" +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=
[gentoo-commits] repo/gentoo:master commit in: sys-cluster/torque/files/
commit: 3ab47a6c79a83ed307d718c08b5453382ab85829 Author: Michael Mair-Keimberger (asterix) gmail com> AuthorDate: Fri Feb 10 15:57:33 2017 + Commit: David Seifert gentoo org> CommitDate: Fri Feb 10 22:33:30 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3ab47a6c sys-cluster/torque: remove unused patch Closes: https://github.com/gentoo/gentoo/pull/3900 .../files/CVE-2013-4319-4.x-root-submit-fix.patch | 38 -- 1 file changed, 38 deletions(-) diff --git a/sys-cluster/torque/files/CVE-2013-4319-4.x-root-submit-fix.patch b/sys-cluster/torque/files/CVE-2013-4319-4.x-root-submit-fix.patch deleted file mode 100644 index 3614e42721..00 --- a/sys-cluster/torque/files/CVE-2013-4319-4.x-root-submit-fix.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 6424696d7b160c8a9ad806c4a6b0f77f0d359962 Mon Sep 17 00:00:00 2001 -From: Justin Bronder-Date: Mon, 23 Dec 2013 12:48:22 -0500 -Subject: [PATCH] CVE-2013-4319: 4.x root submit fix - -https://bugs.gentoo.org/show_bug.cgi?id=484320 -http://nvd.nist.gov/nvd.cfm?cvename=CVE-2013-4319 - src/resmom/mom_process_request.c | 13 + - 1 file changed, 13 insertions(+) - -diff --git a/src/resmom/mom_process_request.c b/src/resmom/mom_process_request.c -index 049f63f..813833f 100644 a/src/resmom/mom_process_request.c -+++ b/src/resmom/mom_process_request.c -@@ -238,6 +238,19 @@ void *mom_process_request( - log_record(PBSEVENT_JOB, PBS_EVENTCLASS_JOB, __func__, log_buffer); - } - -+if (svr_conn[chan->sock].cn_authen != PBS_NET_CONN_FROM_PRIVIL) -+ { -+ sprintf(log_buffer, "request type %s from host %s rejected (connection not privileged)", -+reqtype_to_txt(request->rq_type), -+request->rq_host); -+ -+ log_record(PBSEVENT_JOB, PBS_EVENTCLASS_JOB, __func__, log_buffer); -+ req_reject(PBSE_BADHOST, 0, request, NULL, "request not authorized"); -+ mom_close_client(chan->sock); -+ DIS_tcp_cleanup(chan); -+ return NULL; -+ } -+ - if (!AVL_is_in_tree_no_port_compare(svr_conn[chan->sock].cn_addr, 0, okclients)) - { - sprintf(log_buffer, "request type %s from host %s rejected (host not authorized)", --- -1.8.3.2 -
[gentoo-commits] repo/gentoo:master commit in: sys-cluster/torque/
commit: 377114623c0510d8287fbc7b70dabdc7dedac78c Author: David Seifert gentoo org> AuthorDate: Thu Jan 26 23:10:11 2017 + Commit: David Seifert gentoo org> CommitDate: Thu Jan 26 23:13:48 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=37711462 Partially revert "profiles/base/package.use.mask: force off rust on www-client/firefox" This reverts commit a47178b2b36a03e644f4bd37a1688edb666e5d53. sys-cluster/torque/{torque-6.1.0.ebuild => torque-6.0.1.ebuild} | 0 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/sys-cluster/torque/torque-6.1.0.ebuild b/sys-cluster/torque/torque-6.0.1.ebuild similarity index 100% rename from sys-cluster/torque/torque-6.1.0.ebuild rename to sys-cluster/torque/torque-6.0.1.ebuild
[gentoo-commits] repo/gentoo:master commit in: sys-cluster/torque/
commit: d016c84152e02f19059e8d1f243f052587d2e3aa Author: Ian Stakenvicius gentoo org> AuthorDate: Fri Jun 3 16:12:57 2016 + Commit: Ian Stakenvicius gentoo org> CommitDate: Wed Jun 8 02:11:50 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d016c841 sys-cluster/torque: introduce v6.0.1 with cgroups support So far there has been very little testing done with this version, and the in-ebuild cgroups support needs to be expanded (checks against kernel settings added, etc). Package-Manager: portage-2.2.28 sys-cluster/torque/Manifest| 1 + sys-cluster/torque/metadata.xml| 1 + sys-cluster/torque/torque-6.0.1.ebuild | 176 + 3 files changed, 178 insertions(+) diff --git a/sys-cluster/torque/Manifest b/sys-cluster/torque/Manifest index 2b20c8a..7b15779 100644 --- a/sys-cluster/torque/Manifest +++ b/sys-cluster/torque/Manifest @@ -1,3 +1,4 @@ DIST torque-2.5.13.tar.gz 5854910 SHA256 ab59d4c8e8b45383ddd8202fa83956816175e348bb955a4ad5f7e3cd4dde5ff9 SHA512 e08ddf3950bb32177f4bc504a502fae3928a616739c28ca9687c5207606817d4589583306508a2c568cf19fc8c5617dc4a9decc81576c2875660b715c256cfcf WHIRLPOOL 29eefb89d1eb9d6a81735aa117922a1eb0b72e14eeccab7dbd70cdcf01431b7ecd9c3927e1c5c28b7f42d6739b28f45386740b92adb790ccdf9803e4c6e38534 DIST torque-4.1.7.tar.gz 6218108 SHA256 3c86b2d84589f54ac222e81dd1953d153e1d836163d2000412369fefd25fb2af SHA512 5a085c0a7b205fed075bff4599db90ca5c4bb5f22d87d76fd56539d5cc1935bb8eeffcd4d18ba84401bd4ca128718070b69c8b91ab6814a4638622ba351654e6 WHIRLPOOL cae9216f0cebc22927eec2d1f007b1a3c4a6cc619f2926c40a5f46e0bd0eec19691f9aafcad4fe727e2c5ed2485d11c972603cca613269f82147ff1dc41f1ba4 DIST torque-4.2.9.tar.gz 6294022 SHA256 46f1f319683af6d3820e18cda69ce59113c9a5c192e1f07826007be69385889b SHA512 898703fa1d02310c22e2a02b86d67ca52ebed46684597931944edebb39f8293746739c8dca9cd10e07c2e7274c3dd7f65a5664d1980817e3feec58952c4cf4d1 WHIRLPOOL e65be66b056a519ebd1c30c2c1ae2ddf43bc4e617a52d3caced1e6dfd2b0d8b2a83c26a0f2e6e41cfae791aca68b6f91424745b2baffa2085fccc8f6ae9b8e04 +DIST torque-6.0.1.tar.gz 41229268 SHA256 39623e364a87976a8d657fa47965703ca7ae7c32110ff18eccc6282dc609f3de SHA512 63251ec163feb8d6be788db79de497b2bb1cb98b0d62e2c43fa50d1a4b25b0f8075072c22c3aa4535d6a83a6be987c6cddda47829778bbef3b5006bba936ed87 WHIRLPOOL 98aaf09965416a8e227ef3cdae59f690e4581a2ecde6c5c6e5aa5e99f08ac14012ffb8611b29624f6302098495b94f8e79084fa8478160d71c07f8343ec81839 diff --git a/sys-cluster/torque/metadata.xml b/sys-cluster/torque/metadata.xml index b47af35..b1e48d8 100644 --- a/sys-cluster/torque/metadata.xml +++ b/sys-cluster/torque/metadata.xml @@ -10,6 +10,7 @@ Ian Stakenvicius +Enable pbs_mom to use linux cgroups to isolate jobs Enable pbs_mom to utilize linux cpusets if available Enable the Distributed Resource Management Application API Enable authentication via munge diff --git a/sys-cluster/torque/torque-6.0.1.ebuild b/sys-cluster/torque/torque-6.0.1.ebuild new file mode 100644 index 000..caed69c --- /dev/null +++ b/sys-cluster/torque/torque-6.0.1.ebuild @@ -0,0 +1,176 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +inherit flag-o-matic eutils linux-info + +DESCRIPTION="Resource manager and queuing system based on OpenPBS" +HOMEPAGE="http://www.adaptivecomputing.com/products/open-source/torque; +# TODO: hopefully moving to github tags soon +# http://www.supercluster.org/pipermail/torquedev/2013-May/004519.html +SRC_URI="http://www.adaptivecomputing.com/index.php?wpfb_dl=3032 -> ${P}.tar.gz" + +LICENSE="torque-2.5" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" +IUSE="cgroups cpusets +crypt doc drmaa kernel_linux libressl munge nvidia server +syslog tk" + +DEPEND_COMMON=" + sys-libs/zlib + sys-libs/readline:0= + dev-libs/libxml2 + !libressl? ( dev-libs/openssl:0= ) + libressl? ( dev-libs/libressl:0= ) + 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}"/${P}-1456945733_daea91b + +pkg_setup() { +
[gentoo-commits] repo/gentoo:master commit in: sys-cluster/torque/
commit: 134584b2d81b9928835d5ea44bbb6a2e146b2ef5 Author: Ian Stakenvicius gentoo org> AuthorDate: Thu Jun 2 16:22:53 2016 + Commit: Ian Stakenvicius gentoo org> CommitDate: Thu Jun 2 16:56:18 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=134584b2 sys-cluster/torque: dependency cleanup Dependency atoms listed in the ebuild were rather significantly mis-matching what is actually linked to. Cleaned them up, added slot and slot-operators as needed. Added libressl to IUSE but didn't test if libressl is a drop-in replacement for openssl -- the situation should be better either way since it was a magic dep until now. Also bumped EAPI for torque-2.x so it is no longer deprecated, and adjusted how the cpusets flag is added to configure. Package-Manager: portage-2.2.28 ...orque-2.5.13.ebuild => torque-2.5.13-r1.ebuild} | 26 ++-- ...{torque-4.1.7.ebuild => torque-4.1.7-r1.ebuild} | 27 - ...rque-4.2.9-r4.ebuild => torque-4.2.9-r5.ebuild} | 28 +- 3 files changed, 47 insertions(+), 34 deletions(-) diff --git a/sys-cluster/torque/torque-2.5.13.ebuild b/sys-cluster/torque/torque-2.5.13-r1.ebuild similarity index 94% rename from sys-cluster/torque/torque-2.5.13.ebuild rename to sys-cluster/torque/torque-2.5.13-r1.ebuild index 252ac35..82934c0 100644 --- a/sys-cluster/torque/torque-2.5.13.ebuild +++ b/sys-cluster/torque/torque-2.5.13-r1.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=4 +EAPI=5 inherit autotools-utils eutils flag-o-matic linux-info @@ -17,16 +17,21 @@ KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86" IUSE="cpusets +crypt doc drmaa kernel_linux munge server static-libs +syslog threads tk xml" # ed is used by makedepend-sh -DEPEND_COMMON="sys-libs/ncurses - sys-libs/readline +DEPEND_COMMON=" + sys-libs/readline:0= munge? ( sys-auth/munge ) - tk? ( dev-lang/tk ) + tk? ( + dev-lang/tk:0= + dev-lang/tcl:0= + ) syslog? ( virtual/logger ) - !games-util/qstat" + !!games-util/qstat" +# libncurses.so is just needed so that configure will pass for the readline check DEPEND="${DEPEND_COMMON} + sys-libs/ncurses:* sys-apps/ed - !sys-cluster/slurm" + !!sys-cluster/slurm" RDEPEND="${DEPEND_COMMON} crypt? ( net-misc/openssh ) @@ -49,12 +54,11 @@ pkg_setup() { fi fi - USE_CPUSETS="--disable-cpuset" if use cpusets; then if ! use kernel_linux; then einfo elog "Torque currently only has support for cpusets in linux." - elog "Assuming you didn't really want this USE flag." + elog "Assuming you didn't really want this USE flag and ignoring." einfo else linux-info_pkg_setup @@ -68,7 +72,6 @@ pkg_setup() { elog "your kernel with CONFIG_CPUSETS enabled." einfo fi - USE_CPUSETS="--enable-cpuset" fi fi } @@ -92,7 +95,6 @@ src_configure() { local myeconfargs=( --with-rcp=mom_rcp ) use crypt && myeconfargs=( --with-rcp=scp ) - myeconfargs+=( $(use_enable tk gui) $(use_enable tk tcl-qstat) @@ -102,12 +104,12 @@ src_configure() { $(use_enable threads high-availability) $(use_enable xml server-xml) $(use_enable munge munge-library) + $(usex kernel_linux $(use_enable cpusets cpuset) --disable-cpuset) --with-server-home=${PBS_SERVER_HOME} --with-environ=/etc/pbs_environment --with-default-server=${PBS_SERVER_NAME} --disable-gcc-warnings --with-tcp-retry-limit=2 - ${USE_CPUSETS} ) autotools-utils_src_configure } diff --git a/sys-cluster/torque/torque-4.1.7.ebuild b/sys-cluster/torque/torque-4.1.7-r1.ebuild similarity index 92% rename from sys-cluster/torque/torque-4.1.7.ebuild rename to sys-cluster/torque/torque-4.1.7-r1.ebuild index ea148c3..86dfeb5 100644 --- a/sys-cluster/torque/torque-4.1.7.ebuild +++ b/sys-cluster/torque/torque-4.1.7-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -15,20 +15,27 @@ SRC_URI="http://www.adaptivecomputing.com/index.php?wpfb_dl=1690 -> ${P}.tar.gz" LICENSE="torque-2.5" SLOT="0" KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86" -IUSE="cpusets +crypt doc drmaa kernel_linux
[gentoo-commits] repo/gentoo:master commit in: sys-cluster/torque/
commit: 0b8827fead88ff96a29c0850f873b7d64a329b3e Author: Ian Stakenvicius gentoo org> AuthorDate: Thu Jun 2 15:24:14 2016 + Commit: Ian Stakenvicius gentoo org> CommitDate: Thu Jun 2 16:56:11 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0b8827fe sys-cluster/torque: add myself to the maintainer list in metadata.xml Package-Manager: portage-2.2.28 sys-cluster/torque/metadata.xml | 4 1 file changed, 4 insertions(+) diff --git a/sys-cluster/torque/metadata.xml b/sys-cluster/torque/metadata.xml index 73c49bd..b47af35 100644 --- a/sys-cluster/torque/metadata.xml +++ b/sys-cluster/torque/metadata.xml @@ -5,6 +5,10 @@ clus...@gentoo.org Gentoo Cluster Project + +a...@gentoo.org +Ian Stakenvicius + Enable pbs_mom to utilize linux cpusets if available Enable the Distributed Resource Management Application API
[gentoo-commits] repo/gentoo:master commit in: sys-cluster/torque/
commit: a5da7812c93de7caaadcca05098d4ae7b781691b Author: Justin Bronder gentoo org> AuthorDate: Wed Jun 1 23:02:48 2016 + Commit: Justin Bronder gentoo org> CommitDate: Wed Jun 1 23:02:48 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a5da7812 sys-cluster/torque: dropping jsbronder as maintainer Package-Manager: portage-2.2.26 sys-cluster/torque/metadata.xml | 3 --- 1 file changed, 3 deletions(-) diff --git a/sys-cluster/torque/metadata.xml b/sys-cluster/torque/metadata.xml index f9ad73d..73c49bd 100644 --- a/sys-cluster/torque/metadata.xml +++ b/sys-cluster/torque/metadata.xml @@ -1,9 +1,6 @@ http://www.gentoo.org/dtd/metadata.dtd;> - -jsbron...@gentoo.org - clus...@gentoo.org Gentoo Cluster Project