Add fix from upstream for security issue in optional xattr patch #216887.

Package-Manager: portage-2.2_pre5

4 files changed, 117 insertions, 5 deletions

diff --git a/net-misc/rsync/ChangeLog b/net-misc/rsync/ChangeLog
index 0648678eee47..2c8bcb1f0204 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.153 2008/04/08 17:26:12 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/rsync/ChangeLog,v 1.154 2008/04/10 03:39:14 vapier Exp $
+
+*rsync-2.6.9-r6 (10 Apr 2008)
+
+  10 Apr 2008; Mike Frysinger <vapier@gentoo.org>
+  +files/rsync-3.0.1-xattr-alloc.diff, +rsync-2.6.9-r6.ebuild:
+  Add fix from upstream for security issue in optional xattr patch #216887.
 
 *rsync-3.0.2 (08 Apr 2008)
 
diff --git a/net-misc/rsync/Manifest b/net-misc/rsync/Manifest
index adafbc2772d5..9a38b43ce65d 100644
--- a/net-misc/rsync/Manifest
+++ b/net-misc/rsync/Manifest
@@ -10,6 +10,7 @@ AUX rsync-3.0.0-NULL-config.patch 1817 RMD160 b5184511a1e114139ac4abb2d905c1f4fc
 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 rsync-3.0.1-xattr-alloc.diff 955 RMD160 30c96cd386ab255e84ffd227d740f65b45474cde SHA1 8bdf9345078ff6d4e36e86856b62a70b62ed90e5 SHA256 1be0b2e4d011746882d2dc2229e02fe8d04df93518e4719e7ba6772b3ff77929
 AUX rsyncd.conf 405 RMD160 13b8eb7a40c07494580a013b9cafb89a85e0b38b SHA1 0116523e057957814beb3bb913ab1aa916327a88 SHA256 b7dfb2957fa900de915da3667546e3499a952a51c92388abea79244d34a9a815
 AUX rsyncd.conf.d 149 RMD160 0c2d0e34d1467fc0ec460760b49d621231c8e562 SHA1 fda5604306f2342e56cb773d11ba534494a42a61 SHA256 de758791b16b89a648c01867af7f51bc9bd44e40cbe868e439b753ff5d9572e5
 AUX rsyncd.init.d 558 RMD160 856e8d1d54fed649df029f4c12a735e4628d7bcc SHA1 4d217a584f872070062d17d18a5e3d5571e92e0b SHA256 08e620bac216e0acdb56d94198caebd7fd14b0a42e8465b2eb98b7420d369ab6
@@ -20,15 +21,16 @@ DIST rsync-3.0.0.tar.gz 757821 RMD160 ab71155c8329a195f2c194c2284546d4cae07a97 S
 DIST rsync-3.0.1.tar.gz 765881 RMD160 ff5bb3d17b9f159d75752d464e183cf91c7f77e0 SHA1 e76b6ed0b8f59dfb30123228b8495578019181d7 SHA256 d0a976643f22502e07900a115b592426e071e9ffc01ceb3bac2d28e56b26844b
 DIST rsync-3.0.2.tar.gz 765732 RMD160 8f7872e20ea3e243bf0c44c02a583d579e1a0d19 SHA1 0d1e69c28ee57a6cca6b9a52b18c7fb835ca7a2e SHA256 cb934d7b185756b2b5c0d797045b2e4debcd2bacc8f1565f4e430f24a9d70fc9
 EBUILD rsync-2.6.9-r5.ebuild 2245 RMD160 1d482446e7e24d1fb404edc70ebb6ee6da43fc75 SHA1 fb40baaefb067dff5bca9bd2de91c7834fdd7fcd SHA256 3249e029e6131cadc6d72c8b830e5156ac9f245aa4657865b8d328e0b151956e
