[39822] trunk/dports/net/rsync
simon at macports.org
simon at macports.org
Sat Sep 6 15:37:32 PDT 2008
Revision: 39822
http://trac.macports.org/changeset/39822
Author: simon at macports.org
Date: 2008-09-06 15:37:30 -0700 (Sat, 06 Sep 2008)
Log Message:
-----------
net/rsync: Updated to 3.0.4.
Modified Paths:
--------------
trunk/dports/net/rsync/Portfile
trunk/dports/net/rsync/files/patch-crtimes.diff
trunk/dports/net/rsync/files/patch-fileflags.diff
Modified: trunk/dports/net/rsync/Portfile
===================================================================
--- trunk/dports/net/rsync/Portfile 2008-09-06 20:51:57 UTC (rev 39821)
+++ trunk/dports/net/rsync/Portfile 2008-09-06 22:37:30 UTC (rev 39822)
@@ -3,8 +3,7 @@
PortSystem 1.0
name rsync
-version 3.0.3
-revision 2
+version 3.0.4
categories net
platforms darwin freebsd sunos
maintainers simon openmaintainer
@@ -14,18 +13,17 @@
under the GNU General Public License and is currently \
being maintained by Wayne Davison. \
\
- Rsync version 3.0.3 has been released. This is a \
- security release that fixes a potential buffer-overflow \
- issue. Related pages: \
+ Rsync version 3.0.4 has been released. This is a \
+ bug-fix release. Related pages: \
http://rsync.samba.org/ftp/rsync/rsync-${version}-NEWS
homepage http://samba.org/rsync/
master_sites http://rsync.samba.org/ftp/rsync/ \
http://rsync.samba.org/ftp/rsync/src/
checksums ${distname}${extract.suffix} \
- md5 16d41aab9ece435198af222c5415a304 \
- sha1 c12668eb888e386511299616f6972bec300ed346 \
- rmd160 9997a18cb5577bb127b26bcc55e50382b6e9f68d
+ md5 2b2d159c9bd1b5f8adfd8b13da3a1f3f \
+ sha1 e89ed8d84fe0b6740208ba8183ee1dbc220ba5e5 \
+ rmd160 5e0082c7751205e16431471bdc5f48f87ae26b1a
distname rsync-${version}
depends_lib port:popt port:libiconv
Modified: trunk/dports/net/rsync/files/patch-crtimes.diff
===================================================================
--- trunk/dports/net/rsync/files/patch-crtimes.diff 2008-09-06 20:51:57 UTC (rev 39821)
+++ trunk/dports/net/rsync/files/patch-crtimes.diff 2008-09-06 22:37:30 UTC (rev 39822)
@@ -11,7 +11,7 @@
diff --git a/compat.c b/compat.c
--- a/compat.c
+++ b/compat.c
-@@ -44,6 +44,7 @@ extern int force_change;
+@@ -45,6 +45,7 @@ extern int force_change;
extern int protect_args;
extern int preserve_uid;
extern int preserve_gid;
@@ -19,7 +19,7 @@
extern int preserve_fileflags;
extern int preserve_acls;
extern int preserve_xattrs;
-@@ -61,7 +62,7 @@ extern iconv_t ic_send, ic_recv;
+@@ -63,7 +64,7 @@ extern char *iconv_opt;
#endif
/* These index values are for the file-list's extra-attribute array. */
@@ -27,8 +27,8 @@
+int uid_ndx, gid_ndx, crtimes_ndx, fileflags_ndx, acls_ndx, xattrs_ndx, unsort_ndx;
int receiver_symlink_times = 0; /* receiver can set the time on a symlink */
-
-@@ -135,6 +136,8 @@ void setup_protocol(int f_out,int f_in)
+ int sender_symlink_iconv = 0; /* sender should convert symlink content */
+@@ -139,6 +140,8 @@ void setup_protocol(int f_out,int f_in)
uid_ndx = ++file_extra_cnt;
if (preserve_gid)
gid_ndx = ++file_extra_cnt;
@@ -40,7 +40,7 @@
diff --git a/flist.c b/flist.c
--- a/flist.c
+++ b/flist.c
-@@ -54,6 +54,7 @@ extern int preserve_fileflags;
+@@ -56,6 +56,7 @@ extern int preserve_fileflags;
extern int uid_ndx;
extern int gid_ndx;
extern int eol_nulls;
@@ -48,16 +48,16 @@
extern int relative_paths;
extern int implied_dirs;
extern int file_extra_cnt;
-@@ -389,7 +390,7 @@ int change_pathname(struct file_struct *file, const char *dir, int dirlen)
-
- static void send_file_entry(int f, const char *fname, struct file_struct *file, int ndx, int first_ndx)
+@@ -394,7 +395,7 @@ static void send_file_entry(int f, const char *fname, struct file_struct *file,
+ #endif
+ int ndx, int first_ndx)
{
- static time_t modtime;
+ static time_t modtime, crtime;
static mode_t mode;
#ifdef SUPPORT_FILEFLAGS
static uint32 fileflags;
-@@ -474,6 +475,13 @@ static void send_file_entry(int f, const char *fname, struct file_struct *file,
+@@ -479,6 +480,13 @@ static void send_file_entry(int f, const char *fname, struct file_struct *file,
xflags |= XMIT_SAME_TIME;
else
modtime = file->modtime;
@@ -71,7 +71,7 @@
#ifdef SUPPORT_HARD_LINKS
if (tmp_dev != 0) {
-@@ -543,6 +551,8 @@ static void send_file_entry(int f, const char *fname, struct file_struct *file,
+@@ -548,6 +556,8 @@ static void send_file_entry(int f, const char *fname, struct file_struct *file,
else
write_int(f, modtime);
}
@@ -80,7 +80,7 @@
if (!(xflags & XMIT_SAME_MODE))
write_int(f, to_wire_mode(mode));
#ifdef SUPPORT_FILEFLAGS
-@@ -635,7 +645,7 @@ static void send_file_entry(int f, const char *fname, struct file_struct *file,
+@@ -638,7 +648,7 @@ static void send_file_entry(int f, const char *fname, struct file_struct *file,
static struct file_struct *recv_file_entry(struct file_list *flist,
int xflags, int f)
{
@@ -89,7 +89,7 @@
static mode_t mode;
#ifdef SUPPORT_FILEFLAGS
static uint32 fileflags;
-@@ -770,6 +780,19 @@ static struct file_struct *recv_file_entry(struct file_list *flist,
+@@ -773,6 +783,19 @@ static struct file_struct *recv_file_entry(struct file_list *flist,
} else
modtime = read_int(f);
}
@@ -109,7 +109,7 @@
if (!(xflags & XMIT_SAME_MODE))
mode = from_wire_mode(read_int(f));
-@@ -922,6 +945,8 @@ static struct file_struct *recv_file_entry(struct file_list *flist,
+@@ -932,6 +955,8 @@ static struct file_struct *recv_file_entry(struct file_list *flist,
F_GROUP(file) = gid;
file->flags |= gid_flags;
}
@@ -118,7 +118,7 @@
if (unsort_ndx)
F_NDX(file) = flist->used + flist->ndx_start;
-@@ -1272,6 +1297,8 @@ struct file_struct *make_file(const char *fname, struct file_list *flist,
+@@ -1308,6 +1333,8 @@ struct file_struct *make_file(const char *fname, struct file_list *flist,
F_OWNER(file) = st.st_uid;
if (gid_ndx) /* Check gid_ndx instead of preserve_gid for del support */
F_GROUP(file) = st.st_gid;
@@ -136,9 +136,9 @@
#include "rsync.h"
+#include "ifuncs.h"
+ extern int verbose;
extern int dry_run;
- extern int do_xfers;
-@@ -38,6 +39,7 @@ extern int preserve_xattrs;
+@@ -40,6 +41,7 @@ extern int preserve_xattrs;
extern int preserve_links;
extern int preserve_devices;
extern int preserve_specials;
@@ -146,7 +146,7 @@
extern int preserve_hard_links;
extern int preserve_executability;
extern int preserve_fileflags;
-@@ -618,6 +620,13 @@ int unchanged_attrs(const char *fname, struct file_struct *file, stat_x *sxp)
+@@ -620,6 +622,13 @@ int unchanged_attrs(const char *fname, struct file_struct *file, stat_x *sxp)
if (gid_ndx && !(file->flags & FLAG_SKIP_GROUP) && sxp->st.st_gid != (gid_t)F_GROUP(file))
return 0;
@@ -160,7 +160,7 @@
#ifdef SUPPORT_ACLS
if (preserve_acls && !S_ISLNK(file->mode)) {
if (!ACL_READY(*sxp))
-@@ -661,6 +670,12 @@ void itemize(const char *fnamecmp, struct file_struct *file, int ndx, int statre
+@@ -663,6 +672,12 @@ void itemize(const char *fnamecmp, struct file_struct *file, int ndx, int statre
: iflags & (ITEM_TRANSFER|ITEM_LOCAL_CHANGE) && !(iflags & ITEM_MATCHED)
&& (!(iflags & ITEM_XNAME_FOLLOWS) || *xname))
iflags |= ITEM_REPORT_TIME;
@@ -173,7 +173,7 @@
#if !defined HAVE_LCHMOD && !defined HAVE_SETATTRLIST
if (S_ISLNK(file->mode)) {
;
-@@ -1221,6 +1236,7 @@ static int try_dests_non(struct file_struct *file, char *fname, int ndx,
+@@ -1223,6 +1238,7 @@ static int try_dests_non(struct file_struct *file, char *fname, int ndx,
static void list_file_entry(struct file_struct *f)
{
char permbuf[PERMSTRING_SIZE];
@@ -181,7 +181,7 @@
double len;
if (!F_IS_ACTIVE(f)) {
-@@ -1235,14 +1251,16 @@ static void list_file_entry(struct file_struct *f)
+@@ -1237,14 +1253,16 @@ static void list_file_entry(struct file_struct *f)
#ifdef SUPPORT_LINKS
if (preserve_links && S_ISLNK(f->mode)) {
@@ -200,7 +200,7 @@
f_name(f, NULL));
}
}
-@@ -1334,6 +1352,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
+@@ -1336,6 +1354,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
return;
}
}
@@ -243,7 +243,7 @@
diff --git a/log.c b/log.c
--- a/log.c
+++ b/log.c
-@@ -664,7 +664,8 @@ static void log_formatted(enum logcode code, const char *format, const char *op,
+@@ -663,7 +663,8 @@ static void log_formatted(enum logcode code, const char *format, const char *op,
c[8] = !(iflags & ITEM_REPORT_FFLAGS) ? '.' : 'f';
c[9] = !(iflags & ITEM_REPORT_ACL) ? '.' : 'a';
c[10] = !(iflags & ITEM_REPORT_XATTR) ? '.' : 'x';
@@ -264,7 +264,7 @@
int update_only = 0;
int cvs_exclude = 0;
int dry_run = 0;
-@@ -698,6 +699,7 @@ void usage(enum logcode F)
+@@ -362,6 +363,7 @@ void usage(enum logcode F)
rprintf(F," -D same as --devices --specials\n");
rprintf(F," -t, --times preserve modification times\n");
rprintf(F," -O, --omit-dir-times omit directories from --times\n");
@@ -272,7 +272,7 @@
rprintf(F," --super receiver attempts super-user activities\n");
#ifdef SUPPORT_XATTRS
rprintf(F," --fake-super store/recover privileged attrs using xattrs\n");
-@@ -847,6 +849,9 @@ static struct poptOption long_options[] = {
+@@ -508,6 +510,9 @@ static struct poptOption long_options[] = {
{"times", 't', POPT_ARG_VAL, &preserve_times, 2, 0, 0 },
{"no-times", 0, POPT_ARG_VAL, &preserve_times, 0, 0, 0 },
{"no-t", 0, POPT_ARG_VAL, &preserve_times, 0, 0, 0 },
@@ -282,7 +282,7 @@
{"omit-dir-times", 'O', POPT_ARG_VAL, &omit_dir_times, 1, 0, 0 },
{"no-omit-dir-times",0, POPT_ARG_VAL, &omit_dir_times, 0, 0, 0 },
{"no-O", 0, POPT_ARG_VAL, &omit_dir_times, 0, 0, 0 },
-@@ -2180,6 +2185,8 @@ void server_options(char **args, int *argc_p)
+@@ -1799,6 +1804,8 @@ void server_options(char **args, int *argc_p)
argstr[x++] = 'D';
if (preserve_times)
argstr[x++] = 't';
@@ -294,7 +294,7 @@
diff --git a/rsync.c b/rsync.c
--- a/rsync.c
+++ b/rsync.c
-@@ -471,6 +471,14 @@ int set_file_attrs(const char *fname, struct file_struct *file, stat_x *sxp,
+@@ -472,6 +472,14 @@ int set_file_attrs(const char *fname, struct file_struct *file, stat_x *sxp,
else
file->flags |= FLAG_TIME_FAILED;
}
@@ -309,7 +309,7 @@
change_uid = am_root && uid_ndx && sxp->st.st_uid != (uid_t)F_OWNER(file);
change_gid = gid_ndx && !(file->flags & FLAG_SKIP_GROUP)
-@@ -618,7 +626,7 @@ int finish_transfer(const char *fname, const char *fnametmp,
+@@ -619,7 +627,7 @@ int finish_transfer(const char *fname, const char *fnametmp,
/* Change permissions before putting the file into place. */
set_file_attrs(fnametmp, file, NULL, fnamecmp,
ATTRS_DELAY_IMMUTABLE
@@ -317,8 +317,8 @@
+ | (ok_to_set_time ? 0 : ATTRS_SKIP_MTIME | ATTRS_SKIP_CRTIME));
/* move tmp file over real file */
- if (DEBUG_GTE(RECV, 1))
-@@ -649,7 +657,7 @@ int finish_transfer(const char *fname, const char *fnametmp,
+ if (verbose > 2)
+@@ -650,7 +658,7 @@ int finish_transfer(const char *fname, const char *fnametmp,
do_set_file_attrs:
set_file_attrs(fnametmp, file, NULL, fnamecmp,
@@ -355,7 +355,7 @@
#define ITEM_REPORT_CHANGE (1<<1)
#define ITEM_REPORT_SIZE (1<<2) /* regular files only */
#define ITEM_REPORT_TIMEFAIL (1<<2) /* symlinks only */
-@@ -655,6 +657,7 @@ extern int file_extra_cnt;
+@@ -657,6 +659,7 @@ extern int file_extra_cnt;
extern int inc_recurse;
extern int uid_ndx;
extern int gid_ndx;
@@ -363,7 +363,7 @@
extern int fileflags_ndx;
extern int acls_ndx;
extern int xattrs_ndx;
-@@ -662,6 +665,7 @@ extern int xattrs_ndx;
+@@ -664,6 +667,7 @@ extern int xattrs_ndx;
#define FILE_STRUCT_LEN (offsetof(struct file_struct, basename))
#define EXTRA_LEN (sizeof (union file_extras))
#define PTR_EXTRA_CNT ((sizeof (char *) + EXTRA_LEN - 1) / EXTRA_LEN)
@@ -371,7 +371,7 @@
#define DEV_EXTRA_CNT 2
#define DIRNODE_EXTRA_CNT 3
#define SUM_EXTRA_CNT ((MAX_DIGEST_LEN + EXTRA_LEN - 1) / EXTRA_LEN)
-@@ -920,6 +924,7 @@ typedef struct {
+@@ -922,6 +926,7 @@ typedef struct {
typedef struct {
STRUCT_STAT st;
@@ -382,7 +382,7 @@
diff --git a/rsync.yo b/rsync.yo
--- a/rsync.yo
+++ b/rsync.yo
-@@ -352,6 +352,7 @@ to the detailed description below for a complete description. verb(
+@@ -350,6 +350,7 @@ to the detailed description below for a complete description. verb(
-D same as --devices --specials
-t, --times preserve modification times
-O, --omit-dir-times omit directories from --times
@@ -390,7 +390,7 @@
--super receiver attempts super-user activities
--fake-super store/recover privileged attrs using xattrs
-S, --sparse handle sparse files efficiently
-@@ -1069,6 +1070,9 @@ it is preserving modification times (see bf(--times)). If NFS is sharing
+@@ -1028,6 +1029,9 @@ it is preserving modification times (see bf(--times)). If NFS is sharing
the directories on the receiving side, it is a good idea to use bf(-O).
This option is inferred if you use bf(--backup) without bf(--backup-dir).
@@ -400,7 +400,7 @@
dit(bf(--super)) This tells the receiving side to attempt super-user
activities even if the receiving rsync wasn't run by the super-user. These
activities include: preserving users via the bf(--owner) option, preserving
-@@ -1758,7 +1762,7 @@ with older versions of rsync, but that also turns on the output of other
+@@ -1692,7 +1696,7 @@ with older versions of rsync, but that also turns on the output of other
verbose messages).
The "%i" escape has a cryptic output that is 11 letters long. The general
@@ -409,7 +409,7 @@
type of update being done, bf(X) is replaced by the file-type, and the
other letters represent attributes that may be output if they are being
modified.
-@@ -1817,6 +1821,8 @@ quote(itemization(
+@@ -1751,6 +1755,8 @@ quote(itemization(
it() The bf(f) means that the fileflags information changed.
it() The bf(a) means that the ACL information changed.
it() The bf(x) means that the extended attribute information changed.
@@ -613,3 +613,56 @@
fprintf(F," -l, --link-times display the time on a symlink\n");
fprintf(F," -L, --link-owner display the owner+group on a symlink\n");
#ifdef SUPPORT_XATTRS
+diff -up a/proto.h b/proto.h
+--- a/proto.h
++++ b/proto.h
+@@ -312,6 +312,8 @@ int do_stat(const char *fname, STRUCT_ST
+ int do_lstat(const char *fname, STRUCT_STAT *st);
+ int do_fstat(int fd, STRUCT_STAT *st);
+ OFF_T do_lseek(int fd, OFF_T offset, int whence);
++time_t get_create_time(const char *path);
++int set_create_time(const char *path, time_t crtime);
+ void set_compression(const char *fname);
+ void send_token(int f, int32 token, struct map_struct *buf, OFF_T offset,
+ int32 n, int32 toklen);
+diff -up a/rsync.1 b/rsync.1
+--- a/rsync.1
++++ b/rsync.1
+@@ -425,6 +425,7 @@ to the detailed description below for a
+ \-D same as \-\-devices \-\-specials
+ \-t, \-\-times preserve modification times
+ \-O, \-\-omit\-dir\-times omit directories from \-\-times
++ \-N, \-\-crtimes preserve create times (newness)
+ \-\-super receiver attempts super-user activities
+ \-\-fake\-super store/recover privileged attrs using xattrs
+ \-S, \-\-sparse handle sparse files efficiently
+@@ -1183,6 +1184,10 @@ it is preserving modification times (see
+ the directories on the receiving side, it is a good idea to use \fB\-O\fP.
+ This option is inferred if you use \fB\-\-backup\fP without \fB\-\-backup\-dir\fP.
+ .IP
++.IP "\fB\-N, \-\-crtimes\fP"
++This tells rsync to set the create times (newness) of
++the destination files to the same value as the source files.
++.IP
+ .IP "\fB\-\-super\fP"
+ This tells the receiving side to attempt super-user
+ activities even if the receiving rsync wasn't run by the super-user. These
+@@ -1938,7 +1943,7 @@ with older versions of rsync, but that a
+ verbose messages).
+ .IP
+ The \(lq%i\(rq escape has a cryptic output that is 11 letters long. The general
+-format is like the string \fBYXcstpogfax\fP, where \fBY\fP is replaced by the
++format is like the string \fBYXcstpogfaxn\fP, where \fBY\fP is replaced by the
+ type of update being done, \fBX\fP is replaced by the file-type, and the
+ other letters represent attributes that may be output if they are being
+ modified.
+@@ -2013,6 +2018,9 @@ The \fBf\fP means that the fileflags inf
+ The \fBa\fP means that the ACL information changed.
+ .IP o
+ The \fBx\fP means that the extended attribute information changed.
++.IP o
++A \fBn\fP means the create time (newness) is different and is being
++updated to the sender's value (requires \fB\-\-crtimes\fP).
+ .RE
+
+ .IP
Modified: trunk/dports/net/rsync/files/patch-fileflags.diff
===================================================================
--- trunk/dports/net/rsync/files/patch-fileflags.diff 2008-09-06 20:51:57 UTC (rev 39821)
+++ trunk/dports/net/rsync/files/patch-fileflags.diff 2008-09-06 22:37:30 UTC (rev 39822)
@@ -44,7 +44,7 @@
extern int preserve_acls;
extern int preserve_xattrs;
extern int need_messages_from_generator;
-@@ -60,7 +62,7 @@ extern iconv_t ic_send, ic_recv;
+@@ -61,7 +63,7 @@ extern char *iconv_opt;
#endif
/* These index values are for the file-list's extra-attribute array. */
@@ -52,8 +52,8 @@
+int uid_ndx, gid_ndx, fileflags_ndx, acls_ndx, xattrs_ndx, unsort_ndx;
int receiver_symlink_times = 0; /* receiver can set the time on a symlink */
-
-@@ -134,6 +136,8 @@ void setup_protocol(int f_out,int f_in)
+ int sender_symlink_iconv = 0; /* sender should convert symlink content */
+@@ -137,6 +139,8 @@ void setup_protocol(int f_out,int f_in)
uid_ndx = ++file_extra_cnt;
if (preserve_gid)
gid_ndx = ++file_extra_cnt;
@@ -85,7 +85,7 @@
extern int uid_ndx;
extern int gid_ndx;
extern int eol_nulls;
-@@ -390,6 +391,9 @@ static void send_file_entry(int f, const char *fname, struct file_struct *file,
+@@ -395,6 +396,9 @@ static void send_file_entry(int f, const char *fname, struct file_struct *file,
{
static time_t modtime;
static mode_t mode;
@@ -95,7 +95,7 @@
#ifdef SUPPORT_HARD_LINKS
static int64 dev;
#endif
-@@ -419,6 +423,14 @@ static void send_file_entry(int f, const char *fname, struct file_struct *file,
+@@ -424,6 +428,14 @@ static void send_file_entry(int f, const char *fname, struct file_struct *file,
xflags |= XMIT_SAME_MODE;
else
mode = file->mode;
@@ -110,7 +110,7 @@
if ((preserve_devices && IS_DEVICE(mode))
|| (preserve_specials && IS_SPECIAL(mode))) {
-@@ -533,6 +545,10 @@ static void send_file_entry(int f, const char *fname, struct file_struct *file,
+@@ -538,6 +550,10 @@ static void send_file_entry(int f, const char *fname, struct file_struct *file,
}
if (!(xflags & XMIT_SAME_MODE))
write_int(f, to_wire_mode(mode));
@@ -121,7 +121,7 @@
if (preserve_uid && !(xflags & XMIT_SAME_UID)) {
if (protocol_version < 30)
write_int(f, uid);
-@@ -621,6 +637,9 @@ static struct file_struct *recv_file_entry(struct file_list *flist,
+@@ -624,6 +640,9 @@ static struct file_struct *recv_file_entry(struct file_list *flist,
{
static int64 modtime;
static mode_t mode;
@@ -131,7 +131,7 @@
#ifdef SUPPORT_HARD_LINKS
static int64 dev;
#endif
-@@ -756,6 +775,10 @@ static struct file_struct *recv_file_entry(struct file_list *flist,
+@@ -759,6 +778,10 @@ static struct file_struct *recv_file_entry(struct file_list *flist,
if (chmod_modes && !S_ISLNK(mode))
mode = tweak_mode(mode, chmod_modes);
@@ -142,7 +142,7 @@
if (preserve_uid && !(xflags & XMIT_SAME_UID)) {
if (protocol_version < 30)
-@@ -889,6 +912,10 @@ static struct file_struct *recv_file_entry(struct file_list *flist,
+@@ -899,6 +922,10 @@ static struct file_struct *recv_file_entry(struct file_list *flist,
}
#endif
file->mode = mode;
@@ -153,7 +153,7 @@
if (preserve_uid)
F_OWNER(file) = uid;
if (preserve_gid) {
-@@ -1237,6 +1264,10 @@ struct file_struct *make_file(const char *fname, struct file_list *flist,
+@@ -1273,6 +1300,10 @@ struct file_struct *make_file(const char *fname, struct file_list *flist,
}
#endif
file->mode = st.st_mode;
@@ -164,7 +164,7 @@
if (uid_ndx) /* Check uid_ndx instead of preserve_uid for del support */
F_OWNER(file) = st.st_uid;
if (gid_ndx) /* Check gid_ndx instead of preserve_gid for del support */
-@@ -1355,6 +1386,7 @@ static struct file_struct *send_file_name(int f, struct file_list *flist,
+@@ -1427,6 +1458,7 @@ static struct file_struct *send_file_name(int f, struct file_list *flist,
#endif
#ifdef SUPPORT_XATTRS
if (preserve_xattrs) {
@@ -303,13 +303,13 @@
+ if (force_change && F_FFLAGS(file) & force_change)
+ undo_make_mutable(fname, F_FFLAGS(file));
+#endif
- if (allowed_lull && !(counter % lull_mod))
- maybe_send_keepalive();
- else if (!(counter & 0xFF))
+ if (counter >= loopchk_limit) {
+ if (allowed_lull)
+ maybe_send_keepalive();
diff --git a/log.c b/log.c
--- a/log.c
+++ b/log.c
-@@ -656,7 +656,7 @@ static void log_formatted(enum logcode code, const char *format, const char *op,
+@@ -660,7 +660,7 @@ static void log_formatted(enum logcode code, const char *format, const char *op,
c[5] = !(iflags & ITEM_REPORT_PERMS) ? '.' : 'p';
c[6] = !(iflags & ITEM_REPORT_OWNER) ? '.' : 'o';
c[7] = !(iflags & ITEM_REPORT_GROUP) ? '.' : 'g';
@@ -416,7 +416,7 @@
{"ignore-errors", 0, POPT_ARG_VAL, &ignore_errors, 1, 0, 0 },
{"no-ignore-errors", 0, POPT_ARG_VAL, &ignore_errors, 0, 0, 0 },
{"max-delete", 0, POPT_ARG_INT, &max_delete, 0, 0, 0 },
-@@ -1852,6 +1878,9 @@ void server_options(char **args, int *argc_p)
+@@ -1866,6 +1892,9 @@ void server_options(char **args, int *argc_p)
if (xfer_dirs && !recurse && delete_mode && am_sender)
args[ac++] = "--no-r";
@@ -426,7 +426,7 @@
if (do_compression && def_compress_level != Z_DEFAULT_COMPRESSION) {
if (asprintf(&arg, "--compress-level=%d", def_compress_level) < 0)
goto oom;
-@@ -1939,6 +1968,16 @@ void server_options(char **args, int *argc_p)
+@@ -1953,6 +1982,16 @@ void server_options(char **args, int *argc_p)
args[ac++] = "--delete-excluded";
if (force_delete)
args[ac++] = "--force";
@@ -590,7 +590,7 @@
#define ITEM_BASIS_TYPE_FOLLOWS (1<<11)
#define ITEM_XNAME_FOLLOWS (1<<12)
#define ITEM_IS_NEW (1<<13)
-@@ -460,6 +463,28 @@ typedef unsigned int size_t;
+@@ -462,6 +465,28 @@ typedef unsigned int size_t;
#endif
#endif
@@ -619,7 +619,7 @@
/* Find a variable that is either exactly 32-bits or longer.
* If some code depends on 32-bit truncation, it will need to
* take special action in a "#if SIZEOF_INT32 > 4" section. */
-@@ -630,6 +655,7 @@ extern int file_extra_cnt;
+@@ -632,6 +657,7 @@ extern int file_extra_cnt;
extern int inc_recurse;
extern int uid_ndx;
extern int gid_ndx;
@@ -627,7 +627,7 @@
extern int acls_ndx;
extern int xattrs_ndx;
-@@ -667,6 +693,11 @@ extern int xattrs_ndx;
+@@ -669,6 +695,11 @@ extern int xattrs_ndx;
/* When the associated option is on, all entries will have these present: */
#define F_OWNER(f) REQ_EXTRA(f, uid_ndx)->unum
#define F_GROUP(f) REQ_EXTRA(f, gid_ndx)->unum
@@ -711,7 +711,7 @@
dit(bf(--chmod)) This option tells rsync to apply one or more
comma-separated "chmod" strings to the permission of the files in the
transfer. The resulting value is treated as though it was the permissions
-@@ -1190,12 +1218,13 @@ See bf(--delete) (which is implied) for more details on file-deletion.
+@@ -1197,12 +1225,13 @@ See bf(--delete) (which is implied) for more details on file-deletion.
dit(bf(--ignore-errors)) Tells bf(--delete) to go ahead and delete files
even when there are I/O errors.
@@ -728,7 +728,7 @@
bf(--recursive) option was also enabled.
dit(bf(--max-delete=NUM)) This tells rsync not to delete more than NUM
-@@ -1651,7 +1680,7 @@ with older versions of rsync, but that also turns on the output of other
+@@ -1663,7 +1692,7 @@ with older versions of rsync, but that also turns on the output of other
verbose messages).
The "%i" escape has a cryptic output that is 11 letters long. The general
@@ -737,7 +737,7 @@
type of update being done, bf(X) is replaced by the file-type, and the
other letters represent attributes that may be output if they are being
modified.
-@@ -1707,7 +1736,7 @@ quote(itemization(
+@@ -1719,7 +1748,7 @@ quote(itemization(
sender's value (requires bf(--owner) and super-user privileges).
it() A bf(g) means the group is different and is being updated to the
sender's value (requires bf(--group) and the authority to set the group).
@@ -1060,7 +1060,7 @@
if (rsync_xal_get(fname, sxp->xattr) < 0) {
free_xattr(sxp);
return -1;
-@@ -861,6 +865,11 @@ int set_xattr(const char *fname, const struct file_struct *file,
+@@ -864,6 +868,11 @@ int set_xattr(const char *fname, const struct file_struct *file,
return -1;
}
@@ -1072,7 +1072,7 @@
ndx = F_XATTR(file);
return rsync_xal_set(fname, lst + ndx, fnamecmp, sxp);
}
-@@ -977,7 +986,7 @@ int set_stat_xattr(const char *fname, struct file_struct *file, mode_t new_mode)
+@@ -980,7 +989,7 @@ int set_stat_xattr(const char *fname, struct file_struct *file, mode_t new_mode)
mode = (fst.st_mode & _S_IFMT) | (fmode & ACCESSPERMS)
| (S_ISDIR(fst.st_mode) ? 0700 : 0600);
if (fst.st_mode != mode)
@@ -1224,7 +1224,7 @@
.IP "\fB\-\-chmod\fP"
This option tells rsync to apply one or more
comma-separated \(lqchmod\(rq strings to the permission of the files in the
-@@ -1360,13 +1392,14 @@ See \fB\-\-delete\fP (which is implied)
+@@ -1367,13 +1399,14 @@ See \fB\-\-delete\fP (which is implied)
Tells \fB\-\-delete\fP to go ahead and delete files
even when there are I/O errors.
.IP
@@ -1242,7 +1242,7 @@
\fB\-\-recursive\fP option was also enabled.
.IP
.IP "\fB\-\-max\-delete=NUM\fP"
-@@ -1893,7 +1926,7 @@ with older versions of rsync, but that a
+@@ -1905,7 +1938,7 @@ with older versions of rsync, but that a
verbose messages).
.IP
The \(lq%i\(rq escape has a cryptic output that is 11 letters long. The general
@@ -1251,7 +1251,7 @@
type of update being done, \fBX\fP is replaced by the file-type, and the
other letters represent attributes that may be output if they are being
modified.
-@@ -1963,7 +1996,7 @@ sender's value (requires \fB\-\-owner\fP
+@@ -1975,7 +2008,7 @@ sender's value (requires \fB\-\-owner\fP
A \fBg\fP means the group is different and is being updated to the
sender's value (requires \fB\-\-group\fP and the authority to set the group).
.IP o
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20080906/16f52cf8/attachment-0001.html
More information about the macports-changes
mailing list