Attachment #233329 for bug #263417




# Created by: David O'Brien (obrien@cs.ucdavis.edu)

PORTNAME=	rsync
DISTVERSION=	3.2.4
PORTREVISION=	1
CATEGORIES=	net
MASTER_SITES=	https://www.mirrorservice.org/sites/rsync.samba.org/src/ \
		http://rsync.mirror.garr.it/src/ \
		http://www.mirrorservice.org/sites/rsync.samba.org/src/ \
		https://download.samba.org/pub/rsync/src/
DISTFILES=	${DISTNAME}${EXTRACT_SUFX}

MAINTAINER=	rodrigo@FreeBSD.org

LICENSE=	GPLv3+
LICENSE_FILE=	${WRKSRC}/COPYING

LIB_DEPENDS=	liblz4.so:archivers/liblz4 \
		libxxhash.so:devel/xxhash \
		libzstd.so:archivers/zstd

USES=		cpe shebangfix ssl
SHEBANG_FILES=	support/rrsync

USES=		cpe python shebangfix ssl
CPE_VENDOR=	samba
CPE_PRODUCT=	rsync
USE_RC_SUBR=	rsyncd

SHEBANG_FILES=	support/rrsync

PATCH_STRIP=	-p1
GNU_CONFIGURE=	yes
CONFIGURE_ARGS=	--disable-debug \
		--enable-ipv6 \
		--with-rsyncd-conf=${ETCDIR}/rsyncd.conf

INSTALL_TARGET=	install-strip
TEST_TARGET=	check

CONFIGURE_ARGS=	--disable-debug --enable-ipv6 \
		--with-rsyncd-conf=${ETCDIR}/rsyncd.conf
CPPFLAGS+=	-I${LOCALBASE}/include
LDFLAGS+=	-L${LOCALBASE}/lib

PATCH_STRIP=	-p1
SUB_LIST=	NAME=rsyncd

PORTDOCS=	NEWS.md README.md csprotocol.txt tech_report.tex

# define options
OPTIONS_DEFINE=		DOCS ICONV POPT_PORT SSH ZLIB_BASE
OPTIONS_DEFAULT=	FLAGS ICONV SSH ZLIB_BASE
OPTIONS_RADIO=		PTS
OPTIONS_RADIO_PTS=	FLAGS RENAMED

# options provided upstream
FLAGS_DESC=	File system flags support patch, adds --fileflags
POPT_PORT_DESC=	Use popt from devel/popt instead of bundled one
ZLIB_BASE_DESC=	Use zlib from base instead of bundled one
SSH_DESC=	Use SSH instead of RSH
ZLIB_BASE_DESC=	Use zlib from base instead of bundled one

# options provided by patch (mutually exclusive)
PTS_DESC=	Functionality provided by third party patches
RENAMED_DESC=	Add support for renamed file detection
FLAGS_DESC=	File system flags support patch, adds --fileflags

# define default options
OPTIONS_DEFAULT=FLAGS ICONV SSH ZLIB_BASE

FLAGS_DISTFILES=	${PORTNAME}-patches-${DISTVERSION}${EXTRACT_SUFX}
FLAGS_EXTRA_PATCHES=	${WRKSRC}/patches/fileflags.diff \
			${FILESDIR}/extrapatch-main.c
RENAMED_EXTRA_PATCHES=		${WRKSRC}/patches/detect-renamed.diff

ICONV_DISTFILES=	${PORTNAME}-patches-${DISTVERSION}${EXTRACT_SUFX}
ICONV_USES=		iconv:translit
ICONV_CONFIGURE_ENABLE=	iconv iconv-open

POPT_PORT_LIB_DEPENDS=		libpopt.so:devel/popt

POPT_PORT_CONFIGURE_OFF=	--with-included-popt

RENAMED_DISTFILES=	${PORTNAME}-patches-${DISTVERSION}${EXTRACT_SUFX}
RENAMED_EXTRA_PATCHES=	${WRKSRC}/patches/detect-renamed.diff

SSH_CONFIGURE_ON=	--with-rsh=ssh
SSH_CONFIGURE_OFF=	--with-rsh=rsh

ZLIB_BASE_CONFIGURE_ON=	--with-included-zlib=no
ICONV_DISTFILES=	${PORTNAME}-patches-${DISTVERSION}${EXTRACT_SUFX}
RENAMED_DISTFILES=	${PORTNAME}-patches-${DISTVERSION}${EXTRACT_SUFX}

