rpms/findutils/F-13 findutils-4.4.2-selinux.patch, 1.2, 1.3 findutils-4.5.8-0002-7dc7006.patch, 1.3, 1.4
Kamil Dudka
kdudka at fedoraproject.org
Mon May 10 16:16:43 UTC 2010
Author: kdudka
Update of /cvs/extras/rpms/findutils/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv20204
Modified Files:
findutils-4.4.2-selinux.patch
findutils-4.5.8-0002-7dc7006.patch
Log Message:
eliminate the offset in some patches
findutils-4.4.2-selinux.patch:
NEWS | 6 ++
doc/find.texi | 17 +++++++
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(+), 3 deletions(-)
Index: findutils-4.4.2-selinux.patch
===================================================================
RCS file: /cvs/extras/rpms/findutils/F-13/findutils-4.4.2-selinux.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- findutils-4.4.2-selinux.patch 12 Feb 2010 10:57:54 -0000 1.2
+++ findutils-4.4.2-selinux.patch 10 May 2010 16:16:43 -0000 1.3
@@ -1,3 +1,13 @@
+ NEWS | 6 +++
+ doc/find.texi | 17 +++++++
+ 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(+), 3 deletions(-)
+
diff --git a/NEWS b/NEWS
index d00862f..6b8b725 100644
--- a/NEWS
@@ -130,7 +140,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 @@
@@ -323,7 +333,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. */ ;
@@ -332,7 +342,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.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-13/findutils-4.5.8-0002-7dc7006.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- findutils-4.5.8-0002-7dc7006.patch 6 May 2010 20:45:58 -0000 1.3
+++ findutils-4.5.8-0002-7dc7006.patch 10 May 2010 16:16:43 -0000 1.4
@@ -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,
More information about the scm-commits
mailing list