components/rsync/patches/15730984.patch
author julian.yuen@oracle.com <julian.yuen@oracle.com>
Mon, 16 May 2016 17:05:06 -0700
changeset 5995 a107a73db207
parent 1817 ff42a83716c4
permissions -rw-r--r--
23210083 Upgrade rsync to 3.1.2

Reduce references to source pathnames down to the respective basenames so
that builds are reproducible between workspaces.

--- rsync-3.1.0/main.c.orig	Sat Jan 19 11:05:53 2013
+++ rsync-3.1.0/main.c	Mon Mar 17 14:57:32 2014
@@ -26,6 +26,7 @@
 #if defined CONFIG_LOCALE && defined HAVE_LOCALE_H
 #include <locale.h>
 #endif
+#include <libgen.h>
 
 extern int dry_run;
 extern int list_only;
@@ -1215,7 +1216,7 @@
 	for (i = 0; argv[i]; i++) {
 		if (!(argv[i] = strdup(argv[i]))) {
 			rprintf (FERROR, "out of memory at %s(%d)\n",
-				 __FILE__, __LINE__);
+				 basename(__FILE__), __LINE__);
 			return RERR_MALLOC;
 		}
 	}
--- rsync-3.1.0/cleanup.c.orig	Sat Sep 28 10:40:27 2013
+++ rsync-3.1.0/cleanup.c	Mon Mar 17 14:57:58 2014
@@ -21,6 +21,7 @@
  */
 
 #include "rsync.h"
+#include <libgen.h>
 
 extern int am_server;
 extern int am_daemon;
@@ -134,7 +135,7 @@
 		if (DEBUG_GTE(EXIT, 2)) {
 			rprintf(FINFO,
 				"[%s] _exit_cleanup(code=%d, file=%s, line=%d): entered\n",
-				who_am_i(), code, file, line);
+				who_am_i(), code, basename((char *)file), line);
 		}
 
 		/* FALLTHROUGH */

--- Originals/cleanup.c	2016-05-09 14:57:04.922251814 -0700
+++ rsync-3.1.2/cleanup.c	2016-05-09 14:58:25.902915968 -0700
@@ -235,7 +235,7 @@
 			rprintf(FINFO,
 				"[%s] _exit_cleanup(code=%d, file=%s, line=%d): "
 				"about to call exit(%d)%s\n",
-				who_am_i(), first_code, exit_file, exit_line, exit_code,
+				who_am_i(), first_code, basename((char *)exit_file), exit_line, exit_code,
 				dry_run ? " (DRY RUN)" : "");
 		}

		/* FALLTHROUGH */ 
--- rsync-3.1.0/t_stub.c.orig	Tue Jun 11 18:06:53 2013
+++ rsync-3.1.0/t_stub.c	Mon Mar 17 14:58:24 2014
@@ -20,6 +20,7 @@
  */
 
 #include "rsync.h"
+#include <libgen.h>
 
 int modify_window = 0;
 int preallocate_files = 0;
@@ -56,7 +57,7 @@
  void _exit_cleanup(int code, const char *file, int line)
 {
 	fprintf(stderr, "exit(%d): %s(%d)\n",
-		code, file, line);
+		code, basename((char *)file), line);
 	exit(code);
 }
 
--- rsync-3.1.0/log.c.orig	Tue Jun 11 13:36:44 2013
+++ rsync-3.1.0/log.c	Mon Mar 17 14:58:51 2014
@@ -22,6 +22,7 @@
 #include "rsync.h"
 #include "itypes.h"
 #include "inums.h"
+#include <libgen.h>
 
 extern int dry_run;
 extern int am_daemon;
@@ -887,10 +888,10 @@
 		/* VANISHED is not an error, only a warning */
 		if (code == RERR_VANISHED) {
 			rprintf(FWARNING, "rsync warning: %s (code %d) at %s(%d) [%s=%s]\n",
-				name, code, file, line, who_am_i(), RSYNC_VERSION);
+				name, code, basename((char *)file), line, who_am_i(), RSYNC_VERSION);
 		} else {
 			rprintf(FERROR, "rsync error: %s (code %d) at %s(%d) [%s=%s]\n",
-				name, code, file, line, who_am_i(), RSYNC_VERSION);
+				name, code, basename((char *)file), line, who_am_i(), RSYNC_VERSION);
 		}
 	}
 }