+EBUILD rsync-2.6.9-r6.ebuild 2317 RMD160 5c668ddb8e96fbf010003c1d01918f4a84d91a71 SHA1 ad7732d199783b14bbbf897e278a3c82f240902e SHA256 feea31ab248dd1a6d45c1ac436823aada4b6317b6dfa871f213fa126045a35e7
 EBUILD rsync-3.0.0-r2.ebuild 2224 RMD160 3e4b952ed7be756e4fd327c50b735be7dc5f103f SHA1 bbc0ce3e008bf99110a4c1c0dac8f9bf7c096589 SHA256 c5d80cfae77828cd04e5b5b4d87dbd88f10e7574e1a8b6160587c9c63f93b18f
 EBUILD rsync-3.0.1.ebuild 2029 RMD160 f096e0b5c77a1e2666ce80c4496893ca7b0c2698 SHA1 54592c1b0695b47531efc2a26b4bafd6a7ac9780 SHA256 eb563cf328cfaf13515d53c85c09ecce8236064bdde5eab29df03c591afa05d4
 EBUILD rsync-3.0.2.ebuild 2029 RMD160 0f44e9907565836d4417a39e813e48a5bf336627 SHA1 5ee1ac916a7ccd50ebd5e3aac10ebb42c1c97fbe SHA256 5ec009085d7cb763b20879a8d6750376f3a2cfd32c24620646a267a1491785fb
-MISC ChangeLog 19818 RMD160 254a366eb322f8be8dc4073ae8b7a73cb644f5d3 SHA1 0b6cc8e7cf9d4fbf447fa6f7ff93b651fd42d4a4 SHA256 80877827e903f22129ed15f1ec30302840ccbba5886863c759562bdc131694a5
+MISC ChangeLog 20039 RMD160 a0675e83fd0da3d65963d44ec3d0954ea3ce9dae SHA1 d6bafa962348d01e6a6266f947a786a2af541776 SHA256 72faa908288c2d7826a9dfa228e3379c7c0253eab4b801af6f7e92a8d7aebf5e
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFH+6q6j9hvisErhMIRAlouAJ9ptQZ55weGEwjl3eOGfz92FZ/FYACdGfAB
-YSzEjP4X5nIy67CElcA7Bpo=
-=G4zO
+iD8DBQFH/Yvoj9hvisErhMIRAvpLAJ4u1fKAUPlCZt+Y4g526/DZ6h6sPACcDeQ/
+Lqxi2bbmvOsUgTQYPIL99a8=
+=TVg8
 -----END PGP SIGNATURE-----
diff --git a/net-misc/rsync/files/rsync-3.0.1-xattr-alloc.diff b/net-misc/rsync/files/rsync-3.0.1-xattr-alloc.diff
new file mode 100644
index 000000000000..71547ffbede1
--- /dev/null
+++ b/net-misc/rsync/files/rsync-3.0.1-xattr-alloc.diff
@@ -0,0 +1,27 @@
+fix from upstream
+
+http://bugs.gentoo.org/216887
+
+--- a/util.c
++++ b/util.c
+@@ -1329,7 +1329,7 @@ void *_new_array(unsigned long num, unsigned int size, int use_calloc)
+ 	return use_calloc ? calloc(num, size) : malloc(num * size);
+ }
+ 
+-void *_realloc_array(void *ptr, unsigned int size, unsigned long num)
++void *_realloc_array(void *ptr, unsigned int size, size_t num)
+ {
+ 	if (num >= MALLOC_MAX/size)
+ 		return NULL;
+@@ -1550,7 +1550,10 @@ void *expand_item_list(item_list *lp, size_t item_size,
+ 			new_size += incr;
+ 		else
+ 			new_size *= 2;
+-		new_ptr = realloc_array(lp->items, char, new_size * item_size);
++		if (new_size < lp->malloced)
++			overflow_exit("expand_item_list");
++		/* Using _realloc_array() lets us pass the size, not a type. */
++		new_ptr = _realloc_array(lp->items, item_size, new_size);
+ 		if (verbose >= 4) {
+ 			rprintf(FINFO, "[%s] expand %s to %.0f bytes, did%s move\n",
+ 				who_am_i(), desc, (double)new_size * item_size,
diff --git a/net-misc/rsync/rsync-2.6.9-r6.ebuild b/net-misc/rsync/rsync-2.6.9-r6.ebuild
new file mode 100644
index 000000000000..0c5e89b29ecb
--- /dev/null
+++ b/net-misc/rsync/rsync-2.6.9-r6.ebuild
@@ -0,0 +1,77 @@
+# 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-2.6.9-r6.ebuild,v 1.1 2008/04/10 03:39:14 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 ~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
+		epatch "${FILESDIR}"/rsync-3.0.1-xattr-alloc.diff #216887
+		./prepare-source || die
+	fi
+	epatch "${FILESDIR}"/${P}-stats-fix.patch #165121
+	epatch "${FILESDIR}"/${P}-fname-obo.patch #189132
+	epatch "${FILESDIR}"/${P}-pid-early.patch #192075
+}
+
+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"
+}