1 |
commit: 7edb71845d9237c8dadab3b4621dc948f11d7bec |
2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Aug 7 08:21:07 2020 +0000 |
4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Aug 7 08:21:07 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7edb7184 |
7 |
|
8 |
net-misc/rsync: Removed old |
9 |
|
10 |
Package-Manager: Portage-3.0.1, Repoman-2.3.23 |
11 |
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> |
12 |
|
13 |
net-misc/rsync/Manifest | 1 - |
14 |
net-misc/rsync/files/rsync-3.2.0-noexecstack.patch | 24 ---- |
15 |
net-misc/rsync/files/rsync-3.2.0-simd_check.patch | 13 -- |
16 |
net-misc/rsync/rsync-3.2.0-r1.ebuild | 156 --------------------- |
17 |
net-misc/rsync/rsync-3.2.2.ebuild | 153 -------------------- |
18 |
5 files changed, 347 deletions(-) |
19 |
|
20 |
diff --git a/net-misc/rsync/Manifest b/net-misc/rsync/Manifest |
21 |
index 42d42be819a..3e3ecc5607a 100644 |
22 |
--- a/net-misc/rsync/Manifest |
23 |
+++ b/net-misc/rsync/Manifest |
24 |
@@ -1,3 +1,2 @@ |
25 |
-DIST rsync-3.2.0.tar.gz 1048009 BLAKE2B 641be077a88958a09b083fd9658ae7f40ce3565bee1959f0c7ef82c61356a070e7ca1e0ceeb96b7a1b31a5ee031a84733ade3965aaa93f9e18795df16a6c1460 SHA512 01a109e1e061bb7f4734b694e1f15a83efdd8fcb1995e5eeea75a8d245eead4412c09b37b0fcdfe522e368673768e4fa5ed8891ccf3ae42f60293e4e68d506c2 |
26 |
DIST rsync-3.2.2.tar.gz 1057001 BLAKE2B 177a3145303ab7ed296b9233160ca4907c6b284160f4d0d15aeefd7e28009c1ea29fb3632ab57c008f0aad2f6774185cba86d2d0d68f30737fef217bd9fff402 SHA512 78107cf423e9259a7f7e9bf5527a956b648107aba72ea88b4267ae6334539342501d3c060efbc87235563b0253a12c382c4bb1f73335e68a62ff53aa905f9169 |
27 |
DIST rsync-3.2.3.tar.gz 1069784 BLAKE2B 085adb55d0d7e3d063fa198912fd09df67b63800a65baff5315ccb7dfc0e9d703eef30a7f2e72e3b271162c280abd9809b3f736704752c1663eed65ad8e0ac25 SHA512 48b68491f3ef644dbbbfcaec5ab90a1028593e02d50367ce161fd9d3d0bd0a3628bc57c5e5dec4be3a1d213f784f879b8a8fcdfd789ba0f99837cba16e1ae70e |
28 |
|
29 |
diff --git a/net-misc/rsync/files/rsync-3.2.0-noexecstack.patch b/net-misc/rsync/files/rsync-3.2.0-noexecstack.patch |
30 |
deleted file mode 100644 |
31 |
index 918346062e6..00000000000 |
32 |
--- a/net-misc/rsync/files/rsync-3.2.0-noexecstack.patch |
33 |
+++ /dev/null |
34 |
@@ -1,24 +0,0 @@ |
35 |
-From 75901616c5f38a9ff6ba736c8281933e8ce64b8b Mon Sep 17 00:00:00 2001 |
36 |
-From: =?UTF-8?q?Holger=20Hoffst=C3=A4tte?= <holger@××××××××××××××××××.com> |
37 |
-Date: Sat, 20 Jun 2020 16:54:11 +0200 |
38 |
-Subject: [PATCH] Pass --noexecstack to assembler. |
39 |
- |
40 |
-This prevents Linux from rightfully complaining about an executable |
41 |
-stack segment, which is widely considered a security hazard. |
42 |
---- |
43 |
- Makefile.in | 2 +- |
44 |
- 1 file changed, 1 insertion(+), 1 deletion(-) |
45 |
- |
46 |
-diff --git a/Makefile.in b/Makefile.in |
47 |
-index 31ddc43b..60aff920 100644 |
48 |
---- a/Makefile.in |
49 |
-+++ b/Makefile.in |
50 |
-@@ -135,7 +135,7 @@ simd-checksum-x86_64.o: simd-checksum-x86_64.cpp |
51 |
- $(CXX) $(CXXFLAGS) $(CPPFLAGS) -c -o $@ $(srcdir)/simd-checksum-x86_64.cpp |
52 |
- |
53 |
- lib/md5-asm-x86_64.o: lib/md5-asm-x86_64.s |
54 |
-- $(CC) -c -o $@ $(srcdir)/lib/md5-asm-x86_64.s |
55 |
-+ $(CC) -Wa,--noexecstack -c -o $@ $(srcdir)/lib/md5-asm-x86_64.s |
56 |
- |
57 |
- tls$(EXEEXT): $(TLS_OBJ) |
58 |
- $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(TLS_OBJ) $(LIBS) |
59 |
|
60 |
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 |
61 |
deleted file mode 100644 |
62 |
index 255f2792dc0..00000000000 |
63 |
--- a/net-misc/rsync/files/rsync-3.2.0-simd_check.patch |
64 |
+++ /dev/null |
65 |
@@ -1,13 +0,0 @@ |
66 |
-https://github.com/WayneD/rsync/pull/24 |
67 |
- |
68 |
---- rsync-3.2.0/configure.ac 2020-06-19 23:11:01.000000000 +0200 |
69 |
-+++ rsync-3.2.0/configure.ac 2020-06-19 23:11:01.000000000 +0200 |
70 |
-@@ -207,7 +207,7 @@ |
71 |
- if test x"$CXX" != x""; then |
72 |
- CXX_VERSION=`$CXX --version 2>/dev/null | head -n 1` |
73 |
- case "$CXX_VERSION" in |
74 |
-- g++*) |
75 |
-+ *g++*) |
76 |
- CXX_VERSION=`$CXX -dumpversion | sed 's/\..*//g'` |
77 |
- if test "$CXX_VERSION" -ge "5"; then |
78 |
- CXX_OK=yes |
79 |
|
80 |
diff --git a/net-misc/rsync/rsync-3.2.0-r1.ebuild b/net-misc/rsync/rsync-3.2.0-r1.ebuild |
81 |
deleted file mode 100644 |
82 |
index d74e0fca5bb..00000000000 |
83 |
--- a/net-misc/rsync/rsync-3.2.0-r1.ebuild |
84 |
+++ /dev/null |
85 |
@@ -1,156 +0,0 @@ |
86 |
-# Copyright 1999-2020 Gentoo Authors |
87 |
-# Distributed under the terms of the GNU General Public License v2 |
88 |
- |
89 |
-EAPI=7 |
90 |
- |
91 |
-inherit autotools flag-o-matic prefix systemd |
92 |
- |
93 |
-DESCRIPTION="File transfer program to keep remote files into sync" |
94 |
-HOMEPAGE="https://rsync.samba.org/" |
95 |
-if [[ "${PV}" == *9999 ]] ; then |
96 |
- PYTHON_COMPAT=( python3_{6,7,8} ) |
97 |
- inherit git-r3 python-any-r1 |
98 |
- EGIT_REPO_URI="https://github.com/WayneD/rsync.git" |
99 |
-else |
100 |
- if [[ "${PV}" == *_pre* ]] ; then |
101 |
- SRC_DIR="src-previews" |
102 |
- else |
103 |
- SRC_DIR="src" |
104 |
- 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" |
105 |
- fi |
106 |
- SRC_URI="https://rsync.samba.org/ftp/rsync/${SRC_DIR}/${P/_/}.tar.gz" |
107 |
- S="${WORKDIR}/${P/_/}" |
108 |
-fi |
109 |
- |
110 |
-LICENSE="GPL-3" |
111 |
-SLOT="0" |
112 |
-IUSE_CPU_FLAGS_X86=" sse2" |
113 |
-IUSE="acl examples iconv ipv6 libressl lz4 ssl static stunnel system-zlib xattr xxhash zstd" |
114 |
-IUSE+=" ${IUSE_CPU_FLAGS_X86// / cpu_flags_x86_}" |
115 |
- |
116 |
-LIB_DEPEND="acl? ( virtual/acl[static-libs(+)] ) |
117 |
- lz4? ( app-arch/lz4[static-libs(+)] ) |
118 |
- ssl? ( |
119 |
- !libressl? ( dev-libs/openssl:0=[static-libs(+)] ) |
120 |
- libressl? ( dev-libs/libressl:0=[static-libs(+)] ) |
121 |
- ) |
122 |
- system-zlib? ( sys-libs/zlib[static-libs(+)] ) |
123 |
- xattr? ( kernel_linux? ( sys-apps/attr[static-libs(+)] ) ) |
124 |
- xxhash? ( dev-libs/xxhash[static-libs(+)] ) |
125 |
- zstd? ( app-arch/zstd[static-libs(+)] ) |
126 |
- >=dev-libs/popt-1.5[static-libs(+)]" |
127 |
-RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} ) |
128 |
- iconv? ( virtual/libiconv )" |
129 |
-DEPEND="${RDEPEND} |
130 |
- static? ( ${LIB_DEPEND} )" |
131 |
- |
132 |
-if [[ "${PV}" == *9999 ]] ; then |
133 |
- BDEPEND="${PYTHON_DEPS} |
134 |
- $(python_gen_any_dep ' |
135 |
- dev-python/commonmark[${PYTHON_USEDEP}] |
136 |
- ')" |
137 |
-fi |
138 |
- |
139 |
-# Only required for live ebuild |
140 |
-python_check_deps() { |
141 |
- has_version "dev-python/commonmark[${PYTHON_USEDEP}]" |
142 |
-} |
143 |
- |
144 |
-PATCHES=( |
145 |
- "${FILESDIR}/${P}-simd_check.patch" |
146 |
- "${FILESDIR}/${P}-noexecstack.patch" #728882 |
147 |
-) |
148 |
- |
149 |
-src_prepare() { |
150 |
- default |
151 |
- |
152 |
- eaclocal -I m4 |
153 |
- eautoconf -o configure.sh |
154 |
- eautoheader && touch config.h.in |
155 |
-} |
156 |
- |
157 |
-src_configure() { |
158 |
- use static && append-ldflags -static |
159 |
- local myeconfargs=( |
160 |
- --with-rsyncd-conf="${EPREFIX}"/etc/rsyncd.conf |
161 |
- --without-included-popt |
162 |
- $(use_enable acl acl-support) |
163 |
- $(use_enable iconv) |
164 |
- $(use_enable ipv6) |
165 |
- $(use_enable lz4) |
166 |
- $(use_enable ssl openssl) |
167 |
- $(use_with !system-zlib included-zlib) |
168 |
- $(use_enable xattr xattr-support) |
169 |
- $(use_enable xxhash) |
170 |
- $(use_enable zstd) |
171 |
- ) |
172 |
- |
173 |
- if [[ "${ARCH}" == "amd64" ]] ; then |
174 |
- # SIMD is only available for x86_64 right now (#728868) |
175 |
- myeconfargs+=( $(use_enable cpu_flags_x86_sse2 simd) ) |
176 |
- else |
177 |
- myeconfargs+=( --disable-simd ) |
178 |
- fi |
179 |
- |
180 |
- econf "${myeconfargs[@]}" |
181 |
- [[ "${PV}" == *9999 ]] || touch proto.h-tstamp #421625 |
182 |
-} |
183 |
- |
184 |
-src_install() { |
185 |
- emake DESTDIR="${D}" install |
186 |
- |
187 |
- newconfd "${FILESDIR}"/rsyncd.conf.d rsyncd |
188 |
- newinitd "${FILESDIR}"/rsyncd.init.d-r1 rsyncd |
189 |
- |
190 |
- dodoc NEWS.md OLDNEWS.md README.md TODO tech_report.tex |
191 |
- |
192 |
- insinto /etc |
193 |
- newins "${FILESDIR}"/rsyncd.conf-3.0.9-r1 rsyncd.conf |
194 |
- |
195 |
- insinto /etc/logrotate.d |
196 |
- newins "${FILESDIR}"/rsyncd.logrotate rsyncd |
197 |
- |
198 |
- insinto /etc/xinetd.d |
199 |
- newins "${FILESDIR}"/rsyncd.xinetd-3.0.9-r1 rsyncd |
200 |
- |
201 |
- # Install stunnel helpers |
202 |
- if use stunnel ; then |
203 |
- emake DESTDIR="${D}" install-ssl-daemon |
204 |
- fi |
205 |
- |
206 |
- # Install the useful contrib scripts |
207 |
- if use examples ; then |
208 |
- exeinto /usr/share/rsync |
209 |
- doexe support/* |
210 |
- rm -f "${ED}"/usr/share/rsync/{Makefile*,*.c} |
211 |
- fi |
212 |
- |
213 |
- eprefixify "${ED}"/etc/{,xinetd.d}/rsyncd* |
214 |
- |
215 |
- systemd_dounit "${FILESDIR}/rsyncd.service" |
216 |
-} |
217 |
- |
218 |
-pkg_postinst() { |
219 |
- if egrep -qis '^[[:space:]]use chroot[[:space:]]*=[[:space:]]*(no|0|false)' \ |
220 |
- "${EROOT}"/etc/rsyncd.conf "${EROOT}"/etc/rsync/rsyncd.conf ; then |
221 |
- ewarn "You have disabled chroot support in your rsyncd.conf. This" |
222 |
- ewarn "is a security risk which you should fix. Please check your" |
223 |
- ewarn "/etc/rsyncd.conf file and fix the setting 'use chroot'." |
224 |
- fi |
225 |
- if use stunnel ; then |
226 |
- einfo "Please install \">=net-misc/stunnel-4\" in order to use stunnel feature." |
227 |
- einfo |
228 |
- einfo "You maybe have to update the certificates configured in" |
229 |
- einfo "${EROOT}/etc/stunnel/rsync.conf" |
230 |
- fi |
231 |
- if use system-zlib ; then |
232 |
- ewarn "Using system-zlib is incompatible with <rsync-3.1.1 when" |
233 |
- ewarn "using the --compress option." |
234 |
- ewarn |
235 |
- ewarn "When syncing with >=rsync-3.1.1 built with bundled zlib," |
236 |
- ewarn "and the --compress option, add --new-compress (-zz)." |
237 |
- ewarn |
238 |
- ewarn "For syncing the portage tree, add:" |
239 |
- ewarn "PORTAGE_RSYNC_EXTRA_OPTS=\"--new-compress\" to make.conf" |
240 |
- fi |
241 |
-} |
242 |
|
243 |
diff --git a/net-misc/rsync/rsync-3.2.2.ebuild b/net-misc/rsync/rsync-3.2.2.ebuild |
244 |
deleted file mode 100644 |
245 |
index fb78f513976..00000000000 |
246 |
--- a/net-misc/rsync/rsync-3.2.2.ebuild |
247 |
+++ /dev/null |
248 |
@@ -1,153 +0,0 @@ |
249 |
-# Copyright 1999-2020 Gentoo Authors |
250 |
-# Distributed under the terms of the GNU General Public License v2 |
251 |
- |
252 |
-EAPI=7 |
253 |
- |
254 |
-inherit flag-o-matic prefix systemd |
255 |
- |
256 |
-DESCRIPTION="File transfer program to keep remote files into sync" |
257 |
-HOMEPAGE="https://rsync.samba.org/" |
258 |
-if [[ "${PV}" == *9999 ]] ; then |
259 |
- PYTHON_COMPAT=( python3_{6,7,8} ) |
260 |
- inherit autotools git-r3 python-any-r1 |
261 |
- EGIT_REPO_URI="https://github.com/WayneD/rsync.git" |
262 |
-else |
263 |
- if [[ "${PV}" == *_pre* ]] ; then |
264 |
- SRC_DIR="src-previews" |
265 |
- else |
266 |
- SRC_DIR="src" |
267 |
- 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" |
268 |
- fi |
269 |
- SRC_URI="https://rsync.samba.org/ftp/rsync/${SRC_DIR}/${P/_/}.tar.gz" |
270 |
- S="${WORKDIR}/${P/_/}" |
271 |
-fi |
272 |
- |
273 |
-LICENSE="GPL-3" |
274 |
-SLOT="0" |
275 |
-IUSE_CPU_FLAGS_X86=" sse2" |
276 |
-IUSE="acl examples iconv ipv6 libressl lz4 ssl static stunnel system-zlib xattr xxhash zstd" |
277 |
-IUSE+=" ${IUSE_CPU_FLAGS_X86// / cpu_flags_x86_}" |
278 |
- |
279 |
-LIB_DEPEND="acl? ( virtual/acl[static-libs(+)] ) |
280 |
- lz4? ( app-arch/lz4[static-libs(+)] ) |
281 |
- ssl? ( |
282 |
- !libressl? ( dev-libs/openssl:0=[static-libs(+)] ) |
283 |
- libressl? ( dev-libs/libressl:0=[static-libs(+)] ) |
284 |
- ) |
285 |
- system-zlib? ( sys-libs/zlib[static-libs(+)] ) |
286 |
- xattr? ( kernel_linux? ( sys-apps/attr[static-libs(+)] ) ) |
287 |
- xxhash? ( dev-libs/xxhash[static-libs(+)] ) |
288 |
- zstd? ( app-arch/zstd[static-libs(+)] ) |
289 |
- >=dev-libs/popt-1.5[static-libs(+)]" |
290 |
-RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} ) |
291 |
- iconv? ( virtual/libiconv )" |
292 |
-DEPEND="${RDEPEND} |
293 |
- static? ( ${LIB_DEPEND} )" |
294 |
- |
295 |
-if [[ "${PV}" == *9999 ]] ; then |
296 |
- BDEPEND="${PYTHON_DEPS} |
297 |
- $(python_gen_any_dep ' |
298 |
- dev-python/commonmark[${PYTHON_USEDEP}] |
299 |
- ')" |
300 |
-fi |
301 |
- |
302 |
-# Only required for live ebuild |
303 |
-python_check_deps() { |
304 |
- has_version "dev-python/commonmark[${PYTHON_USEDEP}]" |
305 |
-} |
306 |
- |
307 |
-src_prepare() { |
308 |
- default |
309 |
- if [[ "${PV}" == *9999 ]] ; then |
310 |
- eaclocal -I m4 |
311 |
- eautoconf -o configure.sh |
312 |
- eautoheader && touch config.h.in |
313 |
- fi |
314 |
-} |
315 |
- |
316 |
-src_configure() { |
317 |
- use static && append-ldflags -static |
318 |
- local myeconfargs=( |
319 |
- --with-rsyncd-conf="${EPREFIX}"/etc/rsyncd.conf |
320 |
- --without-included-popt |
321 |
- $(use_enable acl acl-support) |
322 |
- $(use_enable iconv) |
323 |
- $(use_enable ipv6) |
324 |
- $(use_enable lz4) |
325 |
- $(use_enable ssl openssl) |
326 |
- $(use_with !system-zlib included-zlib) |
327 |
- $(use_enable xattr xattr-support) |
328 |
- $(use_enable xxhash) |
329 |
- $(use_enable zstd) |
330 |
- ) |
331 |
- |
332 |
- if use elibc_glibc && [[ "${ARCH}" == "amd64" ]] ; then |
333 |
- # SIMD is only available for x86_64 right now |
334 |
- # and only on glibc (#728868) |
335 |
- myeconfargs+=( $(use_enable cpu_flags_x86_sse2 simd) ) |
336 |
- else |
337 |
- myeconfargs+=( --disable-simd ) |
338 |
- fi |
339 |
- |
340 |
- econf "${myeconfargs[@]}" |
341 |
- [[ "${PV}" == *9999 ]] || touch proto.h-tstamp #421625 |
342 |
-} |
343 |
- |
344 |
-src_install() { |
345 |
- emake DESTDIR="${D}" install |
346 |
- |
347 |
- newconfd "${FILESDIR}"/rsyncd.conf.d rsyncd |
348 |
- newinitd "${FILESDIR}"/rsyncd.init.d-r1 rsyncd |
349 |
- |
350 |
- dodoc NEWS.md README.md TODO tech_report.tex |
351 |
- |
352 |
- insinto /etc |
353 |
- newins "${FILESDIR}"/rsyncd.conf-3.0.9-r1 rsyncd.conf |
354 |
- |
355 |
- insinto /etc/logrotate.d |
356 |
- newins "${FILESDIR}"/rsyncd.logrotate rsyncd |
357 |
- |
358 |
- insinto /etc/xinetd.d |
359 |
- newins "${FILESDIR}"/rsyncd.xinetd-3.0.9-r1 rsyncd |
360 |
- |
361 |
- # Install stunnel helpers |
362 |
- if use stunnel ; then |
363 |
- emake DESTDIR="${D}" install-ssl-daemon |
364 |
- fi |
365 |
- |
366 |
- # Install the useful contrib scripts |
367 |
- if use examples ; then |
368 |
- exeinto /usr/share/rsync |
369 |
- doexe support/* |
370 |
- rm -f "${ED}"/usr/share/rsync/{Makefile*,*.c} |
371 |
- fi |
372 |
- |
373 |
- eprefixify "${ED}"/etc/{,xinetd.d}/rsyncd* |
374 |
- |
375 |
- systemd_dounit "${FILESDIR}/rsyncd.service" |
376 |
-} |
377 |
- |
378 |
-pkg_postinst() { |
379 |
- if egrep -qis '^[[:space:]]use chroot[[:space:]]*=[[:space:]]*(no|0|false)' \ |
380 |
- "${EROOT}"/etc/rsyncd.conf "${EROOT}"/etc/rsync/rsyncd.conf ; then |
381 |
- ewarn "You have disabled chroot support in your rsyncd.conf. This" |
382 |
- ewarn "is a security risk which you should fix. Please check your" |
383 |
- ewarn "/etc/rsyncd.conf file and fix the setting 'use chroot'." |
384 |
- fi |
385 |
- if use stunnel ; then |
386 |
- einfo "Please install \">=net-misc/stunnel-4\" in order to use stunnel feature." |
387 |
- einfo |
388 |
- einfo "You maybe have to update the certificates configured in" |
389 |
- einfo "${EROOT}/etc/stunnel/rsync.conf" |
390 |
- fi |
391 |
- if use system-zlib ; then |
392 |
- ewarn "Using system-zlib is incompatible with <rsync-3.1.1 when" |
393 |
- ewarn "using the --compress option." |
394 |
- ewarn |
395 |
- ewarn "When syncing with >=rsync-3.1.1 built with bundled zlib," |
396 |
- ewarn "and the --compress option, add --new-compress (-zz)." |
397 |
- ewarn |
398 |
- ewarn "For syncing the portage tree, add:" |
399 |
- ewarn "PORTAGE_RSYNC_EXTRA_OPTS=\"--new-compress\" to make.conf" |
400 |
- fi |
401 |
-} |