components/rsync/patches/15730984.patch
author Rich Burridge <rich.burridge@oracle.com>
Thu, 06 Oct 2016 13:05:51 -0700
changeset 7063 c478967a99d2
parent 5995 a107a73db207
permissions -rw-r--r--
23132067 Upgrade pigz to 2.3.3
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
1817
ff42a83716c4 18414592 update rsync to 3.1.0
Danek Duvall <danek.duvall@oracle.com>
parents: 1406
diff changeset
     1
Reduce references to source pathnames down to the respective basenames so
ff42a83716c4 18414592 update rsync to 3.1.0
Danek Duvall <danek.duvall@oracle.com>
parents: 1406
diff changeset
     2
that builds are reproducible between workspaces.
ff42a83716c4 18414592 update rsync to 3.1.0
Danek Duvall <danek.duvall@oracle.com>
parents: 1406
diff changeset
     3
ff42a83716c4 18414592 update rsync to 3.1.0
Danek Duvall <danek.duvall@oracle.com>
parents: 1406
diff changeset
     4
--- rsync-3.1.0/main.c.orig	Sat Jan 19 11:05:53 2013
ff42a83716c4 18414592 update rsync to 3.1.0
Danek Duvall <danek.duvall@oracle.com>
parents: 1406
diff changeset
     5
+++ rsync-3.1.0/main.c	Mon Mar 17 14:57:32 2014
1406
bad4899167db 16973738 Deliver 64-bit binaries for the rsync command
klauw <ken.lauw@oracle.com>
parents: 1351
diff changeset
     6
@@ -26,6 +26,7 @@
bad4899167db 16973738 Deliver 64-bit binaries for the rsync command
klauw <ken.lauw@oracle.com>
parents: 1351
diff changeset
     7
 #if defined CONFIG_LOCALE && defined HAVE_LOCALE_H
bad4899167db 16973738 Deliver 64-bit binaries for the rsync command
klauw <ken.lauw@oracle.com>
parents: 1351
diff changeset
     8
 #include <locale.h>
bad4899167db 16973738 Deliver 64-bit binaries for the rsync command
klauw <ken.lauw@oracle.com>
parents: 1351
diff changeset
     9
 #endif
bad4899167db 16973738 Deliver 64-bit binaries for the rsync command
klauw <ken.lauw@oracle.com>
parents: 1351
diff changeset
    10
+#include <libgen.h>
bad4899167db 16973738 Deliver 64-bit binaries for the rsync command
klauw <ken.lauw@oracle.com>
parents: 1351
diff changeset
    11
 
bad4899167db 16973738 Deliver 64-bit binaries for the rsync command
klauw <ken.lauw@oracle.com>
parents: 1351
diff changeset
    12
 extern int dry_run;
1817
ff42a83716c4 18414592 update rsync to 3.1.0
Danek Duvall <danek.duvall@oracle.com>
parents: 1406
diff changeset
    13
 extern int list_only;
ff42a83716c4 18414592 update rsync to 3.1.0
Danek Duvall <danek.duvall@oracle.com>
parents: 1406
diff changeset
    14
@@ -1215,7 +1216,7 @@
1351
5c589218fa09 15752593 SUNBT7107925 bump rsync to 3.0.9
klauw <ken.lauw@oracle.com>
parents:
diff changeset
    15
 	for (i = 0; argv[i]; i++) {
5c589218fa09 15752593 SUNBT7107925 bump rsync to 3.0.9
klauw <ken.lauw@oracle.com>
parents:
diff changeset
    16
 		if (!(argv[i] = strdup(argv[i]))) {
5c589218fa09 15752593 SUNBT7107925 bump rsync to 3.0.9
klauw <ken.lauw@oracle.com>
parents:
diff changeset
    17
 			rprintf (FERROR, "out of memory at %s(%d)\n",
5c589218fa09 15752593 SUNBT7107925 bump rsync to 3.0.9
klauw <ken.lauw@oracle.com>
parents:
diff changeset
    18
-				 __FILE__, __LINE__);
5c589218fa09 15752593 SUNBT7107925 bump rsync to 3.0.9
klauw <ken.lauw@oracle.com>
parents:
diff changeset
    19
+				 basename(__FILE__), __LINE__);
5c589218fa09 15752593 SUNBT7107925 bump rsync to 3.0.9
klauw <ken.lauw@oracle.com>
parents:
diff changeset
    20
 			return RERR_MALLOC;
5c589218fa09 15752593 SUNBT7107925 bump rsync to 3.0.9
klauw <ken.lauw@oracle.com>
parents:
diff changeset
    21
 		}
