adding acl patch. closes 48214

4 files changed, 89 insertions, 4 deletions

diff --git a/net-misc/rsync/ChangeLog b/net-misc/rsync/ChangeLog
index 09c9094c475a..01b23a7e34df 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.38 2004/04/12 00:33:26 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/rsync/ChangeLog,v 1.39 2004/04/19 08:29:09 mholzer Exp $
+
+*rsync-2.6.0-r1 (19 Apr 2004)
+
+  19 Apr 2004; Martin Holzer <mholzer@gentoo.org> rsync-2.6.0-r1.ebuild:
+  adding acl patch. closes 48214
 
   11 Apr 2004; Michael Sterrett <mr_bones_@gentoo.org> rsync-2.6.0.ebuild:
   add patch from Sascha Silbe to fix use static linking (bug #47361)
diff --git a/net-misc/rsync/Manifest b/net-misc/rsync/Manifest
index 695b7bd22f4f..964dbab99648 100644
--- a/net-misc/rsync/Manifest
+++ b/net-misc/rsync/Manifest
@@ -1,8 +1,10 @@
-MD5 48f3c237cd5d77ee94cc31ae3a271c68 ChangeLog 5481
-MD5 2b4231199efd5dc8f43008d49ab84680 rsync-2.6.0.ebuild 2262
+MD5 2cb2f6f90bd7859779db69ff0483aa50 ChangeLog 5617
 MD5 b63ae1f7cafa826ca51ad2d9095522a1 rsync-2.5.7.ebuild 2229
-MD5 2b5cd2c75632c28fb6d8a311e8548fa9 files/digest-rsync-2.6.0 136
+MD5 2b4231199efd5dc8f43008d49ab84680 rsync-2.6.0.ebuild 2262
+MD5 b938542acf792dc051bb6a0a20cc0dc7 rsync-2.6.0-r1.ebuild 2433
 MD5 65fa0a7432ef5585d43f6c437bbe117a files/digest-rsync-2.5.7 136
 MD5 20418c507f2e4a8ab2dae4acb26053ec files/rsyncd.conf 188
 MD5 38f45eaed761df27cfa731ce65763e98 files/rsyncd.conf.d 355
 MD5 b87d68fcfff9eb9ae5cdbea3796693c5 files/rsyncd.init.d 423
+MD5 2b5cd2c75632c28fb6d8a311e8548fa9 files/digest-rsync-2.6.0 136
+MD5 e04533ca371c57d742250cc0622c005e files/digest-rsync-2.6.0-r1 204
diff --git a/net-misc/rsync/files/digest-rsync-2.6.0-r1 b/net-misc/rsync/files/digest-rsync-2.6.0-r1
new file mode 100644
index 000000000000..42e8d077802b
--- /dev/null
+++ b/net-misc/rsync/files/digest-rsync-2.6.0-r1
@@ -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/rsync-2.6.0-r1.ebuild b/net-misc/rsync/rsync-2.6.0-r1.ebuild
new file mode 100644
index 000000000000..bf7d5f5ba0b6
--- /dev/null
+++ b/net-misc/rsync/rsync-2.6.0-r1.ebuild
@@ -0,0 +1,75 @@
+# 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.0-r1.ebuild,v 1.1 2004/04/19 08:29:09 mholzer 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/${P}.tar.gz
+	http://www.imada.sdu.dk/~bardur/personal/patches/${PN}-proxy-auth/${PN}-2.5.6-proxy-auth-1.patch
+	acl? ( http://www.saout.de/misc/${P}-acl.diff.bz2 )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha ~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}
+	epatch "${DISTDIR}/${PN}-2.5.6-proxy-auth-1.patch"
+	use acl && epatch ${DISTDIR}/${P}-acl.diff.bz2
+
+	# change confdir to /etc/rsync rather than just /etc (the --sysconfdir
+	# configure option doesn't work
+	sed	-i \
+		-e 's|/etc/rsyncd.conf|/etc/rsync/rsyncd.conf|g' rsync.h \
+			|| die "sed rsync.h failed"
+	# 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
+	export LDFLAGS
+	econf $(use_with build included-popt) \
+		$(use_with acl acl-support) || 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 /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"
+
+	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.'
+}