Fix off-by-one errors, #189132 thanks to Tobias Scherbaum.

Package-Manager: portage-2.1.3.6

5 files changed, 160 insertions, 15 deletions

diff --git a/net-misc/rsync/ChangeLog b/net-misc/rsync/ChangeLog
index 888995fd5d92..c40251b2f040 100644
--- a/net-misc/rsync/ChangeLog
+++ b/net-misc/rsync/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/rsync
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/rsync/ChangeLog,v 1.122 2007/07/10 17:42:12 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/rsync/ChangeLog,v 1.123 2007/08/22 09:51:17 uberlord Exp $
+
+*rsync-2.6.9-r3 (22 Aug 2007)
+
+  22 Aug 2007; Roy Marples <uberlord@gentoo.org>
+  +files/rsync-2.6.9-fname-obo.patch, +rsync-2.6.9-r3.ebuild:
+  Fix off-by-one errors, #189132 thanks to Tobias Scherbaum.
 
   10 Jul 2007; Christoph Mende <angelos@gentoo.org> rsync-2.6.9-r2.ebuild:
   Stable on amd64 wrt bug #184685
diff --git a/net-misc/rsync/Manifest b/net-misc/rsync/Manifest
index bb92ce3b9aff..9191d30eb39e 100644
--- a/net-misc/rsync/Manifest
+++ b/net-misc/rsync/Manifest
@@ -1,10 +1,11 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX rsync-2.6.9-delete-acls-xattr.patch 1162 RMD160 f145ea48908cce70f6f364b3ed27d969373befd1 SHA1 dae03baed7062bf7486655ef2988a2d21b3eb5a7 SHA256 a9eefe91908c3e7d842e40f69fdf658edb3250cb9458649d22bc4337398a9783
 MD5 10e516dab4d1712204129674d4f01820 files/rsync-2.6.9-delete-acls-xattr.patch 1162
 RMD160 f145ea48908cce70f6f364b3ed27d969373befd1 files/rsync-2.6.9-delete-acls-xattr.patch 1162
 SHA256 a9eefe91908c3e7d842e40f69fdf658edb3250cb9458649d22bc4337398a9783 files/rsync-2.6.9-delete-acls-xattr.patch 1162
+AUX rsync-2.6.9-fname-obo.patch 1372 RMD160 c6d320a82509969a2303a80f7cdbd7cc70dce7a3 SHA1 c535e86fa3a847250ad01a50e0840937ef24c969 SHA256 d64eee5c3421eece02f57f351107bf69f7fdc0a71a4104144a1974de89b7c804
+MD5 46fcea1ac64c9e075d0338f8e35b1af6 files/rsync-2.6.9-fname-obo.patch 1372
+RMD160 c6d320a82509969a2303a80f7cdbd7cc70dce7a3 files/rsync-2.6.9-fname-obo.patch 1372
+SHA256 d64eee5c3421eece02f57f351107bf69f7fdc0a71a4104144a1974de89b7c804 files/rsync-2.6.9-fname-obo.patch 1372
 AUX rsync-2.6.9-stats-fix.patch 2110 RMD160 8d9c2001cae60b09adc1f62df9ed55d09ab9513f SHA1 cb7ac35a69842567b3badd0f5c57ec070721b2dd SHA256 3656b84337fe317baed6d25b1093d240e2bf844fcca3b32eb20a8b37dcf0475c
 MD5 b7b00018df3e9613c11fb86cc0c08f27 files/rsync-2.6.9-stats-fix.patch 2110
 RMD160 8d9c2001cae60b09adc1f62df9ed55d09ab9513f files/rsync-2.6.9-stats-fix.patch 2110
@@ -34,10 +35,14 @@ EBUILD rsync-2.6.9-r2.ebuild 2144 RMD160 a022b024223773e5dba62c76f1ea29476e036c4
 MD5 24a8e24d13b5f943fff1db61ffde1330 rsync-2.6.9-r2.ebuild 2144
 RMD160 a022b024223773e5dba62c76f1ea29476e036c43 rsync-2.6.9-r2.ebuild 2144
 SHA256 e1c0700dc1accead8faa4c3868a52282be1b2851fc898e772abf3eb126e0aaba rsync-2.6.9-r2.ebuild 2144
