[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

rpms/slocate/FC-3 slocate-2.7-long.patch, NONE, 1.1 slocate.spec, 1.15, 1.16 slocate-2.7-fts.patch, 1.1, NONE



Author: mitr

Update of /cvs/dist/rpms/slocate/FC-3
In directory cvs.devel.redhat.com:/tmp/cvs-serv27579

Modified Files:
	slocate.spec 
Added Files:
	slocate-2.7-long.patch 
Removed Files:
	slocate-2.7-fts.patch 
Log Message:
* Wed Aug 10 2005 Miloslav Trmac <mitr redhat com> - 2.7-12.fc3.1
- s/Copyright/License/
- Skip subtrees with paths longer than 32k
- Drop the ineffective fts patch


slocate-2.7-long.patch:
 main.c |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

--- NEW FILE slocate-2.7-long.patch ---
--- slocate-2.7/main.c.long	2005-08-09 01:04:39.000000000 +0200
+++ slocate-2.7/main.c	2005-08-09 01:08:51.000000000 +0200
@@ -1078,8 +1078,12 @@
 		
 		if (!file)
 		    break;
-		
-		if (file->fts_info != FTS_DP && file->fts_info != FTS_NS) {
+
+		/* 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);
+		else if (file->fts_info != FTS_DP && file->fts_info != FTS_NS) {
 			
 			if ((EXCLUDE && !match_exclude(file->fts_path,"")) || !EXCLUDE)
 			    frcode(fd,file->fts_path,"");


Index: slocate.spec
===================================================================
RCS file: /cvs/dist/rpms/slocate/FC-3/slocate.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- slocate.spec	20 Oct 2004 09:18:56 -0000	1.15
+++ slocate.spec	17 Aug 2005 21:17:01 -0000	1.16
@@ -1,8 +1,8 @@
 Summary: Finds files on a system via a central database.
 Name: slocate
 Version: 2.7
-Release: 12
-Copyright: GPL
+Release: 12.fc3.1
+License: GPL
 Group: Applications/File
 Source: ftp://ftp.geekreview.org/slocate/slocate-%{version}.tar.gz
 Source1: slocate.cron
@@ -14,7 +14,7 @@
 #Patch4: slocate-2.6-segfault.patch
 Patch5: slocate-2.6-uchar.patch
 Patch6: slocate-2.6-can-2003-0848.patch
-Patch7: slocate-2.7-fts.patch
+Patch7: slocate-2.7-long.patch
 Prereq: shadow-utils
 Buildroot: %{_tmppath}/%{name}-root
 
@@ -32,14 +32,14 @@
 #%patch4 -p1 -b .segv2
 %patch5 -p1 -b .uchar
 %patch6 -p1 -b .dropit
-%patch7 -p1 -b .fts
+%patch7 -p1 -b .long
 # *sigh*
 gunzip doc/*.gz
 %patch3 -p1 -b .manpage
 
 %build
 autoreconf -f -i
-CFLAGS="$RPM_OPT_FLAGS -fsigned-char -D_GNU_SOURCE=1 -D_FILE_OFFSET_BITS=64" %configure
+CFLAGS="$RPM_OPT_FLAGS -fsigned-char -D_GNU_SOURCE=1" %configure
 make
 
 %install
@@ -82,6 +82,11 @@
 %dir %attr(750,root,slocate) /var/lib/slocate
 
 %changelog
+* Wed Aug 10 2005 Miloslav Trmac <mitr redhat com> - 2.7-12.fc3.1
+- s/Copyright/License/
+- Skip subtrees with paths longer than 32k
+- Drop the ineffective fts patch
+
 * Wed Oct 20 2004 Thomas Woerner <twoerner redhat com> 2.7-12
 - added /mnt/floppy to PRUNEPATHS
 


--- slocate-2.7-fts.patch DELETED ---


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]