| 1 |
commit: 7605df16eb18f7bc3b1736142b732472bc520f0c |
| 2 |
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Jun 28 17:22:31 2020 +0000 |
| 4 |
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Jun 28 17:22:31 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=7605df16 |
| 7 |
|
| 8 |
net-misc/rsync: disable ipv6 in a different way |
| 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/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 | 3 +-- |
| 17 |
3 files changed, 38 insertions(+), 2 deletions(-) |
| 18 |
|
| 19 |
diff --git a/net-misc/rsync/files/rsync-3.2.0-noexecstack.patch b/net-misc/rsync/files/rsync-3.2.0-noexecstack.patch |
| 20 |
new file mode 100644 |
| 21 |
index 0000000..9183460 |
| 22 |
--- /dev/null |
| 23 |
+++ b/net-misc/rsync/files/rsync-3.2.0-noexecstack.patch |
| 24 |
@@ -0,0 +1,24 @@ |
| 25 |
+From 75901616c5f38a9ff6ba736c8281933e8ce64b8b Mon Sep 17 00:00:00 2001 |
| 26 |
+From: =?UTF-8?q?Holger=20Hoffst=C3=A4tte?= <holger@××××××××××××××××××.com> |
| 27 |
+Date: Sat, 20 Jun 2020 16:54:11 +0200 |
| 28 |
+Subject: [PATCH] Pass --noexecstack to assembler. |
| 29 |
+ |
| 30 |
+This prevents Linux from rightfully complaining about an executable |
| 31 |
+stack segment, which is widely considered a security hazard. |
| 32 |
+--- |
| 33 |
+ Makefile.in | 2 +- |
| 34 |
+ 1 file changed, 1 insertion(+), 1 deletion(-) |
| 35 |
+ |
| 36 |
+diff --git a/Makefile.in b/Makefile.in |
| 37 |
+index 31ddc43b..60aff920 100644 |
| 38 |
+--- a/Makefile.in |
| 39 |
++++ b/Makefile.in |
| 40 |
+@@ -135,7 +135,7 @@ simd-checksum-x86_64.o: simd-checksum-x86_64.cpp |
| 41 |
+ $(CXX) $(CXXFLAGS) $(CPPFLAGS) -c -o $@ $(srcdir)/simd-checksum-x86_64.cpp |
| 42 |
+ |
| 43 |
+ lib/md5-asm-x86_64.o: lib/md5-asm-x86_64.s |
| 44 |
+- $(CC) -c -o $@ $(srcdir)/lib/md5-asm-x86_64.s |
| 45 |
++ $(CC) -Wa,--noexecstack -c -o $@ $(srcdir)/lib/md5-asm-x86_64.s |
| 46 |
+ |
| 47 |
+ tls$(EXEEXT): $(TLS_OBJ) |
| 48 |
+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(TLS_OBJ) $(LIBS) |
| 49 |
|
| 50 |
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 |
| 51 |
new file mode 100644 |
| 52 |
index 0000000..255f279 |
| 53 |
--- /dev/null |
| 54 |
+++ b/net-misc/rsync/files/rsync-3.2.0-simd_check.patch |
| 55 |
@@ -0,0 +1,13 @@ |
| 56 |
+https://github.com/WayneD/rsync/pull/24 |
| 57 |
+ |
| 58 |
+--- rsync-3.2.0/configure.ac 2020-06-19 23:11:01.000000000 +0200 |
| 59 |
++++ rsync-3.2.0/configure.ac 2020-06-19 23:11:01.000000000 +0200 |
| 60 |
+@@ -207,7 +207,7 @@ |
| 61 |
+ if test x"$CXX" != x""; then |
| 62 |
+ CXX_VERSION=`$CXX --version 2>/dev/null | head -n 1` |
| 63 |
+ case "$CXX_VERSION" in |
| 64 |
+- g++*) |
| 65 |
++ *g++*) |
| 66 |
+ CXX_VERSION=`$CXX -dumpversion | sed 's/\..*//g'` |
| 67 |
+ if test "$CXX_VERSION" -ge "5"; then |
| 68 |
+ CXX_OK=yes |
| 69 |
|
| 70 |
diff --git a/net-misc/rsync/rsync-3.2.0-r1.ebuild b/net-misc/rsync/rsync-3.2.0-r1.ebuild |
| 71 |
index 8f6446d..89a4e30 100644 |
| 72 |
--- a/net-misc/rsync/rsync-3.2.0-r1.ebuild |
| 73 |
+++ b/net-misc/rsync/rsync-3.2.0-r1.ebuild |
| 74 |
@@ -59,7 +59,6 @@ python_check_deps() { |
| 75 |
PATCHES=( |
| 76 |
"${FILESDIR}/${P}-simd_check.patch" |
| 77 |
"${FILESDIR}/${P}-noexecstack.patch" #728882 |
| 78 |
- "${FILESDIR}"/${PN}-fix-musl-ipv6.patch |
| 79 |
) |
| 80 |
|
| 81 |
src_prepare() { |
| 82 |
@@ -77,7 +76,7 @@ src_configure() { |
| 83 |
--without-included-popt |
| 84 |
$(use_enable acl acl-support) |
| 85 |
$(use_enable iconv) |
| 86 |
- $(use_enable ipv6) |
| 87 |
+ --disable-ipv6 |
| 88 |
$(use_enable lz4) |
| 89 |
$(use_enable ssl openssl) |
| 90 |
$(use_with !system-zlib included-zlib) |
Archives