Ignore:
Timestamp:
Aug 2, 2012, 10:29:29 PM (8 years ago)
Author:
ryandesign@…
Message:

rsync: update to 3.0.9; new maintainer jimjag (#35498)

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/dports/net/rsync/files/patch-fileflags.diff

    r80017 r96189  
    99    make
    1010
    11 based-on: 1ddcdaf3f6808ba53aef9e19f630a18808de22ac
     11based-on: 40afd365cc8ca968fd16e161d24df5b8a8a520cc
    1212diff --git a/Makefile.in b/Makefile.in
    1313--- a/Makefile.in
     
    272272                        int j = try_dests_non(file, fname, ndx, fnamecmpbuf, &sx,
    273273                                              itemizing, code);
    274 @@ -1526,10 +1551,17 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
    275                 /* We need to ensure that the dirs in the transfer have writable
    276                  * permissions during the time we are putting files within them.
    277                  * This is then fixed after the transfer is done. */
     274@@ -1535,10 +1560,17 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
     275                 * readable and writable permissions during the time we are
     276                 * putting files within them.  This is then restored to the
     277                 * former permissions after the transfer is done. */
    278278+#ifdef SUPPORT_FORCE_CHANGE
    279279+               if (force_change && F_FFLAGS(file) & force_change) {
     
    284284+#endif
    285285 #ifdef HAVE_CHMOD
    286                 if (!am_root && !(file->mode & S_IWUSR) && dir_tweaking) {
    287                         mode_t mode = file->mode | S_IWUSR;
     286                if (!am_root && (file->mode & S_IRWXU) != S_IRWXU && dir_tweaking) {
     287                        mode_t mode = file->mode | S_IRWXU;
    288288-                       if (do_chmod(fname, mode) < 0) {
    289289+                       if (do_chmod(fname, mode, 0) < 0) {
     
    291291                                        "failed to modify permissions on %s",
    292292                                        full_fname(fname));
    293 @@ -1572,6 +1604,10 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
     293@@ -1573,6 +1605,10 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
    294294                file->mode = dest_mode(file->mode, sx.st.st_mode, dflt_perms,
    295295                                       exists);
     
    302302 #ifdef SUPPORT_HARD_LINKS
    303303        if (preserve_hard_links && F_HLINK_NOT_FIRST(file)
    304 @@ -2115,13 +2151,17 @@ static void touch_up_dirs(struct file_list *flist, int ndx)
     304@@ -2116,13 +2152,17 @@ static void touch_up_dirs(struct file_list *flist, int ndx)
    305305                        continue;
    306306                fname = f_name(file, NULL);
     
    767767--- a/rsync.yo
    768768+++ b/rsync.yo
    769 @@ -342,6 +342,7 @@ to the detailed description below for a complete description.  verb(
     769@@ -355,6 +355,7 @@ to the detailed description below for a complete description.  verb(
    770770  -K, --keep-dirlinks         treat symlinked dir on receiver as dir
    771771  -H, --hard-links            preserve hard links
     
    775775      --chmod=CHMOD           affect file and/or directory permissions
    776776  -A, --acls                  preserve ACLs (implies -p)
    777 @@ -373,7 +374,10 @@ to the detailed description below for a complete description.  verb(
    778       --delete-after          receiver deletes after transfer, not before
     777@@ -386,7 +387,10 @@ to the detailed description below for a complete description.  verb(
     778      --delete-after          receiver deletes after transfer, not during
    779779      --delete-excluded       also delete excluded files from dest dirs
    780780      --ignore-errors         delete even if there are I/O errors
     
    787787      --max-size=SIZE         don't transfer any file larger than SIZE
    788788      --min-size=SIZE         don't transfer any file smaller than SIZE
    789 @@ -547,7 +551,8 @@ specified, in which case bf(-r) is not implied.
     789@@ -566,7 +570,8 @@ specified, in which case bf(-r) is not implied.
    790790 
    791791 Note that bf(-a) bf(does not preserve hardlinks), because
     
    797797 dit(--no-OPTION) You may turn off one or more implied options by prefixing
    798798 the option name with "no-".  Not all options may be prefixed with a "no-":
    799 @@ -827,7 +832,7 @@ they would be using bf(--copy-links).
     799@@ -846,7 +851,7 @@ they would be using bf(--copy-links).
    800800 Without this option, if the sending side has replaced a directory with a
    801801 symlink to a directory, the receiving side will delete anything that is in
     
    806806 See also bf(--keep-dirlinks) for an analogous option for the receiving
    807807 side.
    808 @@ -990,6 +995,29 @@ Note that this option does not copy rsyncs special xattr values (e.g. those
     808@@ -1009,6 +1014,29 @@ Note that this option does not copy rsyncs special xattr values (e.g. those
    809809 used by bf(--fake-super)) unless you repeat the option (e.g. -XX).  This
    810810 "copy all xattrs" mode cannot be used with bf(--fake-super).
     
    834834+
    835835 dit(bf(--chmod)) This option tells rsync to apply one or more
    836  comma-separated "chmod" strings to the permission of the files in the
     836 comma-separated "chmod" modes to the permission of the files in the
    837837 transfer.  The resulting value is treated as though it were the permissions
    838 @@ -1260,12 +1288,13 @@ See bf(--delete) (which is implied) for more details on file-deletion.
     838@@ -1289,12 +1317,13 @@ See bf(--delete) (which is implied) for more details on file-deletion.
    839839 dit(bf(--ignore-errors)) Tells bf(--delete) to go ahead and delete files
    840840 even when there are I/O errors.
     
    853853 
    854854 dit(bf(--max-delete=NUM)) This tells rsync not to delete more than NUM
    855 @@ -1753,7 +1782,7 @@ with older versions of rsync, but that also turns on the output of other
     855@@ -1782,7 +1811,7 @@ with older versions of rsync, but that also turns on the output of other
    856856 verbose messages).
    857857 
     
    862862 other letters represent attributes that may be output if they are being
    863863 modified.
    864 @@ -1809,7 +1838,7 @@ quote(itemization(
     864@@ -1838,7 +1867,7 @@ quote(itemization(
    865865   sender's value (requires bf(--owner) and super-user privileges).
    866866   it() A bf(g) means the group is different and is being updated to the
     
    14371437--- a/xattrs.c
    14381438+++ b/xattrs.c
    1439 @@ -1041,7 +1041,7 @@ int set_stat_xattr(const char *fname, struct file_struct *file, mode_t new_mode)
     1439@@ -1042,7 +1042,7 @@ int set_stat_xattr(const char *fname, struct file_struct *file, mode_t new_mode)
    14401440        mode = (fst.st_mode & _S_IFMT) | (fmode & ACCESSPERMS)
    14411441             | (S_ISDIR(fst.st_mode) ? 0700 : 0600);
     
    14621462--- a/configure.sh
    14631463+++ b/configure.sh
    1464 @@ -7425,6 +7425,7 @@ fi
     1464@@ -7444,6 +7444,7 @@ fi
    14651465 
    14661466 for ac_func in waitpid wait4 getcwd strdup chown chmod lchmod mknod mkfifo \
     
    15251525--- a/rsync.1
    15261526+++ b/rsync.1
    1527 @@ -417,6 +417,7 @@ to the detailed description below for a
     1527@@ -431,6 +431,7 @@ to the detailed description below for a
    15281528  \-K, \-\-keep\-dirlinks         treat symlinked dir on receiver as dir
    15291529  \-H, \-\-hard\-links            preserve hard links
     
    15331533      \-\-chmod=CHMOD           affect file and/or directory permissions
    15341534  \-A, \-\-acls                  preserve ACLs (implies \-p)
    1535 @@ -448,7 +449,10 @@ to the detailed description below for a
    1536       \-\-delete\-after          receiver deletes after transfer, not before
     1535@@ -462,7 +463,10 @@ to the detailed description below for a
     1536      \-\-delete\-after          receiver deletes after transfer, not during
    15371537      \-\-delete\-excluded       also delete excluded files from dest dirs
    15381538      \-\-ignore\-errors         delete even if there are I/O errors
     
    15451545      \-\-max\-size=SIZE         don'\&t transfer any file larger than SIZE
    15461546      \-\-min\-size=SIZE         don'\&t transfer any file smaller than SIZE
    1547 @@ -638,7 +642,8 @@ specified, in which case \fB\-r\fP is no
     1547@@ -658,7 +662,8 @@ specified, in which case \fB\-r\fP is no
    15481548 .IP
    15491549 Note that \fB\-a\fP \fBdoes not preserve hardlinks\fP, because
     
    15551555 .IP "\-\-no\-OPTION"
    15561556 You may turn off one or more implied options by prefixing
    1557 @@ -955,7 +960,7 @@ they would be using \fB\-\-copy\-links\f
     1557@@ -975,7 +980,7 @@ they would be using \fB\-\-copy\-links\f
    15581558 Without this option, if the sending side has replaced a directory with a
    15591559 symlink to a directory, the receiving side will delete anything that is in
     
    15641564 See also \fB\-\-keep\-dirlinks\fP for an analogous option for the receiving
    15651565 side.
    1566 @@ -1142,6 +1147,33 @@ Note that this option does not copy rsyn
     1566@@ -1162,6 +1167,33 @@ Note that this option does not copy rsyn
    15671567 used by \fB\-\-fake\-super\fP) unless you repeat the option (e.g. \-XX).  This
    15681568 \(dq\&copy all xattrs\(dq\& mode cannot be used with \fB\-\-fake\-super\fP.
     
    15971597 .IP "\fB\-\-chmod\fP"
    15981598 This option tells rsync to apply one or more
    1599  comma\-separated \(dq\&chmod\(dq\& strings to the permission of the files in the
    1600 @@ -1442,13 +1474,14 @@ See \fB\-\-delete\fP (which is implied)
     1599 comma\-separated \(dq\&chmod\(dq\& modes to the permission of the files in the
     1600@@ -1472,13 +1504,14 @@ See \fB\-\-delete\fP (which is implied)
    16011601 Tells \fB\-\-delete\fP to go ahead and delete files
    16021602 even when there are I/O errors.
     
    16161616 .IP
    16171617 .IP "\fB\-\-max\-delete=NUM\fP"
    1618 @@ -2004,7 +2037,7 @@ with older versions of rsync, but that a
     1618@@ -2034,7 +2067,7 @@ with older versions of rsync, but that a
    16191619 verbose messages).
    16201620 .IP
     
    16251625 other letters represent attributes that may be output if they are being
    16261626 modified.
    1627 @@ -2074,7 +2107,7 @@ sender\(cq\&s value (requires \fB\-\-own
     1627@@ -2104,7 +2137,7 @@ sender\(cq\&s value (requires \fB\-\-own
    16281628 A \fBg\fP means the group is different and is being updated to the
    16291629 sender\(cq\&s value (requires \fB\-\-group\fP and the authority to set the group).
Note: See TracChangeset for help on using the changeset viewer.