rsync flags freebsd

alexus alexus at gmail.com
Wed Jul 1 01:42:08 GMT 2009


On Fri, Mar 13, 2009 at 7:44 PM, Wayne Davison<wayned at samba.org> wrote:
> On Fri, Mar 13, 2009 at 06:57:15PM -0400, Matt McCutchen wrote:
>> I would have thought it more natural to have branches "patches-master"
>> and "patches-3.0.x" in the main repository.  Is there any reason you
>> made a separate repository?
>
> Yes, this way the branch names match and I can tag releases.
>
> ..wayne..
> --
> Please use reply-all for most replies to avoid omitting the mailing list.
> To unsubscribe or change options: https://lists.samba.org/mailman/listinfo/rsync
> Before posting, read: http://www.catb.org/~esr/faqs/smart-questions.html
>

su-3.2# tar -zxvf rsync-3.0.6.tar.gz
x rsync-3.0.6/
x rsync-3.0.6/getfsdev.c
x rsync-3.0.6/aclocal.m4
x rsync-3.0.6/proto.h-tstamp
x rsync-3.0.6/rsync.1
x rsync-3.0.6/packaging/
x rsync-3.0.6/packaging/extern-squish
x rsync-3.0.6/packaging/bin/
x rsync-3.0.6/packaging/bin/gpg
x rsync-3.0.6/packaging/patch-update
x rsync-3.0.6/packaging/lsb/
x rsync-3.0.6/packaging/lsb/rsync.spec
x rsync-3.0.6/packaging/lsb/rsync.xinetd
x rsync-3.0.6/packaging/cull_options
x rsync-3.0.6/packaging/release-rsync
x rsync-3.0.6/packaging/nightly-rsync
x rsync-3.0.6/packaging/solaris/
x rsync-3.0.6/packaging/solaris/build_pkg.sh
x rsync-3.0.6/syscall.c
x rsync-3.0.6/COPYING
x rsync-3.0.6/rsyncd.conf.yo
x rsync-3.0.6/loadparm.c
x rsync-3.0.6/match.c
x rsync-3.0.6/csprotocol.txt
x rsync-3.0.6/checksum.c
x rsync-3.0.6/sender.c
x rsync-3.0.6/socket.c
x rsync-3.0.6/connection.c
x rsync-3.0.6/t_stub.c
x rsync-3.0.6/runtests.sh
x rsync-3.0.6/pipe.c
x rsync-3.0.6/batch.c
x rsync-3.0.6/rsync.h
x rsync-3.0.6/tls.c
x rsync-3.0.6/acls.c
x rsync-3.0.6/INSTALL
x rsync-3.0.6/tech_report.tex
x rsync-3.0.6/proto.h
x rsync-3.0.6/params.c
x rsync-3.0.6/compat.c
x rsync-3.0.6/cleanup.c
x rsync-3.0.6/shconfig.in
x rsync-3.0.6/zlib/
x rsync-3.0.6/zlib/inftrees.c
x rsync-3.0.6/zlib/crc32.c
x rsync-3.0.6/zlib/dummy.in
x rsync-3.0.6/zlib/zutil.h
x rsync-3.0.6/zlib/trees.h
x rsync-3.0.6/zlib/zlib.h
x rsync-3.0.6/zlib/compress.c
x rsync-3.0.6/zlib/crc32.h
x rsync-3.0.6/zlib/deflate.h
x rsync-3.0.6/zlib/inflate.h
x rsync-3.0.6/zlib/inffixed.h
x rsync-3.0.6/zlib/inffast.c
x rsync-3.0.6/zlib/inftrees.h
x rsync-3.0.6/zlib/trees.c
x rsync-3.0.6/zlib/README
x rsync-3.0.6/zlib/adler32.c
x rsync-3.0.6/zlib/zutil.c
x rsync-3.0.6/zlib/inffast.h
x rsync-3.0.6/zlib/inflate.c
x rsync-3.0.6/zlib/deflate.c
x rsync-3.0.6/zlib/ChangeLog
x rsync-3.0.6/zlib/README.rsync
x rsync-3.0.6/zlib/zconf.h
x rsync-3.0.6/rounding.c
x rsync-3.0.6/byteorder.h
x rsync-3.0.6/io.h
x rsync-3.0.6/log.c
x rsync-3.0.6/uidlist.c
x rsync-3.0.6/testhelp/
x rsync-3.0.6/testhelp/maketree.py
x rsync-3.0.6/wildtest.c
x rsync-3.0.6/NEWS
x rsync-3.0.6/wildtest.txt
x rsync-3.0.6/testsuite/
x rsync-3.0.6/testsuite/ssh-basic.test
x rsync-3.0.6/testsuite/chmod-temp-dir.test
x rsync-3.0.6/testsuite/longdir.test
x rsync-3.0.6/testsuite/rsync.fns
x rsync-3.0.6/testsuite/xattrs.test
x rsync-3.0.6/testsuite/backup.test
x rsync-3.0.6/testsuite/daemon-gzip-download.test
x rsync-3.0.6/testsuite/chmod-option.test
x rsync-3.0.6/testsuite/compare-dest.test
x rsync-3.0.6/testsuite/hardlinks.test
x rsync-3.0.6/testsuite/fuzzy.test
x rsync-3.0.6/testsuite/itemize.test
x rsync-3.0.6/testsuite/daemon.test
x rsync-3.0.6/testsuite/exclude.test
x rsync-3.0.6/testsuite/files-from.test
x rsync-3.0.6/testsuite/merge.test
x rsync-3.0.6/testsuite/symlink-ignore.test
x rsync-3.0.6/testsuite/README.testsuite
x rsync-3.0.6/testsuite/relative.test
x rsync-3.0.6/testsuite/hands.test
x rsync-3.0.6/testsuite/delete.test
x rsync-3.0.6/testsuite/unsafe-byname.test
x rsync-3.0.6/testsuite/executability.test
x rsync-3.0.6/testsuite/default-acls.test
x rsync-3.0.6/testsuite/missing.test
x rsync-3.0.6/testsuite/chmod.test
x rsync-3.0.6/testsuite/trimslash.test
x rsync-3.0.6/testsuite/devices.test
x rsync-3.0.6/testsuite/daemon-gzip-upload.test
x rsync-3.0.6/testsuite/acls.test
x rsync-3.0.6/testsuite/unsafe-links.test
x rsync-3.0.6/testsuite/00-hello.test
x rsync-3.0.6/testsuite/duplicates.test
x rsync-3.0.6/testsuite/chgrp.test
x rsync-3.0.6/testsuite/wildmatch.test
x rsync-3.0.6/testsuite/chown.test
x rsync-3.0.6/testsuite/dir-sgid.test
x rsync-3.0.6/testsuite/batch-mode.test
x rsync-3.0.6/clientserver.c
x rsync-3.0.6/README
x rsync-3.0.6/backup.c
x rsync-3.0.6/access.c
x rsync-3.0.6/t_unsafe.c
x rsync-3.0.6/progress.c
x rsync-3.0.6/.gitignore
x rsync-3.0.6/rsync.c
x rsync-3.0.6/options.c
x rsync-3.0.6/fileio.c
x rsync-3.0.6/rsync3.txt
x rsync-3.0.6/errcode.h
x rsync-3.0.6/main.c
x rsync-3.0.6/OLDNEWS
x rsync-3.0.6/rsyncsh.txt
x rsync-3.0.6/install-sh
x rsync-3.0.6/support/
x rsync-3.0.6/support/mnt-excl
x rsync-3.0.6/support/logfilter
x rsync-3.0.6/support/munge-symlinks
x rsync-3.0.6/support/savetransfer.c
x rsync-3.0.6/support/rsyncstats
x rsync-3.0.6/support/Makefile
x rsync-3.0.6/support/git-set-file-times
x rsync-3.0.6/support/lsh
x rsync-3.0.6/support/cvs2includes
x rsync-3.0.6/support/files-to-excludes
x rsync-3.0.6/support/deny-rsync
x rsync-3.0.6/support/atomic-rsync
x rsync-3.0.6/support/rrsync
x rsync-3.0.6/support/file-attr-restore
x rsync-3.0.6/Makefile.in
x rsync-3.0.6/chmod.c
x rsync-3.0.6/getgroups.c
x rsync-3.0.6/TODO
x rsync-3.0.6/configure
x rsync-3.0.6/config.sub
x rsync-3.0.6/flist.c
x rsync-3.0.6/hlink.c
x rsync-3.0.6/exclude.c
x rsync-3.0.6/generator.c
x rsync-3.0.6/hashtable.c
x rsync-3.0.6/trimslash.c
x rsync-3.0.6/mkproto.pl
x rsync-3.0.6/prepare-source
x rsync-3.0.6/rsyncd.conf.5
x rsync-3.0.6/case_N.h
x rsync-3.0.6/receiver.c
x rsync-3.0.6/configure.sh
x rsync-3.0.6/io.c
x rsync-3.0.6/doc/
x rsync-3.0.6/doc/rsync.sgml
x rsync-3.0.6/doc/README-SGML
x rsync-3.0.6/doc/profile.txt
x rsync-3.0.6/lib/
x rsync-3.0.6/lib/pool_alloc.h
x rsync-3.0.6/lib/dummy.in
x rsync-3.0.6/lib/wildmatch.c
x rsync-3.0.6/lib/mdigest.h
x rsync-3.0.6/lib/permstring.h
x rsync-3.0.6/lib/wildmatch.h
x rsync-3.0.6/lib/inet_pton.c
x rsync-3.0.6/lib/snprintf.c
x rsync-3.0.6/lib/compat.c
x rsync-3.0.6/lib/sysxattrs.h
x rsync-3.0.6/lib/mdfour.c
x rsync-3.0.6/lib/inet_ntop.c
x rsync-3.0.6/lib/getaddrinfo.c
x rsync-3.0.6/lib/pool_alloc.3
x rsync-3.0.6/lib/sysacls.h
x rsync-3.0.6/lib/sysxattrs.c
x rsync-3.0.6/lib/sysacls.c
x rsync-3.0.6/lib/pool_alloc.c
x rsync-3.0.6/lib/md5.c
x rsync-3.0.6/lib/permstring.c
x rsync-3.0.6/lib/addrinfo.h
x rsync-3.0.6/config.h.in
x rsync-3.0.6/Doxyfile
x rsync-3.0.6/util.c
x rsync-3.0.6/tweak_manpage
x rsync-3.0.6/ifuncs.h
x rsync-3.0.6/rsync.yo
x rsync-3.0.6/authenticate.c
x rsync-3.0.6/clientname.c
x rsync-3.0.6/configure.in
x rsync-3.0.6/config.guess
x rsync-3.0.6/token.c
x rsync-3.0.6/xattrs.c
x rsync-3.0.6/popt/
x rsync-3.0.6/popt/dummy.in
x rsync-3.0.6/popt/findme.c
x rsync-3.0.6/popt/COPYING
x rsync-3.0.6/popt/popthelp.c
x rsync-3.0.6/popt/popt.c
x rsync-3.0.6/popt/README
x rsync-3.0.6/popt/poptint.h
x rsync-3.0.6/popt/popt.h
x rsync-3.0.6/popt/CHANGES
x rsync-3.0.6/popt/README.rsync
x rsync-3.0.6/popt/findme.h
x rsync-3.0.6/popt/poptparse.c
x rsync-3.0.6/popt/system.h
x rsync-3.0.6/popt/poptconfig.c
x rsync-3.0.6/prepare-source.mak
su-3.2# patch < ../fileflags.diff
Hmm...  Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|This patch provides --fileflags, which preserves the st_flags stat() field.
|Modified from a patch that was written by Rolf Grossmann.
|
|To use this patch, run these commands for a successful build:
|
|    patch -p1 <patches/fileflags.diff
|    ./prepare-source
|    ./configure
|    make
|
|diff --git a/Makefile.in b/Makefile.in
|--- a/Makefile.in
|+++ b/Makefile.in
--------------------------
Patching file Makefile.in using Plan A...
Hunk #1 succeeded at 42.
Hunk #2 succeeded at 107.
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff --git a/compat.c b/compat.c
|--- a/compat.c
|+++ b/compat.c
--------------------------
Patching file compat.c using Plan A...
Hunk #1 succeeded at 41.
Hunk #2 succeeded at 63.
Hunk #3 succeeded at 139.
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff --git a/configure.in b/configure.in
|--- a/configure.in
|+++ b/configure.in
--------------------------
Patching file configure.in using Plan A...
Hunk #1 succeeded at 551 (offset -2 lines).
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff --git a/flist.c b/flist.c
|--- a/flist.c
|+++ b/flist.c
--------------------------
Patching file flist.c using Plan A...
Hunk #1 succeeded at 52.
Hunk #2 succeeded at 396.
Hunk #3 succeeded at 428 with fuzz 2.
Hunk #4 succeeded at 560 (offset 10 lines).
Hunk #5 succeeded at 650 (offset 10 lines).
Hunk #6 succeeded at 777 (offset -1 lines).
Hunk #7 succeeded at 933 (offset 11 lines).
Hunk #8 succeeded at 1299 (offset -1 lines).
Hunk #9 succeeded at 1458 (offset 19 lines).
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff --git a/generator.c b/generator.c
|--- a/generator.c
|+++ b/generator.c
--------------------------
Patching file generator.c using Plan A...
Hunk #1 succeeded at 42.
Hunk #2 succeeded at 168.
Hunk #3 succeeded at 176.
Hunk #4 succeeded at 303.
Hunk #5 succeeded at 612.
Hunk #6 succeeded at 682.
Hunk #7 succeeded at 1465.
Hunk #8 succeeded at 1509.
Hunk #9 succeeded at 1552.
Hunk #10 succeeded at 2094 (offset 4 lines).
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff --git a/log.c b/log.c
|--- a/log.c
|+++ b/log.c
--------------------------
Patching file log.c using Plan A...
Hunk #1 succeeded at 660.
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff --git a/options.c b/options.c
|--- a/options.c
|+++ b/options.c
--------------------------
Patching file options.c using Plan A...
Hunk #1 succeeded at 53.
Hunk #2 succeeded at 86.
Hunk #3 succeeded at 227.
Hunk #4 succeeded at 261.
Hunk #5 succeeded at 277.
Hunk #6 succeeded at 345.
Hunk #7 succeeded at 385.
Hunk #8 succeeded at 495.
Hunk #9 succeeded at 577.
Hunk #10 succeeded at 1900 (offset 6 lines).
Hunk #11 succeeded at 1990 (offset 6 lines).
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff --git a/rsync.c b/rsync.c
|--- a/rsync.c
|+++ b/rsync.c
--------------------------
Patching file rsync.c using Plan A...
Hunk #1 succeeded at 32.
Hunk #2 succeeded at 378.
Hunk #3 succeeded at 464.
Hunk #4 succeeded at 500.
Hunk #5 succeeded at 533.
Hunk #6 succeeded at 545.
Hunk #7 succeeded at 621.
Hunk #8 succeeded at 641.
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff --git a/rsync.h b/rsync.h
|--- a/rsync.h
|+++ b/rsync.h
--------------------------
Patching file rsync.h using Plan A...
Hunk #1 succeeded at 60.
Hunk #2 succeeded at 155.
Hunk #3 succeeded at 182.
Hunk #4 succeeded at 465.
Hunk #5 succeeded at 657.
Hunk #6 succeeded at 695.
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff --git a/rsync.yo b/rsync.yo
|--- a/rsync.yo
|+++ b/rsync.yo
--------------------------
Patching file rsync.yo using Plan A...
Hunk #1 succeeded at 342.
Hunk #2 succeeded at 374.
Hunk #3 succeeded at 551 (offset 3 lines).
Hunk #4 succeeded at 811 (offset 4 lines).
Hunk #5 succeeded at 947 (offset 3 lines).
Hunk #6 succeeded at 1241 (offset 12 lines).
Hunk #7 succeeded at 1703 (offset 7 lines).
Hunk #8 succeeded at 1764 (offset 12 lines).
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff --git a/syscall.c b/syscall.c
|--- a/syscall.c
|+++ b/syscall.c
--------------------------
Patching file syscall.c using Plan A...
Hunk #1 succeeded at 33.
Hunk #2 succeeded at 51.
Hunk #3 succeeded at 86.
Hunk #4 succeeded at 156.
Hunk #5 succeeded at 173.
Hunk #6 succeeded at 202.
Hunk #7 succeeded at 223.
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff --git a/t_stub.c b/t_stub.c
|--- a/t_stub.c
|+++ b/t_stub.c
--------------------------
Patching file t_stub.c using Plan A...
Hunk #1 succeeded at 26.
Hunk #2 succeeded at 90.
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff --git a/util.c b/util.c
|--- a/util.c
|+++ b/util.c
--------------------------
Patching file util.c using Plan A...
Hunk #1 succeeded at 29.
Hunk #2 succeeded at 124.
Hunk #3 succeeded at 141.
Hunk #4 succeeded at 155.
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff --git a/xattrs.c b/xattrs.c
|--- a/xattrs.c
|+++ b/xattrs.c
--------------------------
Patching file xattrs.c using Plan A...
Hunk #1 succeeded at 283 (offset 2 lines).
Hunk #2 succeeded at 885 (offset 17 lines).
Hunk #3 failed at 1006.
1 out of 3 hunks failed--saving rejects to xattrs.c.rej
done
su-3.2# cat xattrs.c.rej
***************
*** 997,1003 ****
        mode = (fst.st_mode & _S_IFMT) | (fmode & ACCESSPERMS)
             | (S_ISDIR(fst.st_mode) ? 0700 : 0600);
        if (fst.st_mode != mode)
-               do_chmod(fname, mode);
        if (!IS_DEVICE(fst.st_mode) && !IS_SPECIAL(fst.st_mode))
                fst.st_rdev = 0; /* just in case */

--- 1006,1012 ----
        mode = (fst.st_mode & _S_IFMT) | (fmode & ACCESSPERMS)
             | (S_ISDIR(fst.st_mode) ? 0700 : 0600);
        if (fst.st_mode != mode)
+               do_chmod(fname, mode, ST_FLAGS(fst));
        if (!IS_DEVICE(fst.st_mode) && !IS_SPECIAL(fst.st_mode))
                fst.st_rdev = 0; /* just in case */

su-3.2#

I dont know if that helpful, but all I'm saying is fileflags.diff
isn't working for rsync-3.0.6, but it works for rsync-3.0.5

-- 
http://alexus.org/


More information about the rsync mailing list