From 991b95e0a78a68a0777c77cfc4e09d85285edf19 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Fri, 30 Mar 2007 05:57:32 +0000 Subject: [PATCH] =?utf8?q?Make=20cronjob=20prelinking=20control=20tristate?= =?utf8?q?=20(yes,=20no,=20user-controlled)=20as=20suggested=20by=20Antti?= =?utf8?q?=20M=C3=A4kel=C3=A4=20#172543.=20Package-Manager:=20portage-2.1.?= =?utf8?q?2.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- sys-devel/autogen/Manifest | 26 +++++++++++++---------- sys-devel/prelink/ChangeLog | 7 ++++++- sys-devel/prelink/Manifest | 30 +++++++++++++-------------- sys-devel/prelink/files/prelink.confd | 7 +++++-- sys-devel/prelink/files/prelink.cron | 5 +++++ 5 files changed, 46 insertions(+), 29 deletions(-) diff --git a/sys-devel/autogen/Manifest b/sys-devel/autogen/Manifest index c7b8b1e012b4..ebe3164fc33c 100644 --- a/sys-devel/autogen/Manifest +++ b/sys-devel/autogen/Manifest @@ -1,6 +1,10 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 +AUX autogen-5.8.8-scrub-debug.patch 787 RMD160 6754f40dcd6521822c6858363bf567f70cfe80c4 SHA1 60dd450dbacd69cee566a3f4ecd8b4a68bb26d2f SHA256 029a9f1aee3b57f89405e6d8815d06262cdb5858d0c7967d0d90a2fd086e5c7f +MD5 d2d8b824528dc2f1e024d8b83cda712e files/autogen-5.8.8-scrub-debug.patch 787 +RMD160 6754f40dcd6521822c6858363bf567f70cfe80c4 files/autogen-5.8.8-scrub-debug.patch 787 +SHA256 029a9f1aee3b57f89405e6d8815d06262cdb5858d0c7967d0d90a2fd086e5c7f files/autogen-5.8.8-scrub-debug.patch 787 DIST autogen-5.7.1.tar.gz 1224552 RMD160 346fa0a126258d568bd4691733e1acf7f5539a39 SHA1 21f23591074eccc792456f2a96dfd791ac3c32a4 SHA256 acb04d5cb77059daae7e7b365f82c14baea6cff8d34e41c7ef7ecba398a789d0 DIST autogen-5.8.3.tar.gz 1256311 RMD160 f4b9e442fcfd7101a64206192e22976fa6f39302 SHA1 5d7fbe5eeb6609545a21346e82b3413bdab63120 SHA256 f3fcdfc857010771e37eddd4a38686bbef45b510b27d8a123585f5e1b27f267d DIST autogen-5.8.8.tar.gz 1298738 RMD160 0799d7451f21de04e215d07c4790229e63e9c30d SHA1 f38fb7f78ff7b5e782f72395179bf56edc594b8a SHA256 f97846f37b59bcb84e99fd11ebb26cb3697fb7823976e713bfe7a98eab471219 @@ -12,14 +16,14 @@ EBUILD autogen-5.8.3.ebuild 1035 RMD160 c487926366c6e5c4e80c0005b5612b760a7d3076 MD5 b3d6437bf4dc50bae08d2fad6de13cb4 autogen-5.8.3.ebuild 1035 RMD160 c487926366c6e5c4e80c0005b5612b760a7d3076 autogen-5.8.3.ebuild 1035 SHA256 f1fd7f947ab1e663b54dd64d6efb4481b07775a1995fcbecc6274a85256267dc autogen-5.8.3.ebuild 1035 -EBUILD autogen-5.8.8.ebuild 1197 RMD160 e746e2e078e3bae7b01e1c3133f1617c406a7992 SHA1 4f4ea646baf24045f40b77d3b0b202a7b8b992ca SHA256 d99cfe7686087ff4a522fab9a8dd4b80558bd58f5685c0c689d26925845f7453 -MD5 944a9a08ff4b382053497c0b6a645cf7 autogen-5.8.8.ebuild 1197 -RMD160 e746e2e078e3bae7b01e1c3133f1617c406a7992 autogen-5.8.8.ebuild 1197 -SHA256 d99cfe7686087ff4a522fab9a8dd4b80558bd58f5685c0c689d26925845f7453 autogen-5.8.8.ebuild 1197 -MISC ChangeLog 2046 RMD160 7084bdf8309bbe04ba52061200e7bf7b62a0070c SHA1 d1a9429855e98882f5bedc3839d2b3f1073fdad2 SHA256 32aa79b13f384e98309b5908d089a1a9c0ced8f01c4329be801944430e48fb98 -MD5 7013f0e26bfe5a07fb366f5c0bcde0bd ChangeLog 2046 -RMD160 7084bdf8309bbe04ba52061200e7bf7b62a0070c ChangeLog 2046 -SHA256 32aa79b13f384e98309b5908d089a1a9c0ced8f01c4329be801944430e48fb98 ChangeLog 2046 +EBUILD autogen-5.8.8.ebuild 1292 RMD160 f13c5ffced10213e0f2d4d41ae922373d56c5503 SHA1 afe4f4490b031533cf519ce8762897f96c7d515e SHA256 f19af1efcba06b4a2000478a98a1e9d972003a0ef8174dbf248ef513cf24a3c7 +MD5 426eb1d687f55555014c6ac380d8e858 autogen-5.8.8.ebuild 1292 +RMD160 f13c5ffced10213e0f2d4d41ae922373d56c5503 autogen-5.8.8.ebuild 1292 +SHA256 f19af1efcba06b4a2000478a98a1e9d972003a0ef8174dbf248ef513cf24a3c7 autogen-5.8.8.ebuild 1292 +MISC ChangeLog 2246 RMD160 59052311ea3b3ea318a3656e672d364dff753cbc SHA1 a5f74bdda58638fb08e990b21d4cc6656829462d SHA256 22aa0d4e6addc1d275b688a89acfd5f22679e3a2eb7be317628da14cb4b761cd +MD5 c654e0050be0335ffe780d68a2c208bd ChangeLog 2246 +RMD160 59052311ea3b3ea318a3656e672d364dff753cbc ChangeLog 2246 +SHA256 22aa0d4e6addc1d275b688a89acfd5f22679e3a2eb7be317628da14cb4b761cd ChangeLog 2246 MISC metadata.xml 162 RMD160 d002486a43522f2116b1d9d59828c484956d66e2 SHA1 d6b4923897f6ae673b4f93646f5b4ba61d5a2c3c SHA256 65a915d44de1f01d4b7f72d313b4192c38374a9835d24988c00c1e73dca5805a MD5 567094e03359ffc1c95af7356395228d metadata.xml 162 RMD160 d002486a43522f2116b1d9d59828c484956d66e2 metadata.xml 162 @@ -36,7 +40,7 @@ SHA256 882f9df22edc419993b87517c12190a783d71426b152e18a605489ca5d5c8a98 files/di -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.3 (GNU/Linux) -iD8DBQFF/F948bi6rjpTunYRAlGUAKDFJdEZ3oN/F3770T5oJpduzM/ocwCfQwwA -QmXg2qFQl1UzN1ryV9k82f8= -=1S3X +iD8DBQFGDKf+8bi6rjpTunYRAp1wAJ43FOQO9KeQSKNL5qOP284S2kgDNwCgnUN2 +LSg0cROyiR24N18cePlp6HA= +=43je -----END PGP SIGNATURE----- diff --git a/sys-devel/prelink/ChangeLog b/sys-devel/prelink/ChangeLog index ab67e1fb6c93..80f9ee1808da 100644 --- a/sys-devel/prelink/ChangeLog +++ b/sys-devel/prelink/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for sys-devel/prelink # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/prelink/ChangeLog,v 1.52 2007/03/25 05:30:30 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/prelink/ChangeLog,v 1.53 2007/03/30 05:57:32 vapier Exp $ + + 30 Mar 2007; Mike Frysinger files/prelink.confd, + files/prelink.cron: + Make cronjob prelinking control tristate (yes, no, user-controlled) as + suggested by Antti Mäkelä #172543. 25 Mar 2007; Mike Frysinger files/prelink.cron: Make sure we change KDE_IS_PRELINKED in /etc/env.d/ accordingly as suggested diff --git a/sys-devel/prelink/Manifest b/sys-devel/prelink/Manifest index 274cf352264f..c1d553d50cfa 100644 --- a/sys-devel/prelink/Manifest +++ b/sys-devel/prelink/Manifest @@ -21,14 +21,14 @@ AUX prelink-20061201-prelink-conf.patch 615 RMD160 de171299f3643d82012aa858894a8 MD5 b814b0be4c06c97b3357283d0b9f9bc2 files/prelink-20061201-prelink-conf.patch 615 RMD160 de171299f3643d82012aa858894a8d55f74f70a3 files/prelink-20061201-prelink-conf.patch 615 SHA256 a62cf740fb55e51d3e535ebed23e04f631fc8a88d6d69018074d441b703b364e files/prelink-20061201-prelink-conf.patch 615 -AUX prelink.confd 1552 RMD160 e15de30750ed3e0521241bb520b3e67e5944bd03 SHA1 e5044184714e7b0ee09176ee58111efb02f6f290 SHA256 2faa2765d312e2b3258a9b7743ac4b32b25b8ec8aa8a10e939ca47fec17903ac -MD5 c239f93c6ef48eb95b8eee0f1d602dd4 files/prelink.confd 1552 -RMD160 e15de30750ed3e0521241bb520b3e67e5944bd03 files/prelink.confd 1552 -SHA256 2faa2765d312e2b3258a9b7743ac4b32b25b8ec8aa8a10e939ca47fec17903ac files/prelink.confd 1552 -AUX prelink.cron 2356 RMD160 0772cf3e8f7b12b6172df10339235addadc01e88 SHA1 ba006616cc5cedd9abafc05df6ffb123eee794a8 SHA256 5db265bca502466e8ed4ddb8649813f58e7170c9b13bf8cb5c7684ae086e688d -MD5 37bb873c18ad5630836cc88dd9e8197d files/prelink.cron 2356 -RMD160 0772cf3e8f7b12b6172df10339235addadc01e88 files/prelink.cron 2356 -SHA256 5db265bca502466e8ed4ddb8649813f58e7170c9b13bf8cb5c7684ae086e688d files/prelink.cron 2356 +AUX prelink.confd 1677 RMD160 ccd7324c07917039566f4e58d6f0fc73e70c99d9 SHA1 6c0995685263fd3e867d4e3bce7fefeb17ef221e SHA256 e5db6bcc86a010a50be9134cb440f8366247ee36f1556f97d4f270746eb59dea +MD5 6594a51375650889ddf0bde9a3afb99a files/prelink.confd 1677 +RMD160 ccd7324c07917039566f4e58d6f0fc73e70c99d9 files/prelink.confd 1677 +SHA256 e5db6bcc86a010a50be9134cb440f8366247ee36f1556f97d4f270746eb59dea files/prelink.confd 1677 +AUX prelink.cron 2408 RMD160 042c7ff86206959823bec72a9cd7a9c22beb12ca SHA1 a90d2c4eaa4ce4cad5efc09225ad5000d2b4b275 SHA256 e9e397fe79faddd4fa3e5b67baf0c3cb793dbb8e52772ec5208d2682e6b624dc +MD5 cceafb54e077fe7ce8fc20c6cca89dad files/prelink.cron 2408 +RMD160 042c7ff86206959823bec72a9cd7a9c22beb12ca files/prelink.cron 2408 +SHA256 e9e397fe79faddd4fa3e5b67baf0c3cb793dbb8e52772ec5208d2682e6b624dc files/prelink.cron 2408 DIST prelink-20050314.tar.bz2 905343 RMD160 27cb5aa9d9ad889fe301dd8b76b4fcbd7c2af51e SHA1 0df95e7a163eb13b4a836688785b88a245d2b750 SHA256 5e175ab84f01cf3b8214f4d47c5246df4ff490bc140bac7ad858f4967bafc116 DIST prelink-20050610.tar.bz2 905388 RMD160 bf1657536497a15fc144ca9c8a0d0e616f7a218f SHA1 dd920a3c9438192eb49804efbe1ae588a8a14e9f SHA256 354fbbd6e98985b644038bc871df8a5c90da9244bf1b8594552d4925f1ae50e6 DIST prelink-20050901.tar.bz2 905959 RMD160 cfe15d86a38b7a2a375ed0d28b6c6218306ecf3c SHA1 defe77e7934fc1df304ba7bfaecaefdc1d078195 SHA256 d8fec0a1dcde1fbcca43fe8ca3f9429127b39a7c4fd1753ca69932af379476f8 @@ -59,10 +59,10 @@ EBUILD prelink-20061201.ebuild 1771 RMD160 f0d33f2f064c344f6e976896c8308925cc9fd MD5 fec1c815b74da400a135403aa9e4c1a1 prelink-20061201.ebuild 1771 RMD160 f0d33f2f064c344f6e976896c8308925cc9fd203 prelink-20061201.ebuild 1771 SHA256 91f23abe09fa9238a78b146b1664ea13d5f39a97e4d71c49f4986fe3dbaa7c8a prelink-20061201.ebuild 1771 -MISC ChangeLog 6234 RMD160 5dd9a7ae3f51020d08c68b6afa02597a028d0446 SHA1 35d96d029af849f421d39562f18246d84be379e8 SHA256 388a574e316c29bb6884478fa52516455e4514a5f99429f20d66053795ea770b -MD5 56bfc6cfbbe9329aaa16469131955bc5 ChangeLog 6234 -RMD160 5dd9a7ae3f51020d08c68b6afa02597a028d0446 ChangeLog 6234 -SHA256 388a574e316c29bb6884478fa52516455e4514a5f99429f20d66053795ea770b ChangeLog 6234 +MISC ChangeLog 6440 RMD160 f7233bc5fb549b0d7792573ef11a4aeb274ba7a2 SHA1 2c74b78773f68accc55e4d235c438c4ebf6e748f SHA256 5c94a55938edd62bb4e9b09e197478edd5f9035c658f438922a815a986088016 +MD5 4ee302d53663eaa16ba66f6dee8b01b7 ChangeLog 6440 +RMD160 f7233bc5fb549b0d7792573ef11a4aeb274ba7a2 ChangeLog 6440 +SHA256 5c94a55938edd62bb4e9b09e197478edd5f9035c658f438922a815a986088016 ChangeLog 6440 MISC metadata.xml 162 RMD160 d002486a43522f2116b1d9d59828c484956d66e2 SHA1 d6b4923897f6ae673b4f93646f5b4ba61d5a2c3c SHA256 65a915d44de1f01d4b7f72d313b4192c38374a9835d24988c00c1e73dca5805a MD5 567094e03359ffc1c95af7356395228d metadata.xml 162 RMD160 d002486a43522f2116b1d9d59828c484956d66e2 metadata.xml 162 @@ -88,7 +88,7 @@ SHA256 b6a4019843ea0f69d246fb7382524fdc8741d594dc4e3e4ab0c36775343cfcb1 files/di -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.3 (GNU/Linux) -iD8DBQFGDDm1/ejvha5XGaMRAtKQAJ0aBvYakAFeWmgkDp57vaulooMZrQCfSKmR -M9vJAw7+pxnL0eju6ZpkuH4= -=zSdl +iD8DBQFGDKbj8bi6rjpTunYRAj3QAKCTEd3q6vkw9p+mOgVZyg/e/X/3GACgmjY1 +Otb8Eoq2rlHJH/+dvNxhCt4= +=il9o -----END PGP SIGNATURE----- diff --git a/sys-devel/prelink/files/prelink.confd b/sys-devel/prelink/files/prelink.confd index e789bd0488e3..6b89b8c1f1fd 100644 --- a/sys-devel/prelink/files/prelink.confd +++ b/sys-devel/prelink/files/prelink.confd @@ -1,10 +1,13 @@ # For an in depth prelinking guide, please see: # http://www.gentoo.org/doc/en/prelink-howto.xml -# Set this to no to disable prelinking altogether +# Control prelinking behavior in the cronjob. +# yes - automatically prelink the system +# no - automatically un-prelink the system +# "" - do nothing at all (user manages) # (if you change this from yes to no prelink -ua # will be run next night to undo prelinking) -PRELINKING=no +PRELINKING="" # Options to pass to prelink # -m Try to conserve virtual memory by allowing overlapping diff --git a/sys-devel/prelink/files/prelink.cron b/sys-devel/prelink/files/prelink.cron index 2561e9d3727a..945d419d5083 100644 --- a/sys-devel/prelink/files/prelink.cron +++ b/sys-devel/prelink/files/prelink.cron @@ -2,6 +2,11 @@ . /etc/conf.d/prelink +case $PRELINKING in + yes|no);; + *) exit 0;; +esac + renice +19 -p $$ >/dev/null 2>&1 if [ "$PRELINKING" != yes ]; then -- 2.26.2