From f3a9746ce328ddf1788dfbedd846bb6dc289f0a8 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Ra=C3=BAl=20Porcel?= Date: Sat, 17 Feb 2007 15:25:43 +0000 Subject: [PATCH] Version bump, plus add patch to make it compile with gcc4, bug 139934 Package-Manager: portage-2.1.2-r9 --- net-irc/dircproxy/ChangeLog | 11 +++- net-irc/dircproxy/Manifest | 59 +++++++++++-------- net-irc/dircproxy/dircproxy-1.0.5.ebuild | 21 ++++--- net-irc/dircproxy/dircproxy-1.1.0-r1.ebuild | 15 +++-- .../dircproxy/dircproxy-1.2.0_beta2.ebuild | 22 +++++++ .../dircproxy/files/digest-dircproxy-1.0.5 | 2 + .../dircproxy/files/digest-dircproxy-1.1.0-r1 | 2 + .../files/digest-dircproxy-1.2.0_beta2 | 3 + net-irc/dircproxy/files/dircproxy-gcc4.patch | 47 +++++++++++++++ 9 files changed, 140 insertions(+), 42 deletions(-) create mode 100644 net-irc/dircproxy/dircproxy-1.2.0_beta2.ebuild create mode 100644 net-irc/dircproxy/files/digest-dircproxy-1.2.0_beta2 create mode 100644 net-irc/dircproxy/files/dircproxy-gcc4.patch diff --git a/net-irc/dircproxy/ChangeLog b/net-irc/dircproxy/ChangeLog index 7c1b7ba945bd..73f6a92fec89 100644 --- a/net-irc/dircproxy/ChangeLog +++ b/net-irc/dircproxy/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for net-irc/dircproxy -# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-irc/dircproxy/ChangeLog,v 1.17 2006/04/05 17:03:32 mcummings Exp $ +# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/net-irc/dircproxy/ChangeLog,v 1.18 2007/02/17 15:25:43 armin76 Exp $ + +*dircproxy-1.2.0_beta2 (17 Feb 2007) + + 17 Feb 2007; Raúl Porcel + +files/dircproxy-gcc4.patch, dircproxy-1.0.5.ebuild, + dircproxy-1.1.0-r1.ebuild, +dircproxy-1.2.0_beta2.ebuild: + Version bump, plus add patch to make it compile with gcc4, bug 139934 05 Apr 2006; dircproxy-1.1.0-r1.ebuild: Marking 1.1.0-r1 ~sparc diff --git a/net-irc/dircproxy/Manifest b/net-irc/dircproxy/Manifest index f3bdcf3aab11..05428c1a9020 100644 --- a/net-irc/dircproxy/Manifest +++ b/net-irc/dircproxy/Manifest @@ -1,31 +1,40 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - -MD5 cb431e69aa0677049864adf3c8dca57c ChangeLog 2853 -RMD160 dc4dcddf88d89de0109fa8d8dbe345a099109066 ChangeLog 2853 -SHA256 20fb85973979ed1de24b81f03a878f8cd2d96f6ccf6c86402ae6b10dcdcbf454 ChangeLog 2853 -MD5 fe4e5eac4126fe2595567cdc9b0b685b dircproxy-1.0.5.ebuild 603 -RMD160 e486c2dd94fb7c9de9690aba767fa4012c3863d5 dircproxy-1.0.5.ebuild 603 -SHA256 0be208abbe487353b00b102b4d767ecefa3b3bb47678a790218dd91aba7d4773 dircproxy-1.0.5.ebuild 603 -MD5 65bf75003fbd1f5b76e97a473ef1d90a dircproxy-1.1.0-r1.ebuild 726 -RMD160 b97a5207b4906763b34709cdd25afcbba28c168d dircproxy-1.1.0-r1.ebuild 726 -SHA256 30933ceea80e9ec855db17dbe6fb2a491c7875ee27c4b6401b415a3bc6aebd1a dircproxy-1.1.0-r1.ebuild 726 +AUX 1.1.0-less-lag-on-attach.patch 1506 RMD160 db8833d195f6b3bfa9743c17aa834148f5b3ade4 SHA1 3df99d0db3ee41a3045fa8b91f109290093af34a SHA256 44059aa7df5ced6bf3b1db959f16eefbfdce18b0a22fdb5ae22d216b2d4a210e MD5 d020302a46b1d425abe235ba16582a03 files/1.1.0-less-lag-on-attach.patch 1506 RMD160 db8833d195f6b3bfa9743c17aa834148f5b3ade4 files/1.1.0-less-lag-on-attach.patch 1506 SHA256 44059aa7df5ced6bf3b1db959f16eefbfdce18b0a22fdb5ae22d216b2d4a210e files/1.1.0-less-lag-on-attach.patch 1506 -MD5 8735716fa2ac751e4b10e7f38cd1bd38 files/digest-dircproxy-1.0.5 67 -RMD160 5ba7f346f99030f4c410e674c5e0459f3a15cfcd files/digest-dircproxy-1.0.5 67 -SHA256 b7af6a98aeec9b68efd4473949640efb7c5adefe20e7825f030eed3854d531b0 files/digest-dircproxy-1.0.5 67 -MD5 3305b6d2321a112b03180bef0a02b0d6 files/digest-dircproxy-1.1.0-r1 67 -RMD160 9cce0ca3e5a2455d59b5aa196b5bfd77082dbfd2 files/digest-dircproxy-1.1.0-r1 67 -SHA256 23cfcfae1c276e13b32366ab100e833e388ce2f6056c6287f636b5559a63e7f1 files/digest-dircproxy-1.1.0-r1 67 +AUX dircproxy-gcc4.patch 1727 RMD160 0cf5e93bb6f3a656dccb4cdf8fab1d560343b985 SHA1 bc41e20704d57c2968447f0c9f3deec12553a75f SHA256 6429f4ed897946be89c8c8760841374c236823a19cb0d035ce657038fdf25f9b +MD5 4f332a62de994e91b19fd0910156ebbe files/dircproxy-gcc4.patch 1727 +RMD160 0cf5e93bb6f3a656dccb4cdf8fab1d560343b985 files/dircproxy-gcc4.patch 1727 +SHA256 6429f4ed897946be89c8c8760841374c236823a19cb0d035ce657038fdf25f9b files/dircproxy-gcc4.patch 1727 +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 +EBUILD dircproxy-1.0.5.ebuild 665 RMD160 e4791c3950c2fe642647615731b0b88d8388a38b SHA1 a9f7fcdba7113117e34ab4d6dd7390265a8c0d4a SHA256 a4581c7037ddde6cd10cb75497a612e847bdd9d85fc3ebe018959cdccdda8668 +MD5 d4ae0d5d9ef4894750813828bf1c054f dircproxy-1.0.5.ebuild 665 +RMD160 e4791c3950c2fe642647615731b0b88d8388a38b dircproxy-1.0.5.ebuild 665 +SHA256 a4581c7037ddde6cd10cb75497a612e847bdd9d85fc3ebe018959cdccdda8668 dircproxy-1.0.5.ebuild 665 +EBUILD dircproxy-1.1.0-r1.ebuild 725 RMD160 a6adc07a32c53174d20f939fd25dcfdb9ef73b61 SHA1 979f7af0ddbb69510d5d572af9e5a55eb801647d SHA256 b8adcab8dbe8eff7bea9e5561fe76c5be25c8efef188294235918d1d21e4eab2 +MD5 0013b7f00ccb1de7cbd901e70a420a6d dircproxy-1.1.0-r1.ebuild 725 +RMD160 a6adc07a32c53174d20f939fd25dcfdb9ef73b61 dircproxy-1.1.0-r1.ebuild 725 +SHA256 b8adcab8dbe8eff7bea9e5561fe76c5be25c8efef188294235918d1d21e4eab2 dircproxy-1.1.0-r1.ebuild 725 +EBUILD dircproxy-1.2.0_beta2.ebuild 636 RMD160 c798dc8b1e471b5bf5d60499da742170c23719ea SHA1 7d6aac74384dfc8f02873d39a4a7746d8e40c936 SHA256 379c74b7c870d9c13c706ec50c07f5d19a99e51a29b1e1764143060b05fc560d +MD5 fc283abadccdeaf2592d14797a42d585 dircproxy-1.2.0_beta2.ebuild 636 +RMD160 c798dc8b1e471b5bf5d60499da742170c23719ea dircproxy-1.2.0_beta2.ebuild 636 +SHA256 379c74b7c870d9c13c706ec50c07f5d19a99e51a29b1e1764143060b05fc560d dircproxy-1.2.0_beta2.ebuild 636 +MISC ChangeLog 3126 RMD160 37546442d7a1da2eafa76758585d75c4bd059f6d SHA1 166bbc8e16a1fba6f4edb2b96a36364dbad2046e SHA256 d09a43e1920c1cff75242411147caf56b7fbd5f642e25b73cadba6d8f5ce8c86 +MD5 f5bb431da1b7e9855c7303778fc63d05 ChangeLog 3126 +RMD160 37546442d7a1da2eafa76758585d75c4bd059f6d ChangeLog 3126 +SHA256 d09a43e1920c1cff75242411147caf56b7fbd5f642e25b73cadba6d8f5ce8c86 ChangeLog 3126 +MISC metadata.xml 160 RMD160 279429d1df694561fc2b163cb81c09387b9d940c SHA1 97da1b72eecc5585c65717da08eaccc9bc1cf7cd SHA256 5e058419199e306612929b80a996e3d16c6b20de674a56bb60558d3d36524fe2 MD5 44c39c6ad372a8e5a5e7ee3311f703a7 metadata.xml 160 RMD160 279429d1df694561fc2b163cb81c09387b9d940c metadata.xml 160 SHA256 5e058419199e306612929b80a996e3d16c6b20de674a56bb60558d3d36524fe2 metadata.xml 160 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.2 (GNU/Linux) - -iD8DBQFEM/httG5z4I8BtQoRAp1aAJ0bPgpvK6q9XewVSn3oIoOJbjBnSQCfT6nk -BUFpxmqR8H+MEZE9+8R8Mkk= -=lnOq ------END PGP SIGNATURE----- +MD5 e4c75a5a34411919454382a3355f576f files/digest-dircproxy-1.0.5 247 +RMD160 2a2850d5b760dc8ff7ed431e5d324ed0b60488f9 files/digest-dircproxy-1.0.5 247 +SHA256 1bf7418783fef8711130595f85af0acc586bca09e872bcdc334889f4002b20c5 files/digest-dircproxy-1.0.5 247 +MD5 fe6390085219b146dcdbb3a0ed14c77e files/digest-dircproxy-1.1.0-r1 247 +RMD160 d68cfc429b1138fc061828a602f433528ae7e927 files/digest-dircproxy-1.1.0-r1 247 +SHA256 8ce718d5456ad5555e62703e0ce647909d06d25e1d58cc73ee3188a48d0cfa44 files/digest-dircproxy-1.1.0-r1 247 +MD5 b6b3266614f8173c9cc9ec8cc62af833 files/digest-dircproxy-1.2.0_beta2 265 +RMD160 2577163e8f979455da26711a3435b090b400eefe files/digest-dircproxy-1.2.0_beta2 265 +SHA256 a9fd1250dff85a68e77dd59eed7ddb4e5cd212258bff86ad0897257f29f395e0 files/digest-dircproxy-1.2.0_beta2 265 diff --git a/net-irc/dircproxy/dircproxy-1.0.5.ebuild b/net-irc/dircproxy/dircproxy-1.0.5.ebuild index 29e641daea98..dad095301cf7 100644 --- a/net-irc/dircproxy/dircproxy-1.0.5.ebuild +++ b/net-irc/dircproxy/dircproxy-1.0.5.ebuild @@ -1,19 +1,26 @@ -# Copyright 1999-2006 Gentoo Foundation +# Copyright 1999-2007 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.14 2006/04/05 17:03:32 mcummings Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-irc/dircproxy/dircproxy-1.0.5.ebuild,v 1.15 2007/02/17 15:25:43 armin76 Exp $ + +inherit eutils DESCRIPTION="an IRC proxy server" -SRC_URI="http://www.securiweb.net/pub/oss/dircproxy/stable/${P}.tar.gz" HOMEPAGE="http://dircproxy.securiweb.net/" +SRC_URI="http://dircproxy.securiweb.net/pub/1.0/${P}.tar.gz" SLOT="0" LICENSE="GPL-2" -KEYWORDS="x86 ppc alpha amd64" +KEYWORDS="alpha amd64 ppc x86" IUSE="" -DEPEND="virtual/libc" +src_unpack() { + unpack ${A} + cd ${S} + + epatch "${FILESDIR}/dircproxy-gcc4.patch" +} src_install() { - make DESTDIR=${D} install || die "make install failed" - dodoc AUTHORS ChangeLog FAQ NEWS PROTOCOL README* TODO INSTALL + emake DESTDIR="${D}" install || die "make install failed" + dodoc AUTHORS ChangeLog FAQ NEWS PROTOCOL README* INSTALL } diff --git a/net-irc/dircproxy/dircproxy-1.1.0-r1.ebuild b/net-irc/dircproxy/dircproxy-1.1.0-r1.ebuild index 29ef595c4525..89f007643d07 100644 --- a/net-irc/dircproxy/dircproxy-1.1.0-r1.ebuild +++ b/net-irc/dircproxy/dircproxy-1.1.0-r1.ebuild @@ -1,28 +1,27 @@ -# Copyright 1999-2006 Gentoo Foundation +# Copyright 1999-2007 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-r1.ebuild,v 1.5 2006/04/05 17:03:32 mcummings Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-irc/dircproxy/dircproxy-1.1.0-r1.ebuild,v 1.6 2007/02/17 15:25:43 armin76 Exp $ inherit eutils DESCRIPTION="an IRC proxy server" HOMEPAGE="http://dircproxy.securiweb.net/" -SRC_URI="http://www.securiweb.net/pub/oss/dircproxy/unstable/${P}.tar.gz" +SRC_URI="http://dircproxy-securiweb.net/pub/1.1/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~x86 ~ppc ~alpha ~amd64 ~sparc" +KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86" IUSE="" -DEPEND="virtual/libc" - src_unpack() { unpack ${A} cd ${S} epatch ${FILESDIR}/${PV}-less-lag-on-attach.patch + epatch "${FILESDIR}/${PN}-gcc4.patch" } src_install() { - make DESTDIR=${D} install || die "make install failed" - dodoc AUTHORS ChangeLog FAQ NEWS PROTOCOL README* TODO INSTALL + emake DESTDIR="${D}" install || die "make install failed" + dodoc AUTHORS ChangeLog FAQ NEWS PROTOCOL README* INSTALL } diff --git a/net-irc/dircproxy/dircproxy-1.2.0_beta2.ebuild b/net-irc/dircproxy/dircproxy-1.2.0_beta2.ebuild new file mode 100644 index 000000000000..d9f9143f4470 --- /dev/null +++ b/net-irc/dircproxy/dircproxy-1.2.0_beta2.ebuild @@ -0,0 +1,22 @@ +# Copyright 1999-2007 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.ebuild,v 1.1 2007/02/17 15:25:43 armin76 Exp $ + +inherit eutils + +MY_P="${P/_/-}" +DESCRIPTION="an IRC proxy server" +SRC_URI="http://dircproxy.securiweb.net/pub/1.2/${MY_P}.tar.bz" +HOMEPAGE="http://dircproxy.securiweb.net/" + +SLOT="0" +LICENSE="GPL-2" +KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86" +IUSE="" + +S="${WORKDIR}/${MY_P}" + +src_install() { + emake DESTDIR="${D}" install || die "make install failed" + dodoc AUTHORS ChangeLog FAQ NEWS README* TODO INSTALL +} diff --git a/net-irc/dircproxy/files/digest-dircproxy-1.0.5 b/net-irc/dircproxy/files/digest-dircproxy-1.0.5 index 0f2816f335b4..ef8a1784026b 100644 --- a/net-irc/dircproxy/files/digest-dircproxy-1.0.5 +++ b/net-irc/dircproxy/files/digest-dircproxy-1.0.5 @@ -1 +1,3 @@ MD5 33b92e0f28530a5faa9fea801d1ad807 dircproxy-1.0.5.tar.gz 217965 +RMD160 8082fbe3c83b9e38eae9a2b48bf244e277b3e63b dircproxy-1.0.5.tar.gz 217965 +SHA256 caec20ed458a5606be8700400ecba27aff00ad6227ff0e8d4db1d3d5bf9f9d37 dircproxy-1.0.5.tar.gz 217965 diff --git a/net-irc/dircproxy/files/digest-dircproxy-1.1.0-r1 b/net-irc/dircproxy/files/digest-dircproxy-1.1.0-r1 index 6da95c6d8130..cea41304cdcf 100644 --- a/net-irc/dircproxy/files/digest-dircproxy-1.1.0-r1 +++ b/net-irc/dircproxy/files/digest-dircproxy-1.1.0-r1 @@ -1 +1,3 @@ MD5 066bd39d80f286ae5ce69a2adbbd01e4 dircproxy-1.1.0.tar.gz 250060 +RMD160 7c7f622a4b67854e608a68191a0537fc83b94045 dircproxy-1.1.0.tar.gz 250060 +SHA256 f0be78d2c2f0279cce26b0b2e87077bfe568f1da189eef2daec78b1e12699c4e dircproxy-1.1.0.tar.gz 250060 diff --git a/net-irc/dircproxy/files/digest-dircproxy-1.2.0_beta2 b/net-irc/dircproxy/files/digest-dircproxy-1.2.0_beta2 new file mode 100644 index 000000000000..c0c495826201 --- /dev/null +++ b/net-irc/dircproxy/files/digest-dircproxy-1.2.0_beta2 @@ -0,0 +1,3 @@ +MD5 850443437f709276ff21a173bbf98456 dircproxy-1.2.0-beta2.tar.bz 314480 +RMD160 3e8bf9e11fd46caa7fd90189faf51c9e5f37d369 dircproxy-1.2.0-beta2.tar.bz 314480 +SHA256 3d663100f10b71dba4e118f7c41c2cf826e5a5ba0dfcd04381c2e84eb7c459c5 dircproxy-1.2.0-beta2.tar.bz 314480 diff --git a/net-irc/dircproxy/files/dircproxy-gcc4.patch b/net-irc/dircproxy/files/dircproxy-gcc4.patch new file mode 100644 index 000000000000..bf4da5bca82f --- /dev/null +++ b/net-irc/dircproxy/files/dircproxy-gcc4.patch @@ -0,0 +1,47 @@ +--- ../tmp-orig/dircproxy-1.0.5/src/dcc_net.c 2001-12-21 21:15:55.000000000 +0100 ++++ ./src/dcc_net.c 2004-12-14 15:40:45.976549384 +0100 +@@ -364,7 +364,8 @@ + n = p->next; + _dccnet_free(p); + +- p = (l ? l->next : proxies) = n; ++ if (l) l->next = n; else proxies = n; ++ p = n; + } else { + l = p; + p = p->next; +diff -urN ../tmp-orig/dircproxy-1.0.5/src/irc_server.c ./src/irc_server.c +--- ../tmp-orig/dircproxy-1.0.5/src/irc_server.c 2002-01-31 15:56:37.000000000 +0100 ++++ ./src/irc_server.c 2004-12-14 15:39:49.163186328 +0100 +@@ -700,7 +700,8 @@ + free(s); + + /* Was in the squelch list, so remove it and stop looking */ +- s = (l ? l->next : p->squelch_modes) = n; ++ if (l) l->next = n; else p->squelch_modes = n; ++ s = n; + squelch = 1; + break; + } else { +@@ -741,7 +742,8 @@ + free(s); + + /* Was in the squelch list, so remove it and stop looking */ +- s = (l ? l->next : p->squelch_modes) = n; ++ if (l) l->next = n; else p->squelch_modes = n; ++ s = n; + squelch = 1; + break; + } else { +diff -urN ../tmp-orig/dircproxy-1.0.5/src/net.c ./src/net.c +--- ../tmp-orig/dircproxy-1.0.5/src/net.c 2002-01-01 18:55:23.000000000 +0100 ++++ ./src/net.c 2004-12-14 15:41:43.499804520 +0100 +@@ -459,7 +459,7 @@ + return 0; + } + +- l = &(buff == SB_IN ? s->in_buff_last : s->out_buff_last); ++ l = (buff == SB_IN) ? &s->in_buff_last : &s->out_buff_last; + + /* Check whether we can just add to the existing buffer */ + if ((mode == SM_RAW) && *l && ((*l)->mode == mode)) { -- 2.26.2