Bump scponly to fix bug 116526.

Package-Manager: portage-2.0.53

5 files changed, 101 insertions, 5 deletions

diff --git a/net-misc/scponly/ChangeLog b/net-misc/scponly/ChangeLog
index 610b947f00f2..b5d2171cef30 100644
--- a/net-misc/scponly/ChangeLog
+++ b/net-misc/scponly/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/scponly
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/scponly/ChangeLog,v 1.14 2005/09/19 23:11:36 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/scponly/ChangeLog,v 1.15 2005/12/26 21:37:23 kloeri Exp $
+
+*scponly-4.2 (26 Dec 2005)
+
+  26 Dec 2005; Bryan Østergaard <kloeri@gentoo.org
+  +files/scponly-4.2-getopt.patch, +scponly-4.2.ebuild:
+  Bump scponly to fix bug 116526.
 
 *scponly-4.1 (19 Sep 2005)
 
diff --git a/net-misc/scponly/Manifest b/net-misc/scponly/Manifest
index bb28c04daefb..56f0e21d5ddd 100644
--- a/net-misc/scponly/Manifest
+++ b/net-misc/scponly/Manifest
@@ -1,7 +1,20 @@
-MD5 48f3604e22751295c07e471844ade2bb scponly-4.0.ebuild 3067
-MD5 dadf22d4d802d59445e6a28a7f7fc934 scponly-4.1.ebuild 1124
-MD5 7810621f18a870c71aa97d3a543f9710 ChangeLog 2239
-MD5 e10a0da4fac2882942ffa8360ccdd921 metadata.xml 201
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 08acb012a5dcc53362bc8e02d0d28093 ChangeLog 2410
 MD5 a1f6bee0be7b749e155d9ec945ce31a4 files/digest-scponly-4.0 59
 MD5 43e0a1f99fd0eb893cf3608c3f1a236d files/digest-scponly-4.1 59
+MD5 1df92190f6908168fb1da4911403352f files/digest-scponly-4.2 59
 MD5 686ea1fd09ee5c0522217845d6bc33cb files/scponly-4.1-gentoo.patch 4634
+MD5 526bdf8f58a4beba8593c2897b315eb0 files/scponly-4.2-getopt.patch 699
+MD5 e10a0da4fac2882942ffa8360ccdd921 metadata.xml 201
+MD5 48f3604e22751295c07e471844ade2bb scponly-4.0.ebuild 3067
+MD5 dadf22d4d802d59445e6a28a7f7fc934 scponly-4.1.ebuild 1124
+MD5 230d78d96118c3fd2cdf530b822c2813 scponly-4.2.ebuild 1148
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDsHD3ugEuf3OQ0akRAnJzAJ9Vdr4AQTW0UMkYDcYIkWSWOg/tgACdGS4b
+pIPD7GX+z4MQi5TMTcuPOs4=
+=J6qu
+-----END PGP SIGNATURE-----
diff --git a/net-misc/scponly/files/digest-scponly-4.2 b/net-misc/scponly/files/digest-scponly-4.2
new file mode 100644
index 000000000000..544d4173cb4a
--- /dev/null
+++ b/net-misc/scponly/files/digest-scponly-4.2
@@ -0,0 +1 @@
+MD5 270dedc527d6fbc68b152b8bb3c8a864 scponly-4.2.tgz 96736
diff --git a/net-misc/scponly/files/scponly-4.2-getopt.patch b/net-misc/scponly/files/scponly-4.2-getopt.patch
new file mode 100644
index 000000000000..f2765cdfb933
--- /dev/null
+++ b/net-misc/scponly/files/scponly-4.2-getopt.patch
@@ -0,0 +1,29 @@
+--- scponly-4.2/helper.c.orig	2005-12-26 20:56:20.000000000 +0100
++++ scponly-4.2/helper.c	2005-12-26 22:05:53.000000000 +0100
+@@ -36,7 +36,9 @@
+ 
+ extern char *optarg;
+ extern int optind;
++#ifdef HAVE_OPTRESET
+ extern int optreset;
++#endif
+ 
+ #ifdef UNIX_COMPAT
+ char* solaris_needs_strsep(char** str, char* delims)
+@@ -156,8 +158,16 @@
+ 				/* 
+ 				 *	now use getopt to look for our problem option
+ 				 */
++				#ifdef HAVE_OPTRESET
++				printf("HAVE_OPTRESET defined\n"),
+ 				optreset=1;
++				#endif
++				#ifdef __GLIBC__
++				printf("__GLIBC defined\n");
++				optind=0;
++				#else
+ 				optind=1;
++				#endif
+ 				/*
+ 				 *	tell getopt to only be strict if the 'opts' is well defined
+ 				 */
diff --git a/net-misc/scponly/scponly-4.2.ebuild b/net-misc/scponly/scponly-4.2.ebuild
new file mode 100644
index 000000000000..07d00da1ae8c
--- /dev/null
+++ b/net-misc/scponly/scponly-4.2.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/scponly/scponly-4.2.ebuild,v 1.1 2005/12/26 21:37:23 kloeri Exp $
+
+inherit eutils
+
+DESCRIPTION="A tiny pseudoshell which only permits scp and sftp"
+HOMEPAGE="http://www.sublimation.org/scponly/"
+SRC_URI="http://www.sublimation.org/scponly/${P}.tgz"
+
+LICENSE="as-is"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE=""
+
+DEPEND="virtual/libc
+	net-misc/openssh"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	epatch ${FILESDIR}/${P}-getopt.patch
+}
+
+src_compile() {
+	PATH="${PATH}:/usr/$(get_libdir)/misc" \
+	econf \
+		--enable-scp-compat \
+		--enable-rsync-compat \
+		--enable-chrooted-binary \
+		|| die "./configure failed"
+#		--enable-svn-compat\ # subversion SCS cli compatibility
+#		--enable-svnserv-compat\ # subversion SCS svnserve compatibility
+	emake || die
+}
+
+src_install() {
+	make DESTDIR=${D} install || die
+
+	dodoc AUTHOR BUILDING-JAILS.TXT CHANGELOG CONTRIB README TODO
+	dodoc setup_chroot.sh
+}
+
+pkg_postinst() {
+	einfo "Setting up chroot in pkg_postinst was removed. Please setup manually."
+}