Add patch from upstream to fix -C #100861 by awk.

Package-Manager: portage-2.0.51.22-r2

5 files changed, 120 insertions, 5 deletions

diff --git a/net-misc/rsync/ChangeLog b/net-misc/rsync/ChangeLog
index 47338f3177bc..e2bf78504df7 100644
--- a/net-misc/rsync/ChangeLog
+++ b/net-misc/rsync/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/rsync
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/rsync/ChangeLog,v 1.80 2005/07/29 23:34:39 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/rsync/ChangeLog,v 1.81 2005/08/01 11:41:29 vapier Exp $
+
+*rsync-2.6.0-r6 (01 Aug 2005)
+
+  01 Aug 2005; Mike Frysinger <vapier@gentoo.org>
+  +files/rsync-2.6.0-cvsignore.patch, +rsync-2.6.0-r6.ebuild:
+  Add patch from upstream to fix -C #100861 by awk.
 
 *rsync-2.6.6 (29 Jul 2005)
 
diff --git a/net-misc/rsync/Manifest b/net-misc/rsync/Manifest
index 671f19a40b51..cd9ab42225db 100644
--- a/net-misc/rsync/Manifest
+++ b/net-misc/rsync/Manifest
@@ -5,14 +5,17 @@ MD5 3685ae9a09bfe55c04044538bf81fe59 rsync-2.6.3-r1.ebuild 2009
 MD5 84ea0ad59fd4e88249ae78f7f55bea2b rsync-2.6.0-r5.ebuild 2503
 MD5 aa87fe072475d63b9476540033b38d01 rsync-2.6.4.ebuild 2001
 MD5 ca2d1087a0b04b7fd6d1652e3ad9ef5a rsync-2.6.6.ebuild 2002
-MD5 07dac22f58c6d5995b5d38ccad760d8e ChangeLog 10571
+MD5 6ad7d546901dc8f5953ba4978b143b2f rsync-2.6.0-r6.ebuild 2544
+MD5 72c163366f40f3f8de2dadc4da802886 ChangeLog 10767
 MD5 e498c1a53adae08aa9947326d1cde06b rsync-2.6.5.ebuild 2002
 MD5 e04533ca371c57d742250cc0622c005e files/digest-rsync-2.6.0-r5 204
+MD5 e04533ca371c57d742250cc0622c005e files/digest-rsync-2.6.0-r6 204
 MD5 3ee26e2b37af76a4770448ec745e6f42 files/digest-rsync-2.6.6 63
 MD5 85d62854c15e2e275184c9af7e5d6d18 files/rsyncd.init.d 438
 MD5 f92735d68f21c6516c8916b484ecd848 files/rsyncd.conf 518
 MD5 b8cb6d507de74f71738f0f50774c35d0 files/rsync-pathsanitize.patch 235
 MD5 837ec8510f315fe348f0a0e13c755c15 files/digest-rsync-2.6.4 63
+MD5 d4a2634dfd2e7e9f6e5537c2b6c8af8d files/rsync-2.6.0-cvsignore.patch 797
 MD5 b447910de9fdd6425c64002fa7d1ab83 files/rsync-2.6.0-sanitize.patch 5671
 MD5 62972fab38bf033135efad0bd025f65b files/digest-rsync-2.6.3-r1 63
 MD5 574dc3e5a445650c56e445bd2a5ecc02 files/rsync-2.6.0-livecd-sigmask.patch 1807
@@ -21,7 +24,7 @@ MD5 39b5aab74752c74d7d600265dd32de05 files/rsyncd.conf.d 348
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.1 (GNU/Linux)
 
-iD8DBQFC6r0dgIKl8Uu19MoRAubTAJwOVBwhHVVaKNlIx5NU5IGzkwXnwQCeL54n
-AeY70XU7UJ/FCuH/3sF+n8E=
-=xhdk
+iD8DBQFC7gqAgIKl8Uu19MoRAi+6AJ4jYFg4GBhwZrbFLJFOmxatD+g2JwCaAqPO
+trHZafV9W3Aq/OLmJ1V3jGA=
+=6YxY
 -----END PGP SIGNATURE-----
