[patch] rsync-3.0.9 patch

rsync-prefix.patch (text/plain), 3.36 KB, created by Jeremy Olexa (darkside) (RETIRED) on 2012-02-27 19:13:39 UTC

? files/rsync-3.0.7-mint.patch
Index: rsync-3.0.9.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-misc/rsync/rsync-3.0.9.ebuild,v
retrieving revision 1.1
diff -u -r1.1 rsync-3.0.9.ebuild
--- rsync-3.0.9.ebuild	30 Oct 2011 23:18:05 -0000	1.1
+++ rsync-3.0.9.ebuild	27 Feb 2012 19:09:54 -0000
@@ -2,9 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/net-misc/rsync/rsync-3.0.9.ebuild,v 1.1 2011/10/30 23:18:05 vapier Exp $
 
-EAPI="2"
+EAPI="3"
 
-inherit eutils flag-o-matic
+inherit eutils flag-o-matic prefix
 
 DESCRIPTION="File transfer program to keep remote files into sync"
 HOMEPAGE="http://rsync.samba.org/"
@@ -12,7 +12,7 @@
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="acl iconv ipv6 static xattr"
 
 DEPEND=">=dev-libs/popt-1.5
@@ -24,6 +24,8 @@
 
 src_prepare() {
 	epatch_user
+	epatch "${FILESDIR}"/${PN}-3.0.7-mint.patch
+	eprefixify
 }
 
 src_configure() {
@@ -34,8 +36,7 @@
 		$(use_enable xattr xattr-support) \
 		$(use_enable ipv6) \
 		$(use_enable iconv) \
-		--with-rsyncd-conf=/etc/rsyncd.conf \
-		|| die
+		--with-rsyncd-conf="${EPREFIX}"/etc/rsyncd.conf
 }
 
 src_install() {
@@ -60,7 +61,7 @@
 
 pkg_postinst() {
 	if egrep -qis '^[[:space:]]use chroot[[:space:]]*=[[:space:]]*(no|0|false)' \
-		"${ROOT}"/etc/rsyncd.conf "${ROOT}"/etc/rsync/rsyncd.conf ; then
+		"${EROOT}"/etc/rsyncd.conf "${EROOT}"/etc/rsync/rsyncd.conf ; then
 		ewarn "You have disabled chroot support in your rsyncd.conf.  This"
 		ewarn "is a security risk which you should fix.  Please check your"
 		ewarn "/etc/rsyncd.conf file and fix the setting 'use chroot'."
Index: files/rsyncd.conf
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-misc/rsync/files/rsyncd.conf,v
retrieving revision 1.7
diff -u -r1.7 rsyncd.conf
--- files/rsyncd.conf	23 May 2006 15:16:08 -0000	1.7
+++ files/rsyncd.conf	27 Feb 2012 19:09:54 -0000
@@ -4,12 +4,12 @@
 # See rsync(1) and rsyncd.conf(5) man pages for help
 
 # This line is required by the /etc/init.d/rsyncd script
-pid file = /var/run/rsyncd.pid
+pid file = @GENTOO_PORTAGE_EPREFIX@/var/run/rsyncd.pid
 use chroot = yes
 read only = yes
 
 # Simple example for enabling your own local rsync server
 #[gentoo-portage]
-#	path = /usr/portage
+#	path = @GENTOO_PORTAGE_EPREFIX@/usr/portage
 #	comment = Gentoo Portage tree
 #	exclude = /distfiles /packages
Index: files/rsyncd.xinetd
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-misc/rsync/files/rsyncd.xinetd,v
retrieving revision 1.1
diff -u -r1.1 rsyncd.xinetd
--- files/rsyncd.xinetd	2 Jan 2006 18:56:09 -0000	1.1
+++ files/rsyncd.xinetd	27 Feb 2012 19:09:54 -0000
@@ -4,7 +4,7 @@
 	protocol    = tcp
 	wait        = no
 	user        = root
-	server      = /usr/bin/rsync
+	server      = @GENTOO_PORTAGE_EPREFIX@/usr/bin/rsync
 	server_args = --daemon
 	disable     = yes
 }