commit: 4e5ed953755580feb167672fb76923f1980d3a9e Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Sun Aug 14 19:44:11 2022 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sun Aug 14 19:49:09 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4e5ed953
net-misc/rsync: add 3.2.5 Drops USE=ipv6 given it's not a well-tested option anyway (see e.g. https://bugzilla.samba.org/show_bug.cgi?id=10715). IPv6 support is now always enabled. Bug: https://bugs.gentoo.org/862876 Signed-off-by: Sam James <sam <AT> gentoo.org> net-misc/rsync/Manifest | 2 ++ net-misc/rsync/{rsync-9999.ebuild => rsync-3.2.5.ebuild} | 12 ++++-------- net-misc/rsync/rsync-9999.ebuild | 12 ++++-------- 3 files changed, 10 insertions(+), 16 deletions(-) diff --git a/net-misc/rsync/Manifest b/net-misc/rsync/Manifest index aaab9bd8b140..c93d6bb16857 100644 --- a/net-misc/rsync/Manifest +++ b/net-misc/rsync/Manifest @@ -1,5 +1,7 @@ DIST rsync-3.2.4.tar.gz 1114853 BLAKE2B a67fcb9619874f1c5346a876138e59f4bf508a90736f830fb2b4eaf180ab11f15a0a7db9b3b28c3b990b77c2b0973d8e668bf509e4134f464159ed3172f53d80 SHA512 96318e2754fbddf84d16df671c721e577766969dfa415925c4dc1be2e4e60a51246623747a8aec0c6e9c0824e6aa7335235ccd07f3d6fd901f8cf28e2d6e91b6 DIST rsync-3.2.4.tar.gz.asc 195 BLAKE2B 9bc2fbd59e5396a91de82f27a461367ad2a129820e2d1926c3b1e26dacf93c676a7231f186c341b6dec9c764a9619b504bc9b5f95925982e78de4607eddf6c65 SHA512 7e1bbebc777d5710345fdec1efd4c2ef1079d6c0ec90272a1a4a51a59ae3cb619b9d1c0ae2f337ecdd06827bb3536b969b6f21f9108f8d21114713aa1750012b +DIST rsync-3.2.5.tar.gz 1129957 BLAKE2B a0d1c4a2dbebe37bad4f6e2e5e4fae41c53529d96e0ca5a429d29d1dee8c63c8ee1b7dc686b732a88049c547271260e8361ac798673970d5327d08dda01ce811 SHA512 6d115acb5bae546cd2b5df2c11390f8609107b7a45aa649158d8daa0c9290ab5f15640fdd4000b21d1ab39f7385b85d77cd8fe4628fa13b2adeea6fcd53d057a +DIST rsync-3.2.5.tar.gz.asc 195 BLAKE2B 9ca9034afc39299c2178190412b188f561d274d8e38d58a988487f2db14a8135840acf3413096d26f080358b69779fa3b48e292670ba6b23ae4eb0c05f9df614 SHA512 b384f48b2fd459a51715c8ab2a14e540c5fa7f7f12453282db770893d6121b1b3c9809e667ccacaf910fd90548abeb700a2c717d76fbea22fe3d6a22aa6b2c44 DIST rsync-3.2.5pre1.tar.gz 1126641 BLAKE2B 14ffa62305d3e842a89992d9d47e79a8efec5744b297a16dbe6d3440c26b10ac200927ca0f4b6fd1d83e705b56fb6ee9cdedc048dd7e8d6ccf92932e462e9159 SHA512 fe3126ba617b1e4dfb0de845dc1438be8aff07d51d70c0b232e6f0d1efba808d0fb42a30ed39fdb3303c489ef85e0761e188d4ed5fa9d6145cb749c7d11b3fb5 DIST rsync-3.2.5pre1.tar.gz.asc 195 BLAKE2B 714eed7026f17131a8cbc13fa3f79e0fba52087b23ef84dbe45a5d84a23610d365ac9cd1e7494287a863b7c1bf8ee296fb80b4d4d592ec79d22376666cc005e4 SHA512 9ddfa092155f6c07e9617000ba55c36a2521cc9a9f30f376e89dde2de7bc25270fa348c0622a2a27c68f69bbdae20c75d99d8a75ce446ff490acb236bf5f9b58 DIST rsync-3.2.5pre2.tar.gz 1127513 BLAKE2B efad3981877809493a96a15f1bec6920a3b975c2d100b5c292800d6fe3aa78e84df601be7eb6fdf51a720ef7d6d96aa648589151bbd238ad1f60ca04f003dda6 SHA512 0e576d074fedefacaaf86d1a7e90b8c77db365f3994d2362d5e6b738cf8362ce2f113dcc2acd76b6635db589492b64ad7a1649ae5cbdb4faec5cde03de6e6faf diff --git a/net-misc/rsync/rsync-9999.ebuild b/net-misc/rsync/rsync-3.2.5.ebuild similarity index 93% copy from net-misc/rsync/rsync-9999.ebuild copy to net-misc/rsync/rsync-3.2.5.ebuild index d172d6ec7259..ab9d689fb713 100644 --- a/net-misc/rsync/rsync-9999.ebuild +++ b/net-misc/rsync/rsync-3.2.5.ebuild @@ -1,9 +1,9 @@ # Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -PYTHON_COMPAT=( python3_{8,9,10} ) +PYTHON_COMPAT=( python3_{8..10} ) inherit flag-o-matic prefix python-single-r1 systemd DESCRIPTION="File transfer program to keep remote files into sync" @@ -31,7 +31,7 @@ fi LICENSE="GPL-3" SLOT="0" -IUSE="acl examples iconv ipv6 lz4 ssl stunnel system-zlib xattr xxhash zstd" +IUSE="acl examples iconv lz4 ssl stunnel system-zlib xattr xxhash zstd" REQUIRED_USE+=" examples? ( ${PYTHON_REQUIRED_USE} )" RDEPEND="acl? ( virtual/acl ) @@ -78,16 +78,12 @@ src_prepare() { } src_configure() { - # Force enable IPv6 on musl - upstream bug: - # https://bugzilla.samba.org/show_bug.cgi?id=10715 - use elibc_musl && use ipv6 && append-cppflags -DINET6 - local myeconfargs=( --with-rsyncd-conf="${EPREFIX}"/etc/rsyncd.conf --without-included-popt + --enable-ipv6 $(use_enable acl acl-support) $(use_enable iconv) - $(use_enable ipv6) $(use_enable lz4) $(use_enable ssl openssl) $(use_with !system-zlib included-zlib) diff --git a/net-misc/rsync/rsync-9999.ebuild b/net-misc/rsync/rsync-9999.ebuild index d172d6ec7259..ab9d689fb713 100644 --- a/net-misc/rsync/rsync-9999.ebuild +++ b/net-misc/rsync/rsync-9999.ebuild @@ -1,9 +1,9 @@ # Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -PYTHON_COMPAT=( python3_{8,9,10} ) +PYTHON_COMPAT=( python3_{8..10} ) inherit flag-o-matic prefix python-single-r1 systemd DESCRIPTION="File transfer program to keep remote files into sync" @@ -31,7 +31,7 @@ fi LICENSE="GPL-3" SLOT="0" -IUSE="acl examples iconv ipv6 lz4 ssl stunnel system-zlib xattr xxhash zstd" +IUSE="acl examples iconv lz4 ssl stunnel system-zlib xattr xxhash zstd" REQUIRED_USE+=" examples? ( ${PYTHON_REQUIRED_USE} )" RDEPEND="acl? ( virtual/acl ) @@ -78,16 +78,12 @@ src_prepare() { } src_configure() { - # Force enable IPv6 on musl - upstream bug: - # https://bugzilla.samba.org/show_bug.cgi?id=10715 - use elibc_musl && use ipv6 && append-cppflags -DINET6 - local myeconfargs=( --with-rsyncd-conf="${EPREFIX}"/etc/rsyncd.conf --without-included-popt + --enable-ipv6 $(use_enable acl acl-support) $(use_enable iconv) - $(use_enable ipv6) $(use_enable lz4) $(use_enable ssl openssl) $(use_with !system-zlib included-zlib)
