amd64 stable, security bug 158122

Package-Manager: portage-2.1.1-r2

3 files changed, 16 insertions, 23 deletions

diff --git a/net-ftp/proftpd/ChangeLog b/net-ftp/proftpd/ChangeLog
index 13d8a54a3ea0..fc60e8e80c0d 100644
--- a/net-ftp/proftpd/ChangeLog
+++ b/net-ftp/proftpd/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-ftp/proftpd
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/ChangeLog,v 1.145 2007/01/19 20:10:20 eroyf Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/ChangeLog,v 1.146 2007/01/23 10:18:19 beandog Exp $
+
+  23 Jan 2007; Steve Dibb <beandog@gentoo.org> proftpd-1.3.1_rc1.ebuild:
+  amd64 stable, security bug 158122
 
   19 Jan 2007; Alexander H. Færøy <eroyf@gentoo.org>
   proftpd-1.3.0a.ebuild:
diff --git a/net-ftp/proftpd/Manifest b/net-ftp/proftpd/Manifest
index 1e27ea6675e2..58339807d533 100644
--- a/net-ftp/proftpd/Manifest
+++ b/net-ftp/proftpd/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX proftpd-1.2.10-ftpshut.patch 897 RMD160 5044b188c400160b1c22c85ea91099b1b4280898 SHA1 2b18239d4742ddb18727aaf08e1c72ea5ba96b1d SHA256 9759256452dacf7c7b197e9b038fd939ade0459ba089536b67d15a01c124ad76
 MD5 f739a48054eabaf69f819f6e31bad069 files/proftpd-1.2.10-ftpshut.patch 897
 RMD160 5044b188c400160b1c22c85ea91099b1b4280898 files/proftpd-1.2.10-ftpshut.patch 897
@@ -62,14 +59,14 @@ EBUILD proftpd-1.3.0a.ebuild 6324 RMD160 bb8c7ef49740421565f367a878f9317663c0ee4
 MD5 99c7fd08e691cf6b4bdcd6b96540d83e proftpd-1.3.0a.ebuild 6324
 RMD160 bb8c7ef49740421565f367a878f9317663c0ee4f proftpd-1.3.0a.ebuild 6324
 SHA256 657b825e022ced3d001b39836a69cca6234cdbb354e5b32f56df81e46ae33fff proftpd-1.3.0a.ebuild 6324
-EBUILD proftpd-1.3.1_rc1.ebuild 6063 RMD160 40b2ea0782e22d34614194f26354a7e187431d94 SHA1 c5ffb685c9a78ca10d40603854499f8bdd493c30 SHA256 2339f437176487738bbd9fc138884ec5e08b1c5e5bca403d9d7c3b2066abb839
-MD5 a8390cc73357aeae765974064601e17a proftpd-1.3.1_rc1.ebuild 6063
-RMD160 40b2ea0782e22d34614194f26354a7e187431d94 proftpd-1.3.1_rc1.ebuild 6063
-SHA256 2339f437176487738bbd9fc138884ec5e08b1c5e5bca403d9d7c3b2066abb839 proftpd-1.3.1_rc1.ebuild 6063
-MISC ChangeLog 23334 RMD160 b06ff0f8ef029872cc84f6364d2b0c09f446fc4a SHA1 b8cde7658b656c43e2c9ec7d370eacbcd21433ee SHA256 dd3888143e6ede8538fea8ea8f1394bb4de598d74102d4c98cea876841fa9dbf
-MD5 6178747322ab63cea08dd6e473bd7a28 ChangeLog 23334
-RMD160 b06ff0f8ef029872cc84f6364d2b0c09f446fc4a ChangeLog 23334
-SHA256 dd3888143e6ede8538fea8ea8f1394bb4de598d74102d4c98cea876841fa9dbf ChangeLog 23334
+EBUILD proftpd-1.3.1_rc1.ebuild 6071 RMD160 006c878d8501acd38f51efb4e5fa0f360f43c9bd SHA1 095bb3bd5566e4492f97e6d31552ac1f0c884f91 SHA256 694952706be2f757deeaed689d2484d4cbc9ec3a41f08287fa6dede8e6814ae5
+MD5 20d18d680a5e135d747de27f3ee994df proftpd-1.3.1_rc1.ebuild 6071
+RMD160 006c878d8501acd38f51efb4e5fa0f360f43c9bd proftpd-1.3.1_rc1.ebuild 6071
+SHA256 694952706be2f757deeaed689d2484d4cbc9ec3a41f08287fa6dede8e6814ae5 proftpd-1.3.1_rc1.ebuild 6071
+MISC ChangeLog 23446 RMD160 872ba2612c5852a267bab0a2fec027aebe45cb3b SHA1 fb7a2f06379a7c4ddb6fe1ce7273ba8eb6bd320a SHA256 9a480b7d8f82dc4b88040595ce32ddea71fc19dec9a96fe2a7ec63f6fe4186a0
+MD5 00e9af53cc353049064144a91cde7c3a ChangeLog 23446
+RMD160 872ba2612c5852a267bab0a2fec027aebe45cb3b ChangeLog 23446
+SHA256 9a480b7d8f82dc4b88040595ce32ddea71fc19dec9a96fe2a7ec63f6fe4186a0 ChangeLog 23446
 MISC metadata.xml 397 RMD160 310baca7e2be7fea56472b78607c3f97eb6947e8 SHA1 ce13b1daa647114e642c1f5382fbd6453764e6b7 SHA256 18ffe70b54ea4d5875b74347b2580cb8dddbede73c3ccd9a6ef6981b7adb8a4f
 MD5 0dd625f2b64b8b0be0609009435beea1 metadata.xml 397
 RMD160 310baca7e2be7fea56472b78607c3f97eb6947e8 metadata.xml 397
