bump(net-misc/rsync): sync with upstream

This commit is contained in:
David Michael 2018-01-17 10:30:26 -05:00
parent 1005980f1c
commit 56f4f2caa0
13 changed files with 276 additions and 1200 deletions

View File

@ -1,13 +1,13 @@
DEFINED_PHASES=configure install postinst prepare DEFINED_PHASES=configure install postinst
DEPEND=!static? ( acl? ( virtual/acl ) xattr? ( kernel_linux? ( sys-apps/attr ) ) >=dev-libs/popt-1.5 ) iconv? ( virtual/libiconv ) static? ( acl? ( virtual/acl[static-libs(+)] ) xattr? ( kernel_linux? ( sys-apps/attr[static-libs(+)] ) ) >=dev-libs/popt-1.5[static-libs(+)] ) virtual/pkgconfig DEPEND=!static? ( acl? ( virtual/acl ) xattr? ( kernel_linux? ( sys-apps/attr ) ) >=dev-libs/popt-1.5 ) iconv? ( virtual/libiconv ) static? ( acl? ( virtual/acl[static-libs(+)] ) xattr? ( kernel_linux? ( sys-apps/attr[static-libs(+)] ) ) >=dev-libs/popt-1.5[static-libs(+)] ) virtual/pkgconfig
DESCRIPTION=File transfer program to keep remote files into sync DESCRIPTION=File transfer program to keep remote files into sync
EAPI=5 EAPI=6
HOMEPAGE=http://rsync.samba.org/ HOMEPAGE=https://rsync.samba.org/
IUSE=acl iconv ipv6 static stunnel xattr IUSE=acl examples iconv ipv6 static stunnel xattr
KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-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 ~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
LICENSE=GPL-3 LICENSE=GPL-3
RDEPEND=!static? ( acl? ( virtual/acl ) xattr? ( kernel_linux? ( sys-apps/attr ) ) >=dev-libs/popt-1.5 ) iconv? ( virtual/libiconv ) RDEPEND=!static? ( acl? ( virtual/acl ) xattr? ( kernel_linux? ( sys-apps/attr ) ) >=dev-libs/popt-1.5 ) iconv? ( virtual/libiconv )
SLOT=0 SLOT=0
SRC_URI=http://rsync.samba.org/ftp/rsync/src/rsync-3.1.2.tar.gz SRC_URI=https://rsync.samba.org/ftp/rsync/src/rsync-3.1.2.tar.gz
_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 flag-o-matic 2274fcc1e7ef6affaff5bcd636275417 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e prefix 7b6fb2fc216b101b5d97d171925a847c systemd 34815d3b76e745c5ca33eec9f95074c2 toolchain-funcs 185a06792159ca143528e7010368e8af _eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 flag-o-matic 2274fcc1e7ef6affaff5bcd636275417 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e prefix 7b6fb2fc216b101b5d97d171925a847c systemd 34815d3b76e745c5ca33eec9f95074c2 toolchain-funcs 185a06792159ca143528e7010368e8af
_md5_=9f6ad75a2c6089dc7e8442331bf93054 _md5_=91bbe1ff4912a278d06fecd6988c9acb

View File

@ -0,0 +1,12 @@
DEFINED_PHASES=configure install postinst
DEPEND=!static? ( acl? ( virtual/acl ) xattr? ( kernel_linux? ( sys-apps/attr ) ) >=dev-libs/popt-1.5 ) iconv? ( virtual/libiconv ) static? ( acl? ( virtual/acl[static-libs(+)] ) xattr? ( kernel_linux? ( sys-apps/attr[static-libs(+)] ) ) >=dev-libs/popt-1.5[static-libs(+)] ) virtual/pkgconfig
DESCRIPTION=File transfer program to keep remote files into sync
EAPI=6
HOMEPAGE=https://rsync.samba.org/
IUSE=acl examples iconv ipv6 static stunnel xattr
LICENSE=GPL-3
RDEPEND=!static? ( acl? ( virtual/acl ) xattr? ( kernel_linux? ( sys-apps/attr ) ) >=dev-libs/popt-1.5 ) iconv? ( virtual/libiconv )
SLOT=0
SRC_URI=https://rsync.samba.org/ftp/rsync/src-previews/rsync-3.1.3pre1.tar.gz
_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 flag-o-matic 2274fcc1e7ef6affaff5bcd636275417 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e prefix 7b6fb2fc216b101b5d97d171925a847c systemd 34815d3b76e745c5ca33eec9f95074c2 toolchain-funcs 185a06792159ca143528e7010368e8af
_md5_=9ade8802b00cf8adad13271bb93c138d

