From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 47A0915808B for ; Sat, 16 Apr 2022 02:09:42 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 21E1AE0984; Sat, 16 Apr 2022 02:09:41 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E66C0E0997 for ; Sat, 16 Apr 2022 02:09:39 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 51630342103 for ; Sat, 16 Apr 2022 02:09:36 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E54CA3AF for ; Sat, 16 Apr 2022 02:09:34 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1650074963.87f7448ac5a516c80f53ab93edfc963930d0e130.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/rsync/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-misc/rsync/Manifest net-misc/rsync/rsync-3.2.4.ebuild net-misc/rsync/rsync-9999.ebuild X-VCS-Directories: net-misc/rsync/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 87f7448ac5a516c80f53ab93edfc963930d0e130 X-VCS-Branch: master Date: Sat, 16 Apr 2022 02:09:34 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 31b5755b-a7e8-40c4-aa2f-675dd19c271d X-Archives-Hash: fd9aca936b1309c2c740f6217e902bc8 commit: 87f7448ac5a516c80f53ab93edfc963930d0e130 Author: Sam James gentoo org> AuthorDate: Sat Apr 16 01:50:02 2022 +0000 Commit: Sam James gentoo org> CommitDate: Sat Apr 16 02:09:23 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=87f7448a net-misc/rsync: add 3.2.4 Signed-off-by: Sam James gentoo.org> net-misc/rsync/Manifest | 2 ++ .../{rsync-9999.ebuild => rsync-3.2.4.ebuild} | 37 ++++++++++++---------- net-misc/rsync/rsync-9999.ebuild | 34 +++++++++++++------- 3 files changed, 45 insertions(+), 28 deletions(-) diff --git a/net-misc/rsync/Manifest b/net-misc/rsync/Manifest index c274f49f3aef..f217d9271b7d 100644 --- a/net-misc/rsync/Manifest +++ b/net-misc/rsync/Manifest @@ -1,2 +1,4 @@ DIST rsync-3.2.3.tar.gz 1069784 BLAKE2B 085adb55d0d7e3d063fa198912fd09df67b63800a65baff5315ccb7dfc0e9d703eef30a7f2e72e3b271162c280abd9809b3f736704752c1663eed65ad8e0ac25 SHA512 48b68491f3ef644dbbbfcaec5ab90a1028593e02d50367ce161fd9d3d0bd0a3628bc57c5e5dec4be3a1d213f784f879b8a8fcdfd789ba0f99837cba16e1ae70e DIST rsync-3.2.3.tar.gz.asc 195 BLAKE2B cc18dd2589c09f869e35ecaf94a610e5b605dcb10ceaf01e6c0eb2667666a9a73feb7dcb2325638686c772f91a74d6d1f15ea33fdb6a38e89640f32a8cd0e04a SHA512 b7e512d8bb0aaff7c48571b918a7b0362942c65ef2a0aa076574ec86c05822dc5df41f8796fdf62b762b12d166a671c9e979f9962357b89e3649459c4567525b +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 diff --git a/net-misc/rsync/rsync-9999.ebuild b/net-misc/rsync/rsync-3.2.4.ebuild similarity index 84% copy from net-misc/rsync/rsync-9999.ebuild copy to net-misc/rsync/rsync-3.2.4.ebuild index 0da8ff82f683..9d743d95cc3d 100644 --- a/net-misc/rsync/rsync-9999.ebuild +++ b/net-misc/rsync/rsync-3.2.4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -7,19 +7,24 @@ inherit flag-o-matic 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} ) +if [[ ${PV} == *9999 ]] ; then + PYTHON_COMPAT=( python3_{8,9,10} ) + EGIT_REPO_URI="https://github.com/WayneD/rsync.git" inherit autotools git-r3 python-any-r1 - EGIT_REPO_URI="https://github.com/WayneD/rsync.git" else - if [[ "${PV}" == *_pre* ]] ; then + VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/waynedavison.asc + inherit verify-sig + + 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/_/}" + + SRC_URI="https://rsync.samba.org/ftp/rsync/${SRC_DIR}/${P/_/}.tar.gz + verify-sig? ( https://rsync.samba.org/ftp/rsync/${SRC_DIR}/${P/_/}.tar.gz.asc )" + S="${WORKDIR}"/${P/_/} fi LICENSE="GPL-3" @@ -37,21 +42,19 @@ RDEPEND="acl? ( virtual/acl ) iconv? ( virtual/libiconv )" DEPEND="${RDEPEND}" -if [[ "${PV}" == *9999 ]] ; then - BDEPEND="${PYTHON_DEPS} +if [[ ${PV} == *9999 ]] ; then + BDEPEND+=" ${PYTHON_DEPS} $(python_gen_any_dep ' dev-python/commonmark[${PYTHON_USEDEP}] ')" +else + BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-waynedavison )" fi -# Only required for live ebuild -python_check_deps() { - has_version "dev-python/commonmark[${PYTHON_USEDEP}]" -} - src_prepare() { default - if [[ "${PV}" == *9999 ]] ; then + + if [[ ${PV} == *9999 ]] ; then eaclocal -I m4 eautoconf -o configure.sh eautoheader && touch config.h.in @@ -111,7 +114,7 @@ src_install() { eprefixify "${ED}"/etc/{,xinetd.d}/rsyncd* - systemd_newunit "packaging/systemd/rsync.service" "rsyncd.service" + systemd_newunit packaging/systemd/rsync.service rsyncd.service } pkg_postinst() { @@ -121,12 +124,14 @@ pkg_postinst() { 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 =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