Diff rsync-3.3.0-r2 with a rsync-9999

/usr/portage/net-misc/rsync/rsync-9999.ebuild 2025-11-18 18:18:07.534755013 +0300
16 16

  
17 17
	REQUIRED_USE="${PYTHON_REQUIRED_USE}"
18 18
else
19
	VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/waynedavison.asc
19
	VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/andrewtridgell.asc
20 20
	inherit verify-sig
21 21

  
22 22
	if [[ -n ${RSYNC_NEEDS_AUTOCONF} ]] ; then
......
27 27
		SRC_DIR="src-previews"
28 28
	else
29 29
		SRC_DIR="src"
30
		KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
30
		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
31 31
	fi
32 32

  
33 33
	SRC_URI="https://rsync.samba.org/ftp/rsync/${SRC_DIR}/${P/_/}.tar.gz
......
37 37

  
38 38
LICENSE="GPL-3"
39 39
SLOT="0"
40
IUSE="acl examples iconv lz4 rrsync ssl stunnel system-zlib xattr xxhash zstd"
40
IUSE="acl examples iconv lz4 rrsync ssl stunnel system-zlib xattr +xxhash zstd"
41 41
REQUIRED_USE+=" examples? ( ${PYTHON_REQUIRED_USE} )"
42 42
REQUIRED_USE+=" rrsync? ( ${PYTHON_REQUIRED_USE} )"
43 43

  
44 44
# attr is autodetected and then dropped by -Wl,--as-needed:
45 45
# https://github.com/RsyncProject/rsync/pull/753
46 46
RDEPEND="
47
	>=dev-libs/popt-1.5
47
	>=dev-libs/popt-1.19
48 48
	acl? ( virtual/acl )
49 49
	examples? (
50 50
		${PYTHON_DEPS}
......
74 74
			dev-python/commonmark[${PYTHON_USEDEP}]
75 75
		')"
76 76
else
77
	BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-waynedavison )"
77
	BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-andrewtridgell )"
78 78
fi
79 79

  
80
PATCHES=(
81
	# Temporary just for the bug #948106 CVE fixes
82
	"${FILESDIR}"/3.3.0
83
)
84

  
85 80
pkg_setup() {
86 81
	# - USE=examples needs Python itself at runtime, but nothing else
87 82
	# - 9999 needs commonmark at build time
......
114 109
}
115 110

  
116 111
src_configure() {
117
	# Should be fixed upstream in next release (>3.3.0) (bug #943745)
118
	append-cflags $(test-flags-CC -std=gnu17)
119

  
120 112
	local myeconfargs=(
121 113
		--with-rsyncd-conf="${EPREFIX}"/etc/rsyncd.conf
122 114
		--without-included-popt
Thank you!