Merge branch 'patches' into 'master'

Adjust patches to upstream

See merge request mer-core/busybox!26

rpm/0001-Copy-extended-attributes-if-p-flag-is-provided-to-cp.patch

@@ -32,7 +32,7 @@ diff --git a/include/libbb.h b/include/libbb.h
 index d4ba031df..3c257c000 100644
 --- a/include/libbb.h
 +++ b/include/libbb.h
-@@ -426,6 +426,9 @@ extern int remove_file(const char *path, int flags) FAST_FUNC;
+@@ -429,6 +429,9 @@ extern int remove_file(const char *path, int flags) FAST_FUNC;
   * This makes "cp /dev/null file" and "install /dev/null file" (!!!)
   * work coreutils-compatibly. */
  extern int copy_file(const char *source, const char *dest, int flags) FAST_FUNC;
@@ -70,15 +70,7 @@ diff --git a/libbb/copy_file.c b/libbb/copy_file.c
 index 1b8befd65..279e4a6e4 100644
 --- a/libbb/copy_file.c
 +++ b/libbb/copy_file.c
-@@ -340,6 +340,7 @@ int FAST_FUNC copy_file(const char *source, const char *dest, int flags)
- 			}
- 		}
- #endif
-+
- 		if (bb_copyfd_eof(src_fd, dst_fd) == -1)
- 			retval = -1;
- 		/* Careful with writing... */
-@@ -414,6 +415,13 @@ int FAST_FUNC copy_file(const char *source, const char *dest, int flags)
+@@ -434,6 +435,13 @@ int FAST_FUNC copy_file(const char *source, const char *dest, int flags)
  			source_stat.st_mode &= ~(S_ISUID | S_ISGID);
  			bb_perror_msg("can't preserve %s of '%s'", "ownership", dest);
  		}

rpm/0003-applets-watch-in-usr-bin.patch

@@ -9,12 +9,11 @@ index 059eb1dda..3ea55fd81 100644
 --- a/procps/watch.c
 +++ b/procps/watch.c
 @@ -14,7 +14,7 @@
- //config:      watch is used to execute a program periodically, showing
- //config:      output to the screen.
+ //config:	watch is used to execute a program periodically, showing
+ //config:	output to the screen.
 
 -//applet:IF_WATCH(APPLET(watch, BB_DIR_BIN, BB_SUID_DROP))
 +//applet:IF_WATCH(APPLET(watch, BB_DIR_USR_BIN, BB_SUID_DROP))
 
  //kbuild:lib-$(CONFIG_WATCH) += watch.o
 
-