5c589218fa09 15752593 SUNBT7107925 bump rsync to 3.0.9
klauw <ken.lauw@oracle.com>
parents:
diff changeset
    22
 	}
1817
ff42a83716c4 18414592 update rsync to 3.1.0
Danek Duvall <danek.duvall@oracle.com>
parents: 1406
diff changeset
    23
--- rsync-3.1.0/cleanup.c.orig	Sat Sep 28 10:40:27 2013
ff42a83716c4 18414592 update rsync to 3.1.0
Danek Duvall <danek.duvall@oracle.com>
parents: 1406
diff changeset
    24
+++ rsync-3.1.0/cleanup.c	Mon Mar 17 14:57:58 2014
1406
bad4899167db 16973738 Deliver 64-bit binaries for the rsync command
klauw <ken.lauw@oracle.com>
parents: 1351
diff changeset
    25
@@ -21,6 +21,7 @@
bad4899167db 16973738 Deliver 64-bit binaries for the rsync command
klauw <ken.lauw@oracle.com>
parents: 1351
diff changeset
    26
  */
bad4899167db 16973738 Deliver 64-bit binaries for the rsync command
klauw <ken.lauw@oracle.com>
parents: 1351
diff changeset
    27
 
bad4899167db 16973738 Deliver 64-bit binaries for the rsync command
klauw <ken.lauw@oracle.com>
parents: 1351
diff changeset
    28
 #include "rsync.h"
bad4899167db 16973738 Deliver 64-bit binaries for the rsync command
klauw <ken.lauw@oracle.com>
parents: 1351
diff changeset
    29
+#include <libgen.h>
bad4899167db 16973738 Deliver 64-bit binaries for the rsync command
klauw <ken.lauw@oracle.com>
parents: 1351
diff changeset
    30
 
bad4899167db 16973738 Deliver 64-bit binaries for the rsync command
klauw <ken.lauw@oracle.com>
parents: 1351
diff changeset
    31
 extern int am_server;
bad4899167db 16973738 Deliver 64-bit binaries for the rsync command
klauw <ken.lauw@oracle.com>
parents: 1351
diff changeset
    32
 extern int am_daemon;
1817
ff42a83716c4 18414592 update rsync to 3.1.0
Danek Duvall <danek.duvall@oracle.com>
parents: 1406
diff changeset
    33
@@ -134,7 +135,7 @@
ff42a83716c4 18414592 update rsync to 3.1.0
Danek Duvall <danek.duvall@oracle.com>
parents: 1406
diff changeset
    34
 		if (DEBUG_GTE(EXIT, 2)) {
1351
5c589218fa09 15752593 SUNBT7107925 bump rsync to 3.0.9
klauw <ken.lauw@oracle.com>
parents:
diff changeset
    35
 			rprintf(FINFO,
5c589218fa09 15752593 SUNBT7107925 bump rsync to 3.0.9
klauw <ken.lauw@oracle.com>
parents:
diff changeset
    36
 				"[%s] _exit_cleanup(code=%d, file=%s, line=%d): entered\n",
5c589218fa09 15752593 SUNBT7107925 bump rsync to 3.0.9
klauw <ken.lauw@oracle.com>
parents:
diff changeset
    37
-				who_am_i(), code, file, line);
1406
bad4899167db 16973738 Deliver 64-bit binaries for the rsync command
klauw <ken.lauw@oracle.com>
parents: 1351
diff changeset
    38
+				who_am_i(), code, basename((char *)file), line);
1351
5c589218fa09 15752593 SUNBT7107925 bump rsync to 3.0.9
klauw <ken.lauw@oracle.com>
parents:
diff changeset
    39
 		}
