diff options
| author |   Jeffrey Forman <jforman@gentoo.org> | 2004-10-01 03:16:13 +0000 |
|---|---|---|
| committer | Jeffrey Forman <jforman@gentoo.org> | 2004-10-01 03:16:13 +0000 |
| commit | 487b37f875ca82ce69968e6b91fd905003179b81 (patch) | |
| tree | 1ff5533a3653ea7763ff6777fa39e062d401d2c3 /net-ftp/vsftpd | |
| parent | bleh, removed wrong ebuild, fix KEYWORDS (diff) | |
| download | historical-487b37f875ca82ce69968e6b91fd905003179b81.tar.gz historical-487b37f875ca82ce69968e6b91fd905003179b81.tar.bz2 historical-487b37f875ca82ce69968e6b91fd905003179b81.zip | |
updated init.d/vsftpd to remove insecure source cmd call, bug 51908
Diffstat (limited to 'net-ftp/vsftpd')
| -rw-r--r-- | net-ftp/vsftpd/ChangeLog | 5 | ||||
| -rw-r--r-- | net-ftp/vsftpd/Manifest | 4 | ||||
| -rw-r--r-- | net-ftp/vsftpd/files/vsftpd.init.d | 13 |
3 files changed, 12 insertions, 10 deletions
diff --git a/net-ftp/vsftpd/ChangeLog b/net-ftp/vsftpd/ChangeLog index f92e2446bf93..ed631ad65124 100644 --- a/net-ftp/vsftpd/ChangeLog +++ b/net-ftp/vsftpd/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for net-ftp/vsftpd # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-ftp/vsftpd/ChangeLog,v 1.44 2004/09/29 03:11:23 tgall Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-ftp/vsftpd/ChangeLog,v 1.45 2004/10/01 03:16:13 jforman Exp $ + + 30 Sep 2004; Jeffrey Forman <jforman@gentoo.org> files/vsftpd.init.d: + updated init.d/vsftpd to remove source cmd per bug #51908 28 Sep 2004; Tom Gall <tgall@gentoo.org> vsftpd-1.2.2.ebuild, +vsftpd-1.2.2-ppc64.diff: diff --git a/net-ftp/vsftpd/Manifest b/net-ftp/vsftpd/Manifest index c0eb90afb062..e03372981fb2 100644 --- a/net-ftp/vsftpd/Manifest +++ b/net-ftp/vsftpd/Manifest @@ -1,4 +1,4 @@ -MD5 2a62ffc7525e208f09131b7f0cfa3dd4 ChangeLog 5124 +MD5 7866ca085e7bfd2fb981065aae4fd1f8 ChangeLog 5259 MD5 d161cb0e313c1619fc61077d5b0c8821 metadata.xml 251 MD5 d1a2ec32b0639d78243cc5aee840eb9f vsftpd-1.0.1-r1.ebuild 1325 MD5 213703fc92069b2036caf192afb39068 vsftpd-1.2.0-r1.ebuild 2218 @@ -15,7 +15,7 @@ MD5 12157a137e6633887fad5c7a8e1e1ae3 files/vsftpd-1.2.0-gentoo.diff.bz2 2078 MD5 3b7d7a76cbc4e8ca1754e7ffef193d09 files/vsftpd-1.2.1-gentoo.diff.bz2 2080 MD5 eb057c63bffcf702e1b8d0f9e406b6e5 files/vsftpd.conf 3770 MD5 a61f83e896d2058a22f9fb3d2b2b1b25 files/vsftpd.conf.d 294 -MD5 73da8f18451d3c3770c539e5dde163ef files/vsftpd.init.d 979 +MD5 d2bbf1b4e07a4f1f51f313274eb2e320 files/vsftpd.init.d 974 MD5 aaa55785aee7dd51daf75a72232693f9 files/vsftpd.pam 481 MD5 e50b10a57c22f7b27de250b8b65038a0 files/vsftpd.xinetd 468 MD5 32951e2e5a1c743fa96533989167c54a files/vsftpd.xinetd.ipv6 488 diff --git a/net-ftp/vsftpd/files/vsftpd.init.d b/net-ftp/vsftpd/files/vsftpd.init.d index 3ac01e6a5221..5f1c4ca527e9 100644 --- a/net-ftp/vsftpd/files/vsftpd.init.d +++ b/net-ftp/vsftpd/files/vsftpd.init.d @@ -1,7 +1,7 @@ #!/sbin/runscript # Copyright 2003-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License, v2 -# $Header: /var/cvsroot/gentoo-x86/net-ftp/vsftpd/files/vsftpd.init.d,v 1.3 2004/07/14 23:44:02 agriffis Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-ftp/vsftpd/files/vsftpd.init.d,v 1.4 2004/10/01 03:16:13 jforman Exp $ depend() { need net @@ -14,12 +14,11 @@ checkconfig() { eerror "There are sample configurations in /usr/share/doc/vsftpd" return 1 else - source ${VSFTPD_CONF} - if [ "${background}" != "YES" ] || [ "${listen}" != "YES" ] ; then - eerror "${VSFTPD_CONF} must contain background=YES and listen=YES" - eerror "in order to start vsftpd from /etc/init.d/vsftpd" - return 2 - fi + ( grep -q "^background=YES" ${VSFTPD_CONF} && grep -q "^listen=YES" ${VSFTPD_CONF} ) || { + eerror "${VSFTPD_CONF} must contain background=YES and listen=YES" + eerror "in order to start vsftpd from /etc/init.d/vsftpd" + return 2 + } fi } |