From 930cc7d721b1ea68468608da3ce2b4e891926834 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 16 Aug 2022 08:29:51 +0100 Subject: gentoo auto-resync : 16:08:2022 - 08:29:51 --- net-misc/Manifest.gz | Bin 55435 -> 55442 bytes net-misc/rsync-bpc/Manifest | 2 +- net-misc/rsync-bpc/rsync-bpc-3.1.3.0.ebuild | 2 +- net-misc/rsync/Manifest | 4 +- net-misc/rsync/rsync-3.2.5-r1.ebuild | 161 ++++++++++++++++++++++++++++ net-misc/rsync/rsync-3.2.5.ebuild | 160 --------------------------- net-misc/rsync/rsync-9999.ebuild | 15 +-- 7 files changed, 173 insertions(+), 171 deletions(-) create mode 100644 net-misc/rsync/rsync-3.2.5-r1.ebuild delete mode 100644 net-misc/rsync/rsync-3.2.5.ebuild (limited to 'net-misc') diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz index 541def990281..34d93093a160 100644 Binary files a/net-misc/Manifest.gz and b/net-misc/Manifest.gz differ diff --git a/net-misc/rsync-bpc/Manifest b/net-misc/rsync-bpc/Manifest index 2ec8b1593073..c8eb568781dc 100644 --- a/net-misc/rsync-bpc/Manifest +++ b/net-misc/rsync-bpc/Manifest @@ -1,3 +1,3 @@ DIST rsync-bpc-3.1.3.0.tar.gz 883808 BLAKE2B 56cb299fb75219043364344d6575a443e32b5992a00f6691dde0f6b99c9b54d73d74bbef8dc98a9c927643985031e027df89d4aa1969d493e624290f28cb19f0 SHA512 24ae86c6108720d7f0ba6d144053ccba6499623018bc2bcff8f1d8e289f9c015f80e73244e965a7fcdccb5f9b2a876f1a54ceed42a19a80fd7c87c6b05c7701d -EBUILD rsync-bpc-3.1.3.0.ebuild 423 BLAKE2B 1b854f7c08506e1e53d1fa4d707797b436b60607d33d066c77448b4b99b3d95998ff6431ce15c83cddd990045765db00055ad19d3dba83520cabe36e7befdb24 SHA512 c3f914cc56d2cdb34f5241240bf57433606a52395f6a8fa1566637bd4a6aafc7b378f5d4aa7ed8b38b1629ee51ace13675b1ba2a9f1061f420defd9674485e08 +EBUILD rsync-bpc-3.1.3.0.ebuild 421 BLAKE2B 92ede71ba21737877e70d5cba25341fffe5815a85718ef66a3d4bd0b7fe4c2d9f3aed78497c1c20a3085b70b281a24c7d708181a3df0ca5c875c87a875e0f652 SHA512 2f1f4f02fa59d4bf27584fe1e09027d081c7a0df81f429198a9dddc1fb05b3d96a983c373a361906967251cc5f96db1057b81709dc24e39e4d5f34216503fd5b MISC metadata.xml 416 BLAKE2B e5fc28ce3c8f63e47a48deac7d2ee6a656739c00701b40348a19f7cebcd7523817764c54a7aed7ba4c1eea6553e673ef7a626a1963a5f1fccae1d190b6a20edb SHA512 c1355c99fe725f93dead8d6ef8670c97026e359bf4e9a34eb019c935dbe6e515bfdc2250bfcd36c21458ec6b9cf40b57b2a24a6aad901e55dbd41327e71fccbc diff --git a/net-misc/rsync-bpc/rsync-bpc-3.1.3.0.ebuild b/net-misc/rsync-bpc/rsync-bpc-3.1.3.0.ebuild index c62f819d61f9..0a2235302cda 100644 --- a/net-misc/rsync-bpc/rsync-bpc-3.1.3.0.ebuild +++ b/net-misc/rsync-bpc/rsync-bpc-3.1.3.0.ebuild @@ -9,7 +9,7 @@ SRC_URI="https://github.com/backuppc/rsync-bpc/releases/download/${PV}/${P}.tar. LICENSE="GPL-3" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" RDEPEND="virtual/ssh" DEPEND="${RDEPEND}" diff --git a/net-misc/rsync/Manifest b/net-misc/rsync/Manifest index fd8298aa1eab..1b2bc0590490 100644 --- a/net-misc/rsync/Manifest +++ b/net-misc/rsync/Manifest @@ -11,6 +11,6 @@ DIST rsync-3.2.5.tar.gz 1129957 BLAKE2B a0d1c4a2dbebe37bad4f6e2e5e4fae41c53529d9 DIST rsync-3.2.5.tar.gz.asc 195 BLAKE2B 9ca9034afc39299c2178190412b188f561d274d8e38d58a988487f2db14a8135840acf3413096d26f080358b69779fa3b48e292670ba6b23ae4eb0c05f9df614 SHA512 b384f48b2fd459a51715c8ab2a14e540c5fa7f7f12453282db770893d6121b1b3c9809e667ccacaf910fd90548abeb700a2c717d76fbea22fe3d6a22aa6b2c44 EBUILD rsync-3.2.4-r1.ebuild 4489 BLAKE2B d13cc511cb1c48c11dfce0df382a0e3baf107ffeddc6d8204debf64c2a15aa97f970a0e4a59b33f71d3e98ad42913ece4ffe576e653a985d9e3391b61419896b SHA512 bdb098101abe7ef32e23b8658f56718cfb00ca3acf273bf590a21edd80e1e54bdeee6169e4a55af4d6e9c94d00233f9e3dbbe970e48bc9d21da5a9479863df73 EBUILD rsync-3.2.4-r3.ebuild 4766 BLAKE2B 2c5a0c4bd2f5f600cec463fe3d5a41cd4f9908ec5ead8e19a52a29108ad25be43cb6da3eb3f04fb0aafb9efb0bcc33e66d6b6f3450ce59a922d21db533d5f87d SHA512 482dee5328c886e9103a4d0a7d05e7bb258f12093f2dd530eef427714dd7f80ffbff821c4104783c066a7178efbe46da7d86101d74fb094c46f32ee411db22d2 -EBUILD rsync-3.2.5.ebuild 4326 BLAKE2B 05e2d480e9cd3282787167369b9ed95ddfbe4895c5364e69573b6a5ef8e5649306baaea820bf72c6a294863e0ba06dded02f5e98ac98d2c90a6645bdff805c3d SHA512 8d4a6bf17790fc85f5385a3e4325d6e149d426a6e99440987bdffb7a72aae0995bbbd25cd90d8417c70402355b4f79f21c68974a9f11a98c414c5eb5bb688ec7 -EBUILD rsync-9999.ebuild 4326 BLAKE2B 05e2d480e9cd3282787167369b9ed95ddfbe4895c5364e69573b6a5ef8e5649306baaea820bf72c6a294863e0ba06dded02f5e98ac98d2c90a6645bdff805c3d SHA512 8d4a6bf17790fc85f5385a3e4325d6e149d426a6e99440987bdffb7a72aae0995bbbd25cd90d8417c70402355b4f79f21c68974a9f11a98c414c5eb5bb688ec7 +EBUILD rsync-3.2.5-r1.ebuild 4324 BLAKE2B cf81a0b890d7927fb3eb68b477f41b3ef3fec0670533784a59bd6d51d6ee66fbf1bad2a289b50ee9f0be2b3ea26636c3136f60263a5b8395c347abcd16f8d37f SHA512 2abbf85f0f3326f88b5bc2e5a6420cd1da50706a3d16397046daae3ef7d487132e0a054aef25edc254fe1b965e6ddf83872046221210b7c5eb0b9a91ca4d37c6 +EBUILD rsync-9999.ebuild 4324 BLAKE2B cf81a0b890d7927fb3eb68b477f41b3ef3fec0670533784a59bd6d51d6ee66fbf1bad2a289b50ee9f0be2b3ea26636c3136f60263a5b8395c347abcd16f8d37f SHA512 2abbf85f0f3326f88b5bc2e5a6420cd1da50706a3d16397046daae3ef7d487132e0a054aef25edc254fe1b965e6ddf83872046221210b7c5eb0b9a91ca4d37c6 MISC metadata.xml 707 BLAKE2B 54c2a5840dd4fabb9055652c6bd39d657fab4846891b5ea3fbc59345d98a494b28033336f52d7dfe69b783f73bc64e40496b5c1d09f735545fa1bd74c04d69a8 SHA512 607337487ce0a6b7a5d52f9cdd0a8c5d40daf67ae9e1a3a2107b366484aca6b1eaed05840b95839a2957971accb28ce228f5a4922c7bbace1cc65fb29151df6d diff --git a/net-misc/rsync/rsync-3.2.5-r1.ebuild b/net-misc/rsync/rsync-3.2.5-r1.ebuild new file mode 100644 index 000000000000..5e5ba3f5fabb --- /dev/null +++ b/net-misc/rsync/rsync-3.2.5-r1.ebuild @@ -0,0 +1,161 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{8..10} ) +inherit prefix python-single-r1 systemd + +DESCRIPTION="File transfer program to keep remote files into sync" +HOMEPAGE="https://rsync.samba.org/" +if [[ ${PV} == *9999 ]] ; then + EGIT_REPO_URI="https://github.com/WayneD/rsync.git" + inherit autotools git-r3 + + REQUIRED_USE="${PYTHON_REQUIRED_USE}" +else + 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 + verify-sig? ( https://rsync.samba.org/ftp/rsync/${SRC_DIR}/${P/_/}.tar.gz.asc )" + S="${WORKDIR}"/${P/_/} +fi + +LICENSE="GPL-3" +SLOT="0" +IUSE="acl examples iconv lz4 ssl stunnel system-zlib xattr xxhash zstd" +REQUIRED_USE+=" examples? ( ${PYTHON_REQUIRED_USE} )" + +RDEPEND=" + >=dev-libs/popt-1.5 + acl? ( virtual/acl ) + examples? ( + ${PYTHON_DEPS} + dev-lang/perl + ) + lz4? ( app-arch/lz4:= ) + ssl? ( dev-libs/openssl:= ) + system-zlib? ( sys-libs/zlib ) + xattr? ( kernel_linux? ( sys-apps/attr ) ) + xxhash? ( >=dev-libs/xxhash-0.8 ) + zstd? ( >=app-arch/zstd-1.4:= ) + iconv? ( virtual/libiconv )" +DEPEND="${RDEPEND}" +BDEPEND="examples? ( ${PYTHON_DEPS} )" + +if [[ ${PV} == *9999 ]] ; then + BDEPEND+=" ${PYTHON_DEPS} + $(python_gen_cond_dep ' + dev-python/commonmark[${PYTHON_USEDEP}] + ')" +else + BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-waynedavison )" +fi + +pkg_setup() { + # - USE=examples needs Python itself at runtime, but nothing else + # - 9999 needs commonmark at build time + if [[ ${PV} == *9999 ]] || use examples ; then + python-single-r1_pkg_setup + fi +} + +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 + --enable-ipv6 + $(use_enable acl acl-support) + $(use_enable iconv) + $(use_enable lz4) + $(use_enable ssl openssl) + $(use_with !system-zlib included-zlib) + $(use_enable xattr xattr-support) + $(use_enable xxhash) + $(use_enable zstd) + ) + + 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 + python_fix_shebang support/ + + 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 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" + 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 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.5.ebuild b/net-misc/rsync/rsync-3.2.5.ebuild deleted file mode 100644 index ab9d689fb713..000000000000 --- a/net-misc/rsync/rsync-3.2.5.ebuild +++ /dev/null @@ -1,160 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{8..10} ) -inherit flag-o-matic prefix python-single-r1 systemd - -DESCRIPTION="File transfer program to keep remote files into sync" -HOMEPAGE="https://rsync.samba.org/" -if [[ ${PV} == *9999 ]] ; then - EGIT_REPO_URI="https://github.com/WayneD/rsync.git" - inherit autotools git-r3 - - REQUIRED_USE="${PYTHON_REQUIRED_USE}" -else - 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 - verify-sig? ( https://rsync.samba.org/ftp/rsync/${SRC_DIR}/${P/_/}.tar.gz.asc )" - S="${WORKDIR}"/${P/_/} -fi - -LICENSE="GPL-3" -SLOT="0" -IUSE="acl examples iconv lz4 ssl stunnel system-zlib xattr xxhash zstd" -REQUIRED_USE+=" examples? ( ${PYTHON_REQUIRED_USE} )" - -RDEPEND="acl? ( virtual/acl ) - examples? ( - ${PYTHON_DEPS} - dev-lang/perl - ) - 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}" -BDEPEND="examples? ( ${PYTHON_DEPS} )" - -if [[ ${PV} == *9999 ]] ; then - BDEPEND+=" ${PYTHON_DEPS} - $(python_gen_cond_dep ' - dev-python/commonmark[${PYTHON_USEDEP}] - ')" -else - BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-waynedavison )" -fi - -pkg_setup() { - # - USE=examples needs Python itself at runtime, but nothing else - # - 9999 needs commonmark at build time - if [[ ${PV} == *9999 ]] || use examples ; then - python-single-r1_pkg_setup - fi -} - -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 - --enable-ipv6 - $(use_enable acl acl-support) - $(use_enable iconv) - $(use_enable lz4) - $(use_enable ssl openssl) - $(use_with !system-zlib included-zlib) - $(use_enable xattr xattr-support) - $(use_enable xxhash) - $(use_enable zstd) - ) - - 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 - python_fix_shebang support/ - - 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 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" - 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 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-9999.ebuild b/net-misc/rsync/rsync-9999.ebuild index ab9d689fb713..5e5ba3f5fabb 100644 --- a/net-misc/rsync/rsync-9999.ebuild +++ b/net-misc/rsync/rsync-9999.ebuild @@ -4,7 +4,7 @@ EAPI=8 PYTHON_COMPAT=( python3_{8..10} ) -inherit flag-o-matic prefix python-single-r1 systemd +inherit prefix python-single-r1 systemd DESCRIPTION="File transfer program to keep remote files into sync" HOMEPAGE="https://rsync.samba.org/" @@ -34,18 +34,19 @@ SLOT="0" IUSE="acl examples iconv lz4 ssl stunnel system-zlib xattr xxhash zstd" REQUIRED_USE+=" examples? ( ${PYTHON_REQUIRED_USE} )" -RDEPEND="acl? ( virtual/acl ) +RDEPEND=" + >=dev-libs/popt-1.5 + acl? ( virtual/acl ) examples? ( ${PYTHON_DEPS} dev-lang/perl ) - lz4? ( app-arch/lz4 ) - ssl? ( dev-libs/openssl:0= ) + lz4? ( app-arch/lz4:= ) + ssl? ( dev-libs/openssl:= ) 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 + xxhash? ( >=dev-libs/xxhash-0.8 ) + zstd? ( >=app-arch/zstd-1.4:= ) iconv? ( virtual/libiconv )" DEPEND="${RDEPEND}" BDEPEND="examples? ( ${PYTHON_DEPS} )" -- cgit v1.2.3