Revbump to add a security patch, bug 184575

Package-Manager: portage-2.1.3_rc8

5 files changed, 59 insertions, 14 deletions

diff --git a/net-irc/xchat/ChangeLog b/net-irc/xchat/ChangeLog
index 622c0339ae08..fc9fd6743d6b 100644
--- a/net-irc/xchat/ChangeLog
+++ b/net-irc/xchat/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-irc/xchat
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat/ChangeLog,v 1.253 2007/07/02 13:12:33 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat/ChangeLog,v 1.254 2007/07/15 11:38:13 armin76 Exp $
+
+*xchat-2.8.4-r1 (15 Jul 2007)
+
+  15 Jul 2007; Raúl Porcel <armin76@gentoo.org>
+  +files/xc284-scrollbmkdir.diff, -xchat-2.8.4.ebuild,
+  +xchat-2.8.4-r1.ebuild:
+  Revbump to add a security patch, bug 184575
 
 *xchat-2.8.4 (02 Jul 2007)
 
diff --git a/net-irc/xchat/Manifest b/net-irc/xchat/Manifest
index 2de34850fcff..5262d947cf86 100644
--- a/net-irc/xchat/Manifest
+++ b/net-irc/xchat/Manifest
@@ -6,6 +6,10 @@ AUX xc282-fixtrayzombies.diff 416 RMD160 b904d72f90c6e58975c3a3bc684990dd2970711
 MD5 ee966371f459e2bace969ddfc92e5c51 files/xc282-fixtrayzombies.diff 416
 RMD160 b904d72f90c6e58975c3a3bc684990dd29707112 files/xc282-fixtrayzombies.diff 416
 SHA256 9bf47b4b37d070062a8c032a49de2b03da2506ae4c9ff9c22fcdfca32f23f1ae files/xc282-fixtrayzombies.diff 416
+AUX xc284-scrollbmkdir.diff 826 RMD160 25823f6c4f2eab546adb06f050095371892188f3 SHA1 1f6c5071ffc16f9012c82f3f84739083806285f0 SHA256 295e293d244ef5bf5d66d056ed476abaf37d2f315b41f87d421303e7a21a07cd
+MD5 e6f0279d8c01cbe6a6bf698add6113fa files/xc284-scrollbmkdir.diff 826
+RMD160 25823f6c4f2eab546adb06f050095371892188f3 files/xc284-scrollbmkdir.diff 826
+SHA256 295e293d244ef5bf5d66d056ed476abaf37d2f315b41f87d421303e7a21a07cd files/xc284-scrollbmkdir.diff 826
 DIST xchat-2.8.2.tar.bz2 1331148 RMD160 62f9ffeb77243e1c20d81f0543ea8ccc7d3cd225 SHA1 5cff7a974819ad8788962742df785aabfe844af0 SHA256 9f6c22e7116afea4c00d90346b0522069f1c2197e8d0ad2f1545da01329750fe
 DIST xchat-2.8.4.tar.bz2 1370883 RMD160 35cf84e03dfda160674d141063c8fc9cd0ac7de2 SHA1 6ac509624c241edfac5d53d9d4ece63d917613d6 SHA256 f95a9a9e477128aae536669dedd79f4e7b4d469072565695289e4bbb5b36dd63
 DIST xchat-dccserver-0.6.patch.bz2 49320 RMD160 24cc9bd414b1dd0e7e38ba9a49d12257aeb89e68 SHA1 e7b8b58cf7f647ff8778c7542cd46e9b22987385 SHA256 90a49a8d810380020c507c1a36f02e7d972cf92b5e4802dcd5cc518cba29078f
@@ -13,14 +17,14 @@ EBUILD xchat-2.8.2-r1.ebuild 2673 RMD160 9a7fb10ea62689fc41584fe33c66b3d9981c3d8
 MD5 f9273b241f10aa321fd66a270a7934f8 xchat-2.8.2-r1.ebuild 2673
 RMD160 9a7fb10ea62689fc41584fe33c66b3d9981c3d8d xchat-2.8.2-r1.ebuild 2673
 SHA256 f0db31f3cab0e2d51a5eddceb0eef012788a728438ec41eb2df51908e07ff050 xchat-2.8.2-r1.ebuild 2673
