Fix timeout crashes and error message. Add a note about passive behavior and default network settings.

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xD2E96200

6 files changed, 123 insertions, 16 deletions

diff --git a/net-ftp/oftpd/ChangeLog b/net-ftp/oftpd/ChangeLog
index e3ebe0385de2..ec8eefea2356 100644
--- a/net-ftp/oftpd/ChangeLog
+++ b/net-ftp/oftpd/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-ftp/oftpd
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/oftpd/ChangeLog,v 1.40 2014/03/29 20:58:11 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/oftpd/ChangeLog,v 1.41 2014/04/07 12:32:25 vapier Exp $
+
+*oftpd-0.3.7-r10 (07 Apr 2014)
+
+  07 Apr 2014; Mike Frysinger <vapier@gentoo.org>
+  +files/oftpd-0.3.7-error-output.patch,
+  +files/oftpd-0.3.7-pthread-cancel.patch, +oftpd-0.3.7-r10.ebuild,
+  files/conf.d.oftpd-r7:
+  Fix timeout crashes and error message.  Add a note about passive behavior and
+  default network settings.
 
 *oftpd-0.3.7-r9 (29 Mar 2014)
 
diff --git a/net-ftp/oftpd/Manifest b/net-ftp/oftpd/Manifest
index aefa9d7b43e8..200d10b9e708 100644
--- a/net-ftp/oftpd/Manifest
+++ b/net-ftp/oftpd/Manifest
@@ -1,34 +1,37 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX conf.d.oftpd-r7 678 SHA256 0446272c764feb3055a1faee84a0690e172a38c7c0406ca7d23bfdee98e7f3e0 SHA512 36efb9e6fb4fb64dc0a55cb8db7d8b83fe40b6d98bf5c7c963587890548afec3eb63d1491c1d362855339c35333d92899450438bf71e5a1975c942270c9a24e3 WHIRLPOOL 4dbadf3b5299099f334c276e5367fc1134e7d706039f1d5fd56bd572290887dbfefcaa56d85cf4dd5ffaedcd21713e99da0a6b69bc2b2bee8feff50565656543
+AUX conf.d.oftpd-r7 978 SHA256 e0df1e91dd525a035a4c7e9756853c5eea07b0ceb2ebbd2924fb28f013feb866 SHA512 6f864b2a6010cd81e0f767bc769200a26793540f77f95deb4678254d48acb93814eb214e4d3df46825c647483fac1bfcbdfd1c32d4da11af6596331408f75e0f WHIRLPOOL 6028f3b164cabce48699f132eb9f178aadec14b911846f729522e9f0b79dcce3f54fdb919ea4e9fe5dd1756697a6d9352c8fbfd707a4af4626e3d761f53da58f
 AUX init.d.oftpd-r7 632 SHA256 197817aa4897233863ce9afa75ce5c785f646192f94aa2324e1ea6d7708ed798 SHA512 c1bb736e856a67258ce89ad696e7d568469cc44a7344bdf46601ced218e6ce88a201565b2ca3fab3d53f3d70bc741c472415f7a74b0e80e8b0c84df0253339f2 WHIRLPOOL 89e3739d1b32d2fe63ff9e63f6c435a338a31d66f015dd4fe29c4ef2d52df5383dfdb2cfc8e12c1f22ea5eebf84f31942446eea55721dfb324bb186d90f19b18
 AUX oftpd-0.3.7-delay-root-check.patch 778 SHA256 782899dbbfa31db0cc772281576113f56e7f33fb02265d868ef05dfd46ebcfe4 SHA512 ea420fdec8df42d6482bf41409571769b1f4011e2bcf9157cd32f68c68c582edd0908cb13286618248647922023f72b029a4523464ce15a5adbfa4ce0bb9f326 WHIRLPOOL b94d68ea5e29a81240c42719dec68d67078473e3bb7fc05a9932f684368fa909bfe27eeaee5bee8e3c96ff945582632faed8faf6def7a86982c3769470d35f6d
