[gentoo-commits] proj/musl:master commit in: net-misc/rsync/files/, net-misc/rsync/

2021-03-13 Thread Sam James 
commit: dbe1af708a329cb345d66b31b78732056dfa7318
Author: Dave Hughes  gmail  com>
AuthorDate: Sat Mar 13 17:53:56 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Mar 13 21:26:11 2021 +
URL:https://gitweb.gentoo.org/proj/musl.git/commit/?id=dbe1af70

net-misc/rsync: remove from overlay

Package-Manager: Portage-3.0.17, Repoman-3.0.2
RepoMan-Options: --force
Manifest-Sign-Key: 0xA1919C830E9498E0
Signed-off-by: Dave Hughes  gmail.com>
Closes: https://github.com/gentoo/musl/pull/425
Signed-off-by: Sam James  gentoo.org>

 net-misc/rsync/Manifest|   2 -
 net-misc/rsync/files/rsync-3.1.3-runstatedir.patch |  65 ---
 net-misc/rsync/files/rsync-3.2.0-noexecstack.patch |  24 -
 net-misc/rsync/files/rsync-3.2.0-simd_check.patch  |  65 ---
 net-misc/rsync/files/rsync-fix-musl-ipv6.patch | 605 -
 net-misc/rsync/files/rsyncd.conf-3.0.9-r1  |  15 -
 net-misc/rsync/files/rsyncd.conf.d |   5 -
 net-misc/rsync/files/rsyncd.init.d-r1  |  11 -
 net-misc/rsync/files/rsyncd.logrotate  |   9 -
 net-misc/rsync/files/rsyncd.service|  12 -
 net-misc/rsync/files/rsyncd.xinetd-3.0.9-r1|  10 -
 net-misc/rsync/metadata.xml|  16 -
 net-misc/rsync/rsync-3.1.3.ebuild  | 101 
 net-misc/rsync/rsync-3.2.0-r1.ebuild   | 151 -
 14 files changed, 1091 deletions(-)

diff --git a/net-misc/rsync/Manifest b/net-misc/rsync/Manifest
deleted file mode 100644
index 12fd2dd..000
--- a/net-misc/rsync/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST rsync-3.1.3.tar.gz 905908 BLAKE2B 
616a1f3239327a28b881310f5f249c90b8bcdb05091279cd62f9cb4e35a8428c7cdd9b89e711ba124601a738f0deb9bfbebafba7fd88b72866476138a9f8c75a
 SHA512 
8385f4c0ea37e7a1da3cf45794154f5bc4d1c49bc625ba3b5f85adaf3eafe6d71c15bdcb1410bde731e5d4c19aff3331606637462fa27a68dc3e13192dd78f99
-DIST rsync-3.2.0.tar.gz 1048009 BLAKE2B 
641be077a88958a09b083fd9658ae7f40ce3565bee1959f0c7ef82c61356a070e7ca1e0ceeb96b7a1b31a5ee031a84733ade3965aaa93f9e18795df16a6c1460
 SHA512 
01a109e1e061bb7f4734b694e1f15a83efdd8fcb1995e5eeea75a8d245eead4412c09b37b0fcdfe522e368673768e4fa5ed8891ccf3ae42f60293e4e68d506c2

diff --git a/net-misc/rsync/files/rsync-3.1.3-runstatedir.patch 
b/net-misc/rsync/files/rsync-3.1.3-runstatedir.patch
deleted file mode 100644
index 60609cb..000
--- a/net-misc/rsync/files/rsync-3.1.3-runstatedir.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-From e14d42421cb96feb4d88ed01ca26026c5b5fa6cc Mon Sep 17 00:00:00 2001
-From: Jory Pratt 
-Date: Mon, 16 Mar 2020 20:50:22 -0500
-Subject: [PATCH] Fix autoconf-2.68-runstatedir.patch
-

- configure.sh | 14 +-
- 1 file changed, 13 insertions(+), 1 deletion(-)
-
-diff --git a/configure.sh b/configure.sh
-index 981203b..f950f4a 100755
 a/configure.sh
-+++ b/configure.sh
-@@ -682,6 +682,7 @@ infodir
- docdir
- oldincludedir
- includedir
-+runstatedir
- localstatedir
- sharedstatedir
- sysconfdir
-@@ -769,6 +770,7 @@ datadir='${datarootdir}'
- sysconfdir='${prefix}/etc'
- sharedstatedir='${prefix}/com'
- localstatedir='${prefix}/var'
-+runstatedir='${localstatedir}/run'
- includedir='${prefix}/include'
- oldincludedir='/usr/include'
- docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
-@@ -1021,6 +1023,15 @@ do
-   | -silent | --silent | --silen | --sile | --sil)
- silent=yes ;;
- 
-+  -runstatedir | --runstatedir | --runstatedi | --runstated \
-+  | --runstate | --runstat | --runsta | --runst | --runs \
-+  | --run | --ru | --r)
-+ac_prev=runstatedir ;;
-+  -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
-+  | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
-+  | --run=* | --ru=* | --r=*)
-+runstatedir=$ac_optarg ;;
-+
-   -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
- ac_prev=sbindir ;;
-   -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
-@@ -1158,7 +1169,7 @@ fi
- for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \
-   datadir sysconfdir sharedstatedir localstatedir includedir \
-   oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
--  libdir localedir mandir
-+  libdir localedir mandir runstatedir
- do
-   eval ac_val=\$$ac_var
-   # Remove trailing slashes.
-@@ -1311,6 +1322,7 @@ Fine tuning of the installation directories:
-   --sysconfdir=DIRread-only single-machine data [PREFIX/etc]
-   --sharedstatedir=DIRmodifiable architecture-independent data 
[PREFIX/com]
-   --localstatedir=DIR modifiable single-machine data [PREFIX/var]
-+  --runstatedir=DIR   modifiable per-process data [LOCALSTATEDIR/run]
-   --libdir=DIRobject code libraries [EPREFIX/lib]
-   --includedir=DIRC header files [PREFIX/include]
-   --oldincludedir=DIR C header files for non-gcc [/usr/include]
--- 
-2.25.1
-

diff --git a/net-misc/rsync/files/rsyn

[gentoo-commits] proj/musl:master commit in: net-misc/rsync/files/, net-misc/rsync/

2020-06-28 Thread Anthony G. Basile 
commit: 7605df16eb18f7bc3b1736142b732472bc520f0c
Author: Anthony G. Basile  gentoo  org>
AuthorDate: Sun Jun 28 17:22:31 2020 +
Commit: Anthony G. Basile  gentoo  org>
CommitDate: Sun Jun 28 17:22:31 2020 +
URL:https://gitweb.gentoo.org/proj/musl.git/commit/?id=7605df16

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  gentoo.org>

 net-misc/rsync/files/rsync-3.2.0-noexecstack.patch | 24 ++
 net-misc/rsync/files/rsync-3.2.0-simd_check.patch  | 13 
 net-misc/rsync/rsync-3.2.0-r1.ebuild   |  3 +--
 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 000..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?= 
+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 000..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.0 +0200
 rsync-3.2.0/configure.ac   2020-06-19 23:11:01.0 +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)

[gentoo-commits] proj/musl:master commit in: net-misc/rsync/files/, net-misc/rsync/

2020-03-16 Thread Jory Pratt 
commit: 573d8bcc00510bb6fe6d688343043f966f3e591d
Author: Jory Pratt  gentoo  org>
AuthorDate: Tue Mar 17 02:12:50 2020 +
Commit: Jory Pratt  gentoo  org>
CommitDate: Tue Mar 17 02:12:50 2020 +
URL:https://gitweb.gentoo.org/proj/musl.git/commit/?id=573d8bcc

net-misc/rsync: fix runstatedir introduced with autoconf-2.69-r5

Package-Manager: Portage-2.3.94, Repoman-2.3.21
Signed-off-by: Jory Pratt  gentoo.org>

 net-misc/rsync/files/rsync-3.1.3-runstatedir.patch | 65 ++
 net-misc/rsync/rsync-3.1.3.ebuild  |  8 ++-
 2 files changed, 72 insertions(+), 1 deletion(-)

diff --git a/net-misc/rsync/files/rsync-3.1.3-runstatedir.patch 
b/net-misc/rsync/files/rsync-3.1.3-runstatedir.patch
new file mode 100644
index 000..60609cb
--- /dev/null
+++ b/net-misc/rsync/files/rsync-3.1.3-runstatedir.patch
@@ -0,0 +1,65 @@
+From e14d42421cb96feb4d88ed01ca26026c5b5fa6cc Mon Sep 17 00:00:00 2001
+From: Jory Pratt 
+Date: Mon, 16 Mar 2020 20:50:22 -0500
+Subject: [PATCH] Fix autoconf-2.68-runstatedir.patch
+
+---
+ configure.sh | 14 +-
+ 1 file changed, 13 insertions(+), 1 deletion(-)
+
+diff --git a/configure.sh b/configure.sh
+index 981203b..f950f4a 100755
+--- a/configure.sh
 b/configure.sh
+@@ -682,6 +682,7 @@ infodir
+ docdir
+ oldincludedir
+ includedir
++runstatedir
+ localstatedir
+ sharedstatedir
+ sysconfdir
+@@ -769,6 +770,7 @@ datadir='${datarootdir}'
+ sysconfdir='${prefix}/etc'
+ sharedstatedir='${prefix}/com'
+ localstatedir='${prefix}/var'
++runstatedir='${localstatedir}/run'
+ includedir='${prefix}/include'
+ oldincludedir='/usr/include'
+ docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
+@@ -1021,6 +1023,15 @@ do
+   | -silent | --silent | --silen | --sile | --sil)
+ silent=yes ;;
+ 
++  -runstatedir | --runstatedir | --runstatedi | --runstated \
++  | --runstate | --runstat | --runsta | --runst | --runs \
++  | --run | --ru | --r)
++ac_prev=runstatedir ;;
++  -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
++  | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
++  | --run=* | --ru=* | --r=*)
++runstatedir=$ac_optarg ;;
++
+   -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
+ ac_prev=sbindir ;;
+   -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
+@@ -1158,7 +1169,7 @@ fi
+ for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \
+   datadir sysconfdir sharedstatedir localstatedir includedir \
+   oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
+-  libdir localedir mandir
++  libdir localedir mandir runstatedir
+ do
+   eval ac_val=\$$ac_var
+   # Remove trailing slashes.
+@@ -1311,6 +1322,7 @@ Fine tuning of the installation directories:
+   --sysconfdir=DIRread-only single-machine data [PREFIX/etc]
+   --sharedstatedir=DIRmodifiable architecture-independent data 
[PREFIX/com]
+   --localstatedir=DIR modifiable single-machine data [PREFIX/var]
++  --runstatedir=DIR   modifiable per-process data [LOCALSTATEDIR/run]
+   --libdir=DIRobject code libraries [EPREFIX/lib]
+   --includedir=DIRC header files [PREFIX/include]
+   --oldincludedir=DIR C header files for non-gcc [/usr/include]
+-- 
+2.25.1
+

diff --git a/net-misc/rsync/rsync-3.1.3.ebuild 
b/net-misc/rsync/rsync-3.1.3.ebuild
index af6dfbd..1eddf87 100644
--- a/net-misc/rsync/rsync-3.1.3.ebuild
+++ b/net-misc/rsync/rsync-3.1.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -30,6 +30,12 @@ PATCHES=(
 
 S="${WORKDIR}/${P/_/}"
 
+src_prepare() {
+   has_version '>=sys-devel/autoconf-2.69-r5' && PATCHES+=( 
"${FILESDIR}/${PN}-3.1.3-runstatedir.patch" )
+
+   default
+}
+
 src_configure() {
use static && append-ldflags -static
local myeconfargs=(

[gentoo-commits] proj/musl:master commit in: net-misc/rsync/files/

2019-07-29 Thread Anthony G. Basile 
commit: 62e4fb550a8dc8beb678f58eef05b04689e0539f
Author: Anthony G. Basile  gentoo  org>
AuthorDate: Mon Jul 29 15:42:51 2019 +
Commit: Anthony G. Basile  gentoo  org>
CommitDate: Mon Jul 29 15:43:28 2019 +
URL:https://gitweb.gentoo.org/proj/musl.git/commit/?id=62e4fb55

Revert "net-misc/rsync: update ipv6 patch"

This reverts commit c4c854fbd41c4edb6f51f52e26b53355957e.

This commit breaks the configuration phase.  Since rsync is critical
for stage builds, we are reverting this for now.

 net-misc/rsync/files/rsync-fix-musl-ipv6.patch | 472 -
 1 file changed, 455 insertions(+), 17 deletions(-)

diff --git a/net-misc/rsync/files/rsync-fix-musl-ipv6.patch 
b/net-misc/rsync/files/rsync-fix-musl-ipv6.patch
index ca692b5..53d7381 100644
--- a/net-misc/rsync/files/rsync-fix-musl-ipv6.patch
+++ b/net-misc/rsync/files/rsync-fix-musl-ipv6.patch
@@ -1,27 +1,25 @@
-From 811db086507aceaec0022798dd418956cdd4b54e Mon Sep 17 00:00:00 2001
+From 78621d2d5e12c9e7c54ab0a15bb90495d7927251 Mon Sep 17 00:00:00 2001
 From: Pierre-Olivier Mercier 
-Date: Mon, 4 Sep 2017 22:29:55 +0200
-Subject: [PATCH] Test IPv6 compatibility instead of relying on library probes.
+Date: Wed, 8 Mar 2017 12:44:11 +0100
+Subject: [PATCH] musl compatibility
 
-Legacy configure behaviour was to detect IPv6 support through known IPv6
-capable version of common standard libraries. Now: it runs a POSIX test
-to determine if IPv6 is usable (in case it has not been disabled).
 ---
- configure.ac | 138 ---
- 1 file changed, 28 insertions(+), 110 deletions(-)
+ configure.ac | 138 +---
+ configure.sh | 348 +--
+ 2 files changed, 102 insertions(+), 384 deletions(-)
 
 diff --git a/configure.ac b/configure.ac
-index e01e124b..b5db8515 100644
+index 1b32dfb..891f7b9 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -204,119 +204,37 @@ if test x"$rsync_cv_HAVE_BROKEN_LARGEFILE" != x"yes"; 
then
 AC_SYS_LARGEFILE
  fi
- 
+
 -ipv6type=unknown
 -ipv6lib=none
 -ipv6trylibc=yes
- 
+
 +# Checks if IPv6 is requested
 +AC_MSG_CHECKING([whether to enable ipv6])
  AC_ARG_ENABLE(ipv6,
@@ -139,17 +137,17 @@ index e01e124b..b5db8515 100644
 +AC_DEFINE(INET6, 1, [true if you have IPv6])
 +  ;;
 +  esac ],
- 
+
 -  AC_SEARCH_LIBS(getaddrinfo, inet6)
 -fi
 +  AC_TRY_RUN([ /* AF_INET6 avalable check */
-+#include 
 +#include 
 +#include 
 +main()
 +{
++  exit(0);
 +   if (socket(AF_INET6, SOCK_STREAM, 0) < 0)
-+ exit(1);
++  exit(1);
 +   else
 + exit(0);
 +}
@@ -159,9 +157,449 @@ index e01e124b..b5db8515 100644
 +  AC_MSG_RESULT(no),
 +  AC_MSG_RESULT(no)
 +))
- 
+
  dnl Do you want to disable use of locale functions
  AC_ARG_ENABLE([locale],
--- 
-2.13.0
+diff --git a/configure.sh b/configure.sh
+index d6e9c8d..cfaaa99 100755
+--- a/configure.sh
 b/configure.sh
+@@ -1349,7 +1349,7 @@ Optional Features:
+   --enable-maintainer-mode
+   turn on extra debug features
+   --disable-largefile omit support for large files
+-  --disable-ipv6  do not even try to use IPv6
++  --disable-ipv6  disable ipv6 support
+   --disable-localedisable locale features
+   --disable-iconv-opendisable all use of iconv_open() function
+   --disable-iconv disable rsync's --iconv option
+@@ -1577,6 +1577,37 @@ fi
+
+ } # ac_fn_c_try_run
+
++# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES
++# ---
++# Tests whether HEADER exists and can be compiled using the include files in
++# INCLUDES, setting the cache variable VAR accordingly.
++ac_fn_c_check_header_compile ()
++{
++  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
++$as_echo_n "checking for $2... " >&6; }
++if eval \${$3+:} false; then :
++  $as_echo_n "(cached) " >&6
++else
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
++$4
++#include <$2>
++_ACEOF
++if ac_fn_c_try_compile "$LINENO"; then :
++  eval "$3=yes"
++else
++  eval "$3=no"
++fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++eval ac_res=\$$3
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
++$as_echo "$ac_res" >&6; }
++  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
++
++} # ac_fn_c_check_header_compile
++
+ # ac_fn_c_try_link LINENO
+ # ---
+ # Try to link conftest.$ac_ext, and return whether this succeeded.
+@@ -1623,37 +1654,6 @@ fi
+
+ } # ac_fn_c_try_link
+
+-# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES
+-# ---
+-# Tests whether HEADER exists and can be compiled using the include files in
+-# INCLUDES, setting the cache variable VAR accordingly.
+-ac_fn_c_check_header_compi

[gentoo-commits] proj/musl:master commit in: net-misc/rsync/files/

2019-07-24 Thread Jory Pratt 
commit: c4c854fbd41c4edb6f51f52e26b53355957e
Author: Jory Pratt  gentoo  org>
AuthorDate: Thu Jul 25 01:44:48 2019 +
Commit: Jory Pratt  gentoo  org>
CommitDate: Thu Jul 25 01:44:48 2019 +
URL:https://gitweb.gentoo.org/proj/musl.git/commit/?id=c4c854fb

net-misc/rsync: update ipv6 patch

Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Jory Pratt  gentoo.org>

 net-misc/rsync/files/rsync-fix-musl-ipv6.patch | 472 +
 1 file changed, 17 insertions(+), 455 deletions(-)

diff --git a/net-misc/rsync/files/rsync-fix-musl-ipv6.patch 
b/net-misc/rsync/files/rsync-fix-musl-ipv6.patch
index 53d7381..ca692b5 100644
--- a/net-misc/rsync/files/rsync-fix-musl-ipv6.patch
+++ b/net-misc/rsync/files/rsync-fix-musl-ipv6.patch
@@ -1,25 +1,27 @@
-From 78621d2d5e12c9e7c54ab0a15bb90495d7927251 Mon Sep 17 00:00:00 2001
+From 811db086507aceaec0022798dd418956cdd4b54e Mon Sep 17 00:00:00 2001
 From: Pierre-Olivier Mercier 
-Date: Wed, 8 Mar 2017 12:44:11 +0100
-Subject: [PATCH] musl compatibility
+Date: Mon, 4 Sep 2017 22:29:55 +0200
+Subject: [PATCH] Test IPv6 compatibility instead of relying on library probes.
 
+Legacy configure behaviour was to detect IPv6 support through known IPv6
+capable version of common standard libraries. Now: it runs a POSIX test
+to determine if IPv6 is usable (in case it has not been disabled).
 ---
- configure.ac | 138 +---
- configure.sh | 348 +--
- 2 files changed, 102 insertions(+), 384 deletions(-)
+ configure.ac | 138 ---
+ 1 file changed, 28 insertions(+), 110 deletions(-)
 
 diff --git a/configure.ac b/configure.ac
-index 1b32dfb..891f7b9 100644
+index e01e124b..b5db8515 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -204,119 +204,37 @@ if test x"$rsync_cv_HAVE_BROKEN_LARGEFILE" != x"yes"; 
then
 AC_SYS_LARGEFILE
  fi
-
+ 
 -ipv6type=unknown
 -ipv6lib=none
 -ipv6trylibc=yes
-
+ 
 +# Checks if IPv6 is requested
 +AC_MSG_CHECKING([whether to enable ipv6])
  AC_ARG_ENABLE(ipv6,
@@ -137,17 +139,17 @@ index 1b32dfb..891f7b9 100644
 +AC_DEFINE(INET6, 1, [true if you have IPv6])
 +  ;;
 +  esac ],
-
+ 
 -  AC_SEARCH_LIBS(getaddrinfo, inet6)
 -fi
 +  AC_TRY_RUN([ /* AF_INET6 avalable check */
++#include 
 +#include 
 +#include 
 +main()
 +{
-+  exit(0);
 +   if (socket(AF_INET6, SOCK_STREAM, 0) < 0)
-+  exit(1);
++ exit(1);
 +   else
 + exit(0);
 +}
@@ -157,449 +159,9 @@ index 1b32dfb..891f7b9 100644
 +  AC_MSG_RESULT(no),
 +  AC_MSG_RESULT(no)
 +))
-
+ 
  dnl Do you want to disable use of locale functions
  AC_ARG_ENABLE([locale],
-diff --git a/configure.sh b/configure.sh
-index d6e9c8d..cfaaa99 100755
 a/configure.sh
-+++ b/configure.sh
-@@ -1349,7 +1349,7 @@ Optional Features:
-   --enable-maintainer-mode
-   turn on extra debug features
-   --disable-largefile omit support for large files
--  --disable-ipv6  do not even try to use IPv6
-+  --disable-ipv6  disable ipv6 support
-   --disable-localedisable locale features
-   --disable-iconv-opendisable all use of iconv_open() function
-   --disable-iconv disable rsync's --iconv option
-@@ -1577,6 +1577,37 @@ fi
-
- } # ac_fn_c_try_run
-
-+# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES
-+# ---
-+# Tests whether HEADER exists and can be compiled using the include files in
-+# INCLUDES, setting the cache variable VAR accordingly.
-+ac_fn_c_check_header_compile ()
-+{
-+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-+$as_echo_n "checking for $2... " >&6; }
-+if eval \${$3+:} false; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+$4
-+#include <$2>
-+_ACEOF
-+if ac_fn_c_try_compile "$LINENO"; then :
-+  eval "$3=yes"
-+else
-+  eval "$3=no"
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
-+eval ac_res=\$$3
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-+$as_echo "$ac_res" >&6; }
-+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-+
-+} # ac_fn_c_check_header_compile
-+
- # ac_fn_c_try_link LINENO
- # ---
- # Try to link conftest.$ac_ext, and return whether this succeeded.
-@@ -1623,37 +1654,6 @@ fi
-
- } # ac_fn_c_try_link
-
--# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES
--# ---
--# Tests whether HEADER exists and can be compiled using the include files in
--# INCLUDES, setting the cache variable VAR accordingly.
--ac_fn_c_check_header_compile ()
--{
--  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
--  { $as_echo "$as_me:${as_lineno-$LINENO}

[gentoo-commits] proj/musl:master commit in: net-misc/rsync/files/, net-misc/rsync/

2018-06-16 Thread Anthony G. Basile 
commit: 3c0b666ea93eb7f456bf2b724eff24cd6a3dfa5f
Author: stefson  yahoo  de>
AuthorDate: Sat Jun 16 11:59:07 2018 +
Commit: Anthony G. Basile  gentoo  org>
CommitDate: Sat Jun 16 23:10:57 2018 +
URL:https://gitweb.gentoo.org/proj/musl.git/commit/?id=3c0b666e

net-misc/rsync: revbump

 net-misc/rsync/Manifest|  1 +
 .../rsync/files/rsync-3.1.2-CVE-2017-16548.patch   | 17 --
 .../files/rsync-3.1.2-CVE-2017-17433-fixup.patch   | 33 --
 .../rsync/files/rsync-3.1.2-CVE-2017-17433.patch   | 39 --
 .../files/rsync-3.1.2-CVE-2017-17434-part1.patch   | 22 
 .../files/rsync-3.1.2-CVE-2017-17434-part2.patch   | 33 --
 .../{rsync-3.1.2-r2.ebuild => rsync-3.1.3.ebuild}  | 35 ++-
 7 files changed, 18 insertions(+), 162 deletions(-)

diff --git a/net-misc/rsync/Manifest b/net-misc/rsync/Manifest
index 87500d8..37665bc 100644
--- a/net-misc/rsync/Manifest
+++ b/net-misc/rsync/Manifest
@@ -1 +1,2 @@
 DIST rsync-3.1.2.tar.gz 892724 BLAKE2B 
e366514ae9835ba7c201a9e09fb9342c5e52fa36d45d46300d080403de25a64ba3ed7a703e56b4f47a743a597694a2d0a50bb4bab6cfa0aa7b59a4f7b93b9f21
 SHA512 
4c55fd69f436ead0cb5a0b7c6fdfef9bb28ddb9c63534eb619e756b118d5b08cfc5e696498650932c86e865b37e06633da947e6720ca0c27ed5c034313ae208b
+DIST rsync-3.1.3.tar.gz 905908 BLAKE2B 
616a1f3239327a28b881310f5f249c90b8bcdb05091279cd62f9cb4e35a8428c7cdd9b89e711ba124601a738f0deb9bfbebafba7fd88b72866476138a9f8c75a
 SHA512 
8385f4c0ea37e7a1da3cf45794154f5bc4d1c49bc625ba3b5f85adaf3eafe6d71c15bdcb1410bde731e5d4c19aff3331606637462fa27a68dc3e13192dd78f99

diff --git a/net-misc/rsync/files/rsync-3.1.2-CVE-2017-16548.patch 
b/net-misc/rsync/files/rsync-3.1.2-CVE-2017-16548.patch
deleted file mode 100644
index d06607c..000
--- a/net-misc/rsync/files/rsync-3.1.2-CVE-2017-16548.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-X-Git-Url: 
https://git.samba.org/rsync.git/?p=rsync.git;a=blobdiff_plain;f=xattrs.c;h=4867e6f5b8ad2934d43b06f3b99b7b3690a6dc7a;hp=68305d7559b34f5cc2f196b74429b82fa6ff49dd;hb=47a63d90e71d3e19e0e96052bb8c6b9cb140ecc1;hpb=bc112b0e7feece62ce98708092306639a8a53cce
-
-diff --git a/xattrs.c b/xattrs.c
-index 68305d7..4867e6f 100644
 a/xattrs.c
-+++ b/xattrs.c
-@@ -824,6 +824,10 @@ void receive_xattr(int f, struct file_struct *file)
-   out_of_memory("receive_xattr");
-   name = ptr + dget_len + extra_len;
-   read_buf(f, name, name_len);
-+  if (name_len < 1 || name[name_len-1] != '\0') {
-+  rprintf(FERROR, "Invalid xattr name received (missing 
trailing \\0).\n");
-+  exit_cleanup(RERR_FILEIO);
-+  }
-   if (dget_len == datum_len)
-   read_buf(f, ptr, dget_len);
-   else {

diff --git a/net-misc/rsync/files/rsync-3.1.2-CVE-2017-17433-fixup.patch 
b/net-misc/rsync/files/rsync-3.1.2-CVE-2017-17433-fixup.patch
deleted file mode 100644
index 0cc9b82..000
--- a/net-misc/rsync/files/rsync-3.1.2-CVE-2017-17433-fixup.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From: Wayne Davison 
-Date: Sun, 3 Dec 2017 23:49:56 + (-0800)
-Subject: Fix issue with earlier path-check (fixes "make check")
-X-Git-Url: 
https://git.samba.org/?p=rsync.git;a=commitdiff_plain;h=f5e8a17e093065fb20fea00a29540fe2c7896441;hp=5509597decdbd7b91994210f700329d8a35e70a1
-
-Fix issue with earlier path-check (fixes "make check")

-
-diff --git a/receiver.c b/receiver.c
-index 9c46242..75cb00d 100644
 a/receiver.c
-+++ b/receiver.c
-@@ -574,15 +574,15 @@ int recv_files(int f_in, int f_out, char *local_name)
-   file = dir_flist->files[cur_flist->parent_ndx];
-   fname = local_name ? local_name : f_name(file, fbuf);
- 
--  if (daemon_filter_list.head
--  && check_filter(&daemon_filter_list, FLOG, fname, 0) < 0) {
-+  if (DEBUG_GTE(RECV, 1))
-+  rprintf(FINFO, "recv_files(%s)\n", fname);
-+
-+  if (daemon_filter_list.head && (*fname != '.' || fname[1] != 
'\0')
-+   && check_filter(&daemon_filter_list, FLOG, fname, 0) < 0) {
-   rprintf(FERROR, "attempt to hack rsync failed.\n");
-   exit_cleanup(RERR_PROTOCOL);
-   }
- 
--  if (DEBUG_GTE(RECV, 1))
--  rprintf(FINFO, "recv_files(%s)\n", fname);
--
- #ifdef SUPPORT_XATTRS
-   if (preserve_xattrs && iflags & ITEM_REPORT_XATTR && do_xfers
-&& !(want_xattr_optim && BITS_SET(iflags, 
ITEM_XNAME_FOLLOWS|ITEM_LOCAL_CHANGE)))

diff --git a/net-misc/rsync/files/rsync-3.1.2-CVE-2017-17433.patch 
b/net-misc/rsync/files/rsync-3.1.2-CVE-2017-17433.patch
deleted file mode 100644
index 0ab8de1..000
--- a/net-misc/rsync/files/rsync-3.1.2-CVE-2017-17433.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 3e06d40029cfdce9d0f73d87cfd4edaf54be9c51 Mon Sep 17 00

[gentoo-commits] proj/musl:master commit in: net-misc/rsync/files/, net-misc/rsync/

2018-01-29 Thread Aric Belsito 
commit: 21c37337e1b7e515dc382632f14099a5e49bb3ee
Author: Aric Belsito  gmail  com>
AuthorDate: Mon Jan 29 19:11:39 2018 +
Commit: Aric Belsito  gmail  com>
CommitDate: Mon Jan 29 19:11:39 2018 +
URL:https://gitweb.gentoo.org/proj/musl.git/commit/?id=21c37337

net-misc/rsync: sync with upstream

add metadata.xml

 .../rsync/files/rsync-3.1.2-CVE-2017-16548.patch   | 17 ++
 .../files/rsync-3.1.2-CVE-2017-17433-fixup.patch   | 33 ++
 .../rsync/files/rsync-3.1.2-CVE-2017-17433.patch   | 39 ++
 .../files/rsync-3.1.2-CVE-2017-17434-part1.patch   | 22 
 .../files/rsync-3.1.2-CVE-2017-17434-part2.patch   | 33 ++
 net-misc/rsync/metadata.xml| 14 
 net-misc/rsync/rsync-3.1.2-r2.ebuild   | 31 ++---
 7 files changed, 177 insertions(+), 12 deletions(-)

diff --git a/net-misc/rsync/files/rsync-3.1.2-CVE-2017-16548.patch 
b/net-misc/rsync/files/rsync-3.1.2-CVE-2017-16548.patch
new file mode 100644
index 000..d06607c
--- /dev/null
+++ b/net-misc/rsync/files/rsync-3.1.2-CVE-2017-16548.patch
@@ -0,0 +1,17 @@
+X-Git-Url: 
https://git.samba.org/rsync.git/?p=rsync.git;a=blobdiff_plain;f=xattrs.c;h=4867e6f5b8ad2934d43b06f3b99b7b3690a6dc7a;hp=68305d7559b34f5cc2f196b74429b82fa6ff49dd;hb=47a63d90e71d3e19e0e96052bb8c6b9cb140ecc1;hpb=bc112b0e7feece62ce98708092306639a8a53cce
+
+diff --git a/xattrs.c b/xattrs.c
+index 68305d7..4867e6f 100644
+--- a/xattrs.c
 b/xattrs.c
+@@ -824,6 +824,10 @@ void receive_xattr(int f, struct file_struct *file)
+   out_of_memory("receive_xattr");
+   name = ptr + dget_len + extra_len;
+   read_buf(f, name, name_len);
++  if (name_len < 1 || name[name_len-1] != '\0') {
++  rprintf(FERROR, "Invalid xattr name received (missing 
trailing \\0).\n");
++  exit_cleanup(RERR_FILEIO);
++  }
+   if (dget_len == datum_len)
+   read_buf(f, ptr, dget_len);
+   else {

diff --git a/net-misc/rsync/files/rsync-3.1.2-CVE-2017-17433-fixup.patch 
b/net-misc/rsync/files/rsync-3.1.2-CVE-2017-17433-fixup.patch
new file mode 100644
index 000..0cc9b82
--- /dev/null
+++ b/net-misc/rsync/files/rsync-3.1.2-CVE-2017-17433-fixup.patch
@@ -0,0 +1,33 @@
+From: Wayne Davison 
+Date: Sun, 3 Dec 2017 23:49:56 + (-0800)
+Subject: Fix issue with earlier path-check (fixes "make check")
+X-Git-Url: 
https://git.samba.org/?p=rsync.git;a=commitdiff_plain;h=f5e8a17e093065fb20fea00a29540fe2c7896441;hp=5509597decdbd7b91994210f700329d8a35e70a1
+
+Fix issue with earlier path-check (fixes "make check")
+---
+
+diff --git a/receiver.c b/receiver.c
+index 9c46242..75cb00d 100644
+--- a/receiver.c
 b/receiver.c
+@@ -574,15 +574,15 @@ int recv_files(int f_in, int f_out, char *local_name)
+   file = dir_flist->files[cur_flist->parent_ndx];
+   fname = local_name ? local_name : f_name(file, fbuf);
+ 
+-  if (daemon_filter_list.head
+-  && check_filter(&daemon_filter_list, FLOG, fname, 0) < 0) {
++  if (DEBUG_GTE(RECV, 1))
++  rprintf(FINFO, "recv_files(%s)\n", fname);
++
++  if (daemon_filter_list.head && (*fname != '.' || fname[1] != 
'\0')
++   && check_filter(&daemon_filter_list, FLOG, fname, 0) < 0) {
+   rprintf(FERROR, "attempt to hack rsync failed.\n");
+   exit_cleanup(RERR_PROTOCOL);
+   }
+ 
+-  if (DEBUG_GTE(RECV, 1))
+-  rprintf(FINFO, "recv_files(%s)\n", fname);
+-
+ #ifdef SUPPORT_XATTRS
+   if (preserve_xattrs && iflags & ITEM_REPORT_XATTR && do_xfers
+&& !(want_xattr_optim && BITS_SET(iflags, 
ITEM_XNAME_FOLLOWS|ITEM_LOCAL_CHANGE)))

diff --git a/net-misc/rsync/files/rsync-3.1.2-CVE-2017-17433.patch 
b/net-misc/rsync/files/rsync-3.1.2-CVE-2017-17433.patch
new file mode 100644
index 000..0ab8de1
--- /dev/null
+++ b/net-misc/rsync/files/rsync-3.1.2-CVE-2017-17433.patch
@@ -0,0 +1,39 @@
+From 3e06d40029cfdce9d0f73d87cfd4edaf54be9c51 Mon Sep 17 00:00:00 2001
+From: Jeriko One 
+Date: Thu, 2 Nov 2017 23:44:19 -0700
+Subject: [PATCH] Check fname in recv_files sooner.
+
+---
+ receiver.c | 12 ++--
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+Index: rsync-3.1.2/receiver.c
+===
+--- rsync-3.1.2.orig/receiver.c
 rsync-3.1.2/receiver.c
+@@ -580,6 +580,12 @@ int recv_files(int f_in, int f_out, char
+   file = dir_flist->files[cur_flist->parent_ndx];
+   fname = local_name ? local_name : f_name(file, fbuf);
+ 
++  if (daemon_filter_list.head
++  && check_filter(&daemon_filter_list, FLOG, fname, 0) < 0) {
++  rprintf(FERROR, "attempt to hack r

[gentoo-commits] proj/musl:master commit in: net-misc/rsync/files/, net-misc/rsync/

2018-01-29 Thread Aric Belsito 
commit: 5ec4cbb0630d630807af09d25689fb1a0bda8785
Author: Pierre-Olivier Mercier  nemunai  re>
AuthorDate: Fri May  5 16:43:17 2017 +
Commit: Aric Belsito  gmail  com>
CommitDate: Sun Jan 28 13:24:30 2018 +
URL:https://gitweb.gentoo.org/proj/musl.git/commit/?id=5ec4cbb0

net-misc/rsync: IPv6 compatibility fix

Bug: https://bugs.gentoo.org/609694
Bug: https://bugzilla.samba.org/show_bug.cgi?id=10715

 net-misc/rsync/Manifest|   1 +
 net-misc/rsync/files/rsync-fix-musl-ipv6.patch | 605 +
 net-misc/rsync/files/rsyncd.conf-3.0.9-r1  |  15 +
 net-misc/rsync/files/rsyncd.conf.d |   5 +
 net-misc/rsync/files/rsyncd.init.d-r1  |  11 +
 net-misc/rsync/files/rsyncd.logrotate  |   9 +
 net-misc/rsync/files/rsyncd.service|  12 +
 net-misc/rsync/files/rsyncd.xinetd-3.0.9-r1|  10 +
 net-misc/rsync/rsync-3.1.2-r2.ebuild   |  89 
 9 files changed, 757 insertions(+)

diff --git a/net-misc/rsync/Manifest b/net-misc/rsync/Manifest
new file mode 100644
index 000..87500d8
--- /dev/null
+++ b/net-misc/rsync/Manifest
@@ -0,0 +1 @@
+DIST rsync-3.1.2.tar.gz 892724 BLAKE2B 
e366514ae9835ba7c201a9e09fb9342c5e52fa36d45d46300d080403de25a64ba3ed7a703e56b4f47a743a597694a2d0a50bb4bab6cfa0aa7b59a4f7b93b9f21
 SHA512 
4c55fd69f436ead0cb5a0b7c6fdfef9bb28ddb9c63534eb619e756b118d5b08cfc5e696498650932c86e865b37e06633da947e6720ca0c27ed5c034313ae208b

diff --git a/net-misc/rsync/files/rsync-fix-musl-ipv6.patch 
b/net-misc/rsync/files/rsync-fix-musl-ipv6.patch
new file mode 100644
index 000..53d7381
--- /dev/null
+++ b/net-misc/rsync/files/rsync-fix-musl-ipv6.patch
@@ -0,0 +1,605 @@
+From 78621d2d5e12c9e7c54ab0a15bb90495d7927251 Mon Sep 17 00:00:00 2001
+From: Pierre-Olivier Mercier 
+Date: Wed, 8 Mar 2017 12:44:11 +0100
+Subject: [PATCH] musl compatibility
+
+---
+ configure.ac | 138 +---
+ configure.sh | 348 +--
+ 2 files changed, 102 insertions(+), 384 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 1b32dfb..891f7b9 100644
+--- a/configure.ac
 b/configure.ac
+@@ -204,119 +204,37 @@ if test x"$rsync_cv_HAVE_BROKEN_LARGEFILE" != x"yes"; 
then
+AC_SYS_LARGEFILE
+ fi
+
+-ipv6type=unknown
+-ipv6lib=none
+-ipv6trylibc=yes
+
++# Checks if IPv6 is requested
++AC_MSG_CHECKING([whether to enable ipv6])
+ AC_ARG_ENABLE(ipv6,
+-  AS_HELP_STRING([--disable-ipv6],[do not even try to use IPv6]))
+-if test x"$enable_ipv6" != x"no"; then
+-  AC_MSG_CHECKING([ipv6 stack type])
+-  for i in inria kame linux-glibc linux-inet6 solaris toshiba v6d zeta 
cygwin; do
+-  case $i in
+-  inria)
+-  # http://www.kame.net/
+-  AC_EGREP_CPP(yes, [
+-#include 
+-#ifdef IPV6_INRIA_VERSION
+-yes
+-#endif],
+-  [ipv6type=$i;
+-  AC_DEFINE(INET6, 1, [true if you have IPv6])
+-  ])
+-  ;;
+-  kame)
+-  # http://www.kame.net/
+-  AC_EGREP_CPP(yes, [
+-#include 
+-#ifdef __KAME__
+-yes
+-#endif],
+-  [ipv6type=$i;
+-  AC_DEFINE(INET6, 1, [true if you have IPv6])])
+-  ;;
+-  linux-glibc)
+-  # http://www.v6.linux.or.jp/
+-  AC_EGREP_CPP(yes, [
+-#include 
+-#if defined(__GLIBC__) && __GLIBC__ >= 2 && __GLIBC_MINOR__ >= 1
+-yes
+-#endif],
+-  [ipv6type=$i;
+-AC_DEFINE(INET6, 1, [true if you have IPv6])])
+-  ;;
+-  linux-inet6)
+-  # http://www.v6.linux.or.jp/
+-  if test -d /usr/inet6 -o -f /usr/inet6/lib/libinet6.a; 
then
+-  ipv6type=$i
+-  ipv6lib=inet6
+-  ipv6libdir=/usr/inet6/lib
+-  ipv6trylibc=yes;
+-  AC_DEFINE(INET6, 1, [true if you have IPv6])
+-  CFLAGS="-I/usr/inet6/include $CFLAGS"
+-  fi
+-  ;;
+-  solaris)
+-  # http://www.sun.com
+-  AC_EGREP_CPP(yes, [
+-#include 
+-#ifdef __sun
+-yes
+-#endif],
+-  [ipv6type=$i;
+-  AC_DEFINE(INET6, 1, [true if you have IPv6])])
+-  ;;
+-  toshiba)
+-  AC_EGREP_CPP(yes, [
+-#include 
+-#ifdef _TOSHIBA_INET6
+-yes
+-#endif],
+-  [ipv6type=$i;
+-  ipv6lib=inet6;
+-  ipv6libdir=/usr/local/v6/lib;
+-  AC_DEFINE(INET6, 1, [true if you have IPv6])])
+-  ;;