浏览代码

fixed bug

LDA010 7 年之前
父节点
当前提交
5a96ef7791

+ 1 - 1
gentoo/sys-cluster/mpich/mpich-3.2-r1.ebuild

@@ -99,7 +99,7 @@ multilib_src_test() {
 
 multilib_src_install() {
 	default
-	if !(use fortran); then
+	if ! use fortran; then
 		# some fortran files get installed unconditionally
 		rm -f "${ED}"usr/include/mpif* "${ED}"usr/include/*.mod || die
 		return;

+ 22 - 0
gentoo/sys-cluster/torque/Manifest

@@ -1,4 +1,26 @@
+AUX CVE-2013-4319-2.x-root-submit-fix.patch 1253 SHA256 a6ebd0c0966148ecb34fb885911e163f93749be72fc5a2e58f11f3c7a9523f45 SHA512 78780ad87e997f22b6abbc3cb51c313616e90320d997705c534c35fbc7f5738b7a2e0ace33051e6e15d4f6e0ab6f97ab9f1ef60dcee5fc4544db13b0a72ea5c4 WHIRLPOOL 64eaf701099da902282b3e1debb6bbfa323fc266ad067047c43dcb353463bf2df7475066f9e263cc9a506b2905aba19c290d50a419ee56a0daa65f237693ede7
+AUX CVE-2013-4495.4.1.patch 9063 SHA256 78a368607133cc9daeca9872ef61ac4117268e091a11554b72ccd48c1a34e781 SHA512 52d0105c8d756e50252926c764eff46653544584c25c43d4dbaf70ed45a1c610c9381b1f735ff6c436774fb8d77a2a7607e0ea2b70eaae927e9a1024b3048913 WHIRLPOOL 815c1719548f21c4cf712c96577701f084ab5f6fc7287e4cd1ddd4fd9678c19a303a94546842c890d0e994c84bae8768aa2ddf49e6ef3094c6b1c61193873d32
+AUX CVE-2013-4495.patch 836 SHA256 4cfaef5ced3b336920821089a97a86f38d71fcc573951912be701d2c51253d45 SHA512 91522f5c8b6fa2e5de80f02e24b2a6827422c335d88600bcbb1a763dd985b3e52b850eab5059adbe4e543311551ec0da21cd69fcb7dc6e01ff93bff843769d8c WHIRLPOOL 17e2790d362a16dcd58b0cb0a9acc81d5f920b96ad8d4eb99fff6cbd58a49e312414c9c9b580b9fbdbd35b4314fb0ea820888e4d93723ffec5ec02cc3c72bbf2
+AUX CVE-2014-0749.patch 750 SHA256 e79c9c2e08aec2e0adc4a10c2d97510ccc6780d5d2944e9fd646bf99b0a5e5aa SHA512 8830f4d1a0190876e97fc568a3ac84341c042686a630cc5a7d8f254414dd13063f08db3b490e447698d9c16430ab6c8990c70ee1acda2435a0b0debfb2666829 WHIRLPOOL 76a459649865456b1d004de5d728c97697f4351870f54980748dfc2046df26ed791738cea96189d3f82b76f8aa370904060ecdbcc0b52c5e092d2870221a132c
+AUX TRQ-2885-limit-tm_adopt-to-only-adopt-a-session-id-t.patch 4292 SHA256 67338a9c338b71b4dff5a911978798a4e51a2f84ce1429d80d70819511874e43 SHA512 15bb5b271b62be03df2b6aeab89082f3003abc67e00aaef96539ab88f21879f3cf30a95303fe68b3e4984cdc4f4c020e61328a4e3c26b4e44be9eafa9be3b5a6 WHIRLPOOL 00342548ab024f70f4f3de6c5982dbcdf5a4acedad94d46d340368bff58e7023a97d386486805a93a1f3da415345bf56ae5b93d7cfec320695bdb4461949b3ac
+AUX pbs_mom-init.d 1084 SHA256 b9f65c9d2fa74835e0737d3ffa3c54a15a6b27a1a42a84f7a2058c2b48874443 SHA512 698707c833070f77224e55788799ae4b32088b47221bfd9ed8fbb4097095bb4771ec39db831bbfd5af46d0a6addee04464bc71ef548ca94f3a324ebb97ce8a9c WHIRLPOOL 8884a378af2ef147314709dc133375e41099ffcc0b2afaf8dec1a62e8c50f2928558614b5302084ce80a661fc65bdad68a25b67f6b8ed2e5fa0bbf04831ce3ce
+AUX pbs_mom-init.d-munge 1149 SHA256 ed2bdf0ac4469dde1c19f9beb5aa6fa69840dc9a471a4195eea952ecfc91d1b7 SHA512 643deb1f21983dbdd8aa53416899db01ff651d81b3d989299eef9c2d3e1aab0e9b083cfae9bb559b6c3195238998a881ec5bf2a663e09f7f8508bb895bc11027 WHIRLPOOL 98ff6b73f83f4ed1859337b126473bc1915cea8dd358caea4aa19aa9880859c66fa6b1e96363838481c465a3237beaee2fa2fa91a079fd0b6f5d9cb7698b5c4f
+AUX pbs_sched-init.d 1165 SHA256 b04d43a838d271c2d78dee950ed9ea2f87a4cd6f3eb4409537a015d286f4c68d SHA512 9417ffe5a417d69e03262221816b2778aacfe7cf393ea5b5ea535497f4dfcbad9545d49cdbcacaaa5e8a0fd01432806aac8e050b4979cabb59656c1256a91dd0 WHIRLPOOL cca5750647349612ad9bd534fe53fb33d851fdb4c9ac705bcb685276538e11c867e6acbbd1dfb6124e2832dbef77ee16c96a925eb650e61afa33f1c3ca4b8c7c
+AUX pbs_server-init.d 1615 SHA256 e6c4bdd33ab79b9e0ca085269e845fbd8794d7427b8ca45cfafa7187a1317dab SHA512 459334236d5614522dafa15c0144bbf9e9b5fe89ce73d61fde6b1bfbcc96c284d8f827069c4dd77f7a6c5fb2828923d60a9381c158123d5f6edd5ca50a471c21 WHIRLPOOL 7cd157ebe0a30099172c48ec774b8256825350a06b6ce0619dc99d465b82e210e6f5facda756743700fc054103af776f08f1d4809a014776e7dd914f07faf5ae
+AUX pbs_server-init.d-munge 1689 SHA256 9d1972d5fdbb31a7ab74a45a77631b96ac23d47e4b814b3fb31964fd1084863f SHA512 b9628241581fbed629d0edf83a3f987de894fb5711061239e737f63ef7dbe9033d35aa87a38b56dbd8da887a3058f9f284bfe101ee13db3464e6e814b537ea23 WHIRLPOOL b9fe25f9097f369e5a944a0e9d2efdf2a1c48bd0b0a6e9504a438956be5e4682ae44c7fc09dbbbffcf07bcbbfc786c2c7fe8f2dc34ac92d69b6f1c5268a9f39e
+AUX tcl8.6.patch 2396 SHA256 02905289c2707b2bc60b3aed513d9d4578cb597b346ee79deb89b1e72131af2b SHA512 a288526bf43cd39d0b5505938f02ee38ccd70481a1b6351a80c5cd151376604d5cdc925293d3bd7f2d4bbe50182993448da645ca42f58e3f1bdf59bce9363b4a WHIRLPOOL cbccee8ce08d3bf36bc30b49cf0740753f10d1d309558a702aa8df8f0d9ec5069e37cc3e7cb47caa686d69935f90c6b6f2dbdae55eba98864f3bbc22f4fa7ada
+AUX torque-4.1.5.1-tcl8.6.patch 2546 SHA256 3b03036181df73cee7e2dea6746b822368a92d4f76953018e226c4e7c26abe86 SHA512 0cd584784b5254daf11635e1d6252fa4fe3c5f2e46a0771452016f66ff0e3be01b91d154cef0a793cf0ab0df223ef5c51303d35c419f1d9addc64ea26a892521 WHIRLPOOL b335acece9491ecfa5adbb9a64122826f8e6944ac33aac862ac4c57c7cf73c0ed823b60228a3567c249f1710d1a8ab0fac8ce2fbb301500eeb0bf8d832c0f117
+AUX torque-4.2.9-tcl8.6.patch 2702 SHA256 cd894a32a300b9b8b5fa343c79ac0ff9f44dc02e12eae9d7bb69d5f8799ead34 SHA512 9844a1f633f049a66cf31d3721f6a5e205ede26186da1357e0b0aa2c0c4d064cbdff45e2f7e685d6c4afd09d961e59ff1759163e4a2ae349fa866e960c1bcf77 WHIRLPOOL a4acb94a7d64e84b25c8ebb0898ab3c4523a141c17719f51eb19276604a3543041374de5e828664dcc1dc35269148512231628d3990c09a9872ade353aa7479f
+AUX torque-conf.d 649 SHA256 4139da44a55dbcb4a8227fd0aedede8e091971fd63c0e08644712f4a91e7b174 SHA512 b82f6c1d661bed03a32c3761530c4b303715167a317e467371091b11d3ae0e19e9784b1588577ee5f65397cb0699818ed5f621aeb66d3f2d218df12d0cf39bde WHIRLPOOL 0f0db60c037400ce87013d7639a5e126b65388e914e1f3bde81548ebc1e8fcefb17972c4deec03509973973a263c5006856699d3f51fad0133b8428e13e2e04c
+AUX torque-conf.d-munge 784 SHA256 7b8e47737211fd0d05dcc7938021ea5dbb1575010c53075440ef0b6b5d43d8b1 SHA512 a78634a6f2bdf3c24e8c99d3cd7a9634daa32d69244a9ddfcc26199f4d04e901abbfa79ad057f5a4e4c492c9e21bc0c65edd8465ac6935fb7c67c8c639e75d68 WHIRLPOOL 90ed407a5a98fb7b4509610c3c23dd1d38566886e4b02fa4db4a9708f8c45b500369e782c25b7b9f02fc685bdcb965049e681c829bad58206729690e6eeadbb9
+AUX torque-env.d 240 SHA256 d04eab3b1314645ee2014c718c4cf79ca74950dee1357d814b85c9faa5ef6002 SHA512 275ce5ccf9f138bcee504a9996c9d838cd34714d352d4b7ac2d631d0fca662bf38a2ef7e8745605d9b3847049015e0791c937340cfdacbf44800482ce73bb042 WHIRLPOOL b7cdc4d6752d00b315fb369f6382e1a6684c1cb8a3486545bd406270ed09811936c2735755fc01175fceed0422139e5d7d8dcd67868e2e40c8ebbb406c2eec57
+AUX trqauthd-init.d 477 SHA256 41d9dfdb64b2512b6da3a0e87fbaf9ac6d7a988ce398c63d918ccf069aa81e4e SHA512 55f19b5effc21444addb465967bbd44d6f67dc48945221753512216c4fc26878d90569cdee7b277676d157aa241c04dc08df65505d21f59f046fa5448d43b81d WHIRLPOOL f1b7f0429d77619099bac9e27c849cfb7fac2f1c0306e8ab6f878a452cf67db3adfb748684a43bc78d644d48f5681ae0e3d3d641ca2457825a40820b84bb36e6
 DIST torque-2.5.13.tar.gz 5854910 SHA256 ab59d4c8e8b45383ddd8202fa83956816175e348bb955a4ad5f7e3cd4dde5ff9 SHA512 e08ddf3950bb32177f4bc504a502fae3928a616739c28ca9687c5207606817d4589583306508a2c568cf19fc8c5617dc4a9decc81576c2875660b715c256cfcf WHIRLPOOL 29eefb89d1eb9d6a81735aa117922a1eb0b72e14eeccab7dbd70cdcf01431b7ecd9c3927e1c5c28b7f42d6739b28f45386740b92adb790ccdf9803e4c6e38534
 DIST torque-4.1.7.tar.gz 6218108 SHA256 3c86b2d84589f54ac222e81dd1953d153e1d836163d2000412369fefd25fb2af SHA512 5a085c0a7b205fed075bff4599db90ca5c4bb5f22d87d76fd56539d5cc1935bb8eeffcd4d18ba84401bd4ca128718070b69c8b91ab6814a4638622ba351654e6 WHIRLPOOL cae9216f0cebc22927eec2d1f007b1a3c4a6cc619f2926c40a5f46e0bd0eec19691f9aafcad4fe727e2c5ed2485d11c972603cca613269f82147ff1dc41f1ba4
 DIST torque-4.2.9.tar.gz 6294022 SHA256 46f1f319683af6d3820e18cda69ce59113c9a5c192e1f07826007be69385889b SHA512 898703fa1d02310c22e2a02b86d67ca52ebed46684597931944edebb39f8293746739c8dca9cd10e07c2e7274c3dd7f65a5664d1980817e3feec58952c4cf4d1 WHIRLPOOL e65be66b056a519ebd1c30c2c1ae2ddf43bc4e617a52d3caced1e6dfd2b0d8b2a83c26a0f2e6e41cfae791aca68b6f91424745b2baffa2085fccc8f6ae9b8e04
 DIST torque-6.0.1.tar.gz 41229268 SHA256 39623e364a87976a8d657fa47965703ca7ae7c32110ff18eccc6282dc609f3de SHA512 63251ec163feb8d6be788db79de497b2bb1cb98b0d62e2c43fa50d1a4b25b0f8075072c22c3aa4535d6a83a6be987c6cddda47829778bbef3b5006bba936ed87 WHIRLPOOL 98aaf09965416a8e227ef3cdae59f690e4581a2ecde6c5c6e5aa5e99f08ac14012ffb8611b29624f6302098495b94f8e79084fa8478160d71c07f8343ec81839
+EBUILD torque-2.5.13-r1.ebuild 7741 SHA256 9de9ea394760c905c44572e12be1f3e1566d0298e4377031c72fddeda3434393 SHA512 d17389297c11f28c4f849e95d2f5c87f428d2b8d3c6a907d5863f4cbdd19a41532cb5abf5b9d78092f99b2838c2e1892b8fb7111b4dcb98338bfa11c4bbc5e5d WHIRLPOOL bba4e436413e131f1baa143501ff81f86ed2305104960a50490c516aff2874504aa01ea317880db498b4c5ae7f8bc738e8330b737d5cf0d1f62c7ecb6f89922e
+EBUILD torque-4.1.7-r1.ebuild 7531 SHA256 27aba74491b8d53d8ffb9a2a87e0c7181453c6844a299e5c771502e929cb1fdb SHA512 43a23bac0c34c1ee68a6e8587b9dabd8f6d44142b65cfff6b6748b50de46ff27f5324212ff87ed37e5350cc6eaa2b0554c0de8603cbdb0dcee3e2a059b21114b WHIRLPOOL 36e783ead1ee8350bdf7ad1a4f037bd8190fb4edadabb3bf4244e9ccee15dcc691f0d09151af03ec60d4804a29acf0320e93dae984ccd512f27bc3e742435d10
+EBUILD torque-4.2.9-r5.ebuild 5713 SHA256 5f36a9d467938c84775fbaa4d621ab41cb911291e7876a0c8e4b27944747bd9a SHA512 5550a467fc5110215b33a66395c14c04c2d6b1e20bc1145e3bdd33d4f446eca8bc60d72ca7428679c1756b06be0d1a2770d05e8ba0fdab19b4ce084d4ca2b63c WHIRLPOOL 67fa578128c262b3531e78b0d5a387812c6592e27ae9111883b6b3107f0b37a222966934c2a90a179d806a38a1346e807b4f5f9cd51457c0ea43a0c29c1e1c65
+EBUILD torque-6.0.1.ebuild 5577 SHA256 23a7e7d3b07e173d501cf66ed926894413f8a80de9eecb2ab1f4ccde40a7be9f SHA512 2b0a415fdcfd862b579729b038d9ae362a70833db081fbfc6d81522444dd9611d0865af0923ecf3aad25407b1b594bd96dabfa46b84ab6f19b03ce9a832d9d1a WHIRLPOOL b2b8474aa1a76f7cc20989734885678be90e562a1bbea6fbd99932331dd1b426ed7b22e318873162f4718261276ac1f153a7564366d894b9cc4c3f6da2c851bc
+MISC metadata.xml 855 SHA256 b0555bf0411c9ff3fafd06ca38e7bfbc218bb87f47288cb8f67058e9973949c9 SHA512 4b04426e1bcaedacff6d5e72d9c4440b839901a6176ab4ccb747dfcffbdef80e5d52562b61514473175f89b1a25123e79a42e42f0f6333a765855dd76bf5c909 WHIRLPOOL 63e9dd40361ba1b5aae9604733398a67fd57b91e0e2c058d898b9bcff1c08641675072566e67b5201bba5293876f06974e362ccfc7ebb54ade0a45a2d9850a3f

+ 13 - 7
gentoo/sys-cluster/torque/torque-4.1.7-r1.ebuild

@@ -174,13 +174,19 @@ pkg_postinst() {
 	echo ""
 	elog "    For a basic setup, you may use emerge --config ${PN}"
 	echo ""
-	if [[ -z "${REPLACING_VERSIONS}" ]] || [[ $(echo "${REPLACING_VERSIONS%.*} < 4.0" | bc)  -eq 1 ]]; then
-		elog "Important 4.0+ updates"
-		elog "  - The on-wire protocol version has been changed."
-		elog "    Versions of Torque before 4.0.0 are no longer able to communicate."
-		elog "  - pbs_iff has been replaced by trqauthd, you will now need to add"
-		elog "    trqauthd to your default runlevel."
-	fi
+
+	local v
+	for v in ${REPLACING_VERSIONS}; do
+		if ! version_is_at_least 4.0 ${v}; 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."
+			break
+		 fi
+	done
 }
 
 # root will be setup as the primary operator/manager, the local machine

+ 7 - 2
gentoo/sys-cluster/torque/torque-4.2.9-r5.ebuild

@@ -172,12 +172,17 @@ 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}" ]] || [[ $(echo "${REPLACING_VERSIONS%.*} < 4.0" | bc)  -eq 1 ]]; then
+
+	local v
+	for v in ${REPLACING_VERSIONS}; do
+		if !  version_is_at_least 4.0 ${v}; 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
+		break
+		fi
+	done
 }

+ 11 - 25
gentoo/sys-cluster/torque/torque-6.0.1.ebuild

@@ -165,30 +165,16 @@ pkg_postinst() {
 	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}" ]] || [[ "$(get_major_version ${REPLACING_VERSIONS})"  -lt 4 ]]; then
-	if [[ -z "${REPLACING_VERSIONS}" ]] || [[ $(echo "${REPLACING_VERSIONS%.*} < 4.0" | bc)  -eq  1 ]]; 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
-
 	local v
-#	for v in ${REPLACING_VERSIONS}; do
-#            if  version_is_at_least 4.0 ${v}; 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."        
-#		break
-#            fi
-#        done
-
-
-
+	for v in ${REPLACING_VERSIONS}; do
+		if !  version_is_at_least 4.0 ${v}; 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."
+			break
+		fi
+	done
 }