vsftpd: sync with portage

4 files changed, 44 insertions, 7 deletions

diff --git a/net-ftp/vsftpd/ChangeLog b/net-ftp/vsftpd/ChangeLog
index 24f121d..be25846 100644
--- a/net-ftp/vsftpd/ChangeLog
+++ b/net-ftp/vsftpd/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for net-ftp/vsftpd
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/vsftpd/ChangeLog,v 1.178 2013/09/06 18:35:11 ago Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/vsftpd/ChangeLog,v 1.180 2014/09/14 11:04:49 hwoarang Exp $
+
+*vsftpd-3.0.2-r3 (14 Sep 2014)
+
+  14 Sep 2014; Markos Chandras <hwoarang@gentoo.org>
+  +files/vsftpd-3.0.2-aslim.patch, +vsftpd-3.0.2-r3.ebuild:
+  Increase VSFTP_AS_LIMIT macro to fix logins with pam_mysql. Bug #522412. Patch
+  by Harald Glatt (hachre) <bugzilla-gentoo@mail.hachre.de>
+
+  23 Apr 2014; Markos Chandras <hwoarang@gentoo.org> vsftpd-3.0.2-r2.ebuild:
+  Add epatch_user and override LIBS variable thanks to Mike Gilbert
+  <floppym@gentoo.org>. Bug #508192
 
   06 Sep 2013; Agostino Sarubbo <ago@gentoo.org> vsftpd-3.0.2-r1.ebuild:
   Stable for sparc, wrt bug #480078
diff --git a/net-ftp/vsftpd/Manifest b/net-ftp/vsftpd/Manifest
index 8f61ac4..a396081 100644
--- a/net-ftp/vsftpd/Manifest
+++ b/net-ftp/vsftpd/Manifest
@@ -5,6 +5,7 @@ AUX vsftpd-2.3.2-kerberos.patch 842 SHA256 d86bed62c0fd22372f4704a12d7f75ce42fc1
 AUX vsftpd-2.3.5-gentoo.patch 8560 SHA256 227fc60234c002d756d6a4f0867b6f7cf63315cb53dda78a1ef62ea5ccc61bdd SHA512 dbe8a022b9dd4bfdf5c0138aa0ad13311d4a52e7671888fc2018992e7906c2aab53355d2ab24cc4e1f19c358a5202eb9965bf3ca9180d6b9d369d451c7c656b3 WHIRLPOOL 40aaeeab47b1775d3b035a91810bc8e67d573d2d51de886d80aa44c96ac92c21154a3e214faf6f7d890b8e18626cdd8e3b28df5b203df3817929c40aeb9400ec
 AUX vsftpd-3.0.0-Makefile.patch 1093 SHA256 e654f707a4c1da2433b28e35a05e1dd92fee35f4582e458e64066f30b75db7de SHA512 66217e5be8e5a7b819c0a38ee8ac9e84ea5937c7285843d1de5b8361211ea86816551b440bf9d5c89c9f874e867c9f50590a2e8a50dbd313fcde1d5d4ea6ab4e WHIRLPOOL 1b031f17fd4176e1d42f2b955b7656d2d281db46fc768f52063e009028224e20dc50b82f93f8c21842cffad82cba3492dfd8ff740ec72d3ad07caad825be73b0
 AUX vsftpd-3.0.2-alpha.patch 525 SHA256 e544547b4f665e40e5a55e411946e37c2493dfe0391ba9ef6760ba889f7a9c98 SHA512 5d9639bf7fa08bfce5cbbc79c59445e099c42adec6dc1a3e14e6a9586c53a082e0c712625a3de62418fd0f0bd253b6b673a700157be07ab114770707739a6c38 WHIRLPOOL c08ddd9fb7aa60c4e1a84a95c3f390cff279d060c6d63464b5defbf4aa9765bf35c717506cb404cc937d4b6b7307d63ed906c796e4409ff7d5494fc2c1ee3b85
