Fixed failing hunks.

diff --git a/acls.diff b/acls.diff
index 112e60435705b32de657591d75c59bdf3cde0a60..e1550d2d26a93b2788db027ce772593322b20a5e 100644 (file)
--- a/acls.diff
+++ b/acls.diff
@@ -11,9 +11,9 @@ 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.
 
 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-11-02 16:47:15
-+++ Makefile.in        2004-10-20 06:32:26
-@@ -25,16 +25,16 @@ VERSION=@VERSION@
+--- orig/Makefile.in   2005-07-07 23:11:07
++++ Makefile.in        2005-07-07 23:11:55
+@@ -25,15 +25,15 @@ VERSION=@VERSION@

  .SUFFIXES:
  .SUFFIXES: .c .o
  
  .SUFFIXES:
  .SUFFIXES: .c .o
  


@@ -22,9 +22,8 @@ ACLs to a non-ACL-supporting disk should complain.
  LIBOBJ=lib/wildmatch.o lib/compat.o lib/snprintf.o lib/mdfour.o \
 -      lib/permstring.o lib/pool_alloc.o @LIBOBJS@
 +      lib/permstring.o lib/pool_alloc.o lib/sysacls.o @LIBOBJS@
  LIBOBJ=lib/wildmatch.o lib/compat.o lib/snprintf.o lib/mdfour.o \
 -      lib/permstring.o lib/pool_alloc.o @LIBOBJS@
 +      lib/permstring.o lib/pool_alloc.o lib/sysacls.o @LIBOBJS@

- ZLIBOBJ=zlib/deflate.o zlib/infblock.o zlib/infcodes.o zlib/inffast.o \
-       zlib/inflate.o zlib/inftrees.o zlib/infutil.o zlib/trees.o \
-       zlib/zutil.o zlib/adler32.o
+ ZLIBOBJ=zlib/deflate.o zlib/inffast.o zlib/inflate.o zlib/inftrees.o \
+       zlib/trees.o zlib/zutil.o zlib/adler32.o zlib/compress.o zlib/crc32.o

  OBJS1=rsync.o generator.o receiver.o cleanup.o sender.o exclude.o util.o \
        main.o checksum.o match.o syscall.o log.o backup.o
  OBJS2=options.o flist.o io.o compat.o hlink.o token.o uidlist.o socket.o \
  OBJS1=rsync.o generator.o receiver.o cleanup.o sender.o exclude.o util.o \
        main.o checksum.o match.o syscall.o log.o backup.o
  OBJS2=options.o flist.o io.o compat.o hlink.o token.o uidlist.o socket.o \


