diff options
Diffstat (limited to 'net-misc/rsync')
-rw-r--r-- | net-misc/rsync/Manifest | 7 | ||||
-rw-r--r-- | net-misc/rsync/files/rsync-3.2.0-noexecstack.patch | 24 | ||||
-rw-r--r-- | net-misc/rsync/files/rsync-3.2.0-simd_check.patch | 13 | ||||
-rw-r--r-- | net-misc/rsync/metadata.xml | 2 | ||||
-rw-r--r-- | net-misc/rsync/rsync-3.2.0-r1.ebuild | 156 | ||||
-rw-r--r-- | net-misc/rsync/rsync-9999.ebuild | 152 |
6 files changed, 353 insertions, 1 deletions
diff --git a/net-misc/rsync/Manifest b/net-misc/rsync/Manifest index d6c631a29279..b26de190f860 100644 --- a/net-misc/rsync/Manifest +++ b/net-misc/rsync/Manifest @@ -1,3 +1,5 @@ +AUX rsync-3.2.0-noexecstack.patch 931 BLAKE2B 92afb3233c42ae5fb08cf51c257e362fe531ece228b0fe490017714449c8f77043cbba7168224bd7f710087da1ca88468f2218fcaeefe868224071567c9ea672 SHA512 a007b365cab90bf9b6d499686fa8c3fd304075d22539e9fd04cd23ccee0e66172ec5ca0f2c8312f9b941a90e30089418546c9f43d2b2507068dd7f24a64f16b0 +AUX rsync-3.2.0-simd_check.patch 446 BLAKE2B d36350122964bc4838841d4d7b814c4e5602f225f41e5d922e18aeb97d51e77c60f952beff25908a4d478d3b245157e6c8eafe5528c7d178c72a3e82e48375e0 SHA512 b262fbb6ae9fba7d01ee0d28928e45df0ede143d81ea4d23e3401e164cfa4f06454b305a54c35a280157d910b42902b627696fccdcec63053fedd0d446d0f152 AUX rsyncd.conf-3.0.9-r1 462 BLAKE2B 45a7dde876368e7392ee7a05edf593f55cf6b3b4dc913745f4322ebd75f97bcdf1a24240a54e11469bd659fd565fc74cd8eeaa9490434d88444b5a076803cea7 SHA512 5c57f633aa3daa6513b5d35a1157a50308559ad993257374ce4eea0269f6bf384938f95bed749acb19538e8c4672355351fcee5cef9607153463b19227d343d7 AUX rsyncd.conf.d 149 BLAKE2B fd2556d0c270c2baa83d4d474d44ab1d16e35f112279a339f179f9af693d977cc0863bf4cd7139363c58e4e6a1a18a24c06474ecc248167224261dbaf04ae0a8 SHA512 8ea9a2f1fea508fa132313fa16513eac84a9ed3ce75741c42769b56bbcd3f1bd2eb8bfdfe40a6c7f619e4281e8fc8d95d1bd84096d0b64aaacf606cd614ae5b3 AUX rsyncd.init.d-r1 247 BLAKE2B ec4f7a875a51bae10cff7e15df18d285b01dddaa99a03127ba242ec535b7c8a3af3ad4489661ba7b5f6b074e2af38b12da394c0f8992bd28328d807a89757bb0 SHA512 df2ef4d9e65fa72daa9a7d91d69a06027d0e0fbc48f9ebd485e2d51990c8d00985b7ccf41314f984975e8073e2075bbdfe5543754718381497c334dc7d96451a @@ -5,5 +7,8 @@ AUX rsyncd.logrotate 105 BLAKE2B 82430036a5ca123ba20bc80040e98869734b3b397440968 AUX rsyncd.service 206 BLAKE2B 3b8bf9165d2410f731c5c2a63fdb5553708aa6aca0fed99acefb38c16b8ae9430a5257440c070b88b71a1295cc6360d89458e1b6696ec9897e722699f162769e SHA512 b848a13856027e4fe1fd206a2aeb32854abd73beb31ebad7ac62c36b433e65507bbb5eef3901a42f46e70a4e887c7f9013617f19712e160ce155f3cb83bfc625 AUX rsyncd.xinetd-3.0.9-r1 194 BLAKE2B 8e3edf4831e020451ba1886e2e8ae86e576016aabcaaf8e84c48adb15ba6a2e8d8c58098af2757011ea4f84fbfd758029d905fb8f5ed21bcc5ac34c3baae2a9c SHA512 fc053fc4748950343e866cc95284d037156a953454e4294d775f01f059e96e805582688bf1de5c965836889192ce4a663ec740e6ec2265406e509c5c6d6c3215 DIST rsync-3.1.3.tar.gz 905908 BLAKE2B 616a1f3239327a28b881310f5f249c90b8bcdb05091279cd62f9cb4e35a8428c7cdd9b89e711ba124601a738f0deb9bfbebafba7fd88b72866476138a9f8c75a SHA512 8385f4c0ea37e7a1da3cf45794154f5bc4d1c49bc625ba3b5f85adaf3eafe6d71c15bdcb1410bde731e5d4c19aff3331606637462fa27a68dc3e13192dd78f99 +DIST rsync-3.2.0.tar.gz 1048009 BLAKE2B 641be077a88958a09b083fd9658ae7f40ce3565bee1959f0c7ef82c61356a070e7ca1e0ceeb96b7a1b31a5ee031a84733ade3965aaa93f9e18795df16a6c1460 SHA512 01a109e1e061bb7f4734b694e1f15a83efdd8fcb1995e5eeea75a8d245eead4412c09b37b0fcdfe522e368673768e4fa5ed8891ccf3ae42f60293e4e68d506c2 EBUILD rsync-3.1.3.ebuild 2791 BLAKE2B c5996386d1e0adf52de159361d1efe245e63abe68fc44febb11b2ec607e27210c572bd4da2045142b4cc4fc5f9efd6a750da9aa4b38f6b1d194cf551e112f48d SHA512 2ef8ea9bfba4df20680d1b83aa121df54d27736c2cd7f65d04df8737bb36c2641e4f087f4b90724567d10b1262de8f6671aa80856982f74c15d28e42437fd6e7 -MISC metadata.xml 449 BLAKE2B 961dae7e8c69c0d452c9eedf67223d14ff8ff481821206d6fe2daed3a23a0da704155d61339b0d32182e5ba9195ff25b3383bd90945ea474b21da7f66f09c77f SHA512 1c0f031c078a7c22b8375b093dcd241e139ca86a61e2d463d9d01946b57b24dff29ab489ac063b70d210d1306106896fe77bd9678331d5954ef3182222d4f920 +EBUILD rsync-3.2.0-r1.ebuild 4511 BLAKE2B 68012e3bfee86051abca8db34ed80bc6e35886e16e23f16e63b9dbb22637d46e66a2123bf21703bc78a8a229ed9d6b797ee8fa53a27883f36bff26df0f0b7188 SHA512 3b441789634815f311ed77760a4ca030c8b20568d8f5e3cd5f638c05743bf6e762de2b0fb30b64252c95a0db8d5c43e86ee7e9ef4c4261640af28e6cd66eee47 +EBUILD rsync-9999.ebuild 4455 BLAKE2B cbbc9b23733d1cca2d6d313b7438aec818199b4a85872ca5ece00d79e7932c3d037f5fafcc48313c3f56f8ecded946bb4abfe61763769e11c336cb30b2a6b5f2 SHA512 77e391b19108f82d1722e62f34619e1469d33d4c0420a683ca719c748473ec42335f2dc54c8422783ec0171ba165c6e6e2ad04b5ae9adb4bd5407e506f8ed732 +MISC metadata.xml 654 BLAKE2B 28ea5b4e47a5e420ab64c1b688425995d9ab4e556a27b56b27f512a15ec337aa6a1028449ae0a2f9fa313df2b5b5e98b6cf98a38dac82eb83ca3b4871f3b1514 SHA512 3e23d80d1c4fffdc38287e0f1a09f44040a53eb1b395dd8e9b47aa6d467ed4cf4a0b379ce578f1ecf6438a4f322375b633dc47fd2a50e7badd5f94054bfb558d diff --git a/net-misc/rsync/files/rsync-3.2.0-noexecstack.patch b/net-misc/rsync/files/rsync-3.2.0-noexecstack.patch new file mode 100644 index 000000000000..918346062e6a --- /dev/null +++ b/net-misc/rsync/files/rsync-3.2.0-noexecstack.patch @@ -0,0 +1,24 @@ +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 new file mode 100644 index 000000000000..255f2792dc07 --- /dev/null +++ b/net-misc/rsync/files/rsync-3.2.0-simd_check.patch @@ -0,0 +1,13 @@ +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/metadata.xml b/net-misc/rsync/metadata.xml index 148a18e18adc..1f39f5419f36 100644 --- a/net-misc/rsync/metadata.xml +++ b/net-misc/rsync/metadata.xml @@ -10,5 +10,7 @@ </upstream> <use> <flag name="stunnel">Provide helper scripts for using rsync via >=net-misc/stunnel-4</flag> + <flag name="system-zlib">Use system zlib instead of bundled one. This is incompatible with older rsync releases!</flag> + <flag name="xxhash">Enable <pkg>dev-libs/xxhash</pkg> support for hashing</flag> </use> </pkgmetadata> diff --git a/net-misc/rsync/rsync-3.2.0-r1.ebuild b/net-misc/rsync/rsync-3.2.0-r1.ebuild new file mode 100644 index 000000000000..672e23e2d33b --- /dev/null +++ b/net-misc/rsync/rsync-3.2.0-r1.ebuild @@ -0,0 +1,156 @@ +# 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 ~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-9999.ebuild b/net-misc/rsync/rsync-9999.ebuild new file mode 100644 index 000000000000..38d7035321aa --- /dev/null +++ b/net-misc/rsync/rsync-9999.ebuild @@ -0,0 +1,152 @@ +# 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 ~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 [[ "${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 +} |