+AUX vsftpd-3.0.2-aslim.patch 512 SHA256 29563dc497b3845c753abd451aebe55a3c9618073ddf0a76997e5a58b2f51cf8 SHA512 ca444fa86279711942e30ef2d756193f9aeb318c2c52dda822c70085c250a09fa182187ecf99d45b64364fde12db8ce818ea50d71fcb73145fc64f5e2d66f263 WHIRLPOOL 423fc960ce6513c195933e8bfd03c5bdaa80d0288189d907998a37cc0d3a2a2a6a475bccf60229f769bd0111b1d371632b2ed1064bb90ab99c7cb9251d139c0b
 AUX vsftpd-3.0.2-remove-legacy-cap.patch 1739 SHA256 c18a5b1092d07c5ff5380553345d4cdf06e0b8968cf90499d3dd1751f889a438 SHA512 b0c2b91f0ba3b73706c352ac391e35b048b544fbab1ab3cd223be7f5ca33516143a775456871ded354a05bf74f0403436f4659d06ae9345e8d6a6d1b21addd42 WHIRLPOOL 253453c1696cfe1e5330055410d5e7e080f0c27ea8ba2158e5667f692067f73c070b8bd7ed56d7aa77c2dcadbe10f62442f31ceef4a7cfdcf8578895525c84d1
 AUX vsftpd-checkconfig.sh 785 SHA256 2de7c7c1edfe3ae0480e22d988a564db3bb873050929ebb6e8361d7a1288ddda SHA512 541702557231c79413ae77cf26c28398fea3cb332375f8d22e0c0a45706b04db954d268addd76fecbb8b0ab3109f1009c18b0599394ed33c4a6fc8dc647d889e WHIRLPOOL ac2d38c646a440edc093f8458cc2395c6da465d9719c10464ded9cba2c480b9398f8ece2d25920d10893dca0fc16ba8b3a583c55724f5a5b5de46eab671bab63
 AUX vsftpd.conf 3842 SHA256 08b680a8531ecc8ccd9bf7cd91dc2de0a49105803a6d8fdcbe0f0dd47de8f6e0 SHA512 ab6c74a22eb30e504efca095ecb0675e058bd4290e4cd926433d011ec8423a33bc1da4d25d4de295e6ab8f001e1d4b3da03340b1b279fdc95461d393ab4f64d8 WHIRLPOOL 00ab13614d97e52c2b0e88587feb7276991090a0e94244695420dd87993fb25d30ea461bc4fc3770a38043cb09b3a714ddfc869c98d29033a61740018acbdf9a
@@ -15,6 +16,6 @@ AUX vsftpd.socket 104 SHA256 9fdbfd2ec0207170371ca3cf2b0ddca2dc2fe3d062e5792e0d3
 AUX vsftpd.xinetd 432 SHA256 4e68c12108509823c74cd66f833299def48f497a4d660624362d3b4990af828f SHA512 f5c232345c06a7f3a7b32ff0281c386e6956e1b91d0331436bf8eb39e479ad1e37335424c35f22f12fb70416caa1f6a317b03e701caa4e0499acd556db64e909 WHIRLPOOL 7ffd1ede197d387e38ffa6e584c86be2fc35c4938b75ebd793daff562f6e99e95aaf0c5e58ee0a74a76686115e5e32e19dd5b27d8a64dd255de1ad7aae74d5fc
 AUX vsftpd_at.service 328 SHA256 5239d00bafe9686b5ee454365e32ea383ea85af70434037fd3812245dc50e8cd SHA512 5a39e853405bd5028f2c52183eb91ad559fb8edbaacfff5d5146e686417c208bb894bd86d5830a61720a1aaa9ba901160c75ed2bf47eec459b2a49ed217b9cb1 WHIRLPOOL cac14417d2c47a7491653c5835e913f980a09934a00b08eeb47f40f15ba3927639ab1ec8efc8d5c28ea49c34391b30946dcb04771b3eefcea5a7b2429b33f6a8
 DIST vsftpd-3.0.2.tar.gz 192808 SHA256 be46f0e2c5528fe021fafc8dab1ecfea0c1f183063a06977f8537fcd0b195e56 SHA512 d5b978e07d8b0a623b79a531824666fb9b970ad5989a8c34c21b545b62ba07cde4bfe3d77b40a8b6e92d17890c37cae209231af8f106da3404f6548e217bd023 WHIRLPOOL 7a74ab478880d021f7a82ffc6ec3989617003234e30d97063760bc06baeee2ab207861b440896b926b95eed7b3d902ab96c05c1bbd23d494d9ff168f98d3404a
