diff options
author | V3n3RiX <venerix@koprulu.sector> | 2023-05-13 11:51:16 +0100 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2023-05-13 11:51:16 +0100 |
commit | 74bdea52f57b5c6ac79078bc30a1c342dc3d49c7 (patch) | |
tree | 7d239372a4ee9d7aa7483f3ff0474ec2d64c426a /sys-cluster | |
parent | 4b718beb7d5fd4e0b5d741ff3a4c5c570519195e (diff) |
gentoo auto-resync : 13:05:2023 - 11:51:15
Diffstat (limited to 'sys-cluster')
-rw-r--r-- | sys-cluster/Manifest.gz | bin | 11539 -> 11532 bytes | |||
-rw-r--r-- | sys-cluster/torque/Manifest | 3 | ||||
-rw-r--r-- | sys-cluster/torque/files/torque-6.0.4-fix-pbs_tcp_timeout-has-a-different-language-linkage.patch | 19 | ||||
-rw-r--r-- | sys-cluster/torque/files/torque-6.0.4-remove-register-storage-class-as-it-s-been-deprecate.patch | 740 | ||||
-rw-r--r-- | sys-cluster/torque/torque-6.0.4-r6.ebuild | 202 |
5 files changed, 964 insertions, 0 deletions
diff --git a/sys-cluster/Manifest.gz b/sys-cluster/Manifest.gz Binary files differindex 8efb71e43a49..e6b0349d81a2 100644 --- a/sys-cluster/Manifest.gz +++ b/sys-cluster/Manifest.gz diff --git a/sys-cluster/torque/Manifest b/sys-cluster/torque/Manifest index db646f7873d9..0bc49d8a1945 100644 --- a/sys-cluster/torque/Manifest +++ b/sys-cluster/torque/Manifest @@ -5,8 +5,10 @@ AUX pbs_server-init.d 1615 BLAKE2B d29bc83b87c684d88fdb93689582cd5dfbecaa8ca035a AUX pbs_server-init.d-munge 1689 BLAKE2B e4a3b95e54f73110716796c1ca90d124112c57287506628af8add62a2d24689f0e00706e9ebc0cf4aa7a4e3b6d30ebaaddf02a7cf640172e73b00d92fac38734 SHA512 b9628241581fbed629d0edf83a3f987de894fb5711061239e737f63ef7dbe9033d35aa87a38b56dbd8da887a3058f9f284bfe101ee13db3464e6e814b537ea23 AUX torque-6.0.3-fix-emptystring-comparison.patch 2062 BLAKE2B d8186eebb69669ac67141183370f8959945db295956c686107471f9e29bfdcd08fd0a6c659f3bb80a6a152cc2a2319089b4a7c17eb29d873c257a559753efec7 SHA512 d2bc25899337f799652b5f02d7fc5d7e894fb6e2eefa201853a2695a5140c85aff670f8af3f8cf1b77988ea51d5f296d0073287316cfb52dcc208acc42161099 AUX torque-6.0.4-error_buf_overflow_prevent.patch 736 BLAKE2B ade2f842fd04d323aead973423c29a24237e189f0badf6033632a5245a243c55435a21fbec0434afc5cada34d72581f51a7d1a1b8c89b25aacb22aeb7e1ab98a SHA512 40aea81d470f485cc4330435c90e41ecaef911e73be17a8f0eb3277965c72d67275221f0c2d8ab5fde25448db93087fc02ef09625052dc80320f51d8fcdfed9c +AUX torque-6.0.4-fix-pbs_tcp_timeout-has-a-different-language-linkage.patch 593 BLAKE2B 4d2b35745fb47d6b75578eff19ebef7606d9c65461dcd986f5e1dcffa42a8b68e804e2d0fb0a6feccc1064ead1247dfbeba662a759f27c0318ec42b361a15268 SHA512 e0df989eb246d181abdb8c1819c6d15f4734158e278b93e49753cb4446f5984451f98494a8dedd27182d04c88186a20bdda3c4f2db3f64954b4242d24195e69e AUX torque-6.0.4-no-openssl.patch 1926 BLAKE2B 387843f6117ebdb1a9ca0f9fe3363dd2b2ab45aced82e3e9c60cb11009fef1dd97afeb9e525a3a5d70885b6cd19cc20333dc9d009453ade63bad8c39fb82d578 SHA512 1370c280860eb31d2a7e09b7bef6d9f2d6d7651ba0c67db7c7c912ec72b78f6ca33f7f5b716afc69a10f8c3efd55d5702f8e894596de78a91a346ec28d83e5dc AUX torque-6.0.4-pthreads-deux.patch 411 BLAKE2B 253382c900c4d581a3fa07fc38188c767658968ad5ebc3d9af52b8757110c9bd203c9aecc1d97d8cd7d75fefc46fabdb6b038966bb3757e08257a945151376c7 SHA512 a9b4ad47c6f1f75832fdd062062c29f087d61c0adea2b04448432b2d3bed51b65db1aeb77ca87fc5fad6536df0aa28f19df2f1e04857db26de03cf090bb30fab +AUX torque-6.0.4-remove-register-storage-class-as-it-s-been-deprecate.patch 17712 BLAKE2B 581154ce977047e61c89e7fab7e2ed7862913fa277f76d4cff9b421f0a5ff5a6c4a8745c083e9b4e194eb788c833fcd1c7942bc2d52ea9ae49a393fcaf15fd15 SHA512 c2edc3acc381706028a5c546c52885486ee8c239a610b3f31dc8abbcdca3692a2f1fd7c4625feec068cd905d2699379424a31406651fe753f2de5bbae704d40c AUX torque-conf.d 649 BLAKE2B 819a53a96a35d77b45d3c536278a088845cbbbd4ac1606b7d822ae36909477428c692975edcd69b519e348fa2cfc7d01c013db33daae65b9a0ba169456324443 SHA512 b82f6c1d661bed03a32c3761530c4b303715167a317e467371091b11d3ae0e19e9784b1588577ee5f65397cb0699818ed5f621aeb66d3f2d218df12d0cf39bde AUX torque-conf.d-munge 784 BLAKE2B fe4fc64377da0ed0232961462bd92fea4fae68760dd698cf2759105f75686c5c77c3cff2c3fac3531c4b4905244cbc9df0fe67fe62a410a63b35008429dd1261 SHA512 a78634a6f2bdf3c24e8c99d3cd7a9634daa32d69244a9ddfcc26199f4d04e901abbfa79ad057f5a4e4c492c9e21bc0c65edd8465ac6935fb7c67c8c639e75d68 AUX torque-env.d 240 BLAKE2B 49ef384c36369e02f11575b40f881efcbc3605dc7c52eb1694f721e15055542296c064628a9ed605638600a1319c6ec18691e5f3e3e94304ada8b7596997765f SHA512 275ce5ccf9f138bcee504a9996c9d838cd34714d352d4b7ac2d631d0fca662bf38a2ef7e8745605d9b3847049015e0791c937340cfdacbf44800482ce73bb042 @@ -16,4 +18,5 @@ DIST torque-6.0.4-gh-20170829.tar.gz 6182495 BLAKE2B f9156ae4ffe388a7f3fa0df142e DIST torque-6.0.4-glibc-2.34-pthread.patch.bz2 6266 BLAKE2B b5175b8bfe2deabe86b067f1ec5269770bcf096c6e875b8fd3cb404a976c9cb550ddcbe6e4ebb1e59c96044f95c285519e70fb4acd5c9db86c3050093ff65b3b SHA512 dbe0bd6000c140e1fe9b36e55c1a844701406a563bd178b9c972793b83282f3434e2160da5280666dcc0934c2b88e36c0a2b9518ffe7695b23d73fce0a07388d EBUILD torque-6.0.4-r4.ebuild 6006 BLAKE2B b268bf6bbebf75bf5cfea18f9e5333d91779c21dd0ac1bbce6059c71975ee655d38c49598e332f30af8dee22ecf69b126cadd80b9ce6f57e9754672a0f5b8493 SHA512 994031561921ab22d03a91bd0586b5d95615584c9a805b7d40e58cb228ef2a1b5052789a00075857991387795dc7540d6757f7a61f3504becb7dd535321448a0 EBUILD torque-6.0.4-r5.ebuild 6053 BLAKE2B a0aa464211880bd0cbeaec2512c799858b316657c02650c861c817fbcf56c9fb666d3f0ef95399ed84b9897da05da4f764e7a32e4d2a847f2353d5b3fc04a210 SHA512 4d9be20f645e7bd2f47494af99bc4578091b2ff0e974b2eef80e0d780b6978aedc78c7f9d9d102bf303bfe6245d44783b8690990fe418c9526cdc45358355f80 +EBUILD torque-6.0.4-r6.ebuild 6211 BLAKE2B c1b77f7c36afe6b268671ed3696c1d269b743fe1a1146e30beeb77d619832d3cc02ddc4785d72f2352237e4d73d75b7c108712e09e40bf840e6d2d1347d49437 SHA512 4487b6a6748c011a52aa364ce9e9077535fa5b98f7f3367910334e8abfeb85ce64a4cbb3981e7c4764de61ed9aa522f24d0643399810c7d7a1ec619304ac4f5b MISC metadata.xml 854 BLAKE2B 77be0da422efef3efbe4a151f45b82f3cc5efdb2da91345bd245d23b1b3f93e8e9bbfff40c7aa4ab149a66574f8113360bf6cce8f630fa3ff17bbcf7a580c896 SHA512 a296b3a82abc530aff7672cf70fe06b26c61dff95476ca33a6692fb7cb5fabaa3873e6e1666721b8066ff524273ea6ebf20681a8418e849f94995b4493d4496f 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 <brahmajit.xyz@gmail.com> +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 <brahmajit.xyz@gmail.com> +--- 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 <brahmajit.xyz@gmail.com> +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 <brahmajit.xyz@gmail.com> +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 <SVRATTRL><NAME><RESC><VAL> */ +--- 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 +} |