Fix from upstream for output with -v and -q #133217 by lou.

Package-Manager: portage-2.1_pre10-r5

5 files changed, 137 insertions, 8 deletions

diff --git a/net-misc/rsync/ChangeLog b/net-misc/rsync/ChangeLog
index 112f993e4669..04987323b520 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.99 2006/05/13 03:54:38 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/rsync/ChangeLog,v 1.100 2006/05/14 05:42:57 vapier Exp $
+
+*rsync-2.6.8-r2 (14 May 2006)
+
+  14 May 2006; Mike Frysinger <vapier@gentoo.org>
+  +files/rsync-2.6.8-verbose-quiet-output.patch, +rsync-2.6.8-r2.ebuild:
+  Fix from upstream for output with -v and -q #133217 by lou.
 
 *rsync-2.6.8-r1 (13 May 2006)
 
diff --git a/net-misc/rsync/Manifest b/net-misc/rsync/Manifest
index 8dbdc575dd7f..ce8d3e8b8ab7 100644
--- a/net-misc/rsync/Manifest
+++ b/net-misc/rsync/Manifest
@@ -21,6 +21,10 @@ AUX rsync-2.6.8-fix-deferred-msgs.patch 1575 RMD160 3606049e8546a237080125fca365
 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-2.6.8-verbose-quiet-output.patch 847 RMD160 352ab2a28eb0aa005898008f70ea17e54d722eaa SHA1 f895b458adfaf0cebd1d5daf7e1b4f1a57619274 SHA256 0987707ae319ef35380324a10b264324e7cce0491e700b457381989c97bc7f1d size 847
+MD5 6c75385d66a928d373c5470d4d8b46e0 files/rsync-2.6.8-verbose-quiet-output.patch 847
+RMD160 352ab2a28eb0aa005898008f70ea17e54d722eaa files/rsync-2.6.8-verbose-quiet-output.patch 847
+SHA256 0987707ae319ef35380324a10b264324e7cce0491e700b457381989c97bc7f1d files/rsync-2.6.8-verbose-quiet-output.patch 847
 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
@@ -82,14 +86,18 @@ EBUILD rsync-2.6.8-r1.ebuild 2211 RMD160 504fb75ead5317c2599647824c141940e636037
 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-r2.ebuild 2273 RMD160 01b0ca218750ec38ef3a33cc72bad76a980947c1 SHA1 135aadbfa033b985dd790f4c9394b51ff8f6a0f6 SHA256 a21375fbe6fb2cfc3b988575ae85383dc83fdabf3e6ab7a8670084b0b55da4b8 size 2273
+MD5 8e725fa379785ecd5d18d55805e528cd rsync-2.6.8-r2.ebuild 2273
+RMD160 01b0ca218750ec38ef3a33cc72bad76a980947c1 rsync-2.6.8-r2.ebuild 2273
+SHA256 a21375fbe6fb2cfc3b988575ae85383dc83fdabf3e6ab7a8670084b0b55da4b8 rsync-2.6.8-r2.ebuild 2273
 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 12865 RMD160 db505f38b499cb33868a087db6ef0aebaa33ace2 SHA1 088fba79a512ea22d920c932614adb8109bc433c SHA256 92afdabd75f00279ca274f65076827f8c7980eae65b96185dbf083094035fdbf size 12865
-MD5 39364313856d9cc7c1de00b16a42ad7e ChangeLog 12865
-RMD160 db505f38b499cb33868a087db6ef0aebaa33ace2 ChangeLog 12865
-SHA256 92afdabd75f00279ca274f65076827f8c7980eae65b96185dbf083094035fdbf ChangeLog 12865
+MISC ChangeLog 13083 RMD160 f1081581d2dd3f51d50d020c8d1255dac8b0721b SHA1 80eaf3d0df2f9f695cb4776a9bd4d21e53ac063e SHA256 ae38e48d0dc1a26dfb0152d0b639c48aa91de1ec3666697019c6b6a19f9fc22f size 13083
+MD5 3d0b60cbdbe1c3c1ad30d11fb240eb6c ChangeLog 13083
+RMD160 f1081581d2dd3f51d50d020c8d1255dac8b0721b ChangeLog 13083
+SHA256 ae38e48d0dc1a26dfb0152d0b639c48aa91de1ec3666697019c6b6a19f9fc22f ChangeLog 13083
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 size 164
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164
@@ -121,10 +129,13 @@ SHA256 db6586c22adcb91ef50be62ec39d19e233d47868c93d087780853c657c356a4c files/di
 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