@@ -83,10 +80,3 @@ SHA256 ce23a27fd36f6b5227bdec431ab632356e4a244e8eda95dbc188bcf58da665ed files/di
 MD5 e9e52e20055997806dbe1f5d23b5b5e8 files/digest-proftpd-1.3.1_rc1 1247
 RMD160 08385084022247973b438a28c18cd368e4045b6c files/digest-proftpd-1.3.1_rc1 1247
 SHA256 a93ef45a9e9098d97dec4a88eb13de30dc59d88c2e80c734ec7a6d55ce919538 files/digest-proftpd-1.3.1_rc1 1247
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.1 (GNU/Linux)
-
-iD8DBQFFsSWR6Xxn2nLwtdQRAtoRAJ9lGqJLfTQOL769mCsQAU8kgZ/yMACfQEwu
-60IAU2Dzgaz4yH92gxzyqyg=
-=JVUd
------END PGP SIGNATURE-----
diff --git a/net-ftp/proftpd/proftpd-1.3.1_rc1.ebuild b/net-ftp/proftpd/proftpd-1.3.1_rc1.ebuild
index 6d2ebf09a216..6e1d36f5f4e6 100644
--- a/net-ftp/proftpd/proftpd-1.3.1_rc1.ebuild
+++ b/net-ftp/proftpd/proftpd-1.3.1_rc1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/proftpd-1.3.1_rc1.ebuild,v 1.7 2006/12/24 22:32:06 killerfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/proftpd-1.3.1_rc1.ebuild,v 1.8 2007/01/23 10:18:19 beandog Exp $
 
 inherit eutils flag-o-matic toolchain-funcs
 
-KEYWORDS="alpha ~amd64 hppa ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86"
 
 IUSE="acl authfile clamav hardened ifsession ipv6 ldap mysql ncurses nls noauthunix opensslcrypt pam postgres radius rewrite selinux shaper sitemisc softquota ssl tcpd vroot xinetd"
 
@@ -24,7 +24,7 @@ SLOT="0"
 LICENSE="GPL-2"
 
 DEPEND="acl? ( sys-apps/acl sys-apps/attr )
-		clamav? ( app-antivirus/clamav )
+		!mips? ( clamav? ( app-antivirus/clamav ) )
 		ldap? ( >=net-nds/openldap-1.2.11 )
 		mysql? ( virtual/mysql )
 		ncurses? ( sys-libs/ncurses )