aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnthony G. Basile <blueness@gentoo.org>2020-06-28 13:22:31 -0400
committerAnthony G. Basile <blueness@gentoo.org>2020-06-28 13:22:31 -0400
commit7605df16eb18f7bc3b1736142b732472bc520f0c (patch)
treec033bb46c25204591cf5a9dac783bc4200ccc040 /net-misc
parentnet-misc/rsync: stabilize on musl arches (diff)
downloadmusl-7605df16eb18f7bc3b1736142b732472bc520f0c.tar.gz
musl-7605df16eb18f7bc3b1736142b732472bc520f0c.tar.bz2
musl-7605df16eb18f7bc3b1736142b732472bc520f0c.zip
net-misc/rsync: disable ipv6 in a different way
Package-Manager: Portage-2.3.99, Repoman-2.3.23 RepoMan-Options: --force Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
Diffstat (limited to 'net-misc')
-rw-r--r--net-misc/rsync/files/rsync-3.2.0-noexecstack.patch24
-rw-r--r--net-misc/rsync/files/rsync-3.2.0-simd_check.patch13
-rw-r--r--net-misc/rsync/rsync-3.2.0-r1.ebuild3
3 files changed, 38 insertions, 2 deletions
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 0000000..9183460
--- /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 0000000..255f279
--- /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/rsync-3.2.0-r1.ebuild b/net-misc/rsync/rsync-3.2.0-r1.ebuild
index 8f6446d..89a4e30 100644
--- a/net-misc/rsync/rsync-3.2.0-r1.ebuild
+++ b/net-misc/rsync/rsync-3.2.0-r1.ebuild
@@ -59,7 +59,6 @@ python_check_deps() {
PATCHES=(
"${FILESDIR}/${P}-simd_check.patch"
"${FILESDIR}/${P}-noexecstack.patch" #728882
- "${FILESDIR}"/${PN}-fix-musl-ipv6.patch
)
src_prepare() {
@@ -77,7 +76,7 @@ src_configure() {
--without-included-popt
$(use_enable acl acl-support)
$(use_enable iconv)
- $(use_enable ipv6)
+ --disable-ipv6
$(use_enable lz4)
$(use_enable ssl openssl)
$(use_with !system-zlib included-zlib)