get on top of #49534 but stay under #49933

4 files changed, 98 insertions, 11 deletions

diff --git a/net-misc/rsync/ChangeLog b/net-misc/rsync/ChangeLog
index ac94787d7342..1518b4b07cb9 100644
--- a/net-misc/rsync/ChangeLog
+++ b/net-misc/rsync/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-misc/rsync
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/rsync/ChangeLog,v 1.52 2004/05/08 10:37:41 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/rsync/ChangeLog,v 1.53 2004/06/23 01:16:46 vapier Exp $
+
+*rsync-2.6.1 (22 Jun 2004)
+
+  22 Jun 2004; Mike Frysinger <vapier@gentoo.org> +rsync-2.6.1.ebuild:
+  Try to fix security bug #49534 without pissing off #49933.
 
 *rsync-2.6.2-r3 (08 May 2004)
 
diff --git a/net-misc/rsync/Manifest b/net-misc/rsync/Manifest
index 305523a2cac6..5c0c0e08a6fd 100644
--- a/net-misc/rsync/Manifest
+++ b/net-misc/rsync/Manifest
@@ -1,16 +1,28 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 be370b5ca41aa33516d5ffd195c5c3d9 ChangeLog 7301
+MD5 4e22b7b0c7b8a312af968e94fc71e137 rsync-2.6.0-r1.ebuild 2435
 MD5 2b4231199efd5dc8f43008d49ab84680 rsync-2.6.0.ebuild 2262
-MD5 1f004a8a92bdfeca518fe7f57abbfc09 rsync-2.6.2-r3.ebuild 1997
+MD5 0f6471942961ced021588dac78273ac3 rsync-2.6.2-r1.ebuild 2060
 MD5 f444a8aab35c011e327bbef5dc8af423 rsync-2.6.2.ebuild 2146
 MD5 4274d0c059d7e425d8d0d1e9c6d7003b rsync-2.6.2-r2.ebuild 1968
-MD5 63cac227216d233b9cf69ab51c87c8fb ChangeLog 7142
-MD5 4e22b7b0c7b8a312af968e94fc71e137 rsync-2.6.0-r1.ebuild 2435
-MD5 0f6471942961ced021588dac78273ac3 rsync-2.6.2-r1.ebuild 2060
-MD5 23ad40bb15faf7e2d3846ffb6d6eaee9 files/digest-rsync-2.6.2-r3 131
-MD5 23ad40bb15faf7e2d3846ffb6d6eaee9 files/digest-rsync-2.6.2-r1 131
+MD5 1f004a8a92bdfeca518fe7f57abbfc09 rsync-2.6.2-r3.ebuild 1997
+MD5 006e3a74eac31df7cb94aff567979d3f rsync-2.6.1.ebuild 1941
 MD5 d12329ba4505253f35b46e3446aaaebc files/digest-rsync-2.6.2 63
-MD5 e04533ca371c57d742250cc0622c005e files/digest-rsync-2.6.0-r1 204
-MD5 3ff6f8bc2cf6a0c67a94d80eaaa721c3 files/rsyncd.init.d 424
-MD5 c5f7ff7f88f35b5f20b080b75cf801ce files/rsyncd.conf.d 356
 MD5 4d441bf205926e27dd5a2f535c6a970c files/rsyncd.conf 413
-MD5 23ad40bb15faf7e2d3846ffb6d6eaee9 files/digest-rsync-2.6.2-r2 131
+MD5 c5f7ff7f88f35b5f20b080b75cf801ce files/rsyncd.conf.d 356
+MD5 3ff6f8bc2cf6a0c67a94d80eaaa721c3 files/rsyncd.init.d 424
 MD5 2b5cd2c75632c28fb6d8a311e8548fa9 files/digest-rsync-2.6.0 136