.if make(makesum)
DISTFILES+=	${PORTNAME}-patches-${DISTVERSION}${EXTRACT_SUFX}


.include <bsd.port.pre.mk>

.if empty(ICONV_LIB) || !${PORT_OPTIONS:MICONV}
CONFIGURE_ARGS+=	ac_cv_search_libiconv_open=no
.endif

post-patch:

Lines 1-5 Link Here

(-)b/net/rsync/distinfo (-5 / +5 lines)
1	TIMESTAMP = 1597589726	1	TIMESTAMP = 1650365056
2	SHA256 (rsync-3.2.3.tar.gz) = becc3c504ceea499f4167a260040ccf4d9f2ef9499ad5683c179a697146ce50e	2	SHA256 (rsync-3.2.4.tar.gz) = 6f761838d08052b0b6579cf7f6737d93e47f01f4da04c5d24d3447b7f2a5fad1
3	SIZE (rsync-3.2.3.tar.gz) = 1069784	3	SIZE (rsync-3.2.4.tar.gz) = 1114853
4	SHA256 (rsync-patches-3.2.3.tar.gz) = de6645b46967bd701b7d6f3e29cccb19d2b46a6fa2d26a9db165847dca0e42f2	4	SHA256 (rsync-patches-3.2.4.tar.gz) = 70a597590af6c61cf3d05d663429ff9f60ffe24e44f9c73a4cdc69ebdc1322a4
5	SIZE (rsync-patches-3.2.3.tar.gz) = 157092	5	SIZE (rsync-patches-3.2.4.tar.gz) = 133580




--- io.c.orig
+++ io.c
@@ -787,18 +787,19 @@
 			if (msgs2stderr == 1 && DEBUG_GTE(IO, 2))
 				rprintf(FINFO, "[%s] recv=%ld\n", who_am_i(), (long)n);
 
