Update of /cvsroot/fink/dists/10.3/unstable/main/finkinfo/utils
In directory 
sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv28430/10.3/unstable/main/finkinfo/utils

Modified Files:
        findutils.info findutils.patch 
Log Message:
backport fixes from 10.4


Index: findutils.patch
===================================================================
RCS file: 
/cvsroot/fink/dists/10.3/unstable/main/finkinfo/utils/findutils.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- findutils.patch     19 Jun 2005 02:22:07 -0000      1.4
+++ findutils.patch     5 Oct 2006 08:53:10 -0000       1.5
@@ -1,16 +1,21 @@
 diff -Naur findutils-4.2.20/findutils.cron findutils-new/findutils.cron
---- findutils-4.2.20/findutils.cron    Wed Dec 31 19:00:00 1969
-+++ findutils-new/findutils.cron       Tue Apr 26 20:40:11 2005
-@@ -0,0 +1,6 @@
+--- findutils-4.2.20/findutils.cron    1969-12-31 19:00:00.000000000 -0500
++++ findutils-new/findutils.cron       2005-07-20 00:44:54.000000000 -0400
+@@ -0,0 +1,11 @@
 +#!/bin/sh
 +
++. @PREFIX@/etc/updatedb.conf
++
++test "x$STATUS" = "xon" || exit 0
++perl -e 'exit (!-e "@PREFIX@/var/locatedb" || -M "@PREFIX@/var/locatedb" > 
$ARGV[0] - 1)' $DAYS && exit 0
++
 +test -x @PREFIX@/bin/updatedb || exit 0
 +cd / && @PREFIX@/bin/updatedb
 +
 +exit 0
 diff -Naur findutils-4.2.20/gnulib/lib/regex.c findutils-new/gnulib/lib/regex.c
---- findutils-4.2.20/gnulib/lib/regex.c        Mon Jan 24 12:10:02 2005
-+++ findutils-new/gnulib/lib/regex.c   Tue Apr 26 20:40:11 2005
+--- findutils-4.2.20/gnulib/lib/regex.c        2005-01-24 12:10:02.000000000 
-0500
++++ findutils-new/gnulib/lib/regex.c   2005-07-20 00:43:33.000000000 -0400
 @@ -7963,7 +7963,7 @@
  
  /* POSIX.2 functions.  Don't define these for Emacs.  */
@@ -21,8 +26,8 @@
  /* regcomp takes a regular expression as a string and compiles it.
  
 diff -Naur findutils-4.2.20/lib/listfile.c findutils-new/lib/listfile.c
---- findutils-4.2.20/lib/listfile.c    Mon Nov  1 04:13:38 2004
-+++ findutils-new/lib/listfile.c       Tue Apr 26 20:40:11 2005
+--- findutils-4.2.20/lib/listfile.c    2004-11-01 04:13:38.000000000 -0500
++++ findutils-new/lib/listfile.c       2005-07-20 00:43:33.000000000 -0400
 @@ -89,10 +89,6 @@
  #define S_ISLNK(m) (((m) & S_IFMT) == S_IFLNK)
  #endif
@@ -35,8 +40,8 @@
     Usually defined by sys/param.h (if at all).  */
  #ifndef DEV_BSIZE
 diff -Naur findutils-4.2.20/locate/updatedb.sh findutils-new/locate/updatedb.sh
---- findutils-4.2.20/locate/updatedb.sh        Mon Jan 24 11:12:35 2005
-+++ findutils-new/locate/updatedb.sh   Tue Apr 26 20:42:12 2005
+--- findutils-4.2.20/locate/updatedb.sh        2005-01-24 11:12:35.000000000 
-0500
++++ findutils-new/locate/updatedb.sh   2005-07-20 00:43:33.000000000 -0400
 @@ -143,7 +143,7 @@
  
  PATH=/bin:/usr/bin:${BINDIR}; export PATH
@@ -46,3 +51,17 @@
  
  if test -n "$PRUNEFS"; then
  prunefs_exp=`echo $PRUNEFS |sed -e 's/\([^ ][^ ]*\)/-o -fstype \1/g' \
+diff -Naur findutils-4.2.20/updatedb.conf findutils-new/updatedb.conf
+--- findutils-4.2.20/updatedb.conf     1969-12-31 19:00:00.000000000 -0500
++++ findutils-new/updatedb.conf        2005-07-20 00:50:03.000000000 -0400
+@@ -0,0 +1,10 @@
++###
++# This file allows you to schedule when the locate DB should be updated.
++#
++# STATUS: If this is not 'on', then the locate DB will never be updated.
++#
++# DAYS: This specifies the period in days between updates. So if DAYS=7,
++# then the DB will be updated every week
++###
++DAYS=1
++STATUS=on

Index: findutils.info
===================================================================
RCS file: /cvsroot/fink/dists/10.3/unstable/main/finkinfo/utils/findutils.info,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- findutils.info      19 Jun 2005 02:22:07 -0000      1.6
+++ findutils.info      5 Oct 2006 08:53:10 -0000       1.7
@@ -1,6 +1,6 @@
 Package: findutils
 Version: 4.2.20
-Revision: 4
+Revision: 6
 Maintainer: Dave Vasilevsky <[EMAIL PROTECTED]>
 Depends: cron-service, libgettext3-shlibs
 BuildDepends: libgettext3-dev, gettext-bin, gettext-tools
@@ -9,26 +9,32 @@
 PatchScript: sed 's|@PREFIX@|%p|g' < %a/%n.patch | patch -p1
 SetCFLAGS: -DFINK -DHAVE_F_FSTYPENAME_IN_STATFS
 CompileScript: <<
- ./configure %c
- make libexecdir=%p/lib/locate
+       SORT=/usr/bin/sort ./configure %c
+       make libexecdir=%p/lib/locate
 <<
 InstallScript: <<
- make install prefix=%i mandir=%i/share/man infodir=%i/share/info 
libexecdir=%i/lib/locate
- mkdir -p %i/etc/cron.daily
- install -c -m 755 findutils.cron %i/etc/cron.daily/%n
+       make install prefix=%i mandir=%i/share/man infodir=%i/share/info 
libexecdir=%i/lib/locate
+       mkdir -p %i/etc/cron.daily
+       install -c -m 755 findutils.cron %i/etc/cron.daily/%n
+       install -c -m 644 updatedb.conf %i/etc/updatedb.conf
 <<
+ConfFiles: %p/etc/updatedb.conf
 DocFiles: README COPYING NEWS
 InfoDocs: find.info
 #
 Description: Tools for searching for files
 DescPackaging: <<
-locate's helper programs are stowed away in .../lib/locate. That's a
-bit more difficult than usual because the configure script is really
-old.
-
-The package installs a daily cron job to update locate's
-database. updatedb is currently run as root since su seems to be
-unable to become user 'nobody'.
+       locate's helper programs are stowed away in .../lib/locate. That's a
+       bit more difficult than usual because the configure script is really
+       old.
+       
+       The package installs a daily cron job to update locate's
+       database. updatedb is currently run as root since su seems to be
+       unable to become user 'nobody'.
+<<
+DescUsage: <<
+       The locate database is updated daily by default. Please see
+       %p/etc/updatedb.conf to reschedule the updatedb task.
 <<
 License: GPL
 Homepage: http://www.gnu.org/software/findutils/findutils.html


-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys -- and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits

Reply via email to