add breakrfc patch (togglable through USE flag) which enables control symbols in filenames (bug #240512)

Package-Manager: portage-2.1.4.5

5 files changed, 76 insertions, 3 deletions

diff --git a/net-ftp/twoftpd/ChangeLog b/net-ftp/twoftpd/ChangeLog
index fc443347d5df..c3d856abe960 100644
--- a/net-ftp/twoftpd/ChangeLog
+++ b/net-ftp/twoftpd/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-ftp/twoftpd
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/twoftpd/ChangeLog,v 1.5 2008/01/25 23:03:22 bangert Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/twoftpd/ChangeLog,v 1.6 2008/11/13 13:00:27 bangert Exp $
+
+*twoftpd-1.21-r1 (13 Nov 2008)
+
+  13 Nov 2008; Thilo Bangert <bangert@gentoo.org>
+  +files/twoftpd-1.21-disable-TELNET_IAC.patch, metadata.xml,
+  +twoftpd-1.21-r1.ebuild:
+  add breakrfc patch (togglable through USE flag) which enables control
+  symbols in filenames (bug #240512)
 
   25 Jan 2008; Thilo Bangert <bangert@gentoo.org> twoftpd-1.21.ebuild:
   use emake - dont dodoc COPYING
diff --git a/net-ftp/twoftpd/Manifest b/net-ftp/twoftpd/Manifest
index cbb25dc73184..39c878ba44f2 100644
--- a/net-ftp/twoftpd/Manifest
+++ b/net-ftp/twoftpd/Manifest
@@ -1,4 +1,6 @@
+AUX twoftpd-1.21-disable-TELNET_IAC.patch 424 RMD160 da1184bff1d6cefb8e19150a8fc61af6fd733f3d SHA1 85c11f12ec5932da42769a115cfbe8816c19088f SHA256 e34cecde652255fa1e63ab821d4f7bf292e54e938c487fa837095347c26c84ac
 DIST twoftpd-1.21.tar.gz 61205 RMD160 b2ac22ce9b7c1f7272110e78ea7daa5517f2723a SHA1 c318ec360c474cecb32193c7c75f5b4336e21034 SHA256 1fc52b20e48d4ef8e18816836b3c2c9a807ef177e6036dd9e1dae102ff48ef29
+EBUILD twoftpd-1.21-r1.ebuild 1177 RMD160 42c4209f1ae2ded894032c4d9d6ff3f485f9e7bd SHA1 338403b4f54a3b5064d089e0192cb22c07eeb60c SHA256 704860496efb2242ec87fc4dc09cbc6a14997f259045848430cdeeb52a47915b
 EBUILD twoftpd-1.21.ebuild 1049 RMD160 d06b14c9b784952ce43378bd3399c9720ad720de SHA1 8c9231f9f37a7d66035cdfa483f0b33b91ff18d3 SHA256 4eaa9495368b671e299f70cdca87bc8501e1f5dc3659ddb4c53823ddb40e1d39
-MISC ChangeLog 769 RMD160 474948fc47a35d6606804c5ecff80a3bfbe65ab2 SHA1 2a30719855c22265f9d8afbc00423a45f9ef3e1a SHA256 d2d0e0adf5d0234381661b017c0ac914a1e2ebd1796ab5858e2f93e5666b08ca
-MISC metadata.xml 558 RMD160 c06dcbed1bc756d6e0201cbc91698ef5d7585a10 SHA1 5f0280ade1b8c75036ef38b97a0e70223734b0a8 SHA256 7d6711d21f6ba6b2ea7fdf7fe07c98cba0aa6ec74837a1afc7c1139950eb7d17
+MISC ChangeLog 1050 RMD160 db0bbb56f36b504baacd8e12fbc6cb0e5d8d84e7 SHA1 ae9c2b5d50d63940cab3bfdff8ed2a9895465919 SHA256 98ece6248b417baf660cb460c37b9f99b0e5c297cbd5a046a6ad4e03f30de846
+MISC metadata.xml 728 RMD160 2a118ebc478868bef0efa9dbb50c892171c38df9 SHA1 bcc9ddfd2d6bab42ad92711661675412a92b84e3 SHA256 08c6e5cefd09ec1f8e795e67e8c73eaf29389bc2a5483db6fb4ab5f893405b5a
diff --git a/net-ftp/twoftpd/files/twoftpd-1.21-disable-TELNET_IAC.patch b/net-ftp/twoftpd/files/twoftpd-1.21-disable-TELNET_IAC.patch
new file mode 100644
index 000000000000..2d2a923ecfb0
--- /dev/null
+++ b/net-ftp/twoftpd/files/twoftpd-1.21-disable-TELNET_IAC.patch
@@ -0,0 +1,14 @@
+diff -uNr twoftpd-1.21.orig/main.c twoftpd-1.21/main.c
+--- twoftpd-1.21.orig/main.c	2006-04-19 02:47:56.000000000 +0300
++++ twoftpd-1.21/main.c	2007-12-16 18:06:08.000000000 +0200
+@@ -119,8 +119,8 @@
+       obuf_flush(&outbuf);
+       saw_esc_respond = 0;
+     }
+-    else if (*byte == TELNET_IAC)
+-      saw_esc = 1;
++//  else if (*byte == TELNET_IAC)
++//    saw_esc = 1;
+     else if (*byte == LF)
+       break;
+     else
diff --git a/net-ftp/twoftpd/metadata.xml b/net-ftp/twoftpd/metadata.xml
index a9e396315390..acc9fd1201ac 100644
--- a/net-ftp/twoftpd/metadata.xml
+++ b/net-ftp/twoftpd/metadata.xml
@@ -10,4 +10,8 @@
 simple, and efficient.  None of the commands can cause execution of other programs,
 and the normal model of execution does a chroot to the logged in user's
 directory immediately after authentication.</longdescription>
+	<use>
+		<flag name='breakrfc'>Break RFC compliance to allow control symbols in
+		filenames (required for some (e.g. cp1251) encodings, use with caution).</flag>
+	</use>
 </pkgmetadata>
diff --git a/net-ftp/twoftpd/twoftpd-1.21-r1.ebuild b/net-ftp/twoftpd/twoftpd-1.21-r1.ebuild
new file mode 100644
index 000000000000..ae2774f68354
--- /dev/null
+++ b/net-ftp/twoftpd/twoftpd-1.21-r1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/twoftpd/twoftpd-1.21-r1.ebuild,v 1.1 2008/11/13 13:00:27 bangert Exp $
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Simple secure efficient FTP server by Bruce Guenter"
+HOMEPAGE="http://untroubled.org/twoftpd/"
+SRC_URI="http://untroubled.org/twoftpd/archive/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86"
+IUSE="breakrfc"
+
+DEPEND="virtual/libc
+		>=dev-libs/bglibs-1.026
+		>=net-libs/cvm-0.32"
+RDEPEND="sys-apps/ucspi-tcp
+		sys-process/daemontools
+		>=net-libs/cvm-0.32"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	use breakrfc && epatch "${FILESDIR}"/${P}-disable-TELNET_IAC.patch
+}
+
+src_compile() {
+	echo "/usr/sbin" > conf-bin
+	echo "/usr/share/man" > conf-man
+	echo "$(tc-getCC) ${CFLAGS} -I/usr/include/bglibs" > conf-cc
+	echo "$(tc-getCC) -s -L/usr/lib/bglibs" > conf-ld
+	emake || die "make failed"
+}
+
+src_install() {
+	dodir /usr/sbin
+	dodir /usr/share/man/man1
+
+	emake install install_prefix="${D}" || die "install failed"
+
+	dodoc ANNOUNCEMENT ChangeLog NEWS README TODO VERSION
+	dodoc twoftpd.run twoftpd-log.run
+}