summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Savchenko <bircoph@gmail.com>2011-01-14 12:53:00 +0300
committerAndrew Savchenko <bircoph@gmail.com>2011-01-14 12:53:00 +0300
commit132bd2910226d05bccea93e4ffa03cbbf07266bb (patch)
treef3495cdec97a57f1d65e0f583297583d688c72af /net-ftp
parentgst-plugins-jpeg: sync with upstream (diff)
downloadbircoph-132bd2910226d05bccea93e4ffa03cbbf07266bb.tar.gz
bircoph-132bd2910226d05bccea93e4ffa03cbbf07266bb.tar.bz2
bircoph-132bd2910226d05bccea93e4ffa03cbbf07266bb.zip
vsftpd: sync with upstream
Diffstat (limited to 'net-ftp')
-rw-r--r--net-ftp/vsftpd/ChangeLog23
-rw-r--r--net-ftp/vsftpd/Manifest6
-rw-r--r--net-ftp/vsftpd/metadata.xml9
-rw-r--r--net-ftp/vsftpd/vsftpd-2.3.2-r1.ebuild2
4 files changed, 29 insertions, 11 deletions
diff --git a/net-ftp/vsftpd/ChangeLog b/net-ftp/vsftpd/ChangeLog
index 5999eb8..109b8d3 100644
--- a/net-ftp/vsftpd/ChangeLog
+++ b/net-ftp/vsftpd/ChangeLog
@@ -1,6 +1,25 @@
# ChangeLog for net-ftp/vsftpd
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/vsftpd/ChangeLog,v 1.130 2010/09/27 17:19:35 hwoarang Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/vsftpd/ChangeLog,v 1.136 2011/01/09 14:04:18 ranger Exp $
+
+ 09 Jan 2011; Brent Baude <ranger@gentoo.org> vsftpd-2.3.2-r1.ebuild:
+ stable ppc, bug 342991
+
+ 27 Nov 2010; Raúl Porcel <armin76@gentoo.org> vsftpd-2.3.2-r1.ebuild:
+ alpha/ia64/s390/sh/sparc stable wrt #342991
+
+ 03 Nov 2010; Markus Meier <maekke@gentoo.org> vsftpd-2.3.2-r1.ebuild:
+ arm stable, bug #342991
+
+ 02 Nov 2010; Dane Smith <c1pher@gentoo.org> metadata.xml:
+ Updated metadata to switch myself from proxy-maintainer to maintainer.
+
+ 01 Nov 2010; Christian Faulhammer <fauli@gentoo.org>
+ vsftpd-2.3.2-r1.ebuild:
+ stable x86, bug 342991
+
+ 31 Oct 2010; Markos Chandras <hwoarang@gentoo.org> vsftpd-2.3.2-r1.ebuild:
+ Stable on amd64 wrt bug #342991
*vsftpd-2.3.2-r1 (27 Sep 2010)
diff --git a/net-ftp/vsftpd/Manifest b/net-ftp/vsftpd/Manifest
index ebbb45a..8fecca3 100644
--- a/net-ftp/vsftpd/Manifest
+++ b/net-ftp/vsftpd/Manifest
@@ -9,6 +9,6 @@ AUX vsftpd.init 1922 RMD160 50925ca15a4f94662790244546454c523b6e4f95 SHA1 ef453f
AUX vsftpd.logrotate 53 RMD160 0fba0639da0d827fc0decfcf9ccd34fc7ad23c68 SHA1 cf18de9f84ad9a44974a7ae0f29562e9a516d5f9 SHA256 b31f4db8e2f8640f83bc38d83444ab784f8fc9a6492f654bb4149e1f566da2f3
AUX vsftpd.xinetd 432 RMD160 6e2b2d0517d0bf8a2a9d7ce42ca2ea4ce73fbca2 SHA1 5325ecbf0755ebd5778d69039393af075c1a9b40 SHA256 4e68c12108509823c74cd66f833299def48f497a4d660624362d3b4990af828f
DIST vsftpd-2.3.2.tar.gz 187229 RMD160 27bdc9d3065390a9dc85b3ef5926ad16d3544d2d SHA1 d525974514ecf61cbbf9cb51066aa68d5a52033b SHA256 a4e04836d8e271f361030e6a679ad001046c3e37f59e9fee5114189f9e065336
-EBUILD vsftpd-2.3.2-r1.ebuild 3364 RMD160 02fc230f83baba9e56da3598010786d35e028390 SHA1 4bb4337b0b6d125ff93cecd4e460a1860a683c56 SHA256 fe74eeeb39919a92fbefb5fc16939909c0f5d2d22ef02ca73463f1ebc51468c5
-MISC ChangeLog 18802 RMD160 5bcad64b50b7c51397dcea833a1b38d067377c98 SHA1 bd7361c0b868d19aefa986f3b8c85b0783797344 SHA256 e6486ae22de1bbc2949e46a332bd621bc02970288ceb83b9598975f339fbbf38
-MISC metadata.xml 787 RMD160 7dd2ce11a4b159f3ff13dfada4c3f64dfbdc2b65 SHA1 934d6bca5ca09d532a8035d0e8af2fccb7779f7f SHA256 e6454f27f20a66c40a8a4937d9ea920ce8c370a7363cf8a6370570ed47d16c86
+EBUILD vsftpd-2.3.2-r1.ebuild 3355 RMD160 9c75bcca544719681fd6636896bb9f666f72e747 SHA1 06ee1597a7d2fe6e624850d1e7af8a57c5d6b120 SHA256 c3d75c998a2f563bcfa458a1202f87a1b9997e5adafc182a744d05aa4bce876e
+MISC ChangeLog 19469 RMD160 e4042c4a541f2ac5f01512cb119508960affbdbc SHA1 3cfa66c83693e0e1bcc50f6657b4a6f7f7b4d702 SHA256 5f533e43c692834676c212994c5c5ecf0838e2e70170864399d2c2a723af69df
+MISC metadata.xml 724 RMD160 e0592272500a06dbd5bfa5d6f7e379a5390a2d02 SHA1 0292de42362025b58ea73c06513f35ff0a4eb56d SHA256 a718c41114032e6e27f6168b40e3ab324b9b17e3436e32a50caecb45ef7f59b4
diff --git a/net-ftp/vsftpd/metadata.xml b/net-ftp/vsftpd/metadata.xml
index 0000276..12e7f5b 100644
--- a/net-ftp/vsftpd/metadata.xml
+++ b/net-ftp/vsftpd/metadata.xml
@@ -11,13 +11,12 @@
<name>Alex Alexander</name>
</maintainer>
<maintainer>
- <email>bugs@bergstroem.nu</email>
- <name>Johan Bergström</name>
- <description>Proxy Maintainer. CC him on bugs</description>
+ <email>c1pher@gentoo.org</email>
+ <name>Dane Smith</name>
</maintainer>
<maintainer>
- <email>smithdanea@gmail.com</email>
- <name>Dane Smith</name>
+ <email>bugs@bergstroem.nu</email>
+ <name>Johan Bergström</name>
<description>Proxy Maintainer. CC him on bugs</description>
</maintainer>
<longdescription lang="en">
diff --git a/net-ftp/vsftpd/vsftpd-2.3.2-r1.ebuild b/net-ftp/vsftpd/vsftpd-2.3.2-r1.ebuild
index eb75d0b..39ef81e 100644
--- a/net-ftp/vsftpd/vsftpd-2.3.2-r1.ebuild
+++ b/net-ftp/vsftpd/vsftpd-2.3.2-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="ftp://vsftpd.beasts.org/users/cevans/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ia64 ppc ~ppc64 s390 sh sparc x86 ~x86-fbsd"
IUSE="caps pam tcpd ssl selinux xinetd"
DEPEND="caps? ( >=sys-libs/libcap-2 )