Gentoo Archives: gentoo-commits

From: "Anthony G. Basile" <blueness@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/musl:master commit in: net-misc/rsync/
Date: Sun, 28 Jun 2020 17:10:52
Message-Id: 1593364167.af17d2ed1ab5879c1f2d52fe92797cb0d19d3a38.blueness@gentoo
1 commit: af17d2ed1ab5879c1f2d52fe92797cb0d19d3a38
2 Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
3 AuthorDate: Sun Jun 28 17:09:27 2020 +0000
4 Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
5 CommitDate: Sun Jun 28 17:09:27 2020 +0000
6 URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=af17d2ed
7
8 net-misc/rsync: version bump to 3.2.0-r1
9
10 Package-Manager: Portage-2.3.99, Repoman-2.3.23
11 RepoMan-Options: --force
12 Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org>
13
14 net-misc/rsync/Manifest | 1 +
15 net-misc/rsync/rsync-3.2.0-r1.ebuild | 157 +++++++++++++++++++++++++++++++++++
16 2 files changed, 158 insertions(+)
17
18 diff --git a/net-misc/rsync/Manifest b/net-misc/rsync/Manifest
19 index 829c80d..12fd2dd 100644
20 --- a/net-misc/rsync/Manifest
21 +++ b/net-misc/rsync/Manifest
22 @@ -1 +1,2 @@
23 DIST rsync-3.1.3.tar.gz 905908 BLAKE2B 616a1f3239327a28b881310f5f249c90b8bcdb05091279cd62f9cb4e35a8428c7cdd9b89e711ba124601a738f0deb9bfbebafba7fd88b72866476138a9f8c75a SHA512 8385f4c0ea37e7a1da3cf45794154f5bc4d1c49bc625ba3b5f85adaf3eafe6d71c15bdcb1410bde731e5d4c19aff3331606637462fa27a68dc3e13192dd78f99
24 +DIST rsync-3.2.0.tar.gz 1048009 BLAKE2B 641be077a88958a09b083fd9658ae7f40ce3565bee1959f0c7ef82c61356a070e7ca1e0ceeb96b7a1b31a5ee031a84733ade3965aaa93f9e18795df16a6c1460 SHA512 01a109e1e061bb7f4734b694e1f15a83efdd8fcb1995e5eeea75a8d245eead4412c09b37b0fcdfe522e368673768e4fa5ed8891ccf3ae42f60293e4e68d506c2
25
26 diff --git a/net-misc/rsync/rsync-3.2.0-r1.ebuild b/net-misc/rsync/rsync-3.2.0-r1.ebuild
27 new file mode 100644
28 index 0000000..7c3b996
29 --- /dev/null
30 +++ b/net-misc/rsync/rsync-3.2.0-r1.ebuild
31 @@ -0,0 +1,157 @@
32 +# Copyright 1999-2020 Gentoo Authors
33 +# Distributed under the terms of the GNU General Public License v2
34 +
35 +EAPI=7
36 +
37 +inherit autotools flag-o-matic prefix systemd
38 +
39 +DESCRIPTION="File transfer program to keep remote files into sync"
40 +HOMEPAGE="https://rsync.samba.org/"
41 +if [[ "${PV}" == *9999 ]] ; then
42 + PYTHON_COMPAT=( python3_{6,7,8} )
43 + inherit git-r3 python-any-r1
44 + EGIT_REPO_URI="https://github.com/WayneD/rsync.git"
45 +else
46 + if [[ "${PV}" == *_pre* ]] ; then
47 + SRC_DIR="src-previews"
48 + else
49 + SRC_DIR="src"
50 + KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86"
51 + fi
52 + SRC_URI="https://rsync.samba.org/ftp/rsync/${SRC_DIR}/${P/_/}.tar.gz"
53 + S="${WORKDIR}/${P/_/}"
54 +fi
55 +
56 +LICENSE="GPL-3"
57 +SLOT="0"
58 +IUSE_CPU_FLAGS_X86=" sse2"
59 +IUSE="acl examples iconv ipv6 libressl lz4 ssl static stunnel system-zlib xattr xxhash zstd"
60 +IUSE+=" ${IUSE_CPU_FLAGS_X86// / cpu_flags_x86_}"
61 +
62 +LIB_DEPEND="acl? ( virtual/acl[static-libs(+)] )
63 + lz4? ( app-arch/lz4[static-libs(+)] )
64 + ssl? (
65 + !libressl? ( dev-libs/openssl:0=[static-libs(+)] )
66 + libressl? ( dev-libs/libressl:0=[static-libs(+)] )
67 + )
68 + system-zlib? ( sys-libs/zlib[static-libs(+)] )
69 + xattr? ( kernel_linux? ( sys-apps/attr[static-libs(+)] ) )
70 + xxhash? ( dev-libs/xxhash[static-libs(+)] )
71 + zstd? ( app-arch/zstd[static-libs(+)] )
72 + >=dev-libs/popt-1.5[static-libs(+)]"
73 +RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
74 + iconv? ( virtual/libiconv )"
75 +DEPEND="${RDEPEND}
76 + static? ( ${LIB_DEPEND} )"
77 +
78 +if [[ "${PV}" == *9999 ]] ; then
79 + BDEPEND="${PYTHON_DEPS}
80 + $(python_gen_any_dep '
81 + dev-python/commonmark[${PYTHON_USEDEP}]
82 + ')"
83 +fi
84 +
85 +# Only required for live ebuild
86 +python_check_deps() {
87 + has_version "dev-python/commonmark[${PYTHON_USEDEP}]"
88 +}
89 +
90 +PATCHES=(
91 + "${FILESDIR}/${P}-simd_check.patch"
92 + "${FILESDIR}/${P}-noexecstack.patch" #728882
93 + "${FILESDIR}"/${PN}-fix-musl-ipv6.patch
94 +)
95 +
96 +src_prepare() {
97 + default
98 +
99 + eaclocal -I m4
100 + eautoconf -o configure.sh
101 + eautoheader && touch config.h.in
102 +}
103 +
104 +src_configure() {
105 + use static && append-ldflags -static
106 + local myeconfargs=(
107 + --with-rsyncd-conf="${EPREFIX}"/etc/rsyncd.conf
108 + --without-included-popt
109 + $(use_enable acl acl-support)
110 + $(use_enable iconv)
111 + $(use_enable ipv6)
112 + $(use_enable lz4)
113 + $(use_enable ssl openssl)
114 + $(use_with !system-zlib included-zlib)
115 + $(use_enable xattr xattr-support)
116 + $(use_enable xxhash)
117 + $(use_enable zstd)
118 + )
119 +
120 + if [[ "${ARCH}" == "amd64" ]] ; then
121 + # SIMD is only available for x86_64 right now (#728868)
122 + myeconfargs+=( $(use_enable cpu_flags_x86_sse2 simd) )
123 + else
124 + myeconfargs+=( --disable-simd )
125 + fi
126 +
127 + econf "${myeconfargs[@]}"
128 + [[ "${PV}" == *9999 ]] || touch proto.h-tstamp #421625
129 +}
130 +
131 +src_install() {
132 + emake DESTDIR="${D}" install
133 +
134 + newconfd "${FILESDIR}"/rsyncd.conf.d rsyncd
135 + newinitd "${FILESDIR}"/rsyncd.init.d-r1 rsyncd
136 +
137 + dodoc NEWS.md OLDNEWS.md README.md TODO tech_report.tex
138 +
139 + insinto /etc
140 + newins "${FILESDIR}"/rsyncd.conf-3.0.9-r1 rsyncd.conf
141 +
142 + insinto /etc/logrotate.d
143 + newins "${FILESDIR}"/rsyncd.logrotate rsyncd
144 +
145 + insinto /etc/xinetd.d
146 + newins "${FILESDIR}"/rsyncd.xinetd-3.0.9-r1 rsyncd
147 +
148 + # Install stunnel helpers
149 + if use stunnel ; then
150 + emake DESTDIR="${D}" install-ssl-daemon
151 + fi
152 +
153 + # Install the useful contrib scripts
154 + if use examples ; then
155 + exeinto /usr/share/rsync
156 + doexe support/*
157 + rm -f "${ED}"/usr/share/rsync/{Makefile*,*.c}
158 + fi
159 +
160 + eprefixify "${ED}"/etc/{,xinetd.d}/rsyncd*
161 +
162 + systemd_dounit "${FILESDIR}/rsyncd.service"
163 +}
164 +
165 +pkg_postinst() {
166 + if egrep -qis '^[[:space:]]use chroot[[:space:]]*=[[:space:]]*(no|0|false)' \
167 + "${EROOT}"/etc/rsyncd.conf "${EROOT}"/etc/rsync/rsyncd.conf ; then
168 + ewarn "You have disabled chroot support in your rsyncd.conf. This"
169 + ewarn "is a security risk which you should fix. Please check your"
170 + ewarn "/etc/rsyncd.conf file and fix the setting 'use chroot'."
171 + fi
172 + if use stunnel ; then
173 + einfo "Please install \">=net-misc/stunnel-4\" in order to use stunnel feature."
174 + einfo
175 + einfo "You maybe have to update the certificates configured in"
176 + einfo "${EROOT}/etc/stunnel/rsync.conf"
177 + fi
178 + if use system-zlib ; then
179 + ewarn "Using system-zlib is incompatible with <rsync-3.1.1 when"
180 + ewarn "using the --compress option."
181 + ewarn
182 + ewarn "When syncing with >=rsync-3.1.1 built with bundled zlib,"
183 + ewarn "and the --compress option, add --new-compress (-zz)."
184 + ewarn
185 + ewarn "For syncing the portage tree, add:"
186 + ewarn "PORTAGE_RSYNC_EXTRA_OPTS=\"--new-compress\" to make.conf"
187 + fi
188 +}