From: Wayne Davison <wayned@samba.org>
Date: Sat, 9 Oct 2004 04:39:15 +0000 (+0000)
Subject: Fixed a failing hunk.
X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/commitdiff_plain/35a9a417e5fcf2a6c61ff32bf5c9b7faeff48155

Fixed a failing hunk.
---

diff --git a/acls.diff b/acls.diff
index 1b39ce6..fee9707 100644
--- a/acls.diff
+++ b/acls.diff
@@ -11,7 +11,7 @@ from a disk that doesn't support ACLs.  This should be changed to silently
 notice that no ACLs are available to copy.  Of course, trying to write out
 ACLs to a non-ACL-supporting disk should complain.
 
---- orig/Makefile.in	2004-08-13 07:18:58
+--- orig/Makefile.in	2004-10-08 20:16:26
 +++ Makefile.in	2004-07-03 20:11:58
 @@ -25,7 +25,7 @@ VERSION=@VERSION@
  .SUFFIXES:
@@ -1178,8 +1178,8 @@ ACLs to a non-ACL-supporting disk should complain.
 +}
 +
 +#endif /* SUPPORT_ACLS */
---- orig/backup.c	2004-09-20 19:50:13
-+++ backup.c	2004-09-07 21:45:57
+--- orig/backup.c	2004-10-06 00:12:15
++++ backup.c	2004-10-06 00:13:09
 @@ -119,6 +119,7 @@ static int make_bak_dir(char *fullpath)
  			} else {
  				do_lchown(fullpath, st.st_uid, st.st_gid);
@@ -1194,10 +1194,10 @@ ACLs to a non-ACL-supporting disk should complain.
  
 +	PUSH_KEEP_BACKUP_ACL(file, fname, buf);
 +
- #ifdef HAVE_MKNOD
  	/* Check to see if this is a device file, or link */
  	if (IS_DEVICE(file->mode)) {
-@@ -251,6 +254,7 @@ static int keep_backup(char *fname)
+ 		if (am_root && preserve_devices) {
+@@ -249,6 +252,7 @@ static int keep_backup(char *fname)
  		}
  	}
  	set_perms(buf, file, NULL, 0);
@@ -1205,9 +1205,9 @@ ACLs to a non-ACL-supporting disk should complain.
  	free(file);
  
  	if (verbose > 1)
---- orig/configure.in	2004-09-23 17:42:07
+--- orig/configure.in	2004-10-06 00:12:16
 +++ configure.in	2004-08-19 19:53:27
-@@ -434,6 +434,11 @@ if test x"$ac_cv_func_strcasecmp" = x"no
+@@ -443,6 +443,11 @@ if test x"$ac_cv_func_strcasecmp" = x"no
      AC_CHECK_LIB(resolv, strcasecmp)
  fi
  
@@ -1219,7 +1219,7 @@ ACLs to a non-ACL-supporting disk should complain.
  dnl At the moment we don't test for a broken memcmp(), because all we
  dnl need to do is test for equality, not comparison, and it seems that
  dnl every platform has a memcmp that can do at least that.
-@@ -656,6 +661,77 @@ AC_SUBST(OBJ_RESTORE)
+@@ -693,6 +698,77 @@ AC_SUBST(OBJ_RESTORE)
  AC_SUBST(CC_SHOBJ_FLAG)
  AC_SUBST(BUILD_POPT)
  
@@ -1337,7 +1337,7 @@ ACLs to a non-ACL-supporting disk should complain.
  	if (f != -1) {
  		/* Now send the uid/gid list. This was introduced in
  		 * protocol version 15 */
---- orig/generator.c	2004-09-20 19:50:13
+--- orig/generator.c	2004-10-06 00:12:16
 +++ generator.c	2004-07-03 20:11:58
 @@ -338,6 +338,10 @@ static void recv_generator(char *fname, 
  		if (set_perms(fname, file, statret ? NULL : &st, 0)
@@ -1361,7 +1361,7 @@ ACLs to a non-ACL-supporting disk should complain.
    next;
  }
  
---- orig/options.c	2004-09-23 17:42:07
+--- orig/options.c	2004-10-08 20:16:26
 +++ options.c	2004-08-19 17:38:57
 @@ -43,6 +43,7 @@ int keep_dirlinks = 0;
  int copy_links = 0;
@@ -1469,9 +1469,9 @@ ACLs to a non-ACL-supporting disk should complain.
  	if (verbose > 1 && flags & PERMS_REPORT) {
  		if (updated)
  			rprintf(FINFO,"%s\n",fname);
---- orig/rsync.h	2004-09-22 08:47:31
+--- orig/rsync.h	2004-10-09 03:21:56
 +++ rsync.h	2004-07-03 20:11:58
-@@ -542,6 +542,40 @@ static inline int flist_up(struct file_l
+@@ -545,6 +545,40 @@ static inline int flist_up(struct file_l
  #include "lib/permstring.h"
  #include "lib/addrinfo.h"
  
@@ -1512,7 +1512,7 @@ ACLs to a non-ACL-supporting disk should complain.
  #include "proto.h"
  
  /* We have replacement versions of these if they're missing. */
---- orig/rsync.yo	2004-09-24 16:42:30
+--- orig/rsync.yo	2004-10-06 00:12:16
 +++ rsync.yo	2004-07-03 20:11:58
 @@ -326,6 +326,7 @@ verb(
       --safe-links            ignore "unsafe" symlinks
diff --git a/tru64.diff b/tru64.diff
index 617587a..851dea8 100644
--- a/tru64.diff
+++ b/tru64.diff
@@ -23,12 +23,12 @@ This is an adapted version of the original by Zoong Pham.
  #if defined(__KAME__) && defined(INET6)
  # define FAITH
  #endif
---- orig/syscall.c	2004-09-23 05:46:46
-+++ syscall.c	2004-09-23 18:11:06
+--- orig/syscall.c	2004-10-06 00:12:16
++++ syscall.c	2004-10-06 00:17:22
 @@ -27,6 +27,7 @@
  #include "rsync.h"
  
- #if HAVE_SYS_UN_H
+ #if !MKNOD_CREATES_SOCKETS && HAVE_SYS_UN_H
 +#define _SOCKADDR_LEN
  #include <sys/un.h>
  #endif