+AUX oftpd-0.3.7-error-output.patch 706 SHA256 aa33fb9ac511895158ed78fc4a4b1984cb7f9ed407f3cd958c3f47d8662d82ca SHA512 36c996038784a0e6b6a17e1f52c346dde741f812588254441c3419f0859daf63c75135e156684f014a576315560da0227aa184870edb3a0c95a18968d9e62a52 WHIRLPOOL 84d954c928f956eb46f7c473adaa01c097c1e73d81fa8c8c1c5c56ba5547d7ce1ed3e55d98425f22f5f510476b4be044493f3299fa94e0a9bd9cde4097707ad8
 AUX oftpd-0.3.7-family-1.patch 936 SHA256 fe903d6fbb4a523f7b85dfb4c112f489da07764e8d67e15faa9b8380d400ba2a SHA512 045eb48da94b3f888ff3f9dab17170338d078284d136d2fb684fac09dedaef55dd186080a520072bf2906be17770f70e66a311e19b86da766f49fe68174857e2 WHIRLPOOL 5498455e4645783f09f3acdc8323d9bc038b20dd59abf4793f29c1230425e57c0f5629056df2cc077da7af0beea16ad43af4ca83677f805d923ba2addf398891
 AUX oftpd-0.3.7-htons.patch 458 SHA256 0f18b2e4a80b835e865bc376e060bd6fde3fdf2d4a09fd963d789feeaddbb400 SHA512 75da3b40206b5c495a2edab531d6c7d2a41e30729a03605e514ec12e20499e4f7f3fb03859b19c5fc5cdb1ea591243abcbf18decefddc03c977254a924ff2109 WHIRLPOOL f4861b628906a8e762dace8ba6f6133ea309eaf3f3cbe132a21f3374c9e6752e39a38ba5fe5d98c44f7a7d9405f4389d2474569da0a276dedc757e53831e09b0
 AUX oftpd-0.3.7-ipv6rel2-0.3.6-to-0.3.7.patch 14107 SHA256 83101b57c00cebe9ed456d79697520f582fc427d18ecf84137c502709fef6bf3 SHA512 c752bdeb0227c036268e3840c3aac9a19e875b9fa37e4f6440211aed312c42836982ff7e8a8e97a1f12f172552f96b290fb17bb139ded5d75999d49270facfc8 WHIRLPOOL 5adb70106584df7b7930439fc41591cfbbd0fb82d02f73bc64416acf7a19db6000c127ef7d088b0f1668faa6490d83be4dfd0ca012bc789a5a7e4e573420d0eb
+AUX oftpd-0.3.7-pthread-cancel.patch 797 SHA256 5ffd545376c3443d9c82b9d25021335cabc7071ed55772b90112ba21b69ce5da SHA512 7920c04bb3eb5ed3b832d140d7ff7808c3d214f804a04569706815d07fb505b7134d283c944c5a76fd64b1da55820ccda872d89a3be6e2363e31a386c320a161 WHIRLPOOL 98c724b07e9e19534479785638e3ebe1e4b958554917d62277bbbd04c16071efe58fa416c72c772764f60ca17ad6dacd8a3efd056993e08429607bd58d0f51f8
 AUX oftpd-0.3.7-unistd.patch 448 SHA256 6f40bc71c91f4e65a640366a17c3f9848a0362abf1143d538d17d4d38bb2bc8f SHA512 0e0ad78eecb9f2be425fcda44e624fe118ceb0ccb094a05bce96a9bb1268bf58e4a8efab553e767d4ad2165e9bc5b360f5d36ad28b21ccfee35f9a2809a96d7e WHIRLPOOL e4ca025978a9d2755c817faa061b5c3f3ed72c663c8f82cfaf17641595fee98f28fd57184323d1411238cdfd1c3fe6b97a58506043412f956e0134f86d71bbe8
 DIST oftpd-0.3.6-ipv6rel2.patch.gz 12478 SHA256 b1165052e0169e1495b5009111f07ba56cb81ce34234b9578a9eb2862e76ac3d SHA512 76d12b82424a9a338f151534df55310511d3138a1e80851e6ebb8f4a841cd075892ab1a02851d871772a2229c107ec35de2d5fb3572c72207a65629e10e55dba WHIRLPOOL f513e485f429957f1559684f6f85c2cea9fc0ae912cf46ccc21c4f272f4809587db3da473e4ebf4c717b48c2a11267ca3bfd875e88231b854d5c80aee36fb2a1
 DIST oftpd-0.3.7.tar.gz 97364 SHA256 b135cd2bc6c54e03e5374845964eab73d5e567160c15bb4226c1c922b1e6d64e SHA512 36bfd15dbe84043aee9678acbcc2c1312091887b381bee36a6a57f2516a5ec742a1733bf570c7cc71aaa28bd053d686976e6bfd549443a8bb398f8176db1a6a8 WHIRLPOOL 1d16c6fa5904700e41e0a499dc72d300823814197114ecb67211abea686a7a7d4017accb3ca3ade4a44a16b778499820b4a3d9589f0495618c6bcd3c6c1cafc4
