Fix from upstream for broken transfers #133054 by Wernfried Haas.

Package-Manager: portage-2.1_pre10-r5

5 files changed, 158 insertions, 8 deletions

diff --git a/net-misc/rsync/ChangeLog b/net-misc/rsync/ChangeLog
index 364a6bf31bcd..112f993e4669 100644
--- a/net-misc/rsync/ChangeLog
+++ b/net-misc/rsync/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/rsync
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/rsync/ChangeLog,v 1.98 2006/05/03 23:03:06 marienz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/rsync/ChangeLog,v 1.99 2006/05/13 03:54:38 vapier Exp $
+
+*rsync-2.6.8-r1 (13 May 2006)
+
+  13 May 2006; Mike Frysinger <vapier@gentoo.org>
+  +files/rsync-2.6.8-fix-deferred-msgs.patch, +rsync-2.6.8-r1.ebuild:
+  Fix from upstream for broken transfers #133054 by Wernfried Haas.
 
   03 May 2006; Marien Zwart <marienz@gentoo.org> Manifest:
   Fix Manifest (ChangeLog changed without a Manifest update).
diff --git a/net-misc/rsync/Manifest b/net-misc/rsync/Manifest
index 0eb6e0301381..8dbdc575dd7f 100644
--- a/net-misc/rsync/Manifest
+++ b/net-misc/rsync/Manifest
@@ -17,6 +17,10 @@ AUX rsync-2.6.6-acls.patch 1627 RMD160 db0ec2160b6594bbc0900341e039a3ece62de272
 MD5 c4757d802d9ddaa65bfeb99fa55fcf1a files/rsync-2.6.6-acls.patch 1627
 RMD160 db0ec2160b6594bbc0900341e039a3ece62de272 files/rsync-2.6.6-acls.patch 1627
 SHA256 b43e28479a2a6a4ddc4ff523bc0c725f8b1ed9c53da35b4781c75e0199a2016a files/rsync-2.6.6-acls.patch 1627
+AUX rsync-2.6.8-fix-deferred-msgs.patch 1575 RMD160 3606049e8546a237080125fca3652c26c0973187 SHA1 bea54d6793fdca28c37fba9b24b5808308dc26f5 SHA256 a73067afd72fa06dd12ab1ef2e0f5820209d550b7e4ee11d9d38d07bbd1c2af7 size 1575
+MD5 f68251b6a85bff0e319ca5f7eea4bb45 files/rsync-2.6.8-fix-deferred-msgs.patch 1575
+RMD160 3606049e8546a237080125fca3652c26c0973187 files/rsync-2.6.8-fix-deferred-msgs.patch 1575
+SHA256 a73067afd72fa06dd12ab1ef2e0f5820209d550b7e4ee11d9d38d07bbd1c2af7 files/rsync-2.6.8-fix-deferred-msgs.patch 1575
 AUX rsync-pathsanitize.patch 235 RMD160 e46d645399841334f46de9ff81f9c0a13d392820 SHA1 1f5d55c55f0e949bc938c02f52be4d750ab11aa3 SHA256 216b5d18c9eed9c5c18e445a3dd64a6b22e6d0c0fdb33f7a06d1d62d08fbdd61 size 235
 MD5 b8cb6d507de74f71738f0f50774c35d0 files/rsync-pathsanitize.patch 235
 RMD160 e46d645399841334f46de9ff81f9c0a13d392820 files/rsync-pathsanitize.patch 235
@@ -74,14 +78,18 @@ EBUILD rsync-2.6.7-r1.ebuild 2160 RMD160 6b6b5a63f0ecc84e6926b349daded13ddb3bfd1
 MD5 0f2b3838fbbfdb805b53f8d385bc7798 rsync-2.6.7-r1.ebuild 2160
 RMD160 6b6b5a63f0ecc84e6926b349daded13ddb3bfd11 rsync-2.6.7-r1.ebuild 2160
 SHA256 28f17d6ae651f49d7128133cfc37e729b088e460c2e3c2b6d982b183f3644af4 rsync-2.6.7-r1.ebuild 2160
+EBUILD rsync-2.6.8-r1.ebuild 2211 RMD160 504fb75ead5317c2599647824c141940e6360375 SHA1 859273052a095897910660143de6561da2d8b059 SHA256 cde8f1e81bd018737393eeba01fd52b16b4ca48b8bcec93bbe0686a94722b9b1 size 2211
+MD5 c170f430f8d3ae43125f9911949ec20d rsync-2.6.8-r1.ebuild 2211
+RMD160 504fb75ead5317c2599647824c141940e6360375 rsync-2.6.8-r1.ebuild 2211
+SHA256 cde8f1e81bd018737393eeba01fd52b16b4ca48b8bcec93bbe0686a94722b9b1 rsync-2.6.8-r1.ebuild 2211
 EBUILD rsync-2.6.8.ebuild 2149 RMD160 56a4eaf4a930165cd6f885fdb9f02f858799c687 SHA1 62d45c4da56bbada01521264bc9d4bf63dc1d454 SHA256 a782828a7ae2c854acb06fb9416cdccd23f5a6f14b397a9ab6334b3a302748a0 size 2149
 MD5 8ca08bc0ec45defbd58ce5fd9c088f23 rsync-2.6.8.ebuild 2149
 RMD160 56a4eaf4a930165cd6f885fdb9f02f858799c687 rsync-2.6.8.ebuild 2149
 SHA256 a782828a7ae2c854acb06fb9416cdccd23f5a6f14b397a9ab6334b3a302748a0 rsync-2.6.8.ebuild 2149
