diff options
Diffstat (limited to 'sys-cluster/torque')
-rw-r--r-- | sys-cluster/torque/Manifest | 18 | ||||
-rw-r--r-- | sys-cluster/torque/files/CVE-2013-4319-2.x-root-submit-fix.patch | 40 | ||||
-rw-r--r-- | sys-cluster/torque/files/CVE-2013-4495.patch | 32 | ||||
-rw-r--r-- | sys-cluster/torque/files/CVE-2014-0749.patch | 32 | ||||
-rw-r--r-- | sys-cluster/torque/files/TRQ-2885-limit-tm_adopt-to-only-adopt-a-session-id-t.patch | 134 | ||||
-rw-r--r-- | sys-cluster/torque/files/tcl8.6.patch | 87 | ||||
-rw-r--r-- | sys-cluster/torque/files/torque-4.2-use-NULL-instead-of-char0.patch | 140 | ||||
-rw-r--r-- | sys-cluster/torque/torque-2.5.13-r1.ebuild | 253 | ||||
-rw-r--r-- | sys-cluster/torque/torque-4.2.10-r1.ebuild (renamed from sys-cluster/torque/torque-4.2.10.ebuild) | 16 | ||||
-rw-r--r-- | sys-cluster/torque/torque-4.2.9-r5.ebuild | 183 | ||||
-rw-r--r-- | sys-cluster/torque/torque-6.0.4.ebuild (renamed from sys-cluster/torque/torque-6.0.3.ebuild) | 32 |
11 files changed, 167 insertions, 800 deletions
diff --git a/sys-cluster/torque/Manifest b/sys-cluster/torque/Manifest index 59134ee52420..20d5db9834e7 100644 --- a/sys-cluster/torque/Manifest +++ b/sys-cluster/torque/Manifest @@ -1,30 +1,22 @@ -AUX CVE-2013-4319-2.x-root-submit-fix.patch 1253 BLAKE2B 9f528ef347c5192bc563223c307c9200bdecd51db3521b8eac05e67ba7e2accba53a6a500a7d19d35190b723b2b21a0b78bcd4dbe9f4ddbbc52ed9b5f94b8cb4 SHA512 78780ad87e997f22b6abbc3cb51c313616e90320d997705c534c35fbc7f5738b7a2e0ace33051e6e15d4f6e0ab6f97ab9f1ef60dcee5fc4544db13b0a72ea5c4 AUX CVE-2013-4495.4.1.patch 9063 BLAKE2B d5ab34ecfc095d266a4e2201640371409828368322f209378c55dc254fbeae02e92ba3e71e442ded77ee89972f8d1b4e7d5cdae025f5122b49b74bd79ba641dc SHA512 52d0105c8d756e50252926c764eff46653544584c25c43d4dbaf70ed45a1c610c9381b1f735ff6c436774fb8d77a2a7607e0ea2b70eaae927e9a1024b3048913 -AUX CVE-2013-4495.patch 836 BLAKE2B 12688cbeef67d928da6936f14d55655ff3c427f95bc245eab4fee280b00c887963aa33ea4554ec71cdabbac920eac53918fa830b27c3a1b52d963bbe90edf9b7 SHA512 91522f5c8b6fa2e5de80f02e24b2a6827422c335d88600bcbb1a763dd985b3e52b850eab5059adbe4e543311551ec0da21cd69fcb7dc6e01ff93bff843769d8c -AUX CVE-2014-0749.patch 750 BLAKE2B bb00bd167a75023d523b57330792d06ac08e6cd4d6caeb0fa49be66e859226c22f5fdbe666f725b846d8a73f46890943ee42234bda07c41067465d34da42e093 SHA512 8830f4d1a0190876e97fc568a3ac84341c042686a630cc5a7d8f254414dd13063f08db3b490e447698d9c16430ab6c8990c70ee1acda2435a0b0debfb2666829 -AUX TRQ-2885-limit-tm_adopt-to-only-adopt-a-session-id-t.patch 4292 BLAKE2B f75fafe1f953a103585a58d1aada13809ac73189779192995e88827f5380b0ed299b8adf6c283ea3ff10535ee9a67b370dbd9979654dc70c3ade0ef520bcf7ac SHA512 15bb5b271b62be03df2b6aeab89082f3003abc67e00aaef96539ab88f21879f3cf30a95303fe68b3e4984cdc4f4c020e61328a4e3c26b4e44be9eafa9be3b5a6 AUX pbs_mom-init.d 1084 BLAKE2B ab674f9670317034a775a07237754078cc89356d91bfdf86fc91ed850328fc4aa302e71be5a5e9a8ac32b6617efe5a63ed5162a9b5fcd945220162e20bb259f6 SHA512 698707c833070f77224e55788799ae4b32088b47221bfd9ed8fbb4097095bb4771ec39db831bbfd5af46d0a6addee04464bc71ef548ca94f3a324ebb97ce8a9c AUX pbs_mom-init.d-munge 1149 BLAKE2B b4a70810c53bcc0508c03893fe89bf2f6c135563694e48de0f04b5494918cd2eae0e61fba9dae4a17b2ebc5e1d70084c6ae272372721cca4d12ac7dfbc06a395 SHA512 643deb1f21983dbdd8aa53416899db01ff651d81b3d989299eef9c2d3e1aab0e9b083cfae9bb559b6c3195238998a881ec5bf2a663e09f7f8508bb895bc11027 AUX pbs_sched-init.d 1165 BLAKE2B c4768e5ebfa8d39b2ef78dd9c14ee90bde6f64b42d0fa3f304b2a55ca5a4ee24de0666f9f6518bd3f9813c82aed139487d0b784293afe76fac36b1e18bc9598f SHA512 9417ffe5a417d69e03262221816b2778aacfe7cf393ea5b5ea535497f4dfcbad9545d49cdbcacaaa5e8a0fd01432806aac8e050b4979cabb59656c1256a91dd0 AUX pbs_server-init.d 1615 BLAKE2B d29bc83b87c684d88fdb93689582cd5dfbecaa8ca035a6fc52a0da0b3a068a034eb88b92c8428cb605a4674cebaf0dc75a58cb2fd2be293fadfca9899e85c806 SHA512 459334236d5614522dafa15c0144bbf9e9b5fe89ce73d61fde6b1bfbcc96c284d8f827069c4dd77f7a6c5fb2828923d60a9381c158123d5f6edd5ca50a471c21 AUX pbs_server-init.d-munge 1689 BLAKE2B e4a3b95e54f73110716796c1ca90d124112c57287506628af8add62a2d24689f0e00706e9ebc0cf4aa7a4e3b6d30ebaaddf02a7cf640172e73b00d92fac38734 SHA512 b9628241581fbed629d0edf83a3f987de894fb5711061239e737f63ef7dbe9033d35aa87a38b56dbd8da887a3058f9f284bfe101ee13db3464e6e814b537ea23 -AUX tcl8.6.patch 2396 BLAKE2B c72854119840df1759a3085c41dfe6aa234c068fb035f3352be5ae5ace57e45c3b2ead502e0c3507c1e1ac1246bc9f86bd7e5e0205799e04d84f95cb05cc993b SHA512 a288526bf43cd39d0b5505938f02ee38ccd70481a1b6351a80c5cd151376604d5cdc925293d3bd7f2d4bbe50182993448da645ca42f58e3f1bdf59bce9363b4a AUX torque-4.1.5.1-tcl8.6.patch 2546 BLAKE2B f0c1c2d5df20c53a58a47de3fc0e226d2e9d99aa9b4f32c5cef1a036c77083ed156d7fba6ba1358077e5fc64ce3c4be41a76d2a4085f345e49753bad37e986d7 SHA512 0cd584784b5254daf11635e1d6252fa4fe3c5f2e46a0771452016f66ff0e3be01b91d154cef0a793cf0ab0df223ef5c51303d35c419f1d9addc64ea26a892521 AUX torque-4.2-dont-mess-with-cflags.patch 806 BLAKE2B d4be6b841f354c5ab9eca24cd2ee330607f83000f1d7086d2cd885427f67537a9c75105b1afa9bdb1a8475bfa408d1aff903cc1d9bd5c7dfbe3d9aaf5f2fddaa SHA512 23aeb87fc75ec8b916817264501240b9f0fae7b3e81662496824dcccc21d1a07b2b58221ea22ca6551b6830e76347416a09da6c22de4aea173a32fe13c90c7ff +AUX torque-4.2-use-NULL-instead-of-char0.patch 3898 BLAKE2B 9d693f6fc8a7dc4d9a3e3517c41ece9cde8f4567cf75439b47bfbf1041cf043b69c7666eb44a477ca6dac79415bd396782ee62535f7f4c32aa3caac4431d2347 SHA512 af6bb3e257f8f4c232c83ed8d0a4a4b8a451acb42bfec36aa1caa3191ab242109f1712bbd639219254e5ab42fa518990343b917ebf9d21406eb23e8b7c9141f3 AUX torque-4.2.9-tcl8.6.patch 2702 BLAKE2B c1444b5f4da1d37e21fe5a8970e188926080805db83406f5caca2cf27dddebf069d9d9747c33e3a1e2b0ec5f36e95d80d1c69151129967d432cd2d11c5e1ecf8 SHA512 9844a1f633f049a66cf31d3721f6a5e205ede26186da1357e0b0aa2c0c4d064cbdff45e2f7e685d6c4afd09d961e59ff1759163e4a2ae349fa866e960c1bcf77 AUX torque-6.0.3-fix-emptystring-comparison.patch 542 BLAKE2B c5acba0cfb1a4ca40a77710563fe42b928052253c3569d9e130357142a0456601bbf671d61db32f54881498f4bc77b588d0cfef3431a35b30c3e3858a6aed002 SHA512 0303c49ef2a407773b9cd14f15e825d13e9a5c9ae91118ed770d81ccb59bbe01fb3614e6865b1be81e6f9618fba3a09cc4fe447a0e6684f1e142c49e17970189 AUX torque-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 AUX trqauthd-init.d 477 BLAKE2B fe62bfae07d1d9fe08352ba4d99ab5d46185a74b10497f32b0f6ad002f1dd8f73f72f351e889c908b2d38b0d09699734e4ea316c2bea2d76de0a436c34222d58 SHA512 55f19b5effc21444addb465967bbd44d6f67dc48945221753512216c4fc26878d90569cdee7b277676d157aa241c04dc08df65505d21f59f046fa5448d43b81d -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.9.tar.gz 6294022 BLAKE2B 2a57bebd7d9160deb3c610c21e1014a813c6e53771aadd65241d5fc623d41dca314e7b391cb218e0c9e917936c0547d1ba4c184442c20cef8bb62f98072537cc SHA512 898703fa1d02310c22e2a02b86d67ca52ebed46684597931944edebb39f8293746739c8dca9cd10e07c2e7274c3dd7f65a5664d1980817e3feec58952c4cf4d1 -DIST torque-6.0.3-1485300822_19e79ad.tar.gz 41660338 BLAKE2B 5e6c2e4bfffbe96d3a3e441f4c4420b4cb81a882bc498c4bf9474cf15a6808234f444183876a5ccfd46b6a9e4113d404cf72359ab3166146c3040854485f807d SHA512 40531f2e7732a11ffc224c536f61adc48ce5699a7caebb8aa1fbe7536b5ca4ed66c8436420bc918f7538ef980818141888aa26390a5a2c8185c8cc57373a0ac1 -EBUILD torque-2.5.13-r1.ebuild 7741 BLAKE2B 7510cd74459f7ef77ad5b707d1307720d8e08345fe4f632201d4e679c2afdf31859a64d6f7d706054abab281a54e373681040763914e7131d4eeec74b7676877 SHA512 d17389297c11f28c4f849e95d2f5c87f428d2b8d3c6a907d5863f4cbdd19a41532cb5abf5b9d78092f99b2838c2e1892b8fb7111b4dcb98338bfa11c4bbc5e5d +DIST torque-4.2.10-gh-20150517.tar.gz 5836286 BLAKE2B 7108f1adcb6f674526b7db97df4ebcee04ae5c818d4f35ed1230a4e72e52ec0bc3b44e17334a143b21bcd3acccefc3927eca4f98d54d37745c8bb46a75e07045 SHA512 600bb5389b6a4161732b7aa82627f1ebeae238d7091aa2e223d9a14c44bf4668662f664b976f62ba3f1d8a366f90fb6058a8c904e20c26432dccd6abcd9c57fa +DIST torque-6.0.4-gh-20170829.tar.gz 6182495 BLAKE2B f9156ae4ffe388a7f3fa0df142e5f2d48c16fd7b8c148a3a80cd1c977eb0c1ef4a455da275f993100867be043422526ed05c53734e707851083d6d23ee1a2cc4 SHA512 8f1101adb89e06617de501f7956e126633b78b495baeb7980d3c534d34537cc604a3cf0a7c23c48eb2554b26cc13672b0e00c75d0f722d63ac4d42d57388ed94 EBUILD torque-4.1.7-r1.ebuild 7491 BLAKE2B d4c4a0be3c07eca1ae0a79fbe52ea153c4c013155426aa9cba4d4f2cc70086883c3b5345026450cd5608ae4e26773dabb9a70742cf9e7cf7dc968a7cc8210380 SHA512 e7213e0df29564fa24a48bf8b96e59a69fbd56abf5c470b794eb19fbdefe705ead880d9d908f006c9c79eeab325b0f6ccc3ae64973cb1e50061c2020c64aa816 -EBUILD torque-4.2.10.ebuild 5942 BLAKE2B d80997472d7af67feed64dd01853700000d6e1030ed7a8fbafbb811d2962f92a4fb3f7c8c2ab8bf611b013eda434c1f1a13af9e6ac991b5ee566a9a4586cd770 SHA512 b31613ee3bbf1623180a55e20a61ef21909a520d9fe04f776a885b06ba3335a4f684c8b18017d658c36151663a6baecbe804d6750a954bb38fc90160b0e52ad6 -EBUILD torque-4.2.9-r5.ebuild 5687 BLAKE2B e9977c7de9a3d8254cae0da6a98b30f60176776dfb55b5b77c0709e60eb1ddc3c4d420a4cff0c0659e9164f11d94f98a550983a7690f5bc06b53d2a4dff90b6a SHA512 faa2b1e99265f1222123a4b30c0edeb512d67d2285cf56789c21dcf85d43daab2ebbf38a6d768614d9124b1b0b43ffec895da4010b4fab36574b79be461c8860 -EBUILD torque-6.0.3.ebuild 5699 BLAKE2B f4d003c110c9c740552e4bb42ca19f4d935b3651ae8624805251d003aedc1feac110a145e1978ea36361b63f18036ed48b457e413a8e69d0765ae2ae01a05952 SHA512 03647560ea0af8ead4403d8a87de1855eb86e7187a2a436da9ea7909086384d85548c43d8c57986c21ea0cc5988bc0394eb2ed73b0ce3afbc39058ad98bb538f +EBUILD torque-4.2.10-r1.ebuild 6086 BLAKE2B c685ce4e6b5b7f58c040f0b16779bb59540aa0c80fe9a55b76d603e336e63a5186d543d664caa0f6184c3145c9608b31fed379b2e827bdcd62e6e53f8334b5cc SHA512 2c64f7dfaa26e1648e32283c1dcc31df0dba8bf3c4177fdafbe713d408d931ca83c2386d3548b47e1d6d90552e4c5ceeadf96c50089f2d17eb56d79312dc70f8 +EBUILD torque-6.0.4.ebuild 5463 BLAKE2B b6202d1c5679637d7d305bef8ec3a5f6d09d6e61eb0dc42093fade8349bd014f30304b6d82f0dcab6267d5d1f5102c3c3246e41e68329e3c9219ccdc9ad5126c SHA512 710971b3b72dc388b7631cba09a46096b45022a803bd1570774cc276d416c6f6426bbb8304d56a30d49de9c940cac6574d1e20e324c42d5aa95813ceda035fdf MISC metadata.xml 988 BLAKE2B 257e838c8bde7ceea876a84631c248fce2e3a347794459bbfd4ae23210c779f69e606e120438351783ebf1cdeab7bd5e5df196ee9af31306bebd6130a08bb46f SHA512 46f2eb41303c17e84aacf5b8548b645772ab923bf9a4847892260cc5c6aaf354acc0bb0128186acf312ed77a24d9429c97f18914d759c7c5c97c19ad62489a43 diff --git a/sys-cluster/torque/files/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 aa53239f157c..000000000000 --- 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 <jsbronder@gmail.com> -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, &okclients)) - { - 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 41232c07ec72..000000000000 --- 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 <dbeer@adaptivecomputing.com> -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 52131edcf7e0..000000000000 --- 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 <dbeer@adaptivecomputing.com> -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 63713a0bc16f..000000000000 --- 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 <cvizino@adaptivecomputing.com> -Date: Tue, 23 Sep 2014 17:40:59 -0600 -Subject: [PATCH 1/2] TRQ-2885 - limit tm_adopt() to only adopt a session id - that is owned by the calling user. - ---- - src/cmds/pbs_track.c | 6 ++++++ - src/include/tm.h | 2 +- - src/include/tm_.h | 1 + - src/lib/Libifl/tm.c | 37 ++++++++++++++++++++++++++++++++++--- - 5 files changed, 56 insertions(+), 4 deletions(-) - -diff --git a/src/cmds/pbs_track.c b/src/cmds/pbs_track.c -index 7a90fda..9383ea5 100644 ---- a/src/cmds/pbs_track.c -+++ b/src/cmds/pbs_track.c -@@ -164,6 +164,12 @@ int main( - - break; - -+ case TM_EPERM: -+ -+ fprintf(stderr, "pbs_track: permission denied: %s (%d)\n", -+ pbse_to_txt(rc), -+ rc); -+ - default: - - /* Unexpected error occurred */ -diff --git a/src/include/tm.h b/src/include/tm.h -index 106d3fb..2288828 100644 ---- a/src/include/tm.h -+++ b/src/include/tm.h -@@ -125,7 +125,7 @@ int tm_register(tm_whattodo_t *what, - /* - * DJH 15 Nov 2001. - * Generic "out-of-band" task adoption call for tasks parented by -- * another job management system. Minor security hole? -+ * another job management system. - * Cannot be called with any other tm call. - * 26 Feb 2002. Allows id to be jobid (adoptCmd = TM_ADOPT_JOBID) - * or some altid (adoptCmd = TM_ADOPT_ALTID) -diff --git a/src/include/tm_.h b/src/include/tm_.h -index c9393b9..8cae7b0 100644 ---- a/src/include/tm_.h -+++ b/src/include/tm_.h -@@ -136,6 +136,7 @@ typedef unsigned int tm_task_id; - #define TM_EBADENVIRONMENT 17005 - #define TM_ENOTFOUND 17006 - #define TM_BADINIT 17007 -+#define TM_EPERM 17008 - - #define TM_TODO_NOP 5000 /* Do nothing (the nodes value may be new) */ - #define TM_TODO_CKPT 5001 /* Checkpoint <what> and continue it */ -diff --git a/src/lib/Libifl/iff --git a/src/lib/Libifl/tm.c b/src/lib/Libifl/tm.c -index edb6273..4f38529 100644 ---- a/src/lib/Libifl/tm.c -+++ b/src/lib/Libifl/tm.c -@@ -94,6 +94,7 @@ - #include <errno.h> - #include <assert.h> - #include <sys/types.h> -+#include <sys/stat.h> - #include <sys/socket.h> - #include <sys/time.h> - #include <netinet/in.h> -@@ -169,6 +170,31 @@ typedef struct event_info - static event_info *event_hash[EVENT_HASH]; - - /* -+ * check if the owner of this process matches the owner of pid -+ * returns TRUE if so, FALSE otherwise -+ */ -+bool ispidowner(pid_t pid) -+ { -+ char path[MAXPATHLEN]; -+ struct stat sbuf; -+ -+ /* build path to pid */ -+ snprintf(path, sizeof(path), "/proc/%d", pid); -+ -+ /* do the stat */ -+ /* if it fails, assume not owner */ -+ if (stat(path, &sbuf) != 0) -+ return(FALSE); -+ -+ /* see if caller is the owner of pid */ -+ if (getuid() != sbuf.st_uid) -+ return(FALSE); -+ -+ /* caller is owner */ -+ return(TRUE); -+ } -+ -+/* - ** Find an event number or return a NULL. - */ - event_info *find_event( -@@ -1800,8 +1826,8 @@ tm_poll_error: - * some mpiruns simply use rsh to start remote processes - no AMS - * tracking or management facilities are available. - * -- * This function allows any task (session) to be adopted into a PBS -- * job. It is used by: -+ * This function allows any task (session) owned by the owner -+ * of the job to be adopted into a PBS job. It is used by: - * - "adopter" (which is in turn used by our pvmrun) - * - our rmsloader wrapper (a home-brew replacement for RMS' - * rmsloader that does some work and then exec()s the real -@@ -1835,7 +1861,8 @@ tm_poll_error: - * the mom. Returns TM_ENOTFOUND if the mom couldn't find a job - * with the given RMS resource id. Returns TM_ESYSTEM or - * TM_ENOTCONNECTED if there was some sort of comms error talking -- * to the mom -+ * to the mom. Returns TM_EPERM if an attempt was made to adopt -+ * a session not owned by the owner of the job. - * - * Side effects: - * Sets the tm_* globals to fake values if tm_init() has never -@@ -1860,6 +1887,10 @@ int tm_adopt( - - sid = getsid(pid); - -+ /* do not adopt a sid not owned by caller */ -+ if (!ispidowner(sid)) -+ return(TM_EPERM); -+ - /* Must be the only call to call to tm and - must only be called once */ - --- -1.8.3.2 - diff --git a/sys-cluster/torque/files/tcl8.6.patch b/sys-cluster/torque/files/tcl8.6.patch deleted file mode 100644 index 0361dbfead0a..000000000000 --- a/sys-cluster/torque/files/tcl8.6.patch +++ /dev/null @@ -1,87 +0,0 @@ -From 061f15e06d6cf85e951cd321360067de5f0b2ce0 Mon Sep 17 00:00:00 2001 -From: Justin Bronder <jsbronder@gmail.com> -Date: Thu, 7 Mar 2013 22:33:04 -0500 -Subject: [PATCH] support tcl-8.6 - ---- - src/cmds/qstat.c | 13 +++++++++---- - src/scheduler.tcl/pbs_tclWrap.c | 6 +++--- - 2 files changed, 12 insertions(+), 7 deletions(-) - -diff --git a/src/cmds/qstat.c b/src/cmds/qstat.c -index 5f85de7..7f289ba 100644 ---- a/src/cmds/qstat.c -+++ b/src/cmds/qstat.c -@@ -88,6 +88,11 @@ - #if TCL_QSTAT - #include <sys/stat.h> - #include <tcl.h> -+#if TCL_MAJOR_VERSION <=8 && TCL_MINOR_VERSION < 6 -+#define Tcl_GetStringResult(x) x->result -+#define Tcl_GetErrorLine(x) x->errorLine -+#define Tcl_SetResult(x, y, z) x->result = y -+#endif - #if TCLX - #include <tclExtend.h> - #endif -@@ -1856,7 +1861,7 @@ tcl_init(void) - if (Tcl_Init(interp) == TCL_ERROR) - { - fprintf(stderr, "Tcl_Init error: %s", -- interp->result); -+ Tcl_GetStringResult(interp)); - } - - #if TCLX -@@ -1869,7 +1874,7 @@ tcl_init(void) - { - #endif - fprintf(stderr, "Tclx_Init error: %s", -- interp->result); -+ Tcl_GetStringResult(interp)); - } - - #endif /* TCLX */ -@@ -1980,10 +1985,10 @@ void tcl_run( - trace = (char *)Tcl_GetVar(interp, "errorInfo", 0); - - if (trace == NULL) -- trace = interp->result; -+ trace = Tcl_GetStringResult(interp); - - fprintf(stderr, "%s: TCL error @ line %d: %s\n", -- script, interp->errorLine, trace); -+ script, Tcl_GetErrorLine(interp), trace); - } - - Tcl_DeleteInterp(interp); -diff --git a/src/scheduler.tcl/pbs_tclWrap.c b/src/scheduler.tcl/pbs_tclWrap.c -index e859ae5..194c24b 100644 ---- a/src/scheduler.tcl/pbs_tclWrap.c -+++ b/src/scheduler.tcl/pbs_tclWrap.c -@@ -924,7 +924,7 @@ char *argv[]; - - if (argc != 2) - { -- sprintf(interp->result, -+ sprintf(Tcl_GetStringResult(interp), - "%s: wrong # args: job_id", argv[0]); - return TCL_ERROR; - } -@@ -936,11 +936,11 @@ char *argv[]; - return TCL_OK; - } - -- interp->result = "0"; -+ Tcl_SetResult(interp, "0", TCL_STATIC); - - if (pbs_rerunjob(connector, argv[1], extend)) - { -- interp->result = "-1"; -+ Tcl_SetResult(interp, "-1", TCL_STATIC); - msg = pbs_geterrmsg(connector); - sprintf(log_buffer, "%s (%d)", msg ? msg : fail, pbs_errno); - log_err(-1, argv[0], log_buffer); --- -1.7.12.4 - 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 000000000000..a1cb85327d71 --- /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.000000000 -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(&DE, "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.c 2015-03-17 16:43:36.000000000 -0400 ++++ b/src/cmds/qsub_functions.c 2019-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 ((start == NULL) && (*tok_ptr == NULL)) + return(0); + + if (start != NULL) +@@ -554,7 +554,7 @@ + return(0); + + if ((*curr_ptr == '=') || +- (*curr_ptr == '\0')) ++ (*curr_ptr == NULL)) + { + /* no name, fail */ + return(-1); +@@ -574,18 +574,18 @@ + + /* strip blanks */ + while ((*equals) && (isspace((int)*equals))) +- *equals++ = '\0'; ++ *equals++ = NULL; + + if (*equals != '=') + return (-1); /* should have found a = as first non blank */ + +- *equals++ = '\0'; ++ *equals++ = NULL; + + /* skip leading white space */ + while (isspace((int)*equals) && *equals) + equals++; + +- if (*equals == '\0') ++ if (*equals == NULL) + return(-1); + + *value = equals; +@@ -872,7 +872,7 @@ + else + { + char *tmp_host = pbs_default(); +- if (tmp_host == '\0') ++ if (tmp_host == NULL) + hash_add_or_exit(mm, job_attr, ATTR_pbs_o_server, qsub_host, LOGIC_DATA); + else + hash_add_or_exit(mm, job_attr, ATTR_pbs_o_server, tmp_host, LOGIC_DATA); +--- a/src/include/attribute.h 2015-03-17 16:43:36.000000000 -0400 ++++ b/src/include/attribute.h 2019-02-22 16:47:40.507695453 -0500 +@@ -445,7 +445,7 @@ + extern int parse_equal_string(char *, char **, char **); + extern char *parse_comma_string(char *,char **); + +-#define NULL_FUNC '\0' ++#define NULL_FUNC NULL + + /* other associated funtions */ + struct dynamic_string; +--- a/src/resmom/mom_main.c 2015-03-17 16:43:36.000000000 -0400 ++++ b/src/resmom/mom_main.c 2019-02-22 14:01:26.573890840 -0500 +@@ -4224,7 +4224,7 @@ + goto done; + } + +- name[i] = '\0'; ++ name[i] = NULL; + + for (d = ret_string, resline++;*resline;) + { +--- a/src/server/job_attr_def.c 2015-03-17 16:43:36.000000000 -0400 ++++ b/src/server/job_attr_def.c 2019-02-22 16:43:05.653007840 -0500 +@@ -1193,7 +1193,7 @@ + }, + + /* JOB_ATR_system_start_time */ +- {ATTR_system_start_time, /* start time as encoded in the proc/pid directory */ ++ { (char *)ATTR_system_start_time, /* start time as encoded in the proc/pid directory */ + decode_l, + encode_l, + set_l, +@@ -1205,7 +1205,7 @@ + PARENT_TYPE_JOB}, + + /* JOB_ATR_nppcu */ +- {ATTR_nppcu, /* how to handle compute units (on Cray system) */ ++ { (char *)ATTR_nppcu, /* how to handle compute units (on Cray system) */ + decode_l, + encode_l, + set_l, 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 7a45fb1c9002..000000000000 --- 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" - elog "wish to disable it for production use." - einfo - 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() { - epatch "${FILESDIR}"/CVE-2013-4319-2.x-root-submit-fix.patch - epatch "${FILESDIR}"/tcl8.6.patch - - # 510726 - epatch "${FILESDIR}"/CVE-2014-0749.patch - - # 491270 - epatch "${FILESDIR}"/CVE-2013-4495.patch - - # Unused and causes breakage when switching from glibc to tirpc. - # https://github.com/adaptivecomputing/torque/pull/148 - sed -i '/rpc\/rpc\.h/d' src/lib/Libnet/net_client.c || die -} - -src_configure() { - local myeconfargs=( --with-rcp=mom_rcp ) - - use crypt && myeconfargs=( --with-rcp=scp ) - myeconfargs+=( - $(use_enable tk gui) - $(use_enable tk tcl-qstat) - $(use_enable syslog) - $(use_enable server) - $(use_enable drmaa) - $(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 - ) - autotools-utils_src_configure -} - -# WARNING -# OpenPBS is extremely stubborn about directory permissions. Sometimes it will -# just fall over with the error message, but in some spots it will just ignore -# you and fail strangely. Likewise it also barfs on our .keep files! -pbs_createspool() { - local root="$1" - local s="$(dirname "${PBS_SERVER_HOME}")" - local h="${PBS_SERVER_HOME}" - local sp="${h}/server_priv" - einfo "Building spool directory under ${D}${h}" - local a d m - local dir_spec=" - 0755:${h}/aux 0700:${h}/checkpoint - 0755:${h}/mom_logs 0751:${h}/mom_priv 0751:${h}/mom_priv/jobs - 1777:${h}/spool 1777:${h}/undelivered" - - if use server; then - dir_spec="${dir_spec} 0755:${h}/sched_logs - 0755:${h}/sched_priv/accounting 0755:${h}/server_logs - 0750:${h}/server_priv 0755:${h}/server_priv/accounting - 0750:${h}/server_priv/acl_groups 0750:${h}/server_priv/acl_hosts - 0750:${h}/server_priv/acl_svr 0750:${h}/server_priv/acl_users - 0750:${h}/server_priv/jobs 0750:${h}/server_priv/queues" - fi - - for a in ${dir_spec}; do - d="${a/*:}" - m="${a/:*}" - if [[ ! -d "${root}${d}" ]]; then - install -d -m${m} "${root}${d}" || die - else - chmod ${m} "${root}${d}" || die - fi - # (#149226) If we're running in src_*, then keepdir - if [[ "${root}" = "${D}" ]]; then - keepdir ${d} - fi - done -} - -src_install() { - # Make directories first - pbs_createspool "${D}" - - autotools-utils_src_install - - use doc && dodoc doc/admin_guide.ps doc/*.pdf - - # 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 "${D}" -iname tclIndex`; do - sed -e "s/${D//\// }/ /" "${file}" > "${file}.new" - mv "${file}.new" "${file}" || die - 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}"/torque-conf.d-munge torque - newenvd "${FILESDIR}"/torque-env.d 25torque -} - -pkg_preinst() { - if [[ -f "${ROOT}etc/pbs_environment" ]]; then - cp "${ROOT}etc/pbs_environment" "${D}"/etc/pbs_environment || die - fi - - echo "${PBS_SERVER_NAME}" > "${D}${PBS_SERVER_HOME}/server_name" || die - - # Fix up the env.d file to use our set server home. - sed -i \ - "s:/var/spool/torque:${PBS_SERVER_HOME}:g" "${D}"/etc/env.d/25torque \ - || die - - if use munge; then - sed -i 's,\(PBS_USE_MUNGE=\).*,\11,' "${D}"etc/conf.d/torque || die - fi -} - -pkg_postinst() { - pbs_createspool "${ROOT}" - 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://www.clusterresources.com/wiki/doku.php?id=torque:torque_wiki" - echo - elog " For a basic setup, you may use emerge --config ${PN}" -} - -# root will be setup as the primary operator/manager, the local machine -# will be added as a node and we'll create a simple queue, batch. -pkg_config() { - local h="$(echo "${ROOT}/${PBS_SERVER_HOME}" | sed 's:///*:/:g')" - local rc=0 - - ebegin "Configuring Torque" - einfo "Using ${h} as the pbs homedir" - einfo "Using ${PBS_SERVER_NAME} as the pbs_server" - - # Check for previous configuration and bail if found. - if [ -e "${h}/server_priv/acl_svr/operators" ] \ - || [ -e "${h}/server_priv/nodes" ] \ - || [ -e "${h}/mom_priv/config" ]; then - ewarn "Previous Torque configuration detected. Press Enter to" - ewarn "continue or Control-C to abort now" - read - fi - - # pbs_mom configuration. - echo "\$pbsserver ${PBS_SERVER_NAME}" > "${h}/mom_priv/config" || die - echo "\$logevent 255" >> "${h}/mom_priv/config" || die - - if use server; then - local qmgr="${ROOT}/usr/bin/qmgr -c" - # pbs_server bails on repeated backslashes. - if ! "${ROOT}"/usr/sbin/pbs_server -f -d "${h}" -t create; then - eerror "Failed to start pbs_server" - rc=1 - else - ${qmgr} "set server operators = root@$(hostname -f)" ${PBS_SERVER_NAME} \ - && ${qmgr} "create queue batch" ${PBS_SERVER_NAME} \ - && ${qmgr} "set queue batch queue_type = Execution" ${PBS_SERVER_NAME} \ - && ${qmgr} "set queue batch started = True" ${PBS_SERVER_NAME} \ - && ${qmgr} "set queue batch enabled = True" ${PBS_SERVER_NAME} \ - && ${qmgr} "set server default_queue = batch" ${PBS_SERVER_NAME} \ - && ${qmgr} "set server resources_default.nodes = 1" ${PBS_SERVER_NAME} \ - && ${qmgr} "set server scheduling = True" ${PBS_SERVER_NAME} \ - || die - - "${ROOT}"/usr/bin/qterm -t quick ${PBS_SERVER_NAME} || rc=1 - - # Add the local machine as a node. - echo "$(hostname -f) np=1" > "${h}/server_priv/nodes" || die - fi - fi - eend ${rc} -} diff --git a/sys-cluster/torque/torque-4.2.10.ebuild b/sys-cluster/torque/torque-4.2.10-r1.ebuild index 769264fd387c..bf8705f64b41 100644 --- a/sys-cluster/torque/torque-4.2.10.ebuild +++ b/sys-cluster/torque/torque-4.2.10-r1.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=6 @@ -9,7 +9,8 @@ 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" +#SRC_URI="http://www.adaptivecomputing.com/index.php?wpfb_dl=2849 -> ${P}.tar.gz" +SRC_URI="https://github.com/adaptivecomputing/torque/archive/ddf5c4f40091b6157164a8846e5b60f42a5ae7f6.tar.gz -> ${P}-gh-20150517.tar.gz" LICENSE="torque-2.5" SLOT="0" @@ -42,7 +43,7 @@ RDEPEND="${DEPEND_COMMON} !crypt? ( net-misc/netkit-rsh ) !dev-libs/uthash" -S="${WORKDIR}"/${PN}-4.2.9 +S="${WORKDIR}"/${PN}-ddf5c4f40091b6157164a8846e5b60f42a5ae7f6 # 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 @@ -90,14 +91,11 @@ src_prepare() { sed -i '/mk_default_ld_lib_file || return 1/d' buildutils/pbs_mkdirs.in || die eapply "${FILESDIR}"/${PN}-4.2.9-tcl8.6.patch - - # 524362 - eapply "${FILESDIR}"/TRQ-2885-limit-tm_adopt-to-only-adopt-a-session-id-t.patch - eapply "${FILESDIR}"/${PN}-4.2-dont-mess-with-cflags.patch + eapply "${FILESDIR}"/${PN}-4.2-use-NULL-instead-of-char0.patch eapply_user mkdir -p "${S}"/m4 - eautoconf + eautoreconf } src_configure() { @@ -177,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-4.2.9-r5.ebuild b/sys-cluster/torque/torque-4.2.9-r5.ebuild deleted file mode 100644 index d972010f7c74..000000000000 --- a/sys-cluster/torque/torque-4.2.9-r5.ebuild +++ /dev/null @@ -1,183 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -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=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" - -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 - -pkg_setup() { - PBS_SERVER_HOME="${PBS_SERVER_HOME:-/var/spool/${PN}}" - - # Find a Torque server to use. Check environment, then - # current setup (if any), and fall back on current hostname. - if [ -z "${PBS_SERVER_NAME}" ]; then - if [ -f "${ROOT}${PBS_SERVER_HOME}/server_name" ]; then - PBS_SERVER_NAME="$(<${ROOT}${PBS_SERVER_HOME}/server_name)" - else - PBS_SERVER_NAME=$(hostname -f) - fi - fi - - if use cpusets; 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 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() { - # Unused and causes breakage when switching from glibc to tirpc. - # https://github.com/adaptivecomputing/torque/pull/148 - sed -i '/rpc\/rpc\.h/d' src/lib/Libnet/net_client.c || die - - # 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 - - epatch "${FILESDIR}"/${P}-tcl8.6.patch - - # 524362 - epatch "${FILESDIR}"/TRQ-2885-limit-tm_adopt-to-only-adopt-a-session-id-t.patch -} - -src_configure() { - local myconf="--with-rcp=mom_rcp" - - use crypt && myconf="--with-rcp=scp" - - econf \ - $(use_enable tk gui) \ - $(use_enable syslog) \ - $(use_enable server) \ - $(use_enable drmaa) \ - $(use_enable munge munge-auth) \ - $(use_enable nvidia nvidia-gpus) \ - $(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 \ - --without-loadlibfile \ - ${myconf} -} - -src_install() { - local dir - - DOCS=( CHANGELOG README.* Release_Notes ) - use doc && DOCS+=( doc/admin_guide.ps doc/*.pdf ) - - default - - # The build script isn't alternative install location friendly, - # So we have to fix some hard-coded paths in tclIndex for xpbs* to work - for file in $(find "${ED}" -iname tclIndex); do - sed \ - -e "s/${ED//\// }/ /" \ - -i "${file}" || die - done - - for dir in $(find "${ED}/${PBS_SERVER_HOME}" -type d); do - keepdir "${dir#${ED}}" - done - - if use server; then - newinitd "${FILESDIR}"/pbs_server-init.d-munge pbs_server - newinitd "${FILESDIR}"/pbs_sched-init.d pbs_sched - fi - newinitd "${FILESDIR}"/pbs_mom-init.d-munge pbs_mom - newconfd "${FILESDIR}"/${PN}-conf.d-munge ${PN} - newinitd "${FILESDIR}"/trqauthd-init.d trqauthd - newenvd "${FILESDIR}"/${PN}-env.d 25${PN} -} - -pkg_preinst() { - if [[ -f "${ROOT}etc/pbs_environment" ]]; then - cp "${ROOT}etc/pbs_environment" "${ED}"/etc/pbs_environment || die - fi - - if use server && [[ -f "${ROOT}${PBS_SERVER_HOME}/server_priv/nodes" ]]; then - cp \ - "${EROOT}${PBS_SERVER_HOME}/server_priv/nodes" \ - "${ED}/${PBS_SERVER_HOME}/server_priv/nodes" || die - fi - - echo "${PBS_SERVER_NAME}" > "${ED}${PBS_SERVER_HOME}/server_name" || die - - # Fix up the env.d file to use our set server home. - sed \ - -e "s:/var/spool/${PN}:${PBS_SERVER_HOME}:g" \ - -i "${ED}"/etc/env.d/25${PN} || die - - if use munge; then - sed -i 's,\(PBS_USE_MUNGE=\).*,\11,' "${ED}"/etc/conf.d/${PN} || die - fi -} - -pkg_postinst() { - 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." - fi -} diff --git a/sys-cluster/torque/torque-6.0.3.ebuild b/sys-cluster/torque/torque-6.0.4.ebuild index ec9563e95bfa..42f1f078421e 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-2017 Gentoo Foundation +# 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,15 +169,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 } |