diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2005-09-13 23:43:57 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2005-09-13 23:43:57 +0000 |
| commit | 9a0bc2442ca2ff0a4006ca53b068e3176edddda7 (patch) | |
| tree | e52f6625b54097e85f90d951f7492004b17b3a6e | |
| parent | Also check if $devices_totar was valid. (diff) | |
| download | gentoo-2-9a0bc2442ca2ff0a4006ca53b068e3176edddda7.tar.gz gentoo-2-9a0bc2442ca2ff0a4006ca53b068e3176edddda7.tar.bz2 gentoo-2-9a0bc2442ca2ff0a4006ca53b068e3176edddda7.zip | |
Patch from Fedora to fix #104378.
(Portage version: 2.0.51.22-r2)
| -rw-r--r-- | sys-apps/slocate/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-apps/slocate/files/slocate-2.7-really-long-paths.patch | 18 | ||||
| -rw-r--r-- | sys-apps/slocate/slocate-2.7-r8.ebuild | 3 |
3 files changed, 25 insertions, 2 deletions
diff --git a/sys-apps/slocate/ChangeLog b/sys-apps/slocate/ChangeLog index 68c04b14cc09..eab1fb9ff39d 100644 --- 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/files/slocate-2.7-really-long-paths.patch b/sys-apps/slocate/files/slocate-2.7-really-long-paths.patch new file mode 100644 index 000000000000..faf7001c9a83 --- /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 ceb3dac250d3..7bc34b15c5be 100644 --- 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:' \ |