Patch from Fedora to fix #104378.

Package-Manager: portage-2.0.51.22-r2

diff --git a/sys-apps/slocate/ChangeLog b/sys-apps/slocate/ChangeLog
index 68c04b14cc09e6bfa6d374dd2aab9fef804be10c..eab1fb9ff39d7078d2c8a4a1e69752c8bbefb74e 100644 (file)
--- a/sys-apps/slocate/ChangeLog
+++ b/sys-apps/slocate/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-apps/slocate
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/slocate/ChangeLog,v 1.55 2005/08/05 20:45:08 ciaranm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/slocate/ChangeLog,v 1.56 2005/09/13 23:43:57 vapier Exp $
+
+  13 Sep 2005; Mike Frysinger <vapier@gentoo.org>
+  +files/slocate-2.7-really-long-paths.patch, slocate-2.7-r8.ebuild:
+  Patch from Fedora to fix #104378.
 
   05 Aug 2005; Ciaran McCreesh <ciaranm@gentoo.org> files/updatedb.conf:
   Exclude /root/.ccache, bug #90344

diff --git a/sys-apps/slocate/Manifest b/sys-apps/slocate/Manifest
index d5c32c0d6792adf96ee86542b03988b30f1c0ff7..34d57360466f7878e8ec0b5b08efdcdf6e6af905 100644 (file)
--- a/sys-apps/slocate/Manifest
+++ b/sys-apps/slocate/Manifest
@@ -1,18 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 1711c302c7546e0a7210bce15849fa43 slocate-2.7-r7.ebuild 2323
-MD5 617c0570e4234957379565db79b3bb93 slocate-2.7-r8.ebuild 2721
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
-MD5 8532ea0a91f85a49f68c62bb71af1eea ChangeLog 7158
-MD5 c4851bb3df3db96d82c744c6c5cd2958 files/updatedb.conf 563
+MD5 bdaca2b2b98155458643f4c5d1fdc58e slocate-2.7-r8.ebuild 2772
+MD5 1711c302c7546e0a7210bce15849fa43 slocate-2.7-r7.ebuild 2323
+MD5 8b5e9de2d8f33a889483877cb737ae63 ChangeLog 7313
 MD5 4109d0757229d079e30f8ea33b676f00 files/digest-slocate-2.7-r8 211
 MD5 4109d0757229d079e30f8ea33b676f00 files/digest-slocate-2.7-r7 211
+MD5 798bd427c87de3cfdb9ecd6854f2e56b files/slocate-2.7-really-long-paths.patch 538
 MD5 6cd691d75d501eb87ed12cf31c1e1ff6 files/slocate-2.7-bounds.patch 305
+MD5 c4851bb3df3db96d82c744c6c5cd2958 files/updatedb.conf 563
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
+Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFC88/kLLFUmVNQ7rkRAheLAJ9J0/xOdSePW2vb7us9uXyaArlPzACcCpX/
-WL7gd763qa3uFMXDJzdWrKc=
-=zbRP
+iD8DBQFDJ2RNgIKl8Uu19MoRAinFAJ4v2CqgSi6QoG0ijlH/g9gH6C5gTwCcDztN
+sP2fYiiqThBdhULOHJz9/X0=
+=XtBS
 -----END PGP SIGNATURE-----

diff --git a/sys-apps/slocate/files/slocate-2.7-really-long-paths.patch b/sys-apps/slocate/files/slocate-2.7-really-long-paths.patch
new file mode 100644 (file)
index 0000000..faf7001
--- /dev/null
+++ b/sys-apps/slocate/files/slocate-2.7-really-long-paths.patch
@@ -0,0 +1,18 @@
+Sniped from Fedora
+
+http://bugs.gentoo.org/104378
+http://www.securityfocus.com/bid/14640
+
+--- slocate/main.c
++++ slocate/main.c
+@@ -1057,6 +1057,10 @@
+               if (!file)
+                   break;
+               
++              /* fts_read () from glibc fails with EOVERFLOW when fts_pathlen
++                 would overflow the u_short file->fts_pathlen. */
++              if (file->fts_info == FTS_D && file->fts_pathlen > 32768)
++                      fts_set(dir,file,FTS_SKIP);
+               if (file->fts_info != FTS_DP && file->fts_info != FTS_NS) {
+                       
+                       if ((EXCLUDE && !match_exclude(file->fts_path,"")) || !EXCLUDE)

diff --git a/sys-apps/slocate/slocate-2.7-r8.ebuild b/sys-apps/slocate/slocate-2.7-r8.ebuild
index ceb3dac250d3d87ca1ff7af2b2723aa3f871ff34..7bc34b15c5beab12f528649e130c969d2018c6a3 100644 (file)
--- a/sys-apps/slocate/slocate-2.7-r8.ebuild
+++ b/sys-apps/slocate/slocate-2.7-r8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/slocate/slocate-2.7-r8.ebuild,v 1.3 2005/07/21 01:06:23 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/slocate/slocate-2.7-r8.ebuild,v 1.4 2005/09/13 23:43:57 vapier Exp $
 
 inherit flag-o-matic eutils
 
@@ -36,6 +36,7 @@ src_unpack() {
        use elibc_uclibc && epatch "${WORKDIR}"/${P}-uclibc-sl_fts.patch
        epatch "${WORKDIR}"/${P}-debian.patch
        epatch "${FILESDIR}"/${P}-bounds.patch
+       epatch "${FILESDIR}"/${P}-really-long-paths.patch
 
        sed -i \
                -e '/SLOC_GRP/s:slocate:locate:' \