Delay root check until after processing the command line.

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

4 files changed, 105 insertions, 7 deletions

diff --git a/net-ftp/oftpd/ChangeLog b/net-ftp/oftpd/ChangeLog
index 0e61274601d6..e3ebe0385de2 100644
--- a/net-ftp/oftpd/ChangeLog
+++ b/net-ftp/oftpd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-ftp/oftpd
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/oftpd/ChangeLog,v 1.39 2013/01/23 17:26:57 xmw Exp $
+# 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 $
+
+*oftpd-0.3.7-r9 (29 Mar 2014)
+
+  29 Mar 2014; Mike Frysinger <vapier@gentoo.org>
+  +files/oftpd-0.3.7-delay-root-check.patch, +oftpd-0.3.7-r9.ebuild:
+  Delay root check until after processing the command line.
 
 *oftpd-0.3.7-r8 (23 Jan 2013)
 
diff --git a/net-ftp/oftpd/Manifest b/net-ftp/oftpd/Manifest
index 3014539d666c..aefa9d7b43e8 100644
--- a/net-ftp/oftpd/Manifest
+++ b/net-ftp/oftpd/Manifest
@@ -3,6 +3,7 @@ Hash: SHA256
 
 AUX conf.d.oftpd-r7 678 SHA256 0446272c764feb3055a1faee84a0690e172a38c7c0406ca7d23bfdee98e7f3e0 SHA512 36efb9e6fb4fb64dc0a55cb8db7d8b83fe40b6d98bf5c7c963587890548afec3eb63d1491c1d362855339c35333d92899450438bf71e5a1975c942270c9a24e3 WHIRLPOOL 4dbadf3b5299099f334c276e5367fc1134e7d706039f1d5fd56bd572290887dbfefcaa56d85cf4dd5ffaedcd21713e99da0a6b69bc2b2bee8feff50565656543
 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-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
@@ -11,12 +12,23 @@ DIST oftpd-0.3.6-ipv6rel2.patch.gz 12478 SHA256 b1165052e0169e1495b5009111f07ba5
 DIST oftpd-0.3.7.tar.gz 97364 SHA256 b135cd2bc6c54e03e5374845964eab73d5e567160c15bb4226c1c922b1e6d64e SHA512 36bfd15dbe84043aee9678acbcc2c1312091887b381bee36a6a57f2516a5ec742a1733bf570c7cc71aaa28bd053d686976e6bfd549443a8bb398f8176db1a6a8 WHIRLPOOL 1d16c6fa5904700e41e0a499dc72d300823814197114ecb67211abea686a7a7d4017accb3ca3ade4a44a16b778499820b4a3d9589f0495618c6bcd3c6c1cafc4
 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
-MISC ChangeLog 6338 SHA256 27082e7942a359711cc207c717acf8a222f7c87b118909d848e17cc73a8f0c0e SHA512 092f09b95c049cf105cdb3680ca52c13e00896bc09bbc0f8129406bbdb4abed4897d072c25bfbf835be23b5123a754531d4e135ae73f7fec31f45ec54c437004 WHIRLPOOL 05dee336bd7dea458363fbdaf341298e217e6e292ced4e68fc0a3b0635590d949044c3761a41c7a39ae3cb08d90e3809e376c2cf09ac6e8d43ffceab0da6baa1
+EBUILD oftpd-0.3.7-r9.ebuild 1309 SHA256 7186ee83aa78400c05f8a13effda4229841c3349cbf570be22379b5662cf7d33 SHA512 e501554f0ce54e328a19e127488151d30ed67c1965a8d6e7454d778d69255d4d7fe6efaeb14333237e75fa70c0a7a5b2fc561b14c1da103feb6c9b03622ad804 WHIRLPOOL f2b23a931ba839cc85f0a40fe0b7a5afe3dd5a140c36b40a9bda9bbefd39bb94ed22d6b022c38c4396fc0c4dcdc41925ce6131fee36dd9dae87332311ce468f8
+MISC ChangeLog 6552 SHA256 86e53c9f62ece28313c3ef5e4e0d012662bf6ca8084fc3cc8a735fb64167ab66 SHA512 1f5749d906ba729ffd92bb0f01b1496558e9aeb17633c3a757775f8d43b294dd00c746110169e39f253117d5361ce794c1de1dab97cdf3eb77070866e8be7237 WHIRLPOOL 84a90773dcd832ea5018dd2b995590baa6ebb1bf7e97162bf419403af7a7906554365280636107a56f1ae6aee9fd34e5963cfd0bb54986bf45a0cc704911df42
 MISC metadata.xml 232 SHA256 540addc97838c8689eba36c8085ed5fcc19ff05a3ae749c62126f5e0ae91c7fe SHA512 0e28d468a4e1c247e3bf623868e12f915e18d36e119cbc67f9d784533b9fd1e0e919ecf944180d6e45f317c06f192c8f58da18bf3d83868dc2393b5399f23b36 WHIRLPOOL 323ee54fea9691ebebcb98c3e4bbd6dba38eea7bd9f60f5697ee5aecd394bfae4b160c0097b18c70dec8e1729cf691fd594140b27c171fff566dedfef3cd2cb9
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iF4EAREIAAYFAlEAHm0ACgkQknrdDGLu8JCKQgEAjPXUgBTlAa6PzaDj9PW2/epy
-wW4JnlfDAIZXICeNZCsA/i07pXo1EMF9Ep3sumj1hM/XhnX/yfvK0WbZEn/ToRTI
-=gVmv
+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
 -----END PGP SIGNATURE-----
diff --git a/net-ftp/oftpd/files/oftpd-0.3.7-delay-root-check.patch b/net-ftp/oftpd/files/oftpd-0.3.7-delay-root-check.patch
new file mode 100644
index 000000000000..56ab51e4d6c3
--- /dev/null
+++ b/net-ftp/oftpd/files/oftpd-0.3.7-delay-root-check.patch
@@ -0,0 +1,30 @@
+check for root after processing args so non-root can run --help
+
+--- a/src/oftpd.c
++++ b/src/oftpd.c
+@@ -56,12 +56,6 @@ int main(int argc, char *argv[])
+         exe_name = argv[0];
+     }
+ 
+-    /* verify we're running as root */
+-    if (geteuid() != 0) {
+-        fprintf(stderr, "%s: program needs root permission to run\n", exe_name);
+-        exit(1);
+-    }
+-
+     /* default command-line arguments */
+     port = FTP_PORT;
+     user_ptr = NULL;
+@@ -187,6 +181,12 @@ int main(int argc, char *argv[])
+         exit(1);
+     }
+ 
++    /* verify we're running as root */
++    if (geteuid() != 0) {
++        fprintf(stderr, "%s: program needs root permission to run\n", exe_name);
++        exit(1);
++    }
++
+     /* become a daemon */
+     if (detach) {
+         daemonize();
diff --git a/net-ftp/oftpd/oftpd-0.3.7-r9.ebuild b/net-ftp/oftpd/oftpd-0.3.7-r9.ebuild
new file mode 100644
index 000000000000..56645a533023
--- /dev/null
+++ b/net-ftp/oftpd/oftpd-0.3.7-r9.ebuild
@@ -0,0 +1,50 @@
+# 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-r9.ebuild,v 1.1 2014/03/29 20:58:11 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
+
+	# 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
+}