added support for rsync>=3 (bug #491258)

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0xC2000586

5 files changed, 107 insertions, 15 deletions

diff --git a/app-shells/rssh/ChangeLog b/app-shells/rssh/ChangeLog
index 6481f427de61..d4a9df5a215c 100644
--- a/app-shells/rssh/ChangeLog
+++ b/app-shells/rssh/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-shells/rssh
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/rssh/ChangeLog,v 1.38 2013/11/14 17:49:51 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/rssh/ChangeLog,v 1.39 2013/11/19 05:00:42 ottxor Exp $
+
+*rssh-2.3.4_p3 (19 Nov 2013)
+
+  19 Nov 2013; Christoph Junghans <ottxor@gentoo.org>
+  +files/rssh-2.3.4_p3-autotools.patch, +rssh-2.3.4_p3.ebuild, metadata.xml:
+  added support for rsync>=3 (bug #491258)
 
   14 Nov 2013; Christoph Junghans <ottxor@gentoo.org> rssh-2.3.4.ebuild:
   added epatch_user (related to bug #491258)
diff --git a/app-shells/rssh/Manifest b/app-shells/rssh/Manifest
index 7cc0d494a0fd..5cc8aa1fec95 100644
--- a/app-shells/rssh/Manifest
+++ b/app-shells/rssh/Manifest
@@ -2,20 +2,23 @@
 Hash: SHA256
 
 AUX rssh-2.3.3-envvars.patch 7087 SHA256 d407531c9717306dbd5e1b3bbb587b5ce5d9f6b6440edb51d2d9f6c64401d4b6 SHA512 405b756724a4e4bf1bb43d2994716e35a9eb812b77fcaf51b74a9ceac1bc75cad8e1fe62084134e8da21e2cb7a976498811685c9554fa7d2fce047d5d47af283 WHIRLPOOL abde37ed282a96a0c7f411826c9716e1dda2b76a4a86690e491a99d672fd11c97cc20754045ea275282396c7504ab6e0ac5b03642e02ff1fde3152cfe7f12376
+AUX rssh-2.3.4_p3-autotools.patch 1016 SHA256 1d0ad8bb9ccf6190e82477fe5f008ededfe42fe539b5ffd32958b044da5c45bd SHA512 af3de7f5855d1feb3145684ecfd64fa29716a8d7ca9cf29bfaa0567de1ee32f5aa67bd53f408fcb87bdba94f9501769027f5725b25b8c19dda3250c00a00f228 WHIRLPOOL 072275f009eb660dbe6d2d04a8d6ee63a14f9d4e92e29d8ebf8f0a1ebe87a127fc19968c67c5e4231110e30505f8bb063931aaa8b274a689b660ebe02da04b87
 DIST rssh-2.3.3.tar.gz 119510 SHA256 1940912c2485f8531e4461de06bd2aebc607d2a89805debb7ac81002fa6fd07f SHA512 a5aeeca30217224830ca96acbf257a59c0da602ed541120d7a69695a352dfe6617b9fd8df7340f3363f4f807b47d1db20b60c10dcc8ef3a208968e3f9cb1c3ee WHIRLPOOL 2db29c430880bf37b7daceece8510fef54662cc3d10e75b693c425231d00b55c4d39c75cd539a088c8547d6caf10ff7c3b994c3ff2eb7e606bb3dcecd3362f05
 DIST rssh-2.3.4.tar.gz 113315 SHA256 f30c6a760918a0ed39cf9e49a49a76cb309d7ef1c25a66e77a41e2b1d0b40cd9 SHA512 c1a77abdf4abe5f936fb1c9c008fc81fabf7b624d69ed31fe2ae5619dfa4a79f1d4a4f2daa5291a36d40353fa2168e74e5ba61294230d702fcdc88ae0d520487 WHIRLPOOL a2fa86922780bdc5f34536aa5840a76902841024b0bc35220098e9d40e087c28578c37417c92ffca5035898c47f50d5de5d18609a3087ceb25eb532bd6b26092
+DIST rssh_2.3.4-3.debian.tar.xz 27364 SHA256 077b304c423349f2771207b0da20b0aef4a8e5baa9c51dcacd37fe2134bee70b SHA512 963d51c0a806090f8008b1f83ca3a0bc271f789e1388c4f4de993e61d705458be4163ba74ebb4fccea454b6ab08239b0a7c2b067bfe7ab222033b9785cb79a90 WHIRLPOOL 127f922d7595c3f3dc68be7b87f2b4043fa433c1e115232b6bac35cc924b280f161c976ab59cca92da846653ea4b5d5c3e33592e4f72593ec8dd07bd6c891c34
 EBUILD rssh-2.3.3-r2.ebuild 886 SHA256 cb4e1c273027b3335a869785a8f37800af17140543729e28fd85d3023a1d92d4 SHA512 9bb707b550b5866b13d7f04664272499938878f477604a99c681be4d700abcfc843c1d1320e8682ae4f4f96fd69ed25598399043a28d1d97c490cf0386d88ca3 WHIRLPOOL 7bac2858f5337ac434fdc196ea0d5f5d16b413ec829fa684cd0644a76f06d39cde3dffa839805b36d46cf0e5cd34dd5a9ddb2efb195c61e8c1d2a2b5c5c89d0c
 EBUILD rssh-2.3.4.ebuild 952 SHA256 af094a4ea3e5b6fd84e4404f386f2fa9a58857a57afb4b4794b255433eea6485 SHA512 b057eaac673a36519846dbc21906cbd3d00c14a7d46b025c6d6c68ca01e2af9590ab7480a0cbce1f2e148a473d7fcfa7a97fe71864905282602dd1afe9730828 WHIRLPOOL 477ee4dd216ebc06a5e3baff4d97a10c08d2294e698da9dbd78c2199a425583fb69bfa8fb22b9088df15e86bbf3cfc20a16d592e27138c7ae537df019ff8ff68
-MISC ChangeLog 4666 SHA256 1143660cc39b39c6cb129e11b96c0ee704c4036be78bcfe034a3be8697831734 SHA512 859f5136d40e70f172911c123ae53dfde3b05beeb72f9d40eb2579a503456544417cb2ba25a4403c417dd53803a853ceea523c936a483e743d74a4f847173a0e WHIRLPOOL a2ea8327c3e1dd5b57fa6b7b8a269cc709a1c0c193de00823eb671a39119db376b68dd6c12d44a6ffd2c95671868d52cf00debaeea98b9013d324db730ba6902
-MISC metadata.xml 272 SHA256 0c365913714b5beca9b01b87b60c5fba58bd64d4f17dbd9a4e64868deb580883 SHA512 d2da213b9baf03d4f971320319f676e2908cebca4b8074fef4ccd21548667ebcabdd4a176285be4b780c332cb7aa7069f3622752a10714ebdf1f34ba955c77cc WHIRLPOOL 3d18689d59870ee8c1ba8ee8312a17ec01e4f99ccecc69ce09fe468f1c5bcc53ddb11969243e794abab7f80837beac4fcd256daecfc3155c6bd784a9af60d06b
+EBUILD rssh-2.3.4_p3.ebuild 1375 SHA256 90636b27d15277dae9dbe64b0c379f544acfec5ebc956fef8175ec77d29f5f4d SHA512 3a1d2bde3399dd8e8ac5b556cc1253f24346f97fe4984f71cac3f1357c2607d7dde886091aedc3af047710c0bb1bd6bf98b5b5794e424186a966ef178ab7a671 WHIRLPOOL 97cdb82b800c236b66ed7dea064756ec2ac30fbaaf428d15e9d3a4b09424c8511b3d588955e64b18ef45cc462ebaacf0d43bd0151db69d1737d0dcee079005db
+MISC ChangeLog 4871 SHA256 aa101206b8591793181792ced6b54377ab3c7793294907757b28d0b24a12f08f SHA512 d2e90c3473e8197858d2bef96a28c525493d63439da90c0fb4777b12d2c2a3f15e083184b1db048de34cbae23561fce3d8f30cc460bd58989bbf6052828d3396 WHIRLPOOL 5f1b1f4431ab5832d17c1c77e13a482788fa3f269cb272b764458648dd5b4a3c09bed4a1b91a246fbc430dce4505329ae32f4bb587484f6f3b9587b78d10c96d
+MISC metadata.xml 343 SHA256 7a89623eb5da019ba5c106cbae30f4e88342a687b0016ccae623c4647fbf12e8 SHA512 81f7ab63a9591463576d4b95e73f6d48150def8c35590075b69ff22aa6df93f07298ff712116271a921331595a655dc5bfe3d20d706b528a15c47632330250a8 WHIRLPOOL d1e869c891dc5b12a133e11e4deb639ceabcfa825572df2110f6ddc97def6b6b7d17e89d20ec9136b22d2c60419c0d0e3a0499fb460a82eff96a17dc8e27a12f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJShQ1FAAoJEOeBhlrCAAWGVG8H/1PAAeo0fKj8FZyiaVVC6dLp
-Sf085H7bQIrK3DC3t9prE3bRJ9RnB5xJB+e59X8pucS9m/LPmFiMjqPzAhf8ZhgZ
-Wo8PSobTi2PTBrcmCW2QWFV6U4IrlvogGX5SpBeelHOnTRAUAZD7h68EDNi/V7OD
-Yeai4HQ6FPXMM9m+XBc03mKgsdmLZS6aZC7Xc7bDDA7Y+V1F0ThrxuYlJyuW6yk4
-SdgSisO2jc0zzvRqkGZgmrXWMYmlLX8A97OZVjvPQdv3W3P63S1uBWL9SJuaFnrc
-Kg4BJVb3+2RusDoVtp9kLhTLCGl0NX7DPemKph3ujz0L5//X9L8+otEYSt6MXk0=
-=hZ/a
+iQEcBAEBCAAGBQJSivB8AAoJEOeBhlrCAAWGwQgH/3/a8+bKvmAuJUBaTDEtutMk
+hSnnK40ToB2V8G0oSJ7dBy5lwISMGS6LaMtVeXeR3oDcVcUMsG1o+uXsms/gs52A
+dnFpDHIlceOAEzvqFDHstuC6SS1xCbeoGSYev/4+diY/IHO2PEwpC5FLDhaWanp9
+z0YAaPsU9nsOBL+Rz4QYiiD8itybAvJQHJrNhHj+K+oRw8SrhkwcTjHAV9/cl1VT
+xhmuFMSTNu9VBosLrCoXMCMjZJprL/4AIZtT5/XTIkfVX2daOvymiXDBuVn9i490
+rtNdafMYqaXjmpFcP3sfrwJbG7H51kncdRBUJVr1OZx2mREIviLe1VwB6NpYWZE=
+=M52O
 -----END PGP SIGNATURE-----
diff --git a/app-shells/rssh/files/rssh-2.3.4_p3-autotools.patch b/app-shells/rssh/files/rssh-2.3.4_p3-autotools.patch
new file mode 100644
index 000000000000..8030eda525f3
--- /dev/null
+++ b/app-shells/rssh/files/rssh-2.3.4_p3-autotools.patch
@@ -0,0 +1,33 @@
+diff -Naur rssh-2.3.4.orig/configure.ac rssh-2.3.4/configure.ac
+--- rssh-2.3.4.orig/configure.ac	2013-11-15 16:11:21.301056547 -0700
++++ rssh-2.3.4/configure.ac	2013-11-15 16:11:51.471424233 -0700
+@@ -13,12 +13,6 @@
+ AC_PROG_MAKE_SET
+ AC_CHECK_TOOL([STRIP],[strip])
+ 
+-if test yes = "$GCC" ; then
+-       defcflags="-O2 -Wall -Wshadow"
+-else
+-       echo "Using default flags"
+-fi
+-
+ # Checks for libraries.
+ 
+ # Checks for header files.
+diff -Naur rssh-2.3.4.orig/Makefile.am rssh-2.3.4/Makefile.am
+--- rssh-2.3.4.orig/Makefile.am	2013-11-15 16:11:21.301056547 -0700
++++ rssh-2.3.4/Makefile.am	2013-11-15 16:12:28.581876494 -0700
+@@ -15,7 +15,7 @@
+ base=`echo @PACKAGE_STRING@|tr " " "-"`
+ 
+ install-exec-hook:
+-	chmod u+s $(libexecdir)/rssh_chroot_helper
++	chmod u+s $(DESTDIR)/$(libexecdir)/rssh_chroot_helper
+ 
+ rpm:	dist
+ 	rpmbuild -ta --sign $(base).tar.gz
+@@ -24,3 +24,4 @@
+ 	gpg -ba --default-key ddm@pizzashack.org $(base).tar.gz
+ 	mv $(base).tar.gz.asc $(base).tar.gz.sig
+ 
++AM_CPPFLAGS += -I. -I$(srcdir)
diff --git a/app-shells/rssh/metadata.xml b/app-shells/rssh/metadata.xml
index 6f229cf9eedf..75b1c5a42744 100644
--- a/app-shells/rssh/metadata.xml
+++ b/app-shells/rssh/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>proxy-maintainers</herd>
-<maintainer>
-	<email>opensource@andmarios.com</email>
-	<name>Marios Andreopoulos</name>
-</maintainer>
+	<maintainer>
+		<email>opensource@andmarios.com</email>
+		<name>Marios Andreopoulos</name>
+	</maintainer>
+	<maintainer>
+		<email>ottxor@gentoo.org</email>
+		<name>Christoph Junghans</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-shells/rssh/rssh-2.3.4_p3.ebuild b/app-shells/rssh/rssh-2.3.4_p3.ebuild
new file mode 100644
index 000000000000..9249a3797ddd
--- /dev/null
+++ b/app-shells/rssh/rssh-2.3.4_p3.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-shells/rssh/rssh-2.3.4_p3.ebuild,v 1.1 2013/11/19 05:00:42 ottxor Exp $
+
+EAPI=5
+inherit autotools-utils multilib
+
+DESCRIPTION="Restricted shell for SSHd"
+HOMEPAGE="http://rssh.sourceforge.net/"
+MY_P="${P/%_p*}"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz
+	mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV/_p/-}.debian.tar.xz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~x86"
+IUSE="static subversion"
+
+RDEPEND="virtual/ssh"
+
+S="${WORKDIR}/${MY_P}"
+DOCS=( AUTHORS ChangeLog CHROOT INSTALL README TODO )
+
+src_prepare() {
+	epatch "${WORKDIR}"/debian/patches/fixes/*.diff "${FILESDIR}/${P}"-autotools.patch
+	use subversion && epatch "${WORKDIR}"/debian/patches/features/subversion.diff
+	AUTOTOOLS_AUTORECONF=1 autotools-utils_src_prepare #due to debian patches
+}
+
+src_configure() {
+	local myeconfargs=(
+		--libexecdir="/usr/$(get_libdir)/misc"
+		--with-scp=/usr/bin/scp
+		--with-sftp-server="/usr/$(get_libdir)/misc/sftp-server"
+		$(use_enable static)
+	)
+	autotools-utils_src_configure
+}
+
+src_install() {
+	autotools-utils_src_install
+	if use subversion && [[ -f "${EROOT}"/etc/rssh.conf ]]; then
+		awk -f conf_convert "${EROOT}"/etc/rssh.conf > "${T}/rssh.conf" || die
+		insinto /etc
+		doins "${T}/rssh.conf"
+	fi
+}