[gentoo-commits] repo/gentoo:master commit in: net-misc/rsync/, net-misc/rsync/files/
commit: d83ea18a4efe4f59fd7c399f6545f9996168b892 Author: Rolf Eike Beer sf-mail de> AuthorDate: Sat Jul 6 18:54:55 2024 + Commit: Sam James gentoo org> CommitDate: Mon Jul 8 10:11:42 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d83ea18a net-misc/rsync: do not export lost+found in portage dir Signed-off-by: Rolf Eike Beer sf-mail.de> Signed-off-by: Sam James gentoo.org> net-misc/rsync/files/rsyncd.conf-3.2.7-r5 | 15 +++ net-misc/rsync/rsync-3.2.7-r5.ebuild | 207 ++ net-misc/rsync/rsync-3.3.0-r1.ebuild | 201 + 3 files changed, 423 insertions(+) diff --git a/net-misc/rsync/files/rsyncd.conf-3.2.7-r5 b/net-misc/rsync/files/rsyncd.conf-3.2.7-r5 new file mode 100644 index ..fe9189182f83 --- /dev/null +++ b/net-misc/rsync/files/rsyncd.conf-3.2.7-r5 @@ -0,0 +1,15 @@ +# /etc/rsyncd.conf + +# Minimal configuration file for rsync daemon +# See rsync(1) and rsyncd.conf(5) man pages for help + +# This line is required by the /etc/init.d/rsyncd script +pid file = @GENTOO_PORTAGE_EPREFIX@/run/rsyncd.pid +use chroot = yes +read only = yes + +# Simple example for enabling your own local rsync server +#[gentoo-portage] +# path = @GENTOO_PORTAGE_EPREFIX@/var/db/repos/gentoo +# comment = Gentoo ebuild repository +# exclude = /distfiles /packages /lost+found diff --git a/net-misc/rsync/rsync-3.2.7-r5.ebuild b/net-misc/rsync/rsync-3.2.7-r5.ebuild new file mode 100644 index ..d3fe9c36b093 --- /dev/null +++ b/net-misc/rsync/rsync-3.2.7-r5.ebuild @@ -0,0 +1,207 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# Uncomment when introducing a patch which touches configure +RSYNC_NEEDS_AUTOCONF=1 +PYTHON_COMPAT=( python3_{9..11} ) +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} == * ]] ; 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=/usr/share/openpgp-keys/waynedavison.asc + inherit verify-sig + + if [[ -n ${RSYNC_NEEDS_AUTOCONF} ]] ; then + inherit autotools + fi + + if [[ ${PV} == *_pre* ]] ; then + SRC_DIR="src-previews" + else + SRC_DIR="src" + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-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 rrsync ssl stunnel system-zlib xattr xxhash zstd" +REQUIRED_USE+=" examples? ( ${PYTHON_REQUIRED_USE} )" +REQUIRED_USE+=" rrsync? ( ${PYTHON_REQUIRED_USE} )" + +RDEPEND=" + >=dev-libs/popt-1.5 + acl? ( virtual/acl ) + examples? ( + ${PYTHON_DEPS} + dev-lang/perl + ) + lz4? ( app-arch/lz4:= ) + rrsync? ( + ${PYTHON_DEPS} + $(python_gen_cond_dep ' + dev-python/bracex[${PYTHON_USEDEP}] + ') + ) + 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} ) + rrsync? ( ${PYTHON_DEPS} ) +" + +if [[ ${PV} == * ]] ; then + BDEPEND+=" ${PYTHON_DEPS} + $(python_gen_cond_dep ' + dev-python/commonmark[${PYTHON_USEDEP}] + ')" +else + BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-waynedavison )" +fi + +PATCHES=( + "${FILESDIR}"/${P}-flist-memcmp-ub.patch + "${FILESDIR}"/${P}-fortify-source-3.patch + "${FILESDIR}"/${PN}-3.2.7-ipv6-configure-c99.patch +) + +pkg_setup() { + # - USE=examples needs Python itself at runtime, but nothing else + # - needs commonmark at build time + if [[ ${PV} == * ]] || use examples || use rrsync; then + python-single-r1_pkg_setup + fi +} + +src_prepare() { + default + + sed -i -e 's/AC_HEADER_MAJOR_FIXED/AC_HEADER_MAJOR/' configure.ac + + if [[ ${PV} == * || -n ${RSYNC_NEEDS_AUTOCONF} ]] ; then + eaclocal -I m4 + eautoconf -o configure.sh + eautoheader && touch config.h.in + fi + + if use examples || use rrsync; then + python_fix_shebang
[gentoo-commits] repo/gentoo:master commit in: net-misc/rsync/
commit: 8df481d1cebf997d93b72a09bba95ae6cbd45567 Author: Sam James gentoo org> AuthorDate: Wed May 29 11:48:21 2024 + Commit: Sam James gentoo org> CommitDate: Wed May 29 11:48:21 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8df481d1 net-misc/rsync: Stabilize 3.3.0 arm64, #933027 Signed-off-by: Sam James gentoo.org> net-misc/rsync/rsync-3.3.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net-misc/rsync/rsync-3.3.0.ebuild b/net-misc/rsync/rsync-3.3.0.ebuild index e0f3edee41bb..a881daee68f1 100644 --- a/net-misc/rsync/rsync-3.3.0.ebuild +++ b/net-misc/rsync/rsync-3.3.0.ebuild @@ -27,7 +27,7 @@ else SRC_DIR="src-previews" else SRC_DIR="src" - KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" + KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" fi SRC_URI="https://rsync.samba.org/ftp/rsync/${SRC_DIR}/${P/_/}.tar.gz
[gentoo-commits] repo/gentoo:master commit in: net-misc/rsync/
commit: 689b2eadddf9626fb9fbe265b761c6cb8c0dd74e Author: Jakov Smolić gentoo org> AuthorDate: Wed May 29 06:26:02 2024 + Commit: Jakov Smolić gentoo org> CommitDate: Wed May 29 06:26:02 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=689b2ead net-misc/rsync: Stabilize 3.3.0 x86, #933027 Signed-off-by: Jakov Smolić gentoo.org> net-misc/rsync/rsync-3.3.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net-misc/rsync/rsync-3.3.0.ebuild b/net-misc/rsync/rsync-3.3.0.ebuild index 896ed181e0f3..967aa605b3e1 100644 --- a/net-misc/rsync/rsync-3.3.0.ebuild +++ b/net-misc/rsync/rsync-3.3.0.ebuild @@ -27,7 +27,7 @@ else SRC_DIR="src-previews" else SRC_DIR="src" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" fi SRC_URI="https://rsync.samba.org/ftp/rsync/${SRC_DIR}/${P/_/}.tar.gz
[gentoo-commits] repo/gentoo:master commit in: net-misc/rsync/
commit: 0681ed190109e02bb4748a765682e1fc68d1 Author: Eli Schwartz gmail com> AuthorDate: Thu May 23 01:43:14 2024 + Commit: Sam James gentoo org> CommitDate: Thu May 23 21:52:04 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0681ed19 net-misc/rsync: remove broken macro and regenerate configure rsync has a fork of the pre-2016 AC_HEADER_MAJOR with a different fix from the one autoconf itself implemented. It raises a FP for: * QA Notice: Found the following implicit function declarations in configure logs: * /var/tmp/portage/net-misc/rsync-3.3.0/work/rsync-3.3.0/config.log:1159 - makedev which is anyways not supposed to be found. We could ignore it, but better to get rid of the macro itself, considering we anyways often regenerate autoreconf. Resulting configure run has no actual differences, just the FP or lack of FP (and running one fewer compiler probe in src_configure). No revbump. Bug: https://github.com/RsyncProject/rsync/issues/616 Closes: https://bugs.gentoo.org/916481 Signed-off-by: Eli Schwartz gmail.com> Signed-off-by: Sam James gentoo.org> net-misc/rsync/rsync-3.2.7-r4.ebuild | 2 ++ net-misc/rsync/rsync-3.3.0.ebuild| 4 +++- net-misc/rsync/rsync-.ebuild | 4 +++- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/net-misc/rsync/rsync-3.2.7-r4.ebuild b/net-misc/rsync/rsync-3.2.7-r4.ebuild index 9d19a857389f..831a218e466c 100644 --- a/net-misc/rsync/rsync-3.2.7-r4.ebuild +++ b/net-misc/rsync/rsync-3.2.7-r4.ebuild @@ -93,6 +93,8 @@ pkg_setup() { src_prepare() { default + sed -i -e 's/AC_HEADER_MAJOR_FIXED/AC_HEADER_MAJOR/' configure.ac + if [[ ${PV} == * || -n ${RSYNC_NEEDS_AUTOCONF} ]] ; then eaclocal -I m4 eautoconf -o configure.sh diff --git a/net-misc/rsync/rsync-3.3.0.ebuild b/net-misc/rsync/rsync-3.3.0.ebuild index c6b7365a04b0..6ea497c2e733 100644 --- a/net-misc/rsync/rsync-3.3.0.ebuild +++ b/net-misc/rsync/rsync-3.3.0.ebuild @@ -4,7 +4,7 @@ EAPI=8 # Uncomment when introducing a patch which touches configure -#RSYNC_NEEDS_AUTOCONF=1 +RSYNC_NEEDS_AUTOCONF=1 PYTHON_COMPAT=( python3_{10..12} ) inherit flag-o-matic prefix python-single-r1 systemd @@ -87,6 +87,8 @@ pkg_setup() { src_prepare() { default + sed -i -e 's/AC_HEADER_MAJOR_FIXED/AC_HEADER_MAJOR/' configure.ac + if [[ ${PV} == * || -n ${RSYNC_NEEDS_AUTOCONF} ]] ; then eaclocal -I m4 eautoconf -o configure.sh diff --git a/net-misc/rsync/rsync-.ebuild b/net-misc/rsync/rsync-.ebuild index c6b7365a04b0..6ea497c2e733 100644 --- a/net-misc/rsync/rsync-.ebuild +++ b/net-misc/rsync/rsync-.ebuild @@ -4,7 +4,7 @@ EAPI=8 # Uncomment when introducing a patch which touches configure -#RSYNC_NEEDS_AUTOCONF=1 +RSYNC_NEEDS_AUTOCONF=1 PYTHON_COMPAT=( python3_{10..12} ) inherit flag-o-matic prefix python-single-r1 systemd @@ -87,6 +87,8 @@ pkg_setup() { src_prepare() { default + sed -i -e 's/AC_HEADER_MAJOR_FIXED/AC_HEADER_MAJOR/' configure.ac + if [[ ${PV} == * || -n ${RSYNC_NEEDS_AUTOCONF} ]] ; then eaclocal -I m4 eautoconf -o configure.sh
[gentoo-commits] repo/gentoo:master commit in: net-misc/rsync/
commit: 4c2f375f6ca0906e8958d251cb7cda68b684f87e Author: Sam James gentoo org> AuthorDate: Mon Apr 29 21:45:44 2024 + Commit: Sam James gentoo org> CommitDate: Mon Apr 29 21:45:44 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4c2f375f net-misc/rsync: enable py3.12 Closes: https://bugs.gentoo.org/929729 Signed-off-by: Sam James gentoo.org> net-misc/rsync/rsync-3.3.0.ebuild | 2 +- net-misc/rsync/rsync-.ebuild | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/net-misc/rsync/rsync-3.3.0.ebuild b/net-misc/rsync/rsync-3.3.0.ebuild index fc6198dfa4d7..c6b7365a04b0 100644 --- a/net-misc/rsync/rsync-3.3.0.ebuild +++ b/net-misc/rsync/rsync-3.3.0.ebuild @@ -5,7 +5,7 @@ EAPI=8 # Uncomment when introducing a patch which touches configure #RSYNC_NEEDS_AUTOCONF=1 -PYTHON_COMPAT=( python3_{10..11} ) +PYTHON_COMPAT=( python3_{10..12} ) inherit flag-o-matic prefix python-single-r1 systemd DESCRIPTION="File transfer program to keep remote files into sync" diff --git a/net-misc/rsync/rsync-.ebuild b/net-misc/rsync/rsync-.ebuild index fc6198dfa4d7..c6b7365a04b0 100644 --- a/net-misc/rsync/rsync-.ebuild +++ b/net-misc/rsync/rsync-.ebuild @@ -5,7 +5,7 @@ EAPI=8 # Uncomment when introducing a patch which touches configure #RSYNC_NEEDS_AUTOCONF=1 -PYTHON_COMPAT=( python3_{10..11} ) +PYTHON_COMPAT=( python3_{10..12} ) inherit flag-o-matic prefix python-single-r1 systemd DESCRIPTION="File transfer program to keep remote files into sync"
[gentoo-commits] repo/gentoo:master commit in: net-misc/rsync/
commit: 66f40db08babd1a366996ec90f58c59949b92ee5 Author: Sam James gentoo org> AuthorDate: Sun Apr 7 23:26:48 2024 + Commit: Sam James gentoo org> CommitDate: Sun Apr 7 23:26:48 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=66f40db0 net-misc/rsync: update upstream metadata See https://www.mail-archive.com/rsync-announce lists.samba.org/msg00113.html. """ The github repos have moved to a new RsyncProject organization. Because various life events have been monopolizing my time, I reached out to Tridge (the original author) and he has graciously agreed to get back into rsync work, along with Paul Mackerras, who was also an early contributor to rsync. This new team will be working mainly on maintenance tasks, and not so much on new features. If you want to get involved, feel free to reach out on the new discord RsyncProject channels. """ Signed-off-by: Sam James gentoo.org> net-misc/rsync/metadata.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net-misc/rsync/metadata.xml b/net-misc/rsync/metadata.xml index 4dd797f7c406..cceaeff88940 100644 --- a/net-misc/rsync/metadata.xml +++ b/net-misc/rsync/metadata.xml @@ -8,7 +8,7 @@ https://rsync.samba.org/ftp/rsync/NEWS cpe:/a:samba:rsync - WayneD/rsync + RsyncProject/rsync Install rrsync script to setup restricted rsync users via ssh logins
[gentoo-commits] repo/gentoo:master commit in: net-misc/rsync/
commit: 5aa9c9fc176a898f9b64e403b6a313478d23c6bf Author: Matoro Mahri matoro tk> AuthorDate: Mon Mar 18 15:19:59 2024 + Commit: Ionen Wolkens gentoo org> CommitDate: Tue Mar 19 03:42:44 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5aa9c9fc net-misc/rsync: Stabilize 3.2.7-r4 hppa, #924909 Signed-off-by: Matoro Mahri matoro.tk> Signed-off-by: Ionen Wolkens gentoo.org> net-misc/rsync/rsync-3.2.7-r4.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net-misc/rsync/rsync-3.2.7-r4.ebuild b/net-misc/rsync/rsync-3.2.7-r4.ebuild index 2d7cc85f312e..9d19a857389f 100644 --- a/net-misc/rsync/rsync-3.2.7-r4.ebuild +++ b/net-misc/rsync/rsync-3.2.7-r4.ebuild @@ -27,7 +27,7 @@ else SRC_DIR="src-previews" else SRC_DIR="src" - KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" fi SRC_URI="https://rsync.samba.org/ftp/rsync/${SRC_DIR}/${P/_/}.tar.gz
[gentoo-commits] repo/gentoo:master commit in: net-misc/rsync/files/
commit: 662cead49f4f2a551879b69ef9d967d54660d232 Author: Michael Mair-Keimberger levelnine at> AuthorDate: Sun Mar 17 12:26:54 2024 + Commit: Conrad Kostecki gentoo org> CommitDate: Mon Mar 18 20:00:23 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=662cead4 net-misc/rsync: remove unused patches Signed-off-by: Michael Mair-Keimberger levelnine.at> Closes: https://github.com/gentoo/gentoo/pull/35799 Signed-off-by: Conrad Kostecki gentoo.org> net-misc/rsync/files/rsync-3.2.4-notpedantic.patch | 25 net-misc/rsync/files/rsync-3.2.4-strlcpy.patch | 46 -- .../files/rsync-3.2.4-unsigned-char-checksum.patch | 12 -- 3 files changed, 83 deletions(-) diff --git a/net-misc/rsync/files/rsync-3.2.4-notpedantic.patch b/net-misc/rsync/files/rsync-3.2.4-notpedantic.patch deleted file mode 100644 index 9d081ab52c5b.. --- a/net-misc/rsync/files/rsync-3.2.4-notpedantic.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff -ruN rsync-3.2.4.orig/configure.ac rsync-3.2.4/configure.ac rsync-3.2.4.orig/configure.ac 2022-12-01 22:26:34.856659562 +0100 -+++ rsync-3.2.4/configure.ac 2022-12-01 22:31:43.849290989 +0100 -@@ -1067,21 +1067,6 @@ - with_included_popt=yes - fi - --if test x"$GCC" = x"yes"; then --if test x"$with_included_popt" != x"yes"; then -- # Turn pedantic warnings into errors to ensure an array-init overflow is an error. -- CFLAGS="$CFLAGS -pedantic-errors" --else -- # Our internal popt code cannot be compiled with pedantic warnings as errors, so try to -- # turn off pedantic warnings (which will not lose the error for array-init overflow). -- # Older gcc versions don't understand -Wno-pedantic, so check if --help=warnings lists -- # -Wpedantic and use that as a flag. -- case `$CC --help=warnings 2>/dev/null | grep Wpedantic` in -- *-Wpedantic*) CFLAGS="$CFLAGS -pedantic-errors -Wno-pedantic" ;; -- esac --fi --fi -- - AC_MSG_CHECKING([whether to use included libpopt]) - if test x"$with_included_popt" = x"yes"; then - AC_MSG_RESULT($srcdir/popt) diff --git a/net-misc/rsync/files/rsync-3.2.4-strlcpy.patch b/net-misc/rsync/files/rsync-3.2.4-strlcpy.patch deleted file mode 100644 index d5a02f0e3159.. --- a/net-misc/rsync/files/rsync-3.2.4-strlcpy.patch +++ /dev/null @@ -1,46 +0,0 @@ -https://github.com/WayneD/rsync/issues/324 -https://github.com/WayneD/rsync/commit/3592ac3c025da23b2dd291561ec6113940b9c11b - -From 3592ac3c025da23b2dd291561ec6113940b9c11b Mon Sep 17 00:00:00 2001 -From: Wayne Davison -Date: Sun, 19 Jun 2022 10:02:51 -0700 -Subject: [PATCH] Include bsd/strings.h if it exists - -Some systems apparently put strlcpy() into a separate bsd/strings.h file -without putting the function into a separate library. Thus, configure -finds that the function exists for linking but the build does not have -the declaration (which rsync only supplies if it is also supplying its -own version of the function). - configure.ac | 3 ++- - rsync.h | 3 +++ - 2 files changed, 5 insertions(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 37dbb18a..37241637 100644 a/configure.ac -+++ b/configure.ac -@@ -13,7 +13,8 @@ AC_CHECK_HEADERS(sys/fcntl.h sys/select.h fcntl.h sys/time.h sys/unistd.h \ - netdb.h malloc.h float.h limits.h iconv.h libcharset.h langinfo.h mcheck.h \ - sys/acl.h acl/libacl.h attr/xattr.h sys/xattr.h sys/extattr.h dl.h \ - popt.h popt/popt.h linux/falloc.h netinet/in_systm.h netgroup.h \ --zlib.h xxhash.h openssl/md4.h openssl/md5.h zstd.h lz4.h sys/file.h) -+zlib.h xxhash.h openssl/md4.h openssl/md5.h zstd.h lz4.h sys/file.h \ -+bsd/string.h) - AC_CHECK_HEADERS([netinet/ip.h], [], [], [[#include ]]) - AC_HEADER_MAJOR_FIXED - -diff --git a/rsync.h b/rsync.h -index e5aacd25..1cc037c5 100644 a/rsync.h -+++ b/rsync.h -@@ -338,6 +338,9 @@ enum delret { - # endif - # include - #endif -+#ifdef HAVE_BSD_STRING_H -+# include -+#endif - #ifdef HAVE_STRINGS_H - # include - #endif diff --git a/net-misc/rsync/files/rsync-3.2.4-unsigned-char-checksum.patch b/net-misc/rsync/files/rsync-3.2.4-unsigned-char-checksum.patch deleted file mode 100644 index 18e56c31ce2a.. --- a/net-misc/rsync/files/rsync-3.2.4-unsigned-char-checksum.patch +++ /dev/null @@ -1,12 +0,0 @@ -https://lists.samba.org/archive/rsync-announce/2022/000111.html a/configure.ac -+++ b/configure.ac -@@ -1117,7 +1117,7 @@ else - fi - - AC_CACHE_CHECK([for unsigned char],rsync_cv_SIGNED_CHAR_OK,[ --AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[signed char *s = ""]])],[rsync_cv_SIGNED_CHAR_OK=yes],[rsync_cv_SIGNED_CHAR_OK=no])]) -+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[signed char *s = (signed char *)""]])],[rsync_cv_SIGNED_CHAR_OK=yes],[rsync_cv_SIGNED_CHAR_OK=no])]) - if test x"$rsync_cv_SIGNED_CHAR_OK" = x"yes"; then - AC_DEFINE(SIGNED_CHAR_OK, 1, [Define to 1 if "signed char"
[gentoo-commits] repo/gentoo:master commit in: net-misc/rsync/
commit: 1de13af07c5a700308d1866b915594d46307267b Author: Sam James gentoo org> AuthorDate: Sat Mar 9 00:20:05 2024 + Commit: Sam James gentoo org> CommitDate: Sat Mar 9 00:20:05 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1de13af0 net-misc/rsync: drop 3.2.4-r3, 3.2.7-r2 Signed-off-by: Sam James gentoo.org> net-misc/rsync/Manifest | 2 - net-misc/rsync/rsync-3.2.4-r3.ebuild | 175 -- net-misc/rsync/rsync-3.2.7-r2.ebuild | 203 --- 3 files changed, 380 deletions(-) diff --git a/net-misc/rsync/Manifest b/net-misc/rsync/Manifest index 6b0d954a83e2..c5557d0f3417 100644 --- a/net-misc/rsync/Manifest +++ b/net-misc/rsync/Manifest @@ -1,4 +1,2 @@ -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.7.tar.gz 1149787 BLAKE2B 1b910b321e8d6b49af9f26bef813509f0da12dedd6857897de136d3617c68d38368ce05de13b9b0ef35a5452dca141ebdcdfb6af8456151d0ca0ad546452b504 SHA512 c2afba11a352fd88133f9e96e19d6df80eb864450c83eced13a7faa23df947bccf2ef093f2101df6ee30abff4cbbd39ac802e9aa5f726e42c9caff274fad8377 DIST rsync-3.2.7.tar.gz.asc 195 BLAKE2B d2bca9276d9a0c96a9156a8da60e391f58eceb2e1ffaa51b7e7ffd592feaba3ce54772bd563a251e3b30efb0ad07fc96da01158a77dd77c6534eac5d80b46e53 SHA512 bad9f48e033966566c6abf8cd485d35c0d9cf130eafb0c5fff9bcb928882283bbcdd2375e7c2880cf71cf81496ba6b743b61adca3d4678421c32915a2464acc3 diff --git a/net-misc/rsync/rsync-3.2.4-r3.ebuild b/net-misc/rsync/rsync-3.2.4-r3.ebuild deleted file mode 100644 index 485e9b7c45e5.. --- a/net-misc/rsync/rsync-3.2.4-r3.ebuild +++ /dev/null @@ -1,175 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -if [[ ${PV} != 3.2.4 ]]; then - # Make sure we revert the autotools hackery applied in 3.2.4. - die "Please use rsync-.ebuild as a basis for version bumps" -fi - -WANT_LIBTOOL=none - -PYTHON_COMPAT=( python3_{9..10} ) -inherit autotools 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} == * ]] ; 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=/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 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-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 ipv6 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} == * ]] ; then - BDEPEND+=" ${PYTHON_DEPS} - $(python_gen_cond_dep ' - dev-python/commonmark[${PYTHON_USEDEP}] - ')" -else - BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-waynedavison )" -fi - -PATCHES=( - "${FILESDIR}"/${P}-unsigned-char-checksum.patch - # https://github.com/WayneD/rsync/issues/324 - "${FILESDIR}"/${P}-strlcpy.patch - "${FILESDIR}"/${P}-notpedantic.patch -) - -pkg_setup() { - # - USE=examples needs Python itself at runtime, but nothing else - # - needs commonmark at build time - if [[ ${PV} == * ]] || use examples ; then - python-single-r1_pkg_setup - fi -} - -src_prepare() { - default -
[gentoo-commits] repo/gentoo:master commit in: net-misc/rsync/
commit: 473a09ec3591e25ad87e1d3b986459e5e7fc90f5 Author: Arthur Zamarin gentoo org> AuthorDate: Sat Mar 2 17:21:55 2024 + Commit: Arthur Zamarin gentoo org> CommitDate: Sat Mar 2 17:21:55 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=473a09ec net-misc/rsync: Stabilize 3.2.7-r4 ppc, #924909 Signed-off-by: Arthur Zamarin gentoo.org> net-misc/rsync/rsync-3.2.7-r4.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net-misc/rsync/rsync-3.2.7-r4.ebuild b/net-misc/rsync/rsync-3.2.7-r4.ebuild index 07a19b413f0b..2d7cc85f312e 100644 --- a/net-misc/rsync/rsync-3.2.7-r4.ebuild +++ b/net-misc/rsync/rsync-3.2.7-r4.ebuild @@ -27,7 +27,7 @@ else SRC_DIR="src-previews" else SRC_DIR="src" - KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" fi SRC_URI="https://rsync.samba.org/ftp/rsync/${SRC_DIR}/${P/_/}.tar.gz
[gentoo-commits] repo/gentoo:master commit in: net-misc/rsync/
commit: 6aa929be962c3ea4c358c89489e84e6b09a0cd6b Author: Sam James gentoo org> AuthorDate: Sun Feb 18 13:20:08 2024 + Commit: Sam James gentoo org> CommitDate: Sun Feb 18 13:20:08 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6aa929be net-misc/rsync: Stabilize 3.2.7-r4 arm, #924909 Signed-off-by: Sam James gentoo.org> net-misc/rsync/rsync-3.2.7-r4.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net-misc/rsync/rsync-3.2.7-r4.ebuild b/net-misc/rsync/rsync-3.2.7-r4.ebuild index b3788a1dce17..b18882ead102 100644 --- a/net-misc/rsync/rsync-3.2.7-r4.ebuild +++ b/net-misc/rsync/rsync-3.2.7-r4.ebuild @@ -27,7 +27,7 @@ else SRC_DIR="src-previews" else SRC_DIR="src" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" + KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" fi SRC_URI="https://rsync.samba.org/ftp/rsync/${SRC_DIR}/${P/_/}.tar.gz
[gentoo-commits] repo/gentoo:master commit in: net-misc/rsync/
commit: a35a21d1dbd98a9856ddd6ada99985d021d1c574 Author: Sam James gentoo org> AuthorDate: Thu Feb 8 01:17:53 2024 + Commit: Sam James gentoo org> CommitDate: Thu Feb 8 01:17:53 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a35a21d1 net-misc/rsync: Stabilize 3.2.7-r3 hppa, #923516 Signed-off-by: Sam James gentoo.org> net-misc/rsync/rsync-3.2.7-r3.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net-misc/rsync/rsync-3.2.7-r3.ebuild b/net-misc/rsync/rsync-3.2.7-r3.ebuild index 3e5be43d5db5..ef0a743c83ee 100644 --- a/net-misc/rsync/rsync-3.2.7-r3.ebuild +++ b/net-misc/rsync/rsync-3.2.7-r3.ebuild @@ -27,7 +27,7 @@ else SRC_DIR="src-previews" else SRC_DIR="src" - KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" fi SRC_URI="https://rsync.samba.org/ftp/rsync/${SRC_DIR}/${P/_/}.tar.gz
[gentoo-commits] repo/gentoo:master commit in: net-misc/rsync/
commit: 29e34fc0ae900dff63b76e52cac70f3f0a9062a0 Author: Sam James gentoo org> AuthorDate: Sat Feb 3 06:54:48 2024 + Commit: Sam James gentoo org> CommitDate: Sat Feb 3 06:54:48 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=29e34fc0 net-misc/rsync: Stabilize 3.2.7-r3 arm64, #923516 Signed-off-by: Sam James gentoo.org> net-misc/rsync/rsync-3.2.7-r3.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net-misc/rsync/rsync-3.2.7-r3.ebuild b/net-misc/rsync/rsync-3.2.7-r3.ebuild index c9c35fd7fd9a..3e5be43d5db5 100644 --- a/net-misc/rsync/rsync-3.2.7-r3.ebuild +++ b/net-misc/rsync/rsync-3.2.7-r3.ebuild @@ -27,7 +27,7 @@ else SRC_DIR="src-previews" else SRC_DIR="src" - KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" fi SRC_URI="https://rsync.samba.org/ftp/rsync/${SRC_DIR}/${P/_/}.tar.gz
[gentoo-commits] repo/gentoo:master commit in: net-misc/rsync/
commit: 89b6d6e385a2405d2c664b10ebdcd127c4b1789d Author: Arthur Zamarin gentoo org> AuthorDate: Fri Feb 2 17:51:24 2024 + Commit: Arthur Zamarin gentoo org> CommitDate: Fri Feb 2 17:51:24 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=89b6d6e3 net-misc/rsync: Stabilize 3.2.7-r3 amd64, #923516 Signed-off-by: Arthur Zamarin gentoo.org> net-misc/rsync/rsync-3.2.7-r3.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net-misc/rsync/rsync-3.2.7-r3.ebuild b/net-misc/rsync/rsync-3.2.7-r3.ebuild index 580f8516717f..c9c35fd7fd9a 100644 --- a/net-misc/rsync/rsync-3.2.7-r3.ebuild +++ b/net-misc/rsync/rsync-3.2.7-r3.ebuild @@ -27,7 +27,7 @@ else SRC_DIR="src-previews" else SRC_DIR="src" - KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" + KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" fi SRC_URI="https://rsync.samba.org/ftp/rsync/${SRC_DIR}/${P/_/}.tar.gz
[gentoo-commits] repo/gentoo:master commit in: net-misc/rsync/
commit: 71e23a960e02069a4930af9804a41b84ab66013d Author: Arthur Zamarin gentoo org> AuthorDate: Fri Feb 2 15:39:07 2024 + Commit: Arthur Zamarin gentoo org> CommitDate: Fri Feb 2 15:39:07 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=71e23a96 net-misc/rsync: Stabilize 3.2.7-r3 x86, #923516 Signed-off-by: Arthur Zamarin gentoo.org> net-misc/rsync/rsync-3.2.7-r3.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net-misc/rsync/rsync-3.2.7-r3.ebuild b/net-misc/rsync/rsync-3.2.7-r3.ebuild index 4c4e6b24dd66..580f8516717f 100644 --- a/net-misc/rsync/rsync-3.2.7-r3.ebuild +++ b/net-misc/rsync/rsync-3.2.7-r3.ebuild @@ -27,7 +27,7 @@ else SRC_DIR="src-previews" else SRC_DIR="src" - KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" + KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" fi SRC_URI="https://rsync.samba.org/ftp/rsync/${SRC_DIR}/${P/_/}.tar.gz
[gentoo-commits] repo/gentoo:master commit in: net-misc/rsync/
commit: 86e2b0f764691baeecbc3dd91d7428e25f605136 Author: Sam James gentoo org> AuthorDate: Fri Feb 2 05:12:51 2024 + Commit: Sam James gentoo org> CommitDate: Fri Feb 2 05:12:51 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=86e2b0f7 net-misc/rsync: Stabilize 3.2.7-r3 ppc, #923516 Signed-off-by: Sam James gentoo.org> net-misc/rsync/rsync-3.2.7-r3.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net-misc/rsync/rsync-3.2.7-r3.ebuild b/net-misc/rsync/rsync-3.2.7-r3.ebuild index c6f2238845b0..4c4e6b24dd66 100644 --- a/net-misc/rsync/rsync-3.2.7-r3.ebuild +++ b/net-misc/rsync/rsync-3.2.7-r3.ebuild @@ -27,7 +27,7 @@ else SRC_DIR="src-previews" else SRC_DIR="src" - KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" + KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" fi SRC_URI="https://rsync.samba.org/ftp/rsync/${SRC_DIR}/${P/_/}.tar.gz
[gentoo-commits] repo/gentoo:master commit in: net-misc/rsync/
commit: fefef02becc655f948f9424a04c2a5a678bb06aa Author: Sam James gentoo org> AuthorDate: Fri Feb 2 03:56:14 2024 + Commit: Sam James gentoo org> CommitDate: Fri Feb 2 03:56:14 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fefef02b net-misc/rsync: Stabilize 3.2.7-r3 ppc64, #923516 Signed-off-by: Sam James gentoo.org> net-misc/rsync/rsync-3.2.7-r3.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net-misc/rsync/rsync-3.2.7-r3.ebuild b/net-misc/rsync/rsync-3.2.7-r3.ebuild index 01c09f3cd5ca..9e8d927ed15c 100644 --- a/net-misc/rsync/rsync-3.2.7-r3.ebuild +++ b/net-misc/rsync/rsync-3.2.7-r3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -27,7 +27,7 @@ else SRC_DIR="src-previews" else SRC_DIR="src" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" fi SRC_URI="https://rsync.samba.org/ftp/rsync/${SRC_DIR}/${P/_/}.tar.gz
[gentoo-commits] repo/gentoo:master commit in: net-misc/rsync/files/, net-misc/rsync/
commit: 89b65644ee5c1a71065c72c0d63efbdf97a90b9c Author: Sam James gentoo org> AuthorDate: Fri Jan 5 05:36:28 2024 + Commit: Sam James gentoo org> CommitDate: Fri Jan 5 05:51:29 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=89b65644 net-misc/rsync: fix modern C issue in configure ipv6 check Signed-off-by: Sam James gentoo.org> .../files/rsync-3.2.7-ipv6-configure-c99.patch | 32 net-misc/rsync/rsync-3.2.7-r4.ebuild | 205 + 2 files changed, 237 insertions(+) diff --git a/net-misc/rsync/files/rsync-3.2.7-ipv6-configure-c99.patch b/net-misc/rsync/files/rsync-3.2.7-ipv6-configure-c99.patch new file mode 100644 index ..1b99dc61088b --- /dev/null +++ b/net-misc/rsync/files/rsync-3.2.7-ipv6-configure-c99.patch @@ -0,0 +1,32 @@ +https://github.com/WayneD/rsync/pull/558 + +From d869bcd3850b9a80f27f5aee4d41725f39d84ea7 Mon Sep 17 00:00:00 2001 +From: Ivan Babrou +Date: Mon, 1 Jan 2024 19:31:01 -0800 +Subject: [PATCH] configure.ac: fix failing IPv6 check due to missing return + type + +Fixing this warning escalated to an error, resuting in no IPv6 support: + +``` +configure.sh:7679: checking whether to enable ipv6 +configure.sh:7718: clang -o conftest -g -O2 -DHAVE_CONFIG_H -Wall -W conftest.c >&5 +conftest.c:73:1: error: type specifier missing, defaults to 'int'; ISO C99 and later do not support implicit int [-Wimplicit-int] +main() +^ +int +1 error generated. +configure.sh:7718: $? = 1 +configure.sh: program exited with status 1 +``` +--- a/configure.ac b/configure.ac +@@ -392,7 +392,7 @@ AS_HELP_STRING([--disable-ipv6],[disable to omit ipv6 support]), + #include + #include + #include +-main() ++int main() + { +if (socket(AF_INET6, SOCK_STREAM, 0) < 0) + exit(1); diff --git a/net-misc/rsync/rsync-3.2.7-r4.ebuild b/net-misc/rsync/rsync-3.2.7-r4.ebuild new file mode 100644 index ..b3788a1dce17 --- /dev/null +++ b/net-misc/rsync/rsync-3.2.7-r4.ebuild @@ -0,0 +1,205 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# Uncomment when introducing a patch which touches configure +RSYNC_NEEDS_AUTOCONF=1 +PYTHON_COMPAT=( python3_{9..11} ) +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} == * ]] ; 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=/usr/share/openpgp-keys/waynedavison.asc + inherit verify-sig + + if [[ -n ${RSYNC_NEEDS_AUTOCONF} ]] ; then + inherit autotools + fi + + if [[ ${PV} == *_pre* ]] ; then + SRC_DIR="src-previews" + else + SRC_DIR="src" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-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 rrsync ssl stunnel system-zlib xattr xxhash zstd" +REQUIRED_USE+=" examples? ( ${PYTHON_REQUIRED_USE} )" +REQUIRED_USE+=" rrsync? ( ${PYTHON_REQUIRED_USE} )" + +RDEPEND=" + >=dev-libs/popt-1.5 + acl? ( virtual/acl ) + examples? ( + ${PYTHON_DEPS} + dev-lang/perl + ) + lz4? ( app-arch/lz4:= ) + rrsync? ( + ${PYTHON_DEPS} + $(python_gen_cond_dep ' + dev-python/bracex[${PYTHON_USEDEP}] + ') + ) + 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} ) + rrsync? ( ${PYTHON_DEPS} ) +" + +if [[ ${PV} == * ]] ; then + BDEPEND+=" ${PYTHON_DEPS} + $(python_gen_cond_dep ' + dev-python/commonmark[${PYTHON_USEDEP}] + ')" +else + BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-waynedavison )" +fi + +PATCHES=( + "${FILESDIR}"/${P}-flist-memcmp-ub.patch + "${FILESDIR}"/${P}-fortify-source-3.patch + "${FILESDIR}"/${PN}-3.2.7-ipv6-configure-c99.patch +) + +pkg_setup() { + # - USE=examples needs Python itself at runtime, but nothing else + # - needs commonmark at build time + if [[ ${PV} == * ]] || use examples || use rrsync; then + python-single-r1_pkg_
[gentoo-commits] repo/gentoo:master commit in: net-misc/rsync/, net-misc/rsync/files/
commit: 49fc4a8567531cb5d8f889832663c784d6a36ddf Author: Sam James gentoo org> AuthorDate: Thu Dec 28 04:11:47 2023 + Commit: Sam James gentoo org> CommitDate: Thu Dec 28 04:11:47 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=49fc4a85 net-misc/rsync: fix crash w/ FORTIFY_SOURCE=3 Closes: https://bugs.gentoo.org/917517 Signed-off-by: Sam James gentoo.org> .../rsync/files/rsync-3.2.7-fortify-source-3.patch | 54 ++ net-misc/rsync/rsync-3.2.7-r3.ebuild | 204 + 2 files changed, 258 insertions(+) diff --git a/net-misc/rsync/files/rsync-3.2.7-fortify-source-3.patch b/net-misc/rsync/files/rsync-3.2.7-fortify-source-3.patch new file mode 100644 index ..952af573dfc7 --- /dev/null +++ b/net-misc/rsync/files/rsync-3.2.7-fortify-source-3.patch @@ -0,0 +1,54 @@ +https://bugs.gentoo.org/917517 +https://github.com/WayneD/rsync/issues/511 +https://bugzilla.suse.com/show_bug.cgi?id=1214249 +https://bugzilla.redhat.com/show_bug.cgi?id=2229654 +https://src.fedoraproject.org/rpms/rsync/raw/06d55616ec86c3a68a8af917783788b928fefcc4/f/rsync-3.2.7-buffer-overflow.patch + +From 1f83963f59960150e8c46112daa8411324c1f209 Mon Sep 17 00:00:00 2001 +From: Jiri Slaby +Date: Fri, 18 Aug 2023 08:26:20 +0200 +Subject: [PATCH] exclude: fix crashes with fortified strlcpy() + +Fortified (-D_FORTIFY_SOURCE=2 for gcc) builds make strlcpy() crash when +its third parameter (size) is larger than the buffer: + $ rsync -FFXHav '--filter=merge global-rsync-filter' Align-37-43/ xxx + sending incremental file list + *** buffer overflow detected ***: terminated + +It's in the exclude code in setup_merge_file(): + strlcpy(y, save, MAXPATHLEN); + +Note the 'y' pointer was incremented, so it no longer points to memory +with MAXPATHLEN "owned" bytes. + +Fix it by remembering the number of copied bytes into the 'save' buffer +and use that instead of MAXPATHLEN which is clearly incorrect. + +Fixes #511. +--- + exclude.c | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/exclude.c b/exclude.c +index ffe55b167..1a5de3b9e 100644 +--- a/exclude.c b/exclude.c +@@ -720,7 +720,8 @@ static BOOL setup_merge_file(int mergelist_num, filter_rule *ex, + parent_dirscan = True; + while (*y) { + char save[MAXPATHLEN]; +- strlcpy(save, y, MAXPATHLEN); ++ /* copylen is strlen(y) which is < MAXPATHLEN. +1 for \0 */ ++ size_t copylen = strlcpy(save, y, MAXPATHLEN) + 1; + *y = '\0'; + dirbuf_len = y - dirbuf; + strlcpy(x, ex->pattern, MAXPATHLEN - (x - buf)); +@@ -734,7 +735,7 @@ static BOOL setup_merge_file(int mergelist_num, filter_rule *ex, + lp->head = NULL; + } + lp->tail = NULL; +- strlcpy(y, save, MAXPATHLEN); ++ strlcpy(y, save, copylen); + while ((*x++ = *y++) != '/') {} + } + parent_dirscan = False; diff --git a/net-misc/rsync/rsync-3.2.7-r3.ebuild b/net-misc/rsync/rsync-3.2.7-r3.ebuild new file mode 100644 index ..01c09f3cd5ca --- /dev/null +++ b/net-misc/rsync/rsync-3.2.7-r3.ebuild @@ -0,0 +1,204 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# Uncomment when introducing a patch which touches configure +#RSYNC_NEEDS_AUTOCONF=1 +PYTHON_COMPAT=( python3_{9..11} ) +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} == * ]] ; 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=/usr/share/openpgp-keys/waynedavison.asc + inherit verify-sig + + if [[ -n ${RSYNC_NEEDS_AUTOCONF} ]] ; then + inherit autotools + fi + + if [[ ${PV} == *_pre* ]] ; then + SRC_DIR="src-previews" + else + SRC_DIR="src" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-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 rrsync ssl stunnel system-zlib xattr xxhash zstd" +REQUIRED_USE+=" examples? ( ${PYTHON_REQUIRED_USE} )" +REQUIRED_USE+=" rrsync? ( ${PYTHON_REQUIRED_USE} )" + +RDEPEND=" + >=dev-libs/popt-1.5 + acl? ( virtual/acl ) + examples? ( + ${PYTHON_DEPS} + dev-lang/perl + ) + lz4? ( app-arch/lz4:= ) +
[gentoo-commits] repo/gentoo:master commit in: net-misc/rsync/
commit: 5318f862149c5e43ebb08dacb0a07de2613e4a48 Author: Arthur Zamarin gentoo org> AuthorDate: Sat Apr 29 11:48:33 2023 + Commit: Arthur Zamarin gentoo org> CommitDate: Sat Apr 29 11:48:33 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5318f862 net-misc/rsync: Stabilize 3.2.7-r2 hppa, #904929 Signed-off-by: Arthur Zamarin gentoo.org> net-misc/rsync/rsync-3.2.7-r2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net-misc/rsync/rsync-3.2.7-r2.ebuild b/net-misc/rsync/rsync-3.2.7-r2.ebuild index 5eb3e3c9336e..9b4a39a98823 100644 --- a/net-misc/rsync/rsync-3.2.7-r2.ebuild +++ b/net-misc/rsync/rsync-3.2.7-r2.ebuild @@ -27,7 +27,7 @@ else SRC_DIR="src-previews" else SRC_DIR="src" - KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~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
[gentoo-commits] repo/gentoo:master commit in: net-misc/rsync/
commit: f1bbbf4237afdbb491ed5c80a1fcf7cfaf455eca Author: Jakov Smolić gentoo org> AuthorDate: Mon Apr 24 14:47:02 2023 + Commit: Jakov Smolić gentoo org> CommitDate: Mon Apr 24 14:47:02 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f1bbbf42 net-misc/rsync: Stabilize 3.2.7-r2 amd64, #904929 Signed-off-by: Jakov Smolić gentoo.org> net-misc/rsync/rsync-3.2.7-r2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net-misc/rsync/rsync-3.2.7-r2.ebuild b/net-misc/rsync/rsync-3.2.7-r2.ebuild index 2181c64f86df..5eb3e3c9336e 100644 --- a/net-misc/rsync/rsync-3.2.7-r2.ebuild +++ b/net-misc/rsync/rsync-3.2.7-r2.ebuild @@ -27,7 +27,7 @@ else SRC_DIR="src-previews" else SRC_DIR="src" - KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~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
[gentoo-commits] repo/gentoo:master commit in: net-misc/rsync/
commit: cb17e7a6498603ee8bbdcecc2d1c4357ef98cc0b Author: Arthur Zamarin gentoo org> AuthorDate: Mon Apr 24 08:25:08 2023 + Commit: Arthur Zamarin gentoo org> CommitDate: Mon Apr 24 08:25:08 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cb17e7a6 net-misc/rsync: Stabilize 3.2.7-r2 sparc, #904929 Signed-off-by: Arthur Zamarin gentoo.org> net-misc/rsync/rsync-3.2.7-r2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net-misc/rsync/rsync-3.2.7-r2.ebuild b/net-misc/rsync/rsync-3.2.7-r2.ebuild index fce2e6ed..079381fe4fbd 100644 --- a/net-misc/rsync/rsync-3.2.7-r2.ebuild +++ b/net-misc/rsync/rsync-3.2.7-r2.ebuild @@ -27,7 +27,7 @@ else SRC_DIR="src-previews" else SRC_DIR="src" - KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~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
[gentoo-commits] repo/gentoo:master commit in: net-misc/rsync/
commit: 411e92e1cb6886a56ad98f68eed266fb4515a964 Author: Arthur Zamarin gentoo org> AuthorDate: Mon Apr 24 08:25:09 2023 + Commit: Arthur Zamarin gentoo org> CommitDate: Mon Apr 24 08:25:09 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=411e92e1 net-misc/rsync: Stabilize 3.2.7-r2 arm, #904929 Signed-off-by: Arthur Zamarin gentoo.org> net-misc/rsync/rsync-3.2.7-r2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net-misc/rsync/rsync-3.2.7-r2.ebuild b/net-misc/rsync/rsync-3.2.7-r2.ebuild index 079381fe4fbd..2181c64f86df 100644 --- a/net-misc/rsync/rsync-3.2.7-r2.ebuild +++ b/net-misc/rsync/rsync-3.2.7-r2.ebuild @@ -27,7 +27,7 @@ else SRC_DIR="src-previews" else SRC_DIR="src" - KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~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
[gentoo-commits] repo/gentoo:master commit in: net-misc/rsync/
commit: fb1f07f466b065d6396924f633673f258219d76f Author: Arthur Zamarin gentoo org> AuthorDate: Mon Apr 24 08:25:06 2023 + Commit: Arthur Zamarin gentoo org> CommitDate: Mon Apr 24 08:25:06 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fb1f07f4 net-misc/rsync: Stabilize 3.2.7-r2 ppc64, #904929 Signed-off-by: Arthur Zamarin gentoo.org> net-misc/rsync/rsync-3.2.7-r2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net-misc/rsync/rsync-3.2.7-r2.ebuild b/net-misc/rsync/rsync-3.2.7-r2.ebuild index 2696011e9bfe..fce2e6ed 100644 --- a/net-misc/rsync/rsync-3.2.7-r2.ebuild +++ b/net-misc/rsync/rsync-3.2.7-r2.ebuild @@ -27,7 +27,7 @@ else SRC_DIR="src-previews" else SRC_DIR="src" - KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~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
[gentoo-commits] repo/gentoo:master commit in: net-misc/rsync/
commit: 5bfd43177e4833323b37466e6d5484e2faa145bb Author: Sam James gentoo org> AuthorDate: Sun Apr 23 22:32:02 2023 + Commit: Sam James gentoo org> CommitDate: Sun Apr 23 22:32:02 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5bfd4317 net-misc/rsync: Stabilize 3.2.7-r2 x86, #904929 Signed-off-by: Sam James gentoo.org> net-misc/rsync/rsync-3.2.7-r2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net-misc/rsync/rsync-3.2.7-r2.ebuild b/net-misc/rsync/rsync-3.2.7-r2.ebuild index 462a4a7be758..2696011e9bfe 100644 --- a/net-misc/rsync/rsync-3.2.7-r2.ebuild +++ b/net-misc/rsync/rsync-3.2.7-r2.ebuild @@ -27,7 +27,7 @@ else SRC_DIR="src-previews" else SRC_DIR="src" - KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~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
[gentoo-commits] repo/gentoo:master commit in: net-misc/rsync/
commit: e243ddc892a8ad4f8077e5f9b6237a6a0ccb15e5 Author: Sam James gentoo org> AuthorDate: Sun Apr 23 21:28:09 2023 + Commit: Sam James gentoo org> CommitDate: Sun Apr 23 21:28:09 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e243ddc8 net-misc/rsync: Stabilize 3.2.7-r2 ppc, #904929 Signed-off-by: Sam James gentoo.org> net-misc/rsync/rsync-3.2.7-r2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net-misc/rsync/rsync-3.2.7-r2.ebuild b/net-misc/rsync/rsync-3.2.7-r2.ebuild index 3bd7b62503f9..462a4a7be758 100644 --- a/net-misc/rsync/rsync-3.2.7-r2.ebuild +++ b/net-misc/rsync/rsync-3.2.7-r2.ebuild @@ -27,7 +27,7 @@ else SRC_DIR="src-previews" else SRC_DIR="src" - KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~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
[gentoo-commits] repo/gentoo:master commit in: net-misc/rsync/
commit: 932dad3ab141b04ef75ce585107e32520ca9735f Author: Sam James gentoo org> AuthorDate: Sun Apr 23 20:52:05 2023 + Commit: Sam James gentoo org> CommitDate: Sun Apr 23 20:52:05 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=932dad3a net-misc/rsync: Stabilize 3.2.7-r2 arm64, #904929 Signed-off-by: Sam James gentoo.org> net-misc/rsync/rsync-3.2.7-r2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net-misc/rsync/rsync-3.2.7-r2.ebuild b/net-misc/rsync/rsync-3.2.7-r2.ebuild index 75442fcd173a..3bd7b62503f9 100644 --- a/net-misc/rsync/rsync-3.2.7-r2.ebuild +++ b/net-misc/rsync/rsync-3.2.7-r2.ebuild @@ -27,7 +27,7 @@ else SRC_DIR="src-previews" else SRC_DIR="src" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~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
[gentoo-commits] repo/gentoo:master commit in: net-misc/rsync/
commit: 31d1d800ca00a944d68e066e84a3e3674e6561d8 Author: Sam James gentoo org> AuthorDate: Fri Feb 24 18:34:23 2023 + Commit: Sam James gentoo org> CommitDate: Fri Feb 24 18:35:59 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=31d1d800 net-misc/rsync: keyword for ~arm64-macos Signed-off-by: Sam James gentoo.org> net-misc/rsync/rsync-3.2.4-r3.ebuild | 2 +- net-misc/rsync/rsync-3.2.7-r2.ebuild | 2 +- net-misc/rsync/rsync-.ebuild | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/net-misc/rsync/rsync-3.2.4-r3.ebuild b/net-misc/rsync/rsync-3.2.4-r3.ebuild index 927590cf6b40..f3c5fd9a0092 100644 --- a/net-misc/rsync/rsync-3.2.4-r3.ebuild +++ b/net-misc/rsync/rsync-3.2.4-r3.ebuild @@ -28,7 +28,7 @@ else SRC_DIR="src-previews" else SRC_DIR="src" - KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~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" + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~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 diff --git a/net-misc/rsync/rsync-3.2.7-r2.ebuild b/net-misc/rsync/rsync-3.2.7-r2.ebuild index 4dc746f9c96a..75442fcd173a 100644 --- a/net-misc/rsync/rsync-3.2.7-r2.ebuild +++ b/net-misc/rsync/rsync-3.2.7-r2.ebuild @@ -27,7 +27,7 @@ else SRC_DIR="src-previews" else SRC_DIR="src" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~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" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~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 diff --git a/net-misc/rsync/rsync-.ebuild b/net-misc/rsync/rsync-.ebuild index 4dc746f9c96a..75442fcd173a 100644 --- a/net-misc/rsync/rsync-.ebuild +++ b/net-misc/rsync/rsync-.ebuild @@ -27,7 +27,7 @@ else SRC_DIR="src-previews" else SRC_DIR="src" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~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" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~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
[gentoo-commits] repo/gentoo:master commit in: net-misc/rsync/
commit: 831dd1209afaf2553baef3264b46b062d76e80b6 Author: Sam James gentoo org> AuthorDate: Sat Jan 21 03:31:14 2023 + Commit: Sam James gentoo org> CommitDate: Sat Jan 21 03:31:32 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=831dd120 net-misc/rsync: handle ubsan Pass -DCAREFUL_ALIGNMENT if building with -fsanitize=undefined to disable intentional unaligned accesses which UBSAN would otherwise flag. Signed-off-by: Sam James gentoo.org> net-misc/rsync/rsync-3.2.7-r2.ebuild | 10 +- net-misc/rsync/rsync-.ebuild | 14 +- 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/net-misc/rsync/rsync-3.2.7-r2.ebuild b/net-misc/rsync/rsync-3.2.7-r2.ebuild index fae9369c193c..4dc746f9c96a 100644 --- a/net-misc/rsync/rsync-3.2.7-r2.ebuild +++ b/net-misc/rsync/rsync-3.2.7-r2.ebuild @@ -6,7 +6,7 @@ EAPI=8 # Uncomment when introducing a patch which touches configure #RSYNC_NEEDS_AUTOCONF=1 PYTHON_COMPAT=( python3_{9..11} ) -inherit prefix python-single-r1 systemd +inherit flag-o-matic prefix python-single-r1 systemd DESCRIPTION="File transfer program to keep remote files into sync" HOMEPAGE="https://rsync.samba.org/"; @@ -125,6 +125,14 @@ src_configure() { $(use_enable zstd) ) + # https://github.com/WayneD/rsync/pull/428 + if is-flagq -fsanitize=undefined ; then + sed -E -i \ + -e 's:#define CAREFUL_ALIGNMENT (0|1):#define CAREFUL_ALIGNMENT 1:' \ + byteorder.h || die + append-flags -DCAREFUL_ALIGNMENT + fi + econf "${myeconfargs[@]}" } diff --git a/net-misc/rsync/rsync-.ebuild b/net-misc/rsync/rsync-.ebuild index 4d23490d778c..4dc746f9c96a 100644 --- a/net-misc/rsync/rsync-.ebuild +++ b/net-misc/rsync/rsync-.ebuild @@ -6,7 +6,7 @@ EAPI=8 # Uncomment when introducing a patch which touches configure #RSYNC_NEEDS_AUTOCONF=1 PYTHON_COMPAT=( python3_{9..11} ) -inherit prefix python-single-r1 systemd +inherit flag-o-matic prefix python-single-r1 systemd DESCRIPTION="File transfer program to keep remote files into sync" HOMEPAGE="https://rsync.samba.org/"; @@ -76,6 +76,10 @@ else BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-waynedavison )" fi +PATCHES=( + "${FILESDIR}"/${P}-flist-memcmp-ub.patch +) + pkg_setup() { # - USE=examples needs Python itself at runtime, but nothing else # - needs commonmark at build time @@ -121,6 +125,14 @@ src_configure() { $(use_enable zstd) ) + # https://github.com/WayneD/rsync/pull/428 + if is-flagq -fsanitize=undefined ; then + sed -E -i \ + -e 's:#define CAREFUL_ALIGNMENT (0|1):#define CAREFUL_ALIGNMENT 1:' \ + byteorder.h || die + append-flags -DCAREFUL_ALIGNMENT + fi + econf "${myeconfargs[@]}" }
[gentoo-commits] repo/gentoo:master commit in: net-misc/rsync/
commit: f90685d20720bf517799f13ad1f55009ee21c795 Author: Sam James gentoo org> AuthorDate: Sun Jan 15 22:34:21 2023 + Commit: Sam James gentoo org> CommitDate: Sun Jan 15 22:40:11 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f90685d2 net-misc/rsync: drop 3.2.7-r1 Signed-off-by: Sam James gentoo.org> net-misc/rsync/rsync-3.2.7-r1.ebuild | 191 --- 1 file changed, 191 deletions(-) diff --git a/net-misc/rsync/rsync-3.2.7-r1.ebuild b/net-misc/rsync/rsync-3.2.7-r1.ebuild deleted file mode 100644 index 4d23490d778c.. --- a/net-misc/rsync/rsync-3.2.7-r1.ebuild +++ /dev/null @@ -1,191 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -# Uncomment when introducing a patch which touches configure -#RSYNC_NEEDS_AUTOCONF=1 -PYTHON_COMPAT=( python3_{9..11} ) -inherit prefix python-single-r1 systemd - -DESCRIPTION="File transfer program to keep remote files into sync" -HOMEPAGE="https://rsync.samba.org/"; -if [[ ${PV} == * ]] ; 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 [[ -n ${RSYNC_NEEDS_AUTOCONF} ]] ; then - inherit autotools - fi - - if [[ ${PV} == *_pre* ]] ; then - SRC_DIR="src-previews" - else - SRC_DIR="src" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~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 rrsync ssl stunnel system-zlib xattr xxhash zstd" -REQUIRED_USE+=" examples? ( ${PYTHON_REQUIRED_USE} )" -REQUIRED_USE+=" rrsync? ( ${PYTHON_REQUIRED_USE} )" - -RDEPEND=" - >=dev-libs/popt-1.5 - acl? ( virtual/acl ) - examples? ( - ${PYTHON_DEPS} - dev-lang/perl - ) - lz4? ( app-arch/lz4:= ) - rrsync? ( - ${PYTHON_DEPS} - $(python_gen_cond_dep ' - dev-python/bracex[${PYTHON_USEDEP}] - ') - ) - 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} ) - rrsync? ( ${PYTHON_DEPS} ) -" - -if [[ ${PV} == * ]] ; 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 - # - needs commonmark at build time - if [[ ${PV} == * ]] || use examples || use rrsync; then - python-single-r1_pkg_setup - fi -} - -src_prepare() { - default - - if [[ ${PV} == * || -n ${RSYNC_NEEDS_AUTOCONF} ]] ; then - eaclocal -I m4 - eautoconf -o configure.sh - eautoheader && touch config.h.in - fi - - if use examples || use rrsync; then - python_fix_shebang support/ - fi - - if [[ -f rrsync.1 ]]; then - # If the pre-build rrsync.1 man page exists, then link to it - # from support/rrsync.1 to avoid rsync's build system attempting - # re-creating the man page (bug #883049). - ln -s ../rrsync.1 support/rrsync.1 || die - 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_with rrsync) - $(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 READ
[gentoo-commits] repo/gentoo:master commit in: net-misc/rsync/, net-misc/rsync/files/
commit: ddcd66e295c1744b215ec48a673b9c399bfb481f Author: Sam James gentoo org> AuthorDate: Wed Jan 11 07:47:26 2023 + Commit: Sam James gentoo org> CommitDate: Wed Jan 11 07:48:29 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ddcd66e2 net-misc/rsync: backport UB fix Signed-off-by: Sam James gentoo.org> .../rsync/files/rsync-3.2.7-flist-memcmp-ub.patch | 21 +++ net-misc/rsync/rsync-3.2.7-r2.ebuild | 195 + 2 files changed, 216 insertions(+) diff --git a/net-misc/rsync/files/rsync-3.2.7-flist-memcmp-ub.patch b/net-misc/rsync/files/rsync-3.2.7-flist-memcmp-ub.patch new file mode 100644 index ..9aa1b93e2c9c --- /dev/null +++ b/net-misc/rsync/files/rsync-3.2.7-flist-memcmp-ub.patch @@ -0,0 +1,21 @@ +https://github.com/WayneD/rsync/issues/427 +https://github.com/WayneD/rsync/issues/429 +https://github.com/WayneD/rsync/commit/90df93e446f9ebbfd4ce97d6755c5fe1f45f9fd0 + +From 90df93e446f9ebbfd4ce97d6755c5fe1f45f9fd0 Mon Sep 17 00:00:00 2001 +From: Wayne Davison +Date: Sun, 8 Jan 2023 21:35:39 -0800 +Subject: [PATCH] Don't call memcmp() on an empty lastdir. + +--- a/flist.c b/flist.c +@@ -2367,7 +2367,7 @@ struct file_list *send_file_list(int f, int argc, char *argv[]) + } + + dirlen = dir ? strlen(dir) : 0; +- if (dirlen != lastdir_len || memcmp(lastdir, dir, dirlen) != 0) { ++ if (dirlen != lastdir_len || (dirlen && memcmp(lastdir, dir, dirlen) != 0)) { + if (!change_pathname(NULL, dir, -dirlen)) + goto bad_path; + lastdir = pathname; + diff --git a/net-misc/rsync/rsync-3.2.7-r2.ebuild b/net-misc/rsync/rsync-3.2.7-r2.ebuild new file mode 100644 index ..11a98ecdd402 --- /dev/null +++ b/net-misc/rsync/rsync-3.2.7-r2.ebuild @@ -0,0 +1,195 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# Uncomment when introducing a patch which touches configure +#RSYNC_NEEDS_AUTOCONF=1 +PYTHON_COMPAT=( python3_{8..11} ) +inherit prefix python-single-r1 systemd + +DESCRIPTION="File transfer program to keep remote files into sync" +HOMEPAGE="https://rsync.samba.org/"; +if [[ ${PV} == * ]] ; 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 [[ -n ${RSYNC_NEEDS_AUTOCONF} ]] ; then + inherit autotools + fi + + if [[ ${PV} == *_pre* ]] ; then + SRC_DIR="src-previews" + else + SRC_DIR="src" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~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 rrsync ssl stunnel system-zlib xattr xxhash zstd" +REQUIRED_USE+=" examples? ( ${PYTHON_REQUIRED_USE} )" +REQUIRED_USE+=" rrsync? ( ${PYTHON_REQUIRED_USE} )" + +RDEPEND=" + >=dev-libs/popt-1.5 + acl? ( virtual/acl ) + examples? ( + ${PYTHON_DEPS} + dev-lang/perl + ) + lz4? ( app-arch/lz4:= ) + rrsync? ( + ${PYTHON_DEPS} + $(python_gen_cond_dep ' + dev-python/bracex[${PYTHON_USEDEP}] + ') + ) + 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} ) + rrsync? ( ${PYTHON_DEPS} ) +" + +if [[ ${PV} == * ]] ; then + BDEPEND+=" ${PYTHON_DEPS} + $(python_gen_cond_dep ' + dev-python/commonmark[${PYTHON_USEDEP}] + ')" +else + BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-waynedavison )" +fi + +PATCHES=( + "${FILESDIR}"/${P}-flist-memcmp-ub.patch +) + +pkg_setup() { + # - USE=examples needs Python itself at runtime, but nothing else + # - needs commonmark at build time + if [[ ${PV} == * ]] || use examples || use rrsync; then + python-single-r1_pkg_setup + fi +} + +src_prepare() { + default + + if [[ ${PV} == * || -n ${RSYNC_NEEDS_AUTOCONF} ]] ; then + eaclocal -I m4 + eautoconf -o config
[gentoo-commits] repo/gentoo:master commit in: net-misc/rsync/
commit: 9026da2681c941ad1545833e860e44e0f5b7e4bd Author: Sam James gentoo org> AuthorDate: Tue Jan 10 06:05:39 2023 + Commit: Sam James gentoo org> CommitDate: Tue Jan 10 06:05:39 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9026da26 net-misc/rsync: enable py3.11 Signed-off-by: Sam James gentoo.org> net-misc/rsync/rsync-3.2.7-r1.ebuild | 4 ++-- net-misc/rsync/rsync-.ebuild | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/net-misc/rsync/rsync-3.2.7-r1.ebuild b/net-misc/rsync/rsync-3.2.7-r1.ebuild index 6c31cf7b857f..73c3bfc6b831 100644 --- a/net-misc/rsync/rsync-3.2.7-r1.ebuild +++ b/net-misc/rsync/rsync-3.2.7-r1.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 # Uncomment when introducing a patch which touches configure #RSYNC_NEEDS_AUTOCONF=1 -PYTHON_COMPAT=( python3_{8..10} ) +PYTHON_COMPAT=( python3_{8..11} ) inherit prefix python-single-r1 systemd DESCRIPTION="File transfer program to keep remote files into sync" diff --git a/net-misc/rsync/rsync-.ebuild b/net-misc/rsync/rsync-.ebuild index 6c31cf7b857f..73c3bfc6b831 100644 --- a/net-misc/rsync/rsync-.ebuild +++ b/net-misc/rsync/rsync-.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 # Uncomment when introducing a patch which touches configure #RSYNC_NEEDS_AUTOCONF=1 -PYTHON_COMPAT=( python3_{8..10} ) +PYTHON_COMPAT=( python3_{8..11} ) inherit prefix python-single-r1 systemd DESCRIPTION="File transfer program to keep remote files into sync"
[gentoo-commits] repo/gentoo:master commit in: net-misc/rsync/files/, net-misc/rsync/
commit: 7a1ecd6cc46b1f97eef4b3d79c1bb03d41c133d0 Author: Andreas K. Hüttel gentoo org> AuthorDate: Thu Dec 1 21:41:18 2022 + Commit: Andreas K. Hüttel gentoo org> CommitDate: Thu Dec 1 21:42:29 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7a1ecd6c net-misc/rsync: Don't be so pedantic. Closes: https://bugs.gentoo.org/883215 Signed-off-by: Andreas K. Hüttel gentoo.org> net-misc/rsync/files/rsync-3.2.4-notpedantic.patch | 25 ++ net-misc/rsync/rsync-3.2.4-r3.ebuild | 1 + 2 files changed, 26 insertions(+) diff --git a/net-misc/rsync/files/rsync-3.2.4-notpedantic.patch b/net-misc/rsync/files/rsync-3.2.4-notpedantic.patch new file mode 100644 index ..9d081ab52c5b --- /dev/null +++ b/net-misc/rsync/files/rsync-3.2.4-notpedantic.patch @@ -0,0 +1,25 @@ +diff -ruN rsync-3.2.4.orig/configure.ac rsync-3.2.4/configure.ac +--- rsync-3.2.4.orig/configure.ac 2022-12-01 22:26:34.856659562 +0100 rsync-3.2.4/configure.ac 2022-12-01 22:31:43.849290989 +0100 +@@ -1067,21 +1067,6 @@ + with_included_popt=yes + fi + +-if test x"$GCC" = x"yes"; then +-if test x"$with_included_popt" != x"yes"; then +- # Turn pedantic warnings into errors to ensure an array-init overflow is an error. +- CFLAGS="$CFLAGS -pedantic-errors" +-else +- # Our internal popt code cannot be compiled with pedantic warnings as errors, so try to +- # turn off pedantic warnings (which will not lose the error for array-init overflow). +- # Older gcc versions don't understand -Wno-pedantic, so check if --help=warnings lists +- # -Wpedantic and use that as a flag. +- case `$CC --help=warnings 2>/dev/null | grep Wpedantic` in +- *-Wpedantic*) CFLAGS="$CFLAGS -pedantic-errors -Wno-pedantic" ;; +- esac +-fi +-fi +- + AC_MSG_CHECKING([whether to use included libpopt]) + if test x"$with_included_popt" = x"yes"; then + AC_MSG_RESULT($srcdir/popt) diff --git a/net-misc/rsync/rsync-3.2.4-r3.ebuild b/net-misc/rsync/rsync-3.2.4-r3.ebuild index 41447f110e95..05ce39b226b0 100644 --- a/net-misc/rsync/rsync-3.2.4-r3.ebuild +++ b/net-misc/rsync/rsync-3.2.4-r3.ebuild @@ -70,6 +70,7 @@ PATCHES=( "${FILESDIR}"/${P}-unsigned-char-checksum.patch # https://github.com/WayneD/rsync/issues/324 "${FILESDIR}"/${P}-strlcpy.patch + "${FILESDIR}"/${P}-notpedantic.patch ) pkg_setup() {
[gentoo-commits] repo/gentoo:master commit in: net-misc/rsync/
commit: 835f0179694d35eec8af5e167eaabfa789d686f7 Author: Mike Gilbert gentoo org> AuthorDate: Sat Nov 26 16:36:30 2022 + Commit: Mike Gilbert gentoo org> CommitDate: Sat Nov 26 16:36:30 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=835f0179 net-misc/rsync: sync live ebuild Signed-off-by: Mike Gilbert gentoo.org> net-misc/rsync/rsync-.ebuild | 32 1 file changed, 28 insertions(+), 4 deletions(-) diff --git a/net-misc/rsync/rsync-.ebuild b/net-misc/rsync/rsync-.ebuild index 804909ae11e6..6c31cf7b857f 100644 --- a/net-misc/rsync/rsync-.ebuild +++ b/net-misc/rsync/rsync-.ebuild @@ -37,8 +37,9 @@ fi LICENSE="GPL-3" SLOT="0" -IUSE="acl examples iconv lz4 ssl stunnel system-zlib xattr xxhash zstd" +IUSE="acl examples iconv lz4 rrsync ssl stunnel system-zlib xattr xxhash zstd" REQUIRED_USE+=" examples? ( ${PYTHON_REQUIRED_USE} )" +REQUIRED_USE+=" rrsync? ( ${PYTHON_REQUIRED_USE} )" RDEPEND=" >=dev-libs/popt-1.5 @@ -48,6 +49,12 @@ RDEPEND=" dev-lang/perl ) lz4? ( app-arch/lz4:= ) + rrsync? ( + ${PYTHON_DEPS} + $(python_gen_cond_dep ' + dev-python/bracex[${PYTHON_USEDEP}] + ') + ) ssl? ( dev-libs/openssl:= ) system-zlib? ( sys-libs/zlib ) xattr? ( kernel_linux? ( sys-apps/attr ) ) @@ -55,7 +62,10 @@ RDEPEND=" zstd? ( >=app-arch/zstd-1.4:= ) iconv? ( virtual/libiconv )" DEPEND="${RDEPEND}" -BDEPEND="examples? ( ${PYTHON_DEPS} )" +BDEPEND=" + examples? ( ${PYTHON_DEPS} ) + rrsync? ( ${PYTHON_DEPS} ) +" if [[ ${PV} == * ]] ; then BDEPEND+=" ${PYTHON_DEPS} @@ -69,7 +79,7 @@ fi pkg_setup() { # - USE=examples needs Python itself at runtime, but nothing else # - needs commonmark at build time - if [[ ${PV} == * ]] || use examples ; then + if [[ ${PV} == * ]] || use examples || use rrsync; then python-single-r1_pkg_setup fi } @@ -82,6 +92,17 @@ src_prepare() { eautoconf -o configure.sh eautoheader && touch config.h.in fi + + if use examples || use rrsync; then + python_fix_shebang support/ + fi + + if [[ -f rrsync.1 ]]; then + # If the pre-build rrsync.1 man page exists, then link to it + # from support/rrsync.1 to avoid rsync's build system attempting + # re-creating the man page (bug #883049). + ln -s ../rrsync.1 support/rrsync.1 || die + fi } src_configure() { @@ -92,6 +113,7 @@ src_configure() { $(use_enable acl acl-support) $(use_enable iconv) $(use_enable lz4) + $(use_with rrsync) $(use_enable ssl openssl) $(use_with !system-zlib included-zlib) $(use_enable xattr xattr-support) @@ -126,7 +148,9 @@ src_install() { # Install the useful contrib scripts if use examples ; then - python_fix_shebang support/ + # The 'rrsync' script is installed conditionally via the 'rrysnc' + # USE flag, and not via the 'examples' USE flag. + rm support/rrsync* || die exeinto /usr/share/rsync doexe support/*
[gentoo-commits] repo/gentoo:master commit in: net-misc/rsync/
commit: 5616d3b3c78fee3e7ba879eed5c606e05339bc50 Author: Florian Schmaus gentoo org> AuthorDate: Sat Nov 26 08:54:04 2022 + Commit: Florian Schmaus gentoo org> CommitDate: Sat Nov 26 08:59:34 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5616d3b3 net-misc/rsync: fix rrsync.1 man page handling Thanks to ionen for co-debugging the root cause of this. Closes: https://bugs.gentoo.org/883049 Signed-off-by: Florian Schmaus gentoo.org> net-misc/rsync/rsync-3.2.7-r1.ebuild | 7 +++ 1 file changed, 7 insertions(+) diff --git a/net-misc/rsync/rsync-3.2.7-r1.ebuild b/net-misc/rsync/rsync-3.2.7-r1.ebuild index bbb1e1b44e26..6c31cf7b857f 100644 --- a/net-misc/rsync/rsync-3.2.7-r1.ebuild +++ b/net-misc/rsync/rsync-3.2.7-r1.ebuild @@ -96,6 +96,13 @@ src_prepare() { if use examples || use rrsync; then python_fix_shebang support/ fi + + if [[ -f rrsync.1 ]]; then + # If the pre-build rrsync.1 man page exists, then link to it + # from support/rrsync.1 to avoid rsync's build system attempting + # re-creating the man page (bug #883049). + ln -s ../rrsync.1 support/rrsync.1 || die + fi } src_configure() {
[gentoo-commits] repo/gentoo:master commit in: net-misc/rsync/
commit: 8997ed1c7fa1c9a5860397e6db8509879446027a Author: Arthur Zamarin gentoo org> AuthorDate: Fri Nov 25 06:33:21 2022 + Commit: Arthur Zamarin gentoo org> CommitDate: Fri Nov 25 06:33:21 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8997ed1c net-misc/rsync: Keyword 3.2.7-r1 ia64, #882593 Signed-off-by: Arthur Zamarin gentoo.org> net-misc/rsync/rsync-3.2.7-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net-misc/rsync/rsync-3.2.7-r1.ebuild b/net-misc/rsync/rsync-3.2.7-r1.ebuild index 9af44ab57907..bbb1e1b44e26 100644 --- a/net-misc/rsync/rsync-3.2.7-r1.ebuild +++ b/net-misc/rsync/rsync-3.2.7-r1.ebuild @@ -27,7 +27,7 @@ else SRC_DIR="src-previews" else SRC_DIR="src" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~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" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~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
[gentoo-commits] repo/gentoo:master commit in: net-misc/rsync/
commit: c73629db51255a5697e78882021b1a32fb51df7f Author: Sam James gentoo org> AuthorDate: Wed Nov 23 23:40:00 2022 + Commit: Sam James gentoo org> CommitDate: Wed Nov 23 23:40:00 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c73629db net-misc/rsync: Keyword 3.2.7-r1 arm, #882593 Signed-off-by: Sam James gentoo.org> net-misc/rsync/rsync-3.2.7-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net-misc/rsync/rsync-3.2.7-r1.ebuild b/net-misc/rsync/rsync-3.2.7-r1.ebuild index bd3b9c98369c..9af44ab57907 100644 --- a/net-misc/rsync/rsync-3.2.7-r1.ebuild +++ b/net-misc/rsync/rsync-3.2.7-r1.ebuild @@ -27,7 +27,7 @@ else SRC_DIR="src-previews" else SRC_DIR="src" - KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~loong ~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" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~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
[gentoo-commits] repo/gentoo:master commit in: net-misc/rsync/
commit: c9b930c3f179d18fbfae5d8d33a6821210dec0ac Author: Sam James gentoo org> AuthorDate: Wed Nov 23 23:39:57 2022 + Commit: Sam James gentoo org> CommitDate: Wed Nov 23 23:39:57 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c9b930c3 net-misc/rsync: Keyword 3.2.7-r1 sparc, #882593 Signed-off-by: Sam James gentoo.org> net-misc/rsync/rsync-3.2.7-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net-misc/rsync/rsync-3.2.7-r1.ebuild b/net-misc/rsync/rsync-3.2.7-r1.ebuild index 448a8236ead9..bd3b9c98369c 100644 --- a/net-misc/rsync/rsync-3.2.7-r1.ebuild +++ b/net-misc/rsync/rsync-3.2.7-r1.ebuild @@ -27,7 +27,7 @@ else SRC_DIR="src-previews" else SRC_DIR="src" - KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~loong ~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
[gentoo-commits] repo/gentoo:master commit in: net-misc/rsync/
commit: fc45a81d751a4df9340280e6a70d123cfae4538c Author: Sam James gentoo org> AuthorDate: Wed Nov 23 23:39:55 2022 + Commit: Sam James gentoo org> CommitDate: Wed Nov 23 23:39:55 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fc45a81d net-misc/rsync: Keyword 3.2.7-r1 arm64, #882593 Signed-off-by: Sam James gentoo.org> net-misc/rsync/rsync-3.2.7-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net-misc/rsync/rsync-3.2.7-r1.ebuild b/net-misc/rsync/rsync-3.2.7-r1.ebuild index be57ac763382..448a8236ead9 100644 --- a/net-misc/rsync/rsync-3.2.7-r1.ebuild +++ b/net-misc/rsync/rsync-3.2.7-r1.ebuild @@ -27,7 +27,7 @@ else SRC_DIR="src-previews" else SRC_DIR="src" - KEYWORDS="~alpha ~amd64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~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
[gentoo-commits] repo/gentoo:master commit in: net-misc/rsync/
commit: b3eeaeabd99023ce2c6c329dcbba993cd01221ef Author: Jakov Smolić gentoo org> AuthorDate: Wed Nov 23 17:43:42 2022 + Commit: Jakov Smolić gentoo org> CommitDate: Wed Nov 23 17:43:42 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b3eeaeab net-misc/rsync: Keyword 3.2.7-r1 hppa, #882593 Signed-off-by: Jakov Smolić gentoo.org> net-misc/rsync/rsync-3.2.7-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net-misc/rsync/rsync-3.2.7-r1.ebuild b/net-misc/rsync/rsync-3.2.7-r1.ebuild index a5ba6d5679bf..be57ac763382 100644 --- a/net-misc/rsync/rsync-3.2.7-r1.ebuild +++ b/net-misc/rsync/rsync-3.2.7-r1.ebuild @@ -27,7 +27,7 @@ else SRC_DIR="src-previews" else SRC_DIR="src" - KEYWORDS="~alpha ~amd64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + KEYWORDS="~alpha ~amd64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~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
[gentoo-commits] repo/gentoo:master commit in: net-misc/rsync/
commit: b34b1fa521bdf4dc047df120493f77dfd5f4f701 Author: Arthur Zamarin gentoo org> AuthorDate: Wed Nov 23 14:40:15 2022 + Commit: Arthur Zamarin gentoo org> CommitDate: Wed Nov 23 14:40:15 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b34b1fa5 net-misc/rsync: Keyword 3.2.7-r1 s390, #882593 Signed-off-by: Arthur Zamarin gentoo.org> net-misc/rsync/rsync-3.2.7-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net-misc/rsync/rsync-3.2.7-r1.ebuild b/net-misc/rsync/rsync-3.2.7-r1.ebuild index 82811728c290..a5ba6d5679bf 100644 --- a/net-misc/rsync/rsync-3.2.7-r1.ebuild +++ b/net-misc/rsync/rsync-3.2.7-r1.ebuild @@ -27,7 +27,7 @@ else SRC_DIR="src-previews" else SRC_DIR="src" - KEYWORDS="~alpha ~amd64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + KEYWORDS="~alpha ~amd64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~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
[gentoo-commits] repo/gentoo:master commit in: net-misc/rsync/
commit: 438fc6a740f1e4a23197878e142a0569aa979e71 Author: Arthur Zamarin gentoo org> AuthorDate: Wed Nov 23 12:03:13 2022 + Commit: Arthur Zamarin gentoo org> CommitDate: Wed Nov 23 12:03:13 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=438fc6a7 net-misc/rsync: Keyword 3.2.7-r1 ppc64, #882593 Signed-off-by: Arthur Zamarin gentoo.org> net-misc/rsync/rsync-3.2.7-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net-misc/rsync/rsync-3.2.7-r1.ebuild b/net-misc/rsync/rsync-3.2.7-r1.ebuild index 0eda11f3670f..1d3949bb8f9e 100644 --- a/net-misc/rsync/rsync-3.2.7-r1.ebuild +++ b/net-misc/rsync/rsync-3.2.7-r1.ebuild @@ -27,7 +27,7 @@ else SRC_DIR="src-previews" else SRC_DIR="src" - KEYWORDS="~alpha ~amd64 ~loong ~m68k ~mips ~riscv ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + KEYWORDS="~alpha ~amd64 ~loong ~m68k ~mips ~ppc64 ~riscv ~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
[gentoo-commits] repo/gentoo:master commit in: net-misc/rsync/
commit: 456a0c5d4a60987f70ad47a0df064a04f7a95dc6 Author: Arthur Zamarin gentoo org> AuthorDate: Wed Nov 23 12:03:14 2022 + Commit: Arthur Zamarin gentoo org> CommitDate: Wed Nov 23 12:03:14 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=456a0c5d net-misc/rsync: Keyword 3.2.7-r1 ppc, #882593 Signed-off-by: Arthur Zamarin gentoo.org> net-misc/rsync/rsync-3.2.7-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net-misc/rsync/rsync-3.2.7-r1.ebuild b/net-misc/rsync/rsync-3.2.7-r1.ebuild index 1d3949bb8f9e..82811728c290 100644 --- a/net-misc/rsync/rsync-3.2.7-r1.ebuild +++ b/net-misc/rsync/rsync-3.2.7-r1.ebuild @@ -27,7 +27,7 @@ else SRC_DIR="src-previews" else SRC_DIR="src" - KEYWORDS="~alpha ~amd64 ~loong ~m68k ~mips ~ppc64 ~riscv ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + KEYWORDS="~alpha ~amd64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~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
[gentoo-commits] repo/gentoo:master commit in: net-misc/rsync/
commit: da4d9a9587d97464097bef47fcfcbae59ab8319c Author: Florian Schmaus gentoo org> AuthorDate: Tue Nov 22 15:53:48 2022 + Commit: Florian Schmaus gentoo org> CommitDate: Wed Nov 23 07:58:35 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=da4d9a95 net-misc/rsync: add rrsync USE flag Closes: https://bugs.gentoo.org/882579 Closes: https://github.com/gentoo/gentoo/pull/28385 Signed-off-by: Florian Schmaus gentoo.org> net-misc/rsync/metadata.xml| 1 + .../{rsync-3.2.7.ebuild => rsync-3.2.7-r1.ebuild} | 27 ++ 2 files changed, 23 insertions(+), 5 deletions(-) diff --git a/net-misc/rsync/metadata.xml b/net-misc/rsync/metadata.xml index 99f88ebaf252..4dd797f7c406 100644 --- a/net-misc/rsync/metadata.xml +++ b/net-misc/rsync/metadata.xml @@ -11,6 +11,7 @@ WayneD/rsync + Install rrsync script to setup restricted rsync users via ssh logins Provide helper scripts for using rsync via >=net-misc/stunnel-4 Use system zlib instead of bundled one. This is incompatible with older rsync releases! Enable dev-libs/xxhash support for hashing diff --git a/net-misc/rsync/rsync-3.2.7.ebuild b/net-misc/rsync/rsync-3.2.7-r1.ebuild similarity index 84% rename from net-misc/rsync/rsync-3.2.7.ebuild rename to net-misc/rsync/rsync-3.2.7-r1.ebuild index 804909ae11e6..0eda11f3670f 100644 --- a/net-misc/rsync/rsync-3.2.7.ebuild +++ b/net-misc/rsync/rsync-3.2.7-r1.ebuild @@ -27,7 +27,7 @@ else SRC_DIR="src-previews" else SRC_DIR="src" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~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" + KEYWORDS="~alpha ~amd64 ~loong ~m68k ~mips ~riscv ~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 @@ -37,8 +37,9 @@ fi LICENSE="GPL-3" SLOT="0" -IUSE="acl examples iconv lz4 ssl stunnel system-zlib xattr xxhash zstd" +IUSE="acl examples iconv lz4 rrsync ssl stunnel system-zlib xattr xxhash zstd" REQUIRED_USE+=" examples? ( ${PYTHON_REQUIRED_USE} )" +REQUIRED_USE+=" rrsync? ( ${PYTHON_REQUIRED_USE} )" RDEPEND=" >=dev-libs/popt-1.5 @@ -48,6 +49,12 @@ RDEPEND=" dev-lang/perl ) lz4? ( app-arch/lz4:= ) + rrsync? ( + ${PYTHON_DEPS} + $(python_gen_cond_dep ' + dev-python/bracex[${PYTHON_USEDEP}] + ') + ) ssl? ( dev-libs/openssl:= ) system-zlib? ( sys-libs/zlib ) xattr? ( kernel_linux? ( sys-apps/attr ) ) @@ -55,7 +62,10 @@ RDEPEND=" zstd? ( >=app-arch/zstd-1.4:= ) iconv? ( virtual/libiconv )" DEPEND="${RDEPEND}" -BDEPEND="examples? ( ${PYTHON_DEPS} )" +BDEPEND=" + examples? ( ${PYTHON_DEPS} ) + rrsync? ( ${PYTHON_DEPS} ) +" if [[ ${PV} == * ]] ; then BDEPEND+=" ${PYTHON_DEPS} @@ -69,7 +79,7 @@ fi pkg_setup() { # - USE=examples needs Python itself at runtime, but nothing else # - needs commonmark at build time - if [[ ${PV} == * ]] || use examples ; then + if [[ ${PV} == * ]] || use examples || use rrsync; then python-single-r1_pkg_setup fi } @@ -82,6 +92,10 @@ src_prepare() { eautoconf -o configure.sh eautoheader && touch config.h.in fi + + if use examples || use rrsync; then + python_fix_shebang support/ + fi } src_configure() { @@ -92,6 +106,7 @@ src_configure() { $(use_enable acl acl-support) $(use_enable iconv) $(use_enable lz4) + $(use_with rrsync) $(use_enable ssl openssl) $(use_with !system-zlib included-zlib) $(use_enable xattr xattr-support) @@ -126,7 +141,9 @@ src_install() { # Install the useful contrib scripts if use examples ; then - python_fix_shebang support/ + # The 'rrsync' script is installed conditionally via the 'rrysnc' + # USE flag, and not via the 'examples' USE flag. + rm support/rrsync* || die exeinto /usr/share/rsync doexe support/*
[gentoo-commits] repo/gentoo:master commit in: net-misc/rsync/files/
commit: 339057afef6d53cd247531371bfe9063103572ea Author: Michael Mair-Keimberger levelnine at> AuthorDate: Thu Oct 27 17:18:48 2022 + Commit: Sam James gentoo org> CommitDate: Sun Oct 30 09:39:10 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=339057af net-misc/rsync: remove unused patch Signed-off-by: Michael Mair-Keimberger levelnine.at> Closes: https://github.com/gentoo/gentoo/pull/27982 Signed-off-by: Sam James gentoo.org> .../rsync/files/rsync-3.2.5-pedantic-errors.patch | 53 -- 1 file changed, 53 deletions(-) diff --git a/net-misc/rsync/files/rsync-3.2.5-pedantic-errors.patch b/net-misc/rsync/files/rsync-3.2.5-pedantic-errors.patch deleted file mode 100644 index 33afbd954a12.. --- a/net-misc/rsync/files/rsync-3.2.5-pedantic-errors.patch +++ /dev/null @@ -1,53 +0,0 @@ -https://github.com/WayneD/rsync/commit/9a3449a3980421f84ac55498ba565bc112b20d6c - -In particular, avoids attr configure test failing. - -From 9a3449a3980421f84ac55498ba565bc112b20d6c Mon Sep 17 00:00:00 2001 -From: Wayne Davison -Date: Thu, 18 Aug 2022 17:33:54 -0700 -Subject: [PATCH] Stop enabling -pedantic-errors. - a/configure.ac -+++ b/configure.ac -@@ -1071,21 +1071,6 @@ elif test x"$ac_cv_header_popt_h" != x"yes"; then - with_included_popt=yes - fi - --if test x"$GCC" = x"yes"; then --if test x"$with_included_popt" != x"yes"; then -- # Turn pedantic warnings into errors to ensure an array-init overflow is an error. -- CFLAGS="$CFLAGS -pedantic-errors" --else -- # Our internal popt code cannot be compiled with pedantic warnings as errors, so try to -- # turn off pedantic warnings (which will not lose the error for array-init overflow). -- # Older gcc versions don't understand -Wno-pedantic, so check if --help=warnings lists -- # -Wpedantic and use that as a flag. -- case `$CC --help=warnings 2>/dev/null | grep Wpedantic` in -- *-Wpedantic*) CFLAGS="$CFLAGS -pedantic-errors -Wno-pedantic" ;; -- esac --fi --fi -- - AC_MSG_CHECKING([whether to use included libpopt]) - if test x"$with_included_popt" = x"yes"; then - AC_MSG_RESULT($srcdir/popt) - a/configure.sh -+++ b/configure.sh -@@ -9982,14 +9982,14 @@ fi - if test x"$GCC" = x"yes"; then - if test x"$with_included_popt" != x"yes"; then - # Turn pedantic warnings into errors to ensure an array-init overflow is an error. -- CFLAGS="$CFLAGS -pedantic-errors" -+ CFLAGS="$CFLAGS " - else - # Our internal popt code cannot be compiled with pedantic warnings as errors, so try to - # turn off pedantic warnings (which will not lose the error for array-init overflow). - # Older gcc versions don't understand -Wno-pedantic, so check if --help=warnings lists - # -Wpedantic and use that as a flag. - case `$CC --help=warnings 2>/dev/null | grep Wpedantic` in -- *-Wpedantic*) CFLAGS="$CFLAGS -pedantic-errors -Wno-pedantic" ;; -+ *-Wpedantic*) CFLAGS="$CFLAGS -Wno-pedantic" ;; - esac - fi - fi
[gentoo-commits] repo/gentoo:master commit in: net-misc/rsync/
commit: 247739d5f91629ea69875115dd20f18a8ebfd77c Author: Sam James gentoo org> AuthorDate: Tue Oct 25 05:30:32 2022 + Commit: Sam James gentoo org> CommitDate: Tue Oct 25 05:31:01 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=247739d5 net-misc/rsync: add 3.2.7, drop 3.2.7_pre1 Bug: https://bugs.gentoo.org/862876 Signed-off-by: Sam James gentoo.org> net-misc/rsync/Manifest| 4 ++-- net-misc/rsync/{rsync-3.2.7_pre1.ebuild => rsync-3.2.7.ebuild} | 0 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/net-misc/rsync/Manifest b/net-misc/rsync/Manifest index a6ef7293f59b..2d98bff9c878 100644 --- a/net-misc/rsync/Manifest +++ b/net-misc/rsync/Manifest @@ -4,5 +4,5 @@ DIST rsync-3.2.5.tar.gz 1129957 BLAKE2B a0d1c4a2dbebe37bad4f6e2e5e4fae41c53529d9 DIST rsync-3.2.5.tar.gz.asc 195 BLAKE2B 9ca9034afc39299c2178190412b188f561d274d8e38d58a988487f2db14a8135840acf3413096d26f080358b69779fa3b48e292670ba6b23ae4eb0c05f9df614 SHA512 b384f48b2fd459a51715c8ab2a14e540c5fa7f7f12453282db770893d6121b1b3c9809e667ccacaf910fd90548abeb700a2c717d76fbea22fe3d6a22aa6b2c44 DIST rsync-3.2.6.tar.gz 1138593 BLAKE2B fa0c4aa9cdffbc9ffd4f81e8c3cdc1fda7080f80c1923084c6d705e6872caaba31c13de4603c9462f312dbbdae76520c27d3f4f40b327f1e66c7127b1d05ea73 SHA512 d141d04732c91e055708e8d1f14b976f9483208a93076bb66dc75cbf87d54f2dcbffc11423f0c9c005d2d4e20cb9c147a7672f7a9c0b987f4e2c39b4c3645cfe DIST rsync-3.2.6.tar.gz.asc 195 BLAKE2B 945c60ca67aa4234bc9d5b38c9228125f3040bccecf60c08892286c1b4fa32878d92bfc78ee664d4f6453ccaaf6d394dbe203f0a8be149e557fabede1c111b07 SHA512 1316b358dfa87ad7c35b2b5d11e0be111a182041150cf9c9ae30f73e0af1430a59136250dc853f784e9e80d0ee20cc46e9a34b07cc7c7a48040db168a8c8941b -DIST rsync-3.2.7pre1.tar.gz 1146970 BLAKE2B a41ef2acdff2b4e6703beb47b6ac90ec40d56bb53492b0a7aba268ebaf4e6bc19a7bde8fbac1ae35ed9062f2d37dd9a5ef0dd17ce8f78a0dab9f184959fd2ce5 SHA512 98eac7e0734e7dc8874fa51265419b40431b9bdc1861a16f8ccec6aa2b42df86532fb7585c19f2c814ad2e71ebf420414120cef434c6712279e453b14fd853f9 -DIST rsync-3.2.7pre1.tar.gz.asc 195 BLAKE2B bb497c19f53e7b465771425c4ee20582b46ea8af652232a58602d8e007fa4a10a237303e46ef22e78432606e95462161930de200b064ab1d2addcadc9dceae50 SHA512 6fb46e8b3a510dd7602003d6ced6d8cda57e5e2c8df4e1f2036c169e51fe21b460b6e6a42fc1c9c8fdc31c37d9992c287d64f529e019d629f35b4a43ab1eb1d8 +DIST rsync-3.2.7.tar.gz 1149787 BLAKE2B 1b910b321e8d6b49af9f26bef813509f0da12dedd6857897de136d3617c68d38368ce05de13b9b0ef35a5452dca141ebdcdfb6af8456151d0ca0ad546452b504 SHA512 c2afba11a352fd88133f9e96e19d6df80eb864450c83eced13a7faa23df947bccf2ef093f2101df6ee30abff4cbbd39ac802e9aa5f726e42c9caff274fad8377 +DIST rsync-3.2.7.tar.gz.asc 195 BLAKE2B d2bca9276d9a0c96a9156a8da60e391f58eceb2e1ffaa51b7e7ffd592feaba3ce54772bd563a251e3b30efb0ad07fc96da01158a77dd77c6534eac5d80b46e53 SHA512 bad9f48e033966566c6abf8cd485d35c0d9cf130eafb0c5fff9bcb928882283bbcdd2375e7c2880cf71cf81496ba6b743b61adca3d4678421c32915a2464acc3 diff --git a/net-misc/rsync/rsync-3.2.7_pre1.ebuild b/net-misc/rsync/rsync-3.2.7.ebuild similarity index 100% rename from net-misc/rsync/rsync-3.2.7_pre1.ebuild rename to net-misc/rsync/rsync-3.2.7.ebuild
[gentoo-commits] repo/gentoo:master commit in: net-misc/rsync/
commit: c40dbfadecf1fc0adfc8135b2f66aa3ed17fbee4 Author: Sam James gentoo org> AuthorDate: Tue Oct 25 05:31:23 2022 + Commit: Sam James gentoo org> CommitDate: Tue Oct 25 05:51:07 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c40dbfad net-misc/rsync: drop 3.2.4-r1, 3.2.5-r1 Signed-off-by: Sam James gentoo.org> net-misc/rsync/Manifest | 2 - net-misc/rsync/rsync-3.2.4-r1.ebuild | 164 - net-misc/rsync/rsync-3.2.5-r1.ebuild | 171 --- 3 files changed, 337 deletions(-) diff --git a/net-misc/rsync/Manifest b/net-misc/rsync/Manifest index 2d98bff9c878..e8abc54f94fc 100644 --- a/net-misc/rsync/Manifest +++ b/net-misc/rsync/Manifest @@ -1,7 +1,5 @@ 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.6.tar.gz 1138593 BLAKE2B fa0c4aa9cdffbc9ffd4f81e8c3cdc1fda7080f80c1923084c6d705e6872caaba31c13de4603c9462f312dbbdae76520c27d3f4f40b327f1e66c7127b1d05ea73 SHA512 d141d04732c91e055708e8d1f14b976f9483208a93076bb66dc75cbf87d54f2dcbffc11423f0c9c005d2d4e20cb9c147a7672f7a9c0b987f4e2c39b4c3645cfe DIST rsync-3.2.6.tar.gz.asc 195 BLAKE2B 945c60ca67aa4234bc9d5b38c9228125f3040bccecf60c08892286c1b4fa32878d92bfc78ee664d4f6453ccaaf6d394dbe203f0a8be149e557fabede1c111b07 SHA512 1316b358dfa87ad7c35b2b5d11e0be111a182041150cf9c9ae30f73e0af1430a59136250dc853f784e9e80d0ee20cc46e9a34b07cc7c7a48040db168a8c8941b DIST rsync-3.2.7.tar.gz 1149787 BLAKE2B 1b910b321e8d6b49af9f26bef813509f0da12dedd6857897de136d3617c68d38368ce05de13b9b0ef35a5452dca141ebdcdfb6af8456151d0ca0ad546452b504 SHA512 c2afba11a352fd88133f9e96e19d6df80eb864450c83eced13a7faa23df947bccf2ef093f2101df6ee30abff4cbbd39ac802e9aa5f726e42c9caff274fad8377 diff --git a/net-misc/rsync/rsync-3.2.4-r1.ebuild b/net-misc/rsync/rsync-3.2.4-r1.ebuild deleted file mode 100644 index d569ca909ecd.. --- a/net-misc/rsync/rsync-3.2.4-r1.ebuild +++ /dev/null @@ -1,164 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{8,9,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} == * ]] ; 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 ~loong ~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 ipv6 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
[gentoo-commits] repo/gentoo:master commit in: net-misc/rsync/
commit: 9d26a6b263f804564af069dfe943c7851c637055 Author: Sam James gentoo org> AuthorDate: Fri Sep 30 20:46:16 2022 + Commit: Sam James gentoo org> CommitDate: Fri Sep 30 20:53:36 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9d26a6b2 net-misc/rsync: add changelog remote-id Signed-off-by: Sam James gentoo.org> net-misc/rsync/metadata.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/net-misc/rsync/metadata.xml b/net-misc/rsync/metadata.xml index e0cef9bf0cdb..99f88ebaf252 100644 --- a/net-misc/rsync/metadata.xml +++ b/net-misc/rsync/metadata.xml @@ -6,6 +6,7 @@ Gentoo Base System + https://rsync.samba.org/ftp/rsync/NEWS cpe:/a:samba:rsync WayneD/rsync
[gentoo-commits] repo/gentoo:master commit in: net-misc/rsync/
commit: 1ebe0b8fa12b7f481eebe1d5fb764b9981b2b95e Author: Sam James gentoo org> AuthorDate: Fri Sep 30 20:46:01 2022 + Commit: Sam James gentoo org> CommitDate: Fri Sep 30 20:53:35 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1ebe0b8f net-misc/rsync: add 3.2.7_pre1 Signed-off-by: Sam James gentoo.org> net-misc/rsync/Manifest| 2 + net-misc/rsync/rsync-3.2.7_pre1.ebuild | 167 + 2 files changed, 169 insertions(+) diff --git a/net-misc/rsync/Manifest b/net-misc/rsync/Manifest index 5503dee54155..a6ef7293f59b 100644 --- a/net-misc/rsync/Manifest +++ b/net-misc/rsync/Manifest @@ -4,3 +4,5 @@ DIST rsync-3.2.5.tar.gz 1129957 BLAKE2B a0d1c4a2dbebe37bad4f6e2e5e4fae41c53529d9 DIST rsync-3.2.5.tar.gz.asc 195 BLAKE2B 9ca9034afc39299c2178190412b188f561d274d8e38d58a988487f2db14a8135840acf3413096d26f080358b69779fa3b48e292670ba6b23ae4eb0c05f9df614 SHA512 b384f48b2fd459a51715c8ab2a14e540c5fa7f7f12453282db770893d6121b1b3c9809e667ccacaf910fd90548abeb700a2c717d76fbea22fe3d6a22aa6b2c44 DIST rsync-3.2.6.tar.gz 1138593 BLAKE2B fa0c4aa9cdffbc9ffd4f81e8c3cdc1fda7080f80c1923084c6d705e6872caaba31c13de4603c9462f312dbbdae76520c27d3f4f40b327f1e66c7127b1d05ea73 SHA512 d141d04732c91e055708e8d1f14b976f9483208a93076bb66dc75cbf87d54f2dcbffc11423f0c9c005d2d4e20cb9c147a7672f7a9c0b987f4e2c39b4c3645cfe DIST rsync-3.2.6.tar.gz.asc 195 BLAKE2B 945c60ca67aa4234bc9d5b38c9228125f3040bccecf60c08892286c1b4fa32878d92bfc78ee664d4f6453ccaaf6d394dbe203f0a8be149e557fabede1c111b07 SHA512 1316b358dfa87ad7c35b2b5d11e0be111a182041150cf9c9ae30f73e0af1430a59136250dc853f784e9e80d0ee20cc46e9a34b07cc7c7a48040db168a8c8941b +DIST rsync-3.2.7pre1.tar.gz 1146970 BLAKE2B a41ef2acdff2b4e6703beb47b6ac90ec40d56bb53492b0a7aba268ebaf4e6bc19a7bde8fbac1ae35ed9062f2d37dd9a5ef0dd17ce8f78a0dab9f184959fd2ce5 SHA512 98eac7e0734e7dc8874fa51265419b40431b9bdc1861a16f8ccec6aa2b42df86532fb7585c19f2c814ad2e71ebf420414120cef434c6712279e453b14fd853f9 +DIST rsync-3.2.7pre1.tar.gz.asc 195 BLAKE2B bb497c19f53e7b465771425c4ee20582b46ea8af652232a58602d8e007fa4a10a237303e46ef22e78432606e95462161930de200b064ab1d2addcadc9dceae50 SHA512 6fb46e8b3a510dd7602003d6ced6d8cda57e5e2c8df4e1f2036c169e51fe21b460b6e6a42fc1c9c8fdc31c37d9992c287d64f529e019d629f35b4a43ab1eb1d8 diff --git a/net-misc/rsync/rsync-3.2.7_pre1.ebuild b/net-misc/rsync/rsync-3.2.7_pre1.ebuild new file mode 100644 index ..804909ae11e6 --- /dev/null +++ b/net-misc/rsync/rsync-3.2.7_pre1.ebuild @@ -0,0 +1,167 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# Uncomment when introducing a patch which touches configure +#RSYNC_NEEDS_AUTOCONF=1 +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} == * ]] ; 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 [[ -n ${RSYNC_NEEDS_AUTOCONF} ]] ; then + inherit autotools + fi + + if [[ ${PV} == *_pre* ]] ; then + SRC_DIR="src-previews" + else + SRC_DIR="src" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~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} == * ]] ; 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 + # - needs commonmark at build time +
[gentoo-commits] repo/gentoo:master commit in: net-misc/rsync/
commit: b1a245c7eebb053d90d08078ec96e009af51 Author: Sam James gentoo org> AuthorDate: Sat Sep 10 04:44:46 2022 + Commit: Sam James gentoo org> CommitDate: Sat Sep 10 04:44:55 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b1a245c7 net-misc/rsync: add 3.2.6 Bug: https://bugs.gentoo.org/862876 Signed-off-by: Sam James gentoo.org> net-misc/rsync/Manifest | 2 + net-misc/rsync/rsync-3.2.6.ebuild | 167 ++ 2 files changed, 169 insertions(+) diff --git a/net-misc/rsync/Manifest b/net-misc/rsync/Manifest index ecac5e460ceb..5503dee54155 100644 --- a/net-misc/rsync/Manifest +++ b/net-misc/rsync/Manifest @@ -2,3 +2,5 @@ DIST rsync-3.2.4.tar.gz 1114853 BLAKE2B a67fcb9619874f1c5346a876138e59f4bf508a90 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.6.tar.gz 1138593 BLAKE2B fa0c4aa9cdffbc9ffd4f81e8c3cdc1fda7080f80c1923084c6d705e6872caaba31c13de4603c9462f312dbbdae76520c27d3f4f40b327f1e66c7127b1d05ea73 SHA512 d141d04732c91e055708e8d1f14b976f9483208a93076bb66dc75cbf87d54f2dcbffc11423f0c9c005d2d4e20cb9c147a7672f7a9c0b987f4e2c39b4c3645cfe +DIST rsync-3.2.6.tar.gz.asc 195 BLAKE2B 945c60ca67aa4234bc9d5b38c9228125f3040bccecf60c08892286c1b4fa32878d92bfc78ee664d4f6453ccaaf6d394dbe203f0a8be149e557fabede1c111b07 SHA512 1316b358dfa87ad7c35b2b5d11e0be111a182041150cf9c9ae30f73e0af1430a59136250dc853f784e9e80d0ee20cc46e9a34b07cc7c7a48040db168a8c8941b diff --git a/net-misc/rsync/rsync-3.2.6.ebuild b/net-misc/rsync/rsync-3.2.6.ebuild new file mode 100644 index ..804909ae11e6 --- /dev/null +++ b/net-misc/rsync/rsync-3.2.6.ebuild @@ -0,0 +1,167 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# Uncomment when introducing a patch which touches configure +#RSYNC_NEEDS_AUTOCONF=1 +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} == * ]] ; 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 [[ -n ${RSYNC_NEEDS_AUTOCONF} ]] ; then + inherit autotools + fi + + if [[ ${PV} == *_pre* ]] ; then + SRC_DIR="src-previews" + else + SRC_DIR="src" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~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} == * ]] ; 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 + # - needs commonmark at build tim
[gentoo-commits] repo/gentoo:master commit in: net-misc/rsync/, net-misc/rsync/files/
commit: d2adbf791493b27c42120df242478d5e3b35a9cc Author: Sam James gentoo org> AuthorDate: Wed Sep 7 22:51:23 2022 + Commit: Sam James gentoo org> CommitDate: Wed Sep 7 22:51:29 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d2adbf79 net-misc/rsync: fix build w/ clang 15 Signed-off-by: Sam James gentoo.org> .../rsync/files/rsync-3.2.5-pedantic-errors.patch | 53 ++ net-misc/rsync/rsync-3.2.5-r1.ebuild | 12 - net-misc/rsync/rsync-.ebuild | 8 +++- 3 files changed, 71 insertions(+), 2 deletions(-) diff --git a/net-misc/rsync/files/rsync-3.2.5-pedantic-errors.patch b/net-misc/rsync/files/rsync-3.2.5-pedantic-errors.patch new file mode 100644 index ..33afbd954a12 --- /dev/null +++ b/net-misc/rsync/files/rsync-3.2.5-pedantic-errors.patch @@ -0,0 +1,53 @@ +https://github.com/WayneD/rsync/commit/9a3449a3980421f84ac55498ba565bc112b20d6c + +In particular, avoids attr configure test failing. + +From 9a3449a3980421f84ac55498ba565bc112b20d6c Mon Sep 17 00:00:00 2001 +From: Wayne Davison +Date: Thu, 18 Aug 2022 17:33:54 -0700 +Subject: [PATCH] Stop enabling -pedantic-errors. + +--- a/configure.ac b/configure.ac +@@ -1071,21 +1071,6 @@ elif test x"$ac_cv_header_popt_h" != x"yes"; then + with_included_popt=yes + fi + +-if test x"$GCC" = x"yes"; then +-if test x"$with_included_popt" != x"yes"; then +- # Turn pedantic warnings into errors to ensure an array-init overflow is an error. +- CFLAGS="$CFLAGS -pedantic-errors" +-else +- # Our internal popt code cannot be compiled with pedantic warnings as errors, so try to +- # turn off pedantic warnings (which will not lose the error for array-init overflow). +- # Older gcc versions don't understand -Wno-pedantic, so check if --help=warnings lists +- # -Wpedantic and use that as a flag. +- case `$CC --help=warnings 2>/dev/null | grep Wpedantic` in +- *-Wpedantic*) CFLAGS="$CFLAGS -pedantic-errors -Wno-pedantic" ;; +- esac +-fi +-fi +- + AC_MSG_CHECKING([whether to use included libpopt]) + if test x"$with_included_popt" = x"yes"; then + AC_MSG_RESULT($srcdir/popt) + +--- a/configure.sh b/configure.sh +@@ -9982,14 +9982,14 @@ fi + if test x"$GCC" = x"yes"; then + if test x"$with_included_popt" != x"yes"; then + # Turn pedantic warnings into errors to ensure an array-init overflow is an error. +- CFLAGS="$CFLAGS -pedantic-errors" ++ CFLAGS="$CFLAGS " + else + # Our internal popt code cannot be compiled with pedantic warnings as errors, so try to + # turn off pedantic warnings (which will not lose the error for array-init overflow). + # Older gcc versions don't understand -Wno-pedantic, so check if --help=warnings lists + # -Wpedantic and use that as a flag. + case `$CC --help=warnings 2>/dev/null | grep Wpedantic` in +- *-Wpedantic*) CFLAGS="$CFLAGS -pedantic-errors -Wno-pedantic" ;; ++ *-Wpedantic*) CFLAGS="$CFLAGS -Wno-pedantic" ;; + esac + fi + fi diff --git a/net-misc/rsync/rsync-3.2.5-r1.ebuild b/net-misc/rsync/rsync-3.2.5-r1.ebuild index 1abfebf444ed..6e6e4bd34c3e 100644 --- a/net-misc/rsync/rsync-3.2.5-r1.ebuild +++ b/net-misc/rsync/rsync-3.2.5-r1.ebuild @@ -3,6 +3,8 @@ EAPI=8 +# Uncomment when introducing a patch which touches configure +RSYNC_NEEDS_AUTOCONF=1 PYTHON_COMPAT=( python3_{8..10} ) inherit prefix python-single-r1 systemd @@ -17,6 +19,10 @@ else VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/waynedavison.asc inherit verify-sig + if [[ -n ${RSYNC_NEEDS_AUTOCONF} ]] ; then + inherit autotools + fi + if [[ ${PV} == *_pre* ]] ; then SRC_DIR="src-previews" else @@ -60,6 +66,10 @@ else BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-waynedavison )" fi +PATCHES=( + "${FILESDIR}"/${P}-pedantic-errors.patch +) + pkg_setup() { # - USE=examples needs Python itself at runtime, but nothing else # - needs commonmark at build time @@ -71,7 +81,7 @@ pkg_setup() { src_prepare() { default - if [[ ${PV} == * ]] ; then + if [[ ${PV} == * || -n ${RSYNC_NEEDS_AUTOCONF} ]] ; then eaclocal -I m4 eautoconf -o configure.sh eautoheader && touch config.h.in diff --git a/net-misc/rsync/rsync-.ebuild b/net-misc/rsync/rsync-.ebuild index 1abfebf444ed..804909ae11e6 100644 --- a/net-misc/rsync/rsync-.ebuild +++ b/net-misc/rsync/rsync-.ebuild @@ -3,6 +3,8 @@ EAPI=8 +# Uncomment when introducing a patch which touches configure +#RSYNC_NEEDS_AUTOCONF=1 PYTHON_COMPAT=( python3_{8..10} ) inherit prefix python-single-r1 systemd @@ -17,6 +19,10 @@ else VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/waynedavison.asc inherit verify-
[gentoo-commits] repo/gentoo:master commit in: net-misc/rsync/
commit: f39e6672bad75fc2102acb04b99cbcb0a9b3fb05 Author: WANG Xuerui gentoo org> AuthorDate: Sun Aug 28 06:57:17 2022 + Commit: WANG Xuerui gentoo org> CommitDate: Sun Aug 28 07:41:20 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f39e6672 net-misc/rsync: forward ~loong Signed-off-by: WANG Xuerui gentoo.org> net-misc/rsync/rsync-.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net-misc/rsync/rsync-.ebuild b/net-misc/rsync/rsync-.ebuild index 5e5ba3f5fabb..1abfebf444ed 100644 --- a/net-misc/rsync/rsync-.ebuild +++ b/net-misc/rsync/rsync-.ebuild @@ -21,7 +21,7 @@ else 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" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~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
[gentoo-commits] repo/gentoo:master commit in: net-misc/rsync/
commit: ebad0007ed8529887e988df25af4c0c82202ef0d Author: WANG Xuerui gentoo org> AuthorDate: Sun Aug 28 06:56:52 2022 + Commit: WANG Xuerui gentoo org> CommitDate: Sun Aug 28 07:41:19 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ebad0007 net-misc/rsync: keyword 3.2.5-r1 for ~loong Signed-off-by: WANG Xuerui gentoo.org> net-misc/rsync/rsync-3.2.5-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net-misc/rsync/rsync-3.2.5-r1.ebuild b/net-misc/rsync/rsync-3.2.5-r1.ebuild index 5e5ba3f5fabb..1abfebf444ed 100644 --- a/net-misc/rsync/rsync-3.2.5-r1.ebuild +++ b/net-misc/rsync/rsync-3.2.5-r1.ebuild @@ -21,7 +21,7 @@ else 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" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~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
[gentoo-commits] repo/gentoo:master commit in: net-misc/rsync-bpc/
commit: 7a13d7b0b62fb8fba53b9ea3e572eb82a4f90f7f Author: Joonas Niilola gentoo org> AuthorDate: Tue Aug 16 06:29:02 2022 + Commit: Joonas Niilola gentoo org> CommitDate: Tue Aug 16 06:34:41 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7a13d7b0 net-misc/rsync-bpc: Stabilize 3.1.3.0 x86, #865335 Signed-off-by: Joonas Niilola gentoo.org> net-misc/rsync-bpc/rsync-bpc-3.1.3.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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..a30163269ea3 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}"
[gentoo-commits] repo/gentoo:master commit in: net-misc/rsync-bpc/
commit: 6f60a363283eb62f04769c229f3328911571dbab Author: Joonas Niilola gentoo org> AuthorDate: Tue Aug 16 06:34:19 2022 + Commit: Joonas Niilola gentoo org> CommitDate: Tue Aug 16 06:34:42 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6f60a363 net-misc/rsync-bpc: Stabilize 3.1.3.0 amd64, #865335 Signed-off-by: Joonas Niilola gentoo.org> net-misc/rsync-bpc/rsync-bpc-3.1.3.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 a30163269ea3..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}"
[gentoo-commits] repo/gentoo:master commit in: net-misc/rsync/
commit: 96043fa182bc97c901ba3da8149e2b30abb93319 Author: Sam James gentoo org> AuthorDate: Tue Aug 16 00:49:23 2022 + Commit: Sam James gentoo org> CommitDate: Tue Aug 16 00:49:43 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=96043fa1 net-misc/rsync: tighten xxhash dep (>= 0.8), add missing slot dep operators Signed-off-by: Sam James gentoo.org> .../rsync/{rsync-3.2.5.ebuild => rsync-3.2.5-r1.ebuild} | 15 --- net-misc/rsync/rsync-.ebuild | 15 --- 2 files changed, 16 insertions(+), 14 deletions(-) diff --git a/net-misc/rsync/rsync-3.2.5.ebuild b/net-misc/rsync/rsync-3.2.5-r1.ebuild similarity index 95% rename from net-misc/rsync/rsync-3.2.5.ebuild rename to net-misc/rsync/rsync-3.2.5-r1.ebuild index ab9d689fb713..5e5ba3f5fabb 100644 --- a/net-misc/rsync/rsync-3.2.5.ebuild +++ b/net-misc/rsync/rsync-3.2.5-r1.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} )" diff --git a/net-misc/rsync/rsync-.ebuild b/net-misc/rsync/rsync-.ebuild index ab9d689fb713..5e5ba3f5fabb 100644 --- a/net-misc/rsync/rsync-.ebuild +++ b/net-misc/rsync/rsync-.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} )"
[gentoo-commits] repo/gentoo:master commit in: net-misc/rsync/
commit: 1c3bbbf6d7dee9d7916d0a72030694ffed58517c Author: Sam James gentoo org> AuthorDate: Mon Aug 15 18:02:04 2022 + Commit: Sam James gentoo org> CommitDate: Mon Aug 15 18:19:46 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1c3bbbf6 net-misc/rsync: drop obsolete IPv6 quirk for musl Closes: https://bugs.gentoo.org/779988 Signed-off-by: Sam James gentoo.org> net-misc/rsync/rsync-3.2.5.ebuild | 4 net-misc/rsync/rsync-.ebuild | 4 2 files changed, 8 deletions(-) diff --git a/net-misc/rsync/rsync-3.2.5.ebuild b/net-misc/rsync/rsync-3.2.5.ebuild index b98126e7a197..ab9d689fb713 100644 --- a/net-misc/rsync/rsync-3.2.5.ebuild +++ b/net-misc/rsync/rsync-3.2.5.ebuild @@ -78,10 +78,6 @@ src_prepare() { } src_configure() { - # Force enable IPv6 on musl - upstream bug: - # https://bugzilla.samba.org/show_bug.cgi?id=10715 - use elibc_musl && append-cppflags -DINET6 - local myeconfargs=( --with-rsyncd-conf="${EPREFIX}"/etc/rsyncd.conf --without-included-popt diff --git a/net-misc/rsync/rsync-.ebuild b/net-misc/rsync/rsync-.ebuild index b98126e7a197..ab9d689fb713 100644 --- a/net-misc/rsync/rsync-.ebuild +++ b/net-misc/rsync/rsync-.ebuild @@ -78,10 +78,6 @@ src_prepare() { } src_configure() { - # Force enable IPv6 on musl - upstream bug: - # https://bugzilla.samba.org/show_bug.cgi?id=10715 - use elibc_musl && append-cppflags -DINET6 - local myeconfargs=( --with-rsyncd-conf="${EPREFIX}"/etc/rsyncd.conf --without-included-popt
[gentoo-commits] repo/gentoo:master commit in: net-misc/rsync/
commit: 14b1779c784b2966171ca83ba5ccac45ba225dc7 Author: Sam James gentoo org> AuthorDate: Sun Aug 14 21:58:24 2022 + Commit: Sam James gentoo org> CommitDate: Sun Aug 14 21:58:33 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=14b1779c net-misc/rsync: keep IPv6 hack for musl Signed-off-by: Sam James gentoo.org> net-misc/rsync/rsync-3.2.5.ebuild | 6 +- net-misc/rsync/rsync-.ebuild | 6 +- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/net-misc/rsync/rsync-3.2.5.ebuild b/net-misc/rsync/rsync-3.2.5.ebuild index 21f955efb05e..b98126e7a197 100644 --- a/net-misc/rsync/rsync-3.2.5.ebuild +++ b/net-misc/rsync/rsync-3.2.5.ebuild @@ -4,7 +4,7 @@ EAPI=8 PYTHON_COMPAT=( python3_{8..10} ) -inherit prefix python-single-r1 systemd +inherit flag-o-matic prefix python-single-r1 systemd DESCRIPTION="File transfer program to keep remote files into sync" HOMEPAGE="https://rsync.samba.org/"; @@ -78,6 +78,10 @@ src_prepare() { } src_configure() { + # Force enable IPv6 on musl - upstream bug: + # https://bugzilla.samba.org/show_bug.cgi?id=10715 + use elibc_musl && append-cppflags -DINET6 + local myeconfargs=( --with-rsyncd-conf="${EPREFIX}"/etc/rsyncd.conf --without-included-popt diff --git a/net-misc/rsync/rsync-.ebuild b/net-misc/rsync/rsync-.ebuild index 21f955efb05e..b98126e7a197 100644 --- a/net-misc/rsync/rsync-.ebuild +++ b/net-misc/rsync/rsync-.ebuild @@ -4,7 +4,7 @@ EAPI=8 PYTHON_COMPAT=( python3_{8..10} ) -inherit prefix python-single-r1 systemd +inherit flag-o-matic prefix python-single-r1 systemd DESCRIPTION="File transfer program to keep remote files into sync" HOMEPAGE="https://rsync.samba.org/"; @@ -78,6 +78,10 @@ src_prepare() { } src_configure() { + # Force enable IPv6 on musl - upstream bug: + # https://bugzilla.samba.org/show_bug.cgi?id=10715 + use elibc_musl && append-cppflags -DINET6 + local myeconfargs=( --with-rsyncd-conf="${EPREFIX}"/etc/rsyncd.conf --without-included-popt
[gentoo-commits] repo/gentoo:master commit in: net-misc/rsync/
commit: 321e098f7ea44932bef2bc1626615942dba4221f Author: Sam James gentoo org> AuthorDate: Sun Aug 14 19:52:10 2022 + Commit: Sam James gentoo org> CommitDate: Sun Aug 14 19:52:10 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=321e098f net-misc/rsync: fix UnusedInherits Signed-off-by: Sam James gentoo.org> net-misc/rsync/rsync-3.2.5.ebuild | 2 +- net-misc/rsync/rsync-.ebuild | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/net-misc/rsync/rsync-3.2.5.ebuild b/net-misc/rsync/rsync-3.2.5.ebuild index ab9d689fb713..21f955efb05e 100644 --- a/net-misc/rsync/rsync-3.2.5.ebuild +++ b/net-misc/rsync/rsync-3.2.5.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/"; diff --git a/net-misc/rsync/rsync-.ebuild b/net-misc/rsync/rsync-.ebuild index ab9d689fb713..21f955efb05e 100644 --- a/net-misc/rsync/rsync-.ebuild +++ b/net-misc/rsync/rsync-.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/";
[gentoo-commits] repo/gentoo:master commit in: net-misc/rsync/
commit: 4e5ed953755580feb167672fb76923f1980d3a9e Author: Sam James gentoo org> AuthorDate: Sun Aug 14 19:44:11 2022 + Commit: Sam James gentoo org> CommitDate: Sun Aug 14 19:49:09 2022 + 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 gentoo.org> net-misc/rsync/Manifest | 2 ++ net-misc/rsync/{rsync-.ebuild => rsync-3.2.5.ebuild} | 12 net-misc/rsync/rsync-.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 714eed7026f17131a8cbc13fa3f79e0fba52087b23ef84dbe45a5d84a23610d365ac9cd1e7494287a863b7c1bf8ee296fb80b4d4d592ec79d2237cc005e4 SHA512 9ddfa092155f6c07e9617000ba55c36a2521cc9a9f30f376e89dde2de7bc25270fa348c0622a2a27c68f69bbdae20c75d99d8a75ce446ff490acb236bf5f9b58 DIST rsync-3.2.5pre2.tar.gz 1127513 BLAKE2B efad3981877809493a96a15f1bec6920a3b975c2d100b5c292800d6fe3aa78e84df601be7eb6fdf51a720ef7d6d96aa648589151bbd238ad1f60ca04f003dda6 SHA512 0e576d074fedefacaaf86d1a7e90b8c77db365f3994d2362d5e6b738cf8362ce2f113dcc2acd76b6635db589492b64ad7a1649ae5cbdb4faec5cde03de6e6faf diff --git a/net-misc/rsync/rsync-.ebuild b/net-misc/rsync/rsync-3.2.5.ebuild similarity index 93% copy from net-misc/rsync/rsync-.ebuild copy to net-misc/rsync/rsync-3.2.5.ebuild index d172d6ec7259..ab9d689fb713 100644 --- a/net-misc/rsync/rsync-.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-.ebuild b/net-misc/rsync/rsync-.ebuild index d172d6ec7259..ab9d689fb713 100644 --- a/net-misc/rsync/rsync-.ebuild +++ b/net-misc/rsync/rsync-.ebuild @@ -1,9 +1,9 @@ # Copyright 1999-2022 Gentoo Aut
[gentoo-commits] repo/gentoo:master commit in: net-misc/rsync/
commit: 8bf24582363286b4330b5bb0fcacb1dd6f4dce93 Author: Sam James gentoo org> AuthorDate: Sun Aug 14 19:47:19 2022 + Commit: Sam James gentoo org> CommitDate: Sun Aug 14 19:49:15 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8bf24582 net-misc/rsync: drop 3.2.5_pre1, 3.2.5_pre2 Bug: https://bugs.gentoo.org/862876 Signed-off-by: Sam James gentoo.org> net-misc/rsync/Manifest| 4 - net-misc/rsync/rsync-3.2.5_pre1.ebuild | 164 - net-misc/rsync/rsync-3.2.5_pre2.ebuild | 164 - 3 files changed, 332 deletions(-) diff --git a/net-misc/rsync/Manifest b/net-misc/rsync/Manifest index c93d6bb16857..ecac5e460ceb 100644 --- a/net-misc/rsync/Manifest +++ b/net-misc/rsync/Manifest @@ -2,7 +2,3 @@ DIST rsync-3.2.4.tar.gz 1114853 BLAKE2B a67fcb9619874f1c5346a876138e59f4bf508a90 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 714eed7026f17131a8cbc13fa3f79e0fba52087b23ef84dbe45a5d84a23610d365ac9cd1e7494287a863b7c1bf8ee296fb80b4d4d592ec79d2237cc005e4 SHA512 9ddfa092155f6c07e9617000ba55c36a2521cc9a9f30f376e89dde2de7bc25270fa348c0622a2a27c68f69bbdae20c75d99d8a75ce446ff490acb236bf5f9b58 -DIST rsync-3.2.5pre2.tar.gz 1127513 BLAKE2B efad3981877809493a96a15f1bec6920a3b975c2d100b5c292800d6fe3aa78e84df601be7eb6fdf51a720ef7d6d96aa648589151bbd238ad1f60ca04f003dda6 SHA512 0e576d074fedefacaaf86d1a7e90b8c77db365f3994d2362d5e6b738cf8362ce2f113dcc2acd76b6635db589492b64ad7a1649ae5cbdb4faec5cde03de6e6faf -DIST rsync-3.2.5pre2.tar.gz.asc 195 BLAKE2B 80ca72083189d978ea993f581de6776488202763a1b3bc6a777d97cecec38a964df2b8b485472f833828370d314c038b4266e9272faf4f19c4f85b28191647ab SHA512 08d14a0e938e27bae7f6302cf1c4f4c1c0bd309cb5c27e341ef7ca2ca07b0536efd853c91bd59cdca78ac4324e239e660211ec7f0daefe7ab1c58a728e73 diff --git a/net-misc/rsync/rsync-3.2.5_pre1.ebuild b/net-misc/rsync/rsync-3.2.5_pre1.ebuild deleted file mode 100644 index f5a0cad3ef74.. --- a/net-misc/rsync/rsync-3.2.5_pre1.ebuild +++ /dev/null @@ -1,164 +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} == * ]] ; 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 ipv6 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 ) - zst
[gentoo-commits] repo/gentoo:master commit in: net-misc/rsync/
commit: 9af26cceb3409642d295a569c3b090f2fb9f9c92 Author: Sam James gentoo org> AuthorDate: Fri Aug 12 15:36:16 2022 + Commit: Sam James gentoo org> CommitDate: Fri Aug 12 15:37:54 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9af26cce net-misc/rsync: add 3.2.5_pre2 (unkeyworded) Bug: https://bugs.gentoo.org/862876 Signed-off-by: Sam James gentoo.org> net-misc/rsync/Manifest| 2 + net-misc/rsync/rsync-3.2.5_pre2.ebuild | 164 + 2 files changed, 166 insertions(+) diff --git a/net-misc/rsync/Manifest b/net-misc/rsync/Manifest index 36341f1776a5..aaab9bd8b140 100644 --- a/net-misc/rsync/Manifest +++ b/net-misc/rsync/Manifest @@ -2,3 +2,5 @@ DIST rsync-3.2.4.tar.gz 1114853 BLAKE2B a67fcb9619874f1c5346a876138e59f4bf508a90 DIST rsync-3.2.4.tar.gz.asc 195 BLAKE2B 9bc2fbd59e5396a91de82f27a461367ad2a129820e2d1926c3b1e26dacf93c676a7231f186c341b6dec9c764a9619b504bc9b5f95925982e78de4607eddf6c65 SHA512 7e1bbebc777d5710345fdec1efd4c2ef1079d6c0ec90272a1a4a51a59ae3cb619b9d1c0ae2f337ecdd06827bb3536b969b6f21f9108f8d21114713aa1750012b DIST rsync-3.2.5pre1.tar.gz 1126641 BLAKE2B 14ffa62305d3e842a89992d9d47e79a8efec5744b297a16dbe6d3440c26b10ac200927ca0f4b6fd1d83e705b56fb6ee9cdedc048dd7e8d6ccf92932e462e9159 SHA512 fe3126ba617b1e4dfb0de845dc1438be8aff07d51d70c0b232e6f0d1efba808d0fb42a30ed39fdb3303c489ef85e0761e188d4ed5fa9d6145cb749c7d11b3fb5 DIST rsync-3.2.5pre1.tar.gz.asc 195 BLAKE2B 714eed7026f17131a8cbc13fa3f79e0fba52087b23ef84dbe45a5d84a23610d365ac9cd1e7494287a863b7c1bf8ee296fb80b4d4d592ec79d2237cc005e4 SHA512 9ddfa092155f6c07e9617000ba55c36a2521cc9a9f30f376e89dde2de7bc25270fa348c0622a2a27c68f69bbdae20c75d99d8a75ce446ff490acb236bf5f9b58 +DIST rsync-3.2.5pre2.tar.gz 1127513 BLAKE2B efad3981877809493a96a15f1bec6920a3b975c2d100b5c292800d6fe3aa78e84df601be7eb6fdf51a720ef7d6d96aa648589151bbd238ad1f60ca04f003dda6 SHA512 0e576d074fedefacaaf86d1a7e90b8c77db365f3994d2362d5e6b738cf8362ce2f113dcc2acd76b6635db589492b64ad7a1649ae5cbdb4faec5cde03de6e6faf +DIST rsync-3.2.5pre2.tar.gz.asc 195 BLAKE2B 80ca72083189d978ea993f581de6776488202763a1b3bc6a777d97cecec38a964df2b8b485472f833828370d314c038b4266e9272faf4f19c4f85b28191647ab SHA512 08d14a0e938e27bae7f6302cf1c4f4c1c0bd309cb5c27e341ef7ca2ca07b0536efd853c91bd59cdca78ac4324e239e660211ec7f0daefe7ab1c58a728e73 diff --git a/net-misc/rsync/rsync-3.2.5_pre2.ebuild b/net-misc/rsync/rsync-3.2.5_pre2.ebuild new file mode 100644 index ..f5a0cad3ef74 --- /dev/null +++ b/net-misc/rsync/rsync-3.2.5_pre2.ebuild @@ -0,0 +1,164 @@ +# 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} == * ]] ; 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 ipv6 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} == * ]] ; 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 + # - needs commonmark at build time + if [[ ${PV} == * ]] || use examples ; then + python-single-r1_pkg_setup + fi +} + +src_prepare() { +
[gentoo-commits] repo/gentoo:master commit in: net-misc/rsync/
commit: 85155265903a3db773bb84edabf4a427836eb34a Author: Sam James gentoo org> AuthorDate: Tue Aug 2 02:56:24 2022 + Commit: Sam James gentoo org> CommitDate: Tue Aug 2 02:56:34 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=85155265 net-misc/rsync: add 3.2.5_pre1 (unkeyworded) Note that upstream are particularly interested in feedback on the new security hardening and whether it breaks any options, so please report any issues upstream if you hit them. Bug: https://bugs.gentoo.org/862876 Signed-off-by: Sam James gentoo.org> net-misc/rsync/Manifest| 2 + net-misc/rsync/rsync-3.2.5_pre1.ebuild | 164 + 2 files changed, 166 insertions(+) diff --git a/net-misc/rsync/Manifest b/net-misc/rsync/Manifest index dd8526885384..36341f1776a5 100644 --- a/net-misc/rsync/Manifest +++ b/net-misc/rsync/Manifest @@ -1,2 +1,4 @@ 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.5pre1.tar.gz 1126641 BLAKE2B 14ffa62305d3e842a89992d9d47e79a8efec5744b297a16dbe6d3440c26b10ac200927ca0f4b6fd1d83e705b56fb6ee9cdedc048dd7e8d6ccf92932e462e9159 SHA512 fe3126ba617b1e4dfb0de845dc1438be8aff07d51d70c0b232e6f0d1efba808d0fb42a30ed39fdb3303c489ef85e0761e188d4ed5fa9d6145cb749c7d11b3fb5 +DIST rsync-3.2.5pre1.tar.gz.asc 195 BLAKE2B 714eed7026f17131a8cbc13fa3f79e0fba52087b23ef84dbe45a5d84a23610d365ac9cd1e7494287a863b7c1bf8ee296fb80b4d4d592ec79d2237cc005e4 SHA512 9ddfa092155f6c07e9617000ba55c36a2521cc9a9f30f376e89dde2de7bc25270fa348c0622a2a27c68f69bbdae20c75d99d8a75ce446ff490acb236bf5f9b58 diff --git a/net-misc/rsync/rsync-3.2.5_pre1.ebuild b/net-misc/rsync/rsync-3.2.5_pre1.ebuild new file mode 100644 index ..f5a0cad3ef74 --- /dev/null +++ b/net-misc/rsync/rsync-3.2.5_pre1.ebuild @@ -0,0 +1,164 @@ +# 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} == * ]] ; 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 ipv6 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} == * ]] ; 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 + # - needs commonmark at build time + if [[ ${PV} == * ]] || use examples ; then + python-single-r1_pkg_setup + fi +} + +src_prepare() { + default + + if [[ ${PV} == * ]] ; then + eaclocal -I m4 + eautoconf -o configure.sh + eautoheader && touch config.h.in + fi +} + +src_configure() { + #
[gentoo-commits] repo/gentoo:master commit in: net-misc/rsync/
commit: c33c0ddefcd860e2536e38547d05060ad6f72f4b Author: Arthur Zamarin gentoo org> AuthorDate: Wed Jul 6 06:23:37 2022 + Commit: Arthur Zamarin gentoo org> CommitDate: Wed Jul 6 06:23:37 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c33c0dde net-misc/rsync: Stabilize 3.2.4-r3 hppa, #856019 Signed-off-by: Arthur Zamarin gentoo.org> net-misc/rsync/rsync-3.2.4-r3.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net-misc/rsync/rsync-3.2.4-r3.ebuild b/net-misc/rsync/rsync-3.2.4-r3.ebuild index 912188ce3bd7..41447f110e95 100644 --- a/net-misc/rsync/rsync-3.2.4-r3.ebuild +++ b/net-misc/rsync/rsync-3.2.4-r3.ebuild @@ -28,7 +28,7 @@ else SRC_DIR="src-previews" else SRC_DIR="src" - KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~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" + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~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
[gentoo-commits] repo/gentoo:master commit in: net-misc/rsync/
commit: 2e9e0f3273f8289839752e954528c0eb65eb76d4 Author: Agostino Sarubbo gentoo org> AuthorDate: Sun Jul 3 10:52:03 2022 + Commit: Agostino Sarubbo gentoo org> CommitDate: Sun Jul 3 10:52:03 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2e9e0f32 net-misc/rsync: x86 stable wrt bug #856019 Package-Manager: Portage-3.0.30, Repoman-3.0.3 RepoMan-Options: --include-arches="x86" Signed-off-by: Agostino Sarubbo gentoo.org> net-misc/rsync/rsync-3.2.4-r3.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net-misc/rsync/rsync-3.2.4-r3.ebuild b/net-misc/rsync/rsync-3.2.4-r3.ebuild index 5fb0e445dcc1..912188ce3bd7 100644 --- a/net-misc/rsync/rsync-3.2.4-r3.ebuild +++ b/net-misc/rsync/rsync-3.2.4-r3.ebuild @@ -28,7 +28,7 @@ else SRC_DIR="src-previews" else SRC_DIR="src" - KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~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" + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~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
[gentoo-commits] repo/gentoo:master commit in: net-misc/rsync/
commit: 69ef19b17254ca1924499473693ee73606d6b1dd Author: Agostino Sarubbo gentoo org> AuthorDate: Sun Jul 3 10:50:09 2022 + Commit: Agostino Sarubbo gentoo org> CommitDate: Sun Jul 3 10:50:11 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=69ef19b1 net-misc/rsync: ppc64 stable wrt bug #856019 Package-Manager: Portage-3.0.30, Repoman-3.0.3 RepoMan-Options: --include-arches="ppc64" Signed-off-by: Agostino Sarubbo gentoo.org> net-misc/rsync/rsync-3.2.4-r3.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net-misc/rsync/rsync-3.2.4-r3.ebuild b/net-misc/rsync/rsync-3.2.4-r3.ebuild index f3608ff713eb..5fb0e445dcc1 100644 --- a/net-misc/rsync/rsync-3.2.4-r3.ebuild +++ b/net-misc/rsync/rsync-3.2.4-r3.ebuild @@ -28,7 +28,7 @@ else SRC_DIR="src-previews" else SRC_DIR="src" - KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~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" + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~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
[gentoo-commits] repo/gentoo:master commit in: net-misc/rsync/
commit: 9d54377d70be8d4ff3eef5b5d57eec42b315c533 Author: Agostino Sarubbo gentoo org> AuthorDate: Sun Jul 3 10:46:30 2022 + Commit: Agostino Sarubbo gentoo org> CommitDate: Sun Jul 3 10:48:09 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9d54377d net-misc/rsync: amd64 stable wrt bug #856019 Package-Manager: Portage-3.0.30, Repoman-3.0.3 RepoMan-Options: --include-arches="amd64" Signed-off-by: Agostino Sarubbo gentoo.org> net-misc/rsync/rsync-3.2.4-r3.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net-misc/rsync/rsync-3.2.4-r3.ebuild b/net-misc/rsync/rsync-3.2.4-r3.ebuild index 1171b62e3854..f3608ff713eb 100644 --- a/net-misc/rsync/rsync-3.2.4-r3.ebuild +++ b/net-misc/rsync/rsync-3.2.4-r3.ebuild @@ -28,7 +28,7 @@ else SRC_DIR="src-previews" else SRC_DIR="src" - KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~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" + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~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
[gentoo-commits] repo/gentoo:master commit in: net-misc/rsync/
commit: 753832e5ac742a216898f22e91aa77400b7eee0e Author: Agostino Sarubbo gentoo org> AuthorDate: Sun Jul 3 08:51:26 2022 + Commit: Agostino Sarubbo gentoo org> CommitDate: Sun Jul 3 08:51:26 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=753832e5 net-misc/rsync: sparc stable wrt bug #856019 Package-Manager: Portage-3.0.30, Repoman-3.0.3 RepoMan-Options: --include-arches="sparc" Signed-off-by: Agostino Sarubbo gentoo.org> net-misc/rsync/rsync-3.2.4-r3.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net-misc/rsync/rsync-3.2.4-r3.ebuild b/net-misc/rsync/rsync-3.2.4-r3.ebuild index 8777b0eb817a..1171b62e3854 100644 --- a/net-misc/rsync/rsync-3.2.4-r3.ebuild +++ b/net-misc/rsync/rsync-3.2.4-r3.ebuild @@ -28,7 +28,7 @@ else SRC_DIR="src-previews" else SRC_DIR="src" - KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~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" + KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~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
[gentoo-commits] repo/gentoo:master commit in: net-misc/rsync/
commit: 1c9f785755f62a5f7b46fbc654dc1ec7efd72e86 Author: Agostino Sarubbo gentoo org> AuthorDate: Sun Jul 3 08:50:04 2022 + Commit: Agostino Sarubbo gentoo org> CommitDate: Sun Jul 3 08:50:04 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1c9f7857 net-misc/rsync: ppc stable wrt bug #856019 Package-Manager: Portage-3.0.30, Repoman-3.0.3 RepoMan-Options: --include-arches="ppc" Signed-off-by: Agostino Sarubbo gentoo.org> net-misc/rsync/rsync-3.2.4-r3.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net-misc/rsync/rsync-3.2.4-r3.ebuild b/net-misc/rsync/rsync-3.2.4-r3.ebuild index dd9c8e4bdcbe..8777b0eb817a 100644 --- a/net-misc/rsync/rsync-3.2.4-r3.ebuild +++ b/net-misc/rsync/rsync-3.2.4-r3.ebuild @@ -28,7 +28,7 @@ else SRC_DIR="src-previews" else SRC_DIR="src" - KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~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" + KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~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
[gentoo-commits] repo/gentoo:master commit in: net-misc/rsync/
commit: d8d37e5e969d17ef419b3189b52459fa01ee0b72 Author: Agostino Sarubbo gentoo org> AuthorDate: Sun Jul 3 08:49:22 2022 + Commit: Agostino Sarubbo gentoo org> CommitDate: Sun Jul 3 08:49:22 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d8d37e5e net-misc/rsync: arm64 stable wrt bug #856019 Package-Manager: Portage-3.0.30, Repoman-3.0.3 RepoMan-Options: --include-arches="arm64" Signed-off-by: Agostino Sarubbo gentoo.org> net-misc/rsync/rsync-3.2.4-r3.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net-misc/rsync/rsync-3.2.4-r3.ebuild b/net-misc/rsync/rsync-3.2.4-r3.ebuild index a7ec4c9ac33a..dd9c8e4bdcbe 100644 --- a/net-misc/rsync/rsync-3.2.4-r3.ebuild +++ b/net-misc/rsync/rsync-3.2.4-r3.ebuild @@ -28,7 +28,7 @@ else SRC_DIR="src-previews" else SRC_DIR="src" - KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~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" + KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~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
[gentoo-commits] repo/gentoo:master commit in: net-misc/rsync/
commit: 65d77be4feadd8f11ea51ec55470ca56157e635e Author: Agostino Sarubbo gentoo org> AuthorDate: Sun Jul 3 08:48:23 2022 + Commit: Agostino Sarubbo gentoo org> CommitDate: Sun Jul 3 08:48:23 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=65d77be4 net-misc/rsync: arm stable wrt bug #856019 Package-Manager: Portage-3.0.30, Repoman-3.0.3 RepoMan-Options: --include-arches="arm" Signed-off-by: Agostino Sarubbo gentoo.org> net-misc/rsync/rsync-3.2.4-r3.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net-misc/rsync/rsync-3.2.4-r3.ebuild b/net-misc/rsync/rsync-3.2.4-r3.ebuild index d4fb6dbdd9a5..a7ec4c9ac33a 100644 --- a/net-misc/rsync/rsync-3.2.4-r3.ebuild +++ b/net-misc/rsync/rsync-3.2.4-r3.ebuild @@ -28,7 +28,7 @@ else SRC_DIR="src-previews" else SRC_DIR="src" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~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" + KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~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
[gentoo-commits] repo/gentoo:master commit in: net-misc/rsync/, net-misc/rsync/files/
commit: 2abd7603ecab79ebc5284d6bc56258ed490d2ff8 Author: orbea riseup net> AuthorDate: Sun Jun 19 21:31:46 2022 + Commit: Sam James gentoo org> CommitDate: Mon Jun 20 05:03:49 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2abd7603 net-misc/rsync: Fix implicit declaration build failure Upstream-issue: https://github.com/WayneD/rsync/issues/324 Upstream-commit: 3592ac3c025d ("Include bsd/strings.h if it exists") Signed-off-by: orbea riseup.net> Closes: https://github.com/gentoo/gentoo/pull/25982 Signed-off-by: Sam James gentoo.org> net-misc/rsync/files/rsync-3.2.4-strlcpy.patch | 46 +++ net-misc/rsync/rsync-3.2.4-r3.ebuild | 174 + 2 files changed, 220 insertions(+) diff --git a/net-misc/rsync/files/rsync-3.2.4-strlcpy.patch b/net-misc/rsync/files/rsync-3.2.4-strlcpy.patch new file mode 100644 index ..d5a02f0e3159 --- /dev/null +++ b/net-misc/rsync/files/rsync-3.2.4-strlcpy.patch @@ -0,0 +1,46 @@ +https://github.com/WayneD/rsync/issues/324 +https://github.com/WayneD/rsync/commit/3592ac3c025da23b2dd291561ec6113940b9c11b + +From 3592ac3c025da23b2dd291561ec6113940b9c11b Mon Sep 17 00:00:00 2001 +From: Wayne Davison +Date: Sun, 19 Jun 2022 10:02:51 -0700 +Subject: [PATCH] Include bsd/strings.h if it exists + +Some systems apparently put strlcpy() into a separate bsd/strings.h file +without putting the function into a separate library. Thus, configure +finds that the function exists for linking but the build does not have +the declaration (which rsync only supplies if it is also supplying its +own version of the function). +--- + configure.ac | 3 ++- + rsync.h | 3 +++ + 2 files changed, 5 insertions(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 37dbb18a..37241637 100644 +--- a/configure.ac b/configure.ac +@@ -13,7 +13,8 @@ AC_CHECK_HEADERS(sys/fcntl.h sys/select.h fcntl.h sys/time.h sys/unistd.h \ + netdb.h malloc.h float.h limits.h iconv.h libcharset.h langinfo.h mcheck.h \ + sys/acl.h acl/libacl.h attr/xattr.h sys/xattr.h sys/extattr.h dl.h \ + popt.h popt/popt.h linux/falloc.h netinet/in_systm.h netgroup.h \ +-zlib.h xxhash.h openssl/md4.h openssl/md5.h zstd.h lz4.h sys/file.h) ++zlib.h xxhash.h openssl/md4.h openssl/md5.h zstd.h lz4.h sys/file.h \ ++bsd/string.h) + AC_CHECK_HEADERS([netinet/ip.h], [], [], [[#include ]]) + AC_HEADER_MAJOR_FIXED + +diff --git a/rsync.h b/rsync.h +index e5aacd25..1cc037c5 100644 +--- a/rsync.h b/rsync.h +@@ -338,6 +338,9 @@ enum delret { + # endif + # include + #endif ++#ifdef HAVE_BSD_STRING_H ++# include ++#endif + #ifdef HAVE_STRINGS_H + # include + #endif diff --git a/net-misc/rsync/rsync-3.2.4-r3.ebuild b/net-misc/rsync/rsync-3.2.4-r3.ebuild new file mode 100644 index ..d4fb6dbdd9a5 --- /dev/null +++ b/net-misc/rsync/rsync-3.2.4-r3.ebuild @@ -0,0 +1,174 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +if [[ ${PV} != 3.2.4 ]]; then + # Make sure we revert the autotools hackery applied in 3.2.4. + die "Please use rsync-.ebuild as a basis for version bumps" +fi + +WANT_LIBTOOL=none + +PYTHON_COMPAT=( python3_{8..10} ) +inherit autotools 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} == * ]] ; 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 ~loong ~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 ipv6 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} == *
[gentoo-commits] repo/gentoo:master commit in: net-misc/rsync/, net-misc/rsync/files/
commit: d6951c6cf52d69f183a00b0f9b4dec5662d4661a Author: Sam James gentoo org> AuthorDate: Sat Jun 18 19:58:44 2022 + Commit: Sam James gentoo org> CommitDate: Sat Jun 18 20:18:55 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d6951c6c net-misc/rsync: backport unsigned char fix See: https://lists.samba.org/archive/rsync-announce/2022/000111.html Signed-off-by: Sam James gentoo.org> .../files/rsync-3.2.4-unsigned-char-checksum.patch | 12 ++ net-misc/rsync/rsync-3.2.4-r2.ebuild | 172 + 2 files changed, 184 insertions(+) diff --git a/net-misc/rsync/files/rsync-3.2.4-unsigned-char-checksum.patch b/net-misc/rsync/files/rsync-3.2.4-unsigned-char-checksum.patch new file mode 100644 index ..18e56c31ce2a --- /dev/null +++ b/net-misc/rsync/files/rsync-3.2.4-unsigned-char-checksum.patch @@ -0,0 +1,12 @@ +https://lists.samba.org/archive/rsync-announce/2022/000111.html +--- a/configure.ac b/configure.ac +@@ -1117,7 +1117,7 @@ else + fi + + AC_CACHE_CHECK([for unsigned char],rsync_cv_SIGNED_CHAR_OK,[ +-AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[signed char *s = ""]])],[rsync_cv_SIGNED_CHAR_OK=yes],[rsync_cv_SIGNED_CHAR_OK=no])]) ++AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[signed char *s = (signed char *)""]])],[rsync_cv_SIGNED_CHAR_OK=yes],[rsync_cv_SIGNED_CHAR_OK=no])]) + if test x"$rsync_cv_SIGNED_CHAR_OK" = x"yes"; then + AC_DEFINE(SIGNED_CHAR_OK, 1, [Define to 1 if "signed char" is a valid type]) + fi diff --git a/net-misc/rsync/rsync-3.2.4-r2.ebuild b/net-misc/rsync/rsync-3.2.4-r2.ebuild new file mode 100644 index ..87315dbcbd91 --- /dev/null +++ b/net-misc/rsync/rsync-3.2.4-r2.ebuild @@ -0,0 +1,172 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +if [[ ${PV} != 3.2.4 ]]; then + # Make sure we revert the autotools hackery applied in 3.2.4. + die "Please use rsync-.ebuild as a basis for version bumps" +fi + +WANT_LIBTOOL=none + +PYTHON_COMPAT=( python3_{8..10} ) +inherit autotools 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} == * ]] ; 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 ~loong ~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 ipv6 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} == * ]] ; then + BDEPEND+=" ${PYTHON_DEPS} + $(python_gen_cond_dep ' + dev-python/commonmark[${PYTHON_USEDEP}] + ')" +else + BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-waynedavison )" +fi + +PATCHES=( + "${FILESDIR}"/${P}-unsigned-char-checksum.patch +) + +pkg_setup() { + # - USE=examples needs Python itself at runtime, but nothing else + # - needs commonmark at build time + if [[ ${PV} == * ]] || use examples ; then + python-single-r1_pkg_setup + fi +} + +src_prepare() { + default + + eautoconf -o configure.sh + touch config.h.in || die +} + +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 + $(use_enable acl acl-support) + $(use_enable iconv) + $(use_enable ipv6) + $(use_enable lz4) +
[gentoo-commits] repo/gentoo:master commit in: net-misc/rsync/
commit: a633907b02d075491dd0a340fb84835fba8bafdf Author: Jakov Smolić gentoo org> AuthorDate: Thu Jun 2 07:31:28 2022 + Commit: Jakov Smolić gentoo org> CommitDate: Thu Jun 2 07:31:28 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a633907b net-misc/rsync: Stabilize 3.2.4-r1 hppa, #849155 Signed-off-by: Jakov Smolić gentoo.org> net-misc/rsync/rsync-3.2.4-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net-misc/rsync/rsync-3.2.4-r1.ebuild b/net-misc/rsync/rsync-3.2.4-r1.ebuild index 266acfaf1ecb..d569ca909ecd 100644 --- a/net-misc/rsync/rsync-3.2.4-r1.ebuild +++ b/net-misc/rsync/rsync-3.2.4-r1.ebuild @@ -21,7 +21,7 @@ else SRC_DIR="src-previews" else SRC_DIR="src" - KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~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" + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~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
[gentoo-commits] repo/gentoo:master commit in: net-misc/rsync/
commit: e4762decc82c17dee0b6bdb4266cebf642114fe9 Author: Jakov Smolić gentoo org> AuthorDate: Thu Jun 2 04:42:56 2022 + Commit: Jakov Smolić gentoo org> CommitDate: Thu Jun 2 04:42:56 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e4762dec net-misc/rsync: Stabilize 3.2.4-r1 arm64, #849155 Signed-off-by: Jakov Smolić gentoo.org> net-misc/rsync/rsync-3.2.4-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net-misc/rsync/rsync-3.2.4-r1.ebuild b/net-misc/rsync/rsync-3.2.4-r1.ebuild index a1010964ae26..266acfaf1ecb 100644 --- a/net-misc/rsync/rsync-3.2.4-r1.ebuild +++ b/net-misc/rsync/rsync-3.2.4-r1.ebuild @@ -21,7 +21,7 @@ else SRC_DIR="src-previews" else SRC_DIR="src" - KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~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" + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~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
[gentoo-commits] repo/gentoo:master commit in: net-misc/rsync/
commit: 973d403ccbb0338adf923720e60962b18d5f8a98 Author: Jakov Smolić gentoo org> AuthorDate: Thu Jun 2 04:30:18 2022 + Commit: Jakov Smolić gentoo org> CommitDate: Thu Jun 2 04:30:18 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=973d403c net-misc/rsync: Stabilize 3.2.4-r1 sparc, #849155 Signed-off-by: Jakov Smolić gentoo.org> net-misc/rsync/rsync-3.2.4-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net-misc/rsync/rsync-3.2.4-r1.ebuild b/net-misc/rsync/rsync-3.2.4-r1.ebuild index a56ae65cf5c3..a1010964ae26 100644 --- a/net-misc/rsync/rsync-3.2.4-r1.ebuild +++ b/net-misc/rsync/rsync-3.2.4-r1.ebuild @@ -21,7 +21,7 @@ else SRC_DIR="src-previews" else SRC_DIR="src" - KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~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" + KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~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
[gentoo-commits] repo/gentoo:master commit in: net-misc/rsync/
commit: adbedf5e21a733ccc6ac1f110d3f19d7c362fbcc Author: Jakov Smolić gentoo org> AuthorDate: Thu Jun 2 04:12:00 2022 + Commit: Jakov Smolić gentoo org> CommitDate: Thu Jun 2 04:12:00 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=adbedf5e net-misc/rsync: Stabilize 3.2.4-r1 arm, #849155 Signed-off-by: Jakov Smolić gentoo.org> net-misc/rsync/rsync-3.2.4-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net-misc/rsync/rsync-3.2.4-r1.ebuild b/net-misc/rsync/rsync-3.2.4-r1.ebuild index cf3bb274de07..a56ae65cf5c3 100644 --- a/net-misc/rsync/rsync-3.2.4-r1.ebuild +++ b/net-misc/rsync/rsync-3.2.4-r1.ebuild @@ -21,7 +21,7 @@ else SRC_DIR="src-previews" else SRC_DIR="src" - KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~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" + KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~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
[gentoo-commits] repo/gentoo:master commit in: net-misc/rsync/
commit: a8e85492018e30930a227b62a5c80f66e7a25d0f Author: Sam James gentoo org> AuthorDate: Thu Jun 2 03:13:46 2022 + Commit: Sam James gentoo org> CommitDate: Thu Jun 2 03:13:46 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a8e85492 net-misc/rsync: Stabilize 3.2.4-r1 ppc, #849155 Signed-off-by: Sam James gentoo.org> net-misc/rsync/rsync-3.2.4-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net-misc/rsync/rsync-3.2.4-r1.ebuild b/net-misc/rsync/rsync-3.2.4-r1.ebuild index 8efd0325ba48..cf3bb274de07 100644 --- a/net-misc/rsync/rsync-3.2.4-r1.ebuild +++ b/net-misc/rsync/rsync-3.2.4-r1.ebuild @@ -21,7 +21,7 @@ else SRC_DIR="src-previews" else SRC_DIR="src" - KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~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" + KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~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
[gentoo-commits] repo/gentoo:master commit in: net-misc/rsync/
commit: c39653b0f4328cc7d629ae2b6a97b4ac10cda5f4 Author: Sam James gentoo org> AuthorDate: Thu Jun 2 03:13:11 2022 + Commit: Sam James gentoo org> CommitDate: Thu Jun 2 03:13:11 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c39653b0 net-misc/rsync: Stabilize 3.2.4-r1 ppc64, #849155 Signed-off-by: Sam James gentoo.org> net-misc/rsync/rsync-3.2.4-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net-misc/rsync/rsync-3.2.4-r1.ebuild b/net-misc/rsync/rsync-3.2.4-r1.ebuild index 2db02b553055..8efd0325ba48 100644 --- a/net-misc/rsync/rsync-3.2.4-r1.ebuild +++ b/net-misc/rsync/rsync-3.2.4-r1.ebuild @@ -21,7 +21,7 @@ else SRC_DIR="src-previews" else SRC_DIR="src" - KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~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" + KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~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
[gentoo-commits] repo/gentoo:master commit in: net-misc/rsync/
commit: d9f2814012aebe6e4aff5c69b3f802b12f4565eb Author: Sam James gentoo org> AuthorDate: Thu Jun 2 03:11:13 2022 + Commit: Sam James gentoo org> CommitDate: Thu Jun 2 03:11:13 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d9f28140 net-misc/rsync: Stabilize 3.2.4-r1 x86, #849155 Signed-off-by: Sam James gentoo.org> net-misc/rsync/rsync-3.2.4-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net-misc/rsync/rsync-3.2.4-r1.ebuild b/net-misc/rsync/rsync-3.2.4-r1.ebuild index 027265dde3cf..2db02b553055 100644 --- a/net-misc/rsync/rsync-3.2.4-r1.ebuild +++ b/net-misc/rsync/rsync-3.2.4-r1.ebuild @@ -21,7 +21,7 @@ else SRC_DIR="src-previews" else SRC_DIR="src" - KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~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" + KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~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
[gentoo-commits] repo/gentoo:master commit in: net-misc/rsync/
commit: 29a51fa58ba70bba71b54c2334acfed4c4e77cc4 Author: Sam James gentoo org> AuthorDate: Thu Jun 2 02:19:43 2022 + Commit: Sam James gentoo org> CommitDate: Thu Jun 2 02:19:43 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=29a51fa5 net-misc/rsync: Stabilize 3.2.4-r1 amd64, #849155 Signed-off-by: Sam James gentoo.org> net-misc/rsync/rsync-3.2.4-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net-misc/rsync/rsync-3.2.4-r1.ebuild b/net-misc/rsync/rsync-3.2.4-r1.ebuild index a5cde37a6997..027265dde3cf 100644 --- a/net-misc/rsync/rsync-3.2.4-r1.ebuild +++ b/net-misc/rsync/rsync-3.2.4-r1.ebuild @@ -21,7 +21,7 @@ else SRC_DIR="src-previews" else SRC_DIR="src" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~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" + KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~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
[gentoo-commits] repo/gentoo:master commit in: net-misc/rsync-bpc/
commit: aec3288e6e3f408b5ba29f6592eaaf89234f5b59 Author: Dennis Eisele dennis-eisele de> AuthorDate: Sun Feb 27 16:59:41 2022 + Commit: Sam James gentoo org> CommitDate: Tue Apr 26 05:13:19 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aec3288e net-misc/rsync-bpc: add new dependency for app-backup/backuppc Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Dennis Eisele dennis-eisele.de> Signed-off-by: Sam James gentoo.org> net-misc/rsync-bpc/Manifest | 1 + net-misc/rsync-bpc/metadata.xml | 12 net-misc/rsync-bpc/rsync-bpc-3.1.3.0.ebuild | 15 +++ 3 files changed, 28 insertions(+) diff --git a/net-misc/rsync-bpc/Manifest b/net-misc/rsync-bpc/Manifest new file mode 100644 index ..62bfacb62647 --- /dev/null +++ b/net-misc/rsync-bpc/Manifest @@ -0,0 +1 @@ +DIST rsync-bpc-3.1.3.0.tar.gz 883808 BLAKE2B 56cb299fb75219043364344d6575a443e32b5992a00f6691dde0f6b99c9b54d73d74bbef8dc98a9c927643985031e027df89d4aa1969d493e624290f28cb19f0 SHA512 24ae86c6108720d7f0ba6d144053ccba6499623018bc2bcff8f1d8e289f9c015f80e73244e965a7fcdccb5f9b2a876f1a54ceed42a19a80fd7c87c6b05c7701d diff --git a/net-misc/rsync-bpc/metadata.xml b/net-misc/rsync-bpc/metadata.xml new file mode 100644 index ..bf9ec30888ef --- /dev/null +++ b/net-misc/rsync-bpc/metadata.xml @@ -0,0 +1,12 @@ + +https://www.gentoo.org/dtd/metadata.dtd";> + + +kernlpa...@dennis-eisele.de +Dennis Eisele + + +proxy-ma...@gentoo.org +Proxy Maintainers + + 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 new file mode 100644 index ..c62f819d61f9 --- /dev/null +++ b/net-misc/rsync-bpc/rsync-bpc-3.1.3.0.ebuild @@ -0,0 +1,15 @@ +# Copyright 2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DESCRIPTION="Rsync-bpc is a customized version of rsync that is used as part of BackupPC" +HOMEPAGE="https://github.com/backuppc/rsync-bpc"; +SRC_URI="https://github.com/backuppc/rsync-bpc/releases/download/${PV}/${P}.tar.gz"; + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +RDEPEND="virtual/ssh" +DEPEND="${RDEPEND}"
[gentoo-commits] repo/gentoo:master commit in: net-misc/rsync/
commit: 882b77edf896534ffd91d0fb17696bfda91e635b Author: Sam James gentoo org> AuthorDate: Sun Apr 17 17:00:47 2022 + Commit: Sam James gentoo org> CommitDate: Sun Apr 17 17:05:57 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=882b77ed net-misc/rsync: drop 3.2.3-r4 Signed-off-by: Sam James gentoo.org> net-misc/rsync/rsync-3.2.3-r4.ebuild | 122 --- 1 file changed, 122 deletions(-) diff --git a/net-misc/rsync/rsync-3.2.3-r4.ebuild b/net-misc/rsync/rsync-3.2.3-r4.ebuild deleted file mode 100644 index 38c591855af9.. --- a/net-misc/rsync/rsync-3.2.3-r4.ebuild +++ /dev/null @@ -1,122 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -if [[ ${PV} != 3.2.3 ]]; then - # Make sure we revert the autotools hackery applied in 3.2.3. - die "Please use rsync-.ebuild as a basis for version bumps" -fi - -WANT_LIBTOOL=none - -inherit autotools prefix systemd - -DESCRIPTION="File transfer program to keep remote files into sync" -HOMEPAGE="https://rsync.samba.org/"; -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" -SRC_URI="https://rsync.samba.org/ftp/rsync/${SRC_DIR}/${P/_/}.tar.gz"; -S="${WORKDIR}/${P/_/}" - -LICENSE="GPL-3" -SLOT="0" -IUSE="acl examples iconv ipv6 lz4 ssl stunnel system-zlib xattr xxhash zstd" - -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}" - -src_prepare() { - local PATCHES=( - "${FILESDIR}/rsync-3.2.3-glibc-lchmod.patch" - "${FILESDIR}/rsync-3.2.3-cross.patch" - ) - default - eautoconf -o configure.sh - touch config.h.in || die -} - -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) - ) - - 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 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 -}
[gentoo-commits] repo/gentoo:master commit in: net-misc/rsync/
commit: 3ca7f6278c1a408b646d5412b7231e6cb72cfb9c Author: Sam James gentoo org> AuthorDate: Sat Apr 16 08:29:13 2022 + Commit: Sam James gentoo org> CommitDate: Sat Apr 16 08:34:16 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3ca7f627 net-misc/rsync: fix shebang on examples scripts Signed-off-by: Sam James gentoo.org> .../{rsync-3.2.4.ebuild => rsync-3.2.4-r1.ebuild} | 27 + net-misc/rsync/rsync-.ebuild | 28 -- 2 files changed, 44 insertions(+), 11 deletions(-) diff --git a/net-misc/rsync/rsync-3.2.4.ebuild b/net-misc/rsync/rsync-3.2.4-r1.ebuild similarity index 87% rename from net-misc/rsync/rsync-3.2.4.ebuild rename to net-misc/rsync/rsync-3.2.4-r1.ebuild index f3a4a1f6ee43..d172d6ec7259 100644 --- a/net-misc/rsync/rsync-3.2.4.ebuild +++ b/net-misc/rsync/rsync-3.2.4-r1.ebuild @@ -3,14 +3,16 @@ EAPI=7 -inherit flag-o-matic prefix systemd +PYTHON_COMPAT=( python3_{8,9,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} == * ]] ; then - PYTHON_COMPAT=( python3_{8,9,10} ) EGIT_REPO_URI="https://github.com/WayneD/rsync.git"; - inherit autotools git-r3 python-any-r1 + 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 @@ -30,8 +32,13 @@ fi LICENSE="GPL-3" SLOT="0" IUSE="acl examples iconv ipv6 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 ) @@ -41,16 +48,25 @@ RDEPEND="acl? ( virtual/acl ) >=dev-libs/popt-1.5 iconv? ( virtual/libiconv )" DEPEND="${RDEPEND}" +BDEPEND="examples? ( ${PYTHON_DEPS} )" if [[ ${PV} == * ]] ; then BDEPEND+=" ${PYTHON_DEPS} - $(python_gen_any_dep ' + $(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 + # - needs commonmark at build time + if [[ ${PV} == * ]] || use examples ; then + python-single-r1_pkg_setup + fi +} + src_prepare() { default @@ -107,8 +123,11 @@ src_install() { # 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 diff --git a/net-misc/rsync/rsync-.ebuild b/net-misc/rsync/rsync-.ebuild index a6b2f8bee049..d172d6ec7259 100644 --- a/net-misc/rsync/rsync-.ebuild +++ b/net-misc/rsync/rsync-.ebuild @@ -3,14 +3,16 @@ EAPI=7 -inherit flag-o-matic prefix systemd +PYTHON_COMPAT=( python3_{8,9,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} == * ]] ; then - PYTHON_COMPAT=( python3_{8,9,10} ) EGIT_REPO_URI="https://github.com/WayneD/rsync.git"; - inherit autotools git-r3 python-any-r1 + 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 @@ -30,8 +32,13 @@ fi LICENSE="GPL-3" SLOT="0" IUSE="acl examples iconv ipv6 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 ) @@ -41,19 +48,23 @@ RDEPEND="acl? ( virtual/acl ) >=dev-libs/popt-1.5 iconv? ( virtual/libiconv )" DEPEND="${RDEPEND}" +BDEPEND="examples? ( ${PYTHON_DEPS} )" if [[ ${PV} == * ]] ; then BDEPEND+=" ${PYTHON_DEPS} - $(python_gen_any_dep ' + $(python_gen_cond_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 -b "dev-python/commonmark[${PYTHON_USEDEP}]" +pkg_setup() { + # - USE=examples needs Python itself at runt
[gentoo-commits] repo/gentoo:master commit in: net-misc/rsync/
commit: bb81e84ee349bb1e800fc3060eb54c7f603977e4 Author: Sam James gentoo org> AuthorDate: Sat Apr 16 02:10:02 2022 + Commit: Sam James gentoo org> CommitDate: Sat Apr 16 02:10:34 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bb81e84e net-misc/rsync: fix whitespace Signed-off-by: Sam James gentoo.org> net-misc/rsync/rsync-3.2.4.ebuild | 2 +- net-misc/rsync/rsync-.ebuild | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/net-misc/rsync/rsync-3.2.4.ebuild b/net-misc/rsync/rsync-3.2.4.ebuild index 9d743d95cc3d..f3a4a1f6ee43 100644 --- a/net-misc/rsync/rsync-3.2.4.ebuild +++ b/net-misc/rsync/rsync-3.2.4.ebuild @@ -9,7 +9,7 @@ DESCRIPTION="File transfer program to keep remote files into sync" HOMEPAGE="https://rsync.samba.org/"; if [[ ${PV} == * ]] ; then PYTHON_COMPAT=( python3_{8,9,10} ) -EGIT_REPO_URI="https://github.com/WayneD/rsync.git"; + EGIT_REPO_URI="https://github.com/WayneD/rsync.git"; inherit autotools git-r3 python-any-r1 else VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/waynedavison.asc diff --git a/net-misc/rsync/rsync-.ebuild b/net-misc/rsync/rsync-.ebuild index 49950fc14082..a6b2f8bee049 100644 --- a/net-misc/rsync/rsync-.ebuild +++ b/net-misc/rsync/rsync-.ebuild @@ -9,7 +9,7 @@ DESCRIPTION="File transfer program to keep remote files into sync" HOMEPAGE="https://rsync.samba.org/"; if [[ ${PV} == * ]] ; then PYTHON_COMPAT=( python3_{8,9,10} ) -EGIT_REPO_URI="https://github.com/WayneD/rsync.git"; + EGIT_REPO_URI="https://github.com/WayneD/rsync.git"; inherit autotools git-r3 python-any-r1 else VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/waynedavison.asc
[gentoo-commits] repo/gentoo:master commit in: net-misc/rsync/
commit: 87f7448ac5a516c80f53ab93edfc963930d0e130 Author: Sam James gentoo org> AuthorDate: Sat Apr 16 01:50:02 2022 + Commit: Sam James gentoo org> CommitDate: Sat Apr 16 02:09:23 2022 + 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-.ebuild => rsync-3.2.4.ebuild} | 37 -- net-misc/rsync/rsync-.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-.ebuild b/net-misc/rsync/rsync-3.2.4.ebuild similarity index 84% copy from net-misc/rsync/rsync-.ebuild copy to net-misc/rsync/rsync-3.2.4.ebuild index 0da8ff82f683..9d743d95cc3d 100644 --- a/net-misc/rsync/rsync-.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}" == * ]] ; then - PYTHON_COMPAT=( python3_{6,7,8} ) +if [[ ${PV} == * ]] ; 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}" == * ]] ; then - BDEPEND="${PYTHON_DEPS} +if [[ ${PV} == * ]] ; 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}" == * ]] ; then + + if [[ ${PV} == * ]] ; 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
[gentoo-commits] repo/gentoo:master commit in: net-misc/rsync/
commit: 21fb3631d32d7ea64dc85d1d09bb167142acd413 Author: Jonathan Davies protonmail com> AuthorDate: Tue Mar 29 21:48:01 2022 + Commit: Sam James gentoo org> CommitDate: Wed Mar 30 23:24:35 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=21fb3631 net-misc/rsync: Added verify-sig integration. Signed-off-by: Jonathan Davies protonmail.com> Closes: https://github.com/gentoo/gentoo/pull/24810 Signed-off-by: Sam James gentoo.org> net-misc/rsync/Manifest | 1 + net-misc/rsync/rsync-3.2.3-r5.ebuild | 9 ++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/net-misc/rsync/Manifest b/net-misc/rsync/Manifest index c1ee190e0be4..c274f49f3aef 100644 --- a/net-misc/rsync/Manifest +++ b/net-misc/rsync/Manifest @@ -1 +1,2 @@ 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 diff --git a/net-misc/rsync/rsync-3.2.3-r5.ebuild b/net-misc/rsync/rsync-3.2.3-r5.ebuild index 7f996c540050..4e060aaa03bc 100644 --- a/net-misc/rsync/rsync-3.2.3-r5.ebuild +++ b/net-misc/rsync/rsync-3.2.3-r5.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 @@ -9,14 +9,16 @@ if [[ ${PV} != 3.2.3 ]]; then fi WANT_LIBTOOL=none +VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/waynedavison.asc -inherit autotools flag-o-matic prefix systemd +inherit autotools flag-o-matic prefix systemd verify-sig DESCRIPTION="File transfer program to keep remote files into sync" HOMEPAGE="https://rsync.samba.org/"; 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" -SRC_URI="https://rsync.samba.org/ftp/rsync/${SRC_DIR}/${P/_/}.tar.gz"; +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/_/}" LICENSE="GPL-3" @@ -33,6 +35,7 @@ RDEPEND="acl? ( virtual/acl ) >=dev-libs/popt-1.5 iconv? ( virtual/libiconv )" DEPEND="${RDEPEND}" +BDEPEND="verify-sig? ( sec-keys/openpgp-keys-waynedavison )" src_prepare() { local PATCHES=(
[gentoo-commits] repo/gentoo:master commit in: net-misc/rsync/
commit: 883377500a40fca29a1b47eaf25eb8879e340833 Author: Fabian Groffen gentoo org> AuthorDate: Thu Dec 30 10:39:24 2021 + Commit: Fabian Groffen gentoo org> CommitDate: Thu Dec 30 10:39:35 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=88337750 net-misc/rsync-3.2.3-r5: fix IPv6 support using musl Closes: https://bugs.gentoo.org/609694 Package-Manager: Portage-3.0.28, Repoman-3.0.3 Signed-off-by: Fabian Groffen gentoo.org> net-misc/rsync/rsync-3.2.3-r5.ebuild | 6 +- net-misc/rsync/rsync-.ebuild | 6 +- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/net-misc/rsync/rsync-3.2.3-r5.ebuild b/net-misc/rsync/rsync-3.2.3-r5.ebuild index 684a8e105cd7..7f996c540050 100644 --- a/net-misc/rsync/rsync-3.2.3-r5.ebuild +++ b/net-misc/rsync/rsync-3.2.3-r5.ebuild @@ -10,7 +10,7 @@ fi WANT_LIBTOOL=none -inherit autotools prefix systemd +inherit autotools flag-o-matic prefix systemd DESCRIPTION="File transfer program to keep remote files into sync" HOMEPAGE="https://rsync.samba.org/"; @@ -47,6 +47,10 @@ 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 diff --git a/net-misc/rsync/rsync-.ebuild b/net-misc/rsync/rsync-.ebuild index 8c91d4f3a17a..0da8ff82f683 100644 --- a/net-misc/rsync/rsync-.ebuild +++ b/net-misc/rsync/rsync-.ebuild @@ -3,7 +3,7 @@ EAPI=7 -inherit prefix systemd +inherit flag-o-matic prefix systemd DESCRIPTION="File transfer program to keep remote files into sync" HOMEPAGE="https://rsync.samba.org/"; @@ -59,6 +59,10 @@ 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
[gentoo-commits] repo/gentoo:master commit in: net-misc/rsync/
commit: 7faf825f93f4f61116da8734391dd79216ef16fb Author: Rolf Eike Beer sf-mail de> AuthorDate: Thu Nov 25 14:42:10 2021 + Commit: Sam James gentoo org> CommitDate: Fri Nov 26 08:49:08 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7faf825f net-misc/rsync: stable 3.2.3-r5 for hppa/sparc, bug #827218 Package-Manager: Portage-3.0.28, Repoman-3.0.3 RepoMan-Options: --include-arches="hppa sparc" Signed-off-by: Rolf Eike Beer sf-mail.de> Signed-off-by: Sam James gentoo.org> net-misc/rsync/rsync-3.2.3-r5.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net-misc/rsync/rsync-3.2.3-r5.ebuild b/net-misc/rsync/rsync-3.2.3-r5.ebuild index aff5ecf8040d..684a8e105cd7 100644 --- a/net-misc/rsync/rsync-3.2.3-r5.ebuild +++ b/net-misc/rsync/rsync-3.2.3-r5.ebuild @@ -15,7 +15,7 @@ inherit autotools prefix systemd DESCRIPTION="File transfer program to keep remote files into sync" HOMEPAGE="https://rsync.samba.org/"; 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" +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" SRC_URI="https://rsync.samba.org/ftp/rsync/${SRC_DIR}/${P/_/}.tar.gz"; S="${WORKDIR}/${P/_/}"
[gentoo-commits] repo/gentoo:master commit in: net-misc/rsync/
commit: eb24aa69610c5daecd46eb9b0f51945d8666fab0 Author: Arthur Zamarin gentoo org> AuthorDate: Thu Nov 25 19:17:22 2021 + Commit: Arthur Zamarin gentoo org> CommitDate: Thu Nov 25 19:17:40 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eb24aa69 net-misc/rsync: Stabilize 3.2.3-r5 x86, #827218 Signed-off-by: Arthur Zamarin gentoo.org> net-misc/rsync/rsync-3.2.3-r5.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net-misc/rsync/rsync-3.2.3-r5.ebuild b/net-misc/rsync/rsync-3.2.3-r5.ebuild index 08f3f654043b..aff5ecf8040d 100644 --- a/net-misc/rsync/rsync-3.2.3-r5.ebuild +++ b/net-misc/rsync/rsync-3.2.3-r5.ebuild @@ -15,7 +15,7 @@ inherit autotools prefix systemd DESCRIPTION="File transfer program to keep remote files into sync" HOMEPAGE="https://rsync.samba.org/"; 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" +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" SRC_URI="https://rsync.samba.org/ftp/rsync/${SRC_DIR}/${P/_/}.tar.gz"; S="${WORKDIR}/${P/_/}"
[gentoo-commits] repo/gentoo:master commit in: net-misc/rsync/
commit: 601e341b117178ae31d35a99aeab4f0f3d3195aa Author: Arthur Zamarin gentoo org> AuthorDate: Thu Nov 25 19:17:19 2021 + Commit: Arthur Zamarin gentoo org> CommitDate: Thu Nov 25 19:17:39 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=601e341b net-misc/rsync: Stabilize 3.2.3-r5 ppc64, #827218 Signed-off-by: Arthur Zamarin gentoo.org> net-misc/rsync/rsync-3.2.3-r5.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net-misc/rsync/rsync-3.2.3-r5.ebuild b/net-misc/rsync/rsync-3.2.3-r5.ebuild index 17d16ef046d3..08f3f654043b 100644 --- a/net-misc/rsync/rsync-3.2.3-r5.ebuild +++ b/net-misc/rsync/rsync-3.2.3-r5.ebuild @@ -15,7 +15,7 @@ inherit autotools prefix systemd DESCRIPTION="File transfer program to keep remote files into sync" HOMEPAGE="https://rsync.samba.org/"; 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" +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" SRC_URI="https://rsync.samba.org/ftp/rsync/${SRC_DIR}/${P/_/}.tar.gz"; S="${WORKDIR}/${P/_/}"
[gentoo-commits] repo/gentoo:master commit in: net-misc/rsync/
commit: 3b7364e55fb23775aea981163aca413ab66bb07c Author: Sam James gentoo org> AuthorDate: Thu Nov 25 04:16:16 2021 + Commit: Sam James gentoo org> CommitDate: Thu Nov 25 04:16:16 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3b7364e5 net-misc/rsync: Stabilize 3.2.3-r5 ppc, #827218 Signed-off-by: Sam James gentoo.org> net-misc/rsync/rsync-3.2.3-r5.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net-misc/rsync/rsync-3.2.3-r5.ebuild b/net-misc/rsync/rsync-3.2.3-r5.ebuild index 8cc3ffadf9c0..17d16ef046d3 100644 --- a/net-misc/rsync/rsync-3.2.3-r5.ebuild +++ b/net-misc/rsync/rsync-3.2.3-r5.ebuild @@ -15,7 +15,7 @@ inherit autotools prefix systemd DESCRIPTION="File transfer program to keep remote files into sync" HOMEPAGE="https://rsync.samba.org/"; 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" +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" SRC_URI="https://rsync.samba.org/ftp/rsync/${SRC_DIR}/${P/_/}.tar.gz"; S="${WORKDIR}/${P/_/}"
[gentoo-commits] repo/gentoo:master commit in: net-misc/rsync/
commit: 6336027471a6e28fabee43f50d1b3ff150bdccc6 Author: Sam James gentoo org> AuthorDate: Thu Nov 25 04:15:56 2021 + Commit: Sam James gentoo org> CommitDate: Thu Nov 25 04:15:56 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=63360274 net-misc/rsync: Stabilize 3.2.3-r5 arm, #827218 Signed-off-by: Sam James gentoo.org> net-misc/rsync/rsync-3.2.3-r5.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net-misc/rsync/rsync-3.2.3-r5.ebuild b/net-misc/rsync/rsync-3.2.3-r5.ebuild index a5cd3d9dc44d..8cc3ffadf9c0 100644 --- a/net-misc/rsync/rsync-3.2.3-r5.ebuild +++ b/net-misc/rsync/rsync-3.2.3-r5.ebuild @@ -15,7 +15,7 @@ inherit autotools prefix systemd DESCRIPTION="File transfer program to keep remote files into sync" HOMEPAGE="https://rsync.samba.org/"; 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" +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" SRC_URI="https://rsync.samba.org/ftp/rsync/${SRC_DIR}/${P/_/}.tar.gz"; S="${WORKDIR}/${P/_/}"
[gentoo-commits] repo/gentoo:master commit in: net-misc/rsync/
commit: d5bd2f2067ce7438750ae13a790de5db45eea903 Author: Sam James gentoo org> AuthorDate: Thu Nov 25 04:13:21 2021 + Commit: Sam James gentoo org> CommitDate: Thu Nov 25 04:13:21 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d5bd2f20 net-misc/rsync: Stabilize 3.2.3-r5 arm64, #827218 Signed-off-by: Sam James gentoo.org> net-misc/rsync/rsync-3.2.3-r5.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net-misc/rsync/rsync-3.2.3-r5.ebuild b/net-misc/rsync/rsync-3.2.3-r5.ebuild index e618b46f985e..a5cd3d9dc44d 100644 --- a/net-misc/rsync/rsync-3.2.3-r5.ebuild +++ b/net-misc/rsync/rsync-3.2.3-r5.ebuild @@ -15,7 +15,7 @@ inherit autotools prefix systemd DESCRIPTION="File transfer program to keep remote files into sync" HOMEPAGE="https://rsync.samba.org/"; 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" +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" SRC_URI="https://rsync.samba.org/ftp/rsync/${SRC_DIR}/${P/_/}.tar.gz"; S="${WORKDIR}/${P/_/}"
[gentoo-commits] repo/gentoo:master commit in: net-misc/rsync/
commit: 14a0c02c55148971995e5077b189bf374a8710ba Author: Sam James gentoo org> AuthorDate: Thu Nov 25 04:12:03 2021 + Commit: Sam James gentoo org> CommitDate: Thu Nov 25 04:12:03 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=14a0c02c net-misc/rsync: Stabilize 3.2.3-r5 amd64, #827218 Signed-off-by: Sam James gentoo.org> net-misc/rsync/rsync-3.2.3-r5.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net-misc/rsync/rsync-3.2.3-r5.ebuild b/net-misc/rsync/rsync-3.2.3-r5.ebuild index 826911b13641..e618b46f985e 100644 --- a/net-misc/rsync/rsync-3.2.3-r5.ebuild +++ b/net-misc/rsync/rsync-3.2.3-r5.ebuild @@ -15,7 +15,7 @@ inherit autotools prefix systemd DESCRIPTION="File transfer program to keep remote files into sync" HOMEPAGE="https://rsync.samba.org/"; 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" +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" SRC_URI="https://rsync.samba.org/ftp/rsync/${SRC_DIR}/${P/_/}.tar.gz"; S="${WORKDIR}/${P/_/}"
[gentoo-commits] repo/gentoo:master commit in: net-misc/rsync/, net-misc/rsync/files/
commit: 029532544d5edfe5fc70413a827831932e3c0b21 Author: Varsha Teratipally google com> AuthorDate: Wed Nov 17 17:30:16 2021 + Commit: Sam James gentoo org> CommitDate: Thu Nov 18 02:30:46 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=02953254 net-misc/rsync: fix CVE-2020-14387 Bug: https://bugs.gentoo.org/792576 Signed-off-by: Varsha Teratipally google.com> Closes: https://github.com/gentoo/gentoo/pull/22981 Signed-off-by: Sam James gentoo.org> .../files/rsync-3.2.3-verify-certificate.patch | 26 + net-misc/rsync/rsync-3.2.3-r5.ebuild | 124 + 2 files changed, 150 insertions(+) diff --git a/net-misc/rsync/files/rsync-3.2.3-verify-certificate.patch b/net-misc/rsync/files/rsync-3.2.3-verify-certificate.patch new file mode 100644 index ..9b462a1df721 --- /dev/null +++ b/net-misc/rsync/files/rsync-3.2.3-verify-certificate.patch @@ -0,0 +1,26 @@ +From c3f7414c450faaf6a8281cc4a4403529aeb7d859 Mon Sep 17 00:00:00 2001 +From: Matt McCutchen +Date: Wed, 26 Aug 2020 12:16:08 -0400 +Subject: [PATCH] rsync-ssl: Verify the hostname in the certificate when using + openssl. + +--- + rsync-ssl | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/rsync-ssl b/rsync-ssl +index 8101975a..46701af1 100755 +--- a/rsync-ssl b/rsync-ssl +@@ -129,7 +129,7 @@ function rsync_ssl_helper { + fi + + if [[ $RSYNC_SSL_TYPE == openssl ]]; then +- exec $RSYNC_SSL_OPENSSL s_client $caopt $certopt -quiet -verify_quiet -servername $hostname -connect $hostname:$port ++ exec $RSYNC_SSL_OPENSSL s_client $caopt $certopt -quiet -verify_quiet -servername $hostname -verify_hostname $hostname -connect $hostname:$port + elif [[ $RSYNC_SSL_TYPE == gnutls ]]; then + exec $RSYNC_SSL_GNUTLS --logfile=/dev/null $gnutls_cert_opt $gnutls_opts $hostname:$port + else +-- +2.25.1 + diff --git a/net-misc/rsync/rsync-3.2.3-r5.ebuild b/net-misc/rsync/rsync-3.2.3-r5.ebuild new file mode 100644 index ..826911b13641 --- /dev/null +++ b/net-misc/rsync/rsync-3.2.3-r5.ebuild @@ -0,0 +1,124 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +if [[ ${PV} != 3.2.3 ]]; then + # Make sure we revert the autotools hackery applied in 3.2.3. + die "Please use rsync-.ebuild as a basis for version bumps" +fi + +WANT_LIBTOOL=none + +inherit autotools prefix systemd + +DESCRIPTION="File transfer program to keep remote files into sync" +HOMEPAGE="https://rsync.samba.org/"; +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" +SRC_URI="https://rsync.samba.org/ftp/rsync/${SRC_DIR}/${P/_/}.tar.gz"; +S="${WORKDIR}/${P/_/}" + +LICENSE="GPL-3" +SLOT="0" +IUSE="acl examples iconv ipv6 lz4 ssl stunnel system-zlib xattr xxhash zstd" + +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}" + +src_prepare() { + local PATCHES=( + "${FILESDIR}/${P}-glibc-lchmod.patch" + "${FILESDIR}/${P}-cross.patch" + # Fix for (CVE-2020-14387) - net-misc/rsync: improper TLS validation in rsync-ssl script + "${FILESDIR}/${P}-verify-certificate.patch" + ) + default + eautoconf -o configure.sh + touch config.h.in || die +} + +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) + ) + + 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 + +
[gentoo-commits] repo/gentoo:master commit in: net-misc/rsync/files/
commit: a81d4c4da78b07828fa9a152d00bb20e0fe289a4 Author: Mike Gilbert gentoo org> AuthorDate: Mon Nov 8 01:18:06 2021 + Commit: Mike Gilbert gentoo org> CommitDate: Mon Nov 8 01:18:06 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a81d4c4d net-misc/rsync: backport another cross-compile fix Bug: https://bugs.gentoo.org/732084 Signed-off-by: Mike Gilbert gentoo.org> net-misc/rsync/files/rsync-3.2.3-cross.patch | 22 ++ 1 file changed, 22 insertions(+) diff --git a/net-misc/rsync/files/rsync-3.2.3-cross.patch b/net-misc/rsync/files/rsync-3.2.3-cross.patch index 1f23627853b..c61090b7c40 100644 --- a/net-misc/rsync/files/rsync-3.2.3-cross.patch +++ b/net-misc/rsync/files/rsync-3.2.3-cross.patch @@ -105,3 +105,25 @@ index 3fd7e5d5..e469981b 100644 AC_LANG(C) if test x"$CXX_OK" = x"yes"; then # AC_MSG_RESULT() is called below. +From 7d830ff52ff7b01f528f39aa27b1ab36ea8c1356 Mon Sep 17 00:00:00 2001 +From: Andrew Aladjev +Date: Sun, 7 Nov 2021 22:45:49 +0300 +Subject: [PATCH] improved cross compilation detection (#252) + +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index fbdd17d8..9e7338cf 100644 +--- a/configure.ac b/configure.ac +@@ -264,7 +264,7 @@ if test x"$enable_simd" != x"no"; then + # For x86-64 SIMD, g++ >=5 or clang++ >=7 is required + if test x"$host_cpu" = x"x86_64" || test x"$host_cpu" = x"amd64"; then + AC_LANG(C++) +- if test x"$host_cpu" = x"$build_cpu"; then ++ if test x"$host" = x"$build"; then + AC_RUN_IFELSE([AC_LANG_PROGRAM([SIMD_X86_64_TEST],[[if (test_ssse3(42) != 42 || test_sse2(42) != 42 || test_avx2(42) != 42) exit(1);]])], + [CXX_OK=yes],[CXX_OK=no]) + else
[gentoo-commits] repo/gentoo:master commit in: net-misc/rsync/, net-misc/rsync/files/
commit: 826471502e24d5d22731fe07558260551c802d4c Author: Mike Gilbert gentoo org> AuthorDate: Fri Oct 22 18:43:49 2021 + Commit: Mike Gilbert gentoo org> CommitDate: Fri Oct 22 18:46:48 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=82647150 net-misc/rsync: backport cross-compile fixes Closes: https://bugs.gentoo.org/732084 Closes: https://github.com/gentoo/gentoo/pull/22354 Closes: https://github.com/gentoo/gentoo/pull/22667 Signed-off-by: Mike Gilbert gentoo.org> net-misc/rsync/files/rsync-3.2.3-cross.patch | 107 +++ net-misc/rsync/rsync-3.2.3-r4.ebuild | 52 - net-misc/rsync/rsync-.ebuild | 5 -- 3 files changed, 122 insertions(+), 42 deletions(-) diff --git a/net-misc/rsync/files/rsync-3.2.3-cross.patch b/net-misc/rsync/files/rsync-3.2.3-cross.patch new file mode 100644 index 000..1f23627853b --- /dev/null +++ b/net-misc/rsync/files/rsync-3.2.3-cross.patch @@ -0,0 +1,107 @@ +From 9f9240b661c5f381831b62d72b6ea928a91ff43a Mon Sep 17 00:00:00 2001 +From: Wayne Davison +Date: Thu, 3 Sep 2020 10:07:36 -0700 +Subject: [PATCH] Set CXX_OK=no when cross compiling. + +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 64d2e6d6..109546a6 100644 +--- a/configure.ac b/configure.ac +@@ -233,7 +233,7 @@ __attribute__ ((target("ssse3"))) void more_testing(char* buf, int len) + in8_2 = _mm_lddqu_si128((__m128i_u*)&buf[i + 16]); + } + } +-]], [[if (test_ssse3(42) != 42 || test_sse2(42) != 42 || test_avx2(42) != 42) exit(1);]])],[CXX_OK=yes],[CXX_OK=no]) ++]], [[if (test_ssse3(42) != 42 || test_sse2(42) != 42 || test_avx2(42) != 42) exit(1);]])],[CXX_OK=yes],[CXX_OK=no],[CXX_OK=no]) + AC_LANG(C) + if test x"$CXX_OK" = x"yes"; then + # AC_MSG_RESULT() is called below. +From 7eb59a9152a2ace7bc7858e9915c671b3ab54344 Mon Sep 17 00:00:00 2001 +From: Wayne Davison +Date: Tue, 22 Sep 2020 17:19:45 -0700 +Subject: [PATCH] Change from $build_cpu to $host_cpu as edo1 suggested. + +--- + configure.ac | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 109546a6..e8c06f42 100644 +--- a/configure.ac b/configure.ac +@@ -211,7 +211,7 @@ CXXFLAGS=`echo "$CXXFLAGS" | sed 's/-g //'` + + if test x"$enable_simd" != x"no"; then + # For x86-64 SIMD, g++ >=5 or clang++ >=7 is required +-if test x"$build_cpu" = x"x86_64"; then ++if test x"$host_cpu" = x"x86_64"; then + AC_LANG(C++) + AC_RUN_IFELSE([AC_LANG_PROGRAM([[#include + #include +@@ -283,8 +283,8 @@ AC_ARG_ENABLE(asm, + AS_HELP_STRING([--disable-asm],[disable ASM optimizations])) + + if test x"$enable_asm" != x"no"; then +-if test x"$build_cpu" = x"x86_64"; then +- ASM="$build_cpu" ++if test x"$host_cpu" = x"x86_64"; then ++ ASM="$host_cpu" + elif test x"$enable_asm" = x"yes"; then + AC_MSG_RESULT(unavailable) + AC_MSG_ERROR(The ASM optimizations are currently x86_64 only. +From b7fab6f285ff0ff3816b109a8c3131b6ded0b484 Mon Sep 17 00:00:00 2001 +From: edo +Date: Wed, 7 Oct 2020 08:33:57 +0300 +Subject: [PATCH] Allow cross-compilation with SIMD (x86_84) (#104) + +Replace runtime SIMD check with a compile-only test in case of +cross-compilation. + +You can still use '--enable-simd=no' to build x86_64 code without +SIMD instructions. +--- + configure.ac | 20 +--- + 1 file changed, 13 insertions(+), 7 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 3fd7e5d5..e469981b 100644 +--- a/configure.ac b/configure.ac +@@ -208,12 +208,7 @@ AC_ARG_ENABLE(simd, + + # Clag is crashing with -g -O2, so we'll get rid of -g for now. + CXXFLAGS=`echo "$CXXFLAGS" | sed 's/-g //'` +- +-if test x"$enable_simd" != x"no"; then +-# For x86-64 SIMD, g++ >=5 or clang++ >=7 is required +-if test x"$host_cpu" = x"x86_64"; then +- AC_LANG(C++) +- AC_RUN_IFELSE([AC_LANG_PROGRAM([[#include ++m4_define(SIMD_X86_64_TEST, [[#include + #include + __attribute__ ((target("default"))) int test_ssse3(int x) { return x; } + __attribute__ ((target("default"))) int test_sse2(int x) { return x; } +@@ -233,7 +228,18 @@ __attribute__ ((target("ssse3"))) void more_testing(char* buf, int len) + in8_2 = _mm_lddqu_si128((__m128i_u*)&buf[i + 16]); + } + } +-]], [[if (test_ssse3(42) != 42 || test_sse2(42) != 42 || test_avx2(42) != 42) exit(1);]])],[CXX_OK=yes],[CXX_OK=no],[CXX_OK=no]) ++]]) ++ ++if test x"$enable_simd" != x"no"; then ++# For x86-64 SIMD, g++ >=5 or clang++ >=7 is required ++if test x"$host_cpu" = x"x86_64"; then ++ AC_LANG(C++) ++ if test x"$host_cpu" = x"$build_cpu"; then ++ AC_RUN_IFELSE([AC_LANG_PROGRAM([SIMD_X86_64_TEST],[[if (test_ssse3(42) != 42 || test_sse2(42) != 42 || test_avx2(42) != 42) exit(1);]])], ++ [CXX_OK=yes],[CXX_OK=no]) ++
[gentoo-commits] repo/gentoo:master commit in: net-misc/rsync/
commit: 03b3ee1dafcd791593e955764c5d77185490c8e8 Author: Mike Gilbert gentoo org> AuthorDate: Fri Oct 22 18:46:16 2021 + Commit: Mike Gilbert gentoo org> CommitDate: Fri Oct 22 18:46:49 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=03b3ee1d net-misc/rsync: drop toolchain-funcs Signed-off-by: Mike Gilbert gentoo.org> net-misc/rsync/rsync-3.2.3-r4.ebuild | 2 +- net-misc/rsync/rsync-.ebuild | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/net-misc/rsync/rsync-3.2.3-r4.ebuild b/net-misc/rsync/rsync-3.2.3-r4.ebuild index 4e5df492e3f..38c591855af 100644 --- a/net-misc/rsync/rsync-3.2.3-r4.ebuild +++ b/net-misc/rsync/rsync-3.2.3-r4.ebuild @@ -10,7 +10,7 @@ fi WANT_LIBTOOL=none -inherit autotools prefix systemd toolchain-funcs +inherit autotools prefix systemd DESCRIPTION="File transfer program to keep remote files into sync" HOMEPAGE="https://rsync.samba.org/"; diff --git a/net-misc/rsync/rsync-.ebuild b/net-misc/rsync/rsync-.ebuild index 6b09d3b0e99..8c91d4f3a17 100644 --- a/net-misc/rsync/rsync-.ebuild +++ b/net-misc/rsync/rsync-.ebuild @@ -3,7 +3,7 @@ EAPI=7 -inherit prefix systemd toolchain-funcs +inherit prefix systemd DESCRIPTION="File transfer program to keep remote files into sync" HOMEPAGE="https://rsync.samba.org/";
[gentoo-commits] repo/gentoo:master commit in: net-misc/rsync/
commit: 521945589adfa47fa37a938450db4e1d38b23580 Author: Lars Wendler gentoo org> AuthorDate: Tue May 25 08:31:06 2021 + Commit: Lars Wendler gentoo org> CommitDate: Tue May 25 08:31:06 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=52194558 net-misc/rsync: Don't use deprecated grep syntax Signed-off-by: Lars Wendler gentoo.org> net-misc/rsync/rsync-3.2.3-r4.ebuild | 2 +- net-misc/rsync/rsync-.ebuild | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/net-misc/rsync/rsync-3.2.3-r4.ebuild b/net-misc/rsync/rsync-3.2.3-r4.ebuild index d5c381d9ed3..34c869e7619 100644 --- a/net-misc/rsync/rsync-3.2.3-r4.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-.ebuild b/net-misc/rsync/rsync-.ebuild index de005c109c3..a0178f21af5 100644 --- a/net-misc/rsync/rsync-.ebuild +++ b/net-misc/rsync/rsync-.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"