-EBUILD vsftpd-3.0.2-r2.ebuild 3574 SHA256 8bcdd952db4c95a3576a650ffb01e92617e4306c5180914a55b600ca01e9e4a6 SHA512 a849e2d657f6c94e99a553689a7cb11826a9c296bb897f79f0fed36d92ba686c912bccec391492f593bae16ccfd1689fd0995f510a57431efcd8ca058f684c65 WHIRLPOOL 17ab79d9544e40401cca4f002e54525c9d6b653fb7b2f5dcf79700c3d2a7c296210fba1244c30fe63319995030fc31337df88a1413fa1bf47e91304ef4a5ee31
-MISC ChangeLog 25319 SHA256 0598bf2a9d12018dbab274a4d19be3c39cef511c35845c87a597a17dc84dffda SHA512 7da7690f0c21912e789669bd55f2ee9a183168b0c5e06bec6b5a6b683916c080c0e0a64deec895dd5b64abbcb03d079bb9907a147f0b7b2c3659000bc3bb0fda WHIRLPOOL f9a068799d6fc7082916c5ec57a4d3064f6b2a8640cc65a6ce3d955962e881922c70c1753b040b80b6b5289ee4963b045778e62aa68edc6bbc05cb43682d5f61
+EBUILD vsftpd-3.0.2-r3.ebuild 3847 SHA256 2694a1e87efa79c23c5c70d854158566d6c65ee15ba78488b4b83e8fda88032e SHA512 52c637537f21107323b0495590cf172a74c39bf1650c84f7d95b9a3db4e82bfd7d1b707fc23323b1a9b52db68a6d2d81efe2e5272183b8ccbf1720b2ffe52b25 WHIRLPOOL 584240dfcc25355992b1c10c8e3c274e3b5335c97be5ce5e7d92c8341a58ee2f84b6a38ea68c53e3848397e7e55b3be7e6b27913f44994ee966993a95d07ab6d
+MISC ChangeLog 25793 SHA256 6f0d61bfa059b95f72a9cdbfcccf9b2848867fff39a3982f05d94909e7445d4c SHA512 87595bb5f73644d8028ff3c559b38f797166c71ff239126d21116223e1a71509c069264e31caf274de205bcc56ceb6954e520bc3e3fdc0d461a3a4427b310c69 WHIRLPOOL f0b8c98a48fb13684b0d8dcdf85c12c640b4818e29eadaed382ad9641c8222db57957c11a2e6df05f1d23b3fe39a4ba0e0f4be0a72dd9795021c01a237d5bded
 MISC metadata.xml 664 SHA256 769529e78a4d3270ae5c627e09783ffd6e122e24c5e931317d0832b6273ee586 SHA512 84392c28c30904caba637a5f90fc73512f028f706f5a805c1181a9fc63b93e9794dc17ade2016d969796b32c6ab6b8530f549298b099ae67c65d03a62d64955b WHIRLPOOL a4690e0bf4b66e94d072b0f6d0297da7fd208277b3302862087f2d274438167c97f2a33a6ad43e76fea2f754190e2b40cfc6a7d7ee562538ef6c479d08f36d0c
diff --git a/net-ftp/vsftpd/files/vsftpd-3.0.2-aslim.patch b/net-ftp/vsftpd/files/vsftpd-3.0.2-aslim.patch
new file mode 100644
index 0000000..9a8f8ea
--- /dev/null
+++ b/net-ftp/vsftpd/files/vsftpd-3.0.2-aslim.patch
@@ -0,0 +1,13 @@
+https://bugs.gentoo.org/show_bug.cgi?id=522412
+https://bugzilla.redhat.com/show_bug.cgi?id=913519
+--- a/defs.h	2014-09-13 12:04:15.953079704 +0200
++++ b/defs.h	2014-09-13 12:04:48.677080716 +0200
+@@ -19,7 +19,7 @@
+ /* Must be at least the size of VSFTP_MAX_COMMAND_LINE, VSFTP_DIR_BUFSIZE and
+    VSFTP_DATA_BUFSIZE*2 */
+ #define VSFTP_PRIVSOCK_MAXSTR   VSFTP_DATA_BUFSIZE * 2
+-#define VSFTP_AS_LIMIT          100UL * 1024 * 1024
++#define VSFTP_AS_LIMIT          400UL * 1024 * 1024
+ 
+ #endif /* VSF_DEFS_H */
+ 
diff --git a/net-ftp/vsftpd/vsftpd-3.0.2-r2.ebuild b/net-ftp/vsftpd/vsftpd-3.0.2-r3.ebuild
index 990ac67..4d970fa 100644
--- a/net-ftp/vsftpd/vsftpd-3.0.2-r2.ebuild
+++ b/net-ftp/vsftpd/vsftpd-3.0.2-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/vsftpd/vsftpd-3.0.2-r2.ebuild,v 1.1 2013/09/03 20:11:27 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/vsftpd/vsftpd-3.0.2-r3.ebuild,v 1.1 2014/09/14 11:04:49 hwoarang Exp $
 
 EAPI="4"
 
@@ -37,6 +37,9 @@ src_prepare() {
 	# Fix building on alpha. Bug #405829
 	epatch "${FILESDIR}/${PN}-3.0.2-alpha.patch"
 
+	# Increase AS_LIMIT. Bug #522412
+	epatch "${FILESDIR}/${P}-aslim.patch"
+
 	# Fix unicode logging
 	epatch "${FILESDIR}/${PN}-2.2.0-logging.patch"
 
@@ -59,12 +62,21 @@ src_prepare() {
 
 	#Bug #450536
 	epatch "${FILESDIR}"/${P}-remove-legacy-cap.patch
+
+	epatch_user
 }
 
 src_compile() {
+	# Override LIBS variable. Bug #508192
+	LIBS=
+	use caps && LIBS+=" -lcap"
+	use pam && LIBS+=" -lpam"
+	use tcpd && LIBS+=" -lwrap"
+	use ssl && LIBS+=" -lssl -lcrypto"
+
 	CFLAGS="${CFLAGS}" \
 	CC="$(tc-getCC)" \
-	emake
+	emake LIBS="${LIBS}"
 }
 
 src_install() {