Fix bug #186656.

Package-Manager: portage-2.1.3.6

5 files changed, 38 insertions, 32 deletions

diff --git a/net-ftp/proftpd/ChangeLog b/net-ftp/proftpd/ChangeLog
index 64e6b9019ae6..3fe6284504c6 100644
--- a/net-ftp/proftpd/ChangeLog
+++ b/net-ftp/proftpd/ChangeLog
@@ -1,6 +1,14 @@
 # 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.163 2007/06/28 18:51:46 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/ChangeLog,v 1.164 2007/08/26 12:39:36 chtekk Exp $
+
+*proftpd-1.3.1_rc3 (26 Aug 2007)
+
+  26 Aug 2007; Luca Longinotti <chtekk@gentoo.org>
+  -proftpd-1.3.1_rc2-r1.ebuild, proftpd-1.3.1_rc2-r3.ebuild,
+  +proftpd-1.3.1_rc3.ebuild:
+  AMD64 stable of 1.3.1_rc2-r3 to get rid of the broken 1.3.1_rc2-r1.
+  Added 1.3.1_rc3 and updated mod_shaper to 0.6.3, fixes bug #186656.
 
   28 Jun 2007; Tobias Scherbaum <dertobi123@gentoo.org>
   proftpd-1.3.1_rc2-r3.ebuild:
diff --git a/net-ftp/proftpd/Manifest b/net-ftp/proftpd/Manifest
index 017a3be0a685..383a90422e93 100644
--- a/net-ftp/proftpd/Manifest
+++ b/net-ftp/proftpd/Manifest
@@ -33,27 +33,29 @@ SHA256 150a5701f5c2788ecdf2c6ec228ce674963c9dc7bc1c511ad1eba8dfe05e2d5d files/pr
 DIST mod_clamav_new.c 7399 RMD160 ae4de6385245a3c79d3c54bb7af9d2fe45a59feb SHA1 f037c573b6c0052f8ed5ee427504a8cd8834f15c SHA256 a5a3860c73c8bc3781516cbc912d7736517a92a15a6fd8352eeed638bcce60c1
 DIST mod_clamav_new.html 4645 RMD160 bc853541e6859e7929c0ed9b01b8f220e09b8ca2 SHA1 58479f3aae082effad3636026a27c09ddb232905 SHA256 ac0ab5f44cfc6c8118664c2a7300450486f52fb3bcde332b4bb9c506dd765a1e
 DIST proftpd-1.3.1rc2.tar.bz2 1516464 RMD160 aa928315880cf1e9d1980850ce2bb07193d2ac46 SHA1 7db6435707983fe8e865064661cedb159ebc1cf6 SHA256 7494ea061ef28efc7afa63ffe0a80d598a55909d06dede9254e955c67e6440da
+DIST proftpd-1.3.1rc3.tar.bz2 1538700 RMD160 68cbdd137caa0f7a46be18eb682d5c3c516ca167 SHA1 a752ccc2ea4d7ae6f55ac5486d1ede01f734280c SHA256 9bad65ea4ddca40547ca6bb1aa337c7d4ae54752bb9f5fc76124a8c4535daefd
 DIST proftpd-mod-shaper-0.6.2.tar.gz 19002 RMD160 3d1fdb82596672c9177009ebb30459a017e74c53 SHA1 930d6dc6b8785da48dc7102db5f1eb20546ccd75 SHA256 59f39bca40462c3bba20feb7be031d7453c366adb4b7fa6d8f50974eb45ae99e
+DIST proftpd-mod-shaper-0.6.3.tar.gz 19040 RMD160 9978fda37d0099c48d755e53132482506c948c05 SHA1 a5c9a1889c441b9290f2c571ad7fc06bebaf9326 SHA256 a6947836461872adca53dab2708b1e140fa6ce7a8b93ccbe2dafbc3ca63fde67
 DIST proftpd-mod-vroot-0.7.2.tar.gz 6071 RMD160 b152162b3714910d5b9378611313041c3e7e17d4 SHA1 3fc4c5874deba4bbe989b0bd54a7478a47f3d876 SHA256 cab5a42390eac4e0b8bdcbe1e6d15804c8029d51da9ad3bd428b46a80cd69d5a
-EBUILD proftpd-1.3.1_rc2-r1.ebuild 6240 RMD160 502eb0b89cb36c6aa44d7fd8fd3a1769dbc502d0 SHA1 f8a3e9ed1cd5009181f304d9e9207596b02f8497 SHA256 cb477527e8c736d4f19bb7ffe445ccc8a57558cb6c7d950ceb92742f81e4060e
-MD5 88980909ce06367304e5d0f5fd354e6a proftpd-1.3.1_rc2-r1.ebuild 6240
-RMD160 502eb0b89cb36c6aa44d7fd8fd3a1769dbc502d0 proftpd-1.3.1_rc2-r1.ebuild 6240
-SHA256 cb477527e8c736d4f19bb7ffe445ccc8a57558cb6c7d950ceb92742f81e4060e proftpd-1.3.1_rc2-r1.ebuild 6240
-EBUILD proftpd-1.3.1_rc2-r3.ebuild 6345 RMD160 9d850f5a72e31f1f27a93c2a66376031c3adfa4e SHA1 f8c904cdd8a319d4b9311dcb2a39cc45facac34a SHA256 bdd0a919d5150194b2a4a310e54c2ce8a4020bcc442c9011d93fceb20401a678
-MD5 a9d573ceb716b5a734a7bc6f08d2bba8 proftpd-1.3.1_rc2-r3.ebuild 6345
-RMD160 9d850f5a72e31f1f27a93c2a66376031c3adfa4e proftpd-1.3.1_rc2-r3.ebuild 6345
-SHA256 bdd0a919d5150194b2a4a310e54c2ce8a4020bcc442c9011d93fceb20401a678 proftpd-1.3.1_rc2-r3.ebuild 6345
-MISC ChangeLog 26400 RMD160 72d224b136934b974544f5a5f8e9e98ef98c2894 SHA1 b64d847ad396193d0d22c1a297f38aa690467359 SHA256 837d706334f82b75f8ede5269a13bff1a4cdc7485c8ca0e56ec2846badbd9f99
-MD5 19b9cfdfee59ebe289a423d1f91c0f42 ChangeLog 26400
-RMD160 72d224b136934b974544f5a5f8e9e98ef98c2894 ChangeLog 26400
-SHA256 837d706334f82b75f8ede5269a13bff1a4cdc7485c8ca0e56ec2846badbd9f99 ChangeLog 26400
+EBUILD proftpd-1.3.1_rc2-r3.ebuild 6340 RMD160 f199bb8c2b239237e50020d6c06b9f55b48b1105 SHA1 7f387d202c3d7cfcf4abaaf3a0594b1fdf41e498 SHA256 3caf1efa45d4a4de7006bb369a5cff0607387dc256eecc79bcee30d843314e2f
+MD5 d3957fcaabaf545818272d74bf850b89 proftpd-1.3.1_rc2-r3.ebuild 6340
+RMD160 f199bb8c2b239237e50020d6c06b9f55b48b1105 proftpd-1.3.1_rc2-r3.ebuild 6340
+SHA256 3caf1efa45d4a4de7006bb369a5cff0607387dc256eecc79bcee30d843314e2f proftpd-1.3.1_rc2-r3.ebuild 6340
+EBUILD proftpd-1.3.1_rc3.ebuild 6094 RMD160 efd227d0ef1672b1b005b51e01828a1147fe71c8 SHA1 80b8afefa92427992a89203155e1180c4278b961 SHA256 c542e23e2d1652a23d1e74a22fd022731702f9ede6fb2c9079ff869e0a4064dd
+MD5 6b7e894f5b1bab28fa119ad9742367a8 proftpd-1.3.1_rc3.ebuild 6094
+RMD160 efd227d0ef1672b1b005b51e01828a1147fe71c8 proftpd-1.3.1_rc3.ebuild 6094
+SHA256 c542e23e2d1652a23d1e74a22fd022731702f9ede6fb2c9079ff869e0a4064dd proftpd-1.3.1_rc3.ebuild 6094
+MISC ChangeLog 26712 RMD160 0debc947a64e5259bd12321b917688fcf7e4d421 SHA1 86fc91f46d17eea6b36eb8d2387d2b9da3cb045b SHA256 4bd6a6451bd7259c7d0c82f1a2a0810caba2751c100a52b09194ec27a96fa752
+MD5 31cfeb99efa3aebea32c76bfe88d1c8b ChangeLog 26712
+RMD160 0debc947a64e5259bd12321b917688fcf7e4d421 ChangeLog 26712
+SHA256 4bd6a6451bd7259c7d0c82f1a2a0810caba2751c100a52b09194ec27a96fa752 ChangeLog 26712
 MISC metadata.xml 397 RMD160 310baca7e2be7fea56472b78607c3f97eb6947e8 SHA1 ce13b1daa647114e642c1f5382fbd6453764e6b7 SHA256 18ffe70b54ea4d5875b74347b2580cb8dddbede73c3ccd9a6ef6981b7adb8a4f
 MD5 0dd625f2b64b8b0be0609009435beea1 metadata.xml 397
 RMD160 310baca7e2be7fea56472b78607c3f97eb6947e8 metadata.xml 397
 SHA256 18ffe70b54ea4d5875b74347b2580cb8dddbede73c3ccd9a6ef6981b7adb8a4f metadata.xml 397
