Fixed some filesystem entries in updatedb.conf file (bug #509084). Committed straight to stable

Package-Manager: portage-2.2.10/cvs/Linux x86_64
RepoMan-Options: --force
Manifest-Sign-Key: 0x981CA6FC

4 files changed, 28 insertions, 11 deletions

diff --git a/sys-apps/mlocate/ChangeLog b/sys-apps/mlocate/ChangeLog
index 2b69a6cf430b..259933aeb75d 100644
--- a/sys-apps/mlocate/ChangeLog
+++ b/sys-apps/mlocate/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-apps/mlocate
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/mlocate/ChangeLog,v 1.118 2014/01/08 22:45:47 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/mlocate/ChangeLog,v 1.119 2014/05/05 06:42:03 polynomial-c Exp $
+
+*mlocate-0.26-r1 (05 May 2014)
+
+  05 May 2014; Lars Wendler <polynomial-c@gentoo.org> -mlocate-0.26.ebuild,
+  +mlocate-0.26-r1.ebuild, files/updatedb.conf:
+  Fixed some filesystem entries in updatedb.conf file. Thanks to Toralf
+  Förster who reported this in bug #509084. Committed straight to stable.
 
   08 Jan 2014; Christian Faulhammer <fauli@gentoo.org> -mlocate-0.25.ebuild:
   clean up
diff --git a/sys-apps/mlocate/Manifest b/sys-apps/mlocate/Manifest
index a8188d442a86..20f81e3741bd 100644
--- a/sys-apps/mlocate/Manifest
+++ b/sys-apps/mlocate/Manifest
@@ -3,15 +3,25 @@ Hash: SHA256
 
 AUX mlocate-cron.conf 237 SHA256 856c1ab465b3e7ffdf752ba323bea9867ac902297fc4247ae15a575419b279c7 SHA512 ab055b052980783b5c63c716d7c12dcb19961a9f990c077e4f8c9bef4ca591bd281ac3941f872659a558a18b81c014dbc0655ff0a1872310670d8efc1d27cb00 WHIRLPOOL f7974d6514f52727c1b5213ded5f2050067afcc1eb9666da55a07845eab06fccfb27d100be102c0169b95b12c0244d0d62019d35d4596fc672216e5b152f3150
 AUX mlocate.cron-r2 1297 SHA256 dfceec061a018f2976f18b8ba874dc152cd9ee4595a6f9a25a6ef5307aeacae9 SHA512 d2f3790a52b426df0482836f15632e46d3e651aa64bf60f2048339723e01007bf59002b900e5d4137fb8e4c5d4d9df1c4351741f6600cc9784e347561093f691 WHIRLPOOL d107c2080ed22cf5107ce55312cc839fa6d252788fdb954ffb823378b02cf7684ce791bb9b764114d65ea63c76be4fabe04e8c8cf89d37dac951e893322db145
-AUX updatedb.conf 967 SHA256 afa4b1f5e7617f288ca83cfab3e8553b1ba92cb878f0f15a6f4817f31bfe9f66 SHA512 8702b452734b6d149544c4f8d55e3efd8d4aec39874cb48fb4c68144992fbde35312fa0d8abb6de4981746a420681af13c2637687a7bcc42003a8f8a032a33f6 WHIRLPOOL 6642d44b988a1cafc218b4196cdc2ef6b36c1009e541d07e1d115bb6d9e0d1ad9d1ba1b5536ce8ec159826e4b8d198b34b7f3e876df141d05697e437985ad779
+AUX updatedb.conf 964 SHA256 e037b09b49cee5291b71e6f823c3e6aeee82590ea139f2c95fe65f635c717172 SHA512 4ecf400139c4f6c7279b19be3547d5940d04ccdc53ece69f045b9ed0cf32bea931e32a4af2317fced04307ad150237763141a14a502abf34a6e6e0e5514b8a6d WHIRLPOOL 41ce2a52f0a155ef335e2e39d6ad8e88649e92adf48f76fc14083f95c1cf5bbefc73565f43b15702f5ca582e808cab0b26b4f937a25ba7cbcf221112361ad5a1
 DIST mlocate-0.26.tar.xz 359204 SHA256 3063df79fe198fb9618e180c54baf3105b33d88fe602ff2d8570aaf944f1263e SHA512 b1207047e30a551cba39e70812439b554def567ebe9b8b81fed6f26435bb575beafe4875a21cd72876eadd85da4e7bfc942eb28b17c430b537c351690364837f WHIRLPOOL 7f0a2df135ce2ec74f2a113e7f88b29f3964aa53fff1c47eb9aa44df4447d7b41b59615571a7626a3b7395208df75641d407b7a9456e590338962cde85093129
-EBUILD mlocate-0.26.ebuild 1729 SHA256 84cbfecb4f55c1b846c776608ff321cddff6269edf03a3ea5a3d0fc1886c878e SHA512 7019e7507aa92447a05398bbb3574e8c5da394601f40750f2cc4f8d995f87d08ab7bd588b2a7ee4e0784b49e5a6f0dfbb06f30693ed60f390072cc2e5f4ef998 WHIRLPOOL 2f40bba5f599799b4bd7b519f342b8bef0cd9e17d80b3535dd311d90db1387f587c25b62f585ca96838446ef43a26442b17a2a5b1530c3c8cc4a15836236901e
-MISC ChangeLog 14468 SHA256 ce4dd03dd16fbe57737ccf5f1d22caa2d001eb9ff5f5d4637a45344680c3b2ef SHA512 67c27f61ed7268a69bf7b6b9d8d2f0c6449cdc16c5c6a072f66110008c316619f60194b98ae03db13c2371345949cde30905b37b21e2ecca1e347a3cb3364e88 WHIRLPOOL a5e4c6e852d95e4a386242294aff011256f67769a8e2a731134a005f1ea43d125b4d8125f3b50c66c41ce9740d50fb45164a0662c29b7b5ecc437d35be8556b4
+EBUILD mlocate-0.26-r1.ebuild 1737 SHA256 4bfa574e161472c96ce586950a9a667d313b88c85fc5b66a6292f59697156142 SHA512 4c421e4120f6424f356d0dccef1d3cb6186a2d784b5b97e10de07223c471427ddcde4e39bf91d6be304c1c825f93e2dba24e94cd22a3154c07ad95aa9bed0de7 WHIRLPOOL dae34f5b5b6fc7aaa85e152f217bf08135821c846ff7f28d443ee34eba1adf71bb3e99938f04bb9fab54deffed8583863e36f80a91dfb895e6d3802e64524f83
+MISC ChangeLog 14779 SHA256 28666c0dd79c7882871bed10a96b89a7d6d9f83b3afd900d58ad302badc29cbe SHA512 33610283cb8697f6cbe4f30aab7dcce039851ac0b87b9bd117e92e927654c1258e3ad9f04d844558b573caa5dd6ce44ab45451512f40125d75d7a9af4daf5e06 WHIRLPOOL 8a3d526c03353dd255bf1a9e7a9308c38bb4304b36e6f28997bc1033e4b35d57ffd0fe44a312adcb0ff479b65970b7342c0798cf22eb36c356c928f7125478af
 MISC metadata.xml 269 SHA256 76fb556342434f4a8ba872bc6dbb7a21f625b5fbd001ee467141d6b710ae82c6 SHA512 45237b40e8f574dd054749e552b73a1f980a34583ff1972eaef603cc4cfba56dee59a7dc2566afa3fe8f663225b0eb666ab3fc088b22220103a397809c2c9f72 WHIRLPOOL 691a8f0df73feb0f318622e083147e6ca05b203dc6aa26a4aa787f9b84050800077c6474d9ef2b667bfc94a138712a13c716ca7ffab3efe10122781e41510e77
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlLN1YQACgkQNQqtfCuFneNl+ACfaRClhmx0CNeVOHttGx69x8d9
-t4QAn3HJyzMMCYFDLauwnhky5L60W9lX
-=bLX4
+iQIcBAEBCAAGBQJTZzK8AAoJEPiazRVxLXTFePcP/R14S++SnpnG3ASvgv56Sqc/
+68JEL/mamt1YyXJZOdpdY4kuV7BZ3+RGxx+rnU8rl6/FGCxXVCc814htLPnhcc1F
+97QAH8DYK6YxzqLmesj7UtMSQxI9TRGrjoaU9ibTsnciTRJKyI+3mfITcY+TDujj
+ugC9EswkO30a5fgD9iNS02ydPc15bmJzTvoMbSwKiyPLwQTByYLcxZJWkQ2F3GZM
+QfM7sA+g+MzOT6oASofUCdTcRMoiBU06ZsGfke1Br5Wwjgh2OnD/IUGwZBuUFQjw
+/J4bx9OFKLqIvtHp9GDwkG+dIUiwwZQ8W3X91CpQar7pLEc+UNp0ZAF7kQ/lpGaH
+ImLG9e8PW7NxX3Qb2q2z9z7lfZdcxw3H7/446m+AWVuLVBBugtksdV8q77fMBCRT
+VEn5dXUQ9GRa2Bb3lnVw2Vjl3cEtXXxCipFJrwQBCXdLff8f6Q5Z7AyPxns6hxko
+ctyK8wu9gCGWexaSuz0R46dTi/zz9nvi812v4I3Q7QBXc1vriH1Y+6tM65va0axi
+y2YjuPQRs4PPkmXKUM0xZIYt4zg1QxqMorg66seqM1Rc/9+VafINJVbT6uSK695j
+py2hti4k0ugbaFf0/mdR0IyhmYEH47mA4GRQ5owQbQV9bM5d7/tneSzUPhCoPgrW
+E6htKxIgYV0tplglGXO6
+=I3oK
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/mlocate/files/updatedb.conf b/sys-apps/mlocate/files/updatedb.conf
index 09f5db4306e8..41bc4ab5e889 100644
--- a/sys-apps/mlocate/files/updatedb.conf
+++ b/sys-apps/mlocate/files/updatedb.conf
@@ -1,11 +1,11 @@
 # /etc/updatedb.conf: config file for slocate
-# $Id: updatedb.conf,v 1.5 2011/01/24 12:39:33 scarabeus Exp $
+# $Id: updatedb.conf,v 1.6 2014/05/05 06:42:03 polynomial-c Exp $
 
 # This file sets variables that are used by updatedb.
 # For more info, see the updatedb.conf(5) manpage.
 
 # Filesystems that are pruned from updatedb database
-PRUNEFS="afs anon_inodefs auto autofs bdev binfmt binfmt_misc cgroup cifs coda configfs cramfs cpuset debugfs devpts devtmps devfs devpts ecryptfs eventpollfs exofs futexfs ftpfs fuse fusectl gfs gfs2 hostfs hugetlbfs inotifyfs iso9660 jffs2 lustre misc mqueue ncpfs nfs NFS nfs4 nfsd nnpfs ocfs ocfs2 pipefs proc ramfs rpc_pipefs securityfs selinuxfs sfs shfs smbfs sockfs spufs sshfs subfs supermount sysfs tmpfs ubifs udf usbfs vboxsf vperfctrfs"
+PRUNEFS="afs anon_inodefs auto autofs bdev binfmt binfmt_misc cgroup cifs coda configfs cramfs cpuset debugfs devfs devpts devtmpfs ecryptfs eventpollfs exofs futexfs ftpfs fuse fusectl gfs gfs2 hostfs hugetlbfs inotifyfs iso9660 jffs2 lustre misc mqueue ncpfs nfs NFS nfs4 nfsd nnpfs ocfs ocfs2 pipefs proc ramfs rpc_pipefs securityfs selinuxfs sfs shfs smbfs sockfs spufs sshfs subfs supermount sysfs tmpfs ubifs udf usbfs vboxsf vperfctrfs"
 
 # Paths which are pruned from updatedb database
 PRUNEPATHS="/tmp /var/tmp /var/cache /var/lock /var/run /var/spool"
diff --git a/sys-apps/mlocate/mlocate-0.26.ebuild b/sys-apps/mlocate/mlocate-0.26-r1.ebuild
index 5a3a9700563b..3caa30e90c8f 100644
--- a/sys-apps/mlocate/mlocate-0.26.ebuild
+++ b/sys-apps/mlocate/mlocate-0.26-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/mlocate/mlocate-0.26.ebuild,v 1.12 2013/09/05 05:14:13 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/mlocate/mlocate-0.26-r1.ebuild,v 1.1 2014/05/05 06:42:03 polynomial-c Exp $
 
 EAPI=4
 inherit eutils user toolchain-funcs