Fix from upstream for hang with --dry-run #193243 by David Leverton.

Package-Manager: portage-2.2_pre2

4 files changed, 107 insertions, 6 deletions

diff --git a/net-misc/rsync/ChangeLog b/net-misc/rsync/ChangeLog
index 0d946876b2e4..7c568b7ba01b 100644
--- a/net-misc/rsync/ChangeLog
+++ b/net-misc/rsync/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/rsync
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/rsync/ChangeLog,v 1.150 2008/03/16 07:22:10 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/rsync/ChangeLog,v 1.151 2008/03/17 03:47:02 vapier Exp $
+
+*rsync-3.0.0-r2 (17 Mar 2008)
+
+  17 Mar 2008; Mike Frysinger <vapier@gentoo.org>
+  +files/rsync-3.0.0-dry-run-hang.patch, +rsync-3.0.0-r2.ebuild:
+  Fix from upstream for hang with --dry-run #193243 by David Leverton.
 
   16 Mar 2008; Mike Frysinger <vapier@gentoo.org> +files/rsyncd.logrotate,
   rsync-3.0.0-r1.ebuild:
diff --git a/net-misc/rsync/Manifest b/net-misc/rsync/Manifest
index d1764cc9b75d..1eb94691ef61 100644
--- a/net-misc/rsync/Manifest
+++ b/net-misc/rsync/Manifest
@@ -8,6 +8,7 @@ AUX rsync-2.6.9-pid-early.patch 1179 RMD160 6f309afc13113fd044e205bf120b91de4275
 AUX rsync-2.6.9-stats-fix.patch 2110 RMD160 8d9c2001cae60b09adc1f62df9ed55d09ab9513f SHA1 cb7ac35a69842567b3badd0f5c57ec070721b2dd SHA256 3656b84337fe317baed6d25b1093d240e2bf844fcca3b32eb20a8b37dcf0475c
 AUX rsync-3.0.0-NULL-config.patch 1817 RMD160 b5184511a1e114139ac4abb2d905c1f4fc237dc2 SHA1 8421313359a7db9917c0fc2bcd6e3f06b5bec544 SHA256 0a333d91ffc0b9702b188e8bc1fb2ad342939c28c2ae1e2b31201987cffe576a
 AUX rsync-3.0.0-acl-crash.patch 3855 RMD160 bc95dbb9dc73b19b6973df6f37ac51e20fdf8d01 SHA1 0e27778d8b312e51f7f5bab5ca50042a2f15b5f2 SHA256 51cb68b1fac816923a62e1416b4c7de360fd400c64f548c6b70bbd7d98a349a9
+AUX rsync-3.0.0-dry-run-hang.patch 714 RMD160 e3d37cc2695b802757d8883ee9e13c6cc8c4ee44 SHA1 fb37990432d1d569752e9420a379182c500f34fc SHA256 91dfa70c003bc3e2b26df936ccebd9758e313fce69bb9a5e3c86ac9f0bb92811
 AUX rsync-3.0.0-fake-super-attrs.patch 8037 RMD160 b26a87c9ceb0183515ee2c5690a0bfa18f698041 SHA1 ddb2db154535756af74d4ce360e0cdf9628d68c9 SHA256 cb5e62e1e084b1e5bb7759ddddde8d933a7ee754b3ec1a54442a14bcd4fae141
 AUX rsyncd.conf 405 RMD160 13b8eb7a40c07494580a013b9cafb89a85e0b38b SHA1 0116523e057957814beb3bb913ab1aa916327a88 SHA256 b7dfb2957fa900de915da3667546e3499a952a51c92388abea79244d34a9a815
 AUX rsyncd.conf.d 149 RMD160 0c2d0e34d1467fc0ec460760b49d621231c8e562 SHA1 fda5604306f2342e56cb773d11ba534494a42a61 SHA256 de758791b16b89a648c01867af7f51bc9bd44e40cbe868e439b753ff5d9572e5
@@ -17,14 +18,14 @@ AUX rsyncd.xinetd 170 RMD160 2ce2addea3cfff08f86a168b0d2d83446514a60f SHA1 a2c04
 DIST rsync-2.6.9.tar.gz 811841 RMD160 36d270d9f01e9a8e808f426196796001bdd3d5d2 SHA1 341618e230ea2e0e551d0ccf06f840d4f824c843 SHA256 ca437301becd890e73300bc69a39189ff1564baa761948ff149b3dd7bde633f9
 DIST rsync-3.0.0.tar.gz 757821 RMD160 ab71155c8329a195f2c194c2284546d4cae07a97 SHA1 8c5582ba2977cd4bf96add95226c64b949931eec SHA256 17697db5bb9de399b71f7927070f60b3554b70b0ecc0419b50455d56560ea169
 EBUILD rsync-2.6.9-r5.ebuild 2245 RMD160 1d482446e7e24d1fb404edc70ebb6ee6da43fc75 SHA1 fb40baaefb067dff5bca9bd2de91c7834fdd7fcd SHA256 3249e029e6131cadc6d72c8b830e5156ac9f245aa4657865b8d328e0b151956e