View File

@ -1,164 +0,0 @@
# ChangeLog for net-misc/rsync
# Copyright 1999-2016 Gentoo Foundation; Distributed under the GPL v2
# (auto-generated from git log)
*rsync-3.1.1 (09 Aug 2015)
*rsync-3.1.0-r1 (09 Aug 2015)
*rsync-3.0.9-r3 (09 Aug 2015)
09 Aug 2015; Robin H. Johnson <robbat2@gentoo.org>
+files/rsync-3.1.1_pre1-avoid_infinite_wait_reading_secrets_file.patch,
+files/rsyncd.conf-3.0.9-r1, +files/rsyncd.conf.d, +files/rsyncd.init.d-r1,
+files/rsyncd.logrotate, +files/rsyncd.service,
+files/rsyncd.xinetd-3.0.9-r1, +metadata.xml, +rsync-3.0.9-r3.ebuild,
+rsync-3.1.0-r1.ebuild, +rsync-3.1.1.ebuild:
proj/gentoo: Initial commit
This commit represents a new era for Gentoo:
Storing the gentoo-x86 tree in Git, as converted from CVS.
This commit is the start of the NEW history.
Any historical data is intended to be grafted onto this point.
Creation process:
1. Take final CVS checkout snapshot
2. Remove ALL ChangeLog* files
3. Transform all Manifests to thin
4. Remove empty Manifests
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
5.1. Do not touch files with -kb/-ko keyword flags.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration
tests
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this
project
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo
developer, wrote Git features for the migration
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve
cvs2svn
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014
work in migration
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on
the bikeshed
*rsync-3.1.2_pre1 (11 Aug 2015)
11 Aug 2015; Lars Wendler <polynomial-c@gentoo.org>
+rsync-3.1.2_pre1.ebuild:
Version bump to latest pre version without KEYWORDS.
Package-Manager: portage-2.2.20
24 Aug 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
Use https by default
Convert all URLs for sites supporting encrypted connections from http to
https
Signed-off-by: Justin Lecher <jlec@gentoo.org>
24 Aug 2015; Mike Gilbert <floppym@gentoo.org> metadata.xml:
Revert DOCTYPE SYSTEM https changes in metadata.xml
repoman does not yet accept the https version.
This partially reverts eaaface92ee81f30a6ac66fe7acbcc42c00dc450.
Bug: https://bugs.gentoo.org/552720
*rsync-3.1.2 (22 Dec 2015)
22 Dec 2015; Lars Wendler <polynomial-c@gentoo.org> metadata.xml,
+rsync-3.1.2.ebuild:
Security bump to version 3.1.2
Added stunnel USE flag which installs stunnel helper scripts
(Gentoo bug #561646).
Package-Manager: portage-2.2.26
Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
22 Dec 2015; Lars Wendler <polynomial-c@gentoo.org>
-files/rsync-3.1.1_pre1-avoid_infinite_wait_reading_secrets_file.patch,
-rsync-3.0.9-r3.ebuild, -rsync-3.1.0-r1.ebuild, -rsync-3.1.2_pre1.ebuild:
Removed old.
Package-Manager: portage-2.2.26
Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
28 Dec 2015; Agostino Sarubbo <ago@gentoo.org> rsync-3.1.2.ebuild:
amd64 stable wrt bug #569140
Package-Manager: portage-2.2.24
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago@gentoo.org>
29 Dec 2015; Jeroen Roovers <jer@gentoo.org> rsync-3.1.2.ebuild:
Stable for HPPA PPC64 (bug #569140).
Package-Manager: portage-2.2.26
RepoMan-Options: --ignore-arches
06 Jan 2016; Andreas Schuerch <nativemad@gentoo.org> rsync-3.1.2.ebuild:
3.1.2 stable on x86 see Bug 569140
Package-Manager: portage-2.2.24
07 Jan 2016; Markus Meier <maekke@gentoo.org> rsync-3.1.2.ebuild:
arm stable, bug #569140
Package-Manager: portage-2.2.26
RepoMan-Options: --include-arches="arm"
09 Jan 2016; Agostino Sarubbo <ago@gentoo.org> rsync-3.1.2.ebuild:
sparc stable wrt bug #569140
Package-Manager: portage-2.2.26
RepoMan-Options: --include-arches="sparc"
Signed-off-by: Agostino Sarubbo <ago@gentoo.org>
10 Jan 2016; Agostino Sarubbo <ago@gentoo.org> rsync-3.1.2.ebuild:
alpha stable wrt bug #569140
Package-Manager: portage-2.2.26
RepoMan-Options: --include-arches="alpha"
Signed-off-by: Agostino Sarubbo <ago@gentoo.org>
11 Jan 2016; Agostino Sarubbo <ago@gentoo.org> rsync-3.1.2.ebuild:
ia64 stable wrt bug #569140
Package-Manager: portage-2.2.26
RepoMan-Options: --include-arches="ia64"
Signed-off-by: Agostino Sarubbo <ago@gentoo.org>
11 Jan 2016; Mike Frysinger <vapier@gentoo.org> rsync-3.1.2.ebuild:
mark 3.1.2 arm64/m68k/ppc/s390/sh stable #569140
24 Jan 2016; Michał Górny <mgorny@gentoo.org> metadata.xml:
Unify quoting in metadata.xml files for machine processing
Force unified quoting in all metadata.xml files since lxml does not
preserve original use of single and double quotes. Ensuring unified
quoting before the process allows distinguishing the GLEP 67-related
metadata.xml changes from unrelated quoting changes.
24 Jan 2016; Michał Górny <mgorny@gentoo.org> metadata.xml:
Replace all herds with appropriate projects (GLEP 67)
Replace all uses of herd with appropriate project maintainers, or no
maintainers in case of herds requested to be disbanded.
24 Jan 2016; Michał Górny <mgorny@gentoo.org> metadata.xml:
Set appropriate maintainer types in metadata.xml (GLEP 67)
26 Jan 2016; Lars Wendler <polynomial-c@gentoo.org> -rsync-3.1.1.ebuild:
Removed vulnerable versions.
Package-Manager: portage-2.2.27
Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
18 May 2016; Austin English <wizardedit@gentoo.org> files/rsyncd.init.d-r1:
use #!/sbin/openrc-run instead of #!/sbin/runscript

File diff suppressed because it is too large Load Diff

View File

@ -1,11 +1,2 @@
AUX rsyncd.conf-3.0.9-r1 449 SHA256 e3da1a057081b9089dede95873d6f413d63870fea67246081a6a90725cfd098b SHA512 8d51b452be88820c38639aa833490a001abc2edba03133441000634c2ec090d243598b0932fc11abdf1286afdab02eb6532df2b28a48bfde781c3a8b61fe8c6f WHIRLPOOL ae2b5dc507362ebc10a27973ac8e74b9983da50abbcb3ab33324da76ec70fe30c1cb49d1f7103c7b752d7cf6732a4bf8112c1763f2e9b9da669178925198716c DIST rsync-3.1.2.tar.gz 892724 BLAKE2B e366514ae9835ba7c201a9e09fb9342c5e52fa36d45d46300d080403de25a64ba3ed7a703e56b4f47a743a597694a2d0a50bb4bab6cfa0aa7b59a4f7b93b9f21 SHA512 4c55fd69f436ead0cb5a0b7c6fdfef9bb28ddb9c63534eb619e756b118d5b08cfc5e696498650932c86e865b37e06633da947e6720ca0c27ed5c034313ae208b
AUX rsyncd.conf.d 149 SHA256 de758791b16b89a648c01867af7f51bc9bd44e40cbe868e439b753ff5d9572e5 SHA512 8ea9a2f1fea508fa132313fa16513eac84a9ed3ce75741c42769b56bbcd3f1bd2eb8bfdfe40a6c7f619e4281e8fc8d95d1bd84096d0b64aaacf606cd614ae5b3 WHIRLPOOL ac5098df8772c66d4d8070fbefe0194d8c44345d14a547f2cd59737f2dcb2023b59285117b07bbc2d711302f7736dd761d5e5498913c1878c3512d9fb5d5e36e DIST rsync-3.1.3pre1.tar.gz 905910 BLAKE2B 1823494a325181773cd14f2b8a9aae4ad6a891d70713e111f43c516a69cb9852103c7bb8ced864aec24b8d2a7a4e791c53f6e868276c6c6cc25f0aaba36ddbf2 SHA512 8e2e4623650985169d4ec2e84549f8b5f060b5544380c5b332998161eb1adcfece48216c343730eb726904079836c2d47dc85fa9707fccc02f09841eb547b597
AUX rsyncd.init.d-r1 254 SHA256 e72950384601f5c7184229294372e3754e92ebe314e59c7b97f0cd69b9550a54 SHA512 ac98a5a3cbaafc568c0565317ec16f8af319f7180ce14fdc4f164c6b821aebdf06a78d8b148c610118732152fd5625844da2f6948a157ec125d752c427a7485e WHIRLPOOL 9446f56439a8a2f4874c077e44b7050ca946b1f74f529433f7553f87ee15b021c8955f1cac8fa09393aeb89ffd8c29547de6681f790e47c43fbc43542f68bb3e
AUX rsyncd.logrotate 105 SHA256 eb54100686a253d4d14c9c67fcc20f92d88c0616692bffea899c6a8f8f980c7c SHA512 b8d6c0bb467a5c963317dc55478d2c10874564cd264d943d4a42037e2fce134fe001fabc92af5c6b5775e84dc310b1c8da147afaa61c99e5663c36580d8651a5 WHIRLPOOL 6c6a712ccb0934b5746640f8a52bc5a341fbf2f1b492fe709a8ea7b330048ffa405e1b785f3ca59a460a688330e6a43cb9fd7fca8838ba52214b5d0603adcc59
AUX rsyncd.service 206 SHA256 e4396236f554cb57eed133370dd74ff79ea495f5d7535734bc736b716931fb00 SHA512 b848a13856027e4fe1fd206a2aeb32854abd73beb31ebad7ac62c36b433e65507bbb5eef3901a42f46e70a4e887c7f9013617f19712e160ce155f3cb83bfc625 WHIRLPOOL 7ea8a774c4b22cc631b86f54ca6bf5e1dabe5d837072b491eb2638e44afd67dc57e7372fbbf26a6214417c7da32521a48c0fddfafb4c9a4249fc35d1271c8651
AUX rsyncd.xinetd-3.0.9-r1 194 SHA256 17162f014242c9d5003578bed44b89cd2dc4f0ce2a200ac1facaa10a9aac8692 SHA512 fc053fc4748950343e866cc95284d037156a953454e4294d775f01f059e96e805582688bf1de5c965836889192ce4a663ec740e6ec2265406e509c5c6d6c3215 WHIRLPOOL 733f734e70d0c74ab6e472e656b8c83ddf816dca7e6c1130b999c2579713740db9362e5d517d0a8cf792b6859fd16d363f43ea8b531388f7abe93dcc1380ae42
DIST rsync-3.1.2.tar.gz 892724 SHA256 ecfa62a7fa3c4c18b9eccd8c16eaddee4bd308a76ea50b5c02a5840f09c0a1c2 SHA512 4c55fd69f436ead0cb5a0b7c6fdfef9bb28ddb9c63534eb619e756b118d5b08cfc5e696498650932c86e865b37e06633da947e6720ca0c27ed5c034313ae208b WHIRLPOOL ba793bfc7f0bdd70dba812a4a782c6ed703c7e83e2d04ca714e67e6153b31f6fc49e224ef7622bf5abb1e0ba0f633bc88b2640548028944b5dfa0443ae8c585e
EBUILD rsync-3.1.2.ebuild 2865 SHA256 b3cef378d38691fd522b6061208667ca79b3f2471325a8058a1b4912c88f5461 SHA512 69f3f9a7bb51dea93f5421208a619d09f547b62f27f235fd67fcd42377d148fcc47887737b4739f35d410287ab0c62d5b902cb81727c18d5df9977ed008fda1a WHIRLPOOL e2e61dd5f96886e969fac52dc131468e73ce337d1b4a1805dc67126055f3465ca629fe60cc059c9de16f4d9313d8686d8222b47712822fc385ae68c1cebab019
MISC ChangeLog 5878 SHA256 f0322d72d76c1694bf9cedea6aa1974632fa923e96796866105f4675f4807814 SHA512 2867072a12b3ccbaac4541752f35b6377f42e981d5ae683da10c94107b58440787a28a593d81e8c6b3c4f77620d1c28ffe2888a98ec6753cf606d9a4cdd4d836 WHIRLPOOL 54c25e67f2f3dea9bbbacd805a9078e604ec5576bd690554a1b162a2315deeb5efdb2453d98efc5a073424df736be193cbaaba268aa7467172a2afe5fecc2f33
MISC ChangeLog-2015 33945 SHA256 e9e1a4a05400f058f5bb7f33eee548ab322dff34570082ac63f0c32f349aada8 SHA512 57cd87723516841f3e87f0d88a9b73d0920e7a65f7a35816cfa568a9f54844224664c94acfb27faa7295c0aacda9a6a1d7131372918c40cead089c28290339b9 WHIRLPOOL 1cb3950f7deb2ff2c9c86968922ce6852ad0f75a36d2a284090bc82f1f014b01b9813e5bc3e93c1f1e55848e2de1ffa251b6f1cafb2bb03242678d6fbb1fb673
MISC metadata.xml 449 SHA256 33ff0e734b8f06b27285c4e7fe353cc3928055610d307ef6c72d578373869aa1 SHA512 1c0f031c078a7c22b8375b093dcd241e139ca86a61e2d463d9d01946b57b24dff29ab489ac063b70d210d1306106896fe77bd9678331d5954ef3182222d4f920 WHIRLPOOL dc7937d53349c9d0fad18445a9dd397b7b85ce7a27a1692e3dc4a44285ec130444b4109f0f096038cbff06d02fcb79ad32be7f1df37693ce507061653e95df22

View File

@ -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 {

View File

@ -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)))