-MD5 30f9fa74bf7f8ecba9d33f7d34a97380 files/digest-proftpd-1.3.1_rc2-r1 1247
-RMD160 b53ee9642bc16ad5b251af0db0cc064ee91e4512 files/digest-proftpd-1.3.1_rc2-r1 1247
-SHA256 f923188a0ae722aca509cfb7fbd6e50e8343aae41a7e0a54f38bd9adc767cfcb files/digest-proftpd-1.3.1_rc2-r1 1247
 MD5 30f9fa74bf7f8ecba9d33f7d34a97380 files/digest-proftpd-1.3.1_rc2-r3 1247
 RMD160 b53ee9642bc16ad5b251af0db0cc064ee91e4512 files/digest-proftpd-1.3.1_rc2-r3 1247
 SHA256 f923188a0ae722aca509cfb7fbd6e50e8343aae41a7e0a54f38bd9adc767cfcb files/digest-proftpd-1.3.1_rc2-r3 1247
+MD5 6cd2759dff87195c9b099b832ac93be9 files/digest-proftpd-1.3.1_rc3 1247
+RMD160 9e8af2c8c6970bdc9278bdd3a1acd82f5cd878e7 files/digest-proftpd-1.3.1_rc3 1247
+SHA256 4ae03987df8ed60a6e0965e7afea6b016c01a7282bbd7747afa8935f2d03ad19 files/digest-proftpd-1.3.1_rc3 1247
diff --git a/net-ftp/proftpd/files/digest-proftpd-1.3.1_rc2-r1 b/net-ftp/proftpd/files/digest-proftpd-1.3.1_rc3
index b18daddb66a6..d07c5dfe30d9 100644
--- a/net-ftp/proftpd/files/digest-proftpd-1.3.1_rc2-r1
+++ b/net-ftp/proftpd/files/digest-proftpd-1.3.1_rc3
@@ -4,12 +4,12 @@ SHA256 a5a3860c73c8bc3781516cbc912d7736517a92a15a6fd8352eeed638bcce60c1 mod_clam
 MD5 098551feed28f069ef01e77af88d55dc mod_clamav_new.html 4645
 RMD160 bc853541e6859e7929c0ed9b01b8f220e09b8ca2 mod_clamav_new.html 4645
 SHA256 ac0ab5f44cfc6c8118664c2a7300450486f52fb3bcde332b4bb9c506dd765a1e mod_clamav_new.html 4645
