From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id A611A158649 for ; Sat, 13 May 2023 04:52:06 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DD0DAE08FC; Sat, 13 May 2023 04:52:05 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A65C3E08FC for ; Sat, 13 May 2023 04:52:05 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 7017E335D17 for ; Sat, 13 May 2023 04:52:04 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id DDF62990 for ; Sat, 13 May 2023 04:52:02 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1683953485.62953bb7ceec7d12e7fcf295b39c174b14dd8bf9.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-cluster/torque/, sys-cluster/torque/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-cluster/torque/files/torque-6.0.4-fix-pbs_tcp_timeout-has-a-different-language-linkage.patch sys-cluster/torque/files/torque-6.0.4-remove-register-storage-class-as-it-s-been-deprecate.patch sys-cluster/torque/torque-6.0.4-r6.ebuild X-VCS-Directories: sys-cluster/torque/files/ sys-cluster/torque/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 62953bb7ceec7d12e7fcf295b39c174b14dd8bf9 X-VCS-Branch: master Date: Sat, 13 May 2023 04:52:02 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 31047987-4983-46e5-9199-d2909090701e X-Archives-Hash: 46f1b0ac91ec6fcdf40acec70a33a90a commit: 62953bb7ceec7d12e7fcf295b39c174b14dd8bf9 Author: Brahmajit Das gmail com> AuthorDate: Fri May 12 21:04:26 2023 +0000 Commit: Sam James gentoo org> CommitDate: Sat May 13 04:51:25 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=62953bb7 sys-cluster/torque: Fix register storage class specifier not allowed Closes: https://bugs.gentoo.org/898574 Signed-off-by: Brahmajit Das gmail.com> Closes: https://github.com/gentoo/gentoo/pull/31009 Signed-off-by: Sam James gentoo.org> ..._timeout-has-a-different-language-linkage.patch | 19 + ...ster-storage-class-as-it-s-been-deprecate.patch | 740 +++++++++++++++++++++ sys-cluster/torque/torque-6.0.4-r6.ebuild | 202 ++++++ 3 files changed, 961 insertions(+) diff --git a/sys-cluster/torque/files/torque-6.0.4-fix-pbs_tcp_timeout-has-a-different-language-linkage.patch b/sys-cluster/torque/files/torque-6.0.4-fix-pbs_tcp_timeout-has-a-different-language-linkage.patch new file mode 100644 index 000000000000..7fda492e86fb --- /dev/null +++ b/sys-cluster/torque/files/torque-6.0.4-fix-pbs_tcp_timeout-has-a-different-language-linkage.patch @@ -0,0 +1,19 @@ +From 6019c52444309dc2fdc61c5340c9458aeff6dced Mon Sep 17 00:00:00 2001 +From: Brahmajit Das +Date: Sat, 13 May 2023 02:11:24 +0530 +Subject: [PATCH] Fix pbs_tcp_timeout has a different language linkage + +Signed-off-by: Brahmajit Das +--- a/src/include/tcp.h ++++ b/src/include/tcp.h +@@ -38,6 +38,6 @@ int tcp_wcommit(struct tcp_chan *chan, int); + int tcp_rskip(struct tcp_chan *chan,size_t); + int tcp_chan_has_data(struct tcp_chan *chan); + +-extern time_t pbs_tcp_timeout; ++extern "C" time_t pbs_tcp_timeout; + + #endif /* TCP_PBS_H */ +-- +2.40.1 + diff --git a/sys-cluster/torque/files/torque-6.0.4-remove-register-storage-class-as-it-s-been-deprecate.patch b/sys-cluster/torque/files/torque-6.0.4-remove-register-storage-class-as-it-s-been-deprecate.patch new file mode 100644 index 000000000000..64fc80c01f2e --- /dev/null +++ b/sys-cluster/torque/files/torque-6.0.4-remove-register-storage-class-as-it-s-been-deprecate.patch @@ -0,0 +1,740 @@ +From 9bd19c7101d0db6910747fc75c9bd1f8a54419c3 Mon Sep 17 00:00:00 2001 +From: Brahmajit Das +Date: Sat, 13 May 2023 02:06:35 +0530 +Subject: [PATCH] Remove register storage class as it's been deprecated since + c++17 + +Signed-off-by: Brahmajit Das +Bug: https://bugs.gentoo.org/898574 +--- a/src/lib/Libattr/attr_func.c ++++ b/src/lib/Libattr/attr_func.c +@@ -310,7 +310,7 @@ svrattrl *attrlist_alloc( + int szval) /* I */ + + { +- register size_t tsize; ++ size_t tsize; + svrattrl *pal; + + /* alloc memory block */ +--- a/src/resmom/aix4/mom_mach.c ++++ b/src/resmom/aix4/mom_mach.c +@@ -642,7 +642,7 @@ cput_sum(job *pjob) + for (i = 0; i < nproc; i++) + { + +- register struct procsinfo *pp = &proc_tbl[i]; ++ struct procsinfo *pp = &proc_tbl[i]; + + if (pp->pi_state == SNONE) + continue; +@@ -697,7 +697,7 @@ mem_sum(job *pjob) + for (i = 0; i < nproc; i++) + { + +- register struct procsinfo *pp = &proc_tbl[i]; ++ struct procsinfo *pp = &proc_tbl[i]; + + if (pp->pi_state == SNONE) + continue; +@@ -760,7 +760,7 @@ overmem_proc(job *pjob, unsigned long limit) + for (i = 0; i < nproc; i++) + { + +- register struct procsinfo *pp = &proc_tbl[i]; ++ struct procsinfo *pp = &proc_tbl[i]; + + if (pp->pi_state == SNONE) + continue; +@@ -1192,7 +1192,7 @@ static unsigned long nodes_ses( + for (i = 0; i < nproc; i++) + { + +- register struct procsinfo *pp = &proc_tbl[i]; ++ struct procsinfo *pp = &proc_tbl[i]; + + if (pp->pi_state == SNONE) + continue; +@@ -1631,7 +1631,7 @@ kill_task(task *ptask, int sig, int pg) + for (i = 0; i < nproc; i++) + { + +- register struct procsinfo *pp = &proc_tbl[i]; ++ struct procsinfo *pp = &proc_tbl[i]; + + if (pp->pi_state == SNONE) + continue; +@@ -1758,7 +1758,7 @@ pid_t jobid; + for (i = 0; i < nproc; i++) + { + +- register struct procsinfo *pp = &proc_tbl[i]; ++ struct procsinfo *pp = &proc_tbl[i]; + + if (pp->pi_state == SNONE) + continue; +@@ -1819,7 +1819,7 @@ pid_t pid; + for (i = 0; i < nproc; i++) + { + +- register struct procsinfo *pp = &proc_tbl[i]; ++ struct procsinfo *pp = &proc_tbl[i]; + + if (pp->pi_state == SNONE) + continue; +@@ -1919,7 +1919,7 @@ pid_t jobid; + for (i = 0; i < nproc; i++) + { + +- register struct procsinfo *pp = &proc_tbl[i]; ++ struct procsinfo *pp = &proc_tbl[i]; + + if (pp->pi_state == SNONE) + continue; +@@ -1966,7 +1966,7 @@ pid_t pid; + for (i = 0; i < nproc; i++) + { + +- register struct procsinfo *pp = &proc_tbl[i]; ++ struct procsinfo *pp = &proc_tbl[i]; + + if (pp->pi_state == SNONE) + continue; +@@ -2227,7 +2227,7 @@ sessions(struct rm_attribute *attrib) + for (i = 0; i < nproc; i++) + { + +- register struct procsinfo *pp = &proc_tbl[i]; ++ struct procsinfo *pp = &proc_tbl[i]; + + if (pp->pi_state == SNONE) + continue; +@@ -2342,7 +2342,7 @@ pids(struct rm_attribute *attrib) + for (i = 0; i < nproc; i++) + { + +- register struct procsinfo *pp = &proc_tbl[i]; ++ struct procsinfo *pp = &proc_tbl[i]; + + if (pp->pi_state == SNONE) + continue; +@@ -2403,7 +2403,7 @@ nusers(struct rm_attribute *attrib) + for (i = 0; i < nproc; i++) + { + +- register struct procsinfo *pp = &proc_tbl[i]; ++ struct procsinfo *pp = &proc_tbl[i]; + + if (pp->pi_state == SNONE) + continue; +--- a/src/resmom/aix5/mom_mach.c ++++ b/src/resmom/aix5/mom_mach.c +@@ -646,7 +646,7 @@ cput_sum(job *pjob) + for (i = 0; i < nproc; i++) + { + +- register struct procsinfo *pp = &proc_tbl[i]; ++ struct procsinfo *pp = &proc_tbl[i]; + + if (pp->pi_state == SNONE) + continue; +@@ -701,7 +701,7 @@ mem_sum(job *pjob) + for (i = 0; i < nproc; i++) + { + +- register struct procsinfo *pp = &proc_tbl[i]; ++ struct procsinfo *pp = &proc_tbl[i]; + + if (pp->pi_state == SNONE) + continue; +@@ -764,7 +764,7 @@ overmem_proc(job *pjob, unsigned long limit) + for (i = 0; i < nproc; i++) + { + +- register struct procsinfo *pp = &proc_tbl[i]; ++ struct procsinfo *pp = &proc_tbl[i]; + + if (pp->pi_state == SNONE) + continue; +@@ -1190,7 +1190,7 @@ nodes_ses(job *pjob) + for (i = 0; i < nproc; i++) + { + +- register struct procsinfo *pp = &proc_tbl[i]; ++ struct procsinfo *pp = &proc_tbl[i]; + + if (pp->pi_state == SNONE) + continue; +@@ -1601,7 +1601,7 @@ kill_task(task *ptask, int sig, int pg) + for (i = 0; i < nproc; i++) + { + +- register struct procsinfo *pp = &proc_tbl[i]; ++ struct procsinfo *pp = &proc_tbl[i]; + + if (pp->pi_state == SNONE) + continue; +@@ -1728,7 +1728,7 @@ pid_t jobid; + for (i = 0; i < nproc; i++) + { + +- register struct procsinfo *pp = &proc_tbl[i]; ++ struct procsinfo *pp = &proc_tbl[i]; + + if (pp->pi_state == SNONE) + continue; +@@ -1789,7 +1789,7 @@ pid_t pid; + for (i = 0; i < nproc; i++) + { + +- register struct procsinfo *pp = &proc_tbl[i]; ++ struct procsinfo *pp = &proc_tbl[i]; + + if (pp->pi_state == SNONE) + continue; +@@ -1889,7 +1889,7 @@ pid_t jobid; + for (i = 0; i < nproc; i++) + { + +- register struct procsinfo *pp = &proc_tbl[i]; ++ struct procsinfo *pp = &proc_tbl[i]; + + if (pp->pi_state == SNONE) + continue; +@@ -1936,7 +1936,7 @@ pid_t pid; + for (i = 0; i < nproc; i++) + { + +- register struct procsinfo *pp = &proc_tbl[i]; ++ struct procsinfo *pp = &proc_tbl[i]; + + if (pp->pi_state == SNONE) + continue; +@@ -2191,7 +2191,7 @@ sessions(struct rm_attribute *attrib) + for (i = 0; i < nproc; i++) + { + +- register struct procsinfo *pp = &proc_tbl[i]; ++ struct procsinfo *pp = &proc_tbl[i]; + + if (pp->pi_state == SNONE) + continue; +@@ -2306,7 +2306,7 @@ pids(struct rm_attribute *attrib) + for (i = 0; i < nproc; i++) + { + +- register struct procsinfo *pp = &proc_tbl[i]; ++ struct procsinfo *pp = &proc_tbl[i]; + + if (pp->pi_state == SNONE) + continue; +@@ -2367,7 +2367,7 @@ nusers(struct rm_attribute *attrib) + for (i = 0; i < nproc; i++) + { + +- register struct procsinfo *pp = &proc_tbl[i]; ++ struct procsinfo *pp = &proc_tbl[i]; + + if (pp->pi_state == SNONE) + continue; +--- a/src/resmom/cygwin/mom_mach.c ++++ b/src/resmom/cygwin/mom_mach.c +@@ -2771,7 +2771,7 @@ char *sessions( + int njids = 0; + pid_t *jids, *hold; + static int maxjid = 200; +- register pid_t jobid; ++ pid_t jobid; + + if (attrib != NULL) + { +@@ -3022,7 +3022,7 @@ char *nusers( + int nuids = 0; + uid_t *uids, *hold; + static int maxuid = 200; +- register uid_t uid; ++ uid_t uid; + + if (attrib != NULL) + { +--- a/src/resmom/digitalunix/mom_mach.c ++++ b/src/resmom/digitalunix/mom_mach.c +@@ -1526,7 +1526,7 @@ sessions(struct rm_attribute *attrib) + int njids = 0; + pid_t *jids, *hold; + static int maxjid = 200; +- register pid_t jobid; ++ pid_t jobid; + + if (attrib) + { +@@ -1717,7 +1717,7 @@ nusers(struct rm_attribute *attrib) + int nuids = 0; + uid_t *uids, *hold; + static int maxuid = 200; +- register uid_t uid; ++ uid_t uid; + + if (attrib) + { +--- a/src/resmom/fujitsu/mom_mach.c ++++ b/src/resmom/fujitsu/mom_mach.c +@@ -1560,7 +1560,7 @@ sessions(struct rm_attribute *attrib) + int njids = 0; + pid_t *jids, *hold; + static int maxjid = 200; +- register pid_t jobid; ++ pid_t jobid; + + if (attrib) + { +@@ -1751,7 +1751,7 @@ nusers(struct rm_attribute *attrib) + int nuids = 0; + uid_t *uids, *hold; + static int maxuid = 200; +- register uid_t uid; ++ uid_t uid; + + if (attrib) + { +--- a/src/resmom/hpux10/mom_mach.c ++++ b/src/resmom/hpux10/mom_mach.c +@@ -1432,7 +1432,7 @@ sessions(struct rm_attribute *attrib) + int njids = 0; + pid_t *jids, *hold; + static int maxjid = 200; +- register pid_t jobid; ++ pid_t jobid; + + if (attrib) + { +@@ -1625,7 +1625,7 @@ nusers(struct rm_attribute *attrib) + int nuids = 0; + uid_t *uids, *hold; + static int maxuid = 200; +- register uid_t uid; ++ uid_t uid; + + if (attrib) + { +--- a/src/resmom/hpux11/mom_mach.c ++++ b/src/resmom/hpux11/mom_mach.c +@@ -1512,7 +1512,7 @@ sessions(struct rm_attribute *attrib) + int njids = 0; + pid_t *jids, *hold; + static int maxjid = 200; +- register pid_t jobid; ++ pid_t jobid; + + if (attrib) + { +@@ -1705,7 +1705,7 @@ nusers(struct rm_attribute *attrib) + int nuids = 0; + uid_t *uids, *hold; + static int maxuid = 200; +- register uid_t uid; ++ uid_t uid; + + if (attrib) + { +--- a/src/resmom/irix5/mom_mach.c ++++ b/src/resmom/irix5/mom_mach.c +@@ -1679,7 +1679,7 @@ sessions(struct rm_attribute *attrib) + int njids = 0; + pid_t *jids, *hold; + static int maxjid = 200; +- register pid_t jobid; ++ pid_t jobid; + + if (attrib) + { +@@ -1894,7 +1894,7 @@ nusers(struct rm_attribute *attrib) + int nuids = 0; + uid_t *uids, *hold; + static int maxuid = 200; +- register uid_t uid; ++ uid_t uid; + + if (attrib) + { +--- a/src/resmom/irix6/mom_mach.c ++++ b/src/resmom/irix6/mom_mach.c +@@ -1923,7 +1923,7 @@ sessions(struct rm_attribute *attrib) + int njids = 0; + pid_t *jids, *hold; + static int maxjid = 200; +- register pid_t jobid; ++ pid_t jobid; + + if (attrib) + { +@@ -2114,7 +2114,7 @@ nusers(struct rm_attribute *attrib) + int nuids = 0; + uid_t *uids, *hold; + static int maxuid = 200; +- register uid_t uid; ++ uid_t uid; + + if (attrib) + { +--- a/src/resmom/linux/mom_mach.c ++++ b/src/resmom/linux/mom_mach.c +@@ -4250,7 +4250,7 @@ const char *nusers( + int nuids = 0; + uid_t *uids, *hold; + static int maxuid = 200; +- register uid_t uid; ++ uid_t uid; + #ifdef NUMA_SUPPORT + char mom_check_name[PBS_MAXSERVERNAME], *s; + job *pjob; +--- a/src/resmom/mom_server.c ++++ b/src/resmom/mom_server.c +@@ -1811,11 +1811,11 @@ void mom_server_all_update_stat(void) + + long power( + +- register int x, +- register int n) ++ int x, ++ int n) + + { +- register long p; ++ long p; + + for (p = 1;n > 0;--n) + { +--- a/src/resmom/mom_server_lib.h ++++ b/src/resmom/mom_server_lib.h +@@ -86,7 +86,7 @@ int send_update(); + + void mom_server_all_update_stat(void); + +-long power(register int x, register int n); ++long power(int x, int n); + + int calculate_retry_seconds(int count); + +--- a/src/resmom/solaris5/mom_mach.c ++++ b/src/resmom/solaris5/mom_mach.c +@@ -1534,7 +1534,7 @@ sessions(struct rm_attribute *attrib) + int njids = 0; + pid_t *jids, *hold; + static int maxjid = 200; +- register pid_t jobid; ++ pid_t jobid; + + if (attrib) + { +@@ -1725,7 +1725,7 @@ nusers(struct rm_attribute *attrib) + int nuids = 0; + uid_t *uids, *hold; + static int maxuid = 200; +- register uid_t uid; ++ uid_t uid; + + if (attrib) + { +--- a/src/resmom/solaris7/mom_mach.c ++++ b/src/resmom/solaris7/mom_mach.c +@@ -1623,7 +1623,7 @@ sessions(struct rm_attribute *attrib) + int njids = 0; + pid_t *jids, *hold; + static int maxjid = 200; +- register pid_t jobid; ++ pid_t jobid; + + if (attrib) + { +@@ -1814,7 +1814,7 @@ nusers(struct rm_attribute *attrib) + int nuids = 0; + uid_t *uids, *hold; + static int maxuid = 200; +- register uid_t uid; ++ uid_t uid; + + if (attrib) + { +--- a/src/resmom/sunos4/mom_mach.c ++++ b/src/resmom/sunos4/mom_mach.c +@@ -384,7 +384,7 @@ cput_sum(job *pjob) + char *id = "cput_sum"; + int i; + +- register struct user *uarea; ++ struct user *uarea; + unsigned long cputime; + int nps = 0; + +@@ -393,7 +393,7 @@ cput_sum(job *pjob) + for (i = 0; i < nproc; i++) + { + +- register struct proc *pp = &proc_tbl[i]; ++ struct proc *pp = &proc_tbl[i]; + + if (pp->p_stat == 0) + continue; +@@ -461,7 +461,7 @@ mem_sum(job *pjob) + for (i = 0; i < nproc; i++) + { + +- register struct proc *pp = &proc_tbl[i]; ++ struct proc *pp = &proc_tbl[i]; + + if (pp->p_stat == 0) + continue; +@@ -493,7 +493,7 @@ resi_sum(job *pjob) + for (i = 0; i < nproc; i++) + { + +- register struct proc *pp = &proc_tbl[i]; ++ struct proc *pp = &proc_tbl[i]; + + if (pp->p_stat == 0) + continue; +@@ -522,7 +522,7 @@ overmem_proc(job *pjob, unsigned long limit) + for (i = 0; i < nproc; i++) + { + +- register struct proc *pp = &proc_tbl[i]; ++ struct proc *pp = &proc_tbl[i]; + + if (pp->p_stat == 0) + continue; +@@ -1270,7 +1270,7 @@ pid_t jobid; + double ses_time; + int i; + +- register struct user *uarea; ++ struct user *uarea; + unsigned long cputime; + + if (getprocs() == 0) +@@ -1284,7 +1284,7 @@ pid_t jobid; + for (i = 0; i < nproc; i++) + { + +- register struct proc *pp = &proc_tbl[i]; ++ struct proc *pp = &proc_tbl[i]; + + if (pp->p_stat == 0) + continue; +@@ -1335,9 +1335,9 @@ pid_t pid; + { + char *id = "cput_proc"; + +- register struct proc *pp; ++ struct proc *pp; + +- register struct user *uarea; ++ struct user *uarea; + uint cputime; + + if (kd == NULL) +@@ -1438,7 +1438,7 @@ pid_t jobid; + for (i = 0; i < nproc; i++) + { + +- register struct proc *pp = &proc_tbl[i]; ++ struct proc *pp = &proc_tbl[i]; + + if (pp->p_stat == 0) + continue; +@@ -1470,7 +1470,7 @@ pid_t pid; + { + char *id = "mem_proc"; + +- register struct proc *pp; ++ struct proc *pp; + int memsize; + + if (kd == NULL) +@@ -1553,7 +1553,7 @@ pid_t jobid; + for (i = 0; i < nproc; i++) + { + +- register struct proc *pp = &proc_tbl[i]; ++ struct proc *pp = &proc_tbl[i]; + + if (pp->p_stat == 0) + continue; +@@ -1583,7 +1583,7 @@ pid_t pid; + { + char *id = "resi_proc"; + +- register struct proc *pp; ++ struct proc *pp; + + if (kd == NULL) + { +@@ -1679,7 +1679,7 @@ sessions(struct rm_attribute *attrib) + for (i = 0; i < nproc; i++) + { + +- register struct proc *pp = &proc_tbl[i]; ++ struct proc *pp = &proc_tbl[i]; + + if (pp->p_stat == 0) + continue; +@@ -1791,7 +1791,7 @@ pids(struct rm_attribute *attrib) + for (i = 0; i < nproc; i++) + { + +- register struct proc *pp = &proc_tbl[i]; ++ struct proc *pp = &proc_tbl[i]; + + if (pp->p_stat == 0) + continue; +@@ -1850,7 +1850,7 @@ nusers(struct rm_attribute *attrib) + for (i = 0; i < nproc; i++) + { + +- register struct proc *pp = &proc_tbl[i]; ++ struct proc *pp = &proc_tbl[i]; + + if (pp->p_stat == 0) + continue; +@@ -2160,7 +2160,7 @@ walltime(struct rm_attribute *attrib) + { + char *id = "walltime"; + +- register struct user *uarea; ++ struct user *uarea; + pid_t value; + int i, job, found = 0; + time_t now, start; +@@ -2215,7 +2215,7 @@ walltime(struct rm_attribute *attrib) + for (i = 0; i < nproc; i++) + { + +- register struct proc *pp = &proc_tbl[i]; ++ struct proc *pp = &proc_tbl[i]; + + if (pp->p_stat == 0) + continue; +--- a/src/resmom/unicos8/mom_mach.c ++++ b/src/resmom/unicos8/mom_mach.c +@@ -263,7 +263,7 @@ var_init(void) + void + var_cleanup(void) + { +- register i; ++ int i; + + if (v_name == NULL) + return; +@@ -280,7 +280,7 @@ var_cleanup(void) + char * + var_value(char *name) + { +- register i; ++ int i; + + for (i = 0; v_name[i]; i++) + { +@@ -2382,9 +2382,9 @@ pid_t jobid; + for (i = 0; i < nproc; i++) + { + +- register struct proc *pp = &process_table[i]; ++ struct proc *pp = &process_table[i]; + +- register struct pcomm *pc; ++ struct pcomm *pc; + + if (pp->p_stat == 0) + continue; +@@ -2437,9 +2437,9 @@ pid_t pid; + for (i = 0; i < nproc; i++) + { + +- register struct proc *pp = &process_table[i]; ++ struct proc *pp = &process_table[i]; + +- register struct pcomm *pc; ++ struct pcomm *pc; + + if (pp->p_stat == 0) + continue; +@@ -2528,9 +2528,9 @@ pid_t jobid; + for (i = 0; i < nproc; i++) + { + +- register struct proc *pp = &process_table[i]; ++ struct proc *pp = &process_table[i]; + +- register struct pcomm *pc; ++ struct pcomm *pc; + + if (pp->p_stat == 0) + continue; +@@ -2576,9 +2576,9 @@ pid_t pid; + for (i = 0; i < nproc; i++) + { + +- register struct proc *pp = &process_table[i]; ++ struct proc *pp = &process_table[i]; + +- register struct pcomm *pc; ++ struct pcomm *pc; + + if (pp->p_stat == 0) + continue; +@@ -2646,7 +2646,7 @@ sessions(struct rm_attribute *attrib) + int i, j, nproc, njids = 0; + pid_t *jids, *hold; + static int maxjid = 300; +- register pid_t jobid; ++ pid_t jobid; + + if (attrib) + { +@@ -2674,7 +2674,7 @@ sessions(struct rm_attribute *attrib) + for (i = 0; i < nproc; i++) + { + +- register struct proc *pp = &process_table[i]; ++ struct proc *pp = &process_table[i]; + + if (pp->p_stat == 0) + continue; +@@ -2790,7 +2790,7 @@ nusers(struct rm_attribute *attrib) + for (i = 0; i < nproc; i++) + { + +- register struct proc *pp = &process_table[i]; ++ struct proc *pp = &process_table[i]; + + if (pp->p_stat == 0) + continue; +@@ -2872,7 +2872,7 @@ pids(struct rm_attribute *attrib) + for (i = 0; i < nproc; i++) + { + +- register struct proc *pp = &process_table[i]; ++ struct proc *pp = &process_table[i]; + + if (pp->p_stat == 0) + continue; +--- a/src/server/node_manager.c ++++ b/src/server/node_manager.c +@@ -5433,10 +5433,10 @@ int node_avail( + char *pc; + + struct prop *prop = NULL; +- register int xavail; +- register int xalloc; +- register int xresvd; +- register int xdown; ++ int xavail; ++ int xalloc; ++ int xresvd; ++ int xdown; + int node_req = 1; + int gpu_req = 0; + int mic_req = 0; +-- +2.40.1 + diff --git a/sys-cluster/torque/torque-6.0.4-r6.ebuild b/sys-cluster/torque/torque-6.0.4-r6.ebuild new file mode 100644 index 000000000000..3e838b63737d --- /dev/null +++ b/sys-cluster/torque/torque-6.0.4-r6.ebuild @@ -0,0 +1,202 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +MY_COMMIT="6a0b37f85c7d644e9217cbab1542792d646f59a6" +inherit autotools flag-o-matic linux-info toolchain-funcs + +DESCRIPTION="Resource manager and queuing system based on OpenPBS" +HOMEPAGE="https://adaptivecomputing.com/cherry-services/torque-resource-manager/ https://github.com/adaptivecomputing/torque/" +SRC_URI=" + https://github.com/adaptivecomputing/torque/archive/${MY_COMMIT}.tar.gz -> ${P}-gh-20170829.tar.gz + https://dev.gentoo.org/~juippis/distfiles/tmp/torque-6.0.4-gcc7.patch + https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-glibc-2.34-pthread.patch.bz2 +" + +LICENSE="torque-2.5" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" +IUSE="autorun cgroups cpusets +crypt doc munge nvidia quickcommit server +syslog tk" + +DEPEND_COMMON=" + sys-libs/zlib + sys-libs/readline:0= + dev-libs/libxml2 + dev-libs/boost + cpusets? ( sys-apps/hwloc:= ) + munge? ( sys-auth/munge ) + nvidia? ( >=x11-drivers/nvidia-drivers-275 ) + tk? ( + dev-lang/tk:0= + dev-lang/tcl:0= + ) + syslog? ( virtual/logger ) + !!games-util/qstat +" + +# libncurses.so is only needed for configure check on readline +DEPEND=" + ${DEPEND_COMMON} + sys-libs/ncurses:* + !!sys-cluster/slurm +" + +RDEPEND=" + ${DEPEND_COMMON} + crypt? ( virtual/openssh ) + !crypt? ( net-misc/netkit-rsh ) + !dev-libs/uthash +" + +# Torque should depend on dev-libs/uthash but that's pretty much impossible +# to patch in as they ship with a broken configure such that files referenced +# by the configure.ac and Makefile.am are missing. +# http://www.supercluster.org/pipermail/torquedev/2014-October/004773.html + +S="${WORKDIR}"/${PN}-6a0b37f85c7d644e9217cbab1542792d646f59a6 + +PATCHES=( + "${DISTDIR}"/${P}-gcc7.patch + "${FILESDIR}"/${PN}-6.0.3-fix-emptystring-comparison.patch + "${FILESDIR}"/${P}-no-openssl.patch + "${FILESDIR}"/${P}-error_buf_overflow_prevent.patch + "${WORKDIR}"/${P}-glibc-2.34-pthread.patch + "${FILESDIR}"/${P}-pthreads-deux.patch + "${FILESDIR}"/${P}-remove-register-storage-class-as-it-s-been-deprecate.patch + "${FILESDIR}"/${P}-fix-pbs_tcp_timeout-has-a-different-language-linkage.patch +) + +pkg_setup() { + PBS_SERVER_HOME="${PBS_SERVER_HOME:-/var/spool/${PN}}" + + # Find a Torque server to use. Check environment, then + # current setup (if any), and fall back on current hostname. + if [[ -z "${PBS_SERVER_NAME}" ]]; then + if [ -f "${EROOT}/${PBS_SERVER_HOME}/server_name" ]; then + PBS_SERVER_NAME="$(<${EROOT}/${PBS_SERVER_HOME}/server_name)" + else + PBS_SERVER_NAME=$(hostname -f) + fi + fi + + if use cpusets || use cgroups; then + if ! use kernel_linux; then + einfo + elog " Torque currently only has support for cpusets and cgroups in linux." + elog "Assuming you didn't really want this USE flag and ignoring its state." + einfo + else + linux-info_pkg_setup + if ! linux_config_exists || ! linux_chkconfig_present CPUSETS; then + einfo + elog " Torque support for cpusets will require that you recompile" + elog "your kernel with CONFIG_CPUSETS enabled." + einfo + fi + fi + fi +} + +src_prepare() { + default + # We install to a valid location, no need to muck with ld.so.conf + # --without-loadlibfile is supposed to do this for us... + sed -i '/mk_default_ld_lib_file || return 1/d' buildutils/pbs_mkdirs.in || die + eautoreconf +} + +src_configure() { + append-cflags "-fpermissive" + + # Force Bash for configure as there's a lot of issues with configure.ac and such here + CONFIG_SHELL="${BROOT}/bin/bash" econf \ + $(use_enable tk gui) \ + $(use_enable tk tcl-qstat) \ + $(use_enable syslog) \ + $(use_enable server) \ + --disable-drmaa \ + $(use_enable munge munge-auth) \ + $(use_enable nvidia nvidia-gpus) \ + $(usex crypt "--with-rcp=scp" "--with-rcp=mom_rcp") \ + $(usex kernel_linux $(use_enable cpusets cpuset) --disable-cpuset) \ + $(usex kernel_linux $(use_enable cgroups) --disable-cgroups) \ + $(use_enable autorun) \ + $(use_enable quickcommit) \ + --with-server-home=${PBS_SERVER_HOME} \ + --with-environ=/etc/pbs_environment \ + --with-default-server=${PBS_SERVER_NAME} \ + --disable-gcc-warnings \ + --disable-silent-rules \ + --with-tcp-retry-limit=2 \ + --without-loadlibfile +} + +src_compile() { + # The .c files are C++, and $(CC) is misused. + emake CC="$(tc-getCXX)" +} + +src_install() { + local dir + + DOCS=( CHANGELOG README.* Release_Notes ) + use doc && DOCS+=( doc/admin_guide.ps doc/*.pdf ) + + default + + # The build script isn't alternative install location friendly, + # So we have to fix some hard-coded paths in tclIndex for xpbs* to work + for file in $(find "${ED}" -iname tclIndex); do + sed \ + -e "s/${ED//\// }/ /" \ + -i "${file}" || die + done + + for dir in $(find "${ED}/${PBS_SERVER_HOME}" -type d); do + keepdir "${dir#${ED}}" + done + + if use server; then + newinitd "${FILESDIR}"/pbs_server-init.d-munge pbs_server + newinitd "${FILESDIR}"/pbs_sched-init.d pbs_sched + fi + + newinitd "${FILESDIR}"/pbs_mom-init.d-munge pbs_mom + newconfd "${FILESDIR}"/${PN}-conf.d-munge ${PN} + newinitd "${FILESDIR}"/trqauthd-init.d trqauthd + newenvd "${FILESDIR}"/${PN}-env.d 25${PN} + + find "${ED}" -name '*.la' -delete || die +} + +pkg_preinst() { + if [[ -f "${EROOT}/etc/pbs_environment" ]]; then + cp "${EROOT}/etc/pbs_environment" "${ED}"/etc/pbs_environment || die + fi + + if use server && [[ -f "${EROOT}/${PBS_SERVER_HOME}/server_priv/nodes" ]]; then + cp \ + "${EROOT}/${PBS_SERVER_HOME}/server_priv/nodes" \ + "${ED}/${PBS_SERVER_HOME}/server_priv/nodes" || die + fi + + echo "${PBS_SERVER_NAME}" > "${ED}${PBS_SERVER_HOME}/server_name" || die + + # Fix up the env.d file to use our set server home. + sed \ + -e "s:/var/spool/${PN}:${PBS_SERVER_HOME}:g" \ + -i "${ED}"/etc/env.d/25${PN} || die + + if use munge; then + sed -i 's,\(PBS_USE_MUNGE=\).*,\11,' "${ED}"/etc/conf.d/${PN} || die + fi +} + +pkg_postinst() { + if [[ -z "${REPLACING_VERSIONS}" ]] ; then + elog "If this is the first time torque has been installed, then you are not" + elog "ready to start the server. Please refer to the documentation located at:" + elog "http://docs.adaptivecomputing.com/torque/${PV//./-}/adminGuide/torquehelp.htm#topics/torque/1-installConfig/initializeConfigOnServer.htm" + fi +}