From 9f8b0a10cde068cb69c2714a61b5f8d00e96ea99 Mon Sep 17 00:00:00 2001 From: Lars Wendler Date: Sat, 20 Jun 2020 03:20:59 +0200 Subject: 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 --- 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 ---- net-misc/rsync/rsync-3.2.0.ebuild | 133 +++++++++++++++++++++ net-misc/rsync/rsync-3.2.0_pre3.ebuild | 133 --------------------- 5 files changed, 158 insertions(+), 158 deletions(-) create mode 100644 net-misc/rsync/files/rsync-3.2.0-simd_check.patch delete mode 100644 net-misc/rsync/files/rsync-3.2.0_pre3-simd_check.patch create mode 100644 net-misc/rsync/rsync-3.2.0.ebuild delete mode 100644 net-misc/rsync/rsync-3.2.0_pre3.ebuild (limited to 'net-misc/rsync') diff --git a/net-misc/rsync/Manifest b/net-misc/rsync/Manifest index 7ef8c17e978b..12fd2dd6f35a 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 000000000000..db3ee83dc0d0 --- /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 1d50c95b00d2..000000000000 --- 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.ebuild b/net-misc/rsync/rsync-3.2.0.ebuild new file mode 100644 index 000000000000..007adedc2779 --- /dev/null +++ b/net-misc/rsync/rsync-3.2.0.ebuild @@ -0,0 +1,133 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{6,7,8} ) + +inherit flag-o-matic prefix python-any-r1 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" +[[ ${PV} = *_pre* ]] || \ +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_}" + +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} )" + +BDEPEND="${PYTHON_DEPS} + $(python_gen_any_dep ' + dev-python/commonmark[${PYTHON_USEDEP}] + ')" + +S="${WORKDIR}/${P/_/}" + +python_check_deps() { + has_version "dev-python/commonmark[${PYTHON_USEDEP}]" +} + +src_prepare() { + default + eapply -Z "${FILESDIR}/${PN}-3.2.0-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) + $(use_enable ssl openssl) + $(use_with !system-zlib included-zlib) + $(use_enable xattr xattr-support) + $(use_enable xxhash) + $(use_enable zstd) + ) + econf "${myeconfargs[@]}" + 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-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 + if use system-zlib ; then + ewarn "Using system-zlib is incompatible with =rsync-3.1.1 built with bundled zlib," + ewarn "and the --compress option, add --new-compress (-zz)." + ewarn + ewarn "For syncing the portage tree, add:" + ewarn "PORTAGE_RSYNC_EXTRA_OPTS=\"--new-compress\" to make.conf" + fi +} diff --git a/net-misc/rsync/rsync-3.2.0_pre3.ebuild b/net-misc/rsync/rsync-3.2.0_pre3.ebuild deleted file mode 100644 index 0b2230194eb6..000000000000 --- a/net-misc/rsync/rsync-3.2.0_pre3.ebuild +++ /dev/null @@ -1,133 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{6,7,8} ) - -inherit flag-o-matic prefix python-any-r1 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" -[[ ${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(+)] ) - 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} )" - -BDEPEND="${PYTHON_DEPS} - $(python_gen_any_dep ' - dev-python/commonmark[${PYTHON_USEDEP}] - ')" - -S="${WORKDIR}/${P/_/}" - -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) - $(use_enable ssl openssl) - $(use_with !system-zlib included-zlib) - $(use_enable xattr xattr-support) - $(use_enable xxhash) - $(use_enable zstd) - ) - econf "${myeconfargs[@]}" - 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-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 - 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 -} -- cgit v1.2.3-65-gdbad