5c589218fa09 15752593 SUNBT7107925 bump rsync to 3.0.9
klauw <ken.lauw@oracle.com>
parents:
diff changeset
    40
 
5c589218fa09 15752593 SUNBT7107925 bump rsync to 3.0.9
klauw <ken.lauw@oracle.com>
parents:
diff changeset
    41
 		/* FALLTHROUGH */
5995
a107a73db207 23210083 Upgrade rsync to 3.1.2
julian.yuen@oracle.com <julian.yuen@oracle.com>
parents: 1817
diff changeset
    42
a107a73db207 23210083 Upgrade rsync to 3.1.2
julian.yuen@oracle.com <julian.yuen@oracle.com>
parents: 1817
diff changeset
    43
--- Originals/cleanup.c	2016-05-09 14:57:04.922251814 -0700
a107a73db207 23210083 Upgrade rsync to 3.1.2
julian.yuen@oracle.com <julian.yuen@oracle.com>
parents: 1817
diff changeset
    44
+++ rsync-3.1.2/cleanup.c	2016-05-09 14:58:25.902915968 -0700
a107a73db207 23210083 Upgrade rsync to 3.1.2
julian.yuen@oracle.com <julian.yuen@oracle.com>
parents: 1817
diff changeset
    45
@@ -235,7 +235,7 @@
1351
5c589218fa09 15752593 SUNBT7107925 bump rsync to 3.0.9
klauw <ken.lauw@oracle.com>
parents:
diff changeset
    46
 			rprintf(FINFO,
5c589218fa09 15752593 SUNBT7107925 bump rsync to 3.0.9
klauw <ken.lauw@oracle.com>
parents:
diff changeset
    47
 				"[%s] _exit_cleanup(code=%d, file=%s, line=%d): "
5995
a107a73db207 23210083 Upgrade rsync to 3.1.2
julian.yuen@oracle.com <julian.yuen@oracle.com>
parents: 1817
diff changeset
    48
 				"about to call exit(%d)%s\n",
a107a73db207 23210083 Upgrade rsync to 3.1.2
julian.yuen@oracle.com <julian.yuen@oracle.com>
parents: 1817
diff changeset
    49
-				who_am_i(), first_code, exit_file, exit_line, exit_code,
a107a73db207 23210083 Upgrade rsync to 3.1.2
julian.yuen@oracle.com <julian.yuen@oracle.com>
parents: 1817
diff changeset
    50
+				who_am_i(), first_code, basename((char *)exit_file), exit_line, exit_code,
a107a73db207 23210083 Upgrade rsync to 3.1.2
julian.yuen@oracle.com <julian.yuen@oracle.com>
parents: 1817
diff changeset
    51
 				dry_run ? " (DRY RUN)" : "");
1351
5c589218fa09 15752593 SUNBT7107925 bump rsync to 3.0.9
klauw <ken.lauw@oracle.com>
parents:
diff changeset
    52
 		}
5995
a107a73db207 23210083 Upgrade rsync to 3.1.2
julian.yuen@oracle.com <julian.yuen@oracle.com>
parents: 1817
diff changeset
    53
a107a73db207 23210083 Upgrade rsync to 3.1.2
julian.yuen@oracle.com <julian.yuen@oracle.com>
parents: 1817
diff changeset
    54
		/* FALLTHROUGH */ 
1817
ff42a83716c4 18414592 update rsync to 3.1.0
Danek Duvall <danek.duvall@oracle.com>
parents: 1406
diff changeset
    55
--- rsync-3.1.0/t_stub.c.orig	Tue Jun 11 18:06:53 2013
ff42a83716c4 18414592 update rsync to 3.1.0
Danek Duvall <danek.duvall@oracle.com>
parents: 1406
diff changeset
    56
+++ rsync-3.1.0/t_stub.c	Mon Mar 17 14:58:24 2014
1406
bad4899167db 16973738 Deliver 64-bit binaries for the rsync command
klauw <ken.lauw@oracle.com>
parents: 1351
diff changeset
    57
