Version bump to 1.2.0_rc1 bug #269200, cleaning out beta

Package-Manager: portage-2.1.6.13/cvs/Linux i686

4 files changed, 15 insertions, 29 deletions

diff --git a/net-irc/dircproxy/ChangeLog b/net-irc/dircproxy/ChangeLog
index 72fcb211c80d..2e8dfc5776e0 100644
--- a/net-irc/dircproxy/ChangeLog
+++ b/net-irc/dircproxy/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-irc/dircproxy
-# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/dircproxy/ChangeLog,v 1.25 2009/03/08 03:10:26 dragonheart Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-irc/dircproxy/ChangeLog,v 1.26 2009/08/30 13:24:36 vostorga Exp $
+
+*dircproxy-1.2.0_rc1 (30 Aug 2009)
+
+  30 Aug 2009; Víctor Ostorga <vostorga@gentoo.org> -dircproxy-1.2.0_beta2-r1.ebuild,
+  +dircproxy-1.2.0_rc1.ebuild, -files/1.2.0-CVE-2007-5226.patch:
+  Version bump to 1.2.0_rc1 bug #269200, cleaning out beta
 
   08 Mar 2009; Daniel Black <dragonheart@gentoo.org>
   dircproxy-1.0.5-r1.ebuild, dircproxy-1.1.0-r2.ebuild,
diff --git a/net-irc/dircproxy/Manifest b/net-irc/dircproxy/Manifest
index 8572d563158e..4ce236e28af7 100644
--- a/net-irc/dircproxy/Manifest
+++ b/net-irc/dircproxy/Manifest
@@ -1,12 +1,11 @@
 AUX 1.0.5-CVE-2007-5226.patch 570 RMD160 a7f2c0f8509b9b1f003f94f373159071deb5ab3e SHA1 b79706a0d1f3f17a28547ec627957685cdd8d6cc SHA256 3a1680a2342ba69948eda62aedf24241dd2f55803a0b88cf0015dd8692d4b3cc
 AUX 1.1.0-less-lag-on-attach.patch 1506 RMD160 db8833d195f6b3bfa9743c17aa834148f5b3ade4 SHA1 3df99d0db3ee41a3045fa8b91f109290093af34a SHA256 44059aa7df5ced6bf3b1db959f16eefbfdce18b0a22fdb5ae22d216b2d4a210e
-AUX 1.2.0-CVE-2007-5226.patch 639 RMD160 59aac88852838c2fff9cd5430ad11360538fe257 SHA1 73a6c414b53959ce6c1b67697567f20a99563612 SHA256 fec232efc67b159d5f0eb66fa2bfc341756a56e88f2e04dd111b052ec3a1291c
 AUX dircproxy-gcc4.patch 1727 RMD160 0cf5e93bb6f3a656dccb4cdf8fab1d560343b985 SHA1 bc41e20704d57c2968447f0c9f3deec12553a75f SHA256 6429f4ed897946be89c8c8760841374c236823a19cb0d035ce657038fdf25f9b
 DIST dircproxy-1.0.5.tar.gz 217965 RMD160 8082fbe3c83b9e38eae9a2b48bf244e277b3e63b SHA1 eaf159d2a1303f82e079940b381c0e71b9b90c28 SHA256 caec20ed458a5606be8700400ecba27aff00ad6227ff0e8d4db1d3d5bf9f9d37
 DIST dircproxy-1.1.0.tar.gz 250060 RMD160 7c7f622a4b67854e608a68191a0537fc83b94045 SHA1 a967a542c4c6063e8f977276b68deb6692c9d150 SHA256 f0be78d2c2f0279cce26b0b2e87077bfe568f1da189eef2daec78b1e12699c4e
-DIST dircproxy-1.2.0-beta2.tar.bz 314480 RMD160 3e8bf9e11fd46caa7fd90189faf51c9e5f37d369 SHA1 43ab3d1b7559fd34a315c50150eebedeb4ec48db SHA256 3d663100f10b71dba4e118f7c41c2cf826e5a5ba0dfcd04381c2e84eb7c459c5
+DIST dircproxy-1.2.0-RC1.tar.gz 811366 RMD160 ddf84a11bcd1859aeb744419bf7fa97f4e95964f SHA1 7dc4b3aa2e10222f74e280de69c41f571335a96b SHA256 40ad50ffd13681114f995519dc3f65f48cb5eac41e780ad14ce8ffd49463757f
 EBUILD dircproxy-1.0.5-r1.ebuild 715 RMD160 f842d29ab288457540b29f8876d2b21a59dfb697 SHA1 07bb912b5859f9292ba790f27a5b6b30e9a47cf9 SHA256 85b1fae6d798fdb42b57ec3d6b7948507fba929d6884577cdeef6afb23813c52
 EBUILD dircproxy-1.1.0-r2.ebuild 779 RMD160 86eb3f5b6286012fdf6affe318dfb514b4ea623c SHA1 d4a2878f46f03973e807389fc48bc7a6b8ae4594 SHA256 059624eb65dcbcd787c70fbd21e97d64eaa7447057dee6d3274ee84265daf9f5