View File

@ -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)

View File

@ -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;
}

View File

@ -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;

View File

@ -1,7 +1,6 @@
#!/sbin/openrc-run #!/sbin/openrc-run
# Copyright 1999-2012 Gentoo Foundation # Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2 # Distributed under the terms of the GNU General Public License v2
# $Id$
command="/usr/bin/rsync" command="/usr/bin/rsync"
command_args="--daemon ${RSYNC_OPTS}" command_args="--daemon ${RSYNC_OPTS}"

View File

@ -1,22 +1,21 @@
# Copyright 1999-2015 Gentoo Foundation # Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2 # Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI="5" EAPI="6"
inherit eutils flag-o-matic prefix systemd inherit eutils flag-o-matic prefix systemd
DESCRIPTION="File transfer program to keep remote files into sync" DESCRIPTION="File transfer program to keep remote files into sync"
HOMEPAGE="http://rsync.samba.org/" HOMEPAGE="https://rsync.samba.org/"
SRC_URI="http://rsync.samba.org/ftp/rsync/src/${P}.tar.gz" SRC_URI="https://rsync.samba.org/ftp/rsync/src/${P}.tar.gz"
[[ "${PV}" = *_pre* ]] && SRC_URI="http://rsync.samba.org/ftp/rsync/src-previews/${P/_/}.tar.gz" [[ "${PV}" = *_pre* ]] && SRC_URI="https://rsync.samba.org/ftp/rsync/src-previews/${P/_/}.tar.gz"
LICENSE="GPL-3" LICENSE="GPL-3"
SLOT="0" SLOT="0"
if [[ ${PV} != *_pre ]] ; then if [[ ${PV} != *_pre ]] ; then
KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-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 ~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 fi
IUSE="acl iconv ipv6 static stunnel xattr" IUSE="acl examples iconv ipv6 static stunnel xattr"
LIB_DEPEND="acl? ( virtual/acl[static-libs(+)] ) LIB_DEPEND="acl? ( virtual/acl[static-libs(+)] )
xattr? ( kernel_linux? ( sys-apps/attr[static-libs(+)] ) ) xattr? ( kernel_linux? ( sys-apps/attr[static-libs(+)] ) )
@ -26,11 +25,15 @@ RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
DEPEND="${RDEPEND} DEPEND="${RDEPEND}
static? ( ${LIB_DEPEND} )" 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
)
src_prepare() { S=${WORKDIR}/${P/_/}
epatch_user
}
src_configure() { src_configure() {
use static && append-ldflags -static use static && append-ldflags -static
@ -65,9 +68,11 @@ src_install() {
fi fi
# Install the useful contrib scripts # Install the useful contrib scripts
exeinto /usr/share/rsync if use examples ; then
doexe support/* exeinto /usr/share/rsync
rm -f "${ED}"/usr/share/rsync/{Makefile*,*.c} doexe support/*
rm -f "${ED}"/usr/share/rsync/{Makefile*,*.c}
fi
eprefixify "${ED}"/etc/{,xinetd.d}/rsyncd* eprefixify "${ED}"/etc/{,xinetd.d}/rsyncd*

View File

@ -0,0 +1,91 @@
# Copyright 1999-2018 Gentoo Foundation
# 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="~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"
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} )"
S="${WORKDIR}/${P/_/}"
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
}