Revision bump to include patch by Adrian <adrian@planetcoding.net> from bug #76781. It patches dircproxy to not ignore the 005 numeric. Old behaviour breaks some scripts.

6 files changed, 49 insertions, 16 deletions

diff --git a/net-irc/dircproxy/ChangeLog b/net-irc/dircproxy/ChangeLog
index ae35f17807df..d32a9ad814fa 100644
--- a/net-irc/dircproxy/ChangeLog
+++ b/net-irc/dircproxy/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-irc/dircproxy
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/dircproxy/ChangeLog,v 1.11 2004/07/01 22:21:03 eradicator Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-irc/dircproxy/ChangeLog,v 1.12 2005/01/07 01:08:33 swegener Exp $
+
+*dircproxy-1.1.0-r1 (07 Jan 2005)
+
+  07 Jan 2005; Sven Wegener <swegener@gentoo.org>
+  +files/1.1.0-005-numeric.patch, +dircproxy-1.1.0-r1.ebuild,
+  -dircproxy-1.1.0.ebuild:
+  Revision bump to include patch by Adrian <adrian@planetcoding.net> from bug
+  #76781. It patches dircproxy to not ignore the 005 numeric. Old behaviour
+  breaks some scripts.
 
   01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
   dircproxy-1.0.5.ebuild, dircproxy-1.1.0.ebuild:
diff --git a/net-irc/dircproxy/Manifest b/net-irc/dircproxy/Manifest
index 95b25508e40b..6d0eb9ddce27 100644
--- a/net-irc/dircproxy/Manifest
+++ b/net-irc/dircproxy/Manifest
@@ -1,16 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 e9e1e3e76c99b45ae6649709d2ff4950 ChangeLog 1694
-MD5 56acb17687575cc2ad3ada68efbeaf81 dircproxy-1.0.5.ebuild 598
+MD5 b3cc8f877bccd2ca6a2decd979d73faf dircproxy-1.0.5.ebuild 596
+MD5 3e0d846b94478774373601d7dff9ca3b dircproxy-1.1.0-r1.ebuild 704
+MD5 4f4c484d6c8939dc2c25fdd55f2d7e5e ChangeLog 2044
 MD5 44c39c6ad372a8e5a5e7ee3311f703a7 metadata.xml 160
-MD5 b89a24e0763b588160f30c87310a6aab dircproxy-1.1.0.ebuild 675
 MD5 8735716fa2ac751e4b10e7f38cd1bd38 files/digest-dircproxy-1.0.5 67
-MD5 3305b6d2321a112b03180bef0a02b0d6 files/digest-dircproxy-1.1.0 67
+MD5 a7c7b1ea76afc3f604758a6448fd1b96 files/1.1.0-005-numeric.patch 708
+MD5 3305b6d2321a112b03180bef0a02b0d6 files/digest-dircproxy-1.1.0-r1 67
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.9.8 (GNU/Linux)
+Version: GnuPG v1.9.10 (GNU/Linux)
 
-iD8DBQFBCrBJHTu7gpaalycRAm1lAJ4+5W/nqesNsYDe36H8ZAfGE0/MQwCfdSvn
-0b5Z69D0PG1ThrJnrvJ2+uY=
-=V6ZT
+iD8DBQFB3eEXI1lqEGTUzyQRAvo1AJ9+yTZaZdOPEYKNPYnowE72suRRsgCgr6Ri
+gDv1IMcYXvcLciHFtxr87P4=
+=3Lq0
 -----END PGP SIGNATURE-----
diff --git a/net-irc/dircproxy/dircproxy-1.0.5.ebuild b/net-irc/dircproxy/dircproxy-1.0.5.ebuild
index 85f023841116..6b4ca0f15be1 100644
--- a/net-irc/dircproxy/dircproxy-1.0.5.ebuild
+++ b/net-irc/dircproxy/dircproxy-1.0.5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/dircproxy/dircproxy-1.0.5.ebuild,v 1.10 2004/07/01 22:21:03 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/dircproxy/dircproxy-1.0.5.ebuild,v 1.11 2005/01/07 01:08:33 swegener Exp $
 
 DESCRIPTION="an IRC proxy server"
 SRC_URI="http://www.securiweb.net/pub/oss/dircproxy/stable/${P}.tar.gz"
diff --git a/net-irc/dircproxy/dircproxy-1.1.0.ebuild b/net-irc/dircproxy/dircproxy-1.1.0-r1.ebuild
index a45096e38e53..8442e2728fac 100644
--- a/net-irc/dircproxy/dircproxy-1.1.0.ebuild
+++ b/net-irc/dircproxy/dircproxy-1.1.0-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/dircproxy/dircproxy-1.1.0.ebuild,v 1.5 2004/07/30 20:31:51 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/dircproxy/dircproxy-1.1.0-r1.ebuild,v 1.1 2005/01/07 01:08:33 swegener Exp $
 
-inherit gnuconfig
+inherit eutils
 
 DESCRIPTION="an IRC proxy server"
 HOMEPAGE="http://dircproxy.securiweb.net/"
@@ -18,7 +18,8 @@ DEPEND="virtual/libc"
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-	gnuconfig_update
+
+	epatch ${FILESDIR}/${PV}-005-numeric.patch
 }
 
 src_install() {
diff --git a/net-irc/dircproxy/files/1.1.0-005-numeric.patch b/net-irc/dircproxy/files/1.1.0-005-numeric.patch
new file mode 100644
index 000000000000..f4bdc0057122
--- /dev/null
+++ b/net-irc/dircproxy/files/1.1.0-005-numeric.patch
@@ -0,0 +1,22 @@
+--- src/irc_client.c    2002-08-17 23:05:55.000000000 +0200
++++ src/irc_client.c.005        2005-01-04 01:21:43.326252869 +0100
+@@ -1885,6 +1885,8 @@
+                            p->servername, p->serverver,
+                            p->serverumodes, p->servercmodes);
+
++  ircserver_send_command(p, "VERSION", "");
++
+   _ircclient_motd(p);
+
+   if (p->modes)
+--- src/irc_server.c    2002-08-17 23:48:03.000000000 +0200
++++ src/irc_server.c.005        2005-01-04 01:21:55.021318675 +0100
+@@ -547,8 +547,6 @@
+       }
+     }
+
+-  } else if (!irc_strcasecmp(msg.cmd, "005")) {
+-    /* Ignore 005 */
+   } else if (!irc_strcasecmp(msg.cmd, "375")) {
+     /* Ignore 375 unless allow_motd */
+     if (p->allow_motd)
diff --git a/net-irc/dircproxy/files/digest-dircproxy-1.1.0 b/net-irc/dircproxy/files/digest-dircproxy-1.1.0-r1
index 6da95c6d8130..6da95c6d8130 100644
--- a/net-irc/dircproxy/files/digest-dircproxy-1.1.0
+++ b/net-irc/dircproxy/files/digest-dircproxy-1.1.0-r1