commit: 0d0536c9b826b5859f73cafa8495a2b4d4f9c1c3
Author: Andrew Savchenko <bircoph <AT> gentoo <DOT> org>
AuthorDate: Sat May 21 12:33:06 2016 +0000
Commit: Andrew Savchenko <bircoph <AT> gentoo <DOT> org>
CommitDate: Sat May 21 12:33:06 2016 +0000
URL: https://gitweb.gentoo.org/dev/bircoph.git/commit/?id=0d0536c9
vsftpd: sync with tree
net-ftp/vsftpd/Manifest | 22 +---------------------
net-ftp/vsftpd/files/vsftpd-3.0.2-aslim.patch | 13 -------------
net-ftp/vsftpd/files/vsftpd.conf | 2 +-
net-ftp/vsftpd/files/vsftpd.init | 18 +++++++++++-------
net-ftp/vsftpd/files/vsftpd.logrotate | 2 +-
net-ftp/vsftpd/files/vsftpd.xinetd | 2 +-
net-ftp/vsftpd/metadata.xml | 12 +++++++-----
...{vsftpd-3.0.2-r3.ebuild => vsftpd-3.0.3.ebuild} | 9 +++------
8 files changed, 25 insertions(+), 55 deletions(-)
diff --git a/net-ftp/vsftpd/Manifest b/net-ftp/vsftpd/Manifest
index a396081..b49b2e8 100644
--- a/net-ftp/vsftpd/Manifest
+++ b/net-ftp/vsftpd/Manifest
@@ -1,21 +1 @@
-AUX vsftpd-2.1.0-caps.patch 575 SHA256
4888021a25625041746b91025af0c2a2cb1fde758eda1d6c94098d4de0c1e370 SHA512
aeb407d9d0cf3940bc0fb1ef76c23cd19f68293e64d8a6a64e2a271b624a237fa3721b6a3476d59f0c6fabf69a418f9577fde351aba0e9aa96dc1362c02e1524
WHIRLPOOL
bfad7367797f0fd0da502d9ebdcf13364123742642d384fb44220c0af2370997c5fbf9e72bf9eaabf47a449650702b1b73ac165a49ebc8687cb624e0caccbf99
-AUX vsftpd-2.2.0-dont-link-caps.patch 806 SHA256
fd164d4702ae866cb06ad245653b4f25c73d1d701a211b1f972b45b98ab55dd2 SHA512
b162f3afcc135bdecea63ef24a1f321e6723a1218a96a8897b3db67338f5cdceb6178c7cd0a155dee80af3e7b9198610562de7cff6986e7dfc93df79b5ee501c
WHIRLPOOL
cd7c6a94cc094af32097031aeca93873604d86f1d2ddaeb4980a18c82ab0061e95ca36484f157b68db9f81456e71fa02a6d01520f7ca9487bd2a266458c5a4cd
-AUX vsftpd-2.2.0-logging.patch 445 SHA256
bbe2fd9aea800480f839c808e085bb8fe67bab9e4d0a152da5b949e2b41b82d8 SHA512
9b7726d1a9453365490e6534bd74072861875f6c74de76e93a9287d6336d3899c723fbdaadd82b6b98662c52b5d6b9e0be7792845f821c9901bc6973d420f5c0
WHIRLPOOL
02a095278d6d423df570ae9dbc0fae6226ead3bdcabf846dd85b6a55251e742b872a41280531dfff63029e43c41cd3cede03ffa0c6fee39783c20e71502afd4c
-AUX vsftpd-2.3.2-kerberos.patch 842 SHA256
d86bed62c0fd22372f4704a12d7f75ce42fc15765ceec802b4b0c5680bc9c200 SHA512
94c743b4f78f41aba4427b6e75b8d85d57a1eec6eb89e0ca93f47c0e5ccdb31a80eb28cfeb3c50cce5cbf5909646150aec762d8b250650dcfbaa6ad190271af8
WHIRLPOOL
53ff6a29d84e23584f7ca873cb715369e636f0d1739fd1a591cc400f6ebe59aa28547a1a6d9b9681822d678e007750c81189c8ed296199eb56d9e77ddd4c7fcf
-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
-AUX vsftpd.init 1261 SHA256
e6cf3df546aae57bb10e2b4282a9ccd79741473ef9dbdbd7628a16c84622da06 SHA512
5270ed8dc2f7a0063b122cb694a6d72c97dbdb2be95d568577666792d237edc193cb9511637eac422a5269100c05d9c4f91102107ceb0cadbf960ba7af4c57b1
WHIRLPOOL
9099e4d3bc20e51e6aa66bece73cc5373f7f083d173483b7872f49776d2d6204a334850434cd349570f76d57ec6c004b1db872820cd1a8d13f239ca423f24802
-AUX vsftpd.logrotate 53 SHA256
b31f4db8e2f8640f83bc38d83444ab784f8fc9a6492f654bb4149e1f566da2f3 SHA512
6b0d718ffdc0b6a68d5092b36a03106d2c4e4fa6873a178c85345acfb3847ef839a475eadb56171d79ec243ae2bf8725cae0ae486b182afe065b181f87c831c5
WHIRLPOOL
e155b30b59319cc5dac69c7446273ab20b4e56f696cce6ab8c83c3310529e0da70969edefaf94c912f121d3df526368ad9aafd291c6cf2f6a9b2d7b69d88b0aa
-AUX vsftpd.service 218 SHA256
5c93a836c0be34d785197ba01541b6cd9db6f8992c4ea081c07a6111cc98290d SHA512
f032f64ed5fab15b1c9543579090cdca007d0a759073e7c4aa0f0ef0f852f6787610f776ce63d0d922ccfbadd480df81ed9a62e6e0f399327d770f9b70c34df9
WHIRLPOOL
c91aabb3b89dc3faa002cd998329d44677f756ee2901492324e37b3f7dbcc29b83c53032891ef1d802ea70d01b060f091970c20a06b36d2cae9358269df6f4e4
-AUX vsftpd.socket 104 SHA256
9fdbfd2ec0207170371ca3cf2b0ddca2dc2fe3d062e5792e0d3e51474c3198c9 SHA512
4c56607dde0ccc4773edf905c1d52b66fff774e6aa8b20a23f9443a04838a9ad8a1df535a0bb27660e9a4528d1d7c90b53fd6dd1fa3d4862e87ed06a1a8a87b7
WHIRLPOOL
435e23297ff200ab68cb2813d2024279ed7d21e7d03f1c732c8ef06baf4b92c330edd496798c197078f07b08c4680c9c70e8dcc8aa4d35872d0cc556298b9fc9
-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-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
+DIST vsftpd-3.0.3.tar.gz 196649 SHA256
9d4d2bf6e6e2884852ba4e69e157a2cecd68c5a7635d66a3a8cf8d898c955ef7 SHA512
5a4410a88e72ecf6f60a60a89771bcec300c9f63c2ea83b219bdf65fd9749b9853f9579f7257205b55659aefcd5dab243eba878dbbd4f0ff8532dd6e60884df7
WHIRLPOOL
014b13a1031d89a12412fb1abc808c8d62f474b84e9d1699ec789e99c9b9ec7f4538e7504caa810c6b77dcccea8fc0e32e9bb3ac5ffc8e2e9a29f67b69ddc3cb
diff --git a/net-ftp/vsftpd/files/vsftpd-3.0.2-aslim.patch
b/net-ftp/vsftpd/files/vsftpd-3.0.2-aslim.patch
deleted file mode 100644
index 9a8f8ea..0000000
--- a/net-ftp/vsftpd/files/vsftpd-3.0.2-aslim.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-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/files/vsftpd.conf b/net-ftp/vsftpd/files/vsftpd.conf
index 2ed7008..9405a36 100644
--- a/net-ftp/vsftpd/files/vsftpd.conf
+++ b/net-ftp/vsftpd/files/vsftpd.conf
@@ -3,7 +3,7 @@
#
# See man 5 vsftpd.conf for more information.
#
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/vsftpd/files/vsftpd.conf,v 1.6
2005/08/03 09:38:31 uberlord Exp $
+# $Id$
# Enable vsftpd to run as a standalone daemon
# Comment these two out to run under inetd or xinetd
diff --git a/net-ftp/vsftpd/files/vsftpd.init b/net-ftp/vsftpd/files/vsftpd.init
index 1650da1..0b44a69 100644
--- a/net-ftp/vsftpd/files/vsftpd.init
+++ b/net-ftp/vsftpd/files/vsftpd.init
@@ -1,7 +1,7 @@
-#!/sbin/runscript
-# Copyright 1999-2013 Gentoo Foundation
+#!/sbin/openrc-run
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/vsftpd/files/vsftpd.init,v 1.8
2013/04/20 16:51:02 hwoarang Exp $
+# $Id$
VSFTPD_NAME=${SVCNAME##*.}
if [ -n "${VSFTPD_NAME}" -a "${SVCNAME}" != "vsftpd" ]; then
@@ -35,13 +35,17 @@ start() {
stop() {
ebegin "Stopping ${SVCNAME}"
+ local retval=0
if [ -f ${VSFTPD_PID} ]; then
- start-stop-daemon --stop --pidfile ${VSFTPD_PID}
+ start-stop-daemon --stop --pidfile ${VSFTPD_PID} || retval=1
+ pkill --full ${VSFTPD_CONF}
else
- ewarn "Couldn't found ${VSFTPD_PID} trying to stop over the
process name ${SVCNAME}"
- start-stop-daemon --stop --name ${SVCNAME}
+ ewarn "Couldn't find ${VSFTPD_PID} trying to stop using the
config filename ${VSFTPD_CONF}"
+ pgrep --full ${VSFTPD_CONF} > ${VSFTPD_PID}
+ start-stop-daemon --stop --pidfile ${VSFTPD_PID} || retval=1
+ pkill --full ${VSFTPD_CONF}
fi
- eend $?
+ eend ${retval}
}
# vim: ts=4
diff --git a/net-ftp/vsftpd/files/vsftpd.logrotate
b/net-ftp/vsftpd/files/vsftpd.logrotate
index f443e2e..b28a2a4 100644
--- a/net-ftp/vsftpd/files/vsftpd.logrotate
+++ b/net-ftp/vsftpd/files/vsftpd.logrotate
@@ -1,4 +1,4 @@
-/var/log/vsftpd.log {
+/var/log/vsftpd*.log {
missingok
notifempty
}
diff --git a/net-ftp/vsftpd/files/vsftpd.xinetd
b/net-ftp/vsftpd/files/vsftpd.xinetd
index d1d88e9..1027c1f 100644
--- a/net-ftp/vsftpd/files/vsftpd.xinetd
+++ b/net-ftp/vsftpd/files/vsftpd.xinetd
@@ -1,6 +1,6 @@
# default: off
# description: Vsftpd is an FTP server, designed to be secure.
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/vsftpd/files/vsftpd.xinetd,v 1.4
2005/06/07 18:34:17 uberlord Exp $
+# $Id$
service ftp
{
diff --git a/net-ftp/vsftpd/metadata.xml b/net-ftp/vsftpd/metadata.xml
index 53e430c..df9322c 100644
--- a/net-ftp/vsftpd/metadata.xml
+++ b/net-ftp/vsftpd/metadata.xml
@@ -1,21 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
<pkgmetadata>
- <herd>net-ftp</herd>
- <herd>proxy-maintainers</herd>
- <maintainer>
+ <maintainer type="person">
<email>hwoar...@gentoo.org</email>
<name>Markos Chandras</name>
</maintainer>
- <maintainer>
+ <maintainer type="person">
<email>wi...@gentoo.org</email>
<name>Alex Alexander</name>
</maintainer>
- <maintainer>
+ <maintainer type="person">
<email>b...@bergstroem.nu</email>
<name>Johan Bergström</name>
<description>Proxy Maintainer. CC him on bugs</description>
</maintainer>
+ <maintainer type="project">
+ <email>proxy-ma...@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<longdescription lang="en">
Very Secure FTP Daemon written with speed, size and security
in mind
diff --git a/net-ftp/vsftpd/vsftpd-3.0.2-r3.ebuild
b/net-ftp/vsftpd/vsftpd-3.0.3.ebuild
similarity index 92%
rename from net-ftp/vsftpd/vsftpd-3.0.2-r3.ebuild
rename to net-ftp/vsftpd/vsftpd-3.0.3.ebuild
index 4d970fa..4c727fb 100644
--- a/net-ftp/vsftpd/vsftpd-3.0.2-r3.ebuild
+++ b/net-ftp/vsftpd/vsftpd-3.0.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 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-r3.ebuild,v 1.1
2014/09/14 11:04:49 hwoarang Exp $
+# $Id$
EAPI="4"
@@ -37,9 +37,6 @@ 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"
@@ -61,7 +58,7 @@ src_prepare() {
epatch "${FILESDIR}"/${PN}-3.0.0-Makefile.patch
#Bug #450536
- epatch "${FILESDIR}"/${P}-remove-legacy-cap.patch
+ epatch "${FILESDIR}"/${PN}-3.0.2-remove-legacy-cap.patch
epatch_user
}
