no need to bzip smallish patches

(Portage version: 2.1_pre4-r1)

13 files changed, 102 insertions, 16 deletions

diff --git a/net-im/centericq/ChangeLog b/net-im/centericq/ChangeLog
index b26b90d1e89e..9d0210d8af49 100644
--- a/net-im/centericq/ChangeLog
+++ b/net-im/centericq/ChangeLog
@@ -1,6 +1,19 @@
 # ChangeLog for net-im/centericq
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/centericq/ChangeLog,v 1.86 2006/01/08 01:41:31 humpback Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/centericq/ChangeLog,v 1.87 2006/02/17 16:38:52 blubb Exp $
+
+  17 Feb 2006; Simon Stelling <blubb@gentoo.org>
+  +files/centericq-4.20.0.CAN-2005-1914.patch,
+  -files/centericq-4.20.0.CAN-2005-1914.patch.bz2,
+  +files/centericq-4.21.0-icq-short-read.diff,
+  -files/centericq-4.21.0-icq-short-read.diff.bz2,
+  +files/centericq-4.21.0-ktools.diff,
+  -files/centericq-4.21.0-ktools.diff.bz2,
+  +files/centericq-4.21.0-memory-handling.diff,
+  -files/centericq-4.21.0-memory-handling.diff.bz2,
+  centericq-4.20.0-r2.ebuild, centericq-4.20.0-r3.ebuild,
+  centericq-4.21.0-r1.ebuild, centericq-4.21.0-r2.ebuild:
+  no need to bzip smallish patches
 
   08 Jan 2006; Gustavo Felisberto <humpback@gentoo.org>; metadata.xml:
   Updated maintainer now it is only wschlich. Closes bug #23129 about retired
diff --git a/net-im/centericq/centericq-4.20.0-r2.ebuild b/net-im/centericq/centericq-4.20.0-r2.ebuild
index 246f13da6f83..28d8d4f3b6ae 100644
--- a/net-im/centericq/centericq-4.20.0-r2.ebuild
+++ b/net-im/centericq/centericq-4.20.0-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/centericq/centericq-4.20.0-r2.ebuild,v 1.1 2005/07/18 16:34:37 wschlich Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/centericq/centericq-4.20.0-r2.ebuild,v 1.2 2006/02/17 16:38:52 blubb Exp $
 
 inherit eutils
 
@@ -28,7 +28,7 @@ src_unpack() {
 	cd ${S}
 
 	# security fix, see CAN-2005-1914 -- from CenterICQ CVS, 20050718
-	epatch ${FILESDIR}/${P}.CAN-2005-1914.patch.bz2
+	epatch ${FILESDIR}/${P}.CAN-2005-1914.patch
 
 	use amd64 && epatch ${FILESDIR}/${PN}-amd64.patch
 }
diff --git a/net-im/centericq/centericq-4.20.0-r3.ebuild b/net-im/centericq/centericq-4.20.0-r3.ebuild
index 2ec184596b5f..30d17b94fade 100644
--- a/net-im/centericq/centericq-4.20.0-r3.ebuild
+++ b/net-im/centericq/centericq-4.20.0-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/centericq/centericq-4.20.0-r3.ebuild,v 1.7 2005/09/09 17:42:16 wschlich Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/centericq/centericq-4.20.0-r3.ebuild,v 1.8 2006/02/17 16:38:52 blubb Exp $
 
 inherit eutils
 
@@ -27,7 +27,7 @@ src_unpack() {
 	unpack ${A}
 	cd ${S}
 	# security fix, see CAN-2005-1914 -- from CenterICQ CVS, 20050718
-	epatch ${FILESDIR}/${P}.CAN-2005-1914.patch.bz2
+	epatch ${FILESDIR}/${P}.CAN-2005-1914.patch
 
 	use amd64 && epatch ${FILESDIR}/${PN}-amd64.patch
 }
diff --git a/net-im/centericq/centericq-4.21.0-r1.ebuild b/net-im/centericq/centericq-4.21.0-r1.ebuild
index 74cd86f2dbb3..bb0744fd2910 100644
--- a/net-im/centericq/centericq-4.21.0-r1.ebuild
+++ b/net-im/centericq/centericq-4.21.0-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/centericq/centericq-4.21.0-r1.ebuild,v 1.5 2005/11/27 19:59:40 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/centericq/centericq-4.21.0-r1.ebuild,v 1.6 2006/02/17 16:38:52 blubb Exp $
 
 inherit eutils
 