+EBUILD oftpd-0.3.7-r10.ebuild 1418 SHA256 5a021e803772519bc895efe6c6cc27e4c38f4506052f23a0a6a1e7cfc8d4f678 SHA512 bed3c066696c25f2b99d565b85b64df38b3822eeee1a27c753c78a733ea7170b2a2a4d3c7045f87885b9f9449625d1ca4216c1da317bf10b35f857766ba979d5 WHIRLPOOL 397f47704c058349f50b30a69c8fdf16351d47042a3f30a276d7cee1d293878bf355118d4ca4ded714ceb55fada476599c6a2366b413498fb02c9b1dfb346b9d
 EBUILD oftpd-0.3.7-r7.ebuild 1229 SHA256 bb94e7ceaf512a0ee72315e276bb3548e2b22ef36500cd924011b1653e872b77 SHA512 3e0a74358bb5af4ba7407dfe8f7f8044b39d1a0927d66af324b4335393a09b89ac27d4369cc900a64c2e67a7968af465e55ee3f6087a13a8841e46cfaa097a42 WHIRLPOOL 8338c6f36b7afa4e882f1d0fc465d87f10dcc0e2cddbc717225c6c2625257f8ef8d207dffb2c8dacec520a5defcbb1d69a98a966b867c2acee5d536225092694
 EBUILD oftpd-0.3.7-r8.ebuild 1249 SHA256 43e33eb0fc4dfea2d9b101e6a4a3d6847c1a30895b44fea7c9648f50ea49d981 SHA512 5105dbe05c68908f68f371f253a3ecc2657a8cebb59b81b91afefceb9be4fe65cd84895eb27d2ef11473e7f94b371e91daa0e492d436b81a7755133dcc38b9ed WHIRLPOOL 34b5a69d86c242ffd3ad00618a1c7e75d64f5a766705067dff1da05a1e3c1f7019bb80ae70047ed68244f00c2e1625eea1ce83811ebb5d0f36169d8a120c3cd4
 EBUILD oftpd-0.3.7-r9.ebuild 1309 SHA256 7186ee83aa78400c05f8a13effda4229841c3349cbf570be22379b5662cf7d33 SHA512 e501554f0ce54e328a19e127488151d30ed67c1965a8d6e7454d778d69255d4d7fe6efaeb14333237e75fa70c0a7a5b2fc561b14c1da103feb6c9b03622ad804 WHIRLPOOL f2b23a931ba839cc85f0a40fe0b7a5afe3dd5a140c36b40a9bda9bbefd39bb94ed22d6b022c38c4396fc0c4dcdc41925ce6131fee36dd9dae87332311ce468f8
-MISC ChangeLog 6552 SHA256 86e53c9f62ece28313c3ef5e4e0d012662bf6ca8084fc3cc8a735fb64167ab66 SHA512 1f5749d906ba729ffd92bb0f01b1496558e9aeb17633c3a757775f8d43b294dd00c746110169e39f253117d5361ce794c1de1dab97cdf3eb77070866e8be7237 WHIRLPOOL 84a90773dcd832ea5018dd2b995590baa6ebb1bf7e97162bf419403af7a7906554365280636107a56f1ae6aee9fd34e5963cfd0bb54986bf45a0cc704911df42
+MISC ChangeLog 6877 SHA256 b9a03e958cb50bcc366b3fd6a2d2bd1d91f7a0975c6efd4e554b41d15953a286 SHA512 26801e1322b686086b0238db9aa065b9a0026e1c82ced3cbc3aec4015222e6749ad10f28798d4192f2124776e04f661a866b779dcd8416d047901faef2d0f208 WHIRLPOOL bab2d842e0bbfa85abca20a077f4b9866c0dd299b32cfbed52815a42e7cabef86fb2b586bc31ec54649b9f6eef0993f620b887778f5705248222d78b0fc796d9
 MISC metadata.xml 232 SHA256 540addc97838c8689eba36c8085ed5fcc19ff05a3ae749c62126f5e0ae91c7fe SHA512 0e28d468a4e1c247e3bf623868e12f915e18d36e119cbc67f9d784533b9fd1e0e919ecf944180d6e45f317c06f192c8f58da18bf3d83868dc2393b5399f23b36 WHIRLPOOL 323ee54fea9691ebebcb98c3e4bbd6dba38eea7bd9f60f5697ee5aecd394bfae4b160c0097b18c70dec8e1729cf691fd594140b27c171fff566dedfef3cd2cb9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTNzPpAAoJEPGu1DbS6WIAYzkP/j70cgh9wemvm9499zJBA90I
