Index: Makefile =================================================================== --- Makefile (revision 541310) +++ Makefile (working copy) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= rsync -DISTVERSION= 3.1.3 -PORTREVISION= 1 +DISTVERSION= 3.2.2 CATEGORIES= net MASTER_SITES= https://rsync.samba.org/ftp/rsync/ \ https://www.mirrorservice.org/sites/rsync.samba.org/ \ @@ -17,6 +16,9 @@ LICENSE= GPLv3 +LIB_DEPENDS= libxxhash.so:devel/xxhash \ + libzstd.so:archivers/zstd + USES= cpe shebangfix SHEBANG_FILES= support/rrsync @@ -34,7 +36,7 @@ CONFIGURE_ARGS= --disable-debug --enable-ipv6 \ --with-rsyncd-conf=${ETCDIR}/rsyncd.conf -PORTDOCS= NEWS README csprotocol.txt tech_report.tex +PORTDOCS= NEWS.md README.md csprotocol.txt tech_report.tex # define options OPTIONS_DEFINE= DOCS POPT_PORT ZLIB_BASE SSH ICONV Index: distinfo =================================================================== --- distinfo (revision 541310) +++ distinfo (working copy) @@ -1,5 +1,7 @@ -TIMESTAMP = 1518368927 -SHA256 (rsync-3.1.3.tar.gz) = 55cc554efec5fdaad70de921cd5a5eeb6c29a95524c715f3bbf849235b0800c0 -SIZE (rsync-3.1.3.tar.gz) = 905908 -SHA256 (rsync-patches-3.1.3.tar.gz) = 0dc2848f20ca75c07a30c3237ccf8d61b61082ae7de94758a27dac350c99fb98 -SIZE (rsync-patches-3.1.3.tar.gz) = 174524 +TIMESTAMP = 1594019616 +SHA256 (rsync-3.2.2.tar.gz) = 644bd3841779507665211fd7db8359c8a10670c57e305b4aab61b4e40037afa8 +SIZE (rsync-3.2.2.tar.gz) = 1057001 +SHA256 (rsync-patches-3.2.2.tar.gz) = eeccf4c7f178c936e451b679e64b670f707b989b7a40e2d22286407f8987ae9a +SIZE (rsync-patches-3.2.2.tar.gz) = 286274 +SHA256 (rsync-patches-3.2.2.tar.gz) = eeccf4c7f178c936e451b679e64b670f707b989b7a40e2d22286407f8987ae9a +SIZE (rsync-patches-3.2.2.tar.gz) = 286274 Index: files/patch-siginfo =================================================================== --- files/patch-siginfo (revision 541310) +++ files/patch-siginfo (nonexistent) @@ -1,63 +0,0 @@ -diff --git a/main.c b/main.c -index 4613c96..3d47f3a 100644 ---- a/main.c -+++ b/main.c -@@ -76,6 +76,7 @@ extern size_t bwlimit_writemax; - extern unsigned int module_dirlen; - extern BOOL flist_receiving_enabled; - extern BOOL shutting_down; -+extern BOOL want_progress_now; - extern int backup_dir_len; - extern int basis_dir_cnt; - extern struct stats stats; -@@ -1439,6 +1440,15 @@ static void sigusr2_handler(UNUSED(int val)) - _exit(0); - } - -+#ifdef SIGINFO -+static void siginfo_handler(UNUSED(int val)) -+{ -+ -+ if (!am_server) -+ want_progress_now = True; -+} -+#endif -+ - void remember_children(UNUSED(int val)) - { - #ifdef WNOHANG -@@ -1538,6 +1548,9 @@ int main(int argc,char *argv[]) - SIGACTMASK(SIGABRT, rsync_panic_handler); - SIGACTMASK(SIGBUS, rsync_panic_handler); - #endif -+#ifdef SIGINFO -+ SIGACTMASK(SIGINFO, siginfo_handler); -+#endif - - starttime = time(NULL); - our_uid = MY_UID(); -diff --git a/receiver.c b/receiver.c -index 4ea4c09..1c255ef 100644 ---- a/receiver.c -+++ b/receiver.c -@@ -62,6 +62,8 @@ extern char sender_file_sum[MAX_DIGEST_LEN]; - extern struct file_list *cur_flist, *first_flist, *dir_flist; - extern filter_rule_list daemon_filter_list; - -+BOOL want_progress_now; -+ - static struct bitbag *delayed_bits = NULL; - static int phase = 0, redoing = 0; - static flist_ndx_list batch_redo_list; -@@ -302,6 +304,11 @@ static int receive_data(int f_in, char *fname_r, int fd_r, OFF_T size_r, - while ((i = recv_token(f_in, &data)) != 0) { - if (INFO_GTE(PROGRESS, 1)) - show_progress(offset, total_size); -+ else if (want_progress_now) { -+ rprintf(FINFO, "%s\n", fname); -+ end_progress(offset); -+ } -+ want_progress_now = False; - - if (allowed_lull) - maybe_send_keepalive(time(NULL), MSK_ALLOW_FLUSH | MSK_ACTIVE_RECEIVER); Property changes on: files/patch-siginfo ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: pkg-plist =================================================================== --- pkg-plist (revision 541310) +++ pkg-plist (working copy) @@ -1,5 +1,7 @@ bin/rsync +bin/rsync-ssl sbin/rrsync man/man1/rsync.1.gz +man/man1/rsync-ssl.1.gz man/man5/rsyncd.conf.5.gz @sample %%ETCDIR%%/rsyncd.conf.sample