@@ -1193,7 +1192,7 @@ ACLs to a non-ACL-supporting disk should complain.
        free(file);
  
        if (verbose > 1) {
        free(file);
  
        if (verbose > 1) {

---- orig/configure.in  2005-06-10 21:33:28
+--- orig/configure.in  2005-07-07 23:11:08

 +++ configure.in       2004-08-19 19:53:27
 @@ -489,6 +489,11 @@ if test x"$ac_cv_func_strcasecmp" = x"no
      AC_CHECK_LIB(resolv, strcasecmp)
 +++ configure.in       2004-08-19 19:53:27
 @@ -489,6 +489,11 @@ if test x"$ac_cv_func_strcasecmp" = x"no
      AC_CHECK_LIB(resolv, strcasecmp)


@@ -1285,7 +1284,7 @@ ACLs to a non-ACL-supporting disk should complain.
  AC_CONFIG_FILES([Makefile lib/dummy zlib/dummy popt/dummy shconfig])
  AC_OUTPUT
  
  AC_CONFIG_FILES([Makefile lib/dummy zlib/dummy popt/dummy shconfig])
  AC_OUTPUT
  

---- orig/flist.c       2005-05-28 08:24:57
+--- orig/flist.c       2005-07-07 20:35:47

 +++ flist.c    2005-03-16 02:24:11
 @@ -974,6 +974,8 @@ static struct file_struct *send_file_nam
        file = make_file(fname, flist, f == -2 ? SERVER_FILTERS : ALL_FILTERS);
 +++ flist.c    2005-03-16 02:24:11
 @@ -974,6 +974,8 @@ static struct file_struct *send_file_nam
        file = make_file(fname, flist, f == -2 ? SERVER_FILTERS : ALL_FILTERS);


@@ -1325,7 +1324,7 @@ ACLs to a non-ACL-supporting disk should complain.
        if (f >= 0) {
                /* Now send the uid/gid list. This was introduced in
                 * protocol version 15 */
        if (f >= 0) {
                /* Now send the uid/gid list. This was introduced in
                 * protocol version 15 */

---- orig/generator.c   2005-06-10 21:33:28
+--- orig/generator.c   2005-07-07 20:35:47

 +++ generator.c        2005-05-12 23:34:00
 @@ -716,6 +716,10 @@ static void recv_generator(char *fname, 
                if (set_perms(fname, file, statret ? NULL : &st, 0)
 +++ generator.c        2005-05-12 23:34:00
 @@ -716,6 +716,10 @@ static void recv_generator(char *fname, 
                if (set_perms(fname, file, statret ? NULL : &st, 0)


@@ -4780,9 +4779,9 @@ ACLs to a non-ACL-supporting disk should complain.
  #include "proto.h"
  
  /* We have replacement versions of these if they're missing. */
  #include "proto.h"
  
  /* We have replacement versions of these if they're missing. */

---- orig/rsync.yo      2005-06-03 08:32:34
+--- orig/rsync.yo      2005-07-07 23:11:09

 +++ rsync.yo   2004-07-03 20:11:58
 +++ rsync.yo   2004-07-03 20:11:58

-@@ -317,6 +317,7 @@ to the detailed description below for a 
+@@ -306,6 +306,7 @@ to the detailed description below for a 

   -H, --hard-links            preserve hard links
   -K, --keep-dirlinks         treat symlinked dir on receiver as dir
   -p, --perms                 preserve permissions
   -H, --hard-links            preserve hard links
   -K, --keep-dirlinks         treat symlinked dir on receiver as dir
   -p, --perms                 preserve permissions


@@ -4790,7 +4789,7 @@ ACLs to a non-ACL-supporting disk should complain.
   -o, --owner                 preserve owner (root only)
   -g, --group                 preserve group
   -D, --devices               preserve devices (root only)
   -o, --owner                 preserve owner (root only)
   -g, --group                 preserve group
   -D, --devices               preserve devices (root only)

-@@ -629,6 +630,11 @@ based on the source file's permissions, 
+@@ -618,6 +619,11 @@ based on the source file's permissions, 

  umask setting
  (which is the same behavior as other file-copy utilities, such as cp).
  
  umask setting
  (which is the same behavior as other file-copy utilities, such as cp).
  

diff --git a/xattrs.diff b/xattrs.diff
index d0e72e603bc21d12080e4dc8e3c5ff96358b9e5b..18419567c5db9932af5d241b6f8bbd831ffeb069 100644 (file)
--- a/xattrs.diff
+++ b/xattrs.diff
@@ -8,17 +8,16 @@ After applying this patch, run these commands for a successful build:
     make proto
     make
 
     make proto
     make
 

---- orig/Makefile.in   2004-10-20 06:32:26
-+++ Makefile.in        2005-03-03 01:20:46
-@@ -27,14 +27,14 @@ VERSION=@VERSION@
+--- orig/Makefile.in   2005-07-07 23:11:55
++++ Makefile.in        2005-07-07 23:15:20
+@@ -27,13 +27,13 @@ VERSION=@VERSION@

  
  HEADERS=byteorder.h config.h errcode.h proto.h rsync.h smb_acls.h lib/pool_alloc.h
  LIBOBJ=lib/wildmatch.o lib/compat.o lib/snprintf.o lib/mdfour.o \
 -      lib/permstring.o lib/pool_alloc.o lib/sysacls.o @LIBOBJS@
 +      lib/permstring.o lib/pool_alloc.o lib/sysacls.o lib/sysxattr.o @LIBOBJS@
  
  HEADERS=byteorder.h config.h errcode.h proto.h rsync.h smb_acls.h lib/pool_alloc.h
  LIBOBJ=lib/wildmatch.o lib/compat.o lib/snprintf.o lib/mdfour.o \
 -      lib/permstring.o lib/pool_alloc.o lib/sysacls.o @LIBOBJS@
 +      lib/permstring.o lib/pool_alloc.o lib/sysacls.o lib/sysxattr.o @LIBOBJS@

- ZLIBOBJ=zlib/deflate.o zlib/infblock.o zlib/infcodes.o zlib/inffast.o \
-       zlib/inflate.o zlib/inftrees.o zlib/infutil.o zlib/trees.o \
-       zlib/zutil.o zlib/adler32.o
+ ZLIBOBJ=zlib/deflate.o zlib/inffast.o zlib/inflate.o zlib/inftrees.o \
+       zlib/trees.o zlib/zutil.o zlib/adler32.o zlib/compress.o zlib/crc32.o

  OBJS1=rsync.o generator.o receiver.o cleanup.o sender.o exclude.o util.o \
        main.o checksum.o match.o syscall.o log.o backup.o
  OBJS2=options.o flist.o io.o compat.o hlink.o token.o uidlist.o socket.o \
  OBJS1=rsync.o generator.o receiver.o cleanup.o sender.o exclude.o util.o \
        main.o checksum.o match.o syscall.o log.o backup.o
  OBJS2=options.o flist.o io.o compat.o hlink.o token.o uidlist.o socket.o \


@@ -44,8 +43,8 @@ After applying this patch, run these commands for a successful build:
 +      PUSH_KEEP_BACKUP_XATTR(file, fname, buf);
  
        /* Check to see if this is a device file, or link */
 +      PUSH_KEEP_BACKUP_XATTR(file, fname, buf);
  
        /* Check to see if this is a device file, or link */

-       if (IS_DEVICE(file->mode)) {
-@@ -264,6 +266,7 @@ static int keep_backup(char *fname)
+       if (IS_DEVICE(file->mode) && am_root && preserve_devices) {
+@@ -265,6 +267,7 @@ static int keep_backup(char *fname)

        }
        set_perms(buf, file, NULL, 0);
        CLEANUP_KEEP_BACKUP_ACL();
        }
        set_perms(buf, file, NULL, 0);
        CLEANUP_KEEP_BACKUP_ACL();


@@ -55,7 +54,7 @@ After applying this patch, run these commands for a successful build:
        if (verbose > 1) {
 --- orig/configure.in  2004-08-19 19:53:27
 +++ configure.in       2005-05-12 22:57:53
        if (verbose > 1) {
 --- orig/configure.in  2004-08-19 19:53:27
 +++ configure.in       2005-05-12 22:57:53

-@@ -812,6 +812,30 @@ samba_cv_HAVE_ACL_GET_PERM_NP=yes,samba_
+@@ -821,6 +821,30 @@ samba_cv_HAVE_ACL_GET_PERM_NP=yes,samba_

    AC_MSG_RESULT(no)
  )
  
    AC_MSG_RESULT(no)
  )
  


@@ -127,7 +126,7 @@ After applying this patch, run these commands for a successful build:
                /* Now send the uid/gid list. This was introduced in
 --- orig/generator.c   2005-05-12 23:34:00
 +++ generator.c        2005-05-12 23:21:08
                /* Now send the uid/gid list. This was introduced in
 --- orig/generator.c   2005-05-12 23:34:00
 +++ generator.c        2005-05-12 23:21:08

-@@ -719,6 +719,10 @@ static void recv_generator(char *fname, 
+@@ -720,6 +720,10 @@ static void recv_generator(char *fname, 

                if (f_out == -1)
                        SET_ACL(fname, file);
  #endif
                if (f_out == -1)
                        SET_ACL(fname, file);
  #endif


@@ -338,7 +337,7 @@ After applying this patch, run these commands for a successful build:
  /* We have replacement versions of these if they're missing. */
 --- orig/rsync.yo      2004-07-03 20:11:58
 +++ rsync.yo   2005-03-03 01:33:53
  /* We have replacement versions of these if they're missing. */
 --- orig/rsync.yo      2004-07-03 20:11:58
 +++ rsync.yo   2005-03-03 01:33:53

-@@ -318,6 +318,7 @@ to the detailed description below for a 
+@@ -307,6 +307,7 @@ to the detailed description below for a 

   -K, --keep-dirlinks         treat symlinked dir on receiver as dir
   -p, --perms                 preserve permissions
   -A, --acls                  preserve ACLs (implies -p) [local option]
   -K, --keep-dirlinks         treat symlinked dir on receiver as dir
   -p, --perms                 preserve permissions
   -A, --acls                  preserve ACLs (implies -p) [local option]


@@ -346,7 +345,7 @@ After applying this patch, run these commands for a successful build:
   -o, --owner                 preserve owner (root only)
   -g, --group                 preserve group
   -D, --devices               preserve devices (root only)
   -o, --owner                 preserve owner (root only)
   -g, --group                 preserve group
   -D, --devices               preserve devices (root only)

-@@ -635,6 +636,11 @@ ACLs to be the same as the local ACLs.  
+@@ -624,6 +625,11 @@ ACLs to be the same as the local ACLs.  

  remote machine's rsync supports this option also. This is a non-standard
  option.
  
  remote machine's rsync supports this option also. This is a non-standard
  option.