-EBUILD rsync-3.0.0-r1.ebuild 2170 RMD160 dadfe116d3a2c982a48d158bde6081ea6f967dcd SHA1 009574c1d86c3e87e4ee0f0e32b5a76e9f807a11 SHA256 993736df303b8404893afefb3a599fd5e0007f395b3f7219a2f73cd149f51709
+EBUILD rsync-3.0.0-r2.ebuild 2224 RMD160 3e4b952ed7be756e4fd327c50b735be7dc5f103f SHA1 bbc0ce3e008bf99110a4c1c0dac8f9bf7c096589 SHA256 c5d80cfae77828cd04e5b5b4d87dbd88f10e7574e1a8b6160587c9c63f93b18f
 EBUILD rsync-3.0.0.ebuild 1913 RMD160 6c2621d2c5acfe1cad18c96e0c5ca1adf74b7d67 SHA1 b920089ea92aec5e728c279c7f33fbb6f6feec85 SHA256 c218f1f687ad819fdd59d65bfcc4bffecb2282e0d1532f019cf4d2fc685d256d
-MISC ChangeLog 19368 RMD160 cb2ebbef42665931972767711fb840561a2ea193 SHA1 aa193d4f960d9e0f7a4efd739e5cea310a672c2c SHA256 24fb57bb3b82665e3120ef6612d6d3bcaa1acde1511c60da8364f2bf962f05b4
+MISC ChangeLog 19586 RMD160 a3e754f315316c0128caa8918960b32577d4ac06 SHA1 f056e1196a03e4fd513c0c4c46d4fd59e04a4c17 SHA256 a22f22d8ba90ee8ef3595769d424379e98a76282d2098056aae21907f1e139b9
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFH3Mruj9hvisErhMIRAs6NAKCB9kCixu6s2XEmPhfPg4NlYSq35gCfYHex
-so+MVevbosWqcCoBXDANzEc=
-=0PF2
+iD8DBQFH3eoKj9hvisErhMIRAu2QAJ9tKMQwx4lh146xAUAHKhb9ItB2wACg5K97
++EghfZ7xrO9ISbPXLcJgPa8=
+=Ehp8
 -----END PGP SIGNATURE-----
diff --git a/net-misc/rsync/files/rsync-3.0.0-dry-run-hang.patch b/net-misc/rsync/files/rsync-3.0.0-dry-run-hang.patch
new file mode 100644
index 000000000000..1f85ac7fa437
--- /dev/null
+++ b/net-misc/rsync/files/rsync-3.0.0-dry-run-hang.patch
@@ -0,0 +1,19 @@
+commit 24ded29ff63d0adee798936ad20f21befcf8187b
+Author: Wayne Davison <wayned@samba.org>
+Date:   Sun Mar 16 06:56:26 2008 -0700
+
+    Fixed a hang when using --remove-source-files in dry-run mode.
+
+diff --git a/generator.c b/generator.c
+index b1634bd..4ec0ac4 100644
+--- a/generator.c
++++ b/generator.c
+@@ -1856,7 +1856,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
+ 		rprintf(FINFO, "generating and sending sums for %d\n", ndx);
+ 
+   notify_others:
+-	if (remove_source_files && !delay_updates && !phase)
++	if (remove_source_files && !delay_updates && !phase && !dry_run)
+ 		increment_active_files(ndx, itemizing, code);
+ 	if (inc_recurse && !dry_run)
+ 		cur_flist->in_progress++;
diff --git a/net-misc/rsync/rsync-3.0.0-r2.ebuild b/net-misc/rsync/rsync-3.0.0-r2.ebuild
new file mode 100644
index 000000000000..f5ef0fa42835
--- /dev/null
+++ b/net-misc/rsync/rsync-3.0.0-r2.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/rsync/rsync-3.0.0-r2.ebuild,v 1.1 2008/03/17 03:47:02 vapier Exp $
+
+inherit eutils flag-o-matic toolchain-funcs autotools
+
+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-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
+IUSE="acl ipv6 static xattr xinetd"
+
+DEPEND=">=dev-libs/popt-1.5
+	acl? ( kernel_linux? ( sys-apps/acl ) )
+	xattr? ( kernel_linux? ( sys-apps/attr ) )
+	xinetd? ( sys-apps/xinetd )"
+
+S=${WORKDIR}/${P/_/}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-acl-crash.patch
+	epatch "${FILESDIR}"/${P}-NULL-config.patch
+	epatch "${FILESDIR}"/${P}-fake-super-attrs.patch
+	epatch "${FILESDIR}"/${P}-dry-run-hang.patch #193243
+}
+
+src_compile() {
+	use static && append-ldflags -static
+	econf \
+		--without-included-popt \
+		$(use_enable acl acl-support) \
+		$(use_enable xattr 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() {
+	emake DESTDIR="${D}" install || die "make install failed"
+	newconfd "${FILESDIR}"/rsyncd.conf.d rsyncd
+	newinitd "${FILESDIR}"/rsyncd.init.d rsyncd
+	dodoc NEWS OLDNEWS README TODO tech_report.tex
+	insinto /etc
+	doins "${FILESDIR}"/rsyncd.conf
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/rsyncd.logrotate rsyncd
+
+	if use xinetd ; then
+		insinto /etc/xinetd.d
+		newins "${FILESDIR}"/rsyncd.xinetd rsyncd
+	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"
+}