@@ -20,6 +20,7 @@
bad4899167db 16973738 Deliver 64-bit binaries for the rsync command
klauw <ken.lauw@oracle.com>
parents: 1351
diff changeset
    58
  */
bad4899167db 16973738 Deliver 64-bit binaries for the rsync command
klauw <ken.lauw@oracle.com>
parents: 1351
diff changeset
    59
 
bad4899167db 16973738 Deliver 64-bit binaries for the rsync command
klauw <ken.lauw@oracle.com>
parents: 1351
diff changeset
    60
 #include "rsync.h"
bad4899167db 16973738 Deliver 64-bit binaries for the rsync command
klauw <ken.lauw@oracle.com>
parents: 1351
diff changeset
    61
+#include <libgen.h>
bad4899167db 16973738 Deliver 64-bit binaries for the rsync command
klauw <ken.lauw@oracle.com>
parents: 1351
diff changeset
    62
 
bad4899167db 16973738 Deliver 64-bit binaries for the rsync command
klauw <ken.lauw@oracle.com>
parents: 1351
diff changeset
    63
 int modify_window = 0;
1817
ff42a83716c4 18414592 update rsync to 3.1.0
Danek Duvall <danek.duvall@oracle.com>
parents: 1406
diff changeset
    64
 int preallocate_files = 0;
ff42a83716c4 18414592 update rsync to 3.1.0
Danek Duvall <danek.duvall@oracle.com>
parents: 1406
diff changeset
    65
@@ -56,7 +57,7 @@
1351
5c589218fa09 15752593 SUNBT7107925 bump rsync to 3.0.9
klauw <ken.lauw@oracle.com>
parents:
diff changeset
    66
  void _exit_cleanup(int code, const char *file, int line)
5c589218fa09 15752593 SUNBT7107925 bump rsync to 3.0.9
klauw <ken.lauw@oracle.com>
parents:
diff changeset
    67
 {
5c589218fa09 15752593 SUNBT7107925 bump rsync to 3.0.9
klauw <ken.lauw@oracle.com>
parents:
diff changeset
    68
 	fprintf(stderr, "exit(%d): %s(%d)\n",
5c589218fa09 15752593 SUNBT7107925 bump rsync to 3.0.9
klauw <ken.lauw@oracle.com>
parents:
diff changeset
    69
-		code, file, line);
1406
bad4899167db 16973738 Deliver 64-bit binaries for the rsync command
klauw <ken.lauw@oracle.com>
parents: 1351
diff changeset
    70
+		code, basename((char *)file), line);
1351
5c589218fa09 15752593 SUNBT7107925 bump rsync to 3.0.9
klauw <ken.lauw@oracle.com>
parents:
diff changeset
    71
 	exit(code);
5c589218fa09 15752593 SUNBT7107925 bump rsync to 3.0.9
klauw <ken.lauw@oracle.com>
parents:
diff changeset
    72
 }
5c589218fa09 15752593 SUNBT7107925 bump rsync to 3.0.9
klauw <ken.lauw@oracle.com>
parents:
diff changeset
    73
 
1817
ff42a83716c4 18414592 update rsync to 3.1.0
Danek Duvall <danek.duvall@oracle.com>
parents: 1406
diff changeset
    74
--- rsync-3.1.0/log.c.orig	Tue Jun 11 13:36:44 2013
ff42a83716c4 18414592 update rsync to 3.1.0
Danek Duvall <danek.duvall@oracle.com>
parents: 1406
diff changeset
    75
+++ rsync-3.1.0/log.c	Mon Mar 17 14:58:51 2014
ff42a83716c4 18414592 update rsync to 3.1.0
Danek Duvall <danek.duvall@oracle.com>
parents: 1406
diff changeset
    76
@@ -22,6 +22,7 @@
1406
bad4899167db 16973738 Deliver 64-bit binaries for the rsync command
klauw <ken.lauw@oracle.com>
parents: 1351
diff changeset
    77
 #include "rsync.h"
