From: Andrej Kacian <ticho@gentoo.org>
Date: Thu, 21 Dec 2006 18:48:02 +0000 (+0000)
Subject: Stable on x86, security bug #158122.
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=5e6c86325f559313867a5dad97bebc400367faca;p=gentoo.git

Stable on x86, security bug #158122.
Package-Manager: portage-2.1.2_rc3-r7
---

diff --git a/net-ftp/proftpd/ChangeLog b/net-ftp/proftpd/ChangeLog
index 50efb738ca98..03ac0e2c1037 100644
--- a/net-ftp/proftpd/ChangeLog
+++ b/net-ftp/proftpd/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-ftp/proftpd
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/ChangeLog,v 1.141 2006/12/21 14:56:31 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/ChangeLog,v 1.142 2006/12/21 18:48:02 ticho Exp $
+
+  21 Dec 2006; Andrej Kacian <ticho@gentoo.org> proftpd-1.3.1_rc1.ebuild:
+  Stable on x86, security bug #158122.
 
   21 Dec 2006; Gustavo Zacarias <gustavoz@gentoo.org>
   proftpd-1.3.1_rc1.ebuild:
diff --git a/net-ftp/proftpd/Manifest b/net-ftp/proftpd/Manifest
index ab74c3d1242e..b26bcce7e47d 100644
--- a/net-ftp/proftpd/Manifest
+++ b/net-ftp/proftpd/Manifest
@@ -62,14 +62,14 @@ EBUILD proftpd-1.3.0a.ebuild 6319 RMD160 7044c76524328003d95f1610f09b1388dc28510
 MD5 b65af93cf8d408443690afdf3c22ad34 proftpd-1.3.0a.ebuild 6319
 RMD160 7044c76524328003d95f1610f09b1388dc285101 proftpd-1.3.0a.ebuild 6319
 SHA256 219c81c01a0d2169e2a0b68ab81163fd3b1df226debf6f5681af4c897d5fbf3a proftpd-1.3.0a.ebuild 6319
-EBUILD proftpd-1.3.1_rc1.ebuild 6065 RMD160 2915776177523b0c2a4a36a48abe5bc9277bc497 SHA1 c6d0d58606331153abf52ce31f37e4c9c0247e4c SHA256 4caa9af5fb551608f7eb470da9373fb81cc8634f4b582ab0f76fcea719286411
-MD5 6fe0c3a756e30384e888135d9e6bc580 proftpd-1.3.1_rc1.ebuild 6065
-RMD160 2915776177523b0c2a4a36a48abe5bc9277bc497 proftpd-1.3.1_rc1.ebuild 6065
-SHA256 4caa9af5fb551608f7eb470da9373fb81cc8634f4b582ab0f76fcea719286411 proftpd-1.3.1_rc1.ebuild 6065
-MISC ChangeLog 22882 RMD160 90bcee1704afbd358a98513753b326428d76ba4a SHA1 72215a8c4149644d66e69cfb6f80cd65642414c2 SHA256 cadee09a070bd034a8497d2e42b7f41067fb8a735ad44e2407a58f3fd221a41b
-MD5 e4925fcd0ed8df795490b1a5c95aba56 ChangeLog 22882
-RMD160 90bcee1704afbd358a98513753b326428d76ba4a ChangeLog 22882
-SHA256 cadee09a070bd034a8497d2e42b7f41067fb8a735ad44e2407a58f3fd221a41b ChangeLog 22882
+EBUILD proftpd-1.3.1_rc1.ebuild 6061 RMD160 715e9c15ebfc4843ea49319b5f08d23b384d5e34 SHA1 ee57f3e1d2422419dc38176196fce674bfd37000 SHA256 69f4bfec5d2bf8042810dbd67bd74e2b2dd3dc40cdea9ea9ee2083e5d2e0974c
+MD5 38696ebf08828fdd84a547ac3261b874 proftpd-1.3.1_rc1.ebuild 6061
+RMD160 715e9c15ebfc4843ea49319b5f08d23b384d5e34 proftpd-1.3.1_rc1.ebuild 6061
+SHA256 69f4bfec5d2bf8042810dbd67bd74e2b2dd3dc40cdea9ea9ee2083e5d2e0974c proftpd-1.3.1_rc1.ebuild 6061
+MISC ChangeLog 22993 RMD160 ae857afbbe6da757da7a8b25f977be298027fc02 SHA1 f782d94719503f149b1513f2640c27d461b6be0e SHA256 68dc29694cd7917931c032722fedad6cb218c1cd2dd5a1745cbda353c384a803
+MD5 d376a342d5873a9ac04a6ecc301e9ab8 ChangeLog 22993
+RMD160 ae857afbbe6da757da7a8b25f977be298027fc02 ChangeLog 22993
+SHA256 68dc29694cd7917931c032722fedad6cb218c1cd2dd5a1745cbda353c384a803 ChangeLog 22993
 MISC metadata.xml 397 RMD160 310baca7e2be7fea56472b78607c3f97eb6947e8 SHA1 ce13b1daa647114e642c1f5382fbd6453764e6b7 SHA256 18ffe70b54ea4d5875b74347b2580cb8dddbede73c3ccd9a6ef6981b7adb8a4f
 MD5 0dd625f2b64b8b0be0609009435beea1 metadata.xml 397
 RMD160 310baca7e2be7fea56472b78607c3f97eb6947e8 metadata.xml 397
@@ -84,9 +84,9 @@ 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 v1.4.6-ecc01.6 (GNU/Linux)
+Version: GnuPG v1.4.6 (GNU/Linux)
 
-iD8DBQFFiqCmKRy60XGEcJIRArUzAJ9zBHZriSIPkrXI5DUiEl3zRZStmACeKPM9
-F2W1Vbj5Lkucr2z78XDwJXA=
-=nhoI
+iD8DBQFFitbtQlM6RnzZP+IRAnI7AJsFMj6M2SzOREMZjyZkOSW0IDI93wCfYd6k
+Cv9F66KrAWrPPSf5GpNOYtc=
+=KUXO
 -----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 8b6031f0653e..1d4703720332 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
 # 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.4 2006/12/21 14:56:31 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/proftpd-1.3.1_rc1.ebuild,v 1.5 2006/12/21 18:48:02 ticho 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"