Make cronjob prelinking control tristate (yes, no, user-controlled) as suggested by Antti Mäkelä #172543.

Package-Manager: portage-2.1.2.2

4 files changed, 31 insertions, 18 deletions

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 <vapier@gentoo.org> 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 <vapier@gentoo.org> 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