sys-apps/preload add patch by Pacho Ramos to include files in /opt or /lib32 to be preloaded, bug #242580. One minor conf file tweak.

Package-Manager: portage-2.2_rc12/cvs/Linux 2.6.27-git6 x86_64

5 files changed, 78 insertions, 6 deletions

diff --git a/sys-apps/preload/ChangeLog b/sys-apps/preload/ChangeLog
index 7913698f9347..e61ffff7645f 100644
--- a/sys-apps/preload/ChangeLog
+++ b/sys-apps/preload/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-apps/preload
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/preload/ChangeLog,v 1.3 2008/10/20 18:58:10 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/preload/ChangeLog,v 1.4 2008/10/20 22:58:40 darkside Exp $
+
+*preload-0.6.3-r2 (20 Oct 2008)
+
+  20 Oct 2008; Jeremy Olexa <darkside@gentoo.org>
+  +files/preload-0.6.3-conf.patch, files/conf.d-preload,
+  +preload-0.6.3-r2.ebuild:
+  sys-apps/preload add patch by Pacho Ramos to include files in /opt or /lib32
+  to be preloaded, bug #242580. One minor conf file tweak.
 
 *preload-0.6.3-r1 (20 Oct 2008)
 
diff --git a/sys-apps/preload/Manifest b/sys-apps/preload/Manifest
index 94b3b1a14470..d86ddbf00e75 100644
--- a/sys-apps/preload/Manifest
+++ b/sys-apps/preload/Manifest
@@ -1,6 +1,8 @@
-AUX conf.d-preload 740 RMD160 db0a03b3246ec1c7306dc58588d9950e254fec69 SHA1 2795e822dd02502bb507063cef4452f8df702d90 SHA256 31e9ff5ae6db80a2f473441c1e18919ec0bb080eb3ea8c5973a7abed5f2ce439
+AUX conf.d-preload 707 RMD160 37054785acd8f307a75544708d1d37d193abc9c3 SHA1 d9b8054f82fe9e8c49dd7201cefc8b79f4091f95 SHA256 967211b9342b46311f26a70c8ea4f2ea27184c96dcfc57cd30b49cc8274f114a
 AUX init.d-preload 686 RMD160 c3e8a16df3bc2f42dbbad96438a7d223d4c84e70 SHA1 3120a33169b1f2381093567869f7d613c379eb6c SHA256 53a6b029e77d9e3fc1b864982dbfe11e0472e544aa2814eec4710c2f13691d65
+AUX preload-0.6.3-conf.patch 565 RMD160 a179cc629466db6b4c8338572dcfedd5df8648fa SHA1 2edf461357da6b3e92a56917f35da8e8409849e8 SHA256 0830b5cd1df5ada7ccb33803cc2a5349200d1f2422ac1d1a2daf94a8a1e8fc56
 DIST preload-0.6.3.tar.gz 139587 RMD160 ba0666ee67780961651a99ac60068265d29c288a SHA1 3733693e186ebc8965f164a3fd7afa2cf558fec5 SHA256 de6a79ca1426f8a2710135b78fd9edb34e3a152e9cdd7cfd68166399171f358b
 EBUILD preload-0.6.3-r1.ebuild 935 RMD160 1a3333ca4f785dda7ea1967e6c2a0369be8c1ea5 SHA1 e90125b7842051730e04f8fd04943d47a01dc207 SHA256 af2105d874f57ba2d79ddfcfbb8567189b5e96147a4762b4399beaf48ce48193
-MISC ChangeLog 946 RMD160 84758c296bac6ad1d175b47117f6ab6ae3031364 SHA1 317bc576c256fe5f1e855ee69299f99c12e859ac SHA256 573fc478112e3abd1ea1942379f548e651cd9eb3b3974029dba7073d63400cf1
+EBUILD preload-0.6.3-r2.ebuild 1132 RMD160 e5f5c8c7e47151744f47103e8ef2673bc493d42b SHA1 235f09b7de85ce50e02999072a4a3bcea60124d4 SHA256 6592fa3d2e7bbcba505924e4d96e89dd99f89b3db80a0f8f7a46d8cc2d68397d
+MISC ChangeLog 1253 RMD160 22743ae65b65ce2e64a2242a13751b0071bd3768 SHA1 d0e023963d1c315d617b251d3f551652c3d3aad5 SHA256 97605701af9468d2c13636612dc3c81dd4c1862fe0bf7677701695b38f1a77a3
 MISC metadata.xml 503 RMD160 38ab96ae80e53c44b88512bec1409281cf06ef56 SHA1 4196948def119ac92327edf1307cc9a1bd0f4162 SHA256 0cbf6f727b2d3bc82e3a3d949dc9cb003029789718735e32cbc77e28eaa21b24
