gentoo resync : 31.05.2021

5 files changed, 6 insertions, 153 deletions

diff --git a/net-misc/rsync/Manifest b/net-misc/rsync/Manifest
index c173d3030617..965f89b9392d 100644
--- a/net-misc/rsync/Manifest
+++ b/net-misc/rsync/Manifest
@@ -2,10 +2,9 @@ AUX rsync-3.2.3-glibc-lchmod.patch 1836 BLAKE2B 14b2e4246c6c2d4623500e346bea3ad4
 AUX rsyncd.conf-3.0.9-r1 462 BLAKE2B 45a7dde876368e7392ee7a05edf593f55cf6b3b4dc913745f4322ebd75f97bcdf1a24240a54e11469bd659fd565fc74cd8eeaa9490434d88444b5a076803cea7 SHA512 5c57f633aa3daa6513b5d35a1157a50308559ad993257374ce4eea0269f6bf384938f95bed749acb19538e8c4672355351fcee5cef9607153463b19227d343d7
 AUX rsyncd.conf.d 149 BLAKE2B fd2556d0c270c2baa83d4d474d44ab1d16e35f112279a339f179f9af693d977cc0863bf4cd7139363c58e4e6a1a18a24c06474ecc248167224261dbaf04ae0a8 SHA512 8ea9a2f1fea508fa132313fa16513eac84a9ed3ce75741c42769b56bbcd3f1bd2eb8bfdfe40a6c7f619e4281e8fc8d95d1bd84096d0b64aaacf606cd614ae5b3
 AUX rsyncd.init.d-r1 247 BLAKE2B ec4f7a875a51bae10cff7e15df18d285b01dddaa99a03127ba242ec535b7c8a3af3ad4489661ba7b5f6b074e2af38b12da394c0f8992bd28328d807a89757bb0 SHA512 df2ef4d9e65fa72daa9a7d91d69a06027d0e0fbc48f9ebd485e2d51990c8d00985b7ccf41314f984975e8073e2075bbdfe5543754718381497c334dc7d96451a
-AUX rsyncd.logrotate 105 BLAKE2B 82430036a5ca123ba20bc80040e98869734b3b397440968909e9ee0f109b9151de8157427b0aa8fb0ed89fa6cc4cab6ac6e0a9986c076531cd4aa87bea4e2d25 SHA512 b8d6c0bb467a5c963317dc55478d2c10874564cd264d943d4a42037e2fce134fe001fabc92af5c6b5775e84dc310b1c8da147afaa61c99e5663c36580d8651a5
+AUX rsyncd.logrotate 104 BLAKE2B 8e031a851e527815d26816985b8438dd439614cf8753d5137cccd73703e8311c33560580736b562ae03951520254b1e6a9ad26d587f5157866c2af1c9e648c3b SHA512 e7ff164926785c4eff2ea641c7ce2d270b25f1c26d93a6108bb6ff2c0207a28ebfd93dca39596243446ce41aceaeae62fc2b34084eb9c9086fcdbc03a657eed8
 AUX rsyncd.xinetd-3.0.9-r1 194 BLAKE2B 8e3edf4831e020451ba1886e2e8ae86e576016aabcaaf8e84c48adb15ba6a2e8d8c58098af2757011ea4f84fbfd758029d905fb8f5ed21bcc5ac34c3baae2a9c SHA512 fc053fc4748950343e866cc95284d037156a953454e4294d775f01f059e96e805582688bf1de5c965836889192ce4a663ec740e6ec2265406e509c5c6d6c3215
 DIST rsync-3.2.3.tar.gz 1069784 BLAKE2B 085adb55d0d7e3d063fa198912fd09df67b63800a65baff5315ccb7dfc0e9d703eef30a7f2e72e3b271162c280abd9809b3f736704752c1663eed65ad8e0ac25 SHA512 48b68491f3ef644dbbbfcaec5ab90a1028593e02d50367ce161fd9d3d0bd0a3628bc57c5e5dec4be3a1d213f784f879b8a8fcdfd789ba0f99837cba16e1ae70e
