Gentoo Archives: gentoo-commits

From: Lars Wendler <polynomial-c@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/rsync/
Date: Thu, 25 Jun 2020 09:20:34
Message-Id: 1593076786.98406e6c893975bb61cddd26dfbb083bc03c6cb4.polynomial-c@gentoo
1 commit: 98406e6c893975bb61cddd26dfbb083bc03c6cb4
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Thu Jun 25 09:19:46 2020 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Thu Jun 25 09:19:46 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=98406e6c
7
8 Revert "net-misc/rsync: Security cleanup"
9
10 This reverts commit 5eb79a6c9300e9385ffb6eac6fff0ef041bef693.
11 because >=rsync-3.2.0 has no riscv keyword yet
12
13 Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
14
15 net-misc/rsync/Manifest | 1 +
16 net-misc/rsync/rsync-3.1.3.ebuild | 91 +++++++++++++++++++++++++++++++++++++++
17 2 files changed, 92 insertions(+)
18
19 diff --git a/net-misc/rsync/Manifest b/net-misc/rsync/Manifest
20 index ea52537c282..bda6efcb431 100644
21 --- a/net-misc/rsync/Manifest
22 +++ b/net-misc/rsync/Manifest
23 @@ -1,2 +1,3 @@
24 +DIST rsync-3.1.3.tar.gz 905908 BLAKE2B 616a1f3239327a28b881310f5f249c90b8bcdb05091279cd62f9cb4e35a8428c7cdd9b89e711ba124601a738f0deb9bfbebafba7fd88b72866476138a9f8c75a SHA512 8385f4c0ea37e7a1da3cf45794154f5bc4d1c49bc625ba3b5f85adaf3eafe6d71c15bdcb1410bde731e5d4c19aff3331606637462fa27a68dc3e13192dd78f99
25 DIST rsync-3.2.0.tar.gz 1048009 BLAKE2B 641be077a88958a09b083fd9658ae7f40ce3565bee1959f0c7ef82c61356a070e7ca1e0ceeb96b7a1b31a5ee031a84733ade3965aaa93f9e18795df16a6c1460 SHA512 01a109e1e061bb7f4734b694e1f15a83efdd8fcb1995e5eeea75a8d245eead4412c09b37b0fcdfe522e368673768e4fa5ed8891ccf3ae42f60293e4e68d506c2
26 DIST rsync-3.2.1.tar.gz 1051665 BLAKE2B de1ee047b9a378cd16fceb188d0a2e14e78751c8295263e183888b464ced9263be600bbb04b7793d48e7aa1fd2ab0709d717234f346cc6a5a028c3daddcb019e SHA512 80d639ab56a993de8016115fe15794bb9aa7012e4a8300402954760566a821c230af9dcdb19143d70663497a830289212ce329fb0c4fd5c4b6f392d850e5fd8c
27
28 diff --git a/net-misc/rsync/rsync-3.1.3.ebuild b/net-misc/rsync/rsync-3.1.3.ebuild
29 new file mode 100644
30 index 00000000000..b5837aee160
31 --- /dev/null
32 +++ b/net-misc/rsync/rsync-3.1.3.ebuild
33 @@ -0,0 +1,91 @@
34 +# Copyright 1999-2020 Gentoo Authors
35 +# Distributed under the terms of the GNU General Public License v2
36 +
37 +EAPI=6
38 +
39 +inherit flag-o-matic prefix systemd
40 +
41 +DESCRIPTION="File transfer program to keep remote files into sync"
42 +HOMEPAGE="https://rsync.samba.org/"
43 +SRC_URI="https://rsync.samba.org/ftp/rsync/src/${P}.tar.gz"
44 +[[ "${PV}" = *_pre* ]] && SRC_URI="https://rsync.samba.org/ftp/rsync/src-previews/${P/_/}.tar.gz"
45 +
46 +LICENSE="GPL-3"
47 +SLOT="0"
48 +[[ ${PV} = *_pre* ]] || \
49 +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"
50 +IUSE="acl examples iconv ipv6 static stunnel xattr"
51 +
52 +LIB_DEPEND="acl? ( virtual/acl[static-libs(+)] )
53 + xattr? ( kernel_linux? ( sys-apps/attr[static-libs(+)] ) )
54 + >=dev-libs/popt-1.5[static-libs(+)]"
55 +RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
56 + iconv? ( virtual/libiconv )"
57 +DEPEND="${RDEPEND}
58 + static? ( ${LIB_DEPEND} )"
59 +
60 +S="${WORKDIR}/${P/_/}"
61 +
62 +src_configure() {
63 + use static && append-ldflags -static
64 + local myeconfargs=(
65 + --with-rsyncd-conf="${EPREFIX}"/etc/rsyncd.conf
66 + --without-included-popt
67 + $(use_enable acl acl-support)
68 + $(use_enable iconv)
69 + $(use_enable ipv6)
70 + $(use_enable xattr xattr-support)
71 + )
72 + econf "${myeconfargs[@]}"
73 + touch proto.h-tstamp #421625
74 +}
75 +
76 +src_install() {
77 + emake DESTDIR="${D}" install
78 +
79 + newconfd "${FILESDIR}"/rsyncd.conf.d rsyncd
80 + newinitd "${FILESDIR}"/rsyncd.init.d-r1 rsyncd
81 +
82 + dodoc NEWS OLDNEWS README TODO tech_report.tex
83 +
84 + insinto /etc
85 + newins "${FILESDIR}"/rsyncd.conf-3.0.9-r1 rsyncd.conf
86 +
87 + insinto /etc/logrotate.d
88 + newins "${FILESDIR}"/rsyncd.logrotate rsyncd
89 +
90 + insinto /etc/xinetd.d
91 + newins "${FILESDIR}"/rsyncd.xinetd-3.0.9-r1 rsyncd
92 +
93 + # Install stunnel helpers
94 + if use stunnel ; then
95 + emake DESTDIR="${D}" install-ssl-client
96 + emake DESTDIR="${D}" install-ssl-daemon
97 + fi
98 +
99 + # Install the useful contrib scripts
100 + if use examples ; then
101 + exeinto /usr/share/rsync
102 + doexe support/*
103 + rm -f "${ED%/}"/usr/share/rsync/{Makefile*,*.c}
104 + fi
105 +
106 + eprefixify "${ED%/}"/etc/{,xinetd.d}/rsyncd*
107 +
108 + systemd_dounit "${FILESDIR}/rsyncd.service"
109 +}
110 +
111 +pkg_postinst() {
112 + if egrep -qis '^[[:space:]]use chroot[[:space:]]*=[[:space:]]*(no|0|false)' \
113 + "${EROOT}"/etc/rsyncd.conf "${EROOT}"/etc/rsync/rsyncd.conf ; then
114 + ewarn "You have disabled chroot support in your rsyncd.conf. This"
115 + ewarn "is a security risk which you should fix. Please check your"
116 + ewarn "/etc/rsyncd.conf file and fix the setting 'use chroot'."
117 + fi
118 + if use stunnel ; then
119 + einfo "Please install \">=net-misc/stunnel-4\" in order to use stunnel feature."
120 + einfo
121 + einfo "You maybe have to update the certificates configured in"
122 + einfo "${EROOT}/etc/stunnel/rsync.conf"
123 + fi
124 +}