-MISC ChangeLog 15689 RMD160 b0b9004d1af1b8befa733ed6bcf08601a0752f2c SHA1 8bb03dbc8ab4e78e5aa0b0e8e7a343d5c1d16fcc SHA256 f6fba212bc227daac9795fdf70e3f8b3c368a5aed84b180de4ee3c68ad12376f
-MD5 c466da6375d9c242034dd96f3de59e7c ChangeLog 15689
-RMD160 b0b9004d1af1b8befa733ed6bcf08601a0752f2c ChangeLog 15689
-SHA256 f6fba212bc227daac9795fdf70e3f8b3c368a5aed84b180de4ee3c68ad12376f ChangeLog 15689
+EBUILD rsync-2.6.9-r3.ebuild 2208 RMD160 300bb756c8c45bdddd5932ffb8c6f5fad04341b2 SHA1 f06eff2c7c5c22df29575da72c4cf5d27f68b732 SHA256 61a41e54abc35733dcbc4e54d24d75aa6ff6b8070ce27a96c3d1a665b14ea874
+MD5 5838849dded15fdf13dc1605bde3c926 rsync-2.6.9-r3.ebuild 2208
+RMD160 300bb756c8c45bdddd5932ffb8c6f5fad04341b2 rsync-2.6.9-r3.ebuild 2208
+SHA256 61a41e54abc35733dcbc4e54d24d75aa6ff6b8070ce27a96c3d1a665b14ea874 rsync-2.6.9-r3.ebuild 2208
+MISC ChangeLog 15894 RMD160 a9c4c097f9f3c47e64fb3a1a49939c9d7a73e1df SHA1 d08e02ccd8277c150e4753f6a6f77421392a0f5b SHA256 be5a1b75b4559587a3aa9f6b66f83c7e0160338b2a231235123b2aeb2520290a
+MD5 e87e46b7ef58477e9fd24e9e7f7ca6c6 ChangeLog 15894
+RMD160 a9c4c097f9f3c47e64fb3a1a49939c9d7a73e1df ChangeLog 15894
+SHA256 be5a1b75b4559587a3aa9f6b66f83c7e0160338b2a231235123b2aeb2520290a ChangeLog 15894
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164
@@ -48,10 +53,6 @@ SHA256 3b24d2cc4f4676a8760a13ad08252df7317ca597118a290a51f624d099b00044 files/di
 MD5 b7c43d63ebd1fc4f11b181745ce98f96 files/digest-rsync-2.6.9-r2 235
 RMD160 38e28736f704de5bceb9edf25034693e0192118d files/digest-rsync-2.6.9-r2 235
 SHA256 3b24d2cc4f4676a8760a13ad08252df7317ca597118a290a51f624d099b00044 files/digest-rsync-2.6.9-r2 235
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.5 (GNU/Linux)
-
-iD8DBQFGk8TxKhnDs22gwa8RAkQKAKDjPruLA6uMk7yhA+8v0hc8npMfvgCfQiE0
-OemfgRBWDuk0KZFcpUepKC4=
-=hr5S
------END PGP SIGNATURE-----
+MD5 b7c43d63ebd1fc4f11b181745ce98f96 files/digest-rsync-2.6.9-r3 235
+RMD160 38e28736f704de5bceb9edf25034693e0192118d files/digest-rsync-2.6.9-r3 235
+SHA256 3b24d2cc4f4676a8760a13ad08252df7317ca597118a290a51f624d099b00044 files/digest-rsync-2.6.9-r3 235
diff --git a/net-misc/rsync/files/digest-rsync-2.6.9-r3 b/net-misc/rsync/files/digest-rsync-2.6.9-r3
new file mode 100644
index 000000000000..fca949e58851
--- /dev/null
+++ b/net-misc/rsync/files/digest-rsync-2.6.9-r3
@@ -0,0 +1,3 @@
+MD5 996d8d8831dbca17910094e56dcb5942 rsync-2.6.9.tar.gz 811841
+RMD160 36d270d9f01e9a8e808f426196796001bdd3d5d2 rsync-2.6.9.tar.gz 811841
+SHA256 ca437301becd890e73300bc69a39189ff1564baa761948ff149b3dd7bde633f9 rsync-2.6.9.tar.gz 811841
diff --git a/net-misc/rsync/files/rsync-2.6.9-fname-obo.patch b/net-misc/rsync/files/rsync-2.6.9-fname-obo.patch
new file mode 100644
index 000000000000..2fa0113020b7
--- /dev/null
+++ b/net-misc/rsync/files/rsync-2.6.9-fname-obo.patch
@@ -0,0 +1,60 @@
+--- rsync-2.6.9.orig/sender.c	2006-09-20 03:53:32.000000000 +0200
++++ rsync-2.6.9/sender.c	2007-07-25 15:33:05.000000000 +0200
+@@ -123,6 +123,7 @@
+ 	char fname[MAXPATHLEN];
+ 	struct file_struct *file;
+ 	unsigned int offset;
++	size_t l = 0;
+ 
+ 	if (ndx < 0 || ndx >= the_file_list->count)
+ 		return;
+@@ -133,6 +134,20 @@
+ 				    file->dir.root, "/", NULL);
+ 	} else
+ 		offset = 0;
++
++	l = offset + 1;
++	if (file) {
++		if (file->dirname)
++			l += strlen(file->dirname);
++		if (file->basename)
++			l += strlen(file->basename);
++	}
++
++	if (l >= sizeof(fname)) {
++		rprintf(FERROR, "Overlong pathname\n");
++		exit_cleanup(RERR_FILESELECT);
++	}
++
+ 	f_name(file, fname + offset);
+ 	if (remove_source_files) {
+ 		if (do_unlink(fname) == 0) {
+@@ -224,6 +239,7 @@
+ 	enum logcode log_code = log_before_transfer ? FLOG : FINFO;
+ 	int f_xfer = write_batch < 0 ? batch_fd : f_out;
+ 	int i, j;
++	size_t l = 0;
+ 
+ 	if (verbose > 2)
+ 		rprintf(FINFO, "send_files starting\n");
+@@ -259,6 +275,20 @@
+ 				fname[offset++] = '/';
+ 		} else
+ 			offset = 0;
++
++		l = offset + 1;
++		if (file) {
++			if (file->dirname)
++				l += strlen(file->dirname);
++			if (file->basename)
++				l += strlen(file->basename);
++		}
++
++		if (l >= sizeof(fname)) {
++			rprintf(FERROR, "Overlong pathname\n");
++			exit_cleanup(RERR_FILESELECT);
++		}
++
+ 		fname2 = f_name(file, fname + offset);
+ 
+ 		if (verbose > 2)
diff --git a/net-misc/rsync/rsync-2.6.9-r3.ebuild b/net-misc/rsync/rsync-2.6.9-r3.ebuild
new file mode 100644
index 000000000000..c506d3385927
--- /dev/null
+++ b/net-misc/rsync/rsync-2.6.9-r3.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/rsync/rsync-2.6.9-r3.ebuild,v 1.1 2007/08/22 09:51:17 uberlord 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 ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
+IUSE="acl ipv6 static xinetd"
+
+DEPEND=">=dev-libs/popt-1.5
+	acl? ( kernel_linux? ( sys-apps/acl ) )
+	xinetd? ( sys-apps/xinetd )"
+
+S=${WORKDIR}/${P/_/}
+
+src_unpack() {
+	unpack ${P/_/}.tar.gz
+	cd "${S}"
+	if use acl ; then
+		epatch patches/{acls,xattrs}.diff
+		epatch "${FILESDIR}"/${P}-delete-acls-xattr.patch
+		./prepare-source || die
+	fi
+	epatch "${FILESDIR}"/${P}-stats-fix.patch #165121
+	epatch "${FILESDIR}"/${P}-fname-obo.patch #189132
+}
+
+src_compile() {
+	[[ $(gcc-version) == "2.95" ]] && append-ldflags -lpthread
+	use static && append-ldflags -static
+
+	econf \
+		--without-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() {
+	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
+	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"
+}