diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2020-09-23 10:22:15 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2020-09-23 10:22:15 +0100 |
commit | 8b4ace9c50842c5b83401ea7b179dcab940387e1 (patch) | |
tree | 230f3135ceaace633cf93e9838b185c4a6664c2e /net-misc/rsync | |
parent | 9ee6d97c2883d42f204a533a8bc1f4562df778fb (diff) |
gentoo resync : 23.09.2020
Diffstat (limited to 'net-misc/rsync')
-rw-r--r-- | net-misc/rsync/Manifest | 8 | ||||
-rw-r--r-- | net-misc/rsync/files/rsync-3.2.2-allow_bwlimit_0.patch | 77 | ||||
-rw-r--r-- | net-misc/rsync/files/rsync-3.2.2-zstd_see_token.patch | 31 | ||||
-rw-r--r-- | net-misc/rsync/rsync-3.2.2-r1.ebuild | 158 | ||||
-rw-r--r-- | net-misc/rsync/rsync-3.2.3.ebuild | 2 | ||||
-rw-r--r-- | net-misc/rsync/rsync-9999.ebuild | 2 |
6 files changed, 4 insertions, 274 deletions
diff --git a/net-misc/rsync/Manifest b/net-misc/rsync/Manifest index 91aed9a4f877..29412b0c9695 100644 --- a/net-misc/rsync/Manifest +++ b/net-misc/rsync/Manifest @@ -1,14 +1,10 @@ -AUX rsync-3.2.2-allow_bwlimit_0.patch 3163 BLAKE2B 69255e7e2926dccdbfa63962db7b11bf8d2ce110251a9edbd437e743f3af9208b2d009b1d7aec6c57b3c241bb01e810b210cd055848532efa724543c440cdc7a SHA512 4c91e63aac56d4e177baa5e0840680515e172cc7a431408bc41ee5f4afa9f1d2f5f4de21999bc77709175cfc042997f4aa455f9ff2ccfa9c6abdf1401f81ac44 -AUX rsync-3.2.2-zstd_see_token.patch 738 BLAKE2B 3bfb8c27e6b6f1893e25d0ff763fb59966d93ac62b0c43245f9544a48d42b65d78161c9add23d26592ac3405636d2387d7d1938b6efc2264c22f25499e17e8af SHA512 03ab78e4f7cffa56727cf528d2d3b09310cb959887f72bcc7bce41b0315c7bcabe72dda9ebacf71a600a7bc9b1c417568adb740ace988beed2e016facf8faf1a 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.service 206 BLAKE2B 3b8bf9165d2410f731c5c2a63fdb5553708aa6aca0fed99acefb38c16b8ae9430a5257440c070b88b71a1295cc6360d89458e1b6696ec9897e722699f162769e SHA512 b848a13856027e4fe1fd206a2aeb32854abd73beb31ebad7ac62c36b433e65507bbb5eef3901a42f46e70a4e887c7f9013617f19712e160ce155f3cb83bfc625 AUX rsyncd.xinetd-3.0.9-r1 194 BLAKE2B 8e3edf4831e020451ba1886e2e8ae86e576016aabcaaf8e84c48adb15ba6a2e8d8c58098af2757011ea4f84fbfd758029d905fb8f5ed21bcc5ac34c3baae2a9c SHA512 fc053fc4748950343e866cc95284d037156a953454e4294d775f01f059e96e805582688bf1de5c965836889192ce4a663ec740e6ec2265406e509c5c6d6c3215 -DIST rsync-3.2.2.tar.gz 1057001 BLAKE2B 177a3145303ab7ed296b9233160ca4907c6b284160f4d0d15aeefd7e28009c1ea29fb3632ab57c008f0aad2f6774185cba86d2d0d68f30737fef217bd9fff402 SHA512 78107cf423e9259a7f7e9bf5527a956b648107aba72ea88b4267ae6334539342501d3c060efbc87235563b0253a12c382c4bb1f73335e68a62ff53aa905f9169 DIST rsync-3.2.3.tar.gz 1069784 BLAKE2B 085adb55d0d7e3d063fa198912fd09df67b63800a65baff5315ccb7dfc0e9d703eef30a7f2e72e3b271162c280abd9809b3f736704752c1663eed65ad8e0ac25 SHA512 48b68491f3ef644dbbbfcaec5ab90a1028593e02d50367ce161fd9d3d0bd0a3628bc57c5e5dec4be3a1d213f784f879b8a8fcdfd789ba0f99837cba16e1ae70e -EBUILD rsync-3.2.2-r1.ebuild 4595 BLAKE2B f98b70a7d8e1c8bc677c7cc0750c21fc8b4f837a25094fc06cbc7af4eeca2e2deed18fd1e01b3ae8eafc450b3fe0e2dc68449d7131abc1cac316322e27572553 SHA512 72752c1941c034cf09fe91b7396024d6d18c4d3837c8edb437753f9f00848fedc8dc3c562186813496538291262389184a3132aceac3a9011939be55598033ba -EBUILD rsync-3.2.3.ebuild 4483 BLAKE2B ed42f69dbfadb523cdccd78199d45a0392fa604b22699c912d7999410a587e4320c5ed821acc9c851daef65e78fa205e206a8fbd8c1309b0d5300541ac1cfe27 SHA512 3662d29d5216c618e73f98ce87249b236f7c2667c82d1c535181d092f346fc181ccd8e3d289b131769ccf18afd6998ce524d8866df7ad04fe2cbc9812cf2fb5d -EBUILD rsync-9999.ebuild 4492 BLAKE2B e8c61555b6fb9ae26b8b6cb1aef37321eef943aac9f942fe968867530a9bba551a09b8aedf5f6a08d17959936e87731c56f12620461e9099567d9c2bafb338be SHA512 1aa7da8316877a9a9e8b6fadc7ce2ef04c5566cab24ccb8ae3504803f077d271eadc3a0df048235ab18f9b6a47d770ed755f6d03da66fe1dccf69fd9bd2cfe2e +EBUILD rsync-3.2.3.ebuild 4489 BLAKE2B 79ad583ddad8ad04d81b6bbc81c2528d5b4d4d22ac496599e34ce3b2debd36d1f8436a25f52a15bf74069e5e63dfea1a8073d2f5586883729cf065dc0d3e9861 SHA512 accd8273fd7877972798f2f57989686ebad200e138bf7aae2cb2e1c11251333491a54da1ec5b365b77e97ae9c5a5b872fa66d643bc010c595efd7e152180c5b3 +EBUILD rsync-9999.ebuild 4498 BLAKE2B 7d88aaf267cb0b8701fcdb13693acdb88f19b7155d3e13f8e3c64ca334ef5fab569543f47973a0f5f0522d2a657267c17e7aa982937b95e998a187d6bb482ddc SHA512 4054e8fd9154880c001e66f059b9e980084e34f9e1c8aacc4fb366668180c2ed0ef011f79ede25d3fc902db170b80327b0df4dbf9ea223d2e098e6f7e7f22166 MISC metadata.xml 654 BLAKE2B 28ea5b4e47a5e420ab64c1b688425995d9ab4e556a27b56b27f512a15ec337aa6a1028449ae0a2f9fa313df2b5b5e98b6cf98a38dac82eb83ca3b4871f3b1514 SHA512 3e23d80d1c4fffdc38287e0f1a09f44040a53eb1b395dd8e9b47aa6d467ed4cf4a0b379ce578f1ecf6438a4f322375b633dc47fd2a50e7badd5f94054bfb558d diff --git a/net-misc/rsync/files/rsync-3.2.2-allow_bwlimit_0.patch b/net-misc/rsync/files/rsync-3.2.2-allow_bwlimit_0.patch deleted file mode 100644 index 4a795bb17b96..000000000000 --- a/net-misc/rsync/files/rsync-3.2.2-allow_bwlimit_0.patch +++ /dev/null @@ -1,77 +0,0 @@ -From 5dcb49c7ddec765d4a24b4f801ffc7212c085db1 Mon Sep 17 00:00:00 2001 -From: Wayne Davison <wayne@opencoder.net> -Date: Tue, 7 Jul 2020 11:40:27 -0700 -Subject: [PATCH] Allow --bwlimit=0 again. - ---- - options.c | 12 ++++++------ - testsuite/hands.test | 2 +- - 2 files changed, 7 insertions(+), 7 deletions(-) - -diff --git a/options.c b/options.c -index 5a372ae7..0b7b9f33 100644 ---- a/options.c -+++ b/options.c -@@ -1253,7 +1253,7 @@ static int count_args(const char **argv) - /* If the size_arg is an invalid string or the value is < min_value, an error - * is put into err_buf & the return is -1. Note that this parser does NOT - * support negative numbers, so a min_value < 0 doesn't make any sense. */ --static ssize_t parse_size_arg(char *size_arg, char def_suf, const char *opt_name, ssize_t min_value) -+static ssize_t parse_size_arg(char *size_arg, char def_suf, const char *opt_name, ssize_t min_value, BOOL allow_0) - { - int reps, mult; - const char *arg, *err = "invalid"; -@@ -1299,7 +1299,7 @@ static ssize_t parse_size_arg(char *size_arg, char def_suf, const char *opt_name - size += atoi(arg), arg += 2; - if (*arg) - goto failure; -- if (size < min_value) { -+ if (size < min_value && (!allow_0 || size != 0)) { - err = size < 0 ? "too big" : "too small"; - goto failure; - } -@@ -1683,19 +1683,19 @@ int parse_arguments(int *argc_p, const char ***argv_p) - break; - - case OPT_MAX_SIZE: -- if ((max_size = parse_size_arg(max_size_arg, 'b', "max-size", 0)) < 0) -+ if ((max_size = parse_size_arg(max_size_arg, 'b', "max-size", 0, True)) < 0) - return 0; - max_size_arg = num_to_byte_string(max_size); - break; - - case OPT_MIN_SIZE: -- if ((min_size = parse_size_arg(min_size_arg, 'b', "min-size", 0)) < 0) -+ if ((min_size = parse_size_arg(min_size_arg, 'b', "min-size", 0, True)) < 0) - return 0; - min_size_arg = num_to_byte_string(min_size); - break; - - case OPT_BWLIMIT: { -- ssize_t size = parse_size_arg(bwlimit_arg, 'K', "bwlimit", 512); -+ ssize_t size = parse_size_arg(bwlimit_arg, 'K', "bwlimit", 512, True); - if (size < 0) - return 0; - bwlimit_arg = num_to_byte_string(size); -@@ -1889,7 +1889,7 @@ int parse_arguments(int *argc_p, const char ***argv_p) - max_alloc_arg = NULL; - } - if (max_alloc_arg) { -- ssize_t size = parse_size_arg(max_alloc_arg, 'B', "max-alloc", 1024*1024); -+ ssize_t size = parse_size_arg(max_alloc_arg, 'B', "max-alloc", 1024*1024, False); - if (size < 0) - return 0; - max_alloc = size; -diff --git a/testsuite/hands.test b/testsuite/hands.test -index 46928d4e..8e265b7c 100644 ---- a/testsuite/hands.test -+++ b/testsuite/hands.test -@@ -16,7 +16,7 @@ DEBUG_OPTS="--debug=all0,deltasum0" - runtest "basic operation" 'checkit "$RSYNC -av \"$fromdir/\" \"$todir\"" "$fromdir/" "$todir"' - - ln "$fromdir/filelist" "$fromdir/dir" --runtest "hard links" 'checkit "$RSYNC -avH $DEBUG_OPTS \"$fromdir/\" \"$todir\"" "$fromdir/" "$todir"' -+runtest "hard links" 'checkit "$RSYNC -avH --bwlimit=0 $DEBUG_OPTS \"$fromdir/\" \"$todir\"" "$fromdir/" "$todir"' - - rm "$todir/text" - runtest "one file" 'checkit "$RSYNC -avH $DEBUG_OPTS \"$fromdir/\" \"$todir\"" "$fromdir/" "$todir"' diff --git a/net-misc/rsync/files/rsync-3.2.2-zstd_see_token.patch b/net-misc/rsync/files/rsync-3.2.2-zstd_see_token.patch deleted file mode 100644 index 02f22409d4c2..000000000000 --- a/net-misc/rsync/files/rsync-3.2.2-zstd_see_token.patch +++ /dev/null @@ -1,31 +0,0 @@ -From bb1365dd7736b264738f50b683a0f81a2ed11aba Mon Sep 17 00:00:00 2001 -From: Wayne Davison <wayne@opencoder.net> -Date: Fri, 10 Jul 2020 09:47:16 -0700 -Subject: [PATCH] Fix see_token zstd case. - ---- - token.c | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/token.c b/token.c -index cad6b641..61be8dd9 100644 ---- a/token.c -+++ b/token.c -@@ -1093,13 +1093,13 @@ void see_token(char *data, int32 toklen) - break; - case CPRES_ZLIBX: - break; --#ifdef SUPPORT_LZ4 -- case CPRES_LZ4: -- /*see_uncompressed_token(data, toklen);*/ -+#ifdef SUPPORT_ZSTD -+ case CPRES_ZSTD: - break; - #endif - #ifdef SUPPORT_LZ4 -- case CPRES_ZSTD: -+ case CPRES_LZ4: -+ /*see_uncompressed_token(data, toklen);*/ - break; - #endif - default: diff --git a/net-misc/rsync/rsync-3.2.2-r1.ebuild b/net-misc/rsync/rsync-3.2.2-r1.ebuild deleted file mode 100644 index a7cd968e74bf..000000000000 --- a/net-misc/rsync/rsync-3.2.2-r1.ebuild +++ /dev/null @@ -1,158 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -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} ) - 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 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~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 libressl lz4 ssl static stunnel system-zlib xattr xxhash zstd" -IUSE+=" ${IUSE_CPU_FLAGS_X86// / cpu_flags_x86_}" - -LIB_DEPEND="acl? ( virtual/acl[static-libs(+)] ) - lz4? ( app-arch/lz4[static-libs(+)] ) - ssl? ( - !libressl? ( dev-libs/openssl:0=[static-libs(+)] ) - libressl? ( dev-libs/libressl:0=[static-libs(+)] ) - ) - system-zlib? ( sys-libs/zlib[static-libs(+)] ) - xattr? ( kernel_linux? ( sys-apps/attr[static-libs(+)] ) ) - xxhash? ( dev-libs/xxhash[static-libs(+)] ) - zstd? ( app-arch/zstd[static-libs(+)] ) - >=dev-libs/popt-1.5[static-libs(+)]" -RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} ) - iconv? ( virtual/libiconv )" -DEPEND="${RDEPEND} - static? ( ${LIB_DEPEND} )" - -if [[ "${PV}" == *9999 ]] ; then - BDEPEND="${PYTHON_DEPS} - $(python_gen_any_dep ' - dev-python/commonmark[${PYTHON_USEDEP}] - ')" -fi - -PATCHES=( - "${FILESDIR}/${P}-allow_bwlimit_0.patch" #731306 - "${FILESDIR}/${P}-zstd_see_token.patch" #733084 -) - -# 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() { - use static && append-ldflags -static - 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[@]}" - [[ "${PV}" == *9999 ]] || touch proto.h-tstamp #421625 -} - -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_dounit "${FILESDIR}/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.ebuild b/net-misc/rsync/rsync-3.2.3.ebuild index fca1f4351e0f..a502102dad2c 100644 --- a/net-misc/rsync/rsync-3.2.3.ebuild +++ b/net-misc/rsync/rsync-3.2.3.ebuild @@ -37,7 +37,7 @@ LIB_DEPEND="acl? ( virtual/acl[static-libs(+)] ) system-zlib? ( sys-libs/zlib[static-libs(+)] ) xattr? ( kernel_linux? ( sys-apps/attr[static-libs(+)] ) ) xxhash? ( dev-libs/xxhash[static-libs(+)] ) - zstd? ( app-arch/zstd[static-libs(+)] ) + zstd? ( >=app-arch/zstd-1.4[static-libs(+)] ) >=dev-libs/popt-1.5[static-libs(+)]" RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} ) iconv? ( virtual/libiconv )" diff --git a/net-misc/rsync/rsync-9999.ebuild b/net-misc/rsync/rsync-9999.ebuild index fb78f513976f..3624db6822a5 100644 --- a/net-misc/rsync/rsync-9999.ebuild +++ b/net-misc/rsync/rsync-9999.ebuild @@ -37,7 +37,7 @@ LIB_DEPEND="acl? ( virtual/acl[static-libs(+)] ) system-zlib? ( sys-libs/zlib[static-libs(+)] ) xattr? ( kernel_linux? ( sys-apps/attr[static-libs(+)] ) ) xxhash? ( dev-libs/xxhash[static-libs(+)] ) - zstd? ( app-arch/zstd[static-libs(+)] ) + zstd? ( >=app-arch/zstd-1.4[static-libs(+)] ) >=dev-libs/popt-1.5[static-libs(+)]" RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} ) iconv? ( virtual/libiconv )" |