+MD5 e04533ca371c57d742250cc0622c005e files/digest-rsync-2.6.0-r1 204
+MD5 23ad40bb15faf7e2d3846ffb6d6eaee9 files/digest-rsync-2.6.2-r1 131
+MD5 23ad40bb15faf7e2d3846ffb6d6eaee9 files/digest-rsync-2.6.2-r2 131
+MD5 23ad40bb15faf7e2d3846ffb6d6eaee9 files/digest-rsync-2.6.2-r3 131
+MD5 1b3c307f2cb9db6757a7b7a4aa8f345a files/digest-rsync-2.6.1 131
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.9.8 (GNU/Linux)
+
+iD8DBQFA2NoLHTu7gpaalycRAlzRAKCdxz/m54OpslDuvRqtZNjSTiLYRACfRsCk
+MqdBueCuljTvfUX/F/ycLw4=
+=x9I7
+-----END PGP SIGNATURE-----
diff --git a/net-misc/rsync/files/digest-rsync-2.6.1 b/net-misc/rsync/files/digest-rsync-2.6.1
new file mode 100644
index 000000000000..7b09f6f1cc94
--- /dev/null
+++ b/net-misc/rsync/files/digest-rsync-2.6.1
@@ -0,0 +1,2 @@
+MD5 6b1ee6a5878569215204f322ad128775 rsync-2.6.1.tar.gz 511395
+MD5 5b33440e8a22a85b6d00aa86bc4ee508 rsync-2.6.2-acl.diff.bz2 30505
diff --git a/net-misc/rsync/rsync-2.6.1.ebuild b/net-misc/rsync/rsync-2.6.1.ebuild
new file mode 100644
index 000000000000..d5817ede0916
--- /dev/null
+++ b/net-misc/rsync/rsync-2.6.1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/rsync/rsync-2.6.1.ebuild,v 1.1 2004/06/23 01:16:46 vapier Exp $
+
+inherit eutils flag-o-matic gcc
+
+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
+	acl? ( http://www.saout.de/misc/rsync-2.6.2-acl.diff.bz2 )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha arm ~hppa ~amd64 ~ia64 ~ppc64 s390"
+IUSE="build static acl"
+
+RDEPEND="virtual/glibc
+	!build? ( >=dev-libs/popt-1.5 )"
+DEPEND="${RDEPEND}
+	>=sys-apps/sed-4
+	acl? ( sys-apps/acl )"
+
+src_unpack() {
+	unpack "${P}.tar.gz"
+	cd ${S}
+	use acl && epatch ${DISTDIR}/rsync-2.6.2-acl.diff.bz2
+
+	# yes, updating the man page is very important.
+	sed -i \
+		-e 's|/etc/rsyncd|/etc/rsync/rsyncd|g' \
+		rsyncd.conf.5 \
+		|| die "sed rsyncd.conf.5 failed"
+}
+
+src_compile() {
+	[ "`gcc-version`" == "2.95" ] && append-ldflags -lpthread
+	use static && append-ldflags -static
+
+	econf \
+		$(use_with build included-popt) \
+		$(use_with acl acl-support) \
+		$(use_enable ipv6) \
+		--with-rsyncd-conf=/etc/rsync/rsyncd.conf \
+		|| die
+	emake || die "emake failed"
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die "make install failed"
+	insinto /etc/conf.d && newins "${FILESDIR}/rsyncd.conf.d" rsyncd
+	exeinto /etc/init.d && newexe "${FILESDIR}/rsyncd.init.d" rsyncd
+	if ! use build ; then
+		dodir /etc/rsync
+		dodoc NEWS OLDNEWS README TODO tech_report.tex
+		if [ ! -e ${ROOT}/etc/rsync/rsyncd.conf ] ; then
+			insinto /etc/rsync
+			doins "${FILESDIR}/rsyncd.conf"
+		fi
+	else
+		rm -rf "${D}/usr/share"
+	fi
+}
+
+pkg_postinst() {
+	ewarn "Please make sure you do NOT disable the rsync server running"
+	ewarn "in a chroot.  Please check /etc/rsync/rsyncd.conf and make sure"
+	ewarn "it says: use chroot = yes"
+}