-EBUILD xchat-2.8.4.ebuild 2538 RMD160 b20a7e89e2bed02305474cec8ee2c243b0176398 SHA1 5e778f3a5fb9361e0fd53a95046e95ebb28ed183 SHA256 38fdafef5f75a0db929545b03706815b018d18f85df3b57ac162c24870bd8d05
-MD5 3b30088e5cb3b414766a78ac28eba0c2 xchat-2.8.4.ebuild 2538
-RMD160 b20a7e89e2bed02305474cec8ee2c243b0176398 xchat-2.8.4.ebuild 2538
-SHA256 38fdafef5f75a0db929545b03706815b018d18f85df3b57ac162c24870bd8d05 xchat-2.8.4.ebuild 2538
-MISC ChangeLog 37232 RMD160 16177dec3f34688e8fbd6f2512c65d7ac6c34544 SHA1 65f79766c14b1e2df5f19ab2e8d27ccaf1d30e59 SHA256 c1bae82b7125e76229275e7931f278f5419baec1a89d8223595f98ffe59c6060
-MD5 02dbef966375fd4aea740735a2000e87 ChangeLog 37232
-RMD160 16177dec3f34688e8fbd6f2512c65d7ac6c34544 ChangeLog 37232
-SHA256 c1bae82b7125e76229275e7931f278f5419baec1a89d8223595f98ffe59c6060 ChangeLog 37232
+EBUILD xchat-2.8.4-r1.ebuild 2588 RMD160 1e0f497eea4df2cc15cad267a51251e781747e88 SHA1 f8329e7318ca7d153d747754826efb9749a914d3 SHA256 33a25eca02efcb42e08a063350d70faf46d06bfcec6172b198faaf4c7040a54a
+MD5 7fee9fb515861358423697b9937c879a xchat-2.8.4-r1.ebuild 2588
+RMD160 1e0f497eea4df2cc15cad267a51251e781747e88 xchat-2.8.4-r1.ebuild 2588
+SHA256 33a25eca02efcb42e08a063350d70faf46d06bfcec6172b198faaf4c7040a54a xchat-2.8.4-r1.ebuild 2588
+MISC ChangeLog 37440 RMD160 dbbf649f59128dac62c773ffc031e67f33f4a381 SHA1 42059fa672c8fe37d703bae9ffc6024f7a92c31c SHA256 243dcb1bfc753d1282240bec4219dde47ee3dccbbf41b715562c4972e8244dbf
+MD5 9da36c89bb6d4b577bda6fc7fa7ff3ec ChangeLog 37440
+RMD160 dbbf649f59128dac62c773ffc031e67f33f4a381 ChangeLog 37440
+SHA256 243dcb1bfc753d1282240bec4219dde47ee3dccbbf41b715562c4972e8244dbf ChangeLog 37440
 MISC metadata.xml 160 RMD160 279429d1df694561fc2b163cb81c09387b9d940c SHA1 97da1b72eecc5585c65717da08eaccc9bc1cf7cd SHA256 5e058419199e306612929b80a996e3d16c6b20de674a56bb60558d3d36524fe2
 MD5 44c39c6ad372a8e5a5e7ee3311f703a7 metadata.xml 160
 RMD160 279429d1df694561fc2b163cb81c09387b9d940c metadata.xml 160
@@ -28,6 +32,6 @@ SHA256 5e058419199e306612929b80a996e3d16c6b20de674a56bb60558d3d36524fe2 metadata
 MD5 2dcd641e0b156d21137fcdd48d46a327 files/digest-xchat-2.8.2-r1 506
 RMD160 c309217ddeaf825ec8090024737f77be0ba2f92a files/digest-xchat-2.8.2-r1 506
 SHA256 fd897d052710db36f1bd39e0a7125fe30778f86d0826509ee88d2742ec14dd7a files/digest-xchat-2.8.2-r1 506