-			if (io_timeout || stop_at_utime) {
+			if (io_timeout) {
 				last_io_in = time(NULL);
-				if (stop_at_utime && last_io_in >= stop_at_utime) {
-					rprintf(FERROR, "stopping at requested limit\n");
-					exit_cleanup(RERR_TIMEOUT);
-				}
 				if (io_timeout && flags & PIO_NEED_INPUT)
 					maybe_send_keepalive(last_io_in, 0);
 			}
 			stats.total_read += n;
 
 			iobuf.in.len += n;
+		}
+
+		if (stop_at_utime && time(NULL) >= stop_at_utime) {
+			rprintf(FERROR, "stopping at requested limit\n");
+			exit_cleanup(RERR_TIMEOUT);
 		}
 
 		if (out && FD_ISSET(iobuf.out_fd, &w_fds)) {
- 

Return to bug 263417

Lines 1-13 Link Here

(-)b/net/rsync/Makefile (-35 / +34 lines)
1	# Created by: David O'Brien (obrien@cs.ucdavis.edu)	1	# Created by: David O'Brien (obrien@cs.ucdavis.edu)
2		2
3	PORTNAME= rsync	3	PORTNAME= rsync
4	DISTVERSION= 3.2.3	4	DISTVERSION= 3.2.4
5	PORTREVISION= 1
6	CATEGORIES= net	5	CATEGORIES= net
7	MASTER_SITES= https://www.mirrorservice.org/sites/rsync.samba.org/src/ \	6	MASTER_SITES= https://www.mirrorservice.org/sites/rsync.samba.org/src/ \
8	http://rsync.mirror.garr.it/src/ \	7	http://rsync.mirror.garr.it/src/ \
9	http://www.mirrorservice.org/sites/rsync.samba.org/src/ \	8	http://www.mirrorservice.org/sites/rsync.samba.org/src/ \
10	https://download.samba.org/pub/rsync/src/	9	https://download.samba.org/pub/rsync/src/
11	DISTFILES= ${DISTNAME}${EXTRACT_SUFX}	10	DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
12		11
13	MAINTAINER= rodrigo@FreeBSD.org	12	MAINTAINER= rodrigo@FreeBSD.org
Lines 16-82 COMMENT= Network file distribution/synchronization utility Link Here
16	LICENSE= GPLv3+	15	LICENSE= GPLv3+
17	LICENSE_FILE= ${WRKSRC}/COPYING	16	LICENSE_FILE= ${WRKSRC}/COPYING
18		17
19	LIB_DEPENDS= libxxhash.so:devel/xxhash \	18	LIB_DEPENDS= liblz4.so:archivers/liblz4 \
20	libzstd.so:archivers/zstd \	19	libxxhash.so:devel/xxhash \
21	liblz4.so:archivers/liblz4	20	libzstd.so:archivers/zstd
22
23	USES= cpe shebangfix ssl
24	SHEBANG_FILES= support/rrsync
25		21
		22	USES= cpe python shebangfix ssl
26	CPE_VENDOR= samba	23	CPE_VENDOR= samba
27	CPE_PRODUCT= rsync	24	CPE_PRODUCT= rsync
		25	USE_RC_SUBR= rsyncd
		26
		27	SHEBANG_FILES= support/rrsync
28		28
29	PATCH_STRIP= -p1
30	GNU_CONFIGURE= yes	29	GNU_CONFIGURE= yes
31	USE_RC_SUBR= rsyncd	30	CONFIGURE_ARGS= --disable-debug \
32	SUB_LIST= NAME=rsyncd	31	--enable-ipv6 \
		32	--with-rsyncd-conf=${ETCDIR}/rsyncd.conf
33		33
34	INSTALL_TARGET= install-strip	34	INSTALL_TARGET= install-strip
35	TEST_TARGET= check	35	TEST_TARGET= check
36		36
37	CONFIGURE_ARGS= --disable-debug --enable-ipv6 \
38	--with-rsyncd-conf=${ETCDIR}/rsyncd.conf
39	CPPFLAGS+= -I${LOCALBASE}/include	37	CPPFLAGS+= -I${LOCALBASE}/include
40	LDFLAGS+= -L${LOCALBASE}/lib	38	LDFLAGS+= -L${LOCALBASE}/lib
41		39
		40	PATCH_STRIP= -p1
		41	SUB_LIST= NAME=rsyncd
		42
42	PORTDOCS= NEWS.md README.md csprotocol.txt tech_report.tex	43	PORTDOCS= NEWS.md README.md csprotocol.txt tech_report.tex
43		44
44	# define options	45	# define options
45	OPTIONS_DEFINE= DOCS POPT_PORT ZLIB_BASE SSH ICONV	46	OPTIONS_DEFINE= DOCS ICONV POPT_PORT SSH ZLIB_BASE
		47	OPTIONS_DEFAULT= FLAGS ICONV SSH ZLIB_BASE
46	OPTIONS_RADIO= PTS	48	OPTIONS_RADIO= PTS
47	OPTIONS_RADIO_PTS= RENAMED FLAGS	49	OPTIONS_RADIO_PTS= FLAGS RENAMED
48		50
49	# options provided upstream	51	# options provided upstream
		52	FLAGS_DESC= File system flags support patch, adds --fileflags
50	POPT_PORT_DESC= Use popt from devel/popt instead of bundled one	53	POPT_PORT_DESC= Use popt from devel/popt instead of bundled one
51	ZLIB_BASE_DESC= Use zlib from base instead of bundled one
52	SSH_DESC= Use SSH instead of RSH	54	SSH_DESC= Use SSH instead of RSH
		55	ZLIB_BASE_DESC= Use zlib from base instead of bundled one
53		56
54	# options provided by patch (mutually exclusive)	57	# options provided by patch (mutually exclusive)
55	PTS_DESC= Functionality provided by third party patches	58	PTS_DESC= Functionality provided by third party patches
56	RENAMED_DESC= Add support for renamed file detection	59	RENAMED_DESC= Add support for renamed file detection
57	FLAGS_DESC= File system flags support patch, adds --fileflags
58
59	# define default options
60	OPTIONS_DEFAULT=FLAGS ICONV SSH ZLIB_BASE
61		60
62	ZLIB_BASE_CONFIGURE_ON= --with-included-zlib=no	61	FLAGS_DISTFILES= ${PORTNAME}-patches-${DISTVERSION}${EXTRACT_SUFX}
63	FLAGS_EXTRA_PATCHES= ${WRKSRC}/patches/fileflags.diff \	62	FLAGS_EXTRA_PATCHES= ${WRKSRC}/patches/fileflags.diff \
64	${FILESDIR}/extrapatch-main.c	63	${FILESDIR}/extrapatch-main.c
65	RENAMED_EXTRA_PATCHES= ${WRKSRC}/patches/detect-renamed.diff
66		64
67	ICONV_USES= iconv:translit	65	ICONV_DISTFILES= ${PORTNAME}-patches-${DISTVERSION}${EXTRACT_SUFX}
		66	ICONV_USES= iconv:translit
68	ICONV_CONFIGURE_ENABLE= iconv iconv-open	67	ICONV_CONFIGURE_ENABLE= iconv iconv-open
69		68
70	POPT_PORT_LIB_DEPENDS= libpopt.so:devel/popt	69	POPT_PORT_LIB_DEPENDS= libpopt.so:devel/popt
71
72	POPT_PORT_CONFIGURE_OFF= --with-included-popt	70	POPT_PORT_CONFIGURE_OFF= --with-included-popt
73		71
		72	RENAMED_DISTFILES= ${PORTNAME}-patches-${DISTVERSION}${EXTRACT_SUFX}
		73	RENAMED_EXTRA_PATCHES= ${WRKSRC}/patches/detect-renamed.diff
		74
74	SSH_CONFIGURE_ON= --with-rsh=ssh	75	SSH_CONFIGURE_ON= --with-rsh=ssh
75	SSH_CONFIGURE_OFF= --with-rsh=rsh	76	SSH_CONFIGURE_OFF= --with-rsh=rsh
76		77
77	FLAGS_DISTFILES= ${PORTNAME}-patches-${DISTVERSION}${EXTRACT_SUFX}	78	ZLIB_BASE_CONFIGURE_ON= --with-included-zlib=no
78	ICONV_DISTFILES= ${PORTNAME}-patches-${DISTVERSION}${EXTRACT_SUFX}
79	RENAMED_DISTFILES= ${PORTNAME}-patches-${DISTVERSION}${EXTRACT_SUFX}
80		79
81	.if make(makesum)	80	.if make(makesum)
82	DISTFILES+= ${PORTNAME}-patches-${DISTVERSION}${EXTRACT_SUFX}	81	DISTFILES+= ${PORTNAME}-patches-${DISTVERSION}${EXTRACT_SUFX}
Lines 84-91 DISTFILES+= ${PORTNAME}-patches-${DISTVERSION}${EXTRACT_SUFX} Link Here
84		83
85	.include <bsd.port.pre.mk>	84	.include <bsd.port.pre.mk>
86		85
87	.if empty(ICONV_LIB) \|\| ! ${PORT_OPTIONS:MICONV}	86	.if empty(ICONV_LIB) \|\| !${PORT_OPTIONS:MICONV}
88	CONFIGURE_ARGS+=ac_cv_search_libiconv_open=no	87	CONFIGURE_ARGS+= ac_cv_search_libiconv_open=no
89	.endif	88	.endif
90		89
91	post-patch:	90	post-patch:

Removed Link Here

(-)a/net/rsync/files/patch-io.c (-28 lines)
1	--- io.c.orig
2	+++ io.c
3	@@ -787,18 +787,19 @@
4	if (msgs2stderr == 1 && DEBUG_GTE(IO, 2))
5	rprintf(FINFO, "[%s] recv=%ld\n", who_am_i(), (long)n);
6
7	- if (io_timeout \|\| stop_at_utime) {
8	+ if (io_timeout) {
9	last_io_in = time(NULL);
10	- if (stop_at_utime && last_io_in >= stop_at_utime) {
11	- rprintf(FERROR, "stopping at requested limit\n");
12	- exit_cleanup(RERR_TIMEOUT);
13	- }
14	if (io_timeout && flags & PIO_NEED_INPUT)
15	maybe_send_keepalive(last_io_in, 0);
16	}
17	stats.total_read += n;
18
19	iobuf.in.len += n;
20	+ }
21	+
22	+ if (stop_at_utime && time(NULL) >= stop_at_utime) {
23	+ rprintf(FERROR, "stopping at requested limit\n");
24	+ exit_cleanup(RERR_TIMEOUT);
25	}
26
27	if (out && FD_ISSET(iobuf.out_fd, &w_fds)) {
28	-