From nobody Wed May 04 08:16:29 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id C3B121AB318A; Wed, 4 May 2022 08:16:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4KtV65588yz4RHw; Wed, 4 May 2022 08:16:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651652189; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=i5sU3DFB81eouXOb6pkw3bDNC7pCyXGCHNqbXi/wj4U=; b=bhXlUHRCPn3zt/7R4yq4+xtf2bU/kQ8jbuq/eOp6egvdXkT28Ka/fdmz0uOFO+jF23Rf7J pmyz2GlVpXnOec8XzXjVDz76AqK/OJFGLIY2Vf+JFv5SQZTZUWShzC8sIbace2Fi4JlH9u QWW6hPEizS2+kC12x+hN7tyBvFQZca78XTtp0h7uTyFX76Xof1UMqbhQ7BglfXO6X0gRKg bBxb4c4FcgVbBIkhSP/crQT9B7dkxRDOUWDKkDo2vQFsZENBuAIjOgVCnCzX6agUA4ra8Y heJGRmpV4h9qGidd2zCjpiBTamBuRTwqiw79vGSqVcy1Enra2DdHo9UxLl0Y5A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 90BEC754E; Wed, 4 May 2022 08:16:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2448GTi4052307; Wed, 4 May 2022 08:16:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2448GTSI052306; Wed, 4 May 2022 08:16:29 GMT (envelope-from git) Date: Wed, 4 May 2022 08:16:29 GMT Message-Id: <202205040816.2448GTSI052306@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Yasuhiro Kimura Subject: git: 21f77dd22253 - main - net/rsync: Update to 3.2.4 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: yasu X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 21f77dd22253ffbe6a16b0367fda3f17c94848ac Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651652189; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=i5sU3DFB81eouXOb6pkw3bDNC7pCyXGCHNqbXi/wj4U=; b=hCdptreohrkFNoXVyFo5PQ5zGhkVQ0S2Iw3ArJ21wuXWAxz5/DMLqIVqHjhEMenotS9qT6 utOg6zI/x6nwyouBqxlLkNXlI/Ly3zsCpSOORjCBlavRCX422vB3gooOuJZgXfbuJ4LCYJ s3qiZ2GfWR4lNsVdf3v20i/nZb68KmMkZU9qDzoBw7Iq6Wsznrq93uK1rpVm1OFq5rQacN 9C1oIBPDRGKyyRykET6uPmv45z9nWRz0X4jkemw8y4n+gQPtUsa6GWJiH9KMtSoJhjJJyM SfizEtL5J2q/vcRIr0LeFhXM+TWvuVd5xkCyhqKzi5rnPCx3XvkNZ69AM+GRUg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1651652189; a=rsa-sha256; cv=none; b=DCz8yMi5pB1s4e3IJtE5A/CLmAU9LSqvuPQWZJW7LLnUzzSAVEviv2OIwWfbQrdhqEP1Rf hisvC6VjicVgZO/MJdzVrgXT2PcyAyevSBq4HlitZm5FZEaSZtVKntvlg63I4JWyKeo8t1 faeLPBfCfgeMI2VQGO0OZsomLRqXz43WBblyfF9fhMy8qznjyM3WkeVu4Bc3TQ7O9c23CS UN7ZM3ebemutzFjUgBCUIZKU7AblN1y4YyGNcJobVQCgZnD8LiCZnsO3hwEbmW0HVWk0wG We+Y6MjJkUnXORvNsUcHAVcguejzlbSVWrRChzmxA/2tO0ZdMks4emSfRKwuPA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by yasu: URL: https://cgit.FreeBSD.org/ports/commit/?id=21f77dd22253ffbe6a16b0367fda3f17c94848ac commit 21f77dd22253ffbe6a16b0367fda3f17c94848ac Author: Yasuhiro Kimura AuthorDate: 2022-04-19 11:27:39 +0000 Commit: Yasuhiro Kimura CommitDate: 2022-05-04 08:05:33 +0000 net/rsync: Update to 3.2.4 * Pet portclippy * Tidy up Makefile with portfmt ChangeLog: https://download.samba.org/pub/rsync/NEWS#3.2.4 PR: 263417 Approved by: maintainer timeout --- net/rsync/Makefile | 69 +++++++++++++++++++++++----------------------- net/rsync/distinfo | 10 +++---- net/rsync/files/patch-io.c | 27 ------------------ 3 files changed, 39 insertions(+), 67 deletions(-) diff --git a/net/rsync/Makefile b/net/rsync/Makefile index 0f9df25989e8..a558a11d612e 100644 --- a/net/rsync/Makefile +++ b/net/rsync/Makefile @@ -1,13 +1,12 @@ # Created by: David O'Brien (obrien@cs.ucdavis.edu) PORTNAME= rsync -DISTVERSION= 3.2.3 -PORTREVISION= 1 +DISTVERSION= 3.2.4 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/ + 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 @@ -16,67 +15,67 @@ COMMENT= Network file distribution/synchronization utility LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/COPYING -LIB_DEPENDS= libxxhash.so:devel/xxhash \ - libzstd.so:archivers/zstd \ - liblz4.so:archivers/liblz4 - -USES= cpe shebangfix ssl -SHEBANG_FILES= support/rrsync +LIB_DEPENDS= liblz4.so:archivers/liblz4 \ + libxxhash.so:devel/xxhash \ + libzstd.so:archivers/zstd +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 -USE_RC_SUBR= rsyncd -SUB_LIST= NAME=rsyncd +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 POPT_PORT ZLIB_BASE SSH ICONV +OPTIONS_DEFINE= DOCS ICONV POPT_PORT SSH ZLIB_BASE +OPTIONS_DEFAULT= FLAGS ICONV SSH ZLIB_BASE OPTIONS_RADIO= PTS -OPTIONS_RADIO_PTS= RENAMED FLAGS +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 -ZLIB_BASE_CONFIGURE_ON= --with-included-zlib=no -FLAGS_EXTRA_PATCHES= ${WRKSRC}/patches/fileflags.diff \ - ${FILESDIR}/extrapatch-main.c -RENAMED_EXTRA_PATCHES= ${WRKSRC}/patches/detect-renamed.diff +FLAGS_DISTFILES= ${PORTNAME}-patches-${DISTVERSION}${EXTRACT_SUFX} +FLAGS_EXTRA_PATCHES= ${WRKSRC}/patches/fileflags.diff \ + ${FILESDIR}/extrapatch-main.c -ICONV_USES= iconv:translit +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_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 -FLAGS_DISTFILES= ${PORTNAME}-patches-${DISTVERSION}${EXTRACT_SUFX} -ICONV_DISTFILES= ${PORTNAME}-patches-${DISTVERSION}${EXTRACT_SUFX} -RENAMED_DISTFILES= ${PORTNAME}-patches-${DISTVERSION}${EXTRACT_SUFX} +ZLIB_BASE_CONFIGURE_ON= --with-included-zlib=no .if make(makesum) DISTFILES+= ${PORTNAME}-patches-${DISTVERSION}${EXTRACT_SUFX} @@ -84,8 +83,8 @@ DISTFILES+= ${PORTNAME}-patches-${DISTVERSION}${EXTRACT_SUFX} .include -.if empty(ICONV_LIB) || ! ${PORT_OPTIONS:MICONV} -CONFIGURE_ARGS+=ac_cv_search_libiconv_open=no +.if empty(ICONV_LIB) || !${PORT_OPTIONS:MICONV} +CONFIGURE_ARGS+= ac_cv_search_libiconv_open=no .endif post-patch: diff --git a/net/rsync/distinfo b/net/rsync/distinfo index 59d408723a6d..febadd2a8a24 100644 --- a/net/rsync/distinfo +++ b/net/rsync/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1597589726 -SHA256 (rsync-3.2.3.tar.gz) = becc3c504ceea499f4167a260040ccf4d9f2ef9499ad5683c179a697146ce50e -SIZE (rsync-3.2.3.tar.gz) = 1069784 -SHA256 (rsync-patches-3.2.3.tar.gz) = de6645b46967bd701b7d6f3e29cccb19d2b46a6fa2d26a9db165847dca0e42f2 -SIZE (rsync-patches-3.2.3.tar.gz) = 157092 +TIMESTAMP = 1650365056 +SHA256 (rsync-3.2.4.tar.gz) = 6f761838d08052b0b6579cf7f6737d93e47f01f4da04c5d24d3447b7f2a5fad1 +SIZE (rsync-3.2.4.tar.gz) = 1114853 +SHA256 (rsync-patches-3.2.4.tar.gz) = 70a597590af6c61cf3d05d663429ff9f60ffe24e44f9c73a4cdc69ebdc1322a4 +SIZE (rsync-patches-3.2.4.tar.gz) = 133580 diff --git a/net/rsync/files/patch-io.c b/net/rsync/files/patch-io.c deleted file mode 100644 index 4e051d32c9c9..000000000000 --- a/net/rsync/files/patch-io.c +++ /dev/null @@ -1,27 +0,0 @@ ---- 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)) {