diff --git a/net-misc/rsync/files/digest-rsync-2.6.0-r6 b/net-misc/rsync/files/digest-rsync-2.6.0-r6
new file mode 100644
index 000000000000..42e8d077802b
--- /dev/null
+++ b/net-misc/rsync/files/digest-rsync-2.6.0-r6
@@ -0,0 +1,3 @@
+MD5 3f24bf31aec0a657eb3b6844c3f09f21 rsync-2.6.0.tar.gz 464920
+MD5 a399e227a18ea3f2eb5aa2b401006d2d rsync-2.5.6-proxy-auth-1.patch 4353
+MD5 16cbffdcd9c6c318761c6c0d86400197 rsync-2.6.0-acl.diff.bz2 60721
diff --git a/net-misc/rsync/files/rsync-2.6.0-cvsignore.patch b/net-misc/rsync/files/rsync-2.6.0-cvsignore.patch
new file mode 100644
index 000000000000..5e5b2552684e
--- /dev/null
+++ b/net-misc/rsync/files/rsync-2.6.0-cvsignore.patch
@@ -0,0 +1,24 @@
+From upstream CVS. This was fixed in 2.6.1.
+
+Log entry:
+
+  "Items read from a per-directory .cvsignore file should be added to the
+   local_exclude_list, not the exclude_list."
+
+Index: flist.c
+===================================================================
+RCS file: /cvsroot/rsync/flist.c,v
+retrieving revision 1.164
+retrieving revision 1.165
+diff -u -r1.164 -r1.165
+--- flist.c	13 Jan 2004 06:27:30 -0000	1.164
++++ flist.c	17 Jan 2004 01:16:49 -0000	1.165
+@@ -942,7 +942,7 @@
+ 	if (cvs_exclude) {
+ 		if (strlen(fname) + strlen(".cvsignore") <= MAXPATHLEN - 1) {
+ 			strcpy(p, ".cvsignore");
+-			add_exclude_file(&exclude_list,fname,MISSING_OK,ADD_EXCLUDE);
++			add_exclude_file(&local_exclude_list,fname,MISSING_OK,ADD_EXCLUDE);
+ 		} else {
+ 			io_error |= IOERR_GENERAL;
+ 			rprintf(FINFO,
diff --git a/net-misc/rsync/rsync-2.6.0-r6.ebuild b/net-misc/rsync/rsync-2.6.0-r6.ebuild
new file mode 100644
index 000000000000..d414dfa556b5
--- /dev/null
+++ b/net-misc/rsync/rsync-2.6.0-r6.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/rsync/rsync-2.6.0-r6.ebuild,v 1.1 2005/08/01 11:41:29 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/old-versions/${P}.tar.gz
+	http://www.imada.sdu.dk/~bardur/personal/40-patches/rsync-proxy-auth/rsync-2.5.6-proxy-auth-1.patch
+	acl? ( http://www.saout.de/misc/${P}-acl.diff.bz2 )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86"
+IUSE="build static acl livecd"
+
+RDEPEND="!build? ( >=dev-libs/popt-1.5 )
+	acl? ( sys-apps/acl )"
+DEPEND="${RDEPEND}
+	>=sys-apps/portage-2.0.51"
+
+src_unpack() {
+	unpack ${P}.tar.gz
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-sanitize.patch
+	epatch "${DISTDIR}"/${PN}-2.5.6-proxy-auth-1.patch
+	epatch "${FILESDIR}"/${P}-cvsignore.patch
+	use acl && epatch "${DISTDIR}"/${P}-acl.diff.bz2
+	use livecd && epatch ${FILESDIR}/${P}-livecd-sigmask.patch
+
+	# apply security patch from bug #60309
+	epatch "${FILESDIR}"/${PN}-pathsanitize.patch
+}
+
+src_compile() {
+	[ "`gcc-version`" == "2.95" ] && append-ldflags -lpthread
+	use static && append-ldflags -static
+	export LDFLAGS
+	econf \
+		$(use_with build included-popt) \
+		$(use_with acl acl-support) \
+		|| 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
+	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"
+	echo
+	einfo 'This patch enables usage of user:pass@proxy.foo:port'
+	einfo 'in the RSYNC_PROXY environment variable to support'
+	einfo 'the "Basic" proxy authentication scheme if you are'
+	einfo 'behind a password protected HTTP proxy.'
+}