-MD5 baba0f3ffdadd8f6981c6e34fc3a7e9e files/digest-xchat-2.8.4 506
-RMD160 30ab02c56b5869c8d401613ceb35055b1be55ef8 files/digest-xchat-2.8.4 506
-SHA256 f9ae0b0cc341dd2a416512136157822a4e69563dec180144ffd16101a813f437 files/digest-xchat-2.8.4 506
+MD5 33627ff41884051c67385d3bb9e97d8e files/digest-xchat-2.8.4-r1 441
+RMD160 641ee3eb9908cefa48773a82f99822cb573c8218 files/digest-xchat-2.8.4-r1 441
+SHA256 6891275a2fb2bb4f5e6c86ef54d6c96e571dc9d04c1b198cc2e1e9744812fbb9 files/digest-xchat-2.8.4-r1 441
diff --git a/net-irc/xchat/files/digest-xchat-2.8.4 b/net-irc/xchat/files/digest-xchat-2.8.4-r1
index a35cdfc237e7..d5bc74aee547 100644
--- a/net-irc/xchat/files/digest-xchat-2.8.4
+++ b/net-irc/xchat/files/digest-xchat-2.8.4-r1
@@ -1,4 +1,3 @@
-MD5 66d60febc62a01bafac9bb3a35fb37ae xchat-2.8.4.tar.bz2 1370883
 RMD160 35cf84e03dfda160674d141063c8fc9cd0ac7de2 xchat-2.8.4.tar.bz2 1370883
 SHA256 f95a9a9e477128aae536669dedd79f4e7b4d469072565695289e4bbb5b36dd63 xchat-2.8.4.tar.bz2 1370883
 MD5 c0220456a4df8ee54ae02e7704a6e024 xchat-dccserver-0.6.patch.bz2 49320
diff --git a/net-irc/xchat/files/xc284-scrollbmkdir.diff b/net-irc/xchat/files/xc284-scrollbmkdir.diff
new file mode 100644
index 000000000000..e2caa28083a9
--- /dev/null
+++ b/net-irc/xchat/files/xc284-scrollbmkdir.diff
@@ -0,0 +1,33 @@
+#
+# Fix creation of ~/.xchat2/scrollback/ paths.
+#
+--- xchat-2.8.4/src/common/text.c	15 Jun 2007 03:53:42 -0000	1.89
++++ xchat-2.8.4p1/src/common/text.c	8 Jul 2007 08:59:02 -0000
+@@ -49,20 +49,25 @@
+ 
+ 
+ static void mkdir_p (char *dir);
++static char *log_create_filename (char *channame);
+ 
+ 
+ static char *
+ scrollback_get_filename (session *sess, char *buf, int max)
+ {
+-	char *net;
++	char *net, *chan;
+ 
+ 	net = server_get_network (sess->server, FALSE);
+ 	if (!net)
+ 		return NULL;
+ 
+-	snprintf (buf, max, "%s/scrollback/%s/%s.txt", get_xdir_fs (), net, sess->channel);
++	snprintf (buf, max, "%s/scrollback/%s/%s.txt", get_xdir_fs (), net, "");
+ 	mkdir_p (buf);
+ 
++	chan = log_create_filename (sess->channel);
++	snprintf (buf, max, "%s/scrollback/%s/%s.txt", get_xdir_fs (), net, chan);
++	free (chan);
++
+ 	return buf;
+ }
+ 
diff --git a/net-irc/xchat/xchat-2.8.4.ebuild b/net-irc/xchat/xchat-2.8.4-r1.ebuild
index aa384b626787..ec7b8a6351be 100644
--- a/net-irc/xchat/xchat-2.8.4.ebuild
+++ b/net-irc/xchat/xchat-2.8.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat/xchat-2.8.4.ebuild,v 1.1 2007/07/02 13:12:33 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat/xchat-2.8.4-r1.ebuild,v 1.1 2007/07/15 11:38:13 armin76 Exp $
 
 inherit eutils versionator gnome2
 
@@ -41,6 +41,8 @@ src_unpack() {
 		sed -i -e 's:${prefix}/lib/xchat:${libdir}/xchat:' \
 			"${S}"/configure{,.in} || die
 	fi
+
+	epatch "${FILESDIR}"/xc284-scrollbmkdir.diff
 }
 
 src_compile() {