-EBUILD rsync-3.2.3-r2.ebuild 4074 BLAKE2B 94c4dec18019a55a7f9c47c1c859caa9d9a3f245e407e9a0094bba6eb5309c27d2926ea3d5fe76e08ce3cfd71dbd2c92be58c178419a30504d8536d2d72a8bbf SHA512 9f86e4bd40539bcbd0ad396d71d1b95622e2ac96b25d413925c9732b63441ec95717d1f627c5effa73175fdbbf786fd73410e082b2c156ef641bf33b4eb8b2cb
-EBUILD rsync-3.2.3-r3.ebuild 3963 BLAKE2B 92b115ec6174e7b3bf2f60d29b9b34eb8c103ef5d88b66d692e9172e5bced76568efacb7e2f993d5e367e6130adb3ef049fe93be4b01e4e1d15cfbd3c2405f30 SHA512 489d75155f40390125567fd6f371bb33129bd12eb99955d53bbb74d0ce5300e91d89f333fa5626479b0af92e386d5f43b5d3ce83b04c00ca5230350e66eb17c6
-EBUILD rsync-9999.ebuild 3904 BLAKE2B 2e0ee58ff446a942084240e1f1e91d32e6ce37da72b6be5cfc89dfab97487adeb6e6422d7ce24b13ffc7725d0c00cf5a92772f5a3f31ea3aac62284397f4c608 SHA512 c4c72c379a294686926da24fa2c0a45a70566a5f9be4ec7989560e119ea3b10d25b1a33e7f2f4ba4d1ddb1502ae8c9bb34ff41ee134a9cb6f6d9b8e5b3b7f94e
+EBUILD rsync-3.2.3-r4.ebuild 3963 BLAKE2B 17f902650a030111cb232102e132b8aeffc680fd2ae1a91a12cf9ee755a0bc4be79368b403aca6ba562c57da56c7e10520e5f6e0fc1c3709a25e7bafe51958d4 SHA512 1c2aeb0a0fd3e192f3bfd88298662e22d2626c8929fbfd3e49a43ac56e6b2c42c07c0c12c916b7bd85c47f2ab9ae683a86b2b8ac2004f5766e1338e65a6f2bda
+EBUILD rsync-9999.ebuild 3904 BLAKE2B 132baf8b3aab2eeb43b888947c1c280d478d3524f5a2f7a7f460952e82f9837367b83c86fee945da2ca9537655cc50c83c23fe8465e562717c5943aeccc761b3 SHA512 7986da32b9b1009f2f7d29c5e4b94b414e1520be8bfa6d1b0902bd1dc97cdc150ba68b50b99d1e68fca7ccde6c6126ece21461b7280be6154d9ed03967892fad
 MISC metadata.xml 654 BLAKE2B 28ea5b4e47a5e420ab64c1b688425995d9ab4e556a27b56b27f512a15ec337aa6a1028449ae0a2f9fa313df2b5b5e98b6cf98a38dac82eb83ca3b4871f3b1514 SHA512 3e23d80d1c4fffdc38287e0f1a09f44040a53eb1b395dd8e9b47aa6d467ed4cf4a0b379ce578f1ecf6438a4f322375b633dc47fd2a50e7badd5f94054bfb558d
diff --git a/net-misc/rsync/files/rsyncd.logrotate b/net-misc/rsync/files/rsyncd.logrotate
index 34bcf72d210c..ec8a98284e23 100644
--- a/net-misc/rsync/files/rsyncd.logrotate
+++ b/net-misc/rsync/files/rsyncd.logrotate
@@ -2,7 +2,7 @@
 	compress
 	maxage 365
 	rotate 7
-	size=+1024k
+	size 1024k
 	notifempty
 	missingok
 	copytruncate