diff --git a/sys-apps/preload/files/conf.d-preload b/sys-apps/preload/files/conf.d-preload
index 3ff0eea79700..52de3301b6b7 100644
--- a/sys-apps/preload/files/conf.d-preload
+++ b/sys-apps/preload/files/conf.d-preload
@@ -1,5 +1,5 @@
 # Copyright 1999-2008 Gentoo Foundation
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/preload/files/conf.d-preload,v 1.2 2008/10/20 18:58:11 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/preload/files/conf.d-preload,v 1.3 2008/10/20 22:58:41 darkside Exp $
 # preload configuration file
 
 # verbosity.  0-9, Default is 4.
@@ -9,8 +9,7 @@ PRELOAD_VERBOSITY="4"
 PRELOAD_NICE="15"
 
 # log file (default is /var/log/preload.log )
-# Empty means default location.
-#PRELOAD_LOGFILE="/var/log/preload.log"
+PRELOAD_LOGFILE="/var/log/preload.log"
 
 # prelaod state file (default is /var/lib/preload/preload.state ) 
 # Empty means no state is saved.
diff --git a/sys-apps/preload/files/preload-0.6.3-conf.patch b/sys-apps/preload/files/preload-0.6.3-conf.patch
new file mode 100644
index 000000000000..e7e27367039d
--- /dev/null
+++ b/sys-apps/preload/files/preload-0.6.3-conf.patch
@@ -0,0 +1,20 @@
+--- src/preload.conf.in~	2008-10-18 17:12:39.000000000 +0200
++++ src/preload.conf.in	2008-10-18 17:12:39.000000000 +0200
+@@ -132,7 +132,7 @@
+ # preload doesn't special-handle device files internally.
+ #
+ # default: (empty list, accept all)
+-mapprefix = /usr;/lib;/lib64;/var/cache;!/
++mapprefix = /usr;/lib;/lib64;/lib32;/opt;/var/cache;!/
+ 
+ # exeprefix:
+ #
+@@ -141,7 +141,7 @@
+ # files instead of maps.
+ #
+ # default: (empty list, accept all)
+-exeprefix = !/usr/sbin;!/usr/local/sbin;/usr;!/
++exeprefix = !/usr/sbin;!/usr/local/sbin;/usr;/opt;!/
+ 
+ # maxprocs
+ #
diff --git a/sys-apps/preload/preload-0.6.3-r2.ebuild b/sys-apps/preload/preload-0.6.3-r2.ebuild
new file mode 100644
index 000000000000..c9683aece7d7
--- /dev/null
+++ b/sys-apps/preload/preload-0.6.3-r2.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/preload/preload-0.6.3-r2.ebuild,v 1.1 2008/10/20 22:58:40 darkside Exp $
+
+EAPI="2"
+inherit eutils
+
+DESCRIPTION="Adaptive readahead daemon."
+HOMEPAGE="http://sourceforge.net/projects/preload"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-libs/glib"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+src_prepare() {
+	# Patch to add /opt & /lib32 to allowed files to preload. Submitted
+	# upstream, bug #242580
+	epatch "${FILESDIR}/${P}-conf.patch"
+}
+
+src_configure() {
+	econf --localstatedir=/var
+}
+
+src_compile() {
+	emake -j1 || die "emake failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "install failed"
+	rm -rf "${D}/etc/rc.d" || die "rm rc.d failed"
+	rm -rf "${D}/etc/sysconfig" || die "rm sysconfig failed"
+	newinitd "${FILESDIR}/init.d-preload" preload || die "initd failed"
+	newconfd "${FILESDIR}/conf.d-preload" preload || die "confd failed"
+	dodoc AUTHORS ChangeLog NEWS README THANKS TODO
+}
+