[143792] trunk/dports/net/rsync
jimjag at macports.org
jimjag at macports.org
Mon Dec 21 13:32:41 PST 2015
Revision: 143792
https://trac.macports.org/changeset/143792
Author: jimjag at macports.org
Date: 2015-12-21 13:32:41 -0800 (Mon, 21 Dec 2015)
Log Message:
-----------
Update rsync to version 3.1.2
Modified Paths:
--------------
trunk/dports/net/rsync/Portfile
trunk/dports/net/rsync/files/patch-crtimes.diff
trunk/dports/net/rsync/files/patch-fileflags.diff
trunk/dports/net/rsync/files/patch-hfs-compression-options.diff
trunk/dports/net/rsync/files/patch-hfs-compression.diff
Modified: trunk/dports/net/rsync/Portfile
===================================================================
--- trunk/dports/net/rsync/Portfile 2015-12-21 21:16:15 UTC (rev 143791)
+++ trunk/dports/net/rsync/Portfile 2015-12-21 21:32:41 UTC (rev 143792)
@@ -4,7 +4,7 @@
PortSystem 1.0
name rsync
-version 3.1.1
+version 3.1.2
revision 0
categories net
license GPL-3+
@@ -21,14 +21,14 @@
master_sites http://rsync.samba.org/ftp/rsync/ \
http://rsync.samba.org/ftp/rsync/src/
-checksums md5 43bd6676f0b404326eee2d63be3cdcfe \
- sha1 c84faba04f721d393feccfa0476bfeed9b5b5250 \
- rmd160 de7ad955cb05d481a963aa30423790f3d82efe7b \
- sha256 7de4364fcf5fe42f3bdb514417f1c40d10bbca896abe7e7f2c581c6ea08a2621
+checksums md5 0f758d7e000c0f7f7d3792610fad70cb \
+ sha1 0d4c7fb7fe3fc80eeff922a7c1d81df11dbb8a1a \
+ rmd160 f7d6c0c9752af8d9eb933cffc6032c1763490a04 \
+ sha256 ecfa62a7fa3c4c18b9eccd8c16eaddee4bd308a76ea50b5c02a5840f09c0a1c2
depends_lib port:popt port:libiconv
-# these come from http://rsync.samba.org/ftp/rsync/rsync-patches-3.1.1.tar.gz
+# these come from http://rsync.samba.org/ftp/rsync/rsync-patches-3.1.2.tar.gz
# and need to be updated with each release
patchfiles patch-fileflags.diff \
patch-crtimes.diff \
Modified: trunk/dports/net/rsync/files/patch-crtimes.diff
===================================================================
--- trunk/dports/net/rsync/files/patch-crtimes.diff 2015-12-21 21:16:15 UTC (rev 143791)
+++ trunk/dports/net/rsync/files/patch-crtimes.diff 2015-12-21 21:32:41 UTC (rev 143792)
@@ -13,7 +13,7 @@
diff --git a/compat.c b/compat.c
--- a/compat.c
+++ b/compat.c
-@@ -48,6 +48,7 @@ extern int force_change;
+@@ -49,6 +49,7 @@ extern int force_change;
extern int protect_args;
extern int preserve_uid;
extern int preserve_gid;
@@ -21,7 +21,7 @@
extern int preserve_fileflags;
extern int preserve_acls;
extern int preserve_xattrs;
-@@ -66,7 +67,7 @@ extern char *iconv_opt;
+@@ -67,7 +68,7 @@ extern char *iconv_opt;
#endif
/* These index values are for the file-list's extra-attribute array. */
@@ -30,7 +30,7 @@
int receiver_symlink_times = 0; /* receiver can set the time on a symlink */
int sender_symlink_iconv = 0; /* sender should convert symlink content */
-@@ -144,6 +145,8 @@ void setup_protocol(int f_out,int f_in)
+@@ -146,6 +147,8 @@ void setup_protocol(int f_out,int f_in)
uid_ndx = ++file_extra_cnt;
if (preserve_gid)
gid_ndx = ++file_extra_cnt;
@@ -227,7 +227,7 @@
}
}
-@@ -1250,6 +1270,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
+@@ -1251,6 +1271,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
return;
}
}
@@ -270,7 +270,7 @@
diff --git a/log.c b/log.c
--- a/log.c
+++ b/log.c
-@@ -723,7 +723,8 @@ static void log_formatted(enum logcode code, const char *format, const char *op,
+@@ -712,7 +712,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';
@@ -291,7 +291,7 @@
int update_only = 0;
int cvs_exclude = 0;
int dry_run = 0;
-@@ -718,6 +719,7 @@ void usage(enum logcode F)
+@@ -716,6 +717,7 @@ void usage(enum logcode F)
rprintf(F," --specials preserve special files\n");
rprintf(F," -D same as --devices --specials\n");
rprintf(F," -t, --times preserve modification times\n");
@@ -299,7 +299,7 @@
rprintf(F," -O, --omit-dir-times omit directories from --times\n");
rprintf(F," -J, --omit-link-times omit symlinks from --times\n");
rprintf(F," --super receiver attempts super-user activities\n");
-@@ -885,6 +887,9 @@ static struct poptOption long_options[] = {
+@@ -883,6 +885,9 @@ static struct poptOption long_options[] = {
{"times", 't', POPT_ARG_VAL, &preserve_times, 1, 0, 0 },
{"no-times", 0, POPT_ARG_VAL, &preserve_times, 0, 0, 0 },
{"no-t", 0, POPT_ARG_VAL, &preserve_times, 0, 0, 0 },
@@ -309,7 +309,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 },
-@@ -2465,6 +2470,8 @@ void server_options(char **args, int *argc_p)
+@@ -2463,6 +2468,8 @@ void server_options(char **args, int *argc_p)
argstr[x++] = 'D';
if (preserve_times)
argstr[x++] = 't';
@@ -329,9 +329,9 @@
+ if (sxp->st.st_ino == 2 && S_ISDIR(sxp->st.st_mode))
+ flags |= ATTRS_SKIP_CRTIME;
if (!(flags & ATTRS_SKIP_MTIME)
- && cmp_time(sxp->st.st_mtime, file->modtime) != 0) {
- int ret = set_modtime(fname, file->modtime, F_MOD_NSEC(file), sxp->st.st_mode, ST_FLAGS(sxp->st));
-@@ -594,6 +597,14 @@ int set_file_attrs(const char *fname, struct file_struct *file, stat_x *sxp,
+ && (sxp->st.st_mtime != file->modtime
+ #ifdef ST_MTIME_NSEC
+@@ -598,6 +601,14 @@ int set_file_attrs(const char *fname, struct file_struct *file, stat_x *sxp,
else
file->flags |= FLAG_TIME_FAILED;
}
@@ -346,7 +346,7 @@
#ifdef SUPPORT_ACLS
/* It's OK to call set_acl() now, even for a dir, as the generator
-@@ -710,7 +721,7 @@ int finish_transfer(const char *fname, const char *fnametmp,
+@@ -714,7 +725,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
@@ -355,7 +355,7 @@
/* move tmp file over real file */
if (DEBUG_GTE(RECV, 1))
-@@ -739,7 +750,7 @@ int finish_transfer(const char *fname, const char *fnametmp,
+@@ -743,7 +754,7 @@ int finish_transfer(const char *fname, const char *fnametmp,
do_set_file_attrs:
set_file_attrs(fnametmp, file, NULL, fnamecmp,
@@ -410,7 +410,7 @@
#define DEV_EXTRA_CNT 2
#define DIRNODE_EXTRA_CNT 3
#define SUM_EXTRA_CNT ((MAX_DIGEST_LEN + EXTRA_LEN - 1) / EXTRA_LEN)
-@@ -1022,6 +1026,7 @@ typedef struct {
+@@ -1021,6 +1025,7 @@ typedef struct {
typedef struct {
STRUCT_STAT st;
@@ -429,7 +429,7 @@
-O, --omit-dir-times omit directories from --times
-J, --omit-link-times omit symlinks from --times
--super receiver attempts super-user activities
-@@ -1201,6 +1202,9 @@ cause the next transfer to behave as if it used bf(-I), causing all files to be
+@@ -1208,6 +1209,9 @@ cause the next transfer to behave as if it used bf(-I), causing all files to be
updated (though rsync's delta-transfer algorithm will make the update fairly efficient
if the files haven't actually changed, you're much better off using bf(-t)).
@@ -439,7 +439,7 @@
dit(bf(-O, --omit-dir-times)) This tells rsync to omit directories when
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).
-@@ -2103,7 +2107,7 @@ with older versions of rsync, but that also turns on the output of other
+@@ -2110,7 +2114,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
@@ -448,7 +448,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.
-@@ -2162,6 +2166,8 @@ quote(itemization(
+@@ -2169,6 +2173,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.
@@ -683,7 +683,7 @@
diff -Nurp a/proto.h b/proto.h
--- a/proto.h
+++ b/proto.h
-@@ -327,6 +327,8 @@ int do_stat(const char *fname, STRUCT_ST
+@@ -328,6 +328,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);
@@ -703,7 +703,7 @@
\-O, \-\-omit\-dir\-times omit directories from \-\-times
\-J, \-\-omit\-link\-times omit symlinks from \-\-times
\-\-super receiver attempts super\-user activities
-@@ -1379,6 +1380,10 @@ cause the next transfer to behave as if
+@@ -1386,6 +1387,10 @@ cause the next transfer to behave as if
updated (though rsync\(cq\&s delta\-transfer algorithm will make the update fairly efficient
if the files haven\(cq\&t actually changed, you\(cq\&re much better off using \fB\-t\fP).
.IP
@@ -714,7 +714,7 @@
.IP "\fB\-O, \-\-omit\-dir\-times\fP"
This tells rsync to omit directories when
it is preserving modification times (see \fB\-\-times\fP). If NFS is sharing
-@@ -2390,7 +2395,7 @@ with older versions of rsync, but that a
+@@ -2397,7 +2402,7 @@ with older versions of rsync, but that a
verbose messages).
.IP
The \(dq\&%i\(dq\& escape has a cryptic output that is 11 letters long. The general
@@ -723,7 +723,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.
-@@ -2465,6 +2470,9 @@ The \fBf\fP means that the fileflags inf
+@@ -2472,6 +2477,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.
Modified: trunk/dports/net/rsync/files/patch-fileflags.diff
===================================================================
--- trunk/dports/net/rsync/files/patch-fileflags.diff 2015-12-21 21:16:15 UTC (rev 143791)
+++ trunk/dports/net/rsync/files/patch-fileflags.diff 2015-12-21 21:32:41 UTC (rev 143792)
@@ -8,11 +8,11 @@
./configure
make
-based-on: 7cb0de6326c915a72253fd103dae93308031ec3f
+based-on: 16b49716d55a50f2e985b879b720b2c53c892a3a
diff --git a/Makefile.in b/Makefile.in
--- a/Makefile.in
+++ b/Makefile.in
-@@ -45,7 +45,7 @@ popt_OBJS=popt/findme.o popt/popt.o popt/poptconfig.o \
+@@ -46,7 +46,7 @@ popt_OBJS=popt/findme.o popt/popt.o popt/poptconfig.o \
popt/popthelp.o popt/poptparse.o
OBJS=$(OBJS1) $(OBJS2) $(OBJS3) $(DAEMON_OBJ) $(LIBOBJ) @BUILD_ZLIB@ @BUILD_POPT@
@@ -21,7 +21,7 @@
# Programs we must have to run the test cases
CHECK_PROGS = rsync$(EXEEXT) tls$(EXEEXT) getgroups$(EXEEXT) getfsdev$(EXEEXT) \
-@@ -127,7 +127,7 @@ getgroups$(EXEEXT): getgroups.o
+@@ -128,7 +128,7 @@ getgroups$(EXEEXT): getgroups.o
getfsdev$(EXEEXT): getfsdev.o
$(CC) $(CFLAGS) $(LDFLAGS) -o $@ getfsdev.o $(LIBS)
@@ -33,7 +33,7 @@
diff --git a/compat.c b/compat.c
--- a/compat.c
+++ b/compat.c
-@@ -44,9 +44,11 @@ extern int checksum_seed;
+@@ -45,9 +45,11 @@ extern int checksum_seed;
extern int basis_dir_cnt;
extern int prune_empty_dirs;
extern int protocol_version;
@@ -45,7 +45,7 @@
extern int preserve_acls;
extern int preserve_xattrs;
extern int need_messages_from_generator;
-@@ -64,7 +66,7 @@ extern char *iconv_opt;
+@@ -65,7 +67,7 @@ extern char *iconv_opt;
#endif
/* These index values are for the file-list's extra-attribute array. */
@@ -54,7 +54,7 @@
int receiver_symlink_times = 0; /* receiver can set the time on a symlink */
int sender_symlink_iconv = 0; /* sender should convert symlink content */
-@@ -142,6 +144,8 @@ void setup_protocol(int f_out,int f_in)
+@@ -144,6 +146,8 @@ void setup_protocol(int f_out,int f_in)
uid_ndx = ++file_extra_cnt;
if (preserve_gid)
gid_ndx = ++file_extra_cnt;
@@ -66,7 +66,7 @@
diff --git a/configure.ac b/configure.ac
--- a/configure.ac
+++ b/configure.ac
-@@ -597,6 +597,7 @@ AC_FUNC_UTIME_NULL
+@@ -593,6 +593,7 @@ AC_FUNC_UTIME_NULL
AC_FUNC_ALLOCA
AC_CHECK_FUNCS(waitpid wait4 getcwd strdup chown chmod lchmod mknod mkfifo \
fchmod fstat ftruncate strchr readlink link utime utimes lutimes strftime \
@@ -257,7 +257,7 @@
#ifdef SUPPORT_ACLS
if (preserve_acls && !S_ISLNK(file->mode)) {
if (!ACL_READY(*sxp))
-@@ -1395,6 +1406,10 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
+@@ -1408,6 +1419,10 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
file->mode = dest_mode(file->mode, sx.st.st_mode,
dflt_perms, statret == 0);
}
@@ -268,7 +268,7 @@
if (statret != 0 && basis_dir[0] != NULL) {
int j = try_dests_non(file, fname, ndx, fnamecmpbuf, &sx,
itemizing, code);
-@@ -1439,10 +1454,15 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
+@@ -1452,10 +1467,15 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
* readable and writable permissions during the time we are
* putting files within them. This is then restored to the
* former permissions after the transfer is done. */
@@ -285,7 +285,7 @@
rsyserr(FERROR_XFER, errno,
"failed to modify permissions on %s",
full_fname(fname));
-@@ -1477,6 +1497,10 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
+@@ -1491,6 +1511,10 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
file->mode = dest_mode(file->mode, sx.st.st_mode, dflt_perms,
exists);
}
@@ -296,7 +296,7 @@
#ifdef SUPPORT_HARD_LINKS
if (preserve_hard_links && F_HLINK_NOT_FIRST(file)
-@@ -2045,13 +2069,17 @@ static void touch_up_dirs(struct file_list *flist, int ndx)
+@@ -2059,13 +2083,17 @@ static void touch_up_dirs(struct file_list *flist, int ndx)
continue;
fname = f_name(file, NULL);
if (fix_dir_perms)
@@ -319,7 +319,7 @@
diff --git a/log.c b/log.c
--- a/log.c
+++ b/log.c
-@@ -720,7 +720,7 @@ static void log_formatted(enum logcode code, const char *format, const char *op,
+@@ -709,7 +709,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';
@@ -349,7 +349,7 @@
extern int file_total;
extern int recurse;
extern int xfer_dirs;
-@@ -839,6 +843,22 @@ static int do_recv(int f_in, int f_out, char *local_name)
+@@ -840,6 +844,22 @@ static int do_recv(int f_in, int f_out, char *local_name)
* points to an identical file won't be replaced by the referent. */
copy_links = copy_dirlinks = copy_unsafe_links = 0;
@@ -391,7 +391,7 @@
int io_timeout = 0;
int prune_empty_dirs = 0;
int use_qsort = 0;
-@@ -574,6 +576,7 @@ static void print_rsync_version(enum logcode f)
+@@ -572,6 +574,7 @@ static void print_rsync_version(enum logcode f)
char const *links = "no ";
char const *iconv = "no ";
char const *ipv6 = "no ";
@@ -399,7 +399,7 @@
STRUCT_STAT *dumstat;
#if SUBPROTOCOL_VERSION != 0
-@@ -610,6 +613,9 @@ static void print_rsync_version(enum logcode f)
+@@ -608,6 +611,9 @@ static void print_rsync_version(enum logcode f)
#ifdef CAN_SET_SYMLINK_TIMES
symtimes = "";
#endif
@@ -409,7 +409,7 @@
rprintf(f, "%s version %s protocol version %d%s\n",
RSYNC_NAME, RSYNC_VERSION, PROTOCOL_VERSION, subprotocol);
-@@ -623,8 +629,8 @@ static void print_rsync_version(enum logcode f)
+@@ -621,8 +627,8 @@ static void print_rsync_version(enum logcode f)
(int)(sizeof (int64) * 8));
rprintf(f, " %ssocketpairs, %shardlinks, %ssymlinks, %sIPv6, batchfiles, %sinplace,\n",
got_socketpair, hardlinks, links, ipv6, have_inplace);
@@ -420,7 +420,7 @@
#ifdef MAINTAINER_MODE
rprintf(f, "Panic Action: \"%s\"\n", get_panic_action());
-@@ -695,6 +701,9 @@ void usage(enum logcode F)
+@@ -693,6 +699,9 @@ void usage(enum logcode F)
rprintf(F," -K, --keep-dirlinks treat symlinked dir on receiver as dir\n");
rprintf(F," -H, --hard-links preserve hard links\n");
rprintf(F," -p, --perms preserve permissions\n");
@@ -430,7 +430,7 @@
rprintf(F," -E, --executability preserve the file's executability\n");
rprintf(F," --chmod=CHMOD affect file and/or directory permissions\n");
#ifdef SUPPORT_ACLS
-@@ -740,7 +749,12 @@ void usage(enum logcode F)
+@@ -738,7 +747,12 @@ void usage(enum logcode F)
rprintf(F," --ignore-missing-args ignore missing source args without error\n");
rprintf(F," --delete-missing-args delete missing source args from destination\n");
rprintf(F," --ignore-errors delete even if there are I/O errors\n");
@@ -444,7 +444,7 @@
rprintf(F," --max-delete=NUM don't delete more than NUM files\n");
rprintf(F," --max-size=SIZE don't transfer any file larger than SIZE\n");
rprintf(F," --min-size=SIZE don't transfer any file smaller than SIZE\n");
-@@ -857,6 +871,10 @@ static struct poptOption long_options[] = {
+@@ -855,6 +869,10 @@ static struct poptOption long_options[] = {
{"perms", 'p', POPT_ARG_VAL, &preserve_perms, 1, 0, 0 },
{"no-perms", 0, POPT_ARG_VAL, &preserve_perms, 0, 0, 0 },
{"no-p", 0, POPT_ARG_VAL, &preserve_perms, 0, 0, 0 },
@@ -455,7 +455,7 @@
{"executability", 'E', POPT_ARG_NONE, &preserve_executability, 0, 0, 0 },
{"acls", 'A', POPT_ARG_NONE, 0, 'A', 0, 0 },
{"no-acls", 0, POPT_ARG_VAL, &preserve_acls, 0, 0, 0 },
-@@ -943,6 +961,14 @@ static struct poptOption long_options[] = {
+@@ -941,6 +959,14 @@ static struct poptOption long_options[] = {
{"remove-source-files",0,POPT_ARG_VAL, &remove_source_files, 1, 0, 0 },
{"force", 0, POPT_ARG_VAL, &force_delete, 1, 0, 0 },
{"no-force", 0, POPT_ARG_VAL, &force_delete, 0, 0, 0 },
@@ -470,7 +470,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 },
-@@ -2537,6 +2563,9 @@ void server_options(char **args, int *argc_p)
+@@ -2539,6 +2565,9 @@ void server_options(char **args, int *argc_p)
if (xfer_dirs && !recurse && delete_mode && am_sender)
args[ac++] = "--no-r";
@@ -480,7 +480,7 @@
if (do_compression && def_compress_level != Z_DEFAULT_COMPRESSION) {
if (asprintf(&arg, "--compress-level=%d", def_compress_level) < 0)
goto oom;
-@@ -2624,6 +2653,16 @@ void server_options(char **args, int *argc_p)
+@@ -2626,6 +2655,16 @@ void server_options(char **args, int *argc_p)
args[ac++] = "--delete-excluded";
if (force_delete)
args[ac++] = "--force";
@@ -557,16 +557,16 @@
/* We shouldn't have attempted to change uid
* or gid unless have the privilege. */
rsyserr(FERROR_XFER, errno, "%s %s failed",
-@@ -549,7 +583,7 @@ int set_file_attrs(const char *fname, struct file_struct *file, stat_x *sxp,
- flags |= ATTRS_SKIP_MTIME;
- if (!(flags & ATTRS_SKIP_MTIME)
- && cmp_time(sxp->st.st_mtime, file->modtime) != 0) {
+@@ -553,7 +587,7 @@ int set_file_attrs(const char *fname, struct file_struct *file, stat_x *sxp,
+ || (NSEC_BUMP(file) && (uint32)sxp->st.ST_MTIME_NSEC != F_MOD_NSEC(file))
+ #endif
+ )) {
- int ret = set_modtime(fname, file->modtime, F_MOD_NSEC(file), sxp->st.st_mode);
+ int ret = set_modtime(fname, file->modtime, F_MOD_NSEC(file), sxp->st.st_mode, ST_FLAGS(sxp->st));
if (ret < 0) {
rsyserr(FERROR_XFER, errno, "failed to set times on %s",
full_fname(fname));
-@@ -576,7 +610,7 @@ int set_file_attrs(const char *fname, struct file_struct *file, stat_x *sxp,
+@@ -580,7 +614,7 @@ int set_file_attrs(const char *fname, struct file_struct *file, stat_x *sxp,
#ifdef HAVE_CHMOD
if (!BITS_EQUAL(sxp->st.st_mode, new_mode, CHMOD_BITS)) {
@@ -575,7 +575,7 @@
if (ret < 0) {
rsyserr(FERROR_XFER, errno,
"failed to set permissions on %s",
-@@ -588,6 +622,19 @@ int set_file_attrs(const char *fname, struct file_struct *file, stat_x *sxp,
+@@ -592,6 +626,19 @@ int set_file_attrs(const char *fname, struct file_struct *file, stat_x *sxp,
}
#endif
@@ -595,7 +595,7 @@
if (INFO_GTE(NAME, 2) && flags & ATTRS_REPORT) {
if (updated)
rprintf(FCLIENT, "%s\n", fname);
-@@ -662,7 +709,8 @@ int finish_transfer(const char *fname, const char *fnametmp,
+@@ -666,7 +713,8 @@ int finish_transfer(const char *fname, const char *fnametmp,
/* Change permissions before putting the file into place. */
set_file_attrs(fnametmp, file, NULL, fnamecmp,
@@ -605,7 +605,7 @@
/* move tmp file over real file */
if (DEBUG_GTE(RECV, 1))
-@@ -679,6 +727,10 @@ int finish_transfer(const char *fname, const char *fnametmp,
+@@ -683,6 +731,10 @@ int finish_transfer(const char *fname, const char *fnametmp,
}
if (ret == 0) {
/* The file was moved into place (not copied), so it's done. */
@@ -715,7 +715,7 @@
--max-delete=NUM don't delete more than NUM files
--max-size=SIZE don't transfer any file larger than SIZE
--min-size=SIZE don't transfer any file smaller than SIZE
-@@ -644,7 +648,8 @@ specified, in which case bf(-r) is not implied.
+@@ -646,7 +650,8 @@ specified, in which case bf(-r) is not implied.
Note that bf(-a) bf(does not preserve hardlinks), because
finding multiply-linked files is expensive. You must separately
@@ -725,7 +725,7 @@
dit(--no-OPTION) You may turn off one or more implied options by prefixing
the option name with "no-". Not all options may be prefixed with a "no-":
-@@ -943,7 +948,7 @@ they would be using bf(--copy-links).
+@@ -950,7 +955,7 @@ they would be using bf(--copy-links).
Without this option, if the sending side has replaced a directory with a
symlink to a directory, the receiving side will delete anything that is in
the way of the new symlink, including a directory hierarchy (as long as
@@ -734,7 +734,7 @@
See also bf(--keep-dirlinks) for an analogous option for the receiving
side.
-@@ -1106,6 +1111,29 @@ Note that this option does not copy rsyncs special xattr values (e.g. those
+@@ -1113,6 +1118,29 @@ Note that this option does not copy rsyncs special xattr values (e.g. those
used by bf(--fake-super)) unless you repeat the option (e.g. -XX). This
"copy all xattrs" mode cannot be used with bf(--fake-super).
@@ -764,7 +764,7 @@
dit(bf(--chmod)) This option tells rsync to apply one or more
comma-separated "chmod" modes to the permission of the files in the
transfer. The resulting value is treated as though it were the permissions
-@@ -1435,12 +1463,13 @@ display as a "*missing" entry in the bf(--list-only) output.
+@@ -1442,12 +1470,13 @@ display as a "*missing" entry in the bf(--list-only) output.
dit(bf(--ignore-errors)) Tells bf(--delete) to go ahead and delete files
even when there are I/O errors.
@@ -781,7 +781,7 @@
bf(--recursive) option was also enabled.
dit(bf(--max-delete=NUM)) This tells rsync not to delete more than NUM
-@@ -2074,7 +2103,7 @@ with older versions of rsync, but that also turns on the output of other
+@@ -2081,7 +2110,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
@@ -790,7 +790,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.
-@@ -2130,7 +2159,7 @@ quote(itemization(
+@@ -2137,7 +2166,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).
@@ -1143,7 +1143,7 @@
diff -Nurp a/configure.sh b/configure.sh
--- a/configure.sh
+++ b/configure.sh
-@@ -7652,6 +7652,7 @@ fi
+@@ -7687,6 +7687,7 @@ fi
for ac_func in waitpid wait4 getcwd strdup chown chmod lchmod mknod mkfifo \
fchmod fstat ftruncate strchr readlink link utime utimes lutimes strftime \
@@ -1154,7 +1154,7 @@
diff -Nurp a/proto.h b/proto.h
--- a/proto.h
+++ b/proto.h
-@@ -286,6 +286,8 @@ int read_ndx_and_attrs(int f_in, int f_o
+@@ -287,6 +287,8 @@ int read_ndx_and_attrs(int f_in, int f_o
void free_sums(struct sum_struct *s);
mode_t dest_mode(mode_t flist_mode, mode_t stat_mode, int dflt_perms,
int exists);
@@ -1162,8 +1162,8 @@
+int undo_make_mutable(const char *fname, uint32 fileflags);
int set_file_attrs(const char *fname, struct file_struct *file, stat_x *sxp,
const char *fnamecmp, int flags);
- RETSIGTYPE sig_int(int sig_num);
-@@ -310,11 +312,12 @@ int do_unlink(const char *fname);
+ void sig_int(int sig_num);
+@@ -311,11 +313,12 @@ int do_unlink(const char *fname);
int do_symlink(const char *lnk, const char *fname);
ssize_t do_readlink(const char *path, char *buf, size_t bufsiz);
int do_link(const char *fname1, const char *fname2);
@@ -1178,7 +1178,7 @@
int do_rename(const char *fname1, const char *fname2);
int do_ftruncate(int fd, OFF_T size);
void trim_trailing_slashes(char *name);
-@@ -353,7 +356,7 @@ void set_nonblocking(int fd);
+@@ -354,7 +357,7 @@ void set_nonblocking(int fd);
void set_blocking(int fd);
int fd_pair(int fd[2]);
void print_child_argv(const char *prefix, char **cmd);
@@ -1210,7 +1210,7 @@
\-\-max\-delete=NUM don'\&t delete more than NUM files
\-\-max\-size=SIZE don'\&t transfer any file larger than SIZE
\-\-min\-size=SIZE don'\&t transfer any file smaller than SIZE
-@@ -743,7 +747,8 @@ specified, in which case \fB\-r\fP is no
+@@ -745,7 +749,8 @@ specified, in which case \fB\-r\fP is no
.IP
Note that \fB\-a\fP \fBdoes not preserve hardlinks\fP, because
finding multiply\-linked files is expensive. You must separately
@@ -1220,7 +1220,7 @@
.IP
.IP "\-\-no\-OPTION"
You may turn off one or more implied options by prefixing
-@@ -1080,7 +1085,7 @@ they would be using \fB\-\-copy\-links\f
+@@ -1087,7 +1092,7 @@ they would be using \fB\-\-copy\-links\f
Without this option, if the sending side has replaced a directory with a
symlink to a directory, the receiving side will delete anything that is in
the way of the new symlink, including a directory hierarchy (as long as
@@ -1229,7 +1229,7 @@
.IP
See also \fB\-\-keep\-dirlinks\fP for an analogous option for the receiving
side.
-@@ -1267,6 +1272,33 @@ Note that this option does not copy rsyn
+@@ -1274,6 +1279,33 @@ Note that this option does not copy rsyn
used by \fB\-\-fake\-super\fP) unless you repeat the option (e.g. \-XX). This
\(dq\© all xattrs\(dq\& mode cannot be used with \fB\-\-fake\-super\fP.
.IP
@@ -1263,7 +1263,7 @@
.IP "\fB\-\-chmod\fP"
This option tells rsync to apply one or more
comma\-separated \(dq\&chmod\(dq\& modes to the permission of the files in the
-@@ -1633,13 +1665,14 @@ display as a \(dq\&*missing\(dq\& entry
+@@ -1640,13 +1672,14 @@ display as a \(dq\&*missing\(dq\& entry
Tells \fB\-\-delete\fP to go ahead and delete files
even when there are I/O errors.
.IP
@@ -1281,7 +1281,7 @@
\fB\-\-recursive\fP option was also enabled.
.IP
.IP "\fB\-\-max\-delete=NUM\fP"
-@@ -2357,7 +2390,7 @@ with older versions of rsync, but that a
+@@ -2364,7 +2397,7 @@ with older versions of rsync, but that a
verbose messages).
.IP
The \(dq\&%i\(dq\& escape has a cryptic output that is 11 letters long. The general
@@ -1290,7 +1290,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.
-@@ -2427,7 +2460,7 @@ sender\(cq\&s value (requires \fB\-\-own
+@@ -2434,7 +2467,7 @@ sender\(cq\&s value (requires \fB\-\-own
A \fBg\fP means the group is different and is being updated to the
sender\(cq\&s value (requires \fB\-\-group\fP and the authority to set the group).
.IP o
Modified: trunk/dports/net/rsync/files/patch-hfs-compression-options.diff
===================================================================
--- trunk/dports/net/rsync/files/patch-hfs-compression-options.diff 2015-12-21 21:16:15 UTC (rev 143791)
+++ trunk/dports/net/rsync/files/patch-hfs-compression-options.diff 2015-12-21 21:32:41 UTC (rev 143792)
@@ -1,7 +1,7 @@
diff --git a/options.c b/options.c
--- a/options.c
+++ b/options.c
-@@ -579,6 +579,7 @@
+@@ -577,6 +577,7 @@
char const *iconv = "no ";
char const *ipv6 = "no ";
char const *fileflags = "no ";
@@ -9,7 +9,7 @@
STRUCT_STAT *dumstat;
#if SUBPROTOCOL_VERSION != 0
-@@ -618,6 +619,9 @@
+@@ -616,6 +617,9 @@
#ifdef SUPPORT_FILEFLAGS
fileflags = "";
#endif
@@ -19,7 +19,7 @@
rprintf(f, "%s version %s protocol version %d%s\n",
RSYNC_NAME, RSYNC_VERSION, PROTOCOL_VERSION, subprotocol);
-@@ -631,8 +635,10 @@
+@@ -629,8 +633,10 @@
(int)(sizeof (int64) * 8));
rprintf(f, " %ssocketpairs, %shardlinks, %ssymlinks, %sIPv6, batchfiles, %sinplace,\n",
got_socketpair, hardlinks, links, ipv6, have_inplace);
Modified: trunk/dports/net/rsync/files/patch-hfs-compression.diff
===================================================================
--- trunk/dports/net/rsync/files/patch-hfs-compression.diff 2015-12-21 21:16:15 UTC (rev 143791)
+++ trunk/dports/net/rsync/files/patch-hfs-compression.diff 2015-12-21 21:32:41 UTC (rev 143792)
@@ -43,7 +43,7 @@
extern int preserve_links;
extern int preserve_devices;
extern int preserve_specials;
-@@ -1762,6 +1763,14 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
+@@ -1776,6 +1777,14 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
fname, fnamecmpbuf);
}
sx.st.st_size = F_LENGTH(fuzzy_file);
@@ -58,7 +58,7 @@
statret = 0;
fnamecmp = fnamecmpbuf;
}
-@@ -1929,6 +1938,18 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
+@@ -1943,6 +1952,18 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
if (read_batch)
goto cleanup;
@@ -162,7 +162,7 @@
extern int protocol_version;
extern int force_change;
extern int file_total;
-@@ -107,6 +112,7 @@ int daemon_over_rsh = 0;
+@@ -108,6 +113,7 @@ int daemon_over_rsh = 0;
mode_t orig_umask = 0;
int batch_gen_fd = -1;
int sender_keeps_checksum = 0;
@@ -170,7 +170,7 @@
/* There's probably never more than at most 2 outstanding child processes,
* but set it higher, just in case. */
-@@ -559,6 +565,43 @@ static pid_t do_cmd(char *cmd, char *machine, char *user, char **remote_argv, in
+@@ -560,6 +566,43 @@ static pid_t do_cmd(char *cmd, char *machine, char *user, char **remote_argv, in
return 0; /* not reached */
}
@@ -214,7 +214,7 @@
/* The receiving side operates in one of two modes:
*
* 1. it receives any number of files into a destination directory,
-@@ -617,6 +660,9 @@ static char *get_local_name(struct file_list *flist, char *dest_path)
+@@ -618,6 +661,9 @@ static char *get_local_name(struct file_list *flist, char *dest_path)
exit_cleanup(RERR_FILESELECT);
}
filesystem_dev = st.st_dev; /* ensures --force works right w/-x */
@@ -224,7 +224,7 @@
return NULL;
}
if (file_total > 1) {
-@@ -677,7 +723,9 @@ static char *get_local_name(struct file_list *flist, char *dest_path)
+@@ -678,7 +724,9 @@ static char *get_local_name(struct file_list *flist, char *dest_path)
full_fname(dest_path));
exit_cleanup(RERR_FILESELECT);
}
@@ -235,7 +235,7 @@
return NULL;
}
-@@ -697,6 +745,9 @@ static char *get_local_name(struct file_list *flist, char *dest_path)
+@@ -698,6 +746,9 @@ static char *get_local_name(struct file_list *flist, char *dest_path)
full_fname(dest_path));
exit_cleanup(RERR_FILESELECT);
}
@@ -256,7 +256,7 @@
int preserve_perms = 0;
int preserve_fileflags = 0;
int preserve_executability = 0;
-@@ -713,6 +714,10 @@ void usage(enum logcode F)
+@@ -711,6 +712,10 @@ void usage(enum logcode F)
#ifdef SUPPORT_XATTRS
rprintf(F," -X, --xattrs preserve extended attributes\n");
#endif
@@ -267,7 +267,7 @@
rprintf(F," -o, --owner preserve owner (super-user only)\n");
rprintf(F," -g, --group preserve group\n");
rprintf(F," --devices preserve device files (super-user only)\n");
-@@ -974,6 +979,12 @@ static struct poptOption long_options[] = {
+@@ -972,6 +977,12 @@ static struct poptOption long_options[] = {
{"force-uchange", 0, POPT_ARG_VAL, &force_change, USR_IMMUTABLE, 0, 0 },
{"force-schange", 0, POPT_ARG_VAL, &force_change, SYS_IMMUTABLE, 0, 0 },
#endif
@@ -280,7 +280,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 },
-@@ -1974,6 +1985,15 @@ int parse_arguments(int *argc_p, const char ***argv_p)
+@@ -1972,6 +1983,15 @@ int parse_arguments(int *argc_p, const char ***argv_p)
}
#endif
@@ -296,7 +296,7 @@
if (block_size > MAX_BLOCK_SIZE) {
snprintf(err_buf, sizeof err_buf,
"--block-size=%lu is too large (max: %u)\n", block_size, MAX_BLOCK_SIZE);
-@@ -2573,6 +2593,11 @@ void server_options(char **args, int *argc_p)
+@@ -2575,6 +2595,11 @@ void server_options(char **args, int *argc_p)
if (preserve_fileflags)
args[ac++] = "--fileflags";
@@ -332,12 +332,12 @@
flags |= ATTRS_SKIP_CRTIME;
if (!(flags & ATTRS_SKIP_MTIME)
+#ifdef SUPPORT_HFS_COMPRESSION
-+ && !(sxp->st.st_flags & UF_COMPRESSED) /* setting this alters mtime, so defer to after set_fileflags */
++ && !(sxp->st.st_flags & UF_COMPRESSED) /* setting this alters mtime, so defer to after set_fileflags */
+#endif
- && cmp_time(sxp->st.st_mtime, file->modtime) != 0) {
- int ret = set_modtime(fname, file->modtime, F_MOD_NSEC(file), sxp->st.st_mode, ST_FLAGS(sxp->st));
- if (ret < 0) {
-@@ -643,6 +652,16 @@ int set_file_attrs(const char *fname, struct file_struct *file, stat_x *sxp,
+ && (sxp->st.st_mtime != file->modtime
+ #ifdef ST_MTIME_NSEC
+ || (NSEC_BUMP(file) && (uint32)sxp->st.ST_MTIME_NSEC != F_MOD_NSEC(file))
+@@ -647,6 +656,16 @@ int set_file_attrs(const char *fname, struct file_struct *file, stat_x *sxp,
&& !set_fileflags(fname, fileflags))
goto cleanup;
updated = 1;
@@ -387,7 +387,7 @@
-o, --owner preserve owner (super-user only)
-g, --group preserve group
--devices preserve device files (super-user only)
-@@ -1135,6 +1137,42 @@ flags on files and directories that are being updated or deleted on the
+@@ -1142,6 +1144,42 @@ flags on files and directories that are being updated or deleted on the
receiving side. It does not try to affect user flags. This option overrides
bf(--force-change) and bf(--force-uchange).
@@ -763,7 +763,7 @@
\-o, \-\-owner preserve owner (super\-user only)
\-g, \-\-group preserve group
\-\-devices preserve device files (super\-user only)
-@@ -1300,6 +1302,44 @@ flags on files and directories that are
+@@ -1307,6 +1309,44 @@ flags on files and directories that are
receiving side. It does not try to affect user flags. This option overrides
\fB\-\-force\-change\fP and \fB\-\-force\-uchange\fP.
.IP
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20151221/f86f3273/attachment-0001.html>
More information about the macports-changes
mailing list