rpms/findutils/F-12 findutils-4.4.2-selinux.patch, 1.1, 1.2 findutils-4.4.2-xautofs.patch, 1.2, 1.3 findutils-4.5.8-0002-7dc7006.patch, 1.2, 1.3 findutils.spec, 1.69, 1.70
Kamil Dudka
kdudka at fedoraproject.org
Mon May 10 15:48:45 UTC 2010
Author: kdudka
Update of /cvs/extras/rpms/findutils/F-12
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv17238
Modified Files:
findutils-4.4.2-selinux.patch findutils-4.4.2-xautofs.patch
findutils-4.5.8-0002-7dc7006.patch findutils.spec
Log Message:
- mention -xautofs in the output of --help (#590166)
findutils-4.4.2-selinux.patch:
NEWS | 6 ++
doc/find.texi | 18 +++++++
find/Makefile.am | 2
find/defs.h | 6 ++
find/find.1 | 4 +
find/parser.c | 128 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-
find/pred.c | 47 ++++++++++++++++++++
find/tree.c | 2
8 files changed, 209 insertions(+), 4 deletions(-)
Index: findutils-4.4.2-selinux.patch
===================================================================
RCS file: /cvs/extras/rpms/findutils/F-12/findutils-4.4.2-selinux.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- findutils-4.4.2-selinux.patch 26 Nov 2009 18:20:59 -0000 1.1
+++ findutils-4.4.2-selinux.patch 10 May 2010 15:48:44 -0000 1.2
@@ -1,3 +1,13 @@
+ NEWS | 6 +++
+ doc/find.texi | 18 +++++++-
+ find/Makefile.am | 2 +-
+ find/defs.h | 6 +++
+ find/find.1 | 4 ++
+ find/parser.c | 128 +++++++++++++++++++++++++++++++++++++++++++++++++++++-
+ find/pred.c | 47 ++++++++++++++++++++
+ find/tree.c | 2 +
+ 8 files changed, 209 insertions(+), 4 deletions(-)
+
diff --git a/NEWS b/NEWS
index d00862f..6b8b725 100644
--- a/NEWS
@@ -138,7 +148,7 @@ index f9c61a3..27ad1da 100644
A `%' character followed by any other character is discarded, but the
other character is printed (don't rely on this, as further format
diff --git a/find/parser.c b/find/parser.c
-index 036ddb8..6b09eee 100644
+index 411fd96..3f237eb 100644
--- a/find/parser.c
+++ b/find/parser.c
@@ -53,6 +53,8 @@
@@ -331,7 +341,7 @@ index 036ddb8..6b09eee 100644
parse_xdev (const struct parser_table* entry, char **argv, int *arg_ptr)
{
options.stay_on_filesystem = true;
-@@ -2815,7 +2934,7 @@ insert_fprintf (struct format_val *vec,
+@@ -2812,7 +2931,7 @@ insert_fprintf (struct format_val *vec,
if (*scan2 == '.')
for (scan2++; ISDIGIT (*scan2); scan2++)
/* Do nothing. */ ;
@@ -340,7 +350,7 @@ index 036ddb8..6b09eee 100644
{
segmentp = make_segment (segmentp, format, scan2 - format,
KIND_FORMAT, *scan2, 0,
-@@ -2945,6 +3064,11 @@ make_segment (struct segment **segment,
+@@ -2942,6 +3061,11 @@ make_segment (struct segment **segment,
*fmt++ = 's';
break;
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 | 11 ++++++++++-
find/util.c | 1 +
6 files changed, 27 insertions(+), 1 deletion(-)
Index: findutils-4.4.2-xautofs.patch
===================================================================
RCS file: /cvs/extras/rpms/findutils/F-12/findutils-4.4.2-xautofs.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- findutils-4.4.2-xautofs.patch 26 Nov 2009 18:20:59 -0000 1.2
+++ findutils-4.4.2-xautofs.patch 10 May 2010 15:48:44 -0000 1.3
@@ -1,3 +1,11 @@
+ doc/find.texi | 4 ++++
+ find/defs.h | 3 +++
+ find/find.1 | 3 +++
+ find/ftsfind.c | 6 ++++++
+ find/parser.c | 11 ++++++++++-
+ find/util.c | 1 +
+ 6 files changed, 27 insertions(+), 1 deletions(-)
+
diff --git a/doc/find.texi b/doc/find.texi
index 2e5958d..8944096 100644
--- a/doc/find.texi
@@ -59,7 +67,7 @@ index b59d896..838b81f 100644
{
/* this is the preorder visit, but user said -depth */
diff --git a/find/parser.c b/find/parser.c
-index 534b670..036ddb8 100644
+index 534b670..411fd96 100644
--- a/find/parser.c
+++ b/find/parser.c
@@ -150,6 +150,7 @@ static boolean parse_user PARAMS((const struct parser_table*, char *arg
@@ -78,17 +86,23 @@ index 534b670..036ddb8 100644
PARSE_TEST ("xtype", xtype), /* GNU */
#ifdef UNIMPLEMENTED_UNIX
/* It's pretty ugly for find to know about archive formats.
-@@ -2560,6 +2562,16 @@ parse_xdev (const struct parser_table* entry, char **argv, int *arg_ptr)
+@@ -1117,7 +1119,7 @@ operators (decreasing precedence; -and is implicit where no others are given):\n
+ positional options (always true): -daystart -follow -regextype\n\n\
+ normal options (always true, specified before other expressions):\n\
+ -depth --help -maxdepth LEVELS -mindepth LEVELS -mount -noleaf\n\
+- --version -xdev -ignore_readdir_race -noignore_readdir_race\n"));
++ --version -xautofs -xdev -ignore_readdir_race -noignore_readdir_race\n"));
+ puts (_("\
+ tests (N can be +N or -N or N): -amin N -anewer FILE -atime N -cmin N\n\
+ -cnewer FILE -ctime N -empty -false -fstype TYPE -gid N -group NAME\n\
+@@ -2560,6 +2562,13 @@ parse_xdev (const struct parser_table* entry, char **argv, int *arg_ptr)
}
static boolean
+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
findutils-4.5.8-0002-7dc7006.patch:
ChangeLog | 85 +++++++++++++++++++++++++++++++++++++++++++++++
find/defs.h | 14 +++----
find/find.c | 69 +++++---------------------------------
find/finddata.c | 12 +-----
find/ftsfind.c | 49 +--------------------------
find/parser.c | 35 ++++++-------------
find/pred.c | 92 +++++++++++++++++++++++++++++++++------------------
find/util.c | 89 +++++++++++++++++++++++++++++++++++++++----------
import-gnulib.config | 1
lib/dircallback.c | 36 +++++++++++++++++++
lib/dircallback.h | 5 ++
lib/listfile.c | 2 -
12 files changed, 293 insertions(+), 196 deletions(-)
Index: findutils-4.5.8-0002-7dc7006.patch
===================================================================
RCS file: /cvs/extras/rpms/findutils/F-12/findutils-4.5.8-0002-7dc7006.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- findutils-4.5.8-0002-7dc7006.patch 6 May 2010 20:46:33 -0000 1.2
+++ findutils-4.5.8-0002-7dc7006.patch 10 May 2010 15:48:44 -0000 1.3
@@ -403,7 +403,7 @@ index 838b81f..9945abd 100644
/* If "-exec ... {} +" has been used, there may be some
diff --git a/find/parser.c b/find/parser.c
-index 6b09eee..612cf71 100644
+index 3f237eb..b96d317 100644
--- a/find/parser.c
+++ b/find/parser.c
@@ -181,7 +181,6 @@ static struct segment **make_segment PARAMS((struct segment **segment,
@@ -446,7 +446,7 @@ index 6b09eee..612cf71 100644
}
boolean
-@@ -3161,11 +3160,10 @@ check_path_safety(const char *action, char **argv)
+@@ -3158,11 +3157,10 @@ check_path_safety(const char *action, char **argv)
/* handles both exec and ok predicate */
static boolean
@@ -462,7 +462,7 @@ index 6b09eee..612cf71 100644
{
int start, end; /* Indexes in ARGV of start & end of cmd. */
int i; /* Index into cmd args */
-@@ -3186,6 +3184,7 @@ new_insert_exec_ok (const char *action,
+@@ -3183,6 +3181,7 @@ new_insert_exec_ok (const char *action,
our_pred->need_type = our_pred->need_stat = false;
execp = &our_pred->args.exec_vec;
@@ -470,7 +470,7 @@ index 6b09eee..612cf71 100644
if ((func != pred_okdir) && (func != pred_ok))
{
-@@ -3205,13 +3204,14 @@ new_insert_exec_ok (const char *action,
+@@ -3202,13 +3201,14 @@ new_insert_exec_ok (const char *action,
if ((func == pred_execdir) || (func == pred_okdir))
{
@@ -487,7 +487,7 @@ index 6b09eee..612cf71 100644
}
our_pred->args.exec_vec.multiple = 0;
-@@ -3364,17 +3364,6 @@ new_insert_exec_ok (const char *action,
+@@ -3361,17 +3361,6 @@ new_insert_exec_ok (const char *action,
Index: findutils.spec
===================================================================
RCS file: /cvs/extras/rpms/findutils/F-12/findutils.spec,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -p -r1.69 -r1.70
--- findutils.spec 6 May 2010 15:09:17 -0000 1.69
+++ findutils.spec 10 May 2010 15:48:44 -0000 1.70
@@ -118,8 +118,9 @@ rm -rf $RPM_BUILD_ROOT
%{_infodir}/find-maint.info.gz
%changelog
-* Thu May 06 2010 Kamil Dudka <kdudka at redhat.com> - 1:4.4.2-7
+* Mon May 10 2010 Kamil Dudka <kdudka at redhat.com> - 1:4.4.2-7
- backport of patches for upstream bugs #19593 and #27563 (rhbz #493143)
+- mention -xautofs in the output of --help (#590166)
* Thu Nov 26 2009 Kamil Dudka <kdudka at redhat.com> - 1:4.4.2-6
- update SELinux patch to the latest upstream (gnulib based) version
More information about the scm-commits
mailing list