-LUYnyDetqXqqvQaNIqKDMjhG2mo3oyKJvLOoMVRdjY696ewA5kCdVUbkKIMgoJr2
-I51NG9Srq4eAkr/Y/ugUZqe/O8Zu+ckJyYy4iQSRCKudhwQzFUr+U6oQbwT6OyT/
-ZSFfkqveNDvYRSa6cbAWmqKo2Q2DLY4BTmCu05iq451d5uAZLmyZi2WQDN/VDRyI
-D1S0BetWfdGW5T0IzkB1Sec0Wi6xGHrsZrJdSF4e20uF2fJPKDKZDEDCLUIhmrYc
-K/wWZpt2bk3s1pZUk0Ck/mVA0KEN5Ba8W+vpXdpjGypixxvJy9MU8Zc91gX4Mqgy
-FUtWeahjy96Xweqx5H5ETTDvw4CTi/ORWwPZ622AmfMIq1FeINyzHml2GoTOXTR2
-ytL4oOXjOYRuyrx2476me5YAtDFumvNLZ5AJdy0+puabGx4jHE4OIDPjHQJa9EN+
-Zt+JVdABP8kICZCQ1xJPmAb9fTbFEKluEQsPX7GBrUCqk0DP3bbQvnwtgDkk0uYz
-UNa/493to1CAMfnoSwlsjETU656s7NDVHXgXpC/va+h59gqhGutlOJDKawsDESRJ
-2EONjDZD31by+Bs3aGlfE4QgwIODJVDfYHII/mZgxEyXPY6O0vkoTYCBFY76c0pO
-4vzeGq4u4sFCkse/6k7N
-=9Tnu
+iQIcBAEBCAAGBQJTQprcAAoJEPGu1DbS6WIAr44P/R10/0NIqjrHjJFXy9tO3LHM
+7fuX30vAT8ruLBFGfegzuRE6JxIe+QrjRccqKbPVaeWjBaJ9JFwTfoGR8bVMVHaG
+momhy36bKQ6N7UtYod7O77ZhodwbI5s2is8wDrId5tjnTDxR0MlspbMIfNIPUSOf
+R6S2r3OOA6qRhNMhc563YXb9P6sMPpozKOv9xRgmAKirBpOeieKD1kBSk7L7llVT
+jAUVirrv5dkXkbf+yy0/YZm57hkeLyLBNaX0na/RjysjzgYkis2nddLo5IM7uoz4
+H5MIdJg9BwpPpjSf6Kps4uCqHOBb4cS7rNLU+y/clGkc30ARbCRKYGpVpAPv1s7U
+Y5WqwW3SaONps8819z7IxV07XXjA8gUOH6KiyyzFb5FNCK7eedThZuOtBDECRdVp
+uSkcRaCqcvxqMGUwHVybumrpu8SVXqjvSSd73ZVdpQ1lhtjV3u3dF23oaBiHLE3M
+b/QusZuHG6k0hGXmRjcHB8DlQ3pw2VbPZvDoQbOyw0Xjx8f0jhYiPw3zGmOVLKIg
+A3d9Fw8+jABDQY3TPqIsAU7PbEXnhY9x8XoM+01P8MMRkdjns9WBrtfBVSQiXb+6
+fxjAm7XVj9DAyad0v9UBct3yAc1LnYL6EDMuXFX9y9XxmYNAJOlFP9P0VcAOrdKs
+tDQT8YR2PshUkbfzRAp4
+=af+7
 -----END PGP SIGNATURE-----
diff --git a/net-ftp/oftpd/files/conf.d.oftpd-r7 b/net-ftp/oftpd/files/conf.d.oftpd-r7
index bc9208386ccc..a8daed0f4f53 100644
--- a/net-ftp/oftpd/files/conf.d.oftpd-r7
+++ b/net-ftp/oftpd/files/conf.d.oftpd-r7
@@ -17,4 +17,10 @@ FTPROOT=/home/ftp
 FTPPORT=21
 
 ## Uncoment this line to activate oftpd service
+# Note: in order for passive connections to work, you must specify an IP address
+# here with the -i flag.  You can make it listen to all IPv4 addresses:
+#  -i 0.0.0.0
+# or make it listen to all IPv6 addresses:
+#  -i ::1
+# By default, oftpd listens to all IPv4/IPv6 addresses, but passive mode fails.
 #OFTPD_OPTS="-p ${FTPPORT} ${FTPUSER} ${FTPROOT}"