-MISC ChangeLog 12646 RMD160 d56ebe3d18b73de23e6710703cc724c9be091c2b SHA1 2018f59d018fcabd8a9f4c54ff9b104fedce3206 SHA256 1a12b3b48a15da61e0dbb1ac8436cbea53d2556156e059a5be5800cb195fbd52 size 12646
-MD5 e04e0c37726c5982b86fa2376c2eb352 ChangeLog 12646
-RMD160 d56ebe3d18b73de23e6710703cc724c9be091c2b ChangeLog 12646
-SHA256 1a12b3b48a15da61e0dbb1ac8436cbea53d2556156e059a5be5800cb195fbd52 ChangeLog 12646
+MISC ChangeLog 12865 RMD160 db505f38b499cb33868a087db6ef0aebaa33ace2 SHA1 088fba79a512ea22d920c932614adb8109bc433c SHA256 92afdabd75f00279ca274f65076827f8c7980eae65b96185dbf083094035fdbf size 12865
+MD5 39364313856d9cc7c1de00b16a42ad7e ChangeLog 12865
+RMD160 db505f38b499cb33868a087db6ef0aebaa33ace2 ChangeLog 12865
+SHA256 92afdabd75f00279ca274f65076827f8c7980eae65b96185dbf083094035fdbf ChangeLog 12865
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 size 164
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164
@@ -110,10 +118,13 @@ SHA256 9b2d2cd3d0281c4e68b56412e56d700933acbb75b1a925d5e49adf6fbd6569b7 files/di
 MD5 41cb6cb57de67daaa9f08c143309eee3 files/digest-rsync-2.6.8 235
 RMD160 c6900a235985b17ea63dc2d85460901d94ed3cff files/digest-rsync-2.6.8 235
 SHA256 db6586c22adcb91ef50be62ec39d19e233d47868c93d087780853c657c356a4c files/digest-rsync-2.6.8 235
+MD5 41cb6cb57de67daaa9f08c143309eee3 files/digest-rsync-2.6.8-r1 235
+RMD160 c6900a235985b17ea63dc2d85460901d94ed3cff files/digest-rsync-2.6.8-r1 235
+SHA256 db6586c22adcb91ef50be62ec39d19e233d47868c93d087780853c657c356a4c files/digest-rsync-2.6.8-r1 235
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.3 (GNU/Linux)
 
-iD8DBQFEWTawW78445TWHXcRAvZXAKCKeB3K5285qA9DcBpG/aCKx1xKkgCfUj1Z
-VLOjXBv1ul6g26qeXvx5o8o=
-=Bmzi
+iD8DBQFEZVjl2+ySkm8kpY0RAirnAKCrGH6/K1eNUixN7ZpdqsQSE4tvOACgtz2B
+DD2jkEb5YkU/P/mMzVv5YOc=
+=I9zs
 -----END PGP SIGNATURE-----
