commit: 903371f5a50399721e749f50d9406361b726b3ee Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Sat Mar 29 17:00:56 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sat Mar 29 17:01:49 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=903371f5
net-misc/rsync: add 3.4.1 Note that the CVE fixes were already backported & fixed in 3.3.0-r2. The reports of regressions upstream seem to have slowed now. Bug: https://bugs.gentoo.org/948106 Signed-off-by: Sam James <sam <AT> gentoo.org> net-misc/rsync/Manifest | 2 ++ net-misc/rsync/files/rsync-3.4.1-c23.patch | 20 ++++++++++++++++++++ .../rsync/{rsync-9999.ebuild => rsync-3.4.1.ebuild} | 14 +++++++++----- net-misc/rsync/rsync-9999.ebuild | 14 +++++++++----- 4 files changed, 40 insertions(+), 10 deletions(-) diff --git a/net-misc/rsync/Manifest b/net-misc/rsync/Manifest index a5939be1ad9c..63f0e788cb9f 100644 --- a/net-misc/rsync/Manifest +++ b/net-misc/rsync/Manifest @@ -2,3 +2,5 @@ DIST rsync-3.2.7.tar.gz 1149787 BLAKE2B 1b910b321e8d6b49af9f26bef813509f0da12ded DIST rsync-3.2.7.tar.gz.asc 195 BLAKE2B d2bca9276d9a0c96a9156a8da60e391f58eceb2e1ffaa51b7e7ffd592feaba3ce54772bd563a251e3b30efb0ad07fc96da01158a77dd77c6534eac5d80b46e53 SHA512 bad9f48e033966566c6abf8cd485d35c0d9cf130eafb0c5fff9bcb928882283bbcdd2375e7c2880cf71cf81496ba6b743b61adca3d4678421c32915a2464acc3 DIST rsync-3.3.0.tar.gz 1153969 BLAKE2B 75a3cc50452086aebd16f42d7a309c173cbc1ea156227afb10d2106d0b9043e973676995b8199d22840775ae3df8db97d1c0de5f3aa58afa130c5b1348c3f825 SHA512 df5c53bc2f2b0e7e30f475903e5e4296dc2fbcf08e9ea6c3c61462d0e52b067c27e82deeb4be79102c86e9aa55a825182e126f22df44dabf5b7328acb2a01d10 DIST rsync-3.3.0.tar.gz.asc 195 BLAKE2B bd077217bd44d406ac49a55b0c0d38c2accd4867b9fbf78a13fe906f52e1773d5a69aa3116a0c245abdeb1af54705d6ffc75aaba8b276ba9229bbb3340d7c3e8 SHA512 611d26374e0ff98ffb11b6ad6555f08773b9f09e1fbf232abc73c5d472b0defd28fd559bd42707774204d055b93be289f19f4db94bbdfe0b0935918fd922cced +DIST rsync-3.4.1.tar.gz 1172739 BLAKE2B 79c1cad697547059ee241e20c26d7f97bed3ad062deb856d31a617fead333a2d9f62c7c47c1efaf70033dbc358fe547d034c35e8181abb51a1fc893557882bc7 SHA512 a3ecde4843ddb795308dca88581b868ac0221eb6f88a1477d7a9a2ecb4e4686042966bdddbab40866f90a4715d3104daa7b83222ddf0f3387b796a86bde8e5c2 +DIST rsync-3.4.1.tar.gz.asc 862 BLAKE2B 5684bd57423e8e43b973c2c416c4897901a3a8b33c22690eaedc609109088e1d5d70f5cf5deaafefc69f547d198b5f8b17f3c484211d545095b19dac7e0bc7d3 SHA512 c83e187c88110b6119a023d239c76291f15124760fd245ead17e747424946e7864187aae96af6f5930cb84beff7308b99daa0566f306c9f2de51e2475704c320 diff --git a/net-misc/rsync/files/rsync-3.4.1-c23.patch b/net-misc/rsync/files/rsync-3.4.1-c23.patch new file mode 100644 index 000000000000..111847c0e163 --- /dev/null +++ b/net-misc/rsync/files/rsync-3.4.1-c23.patch @@ -0,0 +1,20 @@ +https://github.com/RsyncProject/rsync/pull/716 + +From 026ef4cd09660c0a096e285e668b4ba7cd396509 Mon Sep 17 00:00:00 2001 +From: Michal Ruprich <mrupr...@redhat.com> +Date: Fri, 17 Jan 2025 12:37:57 +0100 +Subject: [PATCH] bool is a keyword in C23 + +--- a/wildtest.c ++++ b/wildtest.c +@@ -32,7 +32,9 @@ int fnmatch_errors = 0; + + int wildmatch_errors = 0; + ++#if !defined(__STDC_VERSION__) || __STDC_VERSION__ < 202311L + typedef char bool; ++#endif + + int output_iterations = 0; + int explode_mod = 0; + diff --git a/net-misc/rsync/rsync-9999.ebuild b/net-misc/rsync/rsync-3.4.1.ebuild similarity index 94% copy from net-misc/rsync/rsync-9999.ebuild copy to net-misc/rsync/rsync-3.4.1.ebuild index 5ee608143668..759c2d0bd78d 100644 --- a/net-misc/rsync/rsync-9999.ebuild +++ b/net-misc/rsync/rsync-3.4.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -16,7 +16,7 @@ if [[ ${PV} == *9999 ]] ; then REQUIRED_USE="${PYTHON_REQUIRED_USE}" else - VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/waynedavison.asc + VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/andrewtridgell.asc inherit verify-sig if [[ -n ${RSYNC_NEEDS_AUTOCONF} ]] ; then @@ -42,7 +42,7 @@ REQUIRED_USE+=" examples? ( ${PYTHON_REQUIRED_USE} )" REQUIRED_USE+=" rrsync? ( ${PYTHON_REQUIRED_USE} )" RDEPEND=" - >=dev-libs/popt-1.5 + >=dev-libs/popt-1.19 acl? ( virtual/acl ) examples? ( ${PYTHON_DEPS} @@ -73,9 +73,13 @@ if [[ ${PV} == *9999 ]] ; then dev-python/commonmark[${PYTHON_USEDEP}] ')" else - BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-waynedavison )" + BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-andrewtridgell )" fi +PATCHES=( + "${FILESDIR}"/${PN}-3.4.1-c23.patch +) + pkg_setup() { # - USE=examples needs Python itself at runtime, but nothing else # - 9999 needs commonmark at build time @@ -143,7 +147,7 @@ src_install() { dodoc NEWS.md README.md TODO tech_report.tex insinto /etc - newins "${FILESDIR}"/rsyncd.conf-3.0.9-r1 rsyncd.conf + newins "${FILESDIR}"/rsyncd.conf-3.2.7-r5 rsyncd.conf insinto /etc/logrotate.d newins "${FILESDIR}"/rsyncd.logrotate rsyncd diff --git a/net-misc/rsync/rsync-9999.ebuild b/net-misc/rsync/rsync-9999.ebuild index 5ee608143668..759c2d0bd78d 100644 --- a/net-misc/rsync/rsync-9999.ebuild +++ b/net-misc/rsync/rsync-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -16,7 +16,7 @@ if [[ ${PV} == *9999 ]] ; then REQUIRED_USE="${PYTHON_REQUIRED_USE}" else - VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/waynedavison.asc + VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/andrewtridgell.asc inherit verify-sig if [[ -n ${RSYNC_NEEDS_AUTOCONF} ]] ; then @@ -42,7 +42,7 @@ REQUIRED_USE+=" examples? ( ${PYTHON_REQUIRED_USE} )" REQUIRED_USE+=" rrsync? ( ${PYTHON_REQUIRED_USE} )" RDEPEND=" - >=dev-libs/popt-1.5 + >=dev-libs/popt-1.19 acl? ( virtual/acl ) examples? ( ${PYTHON_DEPS} @@ -73,9 +73,13 @@ if [[ ${PV} == *9999 ]] ; then dev-python/commonmark[${PYTHON_USEDEP}] ')" else - BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-waynedavison )" + BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-andrewtridgell )" fi +PATCHES=( + "${FILESDIR}"/${PN}-3.4.1-c23.patch +) + pkg_setup() { # - USE=examples needs Python itself at runtime, but nothing else # - 9999 needs commonmark at build time @@ -143,7 +147,7 @@ src_install() { dodoc NEWS.md README.md TODO tech_report.tex insinto /etc - newins "${FILESDIR}"/rsyncd.conf-3.0.9-r1 rsyncd.conf + newins "${FILESDIR}"/rsyncd.conf-3.2.7-r5 rsyncd.conf insinto /etc/logrotate.d newins "${FILESDIR}"/rsyncd.logrotate rsyncd