diff --git a/net-misc/rsync/rsync-3.2.3-r2.ebuild b/net-misc/rsync/rsync-3.2.3-r2.ebuild
deleted file mode 100644
index b877bc20ccdb..000000000000
--- a/net-misc/rsync/rsync-3.2.3-r2.ebuild
+++ /dev/null
@@ -1,146 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit prefix systemd
-
-DESCRIPTION="File transfer program to keep remote files into sync"
-HOMEPAGE="https://rsync.samba.org/"
-if [[ "${PV}" == *9999 ]] ; then
-	PYTHON_COMPAT=( python3_{6,7,8} )
-	inherit autotools git-r3 python-any-r1
-	EGIT_REPO_URI="https://github.com/WayneD/rsync.git"
-else
-	if [[ "${PV}" == *_pre* ]] ; then
-		SRC_DIR="src-previews"
-	else
-		SRC_DIR="src"
-		KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-	fi
-	SRC_URI="https://rsync.samba.org/ftp/rsync/${SRC_DIR}/${P/_/}.tar.gz"
-	S="${WORKDIR}/${P/_/}"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE_CPU_FLAGS_X86=" sse2"
-IUSE="acl examples iconv ipv6 lz4 ssl stunnel system-zlib xattr xxhash zstd"
-IUSE+=" ${IUSE_CPU_FLAGS_X86// / cpu_flags_x86_}"
-
-RDEPEND="acl? ( virtual/acl )
-	lz4? ( app-arch/lz4 )
-	ssl? ( dev-libs/openssl:0= )
-	system-zlib? ( sys-libs/zlib )
-	xattr? ( kernel_linux? ( sys-apps/attr ) )
-	xxhash? ( dev-libs/xxhash )
-	zstd? ( >=app-arch/zstd-1.4 )
-	>=dev-libs/popt-1.5
-	iconv? ( virtual/libiconv )"
-DEPEND="${RDEPEND}"
-
-if [[ "${PV}" == *9999 ]] ; then
-	BDEPEND="${PYTHON_DEPS}
-		$(python_gen_any_dep '
-			dev-python/commonmark[${PYTHON_USEDEP}]
-		')"
-fi
-
-# Only required for live ebuild
-python_check_deps() {
-	has_version "dev-python/commonmark[${PYTHON_USEDEP}]"
-}
-
-src_prepare() {
-	default
-	if [[ "${PV}" == *9999 ]] ; then
-		eaclocal -I m4
-		eautoconf -o configure.sh
-		eautoheader && touch config.h.in
-	fi
-}
-
-src_configure() {
-	local myeconfargs=(
-		--with-rsyncd-conf="${EPREFIX}"/etc/rsyncd.conf
-		--without-included-popt
-		$(use_enable acl acl-support)
-		$(use_enable iconv)
-		$(use_enable ipv6)
-		$(use_enable lz4)
-		$(use_enable ssl openssl)
-		$(use_with !system-zlib included-zlib)
-		$(use_enable xattr xattr-support)
-		$(use_enable xxhash)
-		$(use_enable zstd)
-	)
-
-	if use elibc_glibc && [[ "${ARCH}" == "amd64" ]] ; then
-		# SIMD is only available for x86_64 right now
-		# and only on glibc (#728868)
-		myeconfargs+=( $(use_enable cpu_flags_x86_sse2 simd) )
-	else
-		myeconfargs+=( --disable-simd )
-	fi
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	newconfd "${FILESDIR}"/rsyncd.conf.d rsyncd
-	newinitd "${FILESDIR}"/rsyncd.init.d-r1 rsyncd
-
-	dodoc NEWS.md README.md TODO tech_report.tex
-
-	insinto /etc
-	newins "${FILESDIR}"/rsyncd.conf-3.0.9-r1 rsyncd.conf
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/rsyncd.logrotate rsyncd
-
-	insinto /etc/xinetd.d
-	newins "${FILESDIR}"/rsyncd.xinetd-3.0.9-r1 rsyncd
-
-	# Install stunnel helpers
-	if use stunnel ; then
-		emake DESTDIR="${D}" install-ssl-daemon
-	fi
-
-	# Install the useful contrib scripts
-	if use examples ; then
-		exeinto /usr/share/rsync
-		doexe support/*
-		rm -f "${ED}"/usr/share/rsync/{Makefile*,*.c}
-	fi
-
-	eprefixify "${ED}"/etc/{,xinetd.d}/rsyncd*
-
-	systemd_newunit "packaging/systemd/rsync.service" "rsyncd.service"
-}
-
-pkg_postinst() {
-	if egrep -qis '^[[:space:]]use chroot[[:space:]]*=[[:space:]]*(no|0|false)' \
-		"${EROOT}"/etc/rsyncd.conf "${EROOT}"/etc/rsync/rsyncd.conf ; then
-		ewarn "You have disabled chroot support in your rsyncd.conf.  This"
-		ewarn "is a security risk which you should fix.  Please check your"
-		ewarn "/etc/rsyncd.conf file and fix the setting 'use chroot'."
-	fi
-	if use stunnel ; then
-		einfo "Please install \">=net-misc/stunnel-4\" in order to use stunnel feature."
-		einfo
-		einfo "You maybe have to update the certificates configured in"
-		einfo "${EROOT}/etc/stunnel/rsync.conf"
-	fi
-	if use system-zlib ; then
-		ewarn "Using system-zlib is incompatible with <rsync-3.1.1 when"
-		ewarn "using the --compress option."
-		ewarn
-		ewarn "When syncing with >=rsync-3.1.1 built with bundled zlib,"
-		ewarn "and the --compress option, add --new-compress (-zz)."
-		ewarn
-		ewarn "For syncing the portage tree, add:"
-		ewarn "PORTAGE_RSYNC_EXTRA_OPTS=\"--new-compress\" to make.conf"
-	fi
-}
diff --git a/net-misc/rsync/rsync-3.2.3-r3.ebuild b/net-misc/rsync/rsync-3.2.3-r4.ebuild
index d5c381d9ed3b..34c869e7619a 100644
--- a/net-misc/rsync/rsync-3.2.3-r3.ebuild
+++ b/net-misc/rsync/rsync-3.2.3-r4.ebuild
@@ -119,7 +119,7 @@ src_install() {
 }
 
 pkg_postinst() {
-	if egrep -qis '^[[:space:]]use chroot[[:space:]]*=[[:space:]]*(no|0|false)' \
+	if grep -Eqis '^[[:space:]]use chroot[[:space:]]*=[[:space:]]*(no|0|false)' \
 		"${EROOT}"/etc/rsyncd.conf "${EROOT}"/etc/rsync/rsyncd.conf ; then
 		ewarn "You have disabled chroot support in your rsyncd.conf.  This"
 		ewarn "is a security risk which you should fix.  Please check your"
diff --git a/net-misc/rsync/rsync-9999.ebuild b/net-misc/rsync/rsync-9999.ebuild
index de005c109c3c..a0178f21af56 100644
--- a/net-misc/rsync/rsync-9999.ebuild
+++ b/net-misc/rsync/rsync-9999.ebuild
@@ -116,7 +116,7 @@ src_install() {
 }
 
 pkg_postinst() {
-	if egrep -qis '^[[:space:]]use chroot[[:space:]]*=[[:space:]]*(no|0|false)' \
+	if grep -Eqis '^[[:space:]]use chroot[[:space:]]*=[[:space:]]*(no|0|false)' \
 		"${EROOT}"/etc/rsyncd.conf "${EROOT}"/etc/rsync/rsyncd.conf ; then
 		ewarn "You have disabled chroot support in your rsyncd.conf.  This"
 		ewarn "is a security risk which you should fix.  Please check your"