* [gentoo-commits] repo/gentoo:master commit in: net-misc/rsync/files/, net-misc/rsync/
@ 2017-11-14 22:40 Thomas Deutschmann
0 siblings, 0 replies; 9+ messages in thread
From: Thomas Deutschmann @ 2017-11-14 22:40 UTC (permalink / raw
To: gentoo-commits
commit: 61f33ecb79092b9b86d8a95da0950215e6194122
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 14 22:40:01 2017 +0000
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Tue Nov 14 22:40:01 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=61f33ecb
net-misc/rsync: Rev bump to fix CVE-2017-16548
Bug: https://bugs.gentoo.org/636714
Package-Manager: Portage-2.3.13, Repoman-2.3.4
.../rsync/files/rsync-3.1.2-CVE-2017-16548.patch | 17 +++++
net-misc/rsync/rsync-3.1.2-r1.ebuild | 89 ++++++++++++++++++++++
2 files changed, 106 insertions(+)
diff --git a/net-misc/rsync/files/rsync-3.1.2-CVE-2017-16548.patch b/net-misc/rsync/files/rsync-3.1.2-CVE-2017-16548.patch
new file mode 100644
index 00000000000..d06607cf772
--- /dev/null
+++ b/net-misc/rsync/files/rsync-3.1.2-CVE-2017-16548.patch
@@ -0,0 +1,17 @@
+X-Git-Url: https://git.samba.org/rsync.git/?p=rsync.git;a=blobdiff_plain;f=xattrs.c;h=4867e6f5b8ad2934d43b06f3b99b7b3690a6dc7a;hp=68305d7559b34f5cc2f196b74429b82fa6ff49dd;hb=47a63d90e71d3e19e0e96052bb8c6b9cb140ecc1;hpb=bc112b0e7feece62ce98708092306639a8a53cce
+
+diff --git a/xattrs.c b/xattrs.c
+index 68305d7..4867e6f 100644
+--- a/xattrs.c
++++ b/xattrs.c
+@@ -824,6 +824,10 @@ void receive_xattr(int f, struct file_struct *file)
+ out_of_memory("receive_xattr");
+ name = ptr + dget_len + extra_len;
+ read_buf(f, name, name_len);
++ if (name_len < 1 || name[name_len-1] != '\0') {
++ rprintf(FERROR, "Invalid xattr name received (missing trailing \\0).\n");
++ exit_cleanup(RERR_FILEIO);
++ }
+ if (dget_len == datum_len)
+ read_buf(f, ptr, dget_len);
+ else {
diff --git a/net-misc/rsync/rsync-3.1.2-r1.ebuild b/net-misc/rsync/rsync-3.1.2-r1.ebuild
new file mode 100644
index 00000000000..d74d4969071
--- /dev/null
+++ b/net-misc/rsync/rsync-3.1.2-r1.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit eutils flag-o-matic prefix systemd
+
+DESCRIPTION="File transfer program to keep remote files into sync"
+HOMEPAGE="https://rsync.samba.org/"
+SRC_URI="https://rsync.samba.org/ftp/rsync/src/${P}.tar.gz"
+[[ "${PV}" = *_pre* ]] && SRC_URI="https://rsync.samba.org/ftp/rsync/src-previews/${P/_/}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+if [[ ${PV} != *_pre ]] ; then
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+IUSE="acl examples iconv ipv6 static stunnel xattr"
+
+LIB_DEPEND="acl? ( virtual/acl[static-libs(+)] )
+ xattr? ( kernel_linux? ( sys-apps/attr[static-libs(+)] ) )
+ >=dev-libs/popt-1.5[static-libs(+)]"
+RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
+ iconv? ( virtual/libiconv )"
+DEPEND="${RDEPEND}
+ static? ( ${LIB_DEPEND} )"
+
+PATCHES=( "${FILESDIR}"/${PN}-3.1.2-CVE-2017-16548.patch )
+
+S=${WORKDIR}/${P/_/}
+
+src_configure() {
+ use static && append-ldflags -static
+ econf \
+ --without-included-popt \
+ $(use_enable acl acl-support) \
+ $(use_enable xattr xattr-support) \
+ $(use_enable ipv6) \
+ $(use_enable iconv) \
+ --with-rsyncd-conf="${EPREFIX}"/etc/rsyncd.conf
+ touch proto.h-tstamp #421625
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+ newconfd "${FILESDIR}"/rsyncd.conf.d rsyncd
+ newinitd "${FILESDIR}"/rsyncd.init.d-r1 rsyncd
+ dodoc NEWS OLDNEWS README 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-client
+ emake DESTDIR="${D}" install-ssl-daemon
+ fi
+
+ # Install the useful contrib scripts
+ if use examples ; then
+ exeinto /usr/share/rsync
+ doexe support/*
+ rm -f "${ED}"/usr/share/rsync/{Makefile*,*.c}
+ fi
+
+ eprefixify "${ED}"/etc/{,xinetd.d}/rsyncd*
+
+ systemd_dounit "${FILESDIR}/rsyncd.service"
+}
+
+pkg_postinst() {
+ if egrep -qis '^[[:space:]]use chroot[[:space:]]*=[[:space:]]*(no|0|false)' \
+ "${EROOT}"/etc/rsyncd.conf "${EROOT}"/etc/rsync/rsyncd.conf ; then
+ ewarn "You have disabled chroot support in your rsyncd.conf. This"
+ ewarn "is a security risk which you should fix. Please check your"
+ ewarn "/etc/rsyncd.conf file and fix the setting 'use chroot'."
+ fi
+ if use stunnel ; then
+ einfo "Please install \">=net-misc/stunnel-4\" in order to use stunnel feature."
+ einfo
+ einfo "You maybe have to update the certificates configured in"
+ einfo "${EROOT}/etc/stunnel/rsync.conf"
+ fi
+}
^ permalink raw reply related [flat|nested] 9+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-misc/rsync/files/, net-misc/rsync/
@ 2020-06-18 7:31 Lars Wendler
0 siblings, 0 replies; 9+ messages in thread
From: Lars Wendler @ 2020-06-18 7:31 UTC (permalink / raw
To: gentoo-commits
commit: e25457c673c2e20cf9e6f4061f6d87a3278a1444
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 18 07:31:17 2020 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Thu Jun 18 07:31:37 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e25457c6
net-misc/rsync: Bump to version 3.2.0_pre3. Removed old
Package-Manager: Portage-2.3.101, Repoman-2.3.22
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
net-misc/rsync/Manifest | 2 +-
.../rsync/files/rsync-3.2.0_pre3-simd_check.patch | 24 ++++++++++++++++++++++
...c-3.2.0_pre2.ebuild => rsync-3.2.0_pre3.ebuild} | 8 ++++++++
3 files changed, 33 insertions(+), 1 deletion(-)
diff --git a/net-misc/rsync/Manifest b/net-misc/rsync/Manifest
index 8bcd788e14c..7ef8c17e978 100644
--- a/net-misc/rsync/Manifest
+++ b/net-misc/rsync/Manifest
@@ -1,2 +1,2 @@
DIST rsync-3.1.3.tar.gz 905908 BLAKE2B 616a1f3239327a28b881310f5f249c90b8bcdb05091279cd62f9cb4e35a8428c7cdd9b89e711ba124601a738f0deb9bfbebafba7fd88b72866476138a9f8c75a SHA512 8385f4c0ea37e7a1da3cf45794154f5bc4d1c49bc625ba3b5f85adaf3eafe6d71c15bdcb1410bde731e5d4c19aff3331606637462fa27a68dc3e13192dd78f99
-DIST rsync-3.2.0pre2.tar.gz 1044334 BLAKE2B 5069a09d6a24c4c4adfc2202a0845f156270c23e2c236a8a9d490d0156ece4e81ccca6aa9eefd552cd1512e60fff38fd79d3b4ba4e06b11a22ca591daaaae7b0 SHA512 e88093a44d5ac8ff235429aea6a7f93cd8b5a1de42eeee1b7d6d0ce2c23234ac670a775028e2eca22cbf1144b9bac827c0393c22eaf11fa5ec47dc64129462e7
+DIST rsync-3.2.0pre3.tar.gz 1046601 BLAKE2B bfa9345dd387b8e729686c4a3a1d203336f18c14d0bf3b1aa28b6792ba0fc5f07513256f774bdf6ba4af72730a88e9e3bafb5060cdc8b2ae0fe0314e0e79cde1 SHA512 2b8dee4e4c759165ace5bf1bf3f79e88ad25d5dd2eeed89e0ae699ef0956758c6428488fa5e842b59267c315cf38fde9449d0aee1b5db9abd79d90cf4f108992
diff --git a/net-misc/rsync/files/rsync-3.2.0_pre3-simd_check.patch b/net-misc/rsync/files/rsync-3.2.0_pre3-simd_check.patch
new file mode 100644
index 00000000000..1d50c95b00d
--- /dev/null
+++ b/net-misc/rsync/files/rsync-3.2.0_pre3-simd_check.patch
@@ -0,0 +1,24 @@
+https://github.com/WayneD/rsync/issues/19
+
+--- rsync-3.2.0pre3/configure.ac 2020-06-17 19:12:09.000000000 +0200
++++ rsync-3.2.0pre3/configure.ac 2020-06-17 19:12:09.000000000 +0200
+@@ -202,7 +202,7 @@
+ if test x"$enable_simd" = x"yes"; then
+ # For x86-64 SIMD, g++ is also required
+ if test x"$build_cpu" = x"x86_64"; then
+- if test x"$CXX" = x"g++"; then
++ if echo "$CXX" | grep -q 'g++$'; then
+ # AC_MSG_RESULT() called below
+ SIMD="$SIMD x86_64"
+ else
+--- rsync-3.2.0pre3/configure.sh 2020-06-17 19:12:09.000000000 +0200
++++ rsync-3.2.0pre3/configure.sh 2020-06-17 19:12:09.000000000 +0200
+@@ -4842,7 +4842,7 @@
+ if test x"$enable_simd" = x"yes"; then
+ # For x86-64 SIMD, g++ is also required
+ if test x"$build_cpu" = x"x86_64"; then
+- if test x"$CXX" = x"g++"; then
++ if echo "$CXX" | grep -q 'g++$'; then
+ # AC_MSG_RESULT() called below
+ SIMD="$SIMD x86_64"
+ else
diff --git a/net-misc/rsync/rsync-3.2.0_pre2.ebuild b/net-misc/rsync/rsync-3.2.0_pre3.ebuild
similarity index 95%
rename from net-misc/rsync/rsync-3.2.0_pre2.ebuild
rename to net-misc/rsync/rsync-3.2.0_pre3.ebuild
index 485c7b0379a..0b2230194eb 100644
--- a/net-misc/rsync/rsync-3.2.0_pre2.ebuild
+++ b/net-misc/rsync/rsync-3.2.0_pre3.ebuild
@@ -16,7 +16,9 @@ LICENSE="GPL-3"
SLOT="0"
[[ ${PV} = *_pre* ]] || \
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE_CPU_FLAGS_X86=" sse2"
IUSE="acl examples iconv ipv6 libressl lz4 ssl static stunnel system-zlib xattr xxhash zstd"
+IUSE+=" ${IUSE_CPU_FLAGS_X86// / cpu_flags_x86_}"
LIB_DEPEND="acl? ( virtual/acl[static-libs(+)] )
lz4? ( app-arch/lz4[static-libs(+)] )
@@ -45,12 +47,18 @@ python_check_deps() {
has_version "dev-python/commonmark[${PYTHON_USEDEP}]"
}
+src_prepare() {
+ default
+ eapply -Z "${FILESDIR}/${PN}-3.2.0_pre3-simd_check.patch"
+}
+
src_configure() {
use static && append-ldflags -static
local myeconfargs=(
--with-rsyncd-conf="${EPREFIX}"/etc/rsyncd.conf
--without-included-popt
$(use_enable acl acl-support)
+ $(use_enable cpu_flags_x86_sse2 simd)
$(use_enable iconv)
$(use_enable ipv6)
$(use_enable lz4)
^ permalink raw reply related [flat|nested] 9+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-misc/rsync/files/, net-misc/rsync/
@ 2020-06-20 1:28 Lars Wendler
0 siblings, 0 replies; 9+ messages in thread
From: Lars Wendler @ 2020-06-20 1:28 UTC (permalink / raw
To: gentoo-commits
commit: 9f8b0a10cde068cb69c2714a61b5f8d00e96ea99
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 20 01:20:59 2020 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Sat Jun 20 01:28:09 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9f8b0a10
net-misc/rsync: Bump to version 3.2.0. Removed old
Bug: https://bugs.gentoo.org/728852
Package-Manager: Portage-2.3.101, Repoman-2.3.22
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
net-misc/rsync/Manifest | 2 +-
net-misc/rsync/files/rsync-3.2.0-simd_check.patch | 24 ++++++++++++++++++++++
.../rsync/files/rsync-3.2.0_pre3-simd_check.patch | 24 ----------------------
...{rsync-3.2.0_pre3.ebuild => rsync-3.2.0.ebuild} | 4 ++--
4 files changed, 27 insertions(+), 27 deletions(-)
diff --git a/net-misc/rsync/Manifest b/net-misc/rsync/Manifest
index 7ef8c17e978..12fd2dd6f35 100644
--- a/net-misc/rsync/Manifest
+++ b/net-misc/rsync/Manifest
@@ -1,2 +1,2 @@
DIST rsync-3.1.3.tar.gz 905908 BLAKE2B 616a1f3239327a28b881310f5f249c90b8bcdb05091279cd62f9cb4e35a8428c7cdd9b89e711ba124601a738f0deb9bfbebafba7fd88b72866476138a9f8c75a SHA512 8385f4c0ea37e7a1da3cf45794154f5bc4d1c49bc625ba3b5f85adaf3eafe6d71c15bdcb1410bde731e5d4c19aff3331606637462fa27a68dc3e13192dd78f99
-DIST rsync-3.2.0pre3.tar.gz 1046601 BLAKE2B bfa9345dd387b8e729686c4a3a1d203336f18c14d0bf3b1aa28b6792ba0fc5f07513256f774bdf6ba4af72730a88e9e3bafb5060cdc8b2ae0fe0314e0e79cde1 SHA512 2b8dee4e4c759165ace5bf1bf3f79e88ad25d5dd2eeed89e0ae699ef0956758c6428488fa5e842b59267c315cf38fde9449d0aee1b5db9abd79d90cf4f108992
+DIST rsync-3.2.0.tar.gz 1048009 BLAKE2B 641be077a88958a09b083fd9658ae7f40ce3565bee1959f0c7ef82c61356a070e7ca1e0ceeb96b7a1b31a5ee031a84733ade3965aaa93f9e18795df16a6c1460 SHA512 01a109e1e061bb7f4734b694e1f15a83efdd8fcb1995e5eeea75a8d245eead4412c09b37b0fcdfe522e368673768e4fa5ed8891ccf3ae42f60293e4e68d506c2
diff --git a/net-misc/rsync/files/rsync-3.2.0-simd_check.patch b/net-misc/rsync/files/rsync-3.2.0-simd_check.patch
new file mode 100644
index 00000000000..db3ee83dc0d
--- /dev/null
+++ b/net-misc/rsync/files/rsync-3.2.0-simd_check.patch
@@ -0,0 +1,24 @@
+https://github.com/WayneD/rsync/pull/24
+
+--- rsync-3.2.0/configure.ac 2020-06-19 23:11:01.000000000 +0200
++++ rsync-3.2.0/configure.ac 2020-06-19 23:11:01.000000000 +0200
+@@ -207,7 +207,7 @@
+ if test x"$CXX" != x""; then
+ CXX_VERSION=`$CXX --version 2>/dev/null | head -n 1`
+ case "$CXX_VERSION" in
+- g++*)
++ *g++*)
+ CXX_VERSION=`$CXX -dumpversion | sed 's/\..*//g'`
+ if test "$CXX_VERSION" -ge "5"; then
+ CXX_OK=yes
+--- rsync-3.2.0/configure.sh 2020-06-19 23:11:01.000000000 +0200
++++ rsync-3.2.0/configure.sh 2020-06-19 23:11:01.000000000 +0200
+@@ -4889,7 +4889,7 @@
+ if test x"$CXX" != x""; then
+ CXX_VERSION=`$CXX --version 2>/dev/null | head -n 1`
+ case "$CXX_VERSION" in
+- g++*)
++ *g++*)
+ CXX_VERSION=`$CXX -dumpversion | sed 's/\..*//g'`
+ if test "$CXX_VERSION" -ge "5"; then
+ CXX_OK=yes
diff --git a/net-misc/rsync/files/rsync-3.2.0_pre3-simd_check.patch b/net-misc/rsync/files/rsync-3.2.0_pre3-simd_check.patch
deleted file mode 100644
index 1d50c95b00d..00000000000
--- a/net-misc/rsync/files/rsync-3.2.0_pre3-simd_check.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-https://github.com/WayneD/rsync/issues/19
-
---- rsync-3.2.0pre3/configure.ac 2020-06-17 19:12:09.000000000 +0200
-+++ rsync-3.2.0pre3/configure.ac 2020-06-17 19:12:09.000000000 +0200
-@@ -202,7 +202,7 @@
- if test x"$enable_simd" = x"yes"; then
- # For x86-64 SIMD, g++ is also required
- if test x"$build_cpu" = x"x86_64"; then
-- if test x"$CXX" = x"g++"; then
-+ if echo "$CXX" | grep -q 'g++$'; then
- # AC_MSG_RESULT() called below
- SIMD="$SIMD x86_64"
- else
---- rsync-3.2.0pre3/configure.sh 2020-06-17 19:12:09.000000000 +0200
-+++ rsync-3.2.0pre3/configure.sh 2020-06-17 19:12:09.000000000 +0200
-@@ -4842,7 +4842,7 @@
- if test x"$enable_simd" = x"yes"; then
- # For x86-64 SIMD, g++ is also required
- if test x"$build_cpu" = x"x86_64"; then
-- if test x"$CXX" = x"g++"; then
-+ if echo "$CXX" | grep -q 'g++$'; then
- # AC_MSG_RESULT() called below
- SIMD="$SIMD x86_64"
- else
diff --git a/net-misc/rsync/rsync-3.2.0_pre3.ebuild b/net-misc/rsync/rsync-3.2.0.ebuild
similarity index 94%
rename from net-misc/rsync/rsync-3.2.0_pre3.ebuild
rename to net-misc/rsync/rsync-3.2.0.ebuild
index 0b2230194eb..007adedc277 100644
--- a/net-misc/rsync/rsync-3.2.0_pre3.ebuild
+++ b/net-misc/rsync/rsync-3.2.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://rsync.samba.org/ftp/rsync/src/${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
[[ ${PV} = *_pre* ]] || \
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE_CPU_FLAGS_X86=" sse2"
IUSE="acl examples iconv ipv6 libressl lz4 ssl static stunnel system-zlib xattr xxhash zstd"
IUSE+=" ${IUSE_CPU_FLAGS_X86// / cpu_flags_x86_}"
@@ -49,7 +49,7 @@ python_check_deps() {
src_prepare() {
default
- eapply -Z "${FILESDIR}/${PN}-3.2.0_pre3-simd_check.patch"
+ eapply -Z "${FILESDIR}/${PN}-3.2.0-simd_check.patch"
}
src_configure() {
^ permalink raw reply related [flat|nested] 9+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-misc/rsync/files/, net-misc/rsync/
@ 2020-07-28 6:54 Lars Wendler
0 siblings, 0 replies; 9+ messages in thread
From: Lars Wendler @ 2020-07-28 6:54 UTC (permalink / raw
To: gentoo-commits
commit: f0c6c276cbc2bc2b5eb25264586b2a5fef1af3c2
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 28 06:54:11 2020 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Tue Jul 28 06:54:47 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f0c6c276
net-misc/rsync: Revbump to backport two fixes
- Allow --bwlimit=0 again
- Fix usage of zstd compression
Closes: https://bugs.gentoo.org/731306
Closes: https://bugs.gentoo.org/733084
Package-Manager: Portage-3.0.1, Repoman-2.3.23
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
.../rsync/files/rsync-3.2.2-allow_bwlimit_0.patch | 77 ++++++++++
.../rsync/files/rsync-3.2.2-zstd_see_token.patch | 31 ++++
net-misc/rsync/rsync-3.2.2-r1.ebuild | 158 +++++++++++++++++++++
3 files changed, 266 insertions(+)
diff --git a/net-misc/rsync/files/rsync-3.2.2-allow_bwlimit_0.patch b/net-misc/rsync/files/rsync-3.2.2-allow_bwlimit_0.patch
new file mode 100644
index 00000000000..4a795bb17b9
--- /dev/null
+++ b/net-misc/rsync/files/rsync-3.2.2-allow_bwlimit_0.patch
@@ -0,0 +1,77 @@
+From 5dcb49c7ddec765d4a24b4f801ffc7212c085db1 Mon Sep 17 00:00:00 2001
+From: Wayne Davison <wayne@opencoder.net>
+Date: Tue, 7 Jul 2020 11:40:27 -0700
+Subject: [PATCH] Allow --bwlimit=0 again.
+
+---
+ options.c | 12 ++++++------
+ testsuite/hands.test | 2 +-
+ 2 files changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/options.c b/options.c
+index 5a372ae7..0b7b9f33 100644
+--- a/options.c
++++ b/options.c
+@@ -1253,7 +1253,7 @@ static int count_args(const char **argv)
+ /* If the size_arg is an invalid string or the value is < min_value, an error
+ * is put into err_buf & the return is -1. Note that this parser does NOT
+ * support negative numbers, so a min_value < 0 doesn't make any sense. */
+-static ssize_t parse_size_arg(char *size_arg, char def_suf, const char *opt_name, ssize_t min_value)
++static ssize_t parse_size_arg(char *size_arg, char def_suf, const char *opt_name, ssize_t min_value, BOOL allow_0)
+ {
+ int reps, mult;
+ const char *arg, *err = "invalid";
+@@ -1299,7 +1299,7 @@ static ssize_t parse_size_arg(char *size_arg, char def_suf, const char *opt_name
+ size += atoi(arg), arg += 2;
+ if (*arg)
+ goto failure;
+- if (size < min_value) {
++ if (size < min_value && (!allow_0 || size != 0)) {
+ err = size < 0 ? "too big" : "too small";
+ goto failure;
+ }
+@@ -1683,19 +1683,19 @@ int parse_arguments(int *argc_p, const char ***argv_p)
+ break;
+
+ case OPT_MAX_SIZE:
+- if ((max_size = parse_size_arg(max_size_arg, 'b', "max-size", 0)) < 0)
++ if ((max_size = parse_size_arg(max_size_arg, 'b', "max-size", 0, True)) < 0)
+ return 0;
+ max_size_arg = num_to_byte_string(max_size);
+ break;
+
+ case OPT_MIN_SIZE:
+- if ((min_size = parse_size_arg(min_size_arg, 'b', "min-size", 0)) < 0)
++ if ((min_size = parse_size_arg(min_size_arg, 'b', "min-size", 0, True)) < 0)
+ return 0;
+ min_size_arg = num_to_byte_string(min_size);
+ break;
+
+ case OPT_BWLIMIT: {
+- ssize_t size = parse_size_arg(bwlimit_arg, 'K', "bwlimit", 512);
++ ssize_t size = parse_size_arg(bwlimit_arg, 'K', "bwlimit", 512, True);
+ if (size < 0)
+ return 0;
+ bwlimit_arg = num_to_byte_string(size);
+@@ -1889,7 +1889,7 @@ int parse_arguments(int *argc_p, const char ***argv_p)
+ max_alloc_arg = NULL;
+ }
+ if (max_alloc_arg) {
+- ssize_t size = parse_size_arg(max_alloc_arg, 'B', "max-alloc", 1024*1024);
++ ssize_t size = parse_size_arg(max_alloc_arg, 'B', "max-alloc", 1024*1024, False);
+ if (size < 0)
+ return 0;
+ max_alloc = size;
+diff --git a/testsuite/hands.test b/testsuite/hands.test
+index 46928d4e..8e265b7c 100644
+--- a/testsuite/hands.test
++++ b/testsuite/hands.test
+@@ -16,7 +16,7 @@ DEBUG_OPTS="--debug=all0,deltasum0"
+ runtest "basic operation" 'checkit "$RSYNC -av \"$fromdir/\" \"$todir\"" "$fromdir/" "$todir"'
+
+ ln "$fromdir/filelist" "$fromdir/dir"
+-runtest "hard links" 'checkit "$RSYNC -avH $DEBUG_OPTS \"$fromdir/\" \"$todir\"" "$fromdir/" "$todir"'
++runtest "hard links" 'checkit "$RSYNC -avH --bwlimit=0 $DEBUG_OPTS \"$fromdir/\" \"$todir\"" "$fromdir/" "$todir"'
+
+ rm "$todir/text"
+ runtest "one file" 'checkit "$RSYNC -avH $DEBUG_OPTS \"$fromdir/\" \"$todir\"" "$fromdir/" "$todir"'
diff --git a/net-misc/rsync/files/rsync-3.2.2-zstd_see_token.patch b/net-misc/rsync/files/rsync-3.2.2-zstd_see_token.patch
new file mode 100644
index 00000000000..02f22409d4c
--- /dev/null
+++ b/net-misc/rsync/files/rsync-3.2.2-zstd_see_token.patch
@@ -0,0 +1,31 @@
+From bb1365dd7736b264738f50b683a0f81a2ed11aba Mon Sep 17 00:00:00 2001
+From: Wayne Davison <wayne@opencoder.net>
+Date: Fri, 10 Jul 2020 09:47:16 -0700
+Subject: [PATCH] Fix see_token zstd case.
+
+---
+ token.c | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/token.c b/token.c
+index cad6b641..61be8dd9 100644
+--- a/token.c
++++ b/token.c
+@@ -1093,13 +1093,13 @@ void see_token(char *data, int32 toklen)
+ break;
+ case CPRES_ZLIBX:
+ break;
+-#ifdef SUPPORT_LZ4
+- case CPRES_LZ4:
+- /*see_uncompressed_token(data, toklen);*/
++#ifdef SUPPORT_ZSTD
++ case CPRES_ZSTD:
+ break;
+ #endif
+ #ifdef SUPPORT_LZ4
+- case CPRES_ZSTD:
++ case CPRES_LZ4:
++ /*see_uncompressed_token(data, toklen);*/
+ break;
+ #endif
+ default:
diff --git a/net-misc/rsync/rsync-3.2.2-r1.ebuild b/net-misc/rsync/rsync-3.2.2-r1.ebuild
new file mode 100644
index 00000000000..2507bc58986
--- /dev/null
+++ b/net-misc/rsync/rsync-3.2.2-r1.ebuild
@@ -0,0 +1,158 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic prefix systemd
+
+DESCRIPTION="File transfer program to keep remote files into sync"
+HOMEPAGE="https://rsync.samba.org/"
+if [[ "${PV}" == *9999 ]] ; then
+ PYTHON_COMPAT=( python3_{6,7,8} )
+ inherit autotools git-r3 python-any-r1
+ EGIT_REPO_URI="https://github.com/WayneD/rsync.git"
+else
+ if [[ "${PV}" == *_pre* ]] ; then
+ SRC_DIR="src-previews"
+ else
+ SRC_DIR="src"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ fi
+ SRC_URI="https://rsync.samba.org/ftp/rsync/${SRC_DIR}/${P/_/}.tar.gz"
+ S="${WORKDIR}/${P/_/}"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE_CPU_FLAGS_X86=" sse2"
+IUSE="acl examples iconv ipv6 libressl lz4 ssl static stunnel system-zlib xattr xxhash zstd"
+IUSE+=" ${IUSE_CPU_FLAGS_X86// / cpu_flags_x86_}"
+
+LIB_DEPEND="acl? ( virtual/acl[static-libs(+)] )
+ lz4? ( app-arch/lz4[static-libs(+)] )
+ ssl? (
+ !libressl? ( dev-libs/openssl:0=[static-libs(+)] )
+ libressl? ( dev-libs/libressl:0=[static-libs(+)] )
+ )
+ system-zlib? ( sys-libs/zlib[static-libs(+)] )
+ xattr? ( kernel_linux? ( sys-apps/attr[static-libs(+)] ) )
+ xxhash? ( dev-libs/xxhash[static-libs(+)] )
+ zstd? ( app-arch/zstd[static-libs(+)] )
+ >=dev-libs/popt-1.5[static-libs(+)]"
+RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
+ iconv? ( virtual/libiconv )"
+DEPEND="${RDEPEND}
+ static? ( ${LIB_DEPEND} )"
+
+if [[ "${PV}" == *9999 ]] ; then
+ BDEPEND="${PYTHON_DEPS}
+ $(python_gen_any_dep '
+ dev-python/commonmark[${PYTHON_USEDEP}]
+ ')"
+fi
+
+PATCHES=(
+ "${FILESDIR}/${P}-allow_bwlimit_0.patch" #731306
+ "${FILESDIR}/${P}-zstd_see_token.patch" #733084
+)
+
+# Only required for live ebuild
+python_check_deps() {
+ has_version "dev-python/commonmark[${PYTHON_USEDEP}]"
+}
+
+src_prepare() {
+ default
+ if [[ "${PV}" == *9999 ]] ; then
+ eaclocal -I m4
+ eautoconf -o configure.sh
+ eautoheader && touch config.h.in
+ fi
+}
+
+src_configure() {
+ use static && append-ldflags -static
+ local myeconfargs=(
+ --with-rsyncd-conf="${EPREFIX}"/etc/rsyncd.conf
+ --without-included-popt
+ $(use_enable acl acl-support)
+ $(use_enable iconv)
+ $(use_enable ipv6)
+ $(use_enable lz4)
+ $(use_enable ssl openssl)
+ $(use_with !system-zlib included-zlib)
+ $(use_enable xattr xattr-support)
+ $(use_enable xxhash)
+ $(use_enable zstd)
+ )
+
+ if use elibc_glibc && [[ "${ARCH}" == "amd64" ]] ; then
+ # SIMD is only available for x86_64 right now
+ # and only on glibc (#728868)
+ myeconfargs+=( $(use_enable cpu_flags_x86_sse2 simd) )
+ else
+ myeconfargs+=( --disable-simd )
+ fi
+
+ econf "${myeconfargs[@]}"
+ [[ "${PV}" == *9999 ]] || touch proto.h-tstamp #421625
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+
+ newconfd "${FILESDIR}"/rsyncd.conf.d rsyncd
+ newinitd "${FILESDIR}"/rsyncd.init.d-r1 rsyncd
+
+ dodoc NEWS.md README.md TODO tech_report.tex
+
+ insinto /etc
+ newins "${FILESDIR}"/rsyncd.conf-3.0.9-r1 rsyncd.conf
+
+ insinto /etc/logrotate.d
+ newins "${FILESDIR}"/rsyncd.logrotate rsyncd
+
+ insinto /etc/xinetd.d
+ newins "${FILESDIR}"/rsyncd.xinetd-3.0.9-r1 rsyncd
+
+ # Install stunnel helpers
+ if use stunnel ; then
+ emake DESTDIR="${D}" install-ssl-daemon
+ fi
+
+ # Install the useful contrib scripts
+ if use examples ; then
+ exeinto /usr/share/rsync
+ doexe support/*
+ rm -f "${ED}"/usr/share/rsync/{Makefile*,*.c}
+ fi
+
+ eprefixify "${ED}"/etc/{,xinetd.d}/rsyncd*
+
+ systemd_dounit "${FILESDIR}/rsyncd.service"
+}
+
+pkg_postinst() {
+ if egrep -qis '^[[:space:]]use chroot[[:space:]]*=[[:space:]]*(no|0|false)' \
+ "${EROOT}"/etc/rsyncd.conf "${EROOT}"/etc/rsync/rsyncd.conf ; then
+ ewarn "You have disabled chroot support in your rsyncd.conf. This"
+ ewarn "is a security risk which you should fix. Please check your"
+ ewarn "/etc/rsyncd.conf file and fix the setting 'use chroot'."
+ fi
+ if use stunnel ; then
+ einfo "Please install \">=net-misc/stunnel-4\" in order to use stunnel feature."
+ einfo
+ einfo "You maybe have to update the certificates configured in"
+ einfo "${EROOT}/etc/stunnel/rsync.conf"
+ fi
+ if use system-zlib ; then
+ ewarn "Using system-zlib is incompatible with <rsync-3.1.1 when"
+ ewarn "using the --compress option."
+ ewarn
+ ewarn "When syncing with >=rsync-3.1.1 built with bundled zlib,"
+ ewarn "and the --compress option, add --new-compress (-zz)."
+ ewarn
+ ewarn "For syncing the portage tree, add:"
+ ewarn "PORTAGE_RSYNC_EXTRA_OPTS=\"--new-compress\" to make.conf"
+ fi
+}
^ permalink raw reply related [flat|nested] 9+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-misc/rsync/files/, net-misc/rsync/
@ 2020-08-07 8:21 Lars Wendler
0 siblings, 0 replies; 9+ messages in thread
From: Lars Wendler @ 2020-08-07 8:21 UTC (permalink / raw
To: gentoo-commits
commit: 7edb71845d9237c8dadab3b4621dc948f11d7bec
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 7 08:21:07 2020 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Fri Aug 7 08:21:07 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7edb7184
net-misc/rsync: Removed old
Package-Manager: Portage-3.0.1, Repoman-2.3.23
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
net-misc/rsync/Manifest | 1 -
net-misc/rsync/files/rsync-3.2.0-noexecstack.patch | 24 ----
net-misc/rsync/files/rsync-3.2.0-simd_check.patch | 13 --
net-misc/rsync/rsync-3.2.0-r1.ebuild | 156 ---------------------
net-misc/rsync/rsync-3.2.2.ebuild | 153 --------------------
5 files changed, 347 deletions(-)
diff --git a/net-misc/rsync/Manifest b/net-misc/rsync/Manifest
index 42d42be819a..3e3ecc5607a 100644
--- a/net-misc/rsync/Manifest
+++ b/net-misc/rsync/Manifest
@@ -1,3 +1,2 @@
-DIST rsync-3.2.0.tar.gz 1048009 BLAKE2B 641be077a88958a09b083fd9658ae7f40ce3565bee1959f0c7ef82c61356a070e7ca1e0ceeb96b7a1b31a5ee031a84733ade3965aaa93f9e18795df16a6c1460 SHA512 01a109e1e061bb7f4734b694e1f15a83efdd8fcb1995e5eeea75a8d245eead4412c09b37b0fcdfe522e368673768e4fa5ed8891ccf3ae42f60293e4e68d506c2
DIST rsync-3.2.2.tar.gz 1057001 BLAKE2B 177a3145303ab7ed296b9233160ca4907c6b284160f4d0d15aeefd7e28009c1ea29fb3632ab57c008f0aad2f6774185cba86d2d0d68f30737fef217bd9fff402 SHA512 78107cf423e9259a7f7e9bf5527a956b648107aba72ea88b4267ae6334539342501d3c060efbc87235563b0253a12c382c4bb1f73335e68a62ff53aa905f9169
DIST rsync-3.2.3.tar.gz 1069784 BLAKE2B 085adb55d0d7e3d063fa198912fd09df67b63800a65baff5315ccb7dfc0e9d703eef30a7f2e72e3b271162c280abd9809b3f736704752c1663eed65ad8e0ac25 SHA512 48b68491f3ef644dbbbfcaec5ab90a1028593e02d50367ce161fd9d3d0bd0a3628bc57c5e5dec4be3a1d213f784f879b8a8fcdfd789ba0f99837cba16e1ae70e
diff --git a/net-misc/rsync/files/rsync-3.2.0-noexecstack.patch b/net-misc/rsync/files/rsync-3.2.0-noexecstack.patch
deleted file mode 100644
index 918346062e6..00000000000
--- a/net-misc/rsync/files/rsync-3.2.0-noexecstack.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 75901616c5f38a9ff6ba736c8281933e8ce64b8b Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Holger=20Hoffst=C3=A4tte?= <holger@applied-asynchrony.com>
-Date: Sat, 20 Jun 2020 16:54:11 +0200
-Subject: [PATCH] Pass --noexecstack to assembler.
-
-This prevents Linux from rightfully complaining about an executable
-stack segment, which is widely considered a security hazard.
----
- Makefile.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Makefile.in b/Makefile.in
-index 31ddc43b..60aff920 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -135,7 +135,7 @@ simd-checksum-x86_64.o: simd-checksum-x86_64.cpp
- $(CXX) $(CXXFLAGS) $(CPPFLAGS) -c -o $@ $(srcdir)/simd-checksum-x86_64.cpp
-
- lib/md5-asm-x86_64.o: lib/md5-asm-x86_64.s
-- $(CC) -c -o $@ $(srcdir)/lib/md5-asm-x86_64.s
-+ $(CC) -Wa,--noexecstack -c -o $@ $(srcdir)/lib/md5-asm-x86_64.s
-
- tls$(EXEEXT): $(TLS_OBJ)
- $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(TLS_OBJ) $(LIBS)
diff --git a/net-misc/rsync/files/rsync-3.2.0-simd_check.patch b/net-misc/rsync/files/rsync-3.2.0-simd_check.patch
deleted file mode 100644
index 255f2792dc0..00000000000
--- a/net-misc/rsync/files/rsync-3.2.0-simd_check.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-https://github.com/WayneD/rsync/pull/24
-
---- rsync-3.2.0/configure.ac 2020-06-19 23:11:01.000000000 +0200
-+++ rsync-3.2.0/configure.ac 2020-06-19 23:11:01.000000000 +0200
-@@ -207,7 +207,7 @@
- if test x"$CXX" != x""; then
- CXX_VERSION=`$CXX --version 2>/dev/null | head -n 1`
- case "$CXX_VERSION" in
-- g++*)
-+ *g++*)
- CXX_VERSION=`$CXX -dumpversion | sed 's/\..*//g'`
- if test "$CXX_VERSION" -ge "5"; then
- CXX_OK=yes
diff --git a/net-misc/rsync/rsync-3.2.0-r1.ebuild b/net-misc/rsync/rsync-3.2.0-r1.ebuild
deleted file mode 100644
index d74e0fca5bb..00000000000
--- a/net-misc/rsync/rsync-3.2.0-r1.ebuild
+++ /dev/null
@@ -1,156 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic prefix systemd
-
-DESCRIPTION="File transfer program to keep remote files into sync"
-HOMEPAGE="https://rsync.samba.org/"
-if [[ "${PV}" == *9999 ]] ; then
- PYTHON_COMPAT=( python3_{6,7,8} )
- inherit git-r3 python-any-r1
- EGIT_REPO_URI="https://github.com/WayneD/rsync.git"
-else
- if [[ "${PV}" == *_pre* ]] ; then
- SRC_DIR="src-previews"
- else
- SRC_DIR="src"
- KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
- fi
- SRC_URI="https://rsync.samba.org/ftp/rsync/${SRC_DIR}/${P/_/}.tar.gz"
- S="${WORKDIR}/${P/_/}"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE_CPU_FLAGS_X86=" sse2"
-IUSE="acl examples iconv ipv6 libressl lz4 ssl static stunnel system-zlib xattr xxhash zstd"
-IUSE+=" ${IUSE_CPU_FLAGS_X86// / cpu_flags_x86_}"
-
-LIB_DEPEND="acl? ( virtual/acl[static-libs(+)] )
- lz4? ( app-arch/lz4[static-libs(+)] )
- ssl? (
- !libressl? ( dev-libs/openssl:0=[static-libs(+)] )
- libressl? ( dev-libs/libressl:0=[static-libs(+)] )
- )
- system-zlib? ( sys-libs/zlib[static-libs(+)] )
- xattr? ( kernel_linux? ( sys-apps/attr[static-libs(+)] ) )
- xxhash? ( dev-libs/xxhash[static-libs(+)] )
- zstd? ( app-arch/zstd[static-libs(+)] )
- >=dev-libs/popt-1.5[static-libs(+)]"
-RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
- iconv? ( virtual/libiconv )"
-DEPEND="${RDEPEND}
- static? ( ${LIB_DEPEND} )"
-
-if [[ "${PV}" == *9999 ]] ; then
- BDEPEND="${PYTHON_DEPS}
- $(python_gen_any_dep '
- dev-python/commonmark[${PYTHON_USEDEP}]
- ')"
-fi
-
-# Only required for live ebuild
-python_check_deps() {
- has_version "dev-python/commonmark[${PYTHON_USEDEP}]"
-}
-
-PATCHES=(
- "${FILESDIR}/${P}-simd_check.patch"
- "${FILESDIR}/${P}-noexecstack.patch" #728882
-)
-
-src_prepare() {
- default
-
- eaclocal -I m4
- eautoconf -o configure.sh
- eautoheader && touch config.h.in
-}
-
-src_configure() {
- use static && append-ldflags -static
- local myeconfargs=(
- --with-rsyncd-conf="${EPREFIX}"/etc/rsyncd.conf
- --without-included-popt
- $(use_enable acl acl-support)
- $(use_enable iconv)
- $(use_enable ipv6)
- $(use_enable lz4)
- $(use_enable ssl openssl)
- $(use_with !system-zlib included-zlib)
- $(use_enable xattr xattr-support)
- $(use_enable xxhash)
- $(use_enable zstd)
- )
-
- if [[ "${ARCH}" == "amd64" ]] ; then
- # SIMD is only available for x86_64 right now (#728868)
- myeconfargs+=( $(use_enable cpu_flags_x86_sse2 simd) )
- else
- myeconfargs+=( --disable-simd )
- fi
-
- econf "${myeconfargs[@]}"
- [[ "${PV}" == *9999 ]] || touch proto.h-tstamp #421625
-}
-
-src_install() {
- emake DESTDIR="${D}" install
-
- newconfd "${FILESDIR}"/rsyncd.conf.d rsyncd
- newinitd "${FILESDIR}"/rsyncd.init.d-r1 rsyncd
-
- dodoc NEWS.md OLDNEWS.md README.md TODO tech_report.tex
-
- insinto /etc
- newins "${FILESDIR}"/rsyncd.conf-3.0.9-r1 rsyncd.conf
-
- insinto /etc/logrotate.d
- newins "${FILESDIR}"/rsyncd.logrotate rsyncd
-
- insinto /etc/xinetd.d
- newins "${FILESDIR}"/rsyncd.xinetd-3.0.9-r1 rsyncd
-
- # Install stunnel helpers
- if use stunnel ; then
- emake DESTDIR="${D}" install-ssl-daemon
- fi
-
- # Install the useful contrib scripts
- if use examples ; then
- exeinto /usr/share/rsync
- doexe support/*
- rm -f "${ED}"/usr/share/rsync/{Makefile*,*.c}
- fi
-
- eprefixify "${ED}"/etc/{,xinetd.d}/rsyncd*
-
- systemd_dounit "${FILESDIR}/rsyncd.service"
-}
-
-pkg_postinst() {
- if egrep -qis '^[[:space:]]use chroot[[:space:]]*=[[:space:]]*(no|0|false)' \
- "${EROOT}"/etc/rsyncd.conf "${EROOT}"/etc/rsync/rsyncd.conf ; then
- ewarn "You have disabled chroot support in your rsyncd.conf. This"
- ewarn "is a security risk which you should fix. Please check your"
- ewarn "/etc/rsyncd.conf file and fix the setting 'use chroot'."
- fi
- if use stunnel ; then
- einfo "Please install \">=net-misc/stunnel-4\" in order to use stunnel feature."
- einfo
- einfo "You maybe have to update the certificates configured in"
- einfo "${EROOT}/etc/stunnel/rsync.conf"
- fi
- if use system-zlib ; then
- ewarn "Using system-zlib is incompatible with <rsync-3.1.1 when"
- ewarn "using the --compress option."
- ewarn
- ewarn "When syncing with >=rsync-3.1.1 built with bundled zlib,"
- ewarn "and the --compress option, add --new-compress (-zz)."
- ewarn
- ewarn "For syncing the portage tree, add:"
- ewarn "PORTAGE_RSYNC_EXTRA_OPTS=\"--new-compress\" to make.conf"
- fi
-}
diff --git a/net-misc/rsync/rsync-3.2.2.ebuild b/net-misc/rsync/rsync-3.2.2.ebuild
deleted file mode 100644
index fb78f513976..00000000000
--- a/net-misc/rsync/rsync-3.2.2.ebuild
+++ /dev/null
@@ -1,153 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic prefix systemd
-
-DESCRIPTION="File transfer program to keep remote files into sync"
-HOMEPAGE="https://rsync.samba.org/"
-if [[ "${PV}" == *9999 ]] ; then
- PYTHON_COMPAT=( python3_{6,7,8} )
- inherit autotools git-r3 python-any-r1
- EGIT_REPO_URI="https://github.com/WayneD/rsync.git"
-else
- if [[ "${PV}" == *_pre* ]] ; then
- SRC_DIR="src-previews"
- else
- SRC_DIR="src"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
- fi
- SRC_URI="https://rsync.samba.org/ftp/rsync/${SRC_DIR}/${P/_/}.tar.gz"
- S="${WORKDIR}/${P/_/}"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE_CPU_FLAGS_X86=" sse2"
-IUSE="acl examples iconv ipv6 libressl lz4 ssl static stunnel system-zlib xattr xxhash zstd"
-IUSE+=" ${IUSE_CPU_FLAGS_X86// / cpu_flags_x86_}"
-
-LIB_DEPEND="acl? ( virtual/acl[static-libs(+)] )
- lz4? ( app-arch/lz4[static-libs(+)] )
- ssl? (
- !libressl? ( dev-libs/openssl:0=[static-libs(+)] )
- libressl? ( dev-libs/libressl:0=[static-libs(+)] )
- )
- system-zlib? ( sys-libs/zlib[static-libs(+)] )
- xattr? ( kernel_linux? ( sys-apps/attr[static-libs(+)] ) )
- xxhash? ( dev-libs/xxhash[static-libs(+)] )
- zstd? ( app-arch/zstd[static-libs(+)] )
- >=dev-libs/popt-1.5[static-libs(+)]"
-RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
- iconv? ( virtual/libiconv )"
-DEPEND="${RDEPEND}
- static? ( ${LIB_DEPEND} )"
-
-if [[ "${PV}" == *9999 ]] ; then
- BDEPEND="${PYTHON_DEPS}
- $(python_gen_any_dep '
- dev-python/commonmark[${PYTHON_USEDEP}]
- ')"
-fi
-
-# Only required for live ebuild
-python_check_deps() {
- has_version "dev-python/commonmark[${PYTHON_USEDEP}]"
-}
-
-src_prepare() {
- default
- if [[ "${PV}" == *9999 ]] ; then
- eaclocal -I m4
- eautoconf -o configure.sh
- eautoheader && touch config.h.in
- fi
-}
-
-src_configure() {
- use static && append-ldflags -static
- local myeconfargs=(
- --with-rsyncd-conf="${EPREFIX}"/etc/rsyncd.conf
- --without-included-popt
- $(use_enable acl acl-support)
- $(use_enable iconv)
- $(use_enable ipv6)
- $(use_enable lz4)
- $(use_enable ssl openssl)
- $(use_with !system-zlib included-zlib)
- $(use_enable xattr xattr-support)
- $(use_enable xxhash)
- $(use_enable zstd)
- )
-
- if use elibc_glibc && [[ "${ARCH}" == "amd64" ]] ; then
- # SIMD is only available for x86_64 right now
- # and only on glibc (#728868)
- myeconfargs+=( $(use_enable cpu_flags_x86_sse2 simd) )
- else
- myeconfargs+=( --disable-simd )
- fi
-
- econf "${myeconfargs[@]}"
- [[ "${PV}" == *9999 ]] || touch proto.h-tstamp #421625
-}
-
-src_install() {
- emake DESTDIR="${D}" install
-
- newconfd "${FILESDIR}"/rsyncd.conf.d rsyncd
- newinitd "${FILESDIR}"/rsyncd.init.d-r1 rsyncd
-
- dodoc NEWS.md README.md TODO tech_report.tex
-
- insinto /etc
- newins "${FILESDIR}"/rsyncd.conf-3.0.9-r1 rsyncd.conf
-
- insinto /etc/logrotate.d
- newins "${FILESDIR}"/rsyncd.logrotate rsyncd
-
- insinto /etc/xinetd.d
- newins "${FILESDIR}"/rsyncd.xinetd-3.0.9-r1 rsyncd
-
- # Install stunnel helpers
- if use stunnel ; then
- emake DESTDIR="${D}" install-ssl-daemon
- fi
-
- # Install the useful contrib scripts
- if use examples ; then
- exeinto /usr/share/rsync
- doexe support/*
- rm -f "${ED}"/usr/share/rsync/{Makefile*,*.c}
- fi
-
- eprefixify "${ED}"/etc/{,xinetd.d}/rsyncd*
-
- systemd_dounit "${FILESDIR}/rsyncd.service"
-}
-
-pkg_postinst() {
- if egrep -qis '^[[:space:]]use chroot[[:space:]]*=[[:space:]]*(no|0|false)' \
- "${EROOT}"/etc/rsyncd.conf "${EROOT}"/etc/rsync/rsyncd.conf ; then
- ewarn "You have disabled chroot support in your rsyncd.conf. This"
- ewarn "is a security risk which you should fix. Please check your"
- ewarn "/etc/rsyncd.conf file and fix the setting 'use chroot'."
- fi
- if use stunnel ; then
- einfo "Please install \">=net-misc/stunnel-4\" in order to use stunnel feature."
- einfo
- einfo "You maybe have to update the certificates configured in"
- einfo "${EROOT}/etc/stunnel/rsync.conf"
- fi
- if use system-zlib ; then
- ewarn "Using system-zlib is incompatible with <rsync-3.1.1 when"
- ewarn "using the --compress option."
- ewarn
- ewarn "When syncing with >=rsync-3.1.1 built with bundled zlib,"
- ewarn "and the --compress option, add --new-compress (-zz)."
- ewarn
- ewarn "For syncing the portage tree, add:"
- ewarn "PORTAGE_RSYNC_EXTRA_OPTS=\"--new-compress\" to make.conf"
- fi
-}
^ permalink raw reply related [flat|nested] 9+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-misc/rsync/files/, net-misc/rsync/
@ 2020-09-18 10:39 Lars Wendler
0 siblings, 0 replies; 9+ messages in thread
From: Lars Wendler @ 2020-09-18 10:39 UTC (permalink / raw
To: gentoo-commits
commit: 04af0dcff4be3fe893129e3adc754904045a1a7a
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 18 10:37:08 2020 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Fri Sep 18 10:39:36 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=04af0dcf
net-misc/rsync: Removed old
Package-Manager: Portage-3.0.7, Repoman-3.0.1
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
net-misc/rsync/Manifest | 1 -
.../rsync/files/rsync-3.2.2-allow_bwlimit_0.patch | 77 ----------
.../rsync/files/rsync-3.2.2-zstd_see_token.patch | 31 ----
net-misc/rsync/rsync-3.2.2-r1.ebuild | 158 ---------------------
4 files changed, 267 deletions(-)
diff --git a/net-misc/rsync/Manifest b/net-misc/rsync/Manifest
index 3e3ecc5607a..c1ee190e0be 100644
--- a/net-misc/rsync/Manifest
+++ b/net-misc/rsync/Manifest
@@ -1,2 +1 @@
-DIST rsync-3.2.2.tar.gz 1057001 BLAKE2B 177a3145303ab7ed296b9233160ca4907c6b284160f4d0d15aeefd7e28009c1ea29fb3632ab57c008f0aad2f6774185cba86d2d0d68f30737fef217bd9fff402 SHA512 78107cf423e9259a7f7e9bf5527a956b648107aba72ea88b4267ae6334539342501d3c060efbc87235563b0253a12c382c4bb1f73335e68a62ff53aa905f9169
DIST rsync-3.2.3.tar.gz 1069784 BLAKE2B 085adb55d0d7e3d063fa198912fd09df67b63800a65baff5315ccb7dfc0e9d703eef30a7f2e72e3b271162c280abd9809b3f736704752c1663eed65ad8e0ac25 SHA512 48b68491f3ef644dbbbfcaec5ab90a1028593e02d50367ce161fd9d3d0bd0a3628bc57c5e5dec4be3a1d213f784f879b8a8fcdfd789ba0f99837cba16e1ae70e
diff --git a/net-misc/rsync/files/rsync-3.2.2-allow_bwlimit_0.patch b/net-misc/rsync/files/rsync-3.2.2-allow_bwlimit_0.patch
deleted file mode 100644
index 4a795bb17b9..00000000000
--- a/net-misc/rsync/files/rsync-3.2.2-allow_bwlimit_0.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-From 5dcb49c7ddec765d4a24b4f801ffc7212c085db1 Mon Sep 17 00:00:00 2001
-From: Wayne Davison <wayne@opencoder.net>
-Date: Tue, 7 Jul 2020 11:40:27 -0700
-Subject: [PATCH] Allow --bwlimit=0 again.
-
----
- options.c | 12 ++++++------
- testsuite/hands.test | 2 +-
- 2 files changed, 7 insertions(+), 7 deletions(-)
-
-diff --git a/options.c b/options.c
-index 5a372ae7..0b7b9f33 100644
---- a/options.c
-+++ b/options.c
-@@ -1253,7 +1253,7 @@ static int count_args(const char **argv)
- /* If the size_arg is an invalid string or the value is < min_value, an error
- * is put into err_buf & the return is -1. Note that this parser does NOT
- * support negative numbers, so a min_value < 0 doesn't make any sense. */
--static ssize_t parse_size_arg(char *size_arg, char def_suf, const char *opt_name, ssize_t min_value)
-+static ssize_t parse_size_arg(char *size_arg, char def_suf, const char *opt_name, ssize_t min_value, BOOL allow_0)
- {
- int reps, mult;
- const char *arg, *err = "invalid";
-@@ -1299,7 +1299,7 @@ static ssize_t parse_size_arg(char *size_arg, char def_suf, const char *opt_name
- size += atoi(arg), arg += 2;
- if (*arg)
- goto failure;
-- if (size < min_value) {
-+ if (size < min_value && (!allow_0 || size != 0)) {
- err = size < 0 ? "too big" : "too small";
- goto failure;
- }
-@@ -1683,19 +1683,19 @@ int parse_arguments(int *argc_p, const char ***argv_p)
- break;
-
- case OPT_MAX_SIZE:
-- if ((max_size = parse_size_arg(max_size_arg, 'b', "max-size", 0)) < 0)
-+ if ((max_size = parse_size_arg(max_size_arg, 'b', "max-size", 0, True)) < 0)
- return 0;
- max_size_arg = num_to_byte_string(max_size);
- break;
-
- case OPT_MIN_SIZE:
-- if ((min_size = parse_size_arg(min_size_arg, 'b', "min-size", 0)) < 0)
-+ if ((min_size = parse_size_arg(min_size_arg, 'b', "min-size", 0, True)) < 0)
- return 0;
- min_size_arg = num_to_byte_string(min_size);
- break;
-
- case OPT_BWLIMIT: {
-- ssize_t size = parse_size_arg(bwlimit_arg, 'K', "bwlimit", 512);
-+ ssize_t size = parse_size_arg(bwlimit_arg, 'K', "bwlimit", 512, True);
- if (size < 0)
- return 0;
- bwlimit_arg = num_to_byte_string(size);
-@@ -1889,7 +1889,7 @@ int parse_arguments(int *argc_p, const char ***argv_p)
- max_alloc_arg = NULL;
- }
- if (max_alloc_arg) {
-- ssize_t size = parse_size_arg(max_alloc_arg, 'B', "max-alloc", 1024*1024);
-+ ssize_t size = parse_size_arg(max_alloc_arg, 'B', "max-alloc", 1024*1024, False);
- if (size < 0)
- return 0;
- max_alloc = size;
-diff --git a/testsuite/hands.test b/testsuite/hands.test
-index 46928d4e..8e265b7c 100644
---- a/testsuite/hands.test
-+++ b/testsuite/hands.test
-@@ -16,7 +16,7 @@ DEBUG_OPTS="--debug=all0,deltasum0"
- runtest "basic operation" 'checkit "$RSYNC -av \"$fromdir/\" \"$todir\"" "$fromdir/" "$todir"'
-
- ln "$fromdir/filelist" "$fromdir/dir"
--runtest "hard links" 'checkit "$RSYNC -avH $DEBUG_OPTS \"$fromdir/\" \"$todir\"" "$fromdir/" "$todir"'
-+runtest "hard links" 'checkit "$RSYNC -avH --bwlimit=0 $DEBUG_OPTS \"$fromdir/\" \"$todir\"" "$fromdir/" "$todir"'
-
- rm "$todir/text"
- runtest "one file" 'checkit "$RSYNC -avH $DEBUG_OPTS \"$fromdir/\" \"$todir\"" "$fromdir/" "$todir"'
diff --git a/net-misc/rsync/files/rsync-3.2.2-zstd_see_token.patch b/net-misc/rsync/files/rsync-3.2.2-zstd_see_token.patch
deleted file mode 100644
index 02f22409d4c..00000000000
--- a/net-misc/rsync/files/rsync-3.2.2-zstd_see_token.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From bb1365dd7736b264738f50b683a0f81a2ed11aba Mon Sep 17 00:00:00 2001
-From: Wayne Davison <wayne@opencoder.net>
-Date: Fri, 10 Jul 2020 09:47:16 -0700
-Subject: [PATCH] Fix see_token zstd case.
-
----
- token.c | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/token.c b/token.c
-index cad6b641..61be8dd9 100644
---- a/token.c
-+++ b/token.c
-@@ -1093,13 +1093,13 @@ void see_token(char *data, int32 toklen)
- break;
- case CPRES_ZLIBX:
- break;
--#ifdef SUPPORT_LZ4
-- case CPRES_LZ4:
-- /*see_uncompressed_token(data, toklen);*/
-+#ifdef SUPPORT_ZSTD
-+ case CPRES_ZSTD:
- break;
- #endif
- #ifdef SUPPORT_LZ4
-- case CPRES_ZSTD:
-+ case CPRES_LZ4:
-+ /*see_uncompressed_token(data, toklen);*/
- break;
- #endif
- default:
diff --git a/net-misc/rsync/rsync-3.2.2-r1.ebuild b/net-misc/rsync/rsync-3.2.2-r1.ebuild
deleted file mode 100644
index a7cd968e74b..00000000000
--- a/net-misc/rsync/rsync-3.2.2-r1.ebuild
+++ /dev/null
@@ -1,158 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic prefix systemd
-
-DESCRIPTION="File transfer program to keep remote files into sync"
-HOMEPAGE="https://rsync.samba.org/"
-if [[ "${PV}" == *9999 ]] ; then
- PYTHON_COMPAT=( python3_{6,7,8} )
- inherit autotools git-r3 python-any-r1
- EGIT_REPO_URI="https://github.com/WayneD/rsync.git"
-else
- if [[ "${PV}" == *_pre* ]] ; then
- SRC_DIR="src-previews"
- else
- SRC_DIR="src"
- KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
- fi
- SRC_URI="https://rsync.samba.org/ftp/rsync/${SRC_DIR}/${P/_/}.tar.gz"
- S="${WORKDIR}/${P/_/}"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE_CPU_FLAGS_X86=" sse2"
-IUSE="acl examples iconv ipv6 libressl lz4 ssl static stunnel system-zlib xattr xxhash zstd"
-IUSE+=" ${IUSE_CPU_FLAGS_X86// / cpu_flags_x86_}"
-
-LIB_DEPEND="acl? ( virtual/acl[static-libs(+)] )
- lz4? ( app-arch/lz4[static-libs(+)] )
- ssl? (
- !libressl? ( dev-libs/openssl:0=[static-libs(+)] )
- libressl? ( dev-libs/libressl:0=[static-libs(+)] )
- )
- system-zlib? ( sys-libs/zlib[static-libs(+)] )
- xattr? ( kernel_linux? ( sys-apps/attr[static-libs(+)] ) )
- xxhash? ( dev-libs/xxhash[static-libs(+)] )
- zstd? ( app-arch/zstd[static-libs(+)] )
- >=dev-libs/popt-1.5[static-libs(+)]"
-RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
- iconv? ( virtual/libiconv )"
-DEPEND="${RDEPEND}
- static? ( ${LIB_DEPEND} )"
-
-if [[ "${PV}" == *9999 ]] ; then
- BDEPEND="${PYTHON_DEPS}
- $(python_gen_any_dep '
- dev-python/commonmark[${PYTHON_USEDEP}]
- ')"
-fi
-
-PATCHES=(
- "${FILESDIR}/${P}-allow_bwlimit_0.patch" #731306
- "${FILESDIR}/${P}-zstd_see_token.patch" #733084
-)
-
-# Only required for live ebuild
-python_check_deps() {
- has_version "dev-python/commonmark[${PYTHON_USEDEP}]"
-}
-
-src_prepare() {
- default
- if [[ "${PV}" == *9999 ]] ; then
- eaclocal -I m4
- eautoconf -o configure.sh
- eautoheader && touch config.h.in
- fi
-}
-
-src_configure() {
- use static && append-ldflags -static
- local myeconfargs=(
- --with-rsyncd-conf="${EPREFIX}"/etc/rsyncd.conf
- --without-included-popt
- $(use_enable acl acl-support)
- $(use_enable iconv)
- $(use_enable ipv6)
- $(use_enable lz4)
- $(use_enable ssl openssl)
- $(use_with !system-zlib included-zlib)
- $(use_enable xattr xattr-support)
- $(use_enable xxhash)
- $(use_enable zstd)
- )
-
- if use elibc_glibc && [[ "${ARCH}" == "amd64" ]] ; then
- # SIMD is only available for x86_64 right now
- # and only on glibc (#728868)
- myeconfargs+=( $(use_enable cpu_flags_x86_sse2 simd) )
- else
- myeconfargs+=( --disable-simd )
- fi
-
- econf "${myeconfargs[@]}"
- [[ "${PV}" == *9999 ]] || touch proto.h-tstamp #421625
-}
-
-src_install() {
- emake DESTDIR="${D}" install
-
- newconfd "${FILESDIR}"/rsyncd.conf.d rsyncd
- newinitd "${FILESDIR}"/rsyncd.init.d-r1 rsyncd
-
- dodoc NEWS.md README.md TODO tech_report.tex
-
- insinto /etc
- newins "${FILESDIR}"/rsyncd.conf-3.0.9-r1 rsyncd.conf
-
- insinto /etc/logrotate.d
- newins "${FILESDIR}"/rsyncd.logrotate rsyncd
-
- insinto /etc/xinetd.d
- newins "${FILESDIR}"/rsyncd.xinetd-3.0.9-r1 rsyncd
-
- # Install stunnel helpers
- if use stunnel ; then
- emake DESTDIR="${D}" install-ssl-daemon
- fi
-
- # Install the useful contrib scripts
- if use examples ; then
- exeinto /usr/share/rsync
- doexe support/*
- rm -f "${ED}"/usr/share/rsync/{Makefile*,*.c}
- fi
-
- eprefixify "${ED}"/etc/{,xinetd.d}/rsyncd*
-
- systemd_dounit "${FILESDIR}/rsyncd.service"
-}
-
-pkg_postinst() {
- if egrep -qis '^[[:space:]]use chroot[[:space:]]*=[[:space:]]*(no|0|false)' \
- "${EROOT}"/etc/rsyncd.conf "${EROOT}"/etc/rsync/rsyncd.conf ; then
- ewarn "You have disabled chroot support in your rsyncd.conf. This"
- ewarn "is a security risk which you should fix. Please check your"
- ewarn "/etc/rsyncd.conf file and fix the setting 'use chroot'."
- fi
- if use stunnel ; then
- einfo "Please install \">=net-misc/stunnel-4\" in order to use stunnel feature."
- einfo
- einfo "You maybe have to update the certificates configured in"
- einfo "${EROOT}/etc/stunnel/rsync.conf"
- fi
- if use system-zlib ; then
- ewarn "Using system-zlib is incompatible with <rsync-3.1.1 when"
- ewarn "using the --compress option."
- ewarn
- ewarn "When syncing with >=rsync-3.1.1 built with bundled zlib,"
- ewarn "and the --compress option, add --new-compress (-zz)."
- ewarn
- ewarn "For syncing the portage tree, add:"
- ewarn "PORTAGE_RSYNC_EXTRA_OPTS=\"--new-compress\" to make.conf"
- fi
-}
^ permalink raw reply related [flat|nested] 9+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-misc/rsync/files/, net-misc/rsync/
@ 2021-05-25 8:28 Lars Wendler
0 siblings, 0 replies; 9+ messages in thread
From: Lars Wendler @ 2021-05-25 8:28 UTC (permalink / raw
To: gentoo-commits
commit: 862d8edad5c4307c3233c432b2f2d3a9434254fa
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Tue May 25 08:27:46 2021 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Tue May 25 08:28:38 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=862d8eda
net-misc/rsync: Revbump for logrotate file syntax fix
Thanks-to: Hank Leininger <hlein <AT> korelogic.com>
Closes: https://bugs.gentoo.org/791910
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
net-misc/rsync/files/rsyncd.logrotate | 2 +-
net-misc/rsync/{rsync-3.2.3-r3.ebuild => rsync-3.2.3-r4.ebuild} | 0
2 files changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-misc/rsync/files/rsyncd.logrotate b/net-misc/rsync/files/rsyncd.logrotate
index 34bcf72d210..ec8a98284e2 100644
--- a/net-misc/rsync/files/rsyncd.logrotate
+++ b/net-misc/rsync/files/rsyncd.logrotate
@@ -2,7 +2,7 @@
compress
maxage 365
rotate 7
- size=+1024k
+ size 1024k
notifempty
missingok
copytruncate
diff --git a/net-misc/rsync/rsync-3.2.3-r3.ebuild b/net-misc/rsync/rsync-3.2.3-r4.ebuild
similarity index 100%
rename from net-misc/rsync/rsync-3.2.3-r3.ebuild
rename to net-misc/rsync/rsync-3.2.3-r4.ebuild
^ permalink raw reply related [flat|nested] 9+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-misc/rsync/files/, net-misc/rsync/
@ 2022-12-01 21:42 Andreas K. Hüttel
0 siblings, 0 replies; 9+ messages in thread
From: Andreas K. Hüttel @ 2022-12-01 21:42 UTC (permalink / raw
To: gentoo-commits
commit: 7a1ecd6cc46b1f97eef4b3d79c1bb03d41c133d0
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 1 21:41:18 2022 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Thu Dec 1 21:42:29 2022 +0000
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 <dilfridge <AT> 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 000000000000..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() {
^ permalink raw reply related [flat|nested] 9+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-misc/rsync/files/, net-misc/rsync/
@ 2024-01-05 5:57 Sam James
0 siblings, 0 replies; 9+ messages in thread
From: Sam James @ 2024-01-05 5:57 UTC (permalink / raw
To: gentoo-commits
commit: 89b65644ee5c1a71065c72c0d63efbdf97a90b9c
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 5 05:36:28 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jan 5 05:51:29 2024 +0000
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 <sam <AT> 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 000000000000..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 <github@ivan.computer>
+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 <stdlib.h>
+ #include <sys/types.h>
+ #include <sys/socket.h>
+-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 000000000000..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} == *9999 ]] ; then
+ EGIT_REPO_URI="https://github.com/WayneD/rsync.git"
+ inherit autotools git-r3
+
+ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+else
+ VERIFY_SIG_OPENPGP_KEY_PATH=/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} == *9999 ]] ; 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
+ # - 9999 needs commonmark at build time
+ if [[ ${PV} == *9999 ]] || use examples || use rrsync; then
+ python-single-r1_pkg_setup
+ fi
+}
+
+src_prepare() {
+ default
+
+ if [[ ${PV} == *9999 || -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)
+ )
+
+ # 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[@]}"
+}
+
+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
+ # 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/*
+
+ 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 when"
+ ewarn "using the --compress option."
+ ewarn
+ ewarn "When syncing with >=rsync-3.1.1 built with bundled zlib,"
+ ewarn "and the --compress option, add --new-compress (-zz)."
+ ewarn
+ ewarn "For syncing the portage tree, add:"
+ ewarn "PORTAGE_RSYNC_EXTRA_OPTS=\"--new-compress\" to make.conf"
+ fi
+}
^ permalink raw reply related [flat|nested] 9+ messages in thread
end of thread, other threads:[~2024-01-05 5:57 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-11-14 22:40 [gentoo-commits] repo/gentoo:master commit in: net-misc/rsync/files/, net-misc/rsync/ Thomas Deutschmann
-- strict thread matches above, loose matches on Subject: below --
2020-06-18 7:31 Lars Wendler
2020-06-20 1:28 Lars Wendler
2020-07-28 6:54 Lars Wendler
2020-08-07 8:21 Lars Wendler
2020-09-18 10:39 Lars Wendler
2021-05-25 8:28 Lars Wendler
2022-12-01 21:42 Andreas K. Hüttel
2024-01-05 5:57 Sam James
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox