* [gentoo-commits] proj/musl:master commit in: net-misc/rsync/files/, net-misc/rsync/
@ 2018-01-29 19:12 Aric Belsito
0 siblings, 0 replies; 6+ messages in thread
From: Aric Belsito @ 2018-01-29 19:12 UTC (permalink / raw
To: gentoo-commits
commit: 21c37337e1b7e515dc382632f14099a5e49bb3ee
Author: Aric Belsito <lluixhi <AT> gmail <DOT> com>
AuthorDate: Mon Jan 29 19:11:39 2018 +0000
Commit: Aric Belsito <lluixhi <AT> gmail <DOT> com>
CommitDate: Mon Jan 29 19:11:39 2018 +0000
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 0000000..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 0000000..0cc9b82
--- /dev/null
+++ b/net-misc/rsync/files/rsync-3.1.2-CVE-2017-17433-fixup.patch
@@ -0,0 +1,33 @@
+From: Wayne Davison <wayned@samba.org>
+Date: Sun, 3 Dec 2017 23:49:56 +0000 (-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 0000000..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 <jeriko.one@gmx.us>
+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 rsync failed.\n");
++ exit_cleanup(RERR_PROTOCOL);
++ }
++
+ if (DEBUG_GTE(RECV, 1))
+ rprintf(FINFO, "recv_files(%s)\n", fname);
+
+@@ -651,12 +657,6 @@ int recv_files(int f_in, int f_out, char
+
+ cleanup_got_literal = 0;
+
+- if (daemon_filter_list.head
+- && check_filter(&daemon_filter_list, FLOG, fname, 0) < 0) {
+- rprintf(FERROR, "attempt to hack rsync failed.\n");
+- exit_cleanup(RERR_PROTOCOL);
+- }
+-
+ if (read_batch) {
+ int wanted = redoing
+ ? we_want_redo(ndx)
diff --git a/net-misc/rsync/files/rsync-3.1.2-CVE-2017-17434-part1.patch b/net-misc/rsync/files/rsync-3.1.2-CVE-2017-17434-part1.patch
new file mode 100644
index 0000000..aeb8c2e
--- /dev/null
+++ b/net-misc/rsync/files/rsync-3.1.2-CVE-2017-17434-part1.patch
@@ -0,0 +1,22 @@
+From 5509597decdbd7b91994210f700329d8a35e70a1 Mon Sep 17 00:00:00 2001
+From: Jeriko One <jeriko.one@gmx.us>
+Date: Thu, 16 Nov 2017 17:26:03 -0800
+Subject: [PATCH] Check daemon filter against fnamecmp in recv_files().
+
+---
+ receiver.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+Index: rsync-3.1.2/receiver.c
+===================================================================
+--- rsync-3.1.2.orig/receiver.c
++++ rsync-3.1.2/receiver.c
+@@ -728,7 +728,7 @@ int recv_files(int f_in, int f_out, char
+ break;
+ }
+ if (!fnamecmp || (daemon_filter_list.head
+- && check_filter(&daemon_filter_list, FLOG, fname, 0) < 0)) {
++ && check_filter(&daemon_filter_list, FLOG, fnamecmp, 0) < 0)) {
+ fnamecmp = fname;
+ fnamecmp_type = FNAMECMP_FNAME;
+ }
diff --git a/net-misc/rsync/files/rsync-3.1.2-CVE-2017-17434-part2.patch b/net-misc/rsync/files/rsync-3.1.2-CVE-2017-17434-part2.patch
new file mode 100644
index 0000000..5b94efa
--- /dev/null
+++ b/net-misc/rsync/files/rsync-3.1.2-CVE-2017-17434-part2.patch
@@ -0,0 +1,33 @@
+From 70aeb5fddd1b2f8e143276f8d5a085db16c593b9 Mon Sep 17 00:00:00 2001
+From: Jeriko One <jeriko.one@gmx.us>
+Date: Thu, 16 Nov 2017 17:05:42 -0800
+Subject: [PATCH] Sanitize xname in read_ndx_and_attrs.
+
+---
+ rsync.c | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+Index: rsync-3.1.2/rsync.c
+===================================================================
+--- rsync-3.1.2.orig/rsync.c
++++ rsync-3.1.2/rsync.c
+@@ -50,6 +50,7 @@ extern int flist_eof;
+ extern int file_old_total;
+ extern int keep_dirlinks;
+ extern int make_backups;
++extern int sanitize_paths;
+ extern struct file_list *cur_flist, *first_flist, *dir_flist;
+ extern struct chmod_mode_struct *daemon_chmod_modes;
+ #ifdef ICONV_OPTION
+@@ -397,6 +398,11 @@ int read_ndx_and_attrs(int f_in, int f_o
+ if (iflags & ITEM_XNAME_FOLLOWS) {
+ if ((len = read_vstring(f_in, buf, MAXPATHLEN)) < 0)
+ exit_cleanup(RERR_PROTOCOL);
++
++ if (sanitize_paths) {
++ sanitize_path(buf, buf, "", 0, SP_DEFAULT);
++ len = strlen(buf);
++ }
+ } else {
+ *buf = '\0';
+ len = -1;
diff --git a/net-misc/rsync/metadata.xml b/net-misc/rsync/metadata.xml
new file mode 100644
index 0000000..148a18e
--- /dev/null
+++ b/net-misc/rsync/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>base-system@gentoo.org</email>
+ <name>Gentoo Base System</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="cpe">cpe:/a:samba:rsync</remote-id>
+ </upstream>
+ <use>
+ <flag name="stunnel">Provide helper scripts for using rsync via >=net-misc/stunnel-4</flag>
+ </use>
+</pkgmetadata>
diff --git a/net-misc/rsync/rsync-3.1.2-r2.ebuild b/net-misc/rsync/rsync-3.1.2-r2.ebuild
index 08473b5..2302d9a 100644
--- a/net-misc/rsync/rsync-3.1.2-r2.ebuild
+++ b/net-misc/rsync/rsync-3.1.2-r2.ebuild
@@ -1,21 +1,21 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI="6"
inherit eutils flag-o-matic prefix systemd
DESCRIPTION="File transfer program to keep remote files into sync"
-HOMEPAGE="http://rsync.samba.org/"
-SRC_URI="http://rsync.samba.org/ftp/rsync/src/${P}.tar.gz"
-[[ "${PV}" = *_pre* ]] && SRC_URI="http://rsync.samba.org/ftp/rsync/src-previews/${P/_/}.tar.gz"
+HOMEPAGE="https://rsync.samba.org/"
+SRC_URI="https://rsync.samba.org/ftp/rsync/src/${P}.tar.gz"
+[[ "${PV}" = *_pre* ]] && SRC_URI="https://rsync.samba.org/ftp/rsync/src-previews/${P/_/}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
if [[ ${PV} != *_pre ]] ; then
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
-IUSE="acl iconv ipv6 static stunnel xattr"
+IUSE="acl examples iconv ipv6 static stunnel xattr"
LIB_DEPEND="acl? ( virtual/acl[static-libs(+)] )
xattr? ( kernel_linux? ( sys-apps/attr[static-libs(+)] ) )
@@ -25,12 +25,17 @@ RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
DEPEND="${RDEPEND}
static? ( ${LIB_DEPEND} )"
-S=${WORKDIR}/${P/_/}
-
PATCHES=(
+ "${FILESDIR}"/${PN}-3.1.2-CVE-2017-16548.patch
+ "${FILESDIR}"/${PN}-3.1.2-CVE-2017-17433.patch
+ "${FILESDIR}"/${PN}-3.1.2-CVE-2017-17434-part1.patch
+ "${FILESDIR}"/${PN}-3.1.2-CVE-2017-17434-part2.patch
+ "${FILESDIR}"/${PN}-3.1.2-CVE-2017-17433-fixup.patch
"${FILESDIR}"/${PN}-fix-musl-ipv6.patch
)
+S=${WORKDIR}/${P/_/}
+
src_configure() {
use static && append-ldflags -static
econf \
@@ -64,9 +69,11 @@ src_install() {
fi
# Install the useful contrib scripts
- exeinto /usr/share/rsync
- doexe support/*
- rm -f "${ED}"/usr/share/rsync/{Makefile*,*.c}
+ if use examples ; then
+ exeinto /usr/share/rsync
+ doexe support/*
+ rm -f "${ED}"/usr/share/rsync/{Makefile*,*.c}
+ fi
eprefixify "${ED}"/etc/{,xinetd.d}/rsyncd*
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] proj/musl:master commit in: net-misc/rsync/files/, net-misc/rsync/
@ 2018-01-29 19:12 Aric Belsito
0 siblings, 0 replies; 6+ messages in thread
From: Aric Belsito @ 2018-01-29 19:12 UTC (permalink / raw
To: gentoo-commits
commit: 5ec4cbb0630d630807af09d25689fb1a0bda8785
Author: Pierre-Olivier Mercier <nemunaire <AT> nemunai <DOT> re>
AuthorDate: Fri May 5 16:43:17 2017 +0000
Commit: Aric Belsito <lluixhi <AT> gmail <DOT> com>
CommitDate: Sun Jan 28 13:24:30 2018 +0000
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 0000000..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 0000000..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 <nemunaire@nemunai.re>
+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 <netinet/in.h>
+-#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 <netinet/in.h>
+-#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 <features.h>
+-#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 <netinet/ip6.h>
+-#ifdef __sun
+-yes
+-#endif],
+- [ipv6type=$i;
+- AC_DEFINE(INET6, 1, [true if you have IPv6])])
+- ;;
+- toshiba)
+- AC_EGREP_CPP(yes, [
+-#include <sys/param.h>
+-#ifdef _TOSHIBA_INET6
+-yes
+-#endif],
+- [ipv6type=$i;
+- ipv6lib=inet6;
+- ipv6libdir=/usr/local/v6/lib;
+- AC_DEFINE(INET6, 1, [true if you have IPv6])])
+- ;;
+- v6d)
+- AC_EGREP_CPP(yes, [
+-#include </usr/local/v6/include/sys/v6config.h>
+-#ifdef __V6D__
+-yes
+-#endif],
+- [ipv6type=$i;
+- ipv6lib=v6;
+- ipv6libdir=/usr/local/v6/lib;
+- AC_DEFINE(INET6, 1, [true if you have IPv6])])
+- ;;
+- zeta)
+- AC_EGREP_CPP(yes, [
+-#include <sys/param.h>
+-#ifdef _ZETA_MINAMI_INET6
+-yes
+-#endif],
+- [ipv6type=$i;
+- ipv6lib=inet6;
+- ipv6libdir=/usr/local/v6/lib;
+- AC_DEFINE(INET6, 1, [true if you have IPv6])])
+- ;;
+- cygwin)
+- AC_EGREP_CPP(yes, [
+-#include <netinet/in.h>
+-#ifdef _CYGWIN_IN6_H
+-yes
+-#endif],
+- [ipv6type=$i;
+- AC_DEFINE(INET6, 1, [true if you have IPv6])])
+- ;;
+- esac
+- if test "$ipv6type" != "unknown"; then
+- break
+- fi
+- done
+- AC_MSG_RESULT($ipv6type)
++[ --disable-ipv6 disable ipv6 support],
++[ case "$enableval" in
++ no)
++ AC_MSG_RESULT(no)
++ ;;
++ *) AC_MSG_RESULT(yes)
++ AC_DEFINE(INET6, 1, [true if you have IPv6])
++ ;;
++ esac ],
+
+- AC_SEARCH_LIBS(getaddrinfo, inet6)
+-fi
++ AC_TRY_RUN([ /* AF_INET6 avalable check */
++#include <sys/types.h>
++#include <sys/socket.h>
++main()
++{
++ exit(0);
++ if (socket(AF_INET6, SOCK_STREAM, 0) < 0)
++ exit(1);
++ else
++ exit(0);
++}
++],
++ AC_MSG_RESULT(yes)
++ AC_DEFINE(INET6, 1, [true if you have IPv6]),
++ 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-locale disable locale features
+ --disable-iconv-open disable 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}: 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_check_header_mongrel LINENO HEADER VAR INCLUDES
+ # -------------------------------------------------------
+ # Tests whether HEADER exists, giving a warning if it cannot be compiled using
+@@ -4548,7 +4548,7 @@ else
+ We can't simply define LARGE_OFF_T to be 9223372036854775807,
+ since some C++ compilers masquerading as C compilers
+ incorrectly reject 9223372036854775807. */
+-#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
++#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
+ int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
+ && LARGE_OFF_T % 2147483647 == 1)
+ ? 1 : -1];
+@@ -4594,7 +4594,7 @@ else
+ We can't simply define LARGE_OFF_T to be 9223372036854775807,
+ since some C++ compilers masquerading as C compilers
+ incorrectly reject 9223372036854775807. */
+-#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
++#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
+ int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
+ && LARGE_OFF_T % 2147483647 == 1)
+ ? 1 : -1];
+@@ -4618,7 +4618,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ We can't simply define LARGE_OFF_T to be 9223372036854775807,
+ since some C++ compilers masquerading as C compilers
+ incorrectly reject 9223372036854775807. */
+-#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
++#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
+ int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
+ && LARGE_OFF_T % 2147483647 == 1)
+ ? 1 : -1];
+@@ -4663,7 +4663,7 @@ else
+ We can't simply define LARGE_OFF_T to be 9223372036854775807,
+ since some C++ compilers masquerading as C compilers
+ incorrectly reject 9223372036854775807. */
+-#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
++#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
+ int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
+ && LARGE_OFF_T % 2147483647 == 1)
+ ? 1 : -1];
+@@ -4687,7 +4687,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ We can't simply define LARGE_OFF_T to be 9223372036854775807,
+ since some C++ compilers masquerading as C compilers
+ incorrectly reject 9223372036854775807. */
+-#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
++#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
+ int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
+ && LARGE_OFF_T % 2147483647 == 1)
+ ? 1 : -1];
+@@ -4725,262 +4725,61 @@ fi
+
+ fi
+
+-ipv6type=unknown
+-ipv6lib=none
+-ipv6trylibc=yes
+
++# Checks if IPv6 is requested
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable ipv6" >&5
++$as_echo_n "checking whether to enable ipv6... " >&6; }
+ # Check whether --enable-ipv6 was given.
+ if test "${enable_ipv6+set}" = set; then :
+- enableval=$enable_ipv6;
+-fi
+-
+-if test x"$enable_ipv6" != x"no"; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: checking ipv6 stack type" >&5
+-$as_echo_n "checking ipv6 stack type... " >&6; }
+- for i in inria kame linux-glibc linux-inet6 solaris toshiba v6d zeta cygwin; do
+- case $i in
+- inria)
+- # http://www.kame.net/
+-
+-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h. */
+-
+-#include <netinet/in.h>
+-#ifdef IPV6_INRIA_VERSION
+-yes
+-#endif
+-_ACEOF
+-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+- $EGREP "yes" >/dev/null 2>&1; then :
+- ipv6type=$i;
+-
+-$as_echo "#define INET6 1" >>confdefs.h
+-
+-
+-fi
+-rm -f conftest*
+-
+- ;;
+- kame)
+- # http://www.kame.net/
+- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h. */
+-
+-#include <netinet/in.h>
+-#ifdef __KAME__
+-yes
+-#endif
+-_ACEOF
+-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+- $EGREP "yes" >/dev/null 2>&1; then :
+- ipv6type=$i;
+-
+-$as_echo "#define INET6 1" >>confdefs.h
+-
+-fi
+-rm -f conftest*
+-
+- ;;
+- linux-glibc)
+- # http://www.v6.linux.or.jp/
+- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h. */
+-
+-#include <features.h>
+-#if defined(__GLIBC__) && __GLIBC__ >= 2 && __GLIBC_MINOR__ >= 1
+-yes
+-#endif
+-_ACEOF
+-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+- $EGREP "yes" >/dev/null 2>&1; then :
+- ipv6type=$i;
+-
+-$as_echo "#define INET6 1" >>confdefs.h
+-
+-fi
+-rm -f conftest*
+-
+- ;;
+- 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;
+-
+-$as_echo "#define INET6 1" >>confdefs.h
+-
+- CFLAGS="-I/usr/inet6/include $CFLAGS"
+- fi
+- ;;
+- solaris)
+- # http://www.sun.com
+- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h. */
+-
+-#include <netinet/ip6.h>
+-#ifdef __sun
+-yes
+-#endif
+-_ACEOF
+-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+- $EGREP "yes" >/dev/null 2>&1; then :
+- ipv6type=$i;
+-
+-$as_echo "#define INET6 1" >>confdefs.h
+-
+-fi
+-rm -f conftest*
+-
+- ;;
+- toshiba)
+- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h. */
+-
+-#include <sys/param.h>
+-#ifdef _TOSHIBA_INET6
+-yes
+-#endif
+-_ACEOF
+-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+- $EGREP "yes" >/dev/null 2>&1; then :
+- ipv6type=$i;
+- ipv6lib=inet6;
+- ipv6libdir=/usr/local/v6/lib;
+-
+-$as_echo "#define INET6 1" >>confdefs.h
+-
+-fi
+-rm -f conftest*
+-
+- ;;
+- v6d)
+- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h. */
+-
+-#include </usr/local/v6/include/sys/v6config.h>
+-#ifdef __V6D__
+-yes
+-#endif
+-_ACEOF
+-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+- $EGREP "yes" >/dev/null 2>&1; then :
+- ipv6type=$i;
+- ipv6lib=v6;
+- ipv6libdir=/usr/local/v6/lib;
+-
+-$as_echo "#define INET6 1" >>confdefs.h
+-
+-fi
+-rm -f conftest*
+-
+- ;;
+- zeta)
+- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h. */
+-
+-#include <sys/param.h>
+-#ifdef _ZETA_MINAMI_INET6
+-yes
+-#endif
+-_ACEOF
+-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+- $EGREP "yes" >/dev/null 2>&1; then :
+- ipv6type=$i;
+- ipv6lib=inet6;
+- ipv6libdir=/usr/local/v6/lib;
+-
+-$as_echo "#define INET6 1" >>confdefs.h
+-
+-fi
+-rm -f conftest*
+-
+- ;;
+- cygwin)
+- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h. */
+-
+-#include <netinet/in.h>
+-#ifdef _CYGWIN_IN6_H
+-yes
+-#endif
+-_ACEOF
+-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+- $EGREP "yes" >/dev/null 2>&1; then :
+- ipv6type=$i;
++ enableval=$enable_ipv6; case "$enableval" in
++ no)
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++ ;;
++ *) { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
++$as_echo "yes" >&6; }
+
+ $as_echo "#define INET6 1" >>confdefs.h
+
+-fi
+-rm -f conftest*
++ ;;
++ esac
++else
++ if test "$cross_compiling" = yes; then :
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+
+- ;;
+- esac
+- if test "$ipv6type" != "unknown"; then
+- break
+- fi
+- done
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ipv6type" >&5
+-$as_echo "$ipv6type" >&6; }
+-
+- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing getaddrinfo" >&5
+-$as_echo_n "checking for library containing getaddrinfo... " >&6; }
+-if ${ac_cv_search_getaddrinfo+:} false; then :
+- $as_echo_n "(cached) " >&6
+ else
+- ac_func_search_save_LIBS=$LIBS
+-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+-
+-/* Override any GCC internal prototype to avoid an error.
+- Use char because int might match the return type of a GCC
+- builtin and then its argument prototype would still apply. */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-char getaddrinfo ();
+-int
+-main ()
++ /* AF_INET6 avalable check */
++#include <sys/types.h>
++#include <sys/socket.h>
++main()
+ {
+-return getaddrinfo ();
+- ;
+- return 0;
++ exit(0);
++ if (socket(AF_INET6, SOCK_STREAM, 0) < 0)
++ exit(1);
++ else
++ exit(0);
+ }
++
+ _ACEOF
+-for ac_lib in '' inet6; do
+- if test -z "$ac_lib"; then
+- ac_res="none required"
+- else
+- ac_res=-l$ac_lib
+- LIBS="-l$ac_lib $ac_func_search_save_LIBS"
+- fi
+- if ac_fn_c_try_link "$LINENO"; then :
+- ac_cv_search_getaddrinfo=$ac_res
+-fi
+-rm -f core conftest.err conftest.$ac_objext \
+- conftest$ac_exeext
+- if ${ac_cv_search_getaddrinfo+:} false; then :
+- break
+-fi
+-done
+-if ${ac_cv_search_getaddrinfo+:} false; then :
++if ac_fn_c_try_run "$LINENO"; then :
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
++$as_echo "yes" >&6; }
++
++$as_echo "#define INET6 1" >>confdefs.h
+
+ else
+- ac_cv_search_getaddrinfo=no
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+ fi
+-rm conftest.$ac_ext
+-LIBS=$ac_func_search_save_LIBS
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
++ conftest.$ac_objext conftest.beam conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_getaddrinfo" >&5
+-$as_echo "$ac_cv_search_getaddrinfo" >&6; }
+-ac_res=$ac_cv_search_getaddrinfo
+-if test "$ac_res" != no; then :
+- test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+
+ fi
+
+-fi
+
+ # Check whether --enable-locale was given.
+ if test "${enable_locale+set}" = set; then :
+@@ -5006,6 +4805,7 @@ $as_echo "#define SHUTDOWN_ALL_SOCKETS 1" >>confdefs.h
+ $as_echo "no" >&6; };;
+ esac
+
++
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
+ $as_echo_n "checking for ANSI C header files... " >&6; }
+ if ${ac_cv_header_stdc+:} false; then :
+--
+2.10.2
diff --git a/net-misc/rsync/files/rsyncd.conf-3.0.9-r1 b/net-misc/rsync/files/rsyncd.conf-3.0.9-r1
new file mode 100644
index 0000000..20dcf3a
--- /dev/null
+++ b/net-misc/rsync/files/rsyncd.conf-3.0.9-r1
@@ -0,0 +1,15 @@
+# /etc/rsyncd.conf
+
+# Minimal configuration file for rsync daemon
+# See rsync(1) and rsyncd.conf(5) man pages for help
+
+# This line is required by the /etc/init.d/rsyncd script
+pid file = @GENTOO_PORTAGE_EPREFIX@/run/rsyncd.pid
+use chroot = yes
+read only = yes
+
+# Simple example for enabling your own local rsync server
+#[gentoo-portage]
+# path = @GENTOO_PORTAGE_EPREFIX@/usr/portage
+# comment = Gentoo Portage tree
+# exclude = /distfiles /packages
diff --git a/net-misc/rsync/files/rsyncd.conf.d b/net-misc/rsync/files/rsyncd.conf.d
new file mode 100644
index 0000000..c3d897e
--- /dev/null
+++ b/net-misc/rsync/files/rsyncd.conf.d
@@ -0,0 +1,5 @@
+# /etc/conf.d/rsyncd: config file for /etc/init.d/rsyncd
+
+# see man pages for rsync or run `rsync --help`
+# for valid cmdline options
+#RSYNC_OPTS=""
diff --git a/net-misc/rsync/files/rsyncd.init.d-r1 b/net-misc/rsync/files/rsyncd.init.d-r1
new file mode 100644
index 0000000..243e107
--- /dev/null
+++ b/net-misc/rsync/files/rsyncd.init.d-r1
@@ -0,0 +1,11 @@
+#!/sbin/openrc-run
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+command="/usr/bin/rsync"
+command_args="--daemon ${RSYNC_OPTS}"
+pidfile="/var/run/${SVCNAME}.pid"
+
+depend() {
+ use net
+}
diff --git a/net-misc/rsync/files/rsyncd.logrotate b/net-misc/rsync/files/rsyncd.logrotate
new file mode 100644
index 0000000..34bcf72
--- /dev/null
+++ b/net-misc/rsync/files/rsyncd.logrotate
@@ -0,0 +1,9 @@
+/var/log/rsync.log {
+ compress
+ maxage 365
+ rotate 7
+ size=+1024k
+ notifempty
+ missingok
+ copytruncate
+}
diff --git a/net-misc/rsync/files/rsyncd.service b/net-misc/rsync/files/rsyncd.service
new file mode 100644
index 0000000..a2c1de0
--- /dev/null
+++ b/net-misc/rsync/files/rsyncd.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=rsync daemon
+After=networking.target
+
+[Service]
+Type=simple
+ExecStart=/usr/bin/rsync --daemon --no-detach
+StandardOutput=syslog
+StandardError=syslog
+
+[Install]
+WantedBy=multi-user.target
diff --git a/net-misc/rsync/files/rsyncd.xinetd-3.0.9-r1 b/net-misc/rsync/files/rsyncd.xinetd-3.0.9-r1
new file mode 100644
index 0000000..90d07f0
--- /dev/null
+++ b/net-misc/rsync/files/rsyncd.xinetd-3.0.9-r1
@@ -0,0 +1,10 @@
+service rsync
+{
+ socket_type = stream
+ protocol = tcp
+ wait = no
+ user = root
+ server = @GENTOO_PORTAGE_EPREFIX@/usr/bin/rsync
+ server_args = --daemon
+ disable = yes
+}
diff --git a/net-misc/rsync/rsync-3.1.2-r2.ebuild b/net-misc/rsync/rsync-3.1.2-r2.ebuild
new file mode 100644
index 0000000..08473b5
--- /dev/null
+++ b/net-misc/rsync/rsync-3.1.2-r2.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils flag-o-matic prefix systemd
+
+DESCRIPTION="File transfer program to keep remote files into sync"
+HOMEPAGE="http://rsync.samba.org/"
+SRC_URI="http://rsync.samba.org/ftp/rsync/src/${P}.tar.gz"
+[[ "${PV}" = *_pre* ]] && SRC_URI="http://rsync.samba.org/ftp/rsync/src-previews/${P/_/}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+if [[ ${PV} != *_pre ]] ; then
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+IUSE="acl iconv ipv6 static stunnel xattr"
+
+LIB_DEPEND="acl? ( virtual/acl[static-libs(+)] )
+ xattr? ( kernel_linux? ( sys-apps/attr[static-libs(+)] ) )
+ >=dev-libs/popt-1.5[static-libs(+)]"
+RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
+ iconv? ( virtual/libiconv )"
+DEPEND="${RDEPEND}
+ static? ( ${LIB_DEPEND} )"
+
+S=${WORKDIR}/${P/_/}
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-fix-musl-ipv6.patch
+)
+
+src_configure() {
+ use static && append-ldflags -static
+ econf \
+ --without-included-popt \
+ $(use_enable acl acl-support) \
+ $(use_enable xattr xattr-support) \
+ $(use_enable ipv6) \
+ $(use_enable iconv) \
+ --with-rsyncd-conf="${EPREFIX}"/etc/rsyncd.conf
+ touch proto.h-tstamp #421625
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+ newconfd "${FILESDIR}"/rsyncd.conf.d rsyncd
+ newinitd "${FILESDIR}"/rsyncd.init.d-r1 rsyncd
+ dodoc NEWS OLDNEWS README TODO tech_report.tex
+ insinto /etc
+ newins "${FILESDIR}"/rsyncd.conf-3.0.9-r1 rsyncd.conf
+
+ insinto /etc/logrotate.d
+ newins "${FILESDIR}"/rsyncd.logrotate rsyncd
+
+ insinto /etc/xinetd.d
+ newins "${FILESDIR}"/rsyncd.xinetd-3.0.9-r1 rsyncd
+
+ # Install stunnel helpers
+ if use stunnel ; then
+ emake DESTDIR="${D}" install-ssl-client
+ emake DESTDIR="${D}" install-ssl-daemon
+ fi
+
+ # Install the useful contrib scripts
+ exeinto /usr/share/rsync
+ doexe support/*
+ rm -f "${ED}"/usr/share/rsync/{Makefile*,*.c}
+
+ eprefixify "${ED}"/etc/{,xinetd.d}/rsyncd*
+
+ systemd_dounit "${FILESDIR}/rsyncd.service"
+}
+
+pkg_postinst() {
+ if egrep -qis '^[[:space:]]use chroot[[:space:]]*=[[:space:]]*(no|0|false)' \
+ "${EROOT}"/etc/rsyncd.conf "${EROOT}"/etc/rsync/rsyncd.conf ; then
+ ewarn "You have disabled chroot support in your rsyncd.conf. This"
+ ewarn "is a security risk which you should fix. Please check your"
+ ewarn "/etc/rsyncd.conf file and fix the setting 'use chroot'."
+ fi
+ if use stunnel ; then
+ einfo "Please install \">=net-misc/stunnel-4\" in order to use stunnel feature."
+ einfo
+ einfo "You maybe have to update the certificates configured in"
+ einfo "${EROOT}/etc/stunnel/rsync.conf"
+ fi
+}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] proj/musl:master commit in: net-misc/rsync/files/, net-misc/rsync/
@ 2018-06-16 23:11 Anthony G. Basile
0 siblings, 0 replies; 6+ messages in thread
From: Anthony G. Basile @ 2018-06-16 23:11 UTC (permalink / raw
To: gentoo-commits
commit: 3c0b666ea93eb7f456bf2b724eff24cd6a3dfa5f
Author: stefson <herrtimson <AT> yahoo <DOT> de>
AuthorDate: Sat Jun 16 11:59:07 2018 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sat Jun 16 23:10:57 2018 +0000
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..0000000
--- 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..0000000
--- a/net-misc/rsync/files/rsync-3.1.2-CVE-2017-17433-fixup.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From: Wayne Davison <wayned@samba.org>
-Date: Sun, 3 Dec 2017 23:49:56 +0000 (-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..0000000
--- 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:00:00 2001
-From: Jeriko One <jeriko.one@gmx.us>
-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 rsync failed.\n");
-+ exit_cleanup(RERR_PROTOCOL);
-+ }
-+
- if (DEBUG_GTE(RECV, 1))
- rprintf(FINFO, "recv_files(%s)\n", fname);
-
-@@ -651,12 +657,6 @@ int recv_files(int f_in, int f_out, char
-
- cleanup_got_literal = 0;
-
-- if (daemon_filter_list.head
-- && check_filter(&daemon_filter_list, FLOG, fname, 0) < 0) {
-- rprintf(FERROR, "attempt to hack rsync failed.\n");
-- exit_cleanup(RERR_PROTOCOL);
-- }
--
- if (read_batch) {
- int wanted = redoing
- ? we_want_redo(ndx)
diff --git a/net-misc/rsync/files/rsync-3.1.2-CVE-2017-17434-part1.patch b/net-misc/rsync/files/rsync-3.1.2-CVE-2017-17434-part1.patch
deleted file mode 100644
index aeb8c2e..0000000
--- a/net-misc/rsync/files/rsync-3.1.2-CVE-2017-17434-part1.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 5509597decdbd7b91994210f700329d8a35e70a1 Mon Sep 17 00:00:00 2001
-From: Jeriko One <jeriko.one@gmx.us>
-Date: Thu, 16 Nov 2017 17:26:03 -0800
-Subject: [PATCH] Check daemon filter against fnamecmp in recv_files().
-
----
- receiver.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-Index: rsync-3.1.2/receiver.c
-===================================================================
---- rsync-3.1.2.orig/receiver.c
-+++ rsync-3.1.2/receiver.c
-@@ -728,7 +728,7 @@ int recv_files(int f_in, int f_out, char
- break;
- }
- if (!fnamecmp || (daemon_filter_list.head
-- && check_filter(&daemon_filter_list, FLOG, fname, 0) < 0)) {
-+ && check_filter(&daemon_filter_list, FLOG, fnamecmp, 0) < 0)) {
- fnamecmp = fname;
- fnamecmp_type = FNAMECMP_FNAME;
- }
diff --git a/net-misc/rsync/files/rsync-3.1.2-CVE-2017-17434-part2.patch b/net-misc/rsync/files/rsync-3.1.2-CVE-2017-17434-part2.patch
deleted file mode 100644
index 5b94efa..0000000
--- a/net-misc/rsync/files/rsync-3.1.2-CVE-2017-17434-part2.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 70aeb5fddd1b2f8e143276f8d5a085db16c593b9 Mon Sep 17 00:00:00 2001
-From: Jeriko One <jeriko.one@gmx.us>
-Date: Thu, 16 Nov 2017 17:05:42 -0800
-Subject: [PATCH] Sanitize xname in read_ndx_and_attrs.
-
----
- rsync.c | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-Index: rsync-3.1.2/rsync.c
-===================================================================
---- rsync-3.1.2.orig/rsync.c
-+++ rsync-3.1.2/rsync.c
-@@ -50,6 +50,7 @@ extern int flist_eof;
- extern int file_old_total;
- extern int keep_dirlinks;
- extern int make_backups;
-+extern int sanitize_paths;
- extern struct file_list *cur_flist, *first_flist, *dir_flist;
- extern struct chmod_mode_struct *daemon_chmod_modes;
- #ifdef ICONV_OPTION
-@@ -397,6 +398,11 @@ int read_ndx_and_attrs(int f_in, int f_o
- if (iflags & ITEM_XNAME_FOLLOWS) {
- if ((len = read_vstring(f_in, buf, MAXPATHLEN)) < 0)
- exit_cleanup(RERR_PROTOCOL);
-+
-+ if (sanitize_paths) {
-+ sanitize_path(buf, buf, "", 0, SP_DEFAULT);
-+ len = strlen(buf);
-+ }
- } else {
- *buf = '\0';
- len = -1;
diff --git a/net-misc/rsync/rsync-3.1.2-r2.ebuild b/net-misc/rsync/rsync-3.1.3.ebuild
similarity index 81%
rename from net-misc/rsync/rsync-3.1.2-r2.ebuild
rename to net-misc/rsync/rsync-3.1.3.ebuild
index 2302d9a..b4a9c2d 100644
--- a/net-misc/rsync/rsync-3.1.2-r2.ebuild
+++ b/net-misc/rsync/rsync-3.1.3.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI="6"
+EAPI=6
inherit eutils flag-o-matic prefix systemd
@@ -12,9 +12,8 @@ SRC_URI="https://rsync.samba.org/ftp/rsync/src/${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
-if [[ ${PV} != *_pre ]] ; then
+[[ ${PV} = *_pre* ]] || \
KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
IUSE="acl examples iconv ipv6 static stunnel xattr"
LIB_DEPEND="acl? ( virtual/acl[static-libs(+)] )
@@ -25,34 +24,34 @@ RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
DEPEND="${RDEPEND}
static? ( ${LIB_DEPEND} )"
-PATCHES=(
- "${FILESDIR}"/${PN}-3.1.2-CVE-2017-16548.patch
- "${FILESDIR}"/${PN}-3.1.2-CVE-2017-17433.patch
- "${FILESDIR}"/${PN}-3.1.2-CVE-2017-17434-part1.patch
- "${FILESDIR}"/${PN}-3.1.2-CVE-2017-17434-part2.patch
- "${FILESDIR}"/${PN}-3.1.2-CVE-2017-17433-fixup.patch
+PATCHES=(
"${FILESDIR}"/${PN}-fix-musl-ipv6.patch
)
-S=${WORKDIR}/${P/_/}
+S="${WORKDIR}/${P/_/}"
src_configure() {
use static && append-ldflags -static
- econf \
- --without-included-popt \
- $(use_enable acl acl-support) \
- $(use_enable xattr xattr-support) \
- $(use_enable ipv6) \
- $(use_enable iconv) \
+ local myeconfargs=(
--with-rsyncd-conf="${EPREFIX}"/etc/rsyncd.conf
+ --without-included-popt
+ $(use_enable acl acl-support)
+ $(use_enable iconv)
+ $(use_enable ipv6)
+ $(use_enable xattr xattr-support)
+ )
+ econf "${myeconfargs[@]}"
touch proto.h-tstamp #421625
}
src_install() {
emake DESTDIR="${D}" install
+
newconfd "${FILESDIR}"/rsyncd.conf.d rsyncd
newinitd "${FILESDIR}"/rsyncd.init.d-r1 rsyncd
+
dodoc NEWS OLDNEWS README TODO tech_report.tex
+
insinto /etc
newins "${FILESDIR}"/rsyncd.conf-3.0.9-r1 rsyncd.conf
@@ -72,10 +71,10 @@ src_install() {
if use examples ; then
exeinto /usr/share/rsync
doexe support/*
- rm -f "${ED}"/usr/share/rsync/{Makefile*,*.c}
+ rm -f "${ED%/}"/usr/share/rsync/{Makefile*,*.c}
fi
- eprefixify "${ED}"/etc/{,xinetd.d}/rsyncd*
+ eprefixify "${ED%/}"/etc/{,xinetd.d}/rsyncd*
systemd_dounit "${FILESDIR}/rsyncd.service"
}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] proj/musl:master commit in: net-misc/rsync/files/, net-misc/rsync/
@ 2020-03-17 2:12 Jory Pratt
0 siblings, 0 replies; 6+ messages in thread
From: Jory Pratt @ 2020-03-17 2:12 UTC (permalink / raw
To: gentoo-commits
commit: 573d8bcc00510bb6fe6d688343043f966f3e591d
Author: Jory Pratt <anarchy <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 17 02:12:50 2020 +0000
Commit: Jory Pratt <anarchy <AT> gentoo <DOT> org>
CommitDate: Tue Mar 17 02:12:50 2020 +0000
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 <anarchy <AT> 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 0000000..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 <anarchy@gentoo.org>
+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=DIR read-only single-machine data [PREFIX/etc]
+ --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
+ --localstatedir=DIR modifiable single-machine data [PREFIX/var]
++ --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run]
+ --libdir=DIR object code libraries [EPREFIX/lib]
+ --includedir=DIR C 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=(
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] proj/musl:master commit in: net-misc/rsync/files/, net-misc/rsync/
@ 2020-06-28 17:22 Anthony G. Basile
0 siblings, 0 replies; 6+ messages in thread
From: Anthony G. Basile @ 2020-06-28 17:22 UTC (permalink / raw
To: gentoo-commits
commit: 7605df16eb18f7bc3b1736142b732472bc520f0c
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 28 17:22:31 2020 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sun Jun 28 17:22:31 2020 +0000
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 <blueness <AT> 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 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)
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] proj/musl:master commit in: net-misc/rsync/files/, net-misc/rsync/
@ 2021-03-13 21:28 Sam James
0 siblings, 0 replies; 6+ messages in thread
From: Sam James @ 2021-03-13 21:28 UTC (permalink / raw
To: gentoo-commits
commit: dbe1af708a329cb345d66b31b78732056dfa7318
Author: Dave Hughes <davidhughes205 <AT> gmail <DOT> com>
AuthorDate: Sat Mar 13 17:53:56 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Mar 13 21:26:11 2021 +0000
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 <davidhughes205 <AT> gmail.com>
Closes: https://github.com/gentoo/musl/pull/425
Signed-off-by: Sam James <sam <AT> 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..0000000
--- 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..0000000
--- 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 <anarchy@gentoo.org>
-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=DIR read-only single-machine data [PREFIX/etc]
- --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
- --localstatedir=DIR modifiable single-machine data [PREFIX/var]
-+ --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run]
- --libdir=DIR object code libraries [EPREFIX/lib]
- --includedir=DIR C header files [PREFIX/include]
- --oldincludedir=DIR C header files for non-gcc [/usr/include]
---
-2.25.1
-
diff --git a/net-misc/rsync/files/rsync-3.2.0-noexecstack.patch b/net-misc/rsync/files/rsync-3.2.0-noexecstack.patch
deleted file mode 100644
index 9183460..0000000
--- a/net-misc/rsync/files/rsync-3.2.0-noexecstack.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-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
deleted file mode 100644
index 11cf18a..0000000
--- a/net-misc/rsync/files/rsync-3.2.0-simd_check.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-From: Wayne Davison <wayne@opencoder.net>
-Date: Sat, 20 Jun 2020 06:23:52 +0000 (-0700)
-Subject: A slightly modified g++/clang++ check.
-X-Git-Tag: v3.2.1pre1~43
-X-Git-Url: http://git.samba.org/rsync.git/?p=rsync.git;a=commitdiff_plain;h=d4764934c35bdff297a03551c583be611cb8c64c
-
-A slightly modified g++/clang++ check.
----
-
-diff --git a/configure.ac b/configure.ac
-index d665498d..f6ca5e66 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -204,30 +204,28 @@ if test x"$enable_simd" != x"no"; then
- # For x86-64 SIMD, g++ >=5 or clang++ >=7 is required
- if test x"$build_cpu" = x"x86_64"; then
- CXX_OK=
-- if test x"$CXX" != x""; then
-- CXX_VERSION=`$CXX --version 2>/dev/null | head -n 1`
-- case "$CXX_VERSION" in
-- g++*)
-- CXX_VERSION=`$CXX -dumpversion | sed 's/\..*//g'`
-- if test "$CXX_VERSION" -ge "5"; then
-- CXX_OK=yes
-- fi
-- ;;
-- *clang*)
-- # $CXX -dumpversion would have been ideal, but is broken on older clang
-- CXX_VERSION=`echo "$CXX_VERSION" | sed 's/.*version //g' | sed 's/\..*//g'`
-- if test "$CXX_VERSION" -ge "7"; then
-- CXX_OK=yes
-- fi
-- ;;
-- *)
-- CXX_VERSION='Unknown'
-- ;;
-- esac
-- else
-+ case "$CXX" in
-+ g++|*-g++)
-+ CXX_VERSION=`$CXX -dumpversion | sed 's/\..*//'`
-+ if test "$CXX_VERSION" -ge "5"; then
-+ CXX_OK=yes
-+ fi
-+ ;;
-+ *clang*)
-+ # -dumpversion is broken on older clang versions, so we need a fallback.
-+ CXX_VERSION=`$CXX -dumpversion 2>/dev/null | sed 's/\..*//'`
-+ if test x"$CXX_VERSION" = x; then
-+ CXX_VERSION=`$CXX --version | head -n 1 | sed 's/.*version //' | sed 's/\..*//'`
-+ fi
-+ if test "$CXX_VERSION" -ge "7"; then
-+ CXX_OK=yes
-+ fi
-+ ;;
-+ *)
- CXX='No c++'
- CXX_VERSION='Unknown'
-- fi
-+ ;;
-+ esac
- if test x"$CXX_OK" = x"yes"; then
- # AC_MSG_RESULT() is called below.
- SIMD="$SIMD x86_64"
-
diff --git a/net-misc/rsync/files/rsync-fix-musl-ipv6.patch b/net-misc/rsync/files/rsync-fix-musl-ipv6.patch
deleted file mode 100644
index 53d7381..0000000
--- a/net-misc/rsync/files/rsync-fix-musl-ipv6.patch
+++ /dev/null
@@ -1,605 +0,0 @@
-From 78621d2d5e12c9e7c54ab0a15bb90495d7927251 Mon Sep 17 00:00:00 2001
-From: Pierre-Olivier Mercier <nemunaire@nemunai.re>
-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 <netinet/in.h>
--#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 <netinet/in.h>
--#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 <features.h>
--#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 <netinet/ip6.h>
--#ifdef __sun
--yes
--#endif],
-- [ipv6type=$i;
-- AC_DEFINE(INET6, 1, [true if you have IPv6])])
-- ;;
-- toshiba)
-- AC_EGREP_CPP(yes, [
--#include <sys/param.h>
--#ifdef _TOSHIBA_INET6
--yes
--#endif],
-- [ipv6type=$i;
-- ipv6lib=inet6;
-- ipv6libdir=/usr/local/v6/lib;
-- AC_DEFINE(INET6, 1, [true if you have IPv6])])
-- ;;
-- v6d)
-- AC_EGREP_CPP(yes, [
--#include </usr/local/v6/include/sys/v6config.h>
--#ifdef __V6D__
--yes
--#endif],
-- [ipv6type=$i;
-- ipv6lib=v6;
-- ipv6libdir=/usr/local/v6/lib;
-- AC_DEFINE(INET6, 1, [true if you have IPv6])])
-- ;;
-- zeta)
-- AC_EGREP_CPP(yes, [
--#include <sys/param.h>
--#ifdef _ZETA_MINAMI_INET6
--yes
--#endif],
-- [ipv6type=$i;
-- ipv6lib=inet6;
-- ipv6libdir=/usr/local/v6/lib;
-- AC_DEFINE(INET6, 1, [true if you have IPv6])])
-- ;;
-- cygwin)
-- AC_EGREP_CPP(yes, [
--#include <netinet/in.h>
--#ifdef _CYGWIN_IN6_H
--yes
--#endif],
-- [ipv6type=$i;
-- AC_DEFINE(INET6, 1, [true if you have IPv6])])
-- ;;
-- esac
-- if test "$ipv6type" != "unknown"; then
-- break
-- fi
-- done
-- AC_MSG_RESULT($ipv6type)
-+[ --disable-ipv6 disable ipv6 support],
-+[ case "$enableval" in
-+ no)
-+ AC_MSG_RESULT(no)
-+ ;;
-+ *) AC_MSG_RESULT(yes)
-+ AC_DEFINE(INET6, 1, [true if you have IPv6])
-+ ;;
-+ esac ],
-
-- AC_SEARCH_LIBS(getaddrinfo, inet6)
--fi
-+ AC_TRY_RUN([ /* AF_INET6 avalable check */
-+#include <sys/types.h>
-+#include <sys/socket.h>
-+main()
-+{
-+ exit(0);
-+ if (socket(AF_INET6, SOCK_STREAM, 0) < 0)
-+ exit(1);
-+ else
-+ exit(0);
-+}
-+],
-+ AC_MSG_RESULT(yes)
-+ AC_DEFINE(INET6, 1, [true if you have IPv6]),
-+ 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-locale disable locale features
- --disable-iconv-open disable 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}: 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_check_header_mongrel LINENO HEADER VAR INCLUDES
- # -------------------------------------------------------
- # Tests whether HEADER exists, giving a warning if it cannot be compiled using
-@@ -4548,7 +4548,7 @@ else
- We can't simply define LARGE_OFF_T to be 9223372036854775807,
- since some C++ compilers masquerading as C compilers
- incorrectly reject 9223372036854775807. */
--#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
-+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
- int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
- && LARGE_OFF_T % 2147483647 == 1)
- ? 1 : -1];
-@@ -4594,7 +4594,7 @@ else
- We can't simply define LARGE_OFF_T to be 9223372036854775807,
- since some C++ compilers masquerading as C compilers
- incorrectly reject 9223372036854775807. */
--#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
-+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
- int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
- && LARGE_OFF_T % 2147483647 == 1)
- ? 1 : -1];
-@@ -4618,7 +4618,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- We can't simply define LARGE_OFF_T to be 9223372036854775807,
- since some C++ compilers masquerading as C compilers
- incorrectly reject 9223372036854775807. */
--#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
-+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
- int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
- && LARGE_OFF_T % 2147483647 == 1)
- ? 1 : -1];
-@@ -4663,7 +4663,7 @@ else
- We can't simply define LARGE_OFF_T to be 9223372036854775807,
- since some C++ compilers masquerading as C compilers
- incorrectly reject 9223372036854775807. */
--#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
-+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
- int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
- && LARGE_OFF_T % 2147483647 == 1)
- ? 1 : -1];
-@@ -4687,7 +4687,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- We can't simply define LARGE_OFF_T to be 9223372036854775807,
- since some C++ compilers masquerading as C compilers
- incorrectly reject 9223372036854775807. */
--#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
-+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
- int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
- && LARGE_OFF_T % 2147483647 == 1)
- ? 1 : -1];
-@@ -4725,262 +4725,61 @@ fi
-
- fi
-
--ipv6type=unknown
--ipv6lib=none
--ipv6trylibc=yes
-
-+# Checks if IPv6 is requested
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable ipv6" >&5
-+$as_echo_n "checking whether to enable ipv6... " >&6; }
- # Check whether --enable-ipv6 was given.
- if test "${enable_ipv6+set}" = set; then :
-- enableval=$enable_ipv6;
--fi
--
--if test x"$enable_ipv6" != x"no"; then
-- { $as_echo "$as_me:${as_lineno-$LINENO}: checking ipv6 stack type" >&5
--$as_echo_n "checking ipv6 stack type... " >&6; }
-- for i in inria kame linux-glibc linux-inet6 solaris toshiba v6d zeta cygwin; do
-- case $i in
-- inria)
-- # http://www.kame.net/
--
--cat confdefs.h - <<_ACEOF >conftest.$ac_ext
--/* end confdefs.h. */
--
--#include <netinet/in.h>
--#ifdef IPV6_INRIA_VERSION
--yes
--#endif
--_ACEOF
--if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-- $EGREP "yes" >/dev/null 2>&1; then :
-- ipv6type=$i;
--
--$as_echo "#define INET6 1" >>confdefs.h
--
--
--fi
--rm -f conftest*
--
-- ;;
-- kame)
-- # http://www.kame.net/
-- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
--/* end confdefs.h. */
--
--#include <netinet/in.h>
--#ifdef __KAME__
--yes
--#endif
--_ACEOF
--if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-- $EGREP "yes" >/dev/null 2>&1; then :
-- ipv6type=$i;
--
--$as_echo "#define INET6 1" >>confdefs.h
--
--fi
--rm -f conftest*
--
-- ;;
-- linux-glibc)
-- # http://www.v6.linux.or.jp/
-- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
--/* end confdefs.h. */
--
--#include <features.h>
--#if defined(__GLIBC__) && __GLIBC__ >= 2 && __GLIBC_MINOR__ >= 1
--yes
--#endif
--_ACEOF
--if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-- $EGREP "yes" >/dev/null 2>&1; then :
-- ipv6type=$i;
--
--$as_echo "#define INET6 1" >>confdefs.h
--
--fi
--rm -f conftest*
--
-- ;;
-- 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;
--
--$as_echo "#define INET6 1" >>confdefs.h
--
-- CFLAGS="-I/usr/inet6/include $CFLAGS"
-- fi
-- ;;
-- solaris)
-- # http://www.sun.com
-- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
--/* end confdefs.h. */
--
--#include <netinet/ip6.h>
--#ifdef __sun
--yes
--#endif
--_ACEOF
--if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-- $EGREP "yes" >/dev/null 2>&1; then :
-- ipv6type=$i;
--
--$as_echo "#define INET6 1" >>confdefs.h
--
--fi
--rm -f conftest*
--
-- ;;
-- toshiba)
-- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
--/* end confdefs.h. */
--
--#include <sys/param.h>
--#ifdef _TOSHIBA_INET6
--yes
--#endif
--_ACEOF
--if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-- $EGREP "yes" >/dev/null 2>&1; then :
-- ipv6type=$i;
-- ipv6lib=inet6;
-- ipv6libdir=/usr/local/v6/lib;
--
--$as_echo "#define INET6 1" >>confdefs.h
--
--fi
--rm -f conftest*
--
-- ;;
-- v6d)
-- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
--/* end confdefs.h. */
--
--#include </usr/local/v6/include/sys/v6config.h>
--#ifdef __V6D__
--yes
--#endif
--_ACEOF
--if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-- $EGREP "yes" >/dev/null 2>&1; then :
-- ipv6type=$i;
-- ipv6lib=v6;
-- ipv6libdir=/usr/local/v6/lib;
--
--$as_echo "#define INET6 1" >>confdefs.h
--
--fi
--rm -f conftest*
--
-- ;;
-- zeta)
-- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
--/* end confdefs.h. */
--
--#include <sys/param.h>
--#ifdef _ZETA_MINAMI_INET6
--yes
--#endif
--_ACEOF
--if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-- $EGREP "yes" >/dev/null 2>&1; then :
-- ipv6type=$i;
-- ipv6lib=inet6;
-- ipv6libdir=/usr/local/v6/lib;
--
--$as_echo "#define INET6 1" >>confdefs.h
--
--fi
--rm -f conftest*
--
-- ;;
-- cygwin)
-- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
--/* end confdefs.h. */
--
--#include <netinet/in.h>
--#ifdef _CYGWIN_IN6_H
--yes
--#endif
--_ACEOF
--if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-- $EGREP "yes" >/dev/null 2>&1; then :
-- ipv6type=$i;
-+ enableval=$enable_ipv6; case "$enableval" in
-+ no)
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+ ;;
-+ *) { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-+$as_echo "yes" >&6; }
-
- $as_echo "#define INET6 1" >>confdefs.h
-
--fi
--rm -f conftest*
-+ ;;
-+ esac
-+else
-+ if test "$cross_compiling" = yes; then :
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-
-- ;;
-- esac
-- if test "$ipv6type" != "unknown"; then
-- break
-- fi
-- done
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ipv6type" >&5
--$as_echo "$ipv6type" >&6; }
--
-- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing getaddrinfo" >&5
--$as_echo_n "checking for library containing getaddrinfo... " >&6; }
--if ${ac_cv_search_getaddrinfo+:} false; then :
-- $as_echo_n "(cached) " >&6
- else
-- ac_func_search_save_LIBS=$LIBS
--cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
--
--/* Override any GCC internal prototype to avoid an error.
-- Use char because int might match the return type of a GCC
-- builtin and then its argument prototype would still apply. */
--#ifdef __cplusplus
--extern "C"
--#endif
--char getaddrinfo ();
--int
--main ()
-+ /* AF_INET6 avalable check */
-+#include <sys/types.h>
-+#include <sys/socket.h>
-+main()
- {
--return getaddrinfo ();
-- ;
-- return 0;
-+ exit(0);
-+ if (socket(AF_INET6, SOCK_STREAM, 0) < 0)
-+ exit(1);
-+ else
-+ exit(0);
- }
-+
- _ACEOF
--for ac_lib in '' inet6; do
-- if test -z "$ac_lib"; then
-- ac_res="none required"
-- else
-- ac_res=-l$ac_lib
-- LIBS="-l$ac_lib $ac_func_search_save_LIBS"
-- fi
-- if ac_fn_c_try_link "$LINENO"; then :
-- ac_cv_search_getaddrinfo=$ac_res
--fi
--rm -f core conftest.err conftest.$ac_objext \
-- conftest$ac_exeext
-- if ${ac_cv_search_getaddrinfo+:} false; then :
-- break
--fi
--done
--if ${ac_cv_search_getaddrinfo+:} false; then :
-+if ac_fn_c_try_run "$LINENO"; then :
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-+$as_echo "yes" >&6; }
-+
-+$as_echo "#define INET6 1" >>confdefs.h
-
- else
-- ac_cv_search_getaddrinfo=no
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
- fi
--rm conftest.$ac_ext
--LIBS=$ac_func_search_save_LIBS
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-+ conftest.$ac_objext conftest.beam conftest.$ac_ext
- fi
--{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_getaddrinfo" >&5
--$as_echo "$ac_cv_search_getaddrinfo" >&6; }
--ac_res=$ac_cv_search_getaddrinfo
--if test "$ac_res" != no; then :
-- test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
-
- fi
-
--fi
-
- # Check whether --enable-locale was given.
- if test "${enable_locale+set}" = set; then :
-@@ -5006,6 +4805,7 @@ $as_echo "#define SHUTDOWN_ALL_SOCKETS 1" >>confdefs.h
- $as_echo "no" >&6; };;
- esac
-
-+
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
- $as_echo_n "checking for ANSI C header files... " >&6; }
- if ${ac_cv_header_stdc+:} false; then :
---
-2.10.2
diff --git a/net-misc/rsync/files/rsyncd.conf-3.0.9-r1 b/net-misc/rsync/files/rsyncd.conf-3.0.9-r1
deleted file mode 100644
index 20dcf3a..0000000
--- a/net-misc/rsync/files/rsyncd.conf-3.0.9-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-# /etc/rsyncd.conf
-
-# Minimal configuration file for rsync daemon
-# See rsync(1) and rsyncd.conf(5) man pages for help
-
-# This line is required by the /etc/init.d/rsyncd script
-pid file = @GENTOO_PORTAGE_EPREFIX@/run/rsyncd.pid
-use chroot = yes
-read only = yes
-
-# Simple example for enabling your own local rsync server
-#[gentoo-portage]
-# path = @GENTOO_PORTAGE_EPREFIX@/usr/portage
-# comment = Gentoo Portage tree
-# exclude = /distfiles /packages
diff --git a/net-misc/rsync/files/rsyncd.conf.d b/net-misc/rsync/files/rsyncd.conf.d
deleted file mode 100644
index c3d897e..0000000
--- a/net-misc/rsync/files/rsyncd.conf.d
+++ /dev/null
@@ -1,5 +0,0 @@
-# /etc/conf.d/rsyncd: config file for /etc/init.d/rsyncd
-
-# see man pages for rsync or run `rsync --help`
-# for valid cmdline options
-#RSYNC_OPTS=""
diff --git a/net-misc/rsync/files/rsyncd.init.d-r1 b/net-misc/rsync/files/rsyncd.init.d-r1
deleted file mode 100644
index 243e107..0000000
--- a/net-misc/rsync/files/rsyncd.init.d-r1
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-command="/usr/bin/rsync"
-command_args="--daemon ${RSYNC_OPTS}"
-pidfile="/var/run/${SVCNAME}.pid"
-
-depend() {
- use net
-}
diff --git a/net-misc/rsync/files/rsyncd.logrotate b/net-misc/rsync/files/rsyncd.logrotate
deleted file mode 100644
index 34bcf72..0000000
--- a/net-misc/rsync/files/rsyncd.logrotate
+++ /dev/null
@@ -1,9 +0,0 @@
-/var/log/rsync.log {
- compress
- maxage 365
- rotate 7
- size=+1024k
- notifempty
- missingok
- copytruncate
-}
diff --git a/net-misc/rsync/files/rsyncd.service b/net-misc/rsync/files/rsyncd.service
deleted file mode 100644
index a2c1de0..0000000
--- a/net-misc/rsync/files/rsyncd.service
+++ /dev/null
@@ -1,12 +0,0 @@
-[Unit]
-Description=rsync daemon
-After=networking.target
-
-[Service]
-Type=simple
-ExecStart=/usr/bin/rsync --daemon --no-detach
-StandardOutput=syslog
-StandardError=syslog
-
-[Install]
-WantedBy=multi-user.target
diff --git a/net-misc/rsync/files/rsyncd.xinetd-3.0.9-r1 b/net-misc/rsync/files/rsyncd.xinetd-3.0.9-r1
deleted file mode 100644
index 90d07f0..0000000
--- a/net-misc/rsync/files/rsyncd.xinetd-3.0.9-r1
+++ /dev/null
@@ -1,10 +0,0 @@
-service rsync
-{
- socket_type = stream
- protocol = tcp
- wait = no
- user = root
- server = @GENTOO_PORTAGE_EPREFIX@/usr/bin/rsync
- server_args = --daemon
- disable = yes
-}
diff --git a/net-misc/rsync/metadata.xml b/net-misc/rsync/metadata.xml
deleted file mode 100644
index 1f39f54..0000000
--- a/net-misc/rsync/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>base-system@gentoo.org</email>
- <name>Gentoo Base System</name>
- </maintainer>
- <upstream>
- <remote-id type="cpe">cpe:/a:samba:rsync</remote-id>
- </upstream>
- <use>
- <flag name="stunnel">Provide helper scripts for using rsync via >=net-misc/stunnel-4</flag>
- <flag name="system-zlib">Use system zlib instead of bundled one. This is incompatible with older rsync releases!</flag>
- <flag name="xxhash">Enable <pkg>dev-libs/xxhash</pkg> support for hashing</flag>
- </use>
-</pkgmetadata>
diff --git a/net-misc/rsync/rsync-3.1.3.ebuild b/net-misc/rsync/rsync-3.1.3.ebuild
deleted file mode 100644
index 9fc3052..0000000
--- a/net-misc/rsync/rsync-3.1.3.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic prefix systemd
-
-DESCRIPTION="File transfer program to keep remote files into sync"
-HOMEPAGE="https://rsync.samba.org/"
-SRC_URI="https://rsync.samba.org/ftp/rsync/src/${P}.tar.gz"
-[[ "${PV}" = *_pre* ]] && SRC_URI="https://rsync.samba.org/ftp/rsync/src-previews/${P/_/}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-[[ ${PV} = *_pre* ]] || \
-KEYWORDS="amd64 arm arm64 ~mips ppc ppc64 x86"
-IUSE="acl examples iconv ipv6 static stunnel xattr"
-
-LIB_DEPEND="acl? ( virtual/acl[static-libs(+)] )
- xattr? ( kernel_linux? ( sys-apps/attr[static-libs(+)] ) )
- >=dev-libs/popt-1.5[static-libs(+)]"
-RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
- iconv? ( virtual/libiconv )"
-DEPEND="${RDEPEND}
- static? ( ${LIB_DEPEND} )"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-fix-musl-ipv6.patch
-)
-
-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=(
- --with-rsyncd-conf="${EPREFIX}"/etc/rsyncd.conf
- --without-included-popt
- $(use_enable acl acl-support)
- $(use_enable iconv)
- $(use_enable ipv6)
- $(use_enable xattr xattr-support)
- )
- econf "${myeconfargs[@]}"
- touch proto.h-tstamp #421625
-}
-
-src_install() {
- emake DESTDIR="${D}" install
-
- newconfd "${FILESDIR}"/rsyncd.conf.d rsyncd
- newinitd "${FILESDIR}"/rsyncd.init.d-r1 rsyncd
-
- dodoc NEWS OLDNEWS README TODO tech_report.tex
-
- insinto /etc
- newins "${FILESDIR}"/rsyncd.conf-3.0.9-r1 rsyncd.conf
-
- insinto /etc/logrotate.d
- newins "${FILESDIR}"/rsyncd.logrotate rsyncd
-
- insinto /etc/xinetd.d
- newins "${FILESDIR}"/rsyncd.xinetd-3.0.9-r1 rsyncd
-
- # Install stunnel helpers
- if use stunnel ; then
- emake DESTDIR="${D}" install-ssl-client
- emake DESTDIR="${D}" install-ssl-daemon
- fi
-
- # Install the useful contrib scripts
- if use examples ; then
- exeinto /usr/share/rsync
- doexe support/*
- rm -f "${ED%/}"/usr/share/rsync/{Makefile*,*.c}
- fi
-
- eprefixify "${ED%/}"/etc/{,xinetd.d}/rsyncd*
-
- systemd_dounit "${FILESDIR}/rsyncd.service"
-}
-
-pkg_postinst() {
- if egrep -qis '^[[:space:]]use chroot[[:space:]]*=[[:space:]]*(no|0|false)' \
- "${EROOT}"/etc/rsyncd.conf "${EROOT}"/etc/rsync/rsyncd.conf ; then
- ewarn "You have disabled chroot support in your rsyncd.conf. This"
- ewarn "is a security risk which you should fix. Please check your"
- ewarn "/etc/rsyncd.conf file and fix the setting 'use chroot'."
- fi
- if use stunnel ; then
- einfo "Please install \">=net-misc/stunnel-4\" in order to use stunnel feature."
- einfo
- einfo "You maybe have to update the certificates configured in"
- einfo "${EROOT}/etc/stunnel/rsync.conf"
- fi
-}
diff --git a/net-misc/rsync/rsync-3.2.0-r1.ebuild b/net-misc/rsync/rsync-3.2.0-r1.ebuild
deleted file mode 100644
index 3e988f3..0000000
--- a/net-misc/rsync/rsync-3.2.0-r1.ebuild
+++ /dev/null
@@ -1,151 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic prefix systemd
-
-DESCRIPTION="File transfer program to keep remote files into sync"
-HOMEPAGE="https://rsync.samba.org/"
-if [[ "${PV}" == *9999 ]] ; then
- PYTHON_COMPAT=( python3_{7,8} )
- inherit git-r3 python-any-r1
- EGIT_REPO_URI="https://github.com/WayneD/rsync.git"
-else
- if [[ "${PV}" == *_pre* ]] ; then
- SRC_DIR="src-previews"
- else
- SRC_DIR="src"
- KEYWORDS="amd64 arm arm64 ~mips ppc ppc64 x86"
- fi
- SRC_URI="https://rsync.samba.org/ftp/rsync/${SRC_DIR}/${P/_/}.tar.gz"
- S="${WORKDIR}/${P/_/}"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE_CPU_FLAGS_X86=" sse2"
-IUSE="acl examples iconv ipv6 libressl lz4 ssl static stunnel system-zlib xattr xxhash zstd"
-IUSE+=" ${IUSE_CPU_FLAGS_X86// / cpu_flags_x86_}"
-
-LIB_DEPEND="acl? ( virtual/acl[static-libs(+)] )
- lz4? ( app-arch/lz4[static-libs(+)] )
- ssl? (
- !libressl? ( dev-libs/openssl:0=[static-libs(+)] )
- libressl? ( dev-libs/libressl:0=[static-libs(+)] )
- )
- system-zlib? ( sys-libs/zlib[static-libs(+)] )
- xattr? ( kernel_linux? ( sys-apps/attr[static-libs(+)] ) )
- xxhash? ( dev-libs/xxhash[static-libs(+)] )
- zstd? ( app-arch/zstd[static-libs(+)] )
- >=dev-libs/popt-1.5[static-libs(+)]"
-RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
- iconv? ( virtual/libiconv )"
-DEPEND="${RDEPEND}
- static? ( ${LIB_DEPEND} )"
-
-if [[ "${PV}" == *9999 ]] ; then
- BDEPEND="${PYTHON_DEPS}
- $(python_gen_any_dep '
- dev-python/commonmark[${PYTHON_USEDEP}]
- ')"
-fi
-
-# Only required for live ebuild
-python_check_deps() {
- has_version "dev-python/commonmark[${PYTHON_USEDEP}]"
-}
-
-PATCHES=(
- "${FILESDIR}/${P}-simd_check.patch"
- "${FILESDIR}/${P}-noexecstack.patch" #728882
-)
-
-src_prepare() {
- default
-
- eaclocal -I m4
- eautoconf -o configure.sh
- eautoheader && touch config.h.in
-}
-
-src_configure() {
- use static && append-ldflags -static
- local myeconfargs=(
- --with-rsyncd-conf="${EPREFIX}"/etc/rsyncd.conf
- --without-included-popt
- $(use_enable acl acl-support)
- $(use_enable iconv)
- --disable-ipv6
- $(use_enable lz4)
- $(use_enable ssl openssl)
- $(use_with !system-zlib included-zlib)
- $(use_enable xattr xattr-support)
- $(use_enable xxhash)
- $(use_enable zstd)
- )
-
- myeconfargs+=( --disable-simd )
-
- econf "${myeconfargs[@]}"
- [[ "${PV}" == *9999 ]] || touch proto.h-tstamp #421625
-}
-
-src_install() {
- emake DESTDIR="${D}" install
-
- newconfd "${FILESDIR}"/rsyncd.conf.d rsyncd
- newinitd "${FILESDIR}"/rsyncd.init.d-r1 rsyncd
-
- dodoc NEWS.md OLDNEWS.md README.md TODO tech_report.tex
-
- insinto /etc
- newins "${FILESDIR}"/rsyncd.conf-3.0.9-r1 rsyncd.conf
-
- insinto /etc/logrotate.d
- newins "${FILESDIR}"/rsyncd.logrotate rsyncd
-
- insinto /etc/xinetd.d
- newins "${FILESDIR}"/rsyncd.xinetd-3.0.9-r1 rsyncd
-
- # Install stunnel helpers
- if use stunnel ; then
- emake DESTDIR="${D}" install-ssl-daemon
- fi
-
- # Install the useful contrib scripts
- if use examples ; then
- exeinto /usr/share/rsync
- doexe support/*
- rm -f "${ED}"/usr/share/rsync/{Makefile*,*.c}
- fi
-
- eprefixify "${ED}"/etc/{,xinetd.d}/rsyncd*
-
- systemd_dounit "${FILESDIR}/rsyncd.service"
-}
-
-pkg_postinst() {
- if egrep -qis '^[[:space:]]use chroot[[:space:]]*=[[:space:]]*(no|0|false)' \
- "${EROOT}"/etc/rsyncd.conf "${EROOT}"/etc/rsync/rsyncd.conf ; then
- ewarn "You have disabled chroot support in your rsyncd.conf. This"
- ewarn "is a security risk which you should fix. Please check your"
- ewarn "/etc/rsyncd.conf file and fix the setting 'use chroot'."
- fi
- if use stunnel ; then
- einfo "Please install \">=net-misc/stunnel-4\" in order to use stunnel feature."
- einfo
- einfo "You maybe have to update the certificates configured in"
- einfo "${EROOT}/etc/stunnel/rsync.conf"
- fi
- if use system-zlib ; then
- ewarn "Using system-zlib is incompatible with <rsync-3.1.1 when"
- ewarn "using the --compress option."
- ewarn
- ewarn "When syncing with >=rsync-3.1.1 built with bundled zlib,"
- ewarn "and the --compress option, add --new-compress (-zz)."
- ewarn
- ewarn "For syncing the portage tree, add:"
- ewarn "PORTAGE_RSYNC_EXTRA_OPTS=\"--new-compress\" to make.conf"
- fi
-}
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2021-03-13 21:28 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-03-17 2:12 [gentoo-commits] proj/musl:master commit in: net-misc/rsync/files/, net-misc/rsync/ Jory Pratt
-- strict thread matches above, loose matches on Subject: below --
2021-03-13 21:28 Sam James
2020-06-28 17:22 Anthony G. Basile
2018-06-16 23:11 Anthony G. Basile
2018-01-29 19:12 Aric Belsito
2018-01-29 19:12 Aric Belsito
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox