Fix from upstream for using --delete with USE=acl #158130 by Thomas Fleischmann.

Package-Manager: portage-2.1.2_rc3

5 files changed, 153 insertions, 8 deletions

diff --git a/net-misc/rsync/ChangeLog b/net-misc/rsync/ChangeLog
index dc6ee61ffaa2..9d9ed15f6cf5 100644
--- a/net-misc/rsync/ChangeLog
+++ b/net-misc/rsync/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-misc/rsync
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/rsync/ChangeLog,v 1.111 2006/12/14 16:11:42 eroyf Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/rsync/ChangeLog,v 1.112 2006/12/16 08:37:09 vapier Exp $
+
+*rsync-2.6.9-r1 (16 Dec 2006)
+
+  16 Dec 2006; Mike Frysinger <vapier@gentoo.org>
+  +files/rsync-2.6.9-delete-acls-xattr.patch, +rsync-2.6.9-r1.ebuild:
+  Fix from upstream for using --delete with USE=acl #158130 by Thomas
+  Fleischmann.
 
   14 Dec 2006; Alexander H. Færøy <eroyf@gentoo.org> rsync-2.6.9.ebuild:
   Stable on Alpha and MIPS; bug #157977
diff --git a/net-misc/rsync/Manifest b/net-misc/rsync/Manifest
index 916f2f57ec92..5791de602d59 100644
--- a/net-misc/rsync/Manifest
+++ b/net-misc/rsync/Manifest
@@ -25,6 +25,10 @@ AUX rsync-2.6.8-verbose-quiet-output.patch 847 RMD160 352ab2a28eb0aa005898008f70
 MD5 6c75385d66a928d373c5470d4d8b46e0 files/rsync-2.6.8-verbose-quiet-output.patch 847
 RMD160 352ab2a28eb0aa005898008f70ea17e54d722eaa files/rsync-2.6.8-verbose-quiet-output.patch 847
 SHA256 0987707ae319ef35380324a10b264324e7cce0491e700b457381989c97bc7f1d files/rsync-2.6.8-verbose-quiet-output.patch 847
+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-pathsanitize.patch 235 RMD160 e46d645399841334f46de9ff81f9c0a13d392820 SHA1 1f5d55c55f0e949bc938c02f52be4d750ab11aa3 SHA256 216b5d18c9eed9c5c18e445a3dd64a6b22e6d0c0fdb33f7a06d1d62d08fbdd61
 MD5 b8cb6d507de74f71738f0f50774c35d0 files/rsync-pathsanitize.patch 235
 RMD160 e46d645399841334f46de9ff81f9c0a13d392820 files/rsync-pathsanitize.patch 235
@@ -58,14 +62,18 @@ EBUILD rsync-2.6.8-r2.ebuild 2270 RMD160 44a73145d22c23468ad1ec91fd8e24eb22fd4ed
 MD5 a279db18baad7b1e5c0ed9c35db138c1 rsync-2.6.8-r2.ebuild 2270
 RMD160 44a73145d22c23468ad1ec91fd8e24eb22fd4edd rsync-2.6.8-r2.ebuild 2270
 SHA256 d8ad27198f50f73e248ebc95fe1f5be9e75e7e55ee888b12a14d3df7ef0a2275 rsync-2.6.8-r2.ebuild 2270
+EBUILD rsync-2.6.9-r1.ebuild 2110 RMD160 a40b9344b123d0f8c1f82c3f1e94349de98f20e9 SHA1 6d27d51a2361b1c451cc31ad1a3ad8595115cf70 SHA256 c8fdbe6144001e1e2431f355dc6c81df1b7fe8cd5c697247cbf4e4cf26ae49b0
+MD5 ba36f91cab8302d2a688c99101f0a093 rsync-2.6.9-r1.ebuild 2110
+RMD160 a40b9344b123d0f8c1f82c3f1e94349de98f20e9 rsync-2.6.9-r1.ebuild 2110
+SHA256 c8fdbe6144001e1e2431f355dc6c81df1b7fe8cd5c697247cbf4e4cf26ae49b0 rsync-2.6.9-r1.ebuild 2110
 EBUILD rsync-2.6.9.ebuild 2081 RMD160 6147261349e9dbb69bb30a70b142296b8a213ce9 SHA1 148154489973e2520be424843a95ed15df14c92a SHA256 7cb850a31b96810ef156b394544d57607df2065fcb52845f088a91a04dc73826
 MD5 8608efa2df876f0e0c1ea91706633924 rsync-2.6.9.ebuild 2081
 RMD160 6147261349e9dbb69bb30a70b142296b8a213ce9 rsync-2.6.9.ebuild 2081
 SHA256 7cb850a31b96810ef156b394544d57607df2065fcb52845f088a91a04dc73826 rsync-2.6.9.ebuild 2081
-MISC ChangeLog 14320 RMD160 ac31139473f547002e89890984f11ca727763916 SHA1 4884cad0ca2d3bdebfdfb8831a912c7723da9075 SHA256 070bab1a10f1fde772b42113c64c48a71346154735b0f638f05a3e3051659b1b
-MD5 380b388d7aff920f2915e04134634389 ChangeLog 14320
-RMD160 ac31139473f547002e89890984f11ca727763916 ChangeLog 14320
-SHA256 070bab1a10f1fde772b42113c64c48a71346154735b0f638f05a3e3051659b1b ChangeLog 14320
+MISC ChangeLog 14558 RMD160 b4f4276d6ea8e4299ea91de5100dcd85b6eff8c5 SHA1 d65aef9b532c3df502148d6464e03441e351039f SHA256 886d19897f544d909d7efa2af619f62c56a660402715363005a62a7a0f6e184d
+MD5 ff69367c0f701b78421eb56cdd1c5c8a ChangeLog 14558
+RMD160 b4f4276d6ea8e4299ea91de5100dcd85b6eff8c5 ChangeLog 14558
+SHA256 886d19897f544d909d7efa2af619f62c56a660402715363005a62a7a0f6e184d ChangeLog 14558
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164
@@ -79,10 +87,13 @@ SHA256 db6586c22adcb91ef50be62ec39d19e233d47868c93d087780853c657c356a4c files/di
 MD5 b7c43d63ebd1fc4f11b181745ce98f96 files/digest-rsync-2.6.9 235
 RMD160 38e28736f704de5bceb9edf25034693e0192118d files/digest-rsync-2.6.9 235
 SHA256 3b24d2cc4f4676a8760a13ad08252df7317ca597118a290a51f624d099b00044 files/digest-rsync-2.6.9 235
+MD5 b7c43d63ebd1fc4f11b181745ce98f96 files/digest-rsync-2.6.9-r1 235
+RMD160 38e28736f704de5bceb9edf25034693e0192118d files/digest-rsync-2.6.9-r1 235
+SHA256 3b24d2cc4f4676a8760a13ad08252df7317ca597118a290a51f624d099b00044 files/digest-rsync-2.6.9-r1 235
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFgXev6Xxn2nLwtdQRAqp4AJ9+JDE2ez8tdmrIAYj1vzmfFV0nZgCg0JXD
-0Qhdn3JLyzUB8KChNRI7pO0=
-=1uZr
+iD8DBQFFg7B+K9sYciBdMQMRAk7YAJ419PI0kL3XGZ0J3lpo269aUHsBNQCggMuo
+nxgI7VspO9IsRqQhkWRnOR4=
+=SMe0
 -----END PGP SIGNATURE-----
diff --git a/net-misc/rsync/files/digest-rsync-2.6.9-r1 b/net-misc/rsync/files/digest-rsync-2.6.9-r1
new file mode 100644
index 000000000000..fca949e58851
--- /dev/null
+++ b/net-misc/rsync/files/digest-rsync-2.6.9-r1
@@ -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-delete-acls-xattr.patch b/net-misc/rsync/files/rsync-2.6.9-delete-acls-xattr.patch
new file mode 100644
index 000000000000..5fcac75fb3cd
--- /dev/null
+++ b/net-misc/rsync/files/rsync-2.6.9-delete-acls-xattr.patch
@@ -0,0 +1,50 @@
+fix from upstream for using --delete with acls/xattrs
+
+http://www.mail-archive.com/rsync@lists.samba.org/msg17506.html
+http://bugs.gentoo.org/158130
+
+--- rsync/flist.c
++++ rsync/flist.c
+@@ -998,7 +998,7 @@
+ 		file->mode = tweak_mode(file->mode, chmod_modes);
+ 
+ #ifdef SUPPORT_ACLS
+-	if (preserve_acls) {
++	if (preserve_acls && f >= 0) {
+ 		sx.st.st_mode = file->mode;
+ 		sx.acc_acl = sx.def_acl = NULL;
+ 		if (get_acl(fname, &sx) < 0)
+@@ -1006,7 +1006,7 @@
+ 	}
+ #endif
+ #ifdef SUPPORT_XATTRS
+-	if (preserve_xattrs) {
++	if (preserve_xattrs && f >= 0) {
+ 		sx.xattr = NULL;
+ 		if (get_xattr(fname, &sx) < 0)
+ 			return NULL;
+@@ -1021,20 +1021,20 @@
+ 		flist->files[flist->count++] = file;
+ 		send_file_entry(file, f);
+ #ifdef SUPPORT_ACLS
+-		if (preserve_acls)
++		if (preserve_acls && f >= 0)
+ 			send_acl(&sx, f);
+ #endif
+ #ifdef SUPPORT_XATTRS
+-		if (preserve_xattrs)
++		if (preserve_xattrs && f >= 0)
+ 			send_xattr(&sx, f);
+ #endif
+ 	} else {
+ #ifdef SUPPORT_ACLS
+-		if (preserve_acls)
++		if (preserve_acls && f >= 0)
+ 			free_acl(&sx);
+ #endif
+ #ifdef SUPPORT_XATTRS
+-		if (preserve_xattrs)
++		if (preserve_xattrs && f >= 0)
+ 			free_xattr(&sx);
+ #endif
+ 	}
diff --git a/net-misc/rsync/rsync-2.6.9-r1.ebuild b/net-misc/rsync/rsync-2.6.9-r1.ebuild
new file mode 100644
index 000000000000..68a4e9120364
--- /dev/null
+++ b/net-misc/rsync/rsync-2.6.9-r1.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2006 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-r1.ebuild,v 1.1 2006/12/16 08:37:09 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"
+
+RDEPEND=">=dev-libs/popt-1.5
+	acl? ( kernel_linux? ( sys-apps/acl ) )"
+DEPEND="${RDEPEND}
+	>=sys-apps/portage-2.0.51"
+
+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
+}
+
+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"
+}