diff --git a/net-ftp/oftpd/files/oftpd-0.3.7-error-output.patch b/net-ftp/oftpd/files/oftpd-0.3.7-error-output.patch
new file mode 100644
index 000000000000..ab62220b553e
--- /dev/null
+++ b/net-ftp/oftpd/files/oftpd-0.3.7-error-output.patch
@@ -0,0 +1,20 @@
+fix writing of the error message to stderr by processing the varargs
+
+--- a/src/error.c
++++ b/src/error.c
+@@ -23,7 +23,6 @@ void error_init(error_t *err, int error_code, const char *desc_fmt, ...)
+ {
+     va_list args;
+ 
+-    fprintf(stderr, "error_init: %d %s", error_code, desc_fmt);
+     daemon_assert(err != NULL);
+     daemon_assert(error_code >= 0);
+     daemon_assert(desc_fmt != NULL);
+@@ -32,6 +31,7 @@ void error_init(error_t *err, int error_code, const char *desc_fmt, ...)
+     va_start(args, desc_fmt);
+     vsnprintf(err->desc, sizeof(err->desc), desc_fmt, args);
+     va_end(args);
++    fprintf(stderr, "error_init: %d %s\n", error_code, err->desc);
+ 
+     daemon_assert(invariant(err));
+ }
diff --git a/net-ftp/oftpd/files/oftpd-0.3.7-pthread-cancel.patch b/net-ftp/oftpd/files/oftpd-0.3.7-pthread-cancel.patch
new file mode 100644
index 000000000000..586885c3c08c
--- /dev/null
+++ b/net-ftp/oftpd/files/oftpd-0.3.7-pthread-cancel.patch
@@ -0,0 +1,17 @@
+in order for pthread_cancel to work (which oftpd uses to close inactive
+connections), most ports need to load libgcc_s.so.1.  but when oftpd uses
+a chroot, that file is no longer available (in fact, it'll try to load it
+from the chroot itself which is kind of a security issue).  so have the
+code proactively link against libgcc_s when it is found so that the lib
+is already loaded when we cancel.
+
+--- a/configure.in
++++ b/configure.in
+@@ -39,6 +39,7 @@ AC_FUNC_STRFTIME
+ AC_CHECK_FUNCS(getcwd gettimeofday select socket strerror localtime_r gmtime_r)
+ dnl AC_CHECK_LIB(pthread, pthread_create)
+ dnl AC_SEARCH_LIBS(pthread_create, [ pthread pthreads thread threads ])
++AC_CHECK_LIB(gcc_s, _Unwind_Resume)
+ AC_SEARCH_LIBS(socket, socket)
+ AC_SEARCH_LIBS(inet_ntoa, nsl)
+ AC_CHECK_FUNCS(inet_aton)
diff --git a/net-ftp/oftpd/oftpd-0.3.7-r10.ebuild b/net-ftp/oftpd/oftpd-0.3.7-r10.ebuild
new file mode 100644
index 000000000000..2182c93a6f9a
--- /dev/null
+++ b/net-ftp/oftpd/oftpd-0.3.7-r10.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/oftpd/oftpd-0.3.7-r10.ebuild,v 1.1 2014/04/07 12:32:25 vapier Exp $
+
+EAPI=4
+
+inherit autotools eutils
+
+DESCRIPTION="Secure, small, anonymous only ftpd"
+HOMEPAGE="http://www.time-travellers.org/oftpd"
+SRC_URI="http://www.time-travellers.org/oftpd/${P}.tar.gz
+	ftp://ftp.deepspace6.net/pub/ds6/sources/${PN}/${PN}-0.3.6-ipv6rel2.patch.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sh ~sparc ~x86"
+IUSE="ipv6"
+
+DEPEND="net-ftp/ftpbase"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	cd "${WORKDIR}" || die
+	epatch "${FILESDIR}"/oftpd-0.3.7-ipv6rel2-0.3.6-to-0.3.7.patch
+
+	cd "${S}" || die
+	epatch "${WORKDIR}"/${PN}-0.3.6-ipv6rel2.patch
+	epatch "${FILESDIR}"/${PN}-0.3.7-delay-root-check.patch
+	epatch "${FILESDIR}"/${PN}-0.3.7-error-output.patch
+	epatch "${FILESDIR}"/${PN}-0.3.7-pthread-cancel.patch
+
+	# Don't crash when using an unsupported address family, #159178.
+	# updated in bug #157005
+	epatch "${FILESDIR}"/${P}-family-1.patch
+
+	# htons patch #371963
+	epatch "${FILESDIR}"/${P}-htons.patch
+
+	epatch "${FILESDIR}"/${P}-unistd.patch
+	eautoreconf
+}
+
+src_configure() {
+	econf --bindir=/usr/sbin $(use_enable ipv6)
+}
+
+src_install() {
+	default
+	keepdir /home/ftp
+	newinitd "${FILESDIR}"/init.d.oftpd-r7 oftpd
+	newconfd "${FILESDIR}"/conf.d.oftpd-r7 oftpd
+}