-MD5 b117abb8fa7df8bc6d5e2ee85d97b4e0 proftpd-1.3.1rc2.tar.bz2 1516464
-RMD160 aa928315880cf1e9d1980850ce2bb07193d2ac46 proftpd-1.3.1rc2.tar.bz2 1516464
-SHA256 7494ea061ef28efc7afa63ffe0a80d598a55909d06dede9254e955c67e6440da proftpd-1.3.1rc2.tar.bz2 1516464
-MD5 74fbdcac94cde09c67bc033e22324c8c proftpd-mod-shaper-0.6.2.tar.gz 19002
-RMD160 3d1fdb82596672c9177009ebb30459a017e74c53 proftpd-mod-shaper-0.6.2.tar.gz 19002
-SHA256 59f39bca40462c3bba20feb7be031d7453c366adb4b7fa6d8f50974eb45ae99e proftpd-mod-shaper-0.6.2.tar.gz 19002
+MD5 485af3aee9ecebfeae1ae2003250a3a9 proftpd-1.3.1rc3.tar.bz2 1538700
+RMD160 68cbdd137caa0f7a46be18eb682d5c3c516ca167 proftpd-1.3.1rc3.tar.bz2 1538700
+SHA256 9bad65ea4ddca40547ca6bb1aa337c7d4ae54752bb9f5fc76124a8c4535daefd proftpd-1.3.1rc3.tar.bz2 1538700
+MD5 abe5e8b28241f03e1aa648654201d840 proftpd-mod-shaper-0.6.3.tar.gz 19040
+RMD160 9978fda37d0099c48d755e53132482506c948c05 proftpd-mod-shaper-0.6.3.tar.gz 19040
+SHA256 a6947836461872adca53dab2708b1e140fa6ce7a8b93ccbe2dafbc3ca63fde67 proftpd-mod-shaper-0.6.3.tar.gz 19040
 MD5 7abc595e45ce13e38edd6110d1745436 proftpd-mod-vroot-0.7.2.tar.gz 6071
 RMD160 b152162b3714910d5b9378611313041c3e7e17d4 proftpd-mod-vroot-0.7.2.tar.gz 6071
 SHA256 cab5a42390eac4e0b8bdcbe1e6d15804c8029d51da9ad3bd428b46a80cd69d5a proftpd-mod-vroot-0.7.2.tar.gz 6071
diff --git a/net-ftp/proftpd/proftpd-1.3.1_rc2-r3.ebuild b/net-ftp/proftpd/proftpd-1.3.1_rc2-r3.ebuild
index 57069b3d80bc..67473bb4688d 100644
--- a/net-ftp/proftpd/proftpd-1.3.1_rc2-r3.ebuild
+++ b/net-ftp/proftpd/proftpd-1.3.1_rc2-r3.ebuild
@@ -1,10 +1,10 @@
 # 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_rc2-r3.ebuild,v 1.2 2007/06/28 18:51:46 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/proftpd-1.3.1_rc2-r3.ebuild,v 1.3 2007/08/26 12:39:36 chtekk Exp $
 
 inherit eutils flag-o-matic toolchain-funcs
 
-KEYWORDS="alpha ~amd64 hppa ~mips ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 hppa ~mips 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"
 
diff --git a/net-ftp/proftpd/proftpd-1.3.1_rc2-r1.ebuild b/net-ftp/proftpd/proftpd-1.3.1_rc3.ebuild
index 56103ac65bde..90d835c1ad90 100644
--- a/net-ftp/proftpd/proftpd-1.3.1_rc2-r1.ebuild
+++ b/net-ftp/proftpd/proftpd-1.3.1_rc3.ebuild
@@ -1,14 +1,14 @@
 # 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_rc2-r1.ebuild,v 1.8 2007/05/16 20:21:47 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/proftpd-1.3.1_rc3.ebuild,v 1.1 2007/08/26 12:39:36 chtekk Exp $
 
 inherit eutils flag-o-matic toolchain-funcs
 
-KEYWORDS="alpha amd64 hppa ~mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~mips ~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"
 
-SHAPER_VER="0.6.2"
+SHAPER_VER="0.6.3"
 VROOT_VER="0.7.2"
 
 DESCRIPTION="An advanced and very configurable FTP server."
@@ -53,11 +53,6 @@ src_unpack() {
 
 	cd "${S}"
 
-	# Fix bugs #164612, #167003 and #175082
-	epatch "${FILESDIR}/${P}-bug164612.patch"
-	epatch "${FILESDIR}/${P}-bug167003.patch"
-	epatch "${FILESDIR}/${P}-bug175082.patch"
-
 	# Fix stripping of files
 	sed -e "s| @INSTALL_STRIP@||g" -i Make*
 
@@ -182,6 +177,7 @@ src_install() {
 		COPYING CREDITS ChangeLog NEWS README* \
 		doc/license.txt
 	dohtml doc/*.html
+	dohtml doc/howto/*.html
 
 	use shaper && dohtml mod_shaper/mod_shaper.html