@@ -30,8 +30,8 @@ src_unpack() {
 	use amd64 && epatch ${FILESDIR}/${PN}-amd64.patch
 
 	# fix bug #100519
-	epatch ${FILESDIR}/${P}-icq-short-read.diff.bz2
-	epatch ${FILESDIR}/${P}-memory-handling.diff.bz2
+	epatch ${FILESDIR}/${P}-icq-short-read.diff
+	epatch ${FILESDIR}/${P}-memory-handling.diff
 }
 
 src_compile() {
diff --git a/net-im/centericq/centericq-4.21.0-r2.ebuild b/net-im/centericq/centericq-4.21.0-r2.ebuild
index bea07f7f1715..3bd40d7cc722 100644
--- a/net-im/centericq/centericq-4.21.0-r2.ebuild
+++ b/net-im/centericq/centericq-4.21.0-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/centericq/centericq-4.21.0-r2.ebuild,v 1.6 2005/12/17 10:10:28 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/centericq/centericq-4.21.0-r2.ebuild,v 1.7 2006/02/17 16:38:52 blubb Exp $
 
 inherit eutils
 
@@ -30,11 +30,11 @@ src_unpack() {
 	use amd64 && epatch ${FILESDIR}/${PN}-amd64.patch
 
 	# fix bug #100519
-	epatch ${FILESDIR}/${P}-icq-short-read.diff.bz2
-	epatch ${FILESDIR}/${P}-memory-handling.diff.bz2
+	epatch ${FILESDIR}/${P}-icq-short-read.diff
+	epatch ${FILESDIR}/${P}-memory-handling.diff
 
 	# fix bug #114038
-	epatch ${FILESDIR}/${P}-ktools.diff.bz2
+	epatch ${FILESDIR}/${P}-ktools.diff
 }
 
 src_compile() {
diff --git a/net-im/centericq/files/centericq-4.20.0.CAN-2005-1914.patch b/net-im/centericq/files/centericq-4.20.0.CAN-2005-1914.patch
new file mode 100644
index 000000000000..493fa983878a
--- /dev/null
+++ b/net-im/centericq/files/centericq-4.20.0.CAN-2005-1914.patch
@@ -0,0 +1,25 @@
+diff -urN centericq-4.20.0.orig/src/hooks/gaduhook.cc centericq-4.20.0/src/hooks/gaduhook.cc
+--- centericq-4.20.0.orig/src/hooks/gaduhook.cc	2005-01-19 00:20:17.000000000 +0100
++++ centericq-4.20.0/src/hooks/gaduhook.cc	2005-07-18 18:16:20.811398216 +0200
+@@ -1,7 +1,7 @@
+ /*
+ *
+ * centericq gadu-gadu protocol handling class
+-* $Id: centericq-4.20.0.CAN-2005-1914.patch,v 1.1 2006/02/17 16:38:52 blubb Exp $
++* $Id: centericq-4.20.0.CAN-2005-1914.patch,v 1.1 2006/02/17 16:38:52 blubb Exp $
+ *
+ * Copyright (C) 2004 by Konstantin Klyagin <konst@konst.org.ua>
+ *
+@@ -906,8 +906,10 @@
+     if(!(t = (struct gg_token *) h->data) || !h->body)
+ 	return "";
+ 
+-    fname = (getenv("TMPDIR") ? getenv("TMPDIR") : "/tmp");
+-    fname += "/gg.token." + i2str(getpid());
++    do {
++	fname = (getenv("TMPDIR") ? getenv("TMPDIR") : "/tmp");
++	fname += "/gg.token." + i2str(getpid()) + i2str(time(0));
++    } while(!access(fname.c_str(), F_OK));
+ 
+     ofstream bf(fname.c_str());
+ 
diff --git a/net-im/centericq/files/centericq-4.20.0.CAN-2005-1914.patch.bz2 b/net-im/centericq/files/centericq-4.20.0.CAN-2005-1914.patch.bz2
deleted file mode 100644
index 6764821aaa69..000000000000
--- a/net-im/centericq/files/centericq-4.20.0.CAN-2005-1914.patch.bz2
+++ /dev/null
diff --git a/net-im/centericq/files/centericq-4.21.0-icq-short-read.diff b/net-im/centericq/files/centericq-4.21.0-icq-short-read.diff
new file mode 100644
index 000000000000..7d1d700d869f
--- /dev/null
+++ b/net-im/centericq/files/centericq-4.21.0-icq-short-read.diff
@@ -0,0 +1,10 @@
+--- centericq-4.21.0.orig/libicq2000-0.1/src/DirectClient.cpp
++++ centericq-4.21.0/libicq2000-0.1/src/DirectClient.cpp
+@@ -162,6 +162,7 @@
+ 
+       m_recv.setLittleEndian();
+       m_recv >> length;
++      if (length == 0) return; // short read, toss it back (nothing to do)
+       if (length > Incoming_Packet_Limit) throw ParseException("Received too long incoming packet");
+       if (m_recv.remains() < length) return; // waiting for more of the packet
+ 
diff --git a/net-im/centericq/files/centericq-4.21.0-icq-short-read.diff.bz2 b/net-im/centericq/files/centericq-4.21.0-icq-short-read.diff.bz2
deleted file mode 100644
index 3a0ee3b42fbc..000000000000
--- a/net-im/centericq/files/centericq-4.21.0-icq-short-read.diff.bz2
+++ /dev/null
diff --git a/net-im/centericq/files/centericq-4.21.0-ktools.diff b/net-im/centericq/files/centericq-4.21.0-ktools.diff
new file mode 100644
index 000000000000..4433a7202bee
--- /dev/null
+++ b/net-im/centericq/files/centericq-4.21.0-ktools.diff
@@ -0,0 +1,12 @@
+diff -ruN centericq-4.21.0.orig/kkstrtext-0.1/kkstrtext.h centericq-4.21.0/kkstrtext-0.1/kkstrtext.h
+--- centericq-4.21.0.orig/kkstrtext-0.1/kkstrtext.h	2004-11-17 23:00:38.000000000 +0000
++++ centericq-4.21.0/kkstrtext-0.1/kkstrtext.h	2005-12-13 18:34:56.308723728 +0000
+@@ -87,7 +87,7 @@
+     { \
+ 	va_list vgs__ap; char vgs__buf[1024]; \
+ 	va_start(vgs__ap, fmt); \
+-	vsprintf(vgs__buf, fmt, vgs__ap); c = vgs__buf; \
++	vsnprintf(vgs__buf, sizeof(vgs__buf), fmt, vgs__ap); c = vgs__buf; \
+ 	va_end(vgs__ap); \
+     }
+ 
diff --git a/net-im/centericq/files/centericq-4.21.0-ktools.diff.bz2 b/net-im/centericq/files/centericq-4.21.0-ktools.diff.bz2
deleted file mode 100644
index 14249140e059..000000000000
--- a/net-im/centericq/files/centericq-4.21.0-ktools.diff.bz2
+++ /dev/null
diff --git a/net-im/centericq/files/centericq-4.21.0-memory-handling.diff b/net-im/centericq/files/centericq-4.21.0-memory-handling.diff
new file mode 100644
index 000000000000..5249e73d2689
--- /dev/null
+++ b/net-im/centericq/files/centericq-4.21.0-memory-handling.diff
@@ -0,0 +1,26 @@
+--- centericq-4.21.0.orig/src/icqface.cc
++++ centericq-4.21.0/src/icqface.cc
+@@ -2003,7 +2003,7 @@
+ 	    mvaddchnstr(i-1, sizeWArea.x1+1, logline, sizeWArea.x2-sizeWArea.x1);
+ 	}
+ 
+-	delete logline;
++	delete[] logline;
+ 
+ 	if(text.size() > sizeWArea.x2-sizeWArea.x1-2) text.resize(sizeWArea.x2-sizeWArea.x1-2);
+ 	mvhline(LINES-3, sizeWArea.x1+2, ' ', sizeWArea.x2-sizeWArea.x1-2);
+only in patch2:
+unchanged:
+--- centericq-4.21.0.orig/kkstrtext-0.1/kkstrtext.cc
++++ centericq-4.21.0/kkstrtext-0.1/kkstrtext.cc
+@@ -907,8 +907,8 @@
+ 	    r += soutbuf;
+ 	    text.erase(0, text.size()-inleft);
+ 
+-	    delete soutbuf;
+-	    delete sinbuf;
++	    delete[] soutbuf;
++	    free(sinbuf);
+ 
+ 	    if(res == -1 && errno != EILSEQ)
+ 		break;
diff --git a/net-im/centericq/files/centericq-4.21.0-memory-handling.diff.bz2 b/net-im/centericq/files/centericq-4.21.0-memory-handling.diff.bz2
deleted file mode 100644
index 2f9e216275db..000000000000
--- a/net-im/centericq/files/centericq-4.21.0-memory-handling.diff.bz2
+++ /dev/null