-EBUILD dircproxy-1.2.0_beta2-r1.ebuild 732 RMD160 6ae808d309c8f02bf961fe9bb86ba77b3c1f6eaf SHA1 7956125be27184af4e036accf9105d1a8b7c8796 SHA256 63ba1e26e0f37d998a96b343bd89a0a66a913f1d758418357692beec53c060ca
-MISC ChangeLog 4299 RMD160 b5d3396e19f5cf54b1cfff3b589d4d5a990a6da0 SHA1 db948c07422efeaf1a24b8cf464a6c04698377eb SHA256 e40c0e8257e641227516987908dd793757d2b243e8dea07ec36ed29ed96b657f
+EBUILD dircproxy-1.2.0_rc1.ebuild 649 RMD160 081aec6450ff2f2845512bd5e8cf260cf992b259 SHA1 ff329736f99575eb0e2a875662ee4e3996f9f260 SHA256 b059db4183b792a29397ffa27d03a36f394f37f7bdfe6e9e009d6e5af2272483
+MISC ChangeLog 4544 RMD160 ea34b9d43534616630cdbc9dff628f82b74e77da SHA1 e5c80a05454845a303e508c6e9d7764b12ca490f SHA256 d7f7e4fb1280d84ebccf48ba6e33b5818258f349d4444d73ef1d381c08b2ee8b
 MISC metadata.xml 160 RMD160 279429d1df694561fc2b163cb81c09387b9d940c SHA1 97da1b72eecc5585c65717da08eaccc9bc1cf7cd SHA256 5e058419199e306612929b80a996e3d16c6b20de674a56bb60558d3d36524fe2
diff --git a/net-irc/dircproxy/dircproxy-1.2.0_beta2-r1.ebuild b/net-irc/dircproxy/dircproxy-1.2.0_rc1.ebuild
index e108f7e46c4f..45b8cc0d28fd 100644
--- a/net-irc/dircproxy/dircproxy-1.2.0_beta2-r1.ebuild
+++ b/net-irc/dircproxy/dircproxy-1.2.0_rc1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/dircproxy/dircproxy-1.2.0_beta2-r1.ebuild,v 1.3 2009/03/09 04:22:40 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/dircproxy/dircproxy-1.2.0_rc1.ebuild,v 1.1 2009/08/30 13:24:36 vostorga Exp $
 
 inherit eutils
 
-MY_P="${P/_/-}"
+MY_P="${P/_rc/-RC}"
 DESCRIPTION="an IRC proxy server"
 HOMEPAGE="http://code.google.com/p/dircproxy"
-SRC_URI="http://dircproxy.googlecode.com/files/${MY_P}.tar.bz"
+SRC_URI="http://dircproxy.googlecode.com/files/${MY_P}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
@@ -16,14 +16,7 @@ IUSE=""
 
 S="${WORKDIR}/${MY_P}"
 
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	epatch "${FILESDIR}/1.2.0-CVE-2007-5226.patch"
-}
-
 src_install() {
 	emake DESTDIR="${D}" install || die "make install failed"
-	dodoc AUTHORS ChangeLog FAQ NEWS README* TODO INSTALL
+	dodoc AUTHORS ChangeLog FAQ NEWS HACKING README* TODO INSTALL
 }
diff --git a/net-irc/dircproxy/files/1.2.0-CVE-2007-5226.patch b/net-irc/dircproxy/files/1.2.0-CVE-2007-5226.patch
deleted file mode 100644
index 110edc399279..000000000000
--- a/net-irc/dircproxy/files/1.2.0-CVE-2007-5226.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urN dircproxy-1.2.0-beta2.orig/src/irc_server.c dircproxy-1.2.0-beta2/src/irc_server.c
---- dircproxy-1.2.0-beta2.orig/src/irc_server.c	2006-10-07 17:07:08.000000000 -0400
-+++ dircproxy-1.2.0-beta2/src/irc_server.c	2007-10-04 17:45:57.000000000 -0400
-@@ -1155,7 +1155,7 @@
-       
-         if (!strcmp(cmsg.cmd, "ACTION")) {
-           irclog_log(p, IRC_LOG_ACTION, logdest, msg.src.orig,
--                     "%s", cmsg.paramstarts[0]);
-+                     "%s", (cmsg.paramstarts != NULL) ?  cmsg.paramstarts[0]: "none");
- 
-         } else if (!strcmp(cmsg.cmd, "DCC")
-                    && p->conn_class->dcc_proxy_incoming) {