rpms/findutils/devel findutils-4.5.9.tar.gz.sig, NONE, 1.1 .cvsignore, 1.19, 1.20 findutils-4.4.2-xautofs.patch, 1.4, 1.5 findutils-4.5.7-warnings.patch, 1.1, 1.2 findutils.spec, 1.74, 1.75 sources, 1.19, 1.20 findutils-4.5.7-bz579476.patch, 1.1, NONE findutils-4.5.7-fdleak.patch, 1.2, NONE findutils-4.5.7.tar.gz.sig, 1.1, NONE

[Kamil Dudka]

Author: kdudka

Update of /cvs/extras/rpms/findutils/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv23650

Modified Files:
	.cvsignore findutils-4.4.2-xautofs.patch 
	findutils-4.5.7-warnings.patch findutils.spec sources 
Added Files:
	findutils-4.5.9.tar.gz.sig 
Removed Files:
	findutils-4.5.7-bz579476.patch findutils-4.5.7-fdleak.patch 
	findutils-4.5.7.tar.gz.sig 
Log Message:
- new upstream release, dropped applied patches


--- NEW FILE findutils-4.5.9.tar.gz.sig ---
‰ • KÚ ‚¡[rYd©^å
®Z –Z•´È†.yOq‚ïþq¿ÉV„„…Éü[‰,·ùæŸx¥ú_»	‹%lG:ˆ	PÙð]“:Â÷"¬àÇɡü[>7Wà Kœznç/6SC®ºà}Øõ†òýŽø~?«7ðW‰äÄEûÙø€®Ö¶î•˜Þ)¨Qm

Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/findutils/devel/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- .cvsignore	3 Apr 2010 15:50:54 -0000	1.19
+++ .cvsignore	5 May 2010 11:38:25 -0000	1.20
@@ -1 +1 @@
-findutils-4.5.7.tar.gz
+findutils-4.5.9.tar.gz

findutils-4.4.2-xautofs.patch:
 doc/find.texi  |    4 ++++
 find/defs.h    |    3 +++
 find/find.1    |    3 +++
 find/ftsfind.c |    6 ++++++
 find/parser.c  |    9 +++++++++
 find/util.c    |    1 +
 6 files changed, 26 insertions(+)

Index: findutils-4.4.2-xautofs.patch
===================================================================
RCS file: /cvs/extras/rpms/findutils/devel/findutils-4.4.2-xautofs.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- findutils-4.4.2-xautofs.patch	3 Apr 2010 15:50:55 -0000	1.4
+++ findutils-4.4.2-xautofs.patch	5 May 2010 11:38:25 -0000	1.5
@@ -1,3 +1,11 @@
+ doc/find.texi  |    4 ++++
+ find/defs.h    |    3 +++
+ find/find.1    |    3 +++
+ find/ftsfind.c |    6 ++++++
+ find/parser.c  |    9 +++++++++
+ find/util.c    |    1 +
+ 6 files changed, 26 insertions(+), 0 deletions(-)
+
 diff --git a/doc/find.texi b/doc/find.texi
 index b509f66..3ce5b1e 100644
 --- a/doc/find.texi
@@ -14,15 +22,15 @@ index b509f66..3ce5b1e 100644
  @deffnx Option -mount
  Don't descend directories on other filesystems.  These options are
 diff --git a/find/defs.h b/find/defs.h
-index f344f97..4ade8f4 100644
+index 11d1d00..da3ff96 100644
 --- a/find/defs.h
 +++ b/find/defs.h
-@@ -562,6 +562,9 @@ struct options
+@@ -561,6 +561,9 @@ struct options
    /* If true, don't cross filesystem boundaries. */
-   boolean stay_on_filesystem;
+   bool stay_on_filesystem;
  
 +  /* If true, don't descend directories on autofs filesystems. */
-+  boolean bypass_autofs;
++  bool bypass_autofs;
 +
    /* If true, we ignore the problem where we find that a directory entry
     * no longer exists by the time we get around to processing it.
@@ -42,10 +50,10 @@ index 5da6ddf..82dc802 100644
  Don't descend directories on other filesystems.
  
 diff --git a/find/ftsfind.c b/find/ftsfind.c
-index c3681f6..b3a08f9 100644
+index 9fdb8ef..bd7cc37 100644
 --- a/find/ftsfind.c
 +++ b/find/ftsfind.c
-@@ -524,6 +524,12 @@ consider_visiting (FTS *p, FTSENT *ent)
+@@ -485,6 +485,12 @@ consider_visiting (FTS *p, FTSENT *ent)
  	}
      }
  
@@ -59,17 +67,17 @@ index c3681f6..b3a08f9 100644
      {
        /* this is the preorder visit, but user said -depth */
 diff --git a/find/parser.c b/find/parser.c
-index 2ea3126..8238671 100644
+index 3da5721..e99caff 100644
 --- a/find/parser.c
 +++ b/find/parser.c
-@@ -153,6 +153,7 @@ static boolean parse_user          PARAMS((const struct parser_table*, char *arg
- static boolean parse_version       PARAMS((const struct parser_table*, char *argv[], int *arg_ptr));
- static boolean parse_wholename     PARAMS((const struct parser_table*, char *argv[], int *arg_ptr));
- static boolean parse_xdev          PARAMS((const struct parser_table*, char *argv[], int *arg_ptr));
-+static boolean parse_xautofs       PARAMS((const struct parser_table*, char *argv[], int *arg_ptr));
- static boolean parse_ignore_race   PARAMS((const struct parser_table*, char *argv[], int *arg_ptr));
- static boolean parse_noignore_race PARAMS((const struct parser_table*, char *argv[], int *arg_ptr));
- static boolean parse_warn          PARAMS((const struct parser_table*, char *argv[], int *arg_ptr));
+@@ -151,6 +151,7 @@ static bool parse_user          (const struct parser_table*, char *argv[], int *
+ static bool parse_version       (const struct parser_table*, char *argv[], int *arg_ptr);
+ static bool parse_wholename     (const struct parser_table*, char *argv[], int *arg_ptr);
+ static bool parse_xdev          (const struct parser_table*, char *argv[], int *arg_ptr);
++static bool parse_xautofs       (const struct parser_table*, char *argv[], int *arg_ptr);
+ static bool parse_ignore_race   (const struct parser_table*, char *argv[], int *arg_ptr);
+ static bool parse_noignore_race (const struct parser_table*, char *argv[], int *arg_ptr);
+ static bool parse_warn          (const struct parser_table*, char *argv[], int *arg_ptr);
 @@ -325,6 +326,7 @@ static struct parser_table const parse_table[] =
    PARSE_TEST_NP    ("wholename",             wholename), /* GNU, replaced -path, but anyway -path will soon be in POSIX */
    {ARG_TEST,       "writable",               parse_accesscheck, pred_writable}, /* GNU, 4.3.0+ */
@@ -78,28 +86,25 @@ index 2ea3126..8238671 100644
    PARSE_TEST       ("xtype",                 xtype),	     /* GNU */
  #ifdef UNIMPLEMENTED_UNIX
    /* It's pretty ugly for find to know about archive formats.
-@@ -2795,6 +2797,16 @@ parse_xdev (const struct parser_table* entry, char **argv, int *arg_ptr)
+@@ -2795,6 +2797,13 @@ parse_xdev (const struct parser_table* entry, char **argv, int *arg_ptr)
  }
  
- static boolean
+ static bool
 +parse_xautofs (const struct parser_table* entry, char **argv, int *arg_ptr)
 +{
-+  (void) argv;
-+  (void) arg_ptr;
-+  (void) entry;
 +  options.bypass_autofs = true;
-+  return true;
++  return parse_noop (entry, argv, arg_ptr);
 +}
 +
-+static boolean
++static bool
  parse_ignore_race (const struct parser_table* entry, char **argv, int *arg_ptr)
  {
    options.ignore_readdir_race = true;
 diff --git a/find/util.c b/find/util.c
-index 11e8eed..3761a61 100644
+index 8577396..4d45f84 100644
 --- a/find/util.c
 +++ b/find/util.c
-@@ -999,6 +999,7 @@ set_option_defaults (struct options *p)
+@@ -1006,6 +1006,7 @@ set_option_defaults (struct options *p)
  
    p->full_days = false;
    p->stay_on_filesystem = false;

findutils-4.5.7-warnings.patch:
 find/pred.c   |    2 +-
 xargs/xargs.c |    5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

Index: findutils-4.5.7-warnings.patch
===================================================================
RCS file: /cvs/extras/rpms/findutils/devel/findutils-4.5.7-warnings.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- findutils-4.5.7-warnings.patch	3 Apr 2010 15:50:55 -0000	1.1
+++ findutils-4.5.7-warnings.patch	5 May 2010 11:38:25 -0000	1.2
@@ -3,10 +3,10 @@
  2 files changed, 4 insertions(+), 3 deletions(-)
 
 diff --git a/find/pred.c b/find/pred.c
-index 7df37b1..cb61ed2 100644
+index e310eea..140dd5c 100644
 --- a/find/pred.c
 +++ b/find/pred.c
-@@ -2045,7 +2045,7 @@ launch (struct buildcmd_control *ctl, void *usercontext, int argc, char **argv)
+@@ -2111,7 +2111,7 @@ launch (struct buildcmd_control *ctl, void *usercontext, int argc, char **argv)
  	    }
  	}
  
@@ -16,10 +16,10 @@ index 7df37b1..cb61ed2 100644
        else
  	execvp (argv[0], argv);
 diff --git a/xargs/xargs.c b/xargs/xargs.c
-index 4954256..bf48af5 100644
+index c53b5a9..a0d90a5 100644
 --- a/xargs/xargs.c
 +++ b/xargs/xargs.c
-@@ -1117,7 +1117,7 @@ xargs_do_exec (struct buildcmd_control *ctl, void *usercontext, int argc, char *
+@@ -1105,7 +1105,7 @@ xargs_do_exec (struct buildcmd_control *ctl, void *usercontext, int argc, char *
  
  	    prep_child_for_exec ();
  
@@ -28,7 +28,7 @@ index 4954256..bf48af5 100644
  	      errno = E2BIG;
  	    else
  	      execvp (argv[0], argv);
-@@ -1135,7 +1135,8 @@ xargs_do_exec (struct buildcmd_control *ctl, void *usercontext, int argc, char *
+@@ -1123,7 +1123,8 @@ xargs_do_exec (struct buildcmd_control *ctl, void *usercontext, int argc, char *
  		 * utility if we run it, for POSIX compliance on the
  		 * handling of exit values.
  		 */


Index: findutils.spec
===================================================================
RCS file: /cvs/extras/rpms/findutils/devel/findutils.spec,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -p -r1.74 -r1.75
--- findutils.spec	5 Apr 2010 23:53:06 -0000	1.74
+++ findutils.spec	5 May 2010 11:38:25 -0000	1.75
@@ -1,7 +1,7 @@
 Summary: The GNU versions of find utilities (find and xargs)
 Name: findutils
-Version: 4.5.7
-Release: 4%{?dist}
+Version: 4.5.9
+Release: 1%{?dist}
 Epoch: 1
 License: GPLv3+
 Group: Applications/File
@@ -23,12 +23,6 @@ Patch3: findutils-4.4.2-xautofs.patch
 # eliminate compile-time warnings
 Patch4: findutils-4.5.7-warnings.patch
 
-# upstream commit a44cece
-Patch5: findutils-4.5.7-fdleak.patch
-
-# rhbz #579476 (upstream bug #27213)
-Patch6: findutils-4.5.7-bz579476.patch
-
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -55,8 +49,6 @@ useful for finding things on your system
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
-%patch5 -p1
-%patch6 -p1
 
 # needed because of findutils-4.4.0-no-locate.patch
 aclocal -I gnulib/m4 -I m4
@@ -87,15 +79,14 @@ ln -sf ../../bin/find $RPM_BUILD_ROOT/us
 
 %post
 if [ -f %{_infodir}/find.info.gz ]; then
-    /sbin/install-info %{_infodir}/find.info.gz %{_infodir}/dir || :
+  /sbin/install-info %{_infodir}/find.info.gz %{_infodir}/dir || :
 fi
 
 %preun
 if [ $1 = 0 ]; then
-    if [ -f %{_infodir}/find.info.gz ]; then
-        /sbin/install-info --delete %{_infodir}/find.info.gz %{_infodir}/dir \
-            || :
-    fi
+  if [ -f %{_infodir}/find.info.gz ]; then
+    /sbin/install-info --delete %{_infodir}/find.info.gz %{_infodir}/dir || :
+  fi
 fi
 
 %clean
@@ -114,6 +105,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_infodir}/find-maint.info.gz
 
 %changelog
+* Wed May 05 2010 Kamil Dudka <kdudka at redhat.com> - 1:4.5.9-1
+- new upstream release, dropped applied patches
+
 * Tue Apr 06 2010 Kamil Dudka <kdudka at redhat.com> - 1:4.5.7-4
 - avoid assertion failure due to access permissions (#579476)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/findutils/devel/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- sources	3 Apr 2010 15:50:55 -0000	1.19
+++ sources	5 May 2010 11:38:25 -0000	1.20
@@ -1 +1 @@
-abe3035556f2b95a83cd4a99d1614e37  findutils-4.5.7.tar.gz
+f0276639a824f57e78916d3c207ee618  findutils-4.5.9.tar.gz


--- findutils-4.5.7-bz579476.patch DELETED ---


--- findutils-4.5.7-fdleak.patch DELETED ---


--- findutils-4.5.7.tar.gz.sig DELETED ---