+MD5 41cb6cb57de67daaa9f08c143309eee3 files/digest-rsync-2.6.8-r2 235
+RMD160 c6900a235985b17ea63dc2d85460901d94ed3cff files/digest-rsync-2.6.8-r2 235
+SHA256 db6586c22adcb91ef50be62ec39d19e233d47868c93d087780853c657c356a4c files/digest-rsync-2.6.8-r2 235
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.3 (GNU/Linux)
 
-iD8DBQFEZVjl2+ySkm8kpY0RAirnAKCrGH6/K1eNUixN7ZpdqsQSE4tvOACgtz2B
-DD2jkEb5YkU/P/mMzVv5YOc=
-=I9zs
+iD8DBQFEZsPU2+ySkm8kpY0RAvUCAJ9IlAQKWHnjB43SkDGugaaMHlfd4ACdHzyn
+w/v4YgebGfHU/6bb8aScZLY=
+=x0a5
 -----END PGP SIGNATURE-----
diff --git a/net-misc/rsync/files/digest-rsync-2.6.8-r2 b/net-misc/rsync/files/digest-rsync-2.6.8-r2
new file mode 100644
index 000000000000..4789a4ea15b8
--- /dev/null
+++ b/net-misc/rsync/files/digest-rsync-2.6.8-r2
@@ -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-verbose-quiet-output.patch b/net-misc/rsync/files/rsync-2.6.8-verbose-quiet-output.patch
new file mode 100644
index 000000000000..d13f871963dd
--- /dev/null
+++ b/net-misc/rsync/files/rsync-2.6.8-verbose-quiet-output.patch
@@ -0,0 +1,30 @@
+http://bugs.gentoo.org/133217
+
+Index: log.c
+===================================================================
+RCS file: /cvsroot/rsync/log.c,v
+retrieving revision 1.150
+retrieving revision 1.151
+diff -u -p -r1.150 -r1.151
+--- log.c	9 May 2006 18:31:10 -0000	1.150
++++ log.c	14 May 2006 00:27:33 -0000	1.151
+@@ -224,9 +224,6 @@ void rwrite(enum logcode code, char *buf
+ 	if (len < 0)
+ 		exit_cleanup(RERR_MESSAGEIO);
+ 
+-	if (quiet && code == FINFO)
+-		return;
+-
+ 	if (am_server && msg_fd_out >= 0) {
+ 		/* Pass the message to our sibling. */
+ 		send_msg((enum msgcode)code, buf, len);
+@@ -258,6 +255,9 @@ void rwrite(enum logcode code, char *buf
+ 	} else if (code == FLOG)
+ 		return;
+ 
++	if (quiet && code != FERROR)
++		return;
++
+ 	if (am_server) {
+ 		/* Pass the message to the non-server side. */
+ 		if (send_msg((enum msgcode)code, buf, len))
diff --git a/net-misc/rsync/rsync-2.6.8-r2.ebuild b/net-misc/rsync/rsync-2.6.8-r2.ebuild
new file mode 100644
index 000000000000..dffe9f9908a5
--- /dev/null
+++ b/net-misc/rsync/rsync-2.6.8-r2.ebuild
@@ -0,0 +1,79 @@
+# 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-r2.ebuild,v 1.1 2006/05/14 05:42:57 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
+	epatch "${FILESDIR}"/${P}-verbose-quiet-output.patch #133217
+	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"
+}