Bump to 4.3, bug 116526.

(Portage version: 2.0.53)

5 files changed, 86 insertions, 12 deletions

diff --git a/net-misc/scponly/ChangeLog b/net-misc/scponly/ChangeLog
index c0185c487ba6..5a993dec2621 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.18 2005/12/27 02:26:12 halcy0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/scponly/ChangeLog,v 1.19 2005/12/28 09:56:33 kloeri Exp $
+
+*scponly-4.3 (28 Dec 2005)
+
+  28 Dec 2005; Bryan Østergaard <kloeri@gentoo.org
+  +files/scponly-4.3-getopt.patch, +scponly-4.3.ebuild:
+  Bump to 4.3, bug 116526.
 
   27 Dec 2005; Mark Loeser <halcy0n@gentoo.org> scponly-4.2.ebuild:
   Stable on x86; bug #116526
diff --git a/net-misc/scponly/Manifest b/net-misc/scponly/Manifest
index af993defc07e..379002a985ea 100644
--- a/net-misc/scponly/Manifest
+++ b/net-misc/scponly/Manifest
@@ -1,20 +1,13 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 4e1b8123c47478aa8bc96ab7da233cce ChangeLog 2717
+MD5 f0ae99c1a475e9cdea7739d5496d5501 ChangeLog 2881
 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 18902f9bf0f2f546d7bdcf8d96174d8a files/digest-scponly-4.3 59
 MD5 686ea1fd09ee5c0522217845d6bc33cb files/scponly-4.1-gentoo.patch 4634
 MD5 c899ab1f389400eaa4568c416dbcd493 files/scponly-4.2-getopt.patch 625
+MD5 c6b771b0da5de88d90f4715e2fe69e85 files/scponly-4.3-getopt.patch 616
 MD5 e10a0da4fac2882942ffa8360ccdd921 metadata.xml 201
 MD5 48f3604e22751295c07e471844ade2bb scponly-4.0.ebuild 3067
 MD5 dadf22d4d802d59445e6a28a7f7fc934 scponly-4.1.ebuild 1124
 MD5 0e85e30c913d79adb0036280672542dd scponly-4.2.ebuild 1147
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDsKZNCRZPokWLroQRArR8AKCyALAdsWs0IFwjzTn0zHkStdDptwCfRrXm
-x3C1dk2b+nWeUqLLifuIil4=
-=b/0T
------END PGP SIGNATURE-----
+MD5 0e85e30c913d79adb0036280672542dd scponly-4.3.ebuild 1147
diff --git a/net-misc/scponly/files/digest-scponly-4.3 b/net-misc/scponly/files/digest-scponly-4.3
new file mode 100644
index 000000000000..86b72bbb8528
--- /dev/null
+++ b/net-misc/scponly/files/digest-scponly-4.3
@@ -0,0 +1 @@
+MD5 2cef26fe5ed740031a067f189c293e77 scponly-4.3.tgz 94889
diff --git a/net-misc/scponly/files/scponly-4.3-getopt.patch b/net-misc/scponly/files/scponly-4.3-getopt.patch
new file mode 100644
index 000000000000..bed8ea86dd5d
--- /dev/null
+++ b/net-misc/scponly/files/scponly-4.3-getopt.patch
@@ -0,0 +1,27 @@
+--- scponly-4.3/helper.c.orig	2005-12-28 10:23:28.000000000 +0100
++++ scponly-4.3/helper.c	2005-12-28 10:25:21.000000000 +0100
+@@ -39,7 +39,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)
+@@ -160,8 +162,14 @@
+ 				 *	now use getopt to look for our problem option
+ 				 */
+ #ifdef HAVE_GETOPT
++#ifdef HAVE_OPTRESET
+ 				optreset=1;
++#endif
++#ifdef __GLIBC__
++				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.3.ebuild b/net-misc/scponly/scponly-4.3.ebuild
new file mode 100644
index 000000000000..8c33009726cd
--- /dev/null
+++ b/net-misc/scponly/scponly-4.3.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.3.ebuild,v 1.1 2005/12/28 09:56:33 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."
+}