View | Details | Raw Unified | Return to bug 247796
Collapse All | Expand All

(-)Makefile (-3 / +5 lines)
Lines 2-9 Link Here
2
# $FreeBSD$
2
# $FreeBSD$
3
3
4
PORTNAME=	rsync
4
PORTNAME=	rsync
5
DISTVERSION=	3.1.3
5
DISTVERSION=	3.2.2
6
PORTREVISION=	1
7
CATEGORIES=	net
6
CATEGORIES=	net
8
MASTER_SITES=	https://rsync.samba.org/ftp/rsync/ \
7
MASTER_SITES=	https://rsync.samba.org/ftp/rsync/ \
9
		https://www.mirrorservice.org/sites/rsync.samba.org/ \
8
		https://www.mirrorservice.org/sites/rsync.samba.org/ \
Lines 17-22 Link Here
17
16
18
LICENSE=	GPLv3
17
LICENSE=	GPLv3
19
18
19
LIB_DEPENDS=	libxxhash.so:devel/xxhash \
20
		libzstd.so:archivers/zstd
21
20
USES=		cpe shebangfix
22
USES=		cpe shebangfix
21
SHEBANG_FILES=	support/rrsync
23
SHEBANG_FILES=	support/rrsync
22
24
Lines 34-40 Link Here
34
CONFIGURE_ARGS=	--disable-debug --enable-ipv6 \
36
CONFIGURE_ARGS=	--disable-debug --enable-ipv6 \
35
		--with-rsyncd-conf=${ETCDIR}/rsyncd.conf
37
		--with-rsyncd-conf=${ETCDIR}/rsyncd.conf
36
38
37
PORTDOCS=	NEWS README csprotocol.txt tech_report.tex
39
PORTDOCS=	NEWS.md README.md csprotocol.txt tech_report.tex
38
40
39
# define options
41
# define options
40
OPTIONS_DEFINE=		DOCS POPT_PORT ZLIB_BASE SSH ICONV
42
OPTIONS_DEFINE=		DOCS POPT_PORT ZLIB_BASE SSH ICONV
(-)distinfo (-5 / +7 lines)
Lines 1-5 Link Here
1
TIMESTAMP = 1518368927
1
TIMESTAMP = 1594019616
2
SHA256 (rsync-3.1.3.tar.gz) = 55cc554efec5fdaad70de921cd5a5eeb6c29a95524c715f3bbf849235b0800c0
2
SHA256 (rsync-3.2.2.tar.gz) = 644bd3841779507665211fd7db8359c8a10670c57e305b4aab61b4e40037afa8
3
SIZE (rsync-3.1.3.tar.gz) = 905908
3
SIZE (rsync-3.2.2.tar.gz) = 1057001
4
SHA256 (rsync-patches-3.1.3.tar.gz) = 0dc2848f20ca75c07a30c3237ccf8d61b61082ae7de94758a27dac350c99fb98
4
SHA256 (rsync-patches-3.2.2.tar.gz) = eeccf4c7f178c936e451b679e64b670f707b989b7a40e2d22286407f8987ae9a
5
SIZE (rsync-patches-3.1.3.tar.gz) = 174524
5
SIZE (rsync-patches-3.2.2.tar.gz) = 286274
6
SHA256 (rsync-patches-3.2.2.tar.gz) = eeccf4c7f178c936e451b679e64b670f707b989b7a40e2d22286407f8987ae9a
7
SIZE (rsync-patches-3.2.2.tar.gz) = 286274
(-)files/patch-siginfo (-63 lines)
Lines 1-63 Link Here
1
diff --git a/main.c b/main.c
2
index 4613c96..3d47f3a 100644
3
--- a/main.c
4
+++ b/main.c
5
@@ -76,6 +76,7 @@ extern size_t bwlimit_writemax;
6
 extern unsigned int module_dirlen;
7
 extern BOOL flist_receiving_enabled;
8
 extern BOOL shutting_down;
9
+extern BOOL want_progress_now;
10
 extern int backup_dir_len;
11
 extern int basis_dir_cnt;
12
 extern struct stats stats;
13
@@ -1439,6 +1440,15 @@ static void sigusr2_handler(UNUSED(int val))
14
 	_exit(0);
15
 }
16
 
17
+#ifdef SIGINFO
18
+static void siginfo_handler(UNUSED(int val))
19
+{
20
+
21
+	if (!am_server)
22
+		want_progress_now = True;
23
+}
24
+#endif
25
+
26
 void remember_children(UNUSED(int val))
27
 {
28
 #ifdef WNOHANG
29
@@ -1538,6 +1548,9 @@ int main(int argc,char *argv[])
30
 	SIGACTMASK(SIGABRT, rsync_panic_handler);
31
 	SIGACTMASK(SIGBUS, rsync_panic_handler);
32
 #endif
33
+#ifdef SIGINFO
34
+	SIGACTMASK(SIGINFO, siginfo_handler);
35
+#endif
36
 
37
 	starttime = time(NULL);
38
 	our_uid = MY_UID();
39
diff --git a/receiver.c b/receiver.c
40
index 4ea4c09..1c255ef 100644
41
--- a/receiver.c
42
+++ b/receiver.c
43
@@ -62,6 +62,8 @@ extern char sender_file_sum[MAX_DIGEST_LEN];
44
 extern struct file_list *cur_flist, *first_flist, *dir_flist;
45
 extern filter_rule_list daemon_filter_list;
46
 
47
+BOOL want_progress_now;
48
+
49
 static struct bitbag *delayed_bits = NULL;
50
 static int phase = 0, redoing = 0;
51
 static flist_ndx_list batch_redo_list;
52
@@ -302,6 +304,11 @@ static int receive_data(int f_in, char *fname_r, int fd_r, OFF_T size_r,
53
 	while ((i = recv_token(f_in, &data)) != 0) {
54
 		if (INFO_GTE(PROGRESS, 1))
55
 			show_progress(offset, total_size);
56
+		else if (want_progress_now) {
57
+			rprintf(FINFO, "%s\n", fname);
58
+			end_progress(offset);
59
+		}
60
+		want_progress_now = False;
61
 
62
 		if (allowed_lull)
63
 			maybe_send_keepalive(time(NULL), MSK_ALLOW_FLUSH | MSK_ACTIVE_RECEIVER);
(-)pkg-plist (+2 lines)
Lines 1-5 Link Here
1
bin/rsync
1
bin/rsync
2
bin/rsync-ssl
2
sbin/rrsync
3
sbin/rrsync
3
man/man1/rsync.1.gz
4
man/man1/rsync.1.gz
5
man/man1/rsync-ssl.1.gz
4
man/man5/rsyncd.conf.5.gz
6
man/man5/rsyncd.conf.5.gz
5
@sample %%ETCDIR%%/rsyncd.conf.sample
7
@sample %%ETCDIR%%/rsyncd.conf.sample

Return to bug 247796