1817
ff42a83716c4 18414592 update rsync to 3.1.0
Danek Duvall <danek.duvall@oracle.com>
parents: 1406
diff changeset
    78
 #include "itypes.h"
ff42a83716c4 18414592 update rsync to 3.1.0
Danek Duvall <danek.duvall@oracle.com>
parents: 1406
diff changeset
    79
 #include "inums.h"
1406
bad4899167db 16973738 Deliver 64-bit binaries for the rsync command
klauw <ken.lauw@oracle.com>
parents: 1351
diff changeset
    80
+#include <libgen.h>
bad4899167db 16973738 Deliver 64-bit binaries for the rsync command
klauw <ken.lauw@oracle.com>
parents: 1351
diff changeset
    81
 
bad4899167db 16973738 Deliver 64-bit binaries for the rsync command
klauw <ken.lauw@oracle.com>
parents: 1351
diff changeset
    82
 extern int dry_run;
1817
ff42a83716c4 18414592 update rsync to 3.1.0
Danek Duvall <danek.duvall@oracle.com>
parents: 1406
diff changeset
    83
 extern int am_daemon;
ff42a83716c4 18414592 update rsync to 3.1.0
Danek Duvall <danek.duvall@oracle.com>
parents: 1406
diff changeset
    84
@@ -887,10 +888,10 @@
1351
5c589218fa09 15752593 SUNBT7107925 bump rsync to 3.0.9
klauw <ken.lauw@oracle.com>
parents:
diff changeset
    85
 		/* VANISHED is not an error, only a warning */
5c589218fa09 15752593 SUNBT7107925 bump rsync to 3.0.9
klauw <ken.lauw@oracle.com>
parents:
diff changeset
    86
 		if (code == RERR_VANISHED) {
5c589218fa09 15752593 SUNBT7107925 bump rsync to 3.0.9
klauw <ken.lauw@oracle.com>
parents:
diff changeset
    87
 			rprintf(FWARNING, "rsync warning: %s (code %d) at %s(%d) [%s=%s]\n",
5c589218fa09 15752593 SUNBT7107925 bump rsync to 3.0.9
klauw <ken.lauw@oracle.com>
parents:
diff changeset
    88
-				name, code, file, line, who_am_i(), RSYNC_VERSION);
1406
bad4899167db 16973738 Deliver 64-bit binaries for the rsync command
klauw <ken.lauw@oracle.com>
parents: 1351
diff changeset
    89
+				name, code, basename((char *)file), line, who_am_i(), RSYNC_VERSION);
1351
5c589218fa09 15752593 SUNBT7107925 bump rsync to 3.0.9
klauw <ken.lauw@oracle.com>
parents:
diff changeset
    90
 		} else {
5c589218fa09 15752593 SUNBT7107925 bump rsync to 3.0.9
klauw <ken.lauw@oracle.com>
parents:
diff changeset
    91
 			rprintf(FERROR, "rsync error: %s (code %d) at %s(%d) [%s=%s]\n",
5c589218fa09 15752593 SUNBT7107925 bump rsync to 3.0.9
klauw <ken.lauw@oracle.com>
parents:
diff changeset
    92
-				name, code, file, line, who_am_i(), RSYNC_VERSION);
1406
bad4899167db 16973738 Deliver 64-bit binaries for the rsync command
klauw <ken.lauw@oracle.com>
parents: 1351
diff changeset
    93
+				name, code, basename((char *)file), line, who_am_i(), RSYNC_VERSION);
1351
5c589218fa09 15752593 SUNBT7107925 bump rsync to 3.0.9
klauw <ken.lauw@oracle.com>
parents:
diff changeset
    94
 		}
5c589218fa09 15752593 SUNBT7107925 bump rsync to 3.0.9
klauw <ken.lauw@oracle.com>
parents:
diff changeset
    95
 	}
5c589218fa09 15752593 SUNBT7107925 bump rsync to 3.0.9
klauw <ken.lauw@oracle.com>
parents:
diff changeset
    96
 }