[patch] rsync-3.0.9 patch, take 2

rsync-prefix.patch.1 (text/plain), 7.12 KB, created by Jeremy Olexa (darkside) (RETIRED) on 2012-02-27 19:37:52 UTC

Index: Manifest
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-misc/rsync/Manifest,v
retrieving revision 1.267
diff -u -r1.267 Manifest
--- Manifest	30 Oct 2011 23:18:19 -0000	1.267
+++ Manifest	27 Feb 2012 19:35:30 -0000
@@ -1,24 +1,14 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
-AUX rsyncd.conf 405 RMD160 13b8eb7a40c07494580a013b9cafb89a85e0b38b SHA1 0116523e057957814beb3bb913ab1aa916327a88 SHA256 b7dfb2957fa900de915da3667546e3499a952a51c92388abea79244d34a9a815
+AUX rsyncd.conf 453 RMD160 afbece3ae0fbee289db568ef1e09fdbc35e1f0b2 SHA1 9290020e33b423396ec6c8c9e1f10ae762f94d6e SHA256 fff0bc9e6ca76c92d07d4d048e9f93000b0b47301eba71a82af86941b8f30c4b
 AUX rsyncd.conf.d 149 RMD160 0c2d0e34d1467fc0ec460760b49d621231c8e562 SHA1 fda5604306f2342e56cb773d11ba534494a42a61 SHA256 de758791b16b89a648c01867af7f51bc9bd44e40cbe868e439b753ff5d9572e5
 AUX rsyncd.init.d 558 RMD160 856e8d1d54fed649df029f4c12a735e4628d7bcc SHA1 4d217a584f872070062d17d18a5e3d5571e92e0b SHA256 08e620bac216e0acdb56d94198caebd7fd14b0a42e8465b2eb98b7420d369ab6
 AUX rsyncd.logrotate 105 RMD160 427a1f17db691ba9d54b28893d3635597e6c94ff SHA1 a9e7cc0885b33836c950af0073daa383431f8949 SHA256 eb54100686a253d4d14c9c67fcc20f92d88c0616692bffea899c6a8f8f980c7c
-AUX rsyncd.xinetd 170 RMD160 2ce2addea3cfff08f86a168b0d2d83446514a60f SHA1 a2c04b2f3615a474c72f92362337baa366910b20 SHA256 e19e99dc3daa12d5729dd972b637ed064a2b004a1c7fe75c9f2ebb5ab5997aa8
+AUX rsyncd.xinetd 194 RMD160 0547874540416f5c27882d8cbceb167a39e1d2d8 SHA1 d48ef0238a65d871d5d6e982e2842d1e57ba2f4c SHA256 17162f014242c9d5003578bed44b89cd2dc4f0ce2a200ac1facaa10a9aac8692
 DIST rsync-3.0.7.tar.gz 779287 RMD160 aa3bdec0d7692ac1de52f2efc925e9a34bbd917b SHA1 63426a1bc71991d93159cd522521fbacdafb7a61 SHA256 9ee00d16c023c486328cbb61f59928a954b24b7b7173c3517ebb0d6c3edfe7c8
 DIST rsync-3.0.8.tar.gz 790722 RMD160 f00c5ba42e33a1745976c9af5e770c220a6fa4a6 SHA1 10e80173c7e9ed8b8a4dc9e8fdab08402da5f08d SHA256 4b3fc271f4c96036b4c73fb019be078e4d8cce2defe1e7ae7cde1117859a2114
 DIST rsync-3.0.9.tar.gz 792725 RMD160 e5ee8d786defb0d8f937c8d027466f418c63c97e SHA1 c64c8341984aea647506eb504496999fd968ddfc SHA256 30f10f8dd5490d28240d4271bb652b1da7a60b22ed2b9ae28090668de9247c05
 EBUILD rsync-3.0.7-r2.ebuild 2073 RMD160 ec55b6c88aec6c03be61914408188e2cfb783375 SHA1 323ea389355586061aab6a84ebdd13032a09a0d3 SHA256 58381d074282ba09cf72005e301b481982e2fdbdc3cbefa24a2486c025eab507
 EBUILD rsync-3.0.7.ebuild 1818 RMD160 ae50153104de0eceef6604e4b4e7c766fe0a041d SHA1 e0998d6b323fb7a736ccf5d88440789ce88ceb0c SHA256 67840ba994553d506026e474f481eddfe66f6f63144d8293d1cb2a6485cfa4e7
 EBUILD rsync-3.0.8.ebuild 1953 RMD160 b901bb1118ab12c077b0630115c8e40fc916a7c1 SHA1 b5bff9bbc9d8fe66a18374dde1e0e12b7350a426 SHA256 ee881519a8a4e8ec074d8d8fd9e68434a46f0760b194d86ce8a1ea0edfa73263
-EBUILD rsync-3.0.9.ebuild 1939 RMD160 c04e86dad536ab6f57044a5711b4c81204a7023d SHA1 af13e159ac333e49e7288fb1588fb57ba9ee2bf6 SHA256 26a2e8b3f6a7bc58e4cd4345613a479ca1188ed3da87e143109afe4fa8628b52
+EBUILD rsync-3.0.9.ebuild 2236 RMD160 6b10e225ce2a3a82b7641d22dd91a03690caa5fa SHA1 c68e0b356720ccdc2d925c4594e76925b454866e SHA256 c089034f8c409f8e6c2e1fa198e561cc3076c425ea3c6650389eb92fbaf4343f
 MISC ChangeLog 27121 RMD160 797dd6cd2c378d58ab32e9d6f3d138a47fdfec80 SHA1 ee39428823d2bc7c1d578c57e5c8814b0ed07b77 SHA256 1af78d001f55177573f9684395f8e011bac56ba9a701f940ac760065394b426f
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
-
-iF4EAREIAAYFAk6t2yYACgkQaC/OocHi7JajrQD9FZAEprjkorW4QxHTau78ENqf
-GtVGO05ZVg1Sz/ho6WEBAIGakKSgQwlEA3jFzOu8ExceK6Elwh3HXo7CABxn9AMH
-=93ip
------END PGP SIGNATURE-----
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:35:30 -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
@@ -34,8 +34,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() {
@@ -56,11 +55,13 @@
 	exeinto /usr/share/rsync
 	doexe support/* || die
 	rm -f "${D}"/usr/share/rsync/{Makefile*,*.c}
+
+	eprefixify "${D}"/etc/{,xinetd.d}/rsyncd*
 }
 
 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:35:30 -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:35:30 -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
 }