Fix bug #186656.

(Portage version: 2.1.3.6)

4 files changed, 21 insertions, 17 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/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