revision bump to support Gentoo Prefix. EAPI, KEYWORDS, EPREFIX/ED/EROOT usage, new files in FILESDIR. Bug 406061

Package-Manager: portage-2.1.10.44/cvs/Linux i686

5 files changed, 106 insertions, 12 deletions

diff --git a/net-misc/rsync/ChangeLog b/net-misc/rsync/ChangeLog
index d2ae573c48f8..15cca424e029 100644
--- a/net-misc/rsync/ChangeLog
+++ b/net-misc/rsync/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-misc/rsync
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/rsync/ChangeLog,v 1.216 2012/02/28 18:07:20 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/rsync/ChangeLog,v 1.217 2012/02/28 19:34:07 darkside Exp $
+
+*rsync-3.0.9-r1 (28 Feb 2012)
+
+  28 Feb 2012; Jeremy Olexa <darkside@gentoo.org> +files/rsyncd.conf-3.0.9-r1,
+  +files/rsyncd.xinetd-3.0.9-r1, +rsync-3.0.9-r1.ebuild:
+  revision bump to support Gentoo Prefix. EAPI, KEYWORDS, EPREFIX/ED/EROOT
+  usage, new files in FILESDIR. Bug 406061
 
   28 Feb 2012; Jeroen Roovers <jer@gentoo.org> rsync-3.0.9.ebuild:
   Stable for HPPA (bug #406055).
diff --git a/net-misc/rsync/Manifest b/net-misc/rsync/Manifest
index 207940964969..fdba65e6cfa6 100644
--- a/net-misc/rsync/Manifest
+++ b/net-misc/rsync/Manifest
@@ -1,24 +1,17 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX rsyncd.conf 405 RMD160 13b8eb7a40c07494580a013b9cafb89a85e0b38b SHA1 0116523e057957814beb3bb913ab1aa916327a88 SHA256 b7dfb2957fa900de915da3667546e3499a952a51c92388abea79244d34a9a815
+AUX rsyncd.conf-3.0.9-r1 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-3.0.9-r1 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-r1.ebuild 2211 RMD160 c601be28970dd24c615351b1e2c05b073e1b2504 SHA1 663ec6c3fd33c497f005f530045062a8798b54e7 SHA256 f0640948ce8520253940e47f00e862f9acc908201c6835fbfdcc0f9589d824d4
 EBUILD rsync-3.0.9.ebuild 1934 RMD160 98c093a7a2f59e651b87574ee609b206163068d6 SHA1 671b99e0ba7bbab532f68c77f9fdea176faa6455 SHA256 8422055ae830f80d242f3fea9603a3689b95642b1a7cb60fba012567695e0382
-MISC ChangeLog 27317 RMD160 58570eac3989f50b95bc8a4a3707861d760cc840 SHA1 0fe75aab1d1cc8e93a4f0802b3621cb2b88dbd72 SHA256 67c7dd8d5604bb24ba7fc34901740c18b0fdbe162879958450a2ef9de7fb0d3f
+MISC ChangeLog 27608 RMD160 a6fc2ced47e466cf33dbd0e93ceccfb1d32e2ea4 SHA1 02a29212725680eb37cd7088d195d33e495ff90d SHA256 acc61f1967fe616fdfb0b07cccb4ddba8d7a66ae9f65925e6f76089937f4f0c6
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iEYEARECAAYFAk9NF94ACgkQVWmRsqeSphNPdQCeI5DjlkSYnUvLIQrsQTG+n6vj
-meYAnRdSRsEGcj/kdAlUlKaJ38CgWnNb
-=E+hw
------END PGP SIGNATURE-----
diff --git a/net-misc/rsync/files/rsyncd.conf-3.0.9-r1 b/net-misc/rsync/files/rsyncd.conf-3.0.9-r1
new file mode 100644
index 000000000000..168325cd511f
--- /dev/null
+++ b/net-misc/rsync/files/rsyncd.conf-3.0.9-r1
@@ -0,0 +1,15 @@
+# /etc/rsyncd.conf
+
+# Minimal configuration file for rsync daemon
+# See rsync(1) and rsyncd.conf(5) man pages for help
+
+# This line is required by the /etc/init.d/rsyncd script
+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 = @GENTOO_PORTAGE_EPREFIX@/usr/portage
+#	comment = Gentoo Portage tree
+#	exclude = /distfiles /packages
diff --git a/net-misc/rsync/files/rsyncd.xinetd-3.0.9-r1 b/net-misc/rsync/files/rsyncd.xinetd-3.0.9-r1
new file mode 100644
index 000000000000..90d07f0710ba
--- /dev/null
+++ b/net-misc/rsync/files/rsyncd.xinetd-3.0.9-r1
@@ -0,0 +1,10 @@
+service rsync
+{
+	socket_type = stream
+	protocol    = tcp
+	wait        = no
+	user        = root
+	server      = @GENTOO_PORTAGE_EPREFIX@/usr/bin/rsync
+	server_args = --daemon
+	disable     = yes
+}
diff --git a/net-misc/rsync/rsync-3.0.9-r1.ebuild b/net-misc/rsync/rsync-3.0.9-r1.ebuild
new file mode 100644
index 000000000000..ba7af77900b7
--- /dev/null
+++ b/net-misc/rsync/rsync-3.0.9-r1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/rsync/rsync-3.0.9-r1.ebuild,v 1.1 2012/02/28 19:34:07 darkside Exp $
+
+EAPI="4"
+
+inherit eutils flag-o-matic prefix
+
+DESCRIPTION="File transfer program to keep remote files into sync"
+HOMEPAGE="http://rsync.samba.org/"
+SRC_URI="http://rsync.samba.org/ftp/rsync/src/${P/_/}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+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
+	acl? ( virtual/acl )
+	xattr? ( kernel_linux? ( sys-apps/attr ) )
+	iconv? ( virtual/libiconv )"
+
+S=${WORKDIR}/${P/_/}
+
+src_prepare() {
+	epatch_user
+}
+
+src_configure() {
+	use static && append-ldflags -static
+	econf \
+		--without-included-popt \
+		$(use_enable acl acl-support) \
+		$(use_enable xattr xattr-support) \
+		$(use_enable ipv6) \
+		$(use_enable iconv) \
+		--with-rsyncd-conf="${EPREFIX}"/etc/rsyncd.conf
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	newconfd "${FILESDIR}"/rsyncd.conf.d rsyncd
+	newinitd "${FILESDIR}"/rsyncd.init.d rsyncd
+	dodoc NEWS OLDNEWS README TODO tech_report.tex
+	insinto /etc
+	newins "${FILESDIR}"/rsyncd.conf-3.0.9-r1 rsyncd.conf
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/rsyncd.logrotate rsyncd
+
+	insinto /etc/xinetd.d
+	newins "${FILESDIR}"/rsyncd.xinetd-3.0.9-r1 rsyncd
+
+	# Install the useful contrib scripts
+	exeinto /usr/share/rsync
+	doexe support/*
+	rm -f "${ED}"/usr/share/rsync/{Makefile*,*.c}
+
+	eprefixify "${ED}"/etc/{,xinetd.d}/rsyncd*
+}
+
+pkg_postinst() {
+	if egrep -qis '^[[:space:]]use chroot[[:space:]]*=[[:space:]]*(no|0|false)' \
+		"${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'."
+	fi
+}