From nobody Sun May 8 11:10:32 2022 X-Original-To: dev-commits-ports-all@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 792651AC216E; Sun, 8 May 2022 11:10:32 +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 4Kx1n432t6z4dpj; Sun, 8 May 2022 11:10:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652008232; 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=pcADUtzbJDsz/DYAMmnPNqK9kdSYbzMQrFxPH0xMceg=; b=PChoYyzKGQAwFyrEQvUI5HzB6I1EjGF4u3I0x2opA9u0B4m8YoNR44JS4dAly/qUpOReqI 1bwIhxDTZnEqhC77L6NWMqNS7SfrZPy8+/UpoXVhyH10XwkJGRTqi6hThZsf8Ipqn5QOfu SZtJ4EFAQihFm2tC2VYWFY0wLaJHWwRC+Jud/Pjzdg32WAY3BTXomUFC4cM/qnXi5YPOZZ 3hhcRg92H62wdktFVaM2LtLLTPSykPGkE0qB4nzEWZSdMLiqGFlMUzjSQADZaQzvdq9q3k 1ulTmRQqRvfmKTWwF+U6SgtHHpeGNEywAG5MnRxcn+EBLy+4GZ+QTnoV26zneA== 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 4561223895; Sun, 8 May 2022 11:10:32 +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 248BAWF8077591; Sun, 8 May 2022 11:10:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 248BAWXK077590; Sun, 8 May 2022 11:10:32 GMT (envelope-from git) Date: Sun, 8 May 2022 11:10:32 GMT Message-Id: <202205081110.248BAWXK077590@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Rodrigo Osorio Subject: git: 846e6c502da7 - main - net/rsync: Fix unexpected changes caused by previous rsync commit List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rodrigo X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 846e6c502da76de2a1c624aeb219898107fbffb5 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652008232; 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=pcADUtzbJDsz/DYAMmnPNqK9kdSYbzMQrFxPH0xMceg=; b=KpLe5XG1vztZ/pMS1eZjuofuYP3KK3VQxt97NtoY3xqJg7Nyd7OEizba8z+BeCzOYD0IRC GjGFLdaDxoPLWXX0gT9Gt4Pg80A9Tp8VJe3J3pD6sE4cW0bEDEPUQkNsbPXGSzUP4tTp4F +hRN4RYS5jmw55wLOduTmfO/+eb7knEU8UQNs6MNtnPBtrp90UbjZhqRG8hb1XsncrUCDA Ju1POr50sGiyCMAd0aa9PFlmoWnzGyYJMdJeLOCzKnXRVsNcieUKXkfZnXg0MJRXElcqIn vDjvVewTFrKIJ96n+ALNRzv83SsWbp3V1bN+AxQGA/YjZnVB7KPEc+Kd2tJaDg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1652008232; a=rsa-sha256; cv=none; b=LF/ES1EksKV3dHboPDhS//BFRuiWWaJZeoCNfSh+nSPXjpyAnaAFjVYBA2vAS4BLt8yKSD twtQ5j6pVspjxrUPNSE2ud7TqIAsNz4MRFn5aq+uVw7OQ5F9qG4qZly2J/HkTrcjUZRUA7 6vbpFdFuklqhXTuxBLaRbajYZYQfJg7Q2J4AIxKgZsRjlo7LT5zMEdcJb3YytvkSqIYuo0 tymPWzu346pVzIBrvR17p1TmayteIPKuNcsGUMzuLYJS8NWx7fdIhWdYs46cBrOLnMaFUE Cs/bVRZQJtJlEbtP65kwVxUcTzP2y0hRbJXkvyzvx+w3fxKgh9jBynrYn+dVFw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by rodrigo: URL: https://cgit.FreeBSD.org/ports/commit/?id=846e6c502da76de2a1c624aeb219898107fbffb5 commit 846e6c502da76de2a1c624aeb219898107fbffb5 Author: Rodrigo Osorio AuthorDate: 2022-05-08 09:21:44 +0000 Commit: Rodrigo Osorio CommitDate: 2022-05-08 11:00:37 +0000 net/rsync: Fix unexpected changes caused by previous rsync commit * Remove python dependency introduced in last commit, we keep USES=python to fix the rrsync shebang but add PYTHON_NO_DEPENDS=yes since Python itself is not wanted. Add a pkg-message to notify users. * Fix patching issues on manpages and sample files which abusively transformes all etc paths into /usr/local/etc. * Install missing rrsync manpage Also add forgotten items in last commit * version 3.2.4 fixes CVE-2018-25032 in bundled zlib * remove upstreamed patch to fix time limit options (patch-io.c) PR: 263787 PR: 263794 Reported by: Reported by: Security: CVE-2018-25032 in the bundled zlib --- net/rsync/Makefile | 8 ++++++-- net/rsync/pkg-message | 8 ++++++++ net/rsync/pkg-plist | 1 + 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/net/rsync/Makefile b/net/rsync/Makefile index a558a11d612e..dc13b0c295a3 100644 --- a/net/rsync/Makefile +++ b/net/rsync/Makefile @@ -2,6 +2,7 @@ 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/ \ @@ -20,6 +21,7 @@ LIB_DEPENDS= liblz4.so:archivers/liblz4 \ libzstd.so:archivers/zstd USES= cpe python shebangfix ssl +PYTHON_NO_DEPENDS= yes CPE_VENDOR= samba CPE_PRODUCT= rsync USE_RC_SUBR= rsyncd @@ -88,14 +90,16 @@ CONFIGURE_ARGS+= ac_cv_search_libiconv_open=no .endif post-patch: - @${REINPLACE_CMD} -e 's:/etc/:${ETCDIR}/:g' \ - ${WRKSRC}/rsync.1 ${WRKSRC}/rsyncd.conf.5 + @${REINPLACE_CMD} -e 's:/etc/r{1,2}sync:${ETCDIR}/:g' \ + -e 's:/etc/letsencrypt:${PREFIX}/etc/letsencrypt:g' \ + ${WRKSRC}/rsync.1 ${WRKSRC}/rsyncd.conf.5 @${REINPLACE_CMD} -e 's|/usr/bin/rsync|${PREFIX}/bin/rsync|g' ${WRKSRC}/support/rrsync post-install: @${MKDIR} ${STAGEDIR}${ETCDIR} ${INSTALL_DATA} ${FILESDIR}/rsyncd.conf.sample ${STAGEDIR}${ETCDIR}/ ${INSTALL_SCRIPT} ${WRKSRC}/support/rrsync ${STAGEDIR}${PREFIX}/sbin + ${INSTALL_MAN} ${WRKSRC}/rrsync.1 ${STAGEDIR}${PREFIX}/man/man1/ post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} diff --git a/net/rsync/pkg-message b/net/rsync/pkg-message new file mode 100644 index 000000000000..2710aeb697ba --- /dev/null +++ b/net/rsync/pkg-message @@ -0,0 +1,8 @@ +[ +{ type: install + message: <