diff --git a/net-misc/rsync/files/digest-rsync-2.6.8-r1 b/net-misc/rsync/files/digest-rsync-2.6.8-r1
new file mode 100644
index 000000000000..4789a4ea15b8
--- /dev/null
+++ b/net-misc/rsync/files/digest-rsync-2.6.8-r1
@@ -0,0 +1,3 @@
+MD5 082a9dba1f741e6591e5cd748a1233de rsync-2.6.8.tar.gz 772314
+RMD160 f01bd6c6d28f7cf888be640c4d3b2406bba28385 rsync-2.6.8.tar.gz 772314
+SHA256 784782de0efee0b4624bdd1d75d524ef95d16354cb13cbb5449d990b61e607a6 rsync-2.6.8.tar.gz 772314
diff --git a/net-misc/rsync/files/rsync-2.6.8-fix-deferred-msgs.patch b/net-misc/rsync/files/rsync-2.6.8-fix-deferred-msgs.patch
new file mode 100644
index 000000000000..6d2a464d6950
--- /dev/null
+++ b/net-misc/rsync/files/rsync-2.6.8-fix-deferred-msgs.patch
@@ -0,0 +1,52 @@
+Fix from upstream for:
+http://bugs.gentoo.org/133054
+
+Index: io.c
+===================================================================
+RCS file: /cvsroot/rsync/io.c,v
+retrieving revision 1.193
+retrieving revision 1.194
+diff -u -p -r1.193 -r1.194
+--- io.c	25 Apr 2006 23:51:15 -0000	1.193
++++ io.c	3 May 2006 05:19:01 -0000	1.194
+@@ -294,6 +294,7 @@ static void read_msg_fd(void)
+ 			exit_cleanup(RERR_STREAMIO);
+ 		}
+ 		close_multiplexing_out();
++		defer_forwarding_messages = 0;
+ 		/* FALL THROUGH */
+ 	case MSG_INFO:
+ 	case MSG_ERROR:
+@@ -303,7 +304,8 @@ static void read_msg_fd(void)
+ 			if (n >= sizeof buf)
+ 				n = sizeof buf - 1;
+ 			read_loop(fd, buf, n);
+-			if (am_generator && am_server && defer_forwarding_messages)
++			if (am_generator && am_server
++			 && defer_forwarding_messages && tag != MSG_LOG)
+ 				msg_list_add(&msg2sndr, tag, buf, n);
+ 			else
+ 				rwrite((enum logcode)tag, buf, n);
+@@ -1134,11 +1136,20 @@ static void msg2sndr_flush(void)
+ 
+ 	while (msg2sndr.head && io_multiplexing_out) {
+ 		struct msg_list_item *m = msg2sndr.head;
++		int tag = (IVAL(m->buf, 0) >> 24) - MPLEX_BASE;
+ 		if (!(msg2sndr.head = m->next))
+ 			msg2sndr.tail = NULL;
+-		stats.total_written += m->len;
+ 		defer_forwarding_messages = 1;
+-		writefd_unbuffered(sock_f_out, m->buf, m->len);
++		switch (tag) {
++		case MSG_INFO:
++		case MSG_ERROR:
++			rwrite((enum logcode)tag, m->buf + 4, m->len - 4);
++			break;
++		default:
++			stats.total_written += m->len;
++			writefd_unbuffered(sock_f_out, m->buf, m->len);
++			break;
++		}
+ 		defer_forwarding_messages = 0;
+ 		free(m);
+ 	}
diff --git a/net-misc/rsync/rsync-2.6.8-r1.ebuild b/net-misc/rsync/rsync-2.6.8-r1.ebuild
new file mode 100644
index 000000000000..24a6a8104072
--- /dev/null
+++ b/net-misc/rsync/rsync-2.6.8-r1.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/rsync/rsync-2.6.8-r1.ebuild,v 1.1 2006/05/13 03:54:38 vapier Exp $
+
+inherit eutils flag-o-matic toolchain-funcs
+
+DESCRIPTION="File transfer program to keep remote files into sync"
+HOMEPAGE="http://rsync.samba.org/"
+SRC_URI="http://rsync.samba.org/ftp/rsync/${P/_/}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ~m68k ~mips ppc ~ppc-macos ppc64 ~s390 ~sh sparc x86 ~x86-fbsd"
+IUSE="acl build ipv6 static xinetd"
+
+RDEPEND="!build? ( >=dev-libs/popt-1.5 )
+	acl? ( kernel_linux? ( sys-apps/acl ) )"
+DEPEND="${RDEPEND}
+	>=sys-apps/portage-2.0.51"
+
+S=${WORKDIR}/${P/_/}
+
+src_unpack() {
+	unpack ${P/_/}.tar.gz
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-fix-deferred-msgs.patch #133054
+	if use acl ; then
+		epatch patches/{acls,xattrs}.diff
+		./prepare-source || die
+	fi
+}
+
+src_compile() {
+	[[ $(gcc-version) == "2.95" ]] && append-ldflags -lpthread
+	use static && append-ldflags -static
+
+	econf \
+		$(use_with build included-popt) \
+		$(use_enable acl acl-support) \
+		$(use_enable acl xattr-support) \
+		$(use_enable ipv6) \
+		--with-rsyncd-conf=/etc/rsyncd.conf \
+		|| die
+	emake || die "emake failed"
+}
+
+pkg_preinst() {
+	if [[ -e ${ROOT}/etc/rsync/rsyncd.conf ]] && [[ ! -e ${ROOT}/etc/rsyncd.conf ]] ; then
+		mv "${ROOT}"/etc/rsync/rsyncd.conf "${ROOT}"/etc/rsyncd.conf
+		rm -f "${ROOT}"/etc/rsync/.keep
+		rmdir "${ROOT}"/etc/rsync >& /dev/null
+	fi
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die "make install failed"
+	newconfd "${FILESDIR}"/rsyncd.conf.d rsyncd
+	newinitd "${FILESDIR}"/rsyncd.init.d rsyncd
+	if ! use build ; then
+		dodoc NEWS OLDNEWS README TODO tech_report.tex
+		insinto /etc
+		doins "${FILESDIR}"/rsyncd.conf
+		if use xinetd ; then
+			insinto /etc/xinetd.d
+			newins "${FILESDIR}"/rsyncd.xinetd rsyncd
+		fi
+	else
+		rm -r "${D}"/usr/share
+	fi
+}
+
+pkg_postinst() {
+	ewarn "The rsyncd.conf file has been moved for you to /etc/rsyncd.conf"
+	echo
+	ewarn "Please make sure you do NOT disable the rsync server running"
+	ewarn "in a chroot.  Please check /etc/rsyncd.conf and make sure"
+	ewarn "it says: use chroot = yes"
+}