[SM-Commit] GIT changes to master grimoire by George Sherwood (c08ff2a633286ee7523b5eaeabeec33912deaafe)

George Sherwood scm at mail.sourcemage.org
Sun Aug 27 22:16:36 EDT 2006


GIT changes to master grimoire by George Sherwood <chat at sourcemage.org>:

 chat-irc/irssi/DETAILS                     |    2 +-
 chat-irc/irssi/HISTORY                     |    5 +++++
 chat-irc/irssi/PRE_BUILD                   |    3 +++
 chat-irc/irssi/irssi-0.8.10-dcc-segv.patch |   12 ++++++++++++
 4 files changed, 21 insertions(+), 1 deletion(-)

New commits:
commit c08ff2a633286ee7523b5eaeabeec33912deaafe
Author: George Sherwood <chat at sourcemage.org>
Commit: George Sherwood <chat at sourcemage.org>

    Irssi added Upstream patch to fix crash. Bug 13030.

diff --git a/chat-irc/irssi/DETAILS b/chat-irc/irssi/DETAILS
index 4808774..0a298b6 100755
--- a/chat-irc/irssi/DETAILS
+++ b/chat-irc/irssi/DETAILS
@@ -15,7 +15,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL
    SOURCE_IGNORE=volatile
 else
          VERSION=0.8.10a
-      PATCHLEVEL=2
+      PATCHLEVEL=3
           SOURCE=$SPELL-$VERSION.tar.bz2
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-0.8.10
    SOURCE_URL[0]=http://www.irssi.org/files/${SOURCE}
diff --git a/chat-irc/irssi/HISTORY b/chat-irc/irssi/HISTORY
index b1d2702..6144f39 100644
--- a/chat-irc/irssi/HISTORY
+++ b/chat-irc/irssi/HISTORY
@@ -1,3 +1,8 @@
+2006-08-28 George Sherwood <george at beernabeer.com>
+	* DETAILS: Bumped PATCHLEVEL
+	* PRE_BUILD: Added upstream patch from Bug #13030.
+	* irssi-0.8.10-dcc-segv.patch: Added patch from Upstream Bug #369 
+
 2006-08-22 Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>
 	* CONFIGURE: added negative switches to config_query_options
 	* DETAILS: bumped PATCHLEVEL
diff --git a/chat-irc/irssi/PRE_BUILD b/chat-irc/irssi/PRE_BUILD
index 91a86cd..4cb2ac0 100755
--- a/chat-irc/irssi/PRE_BUILD
+++ b/chat-irc/irssi/PRE_BUILD
@@ -2,4 +2,7 @@ default_pre_build &&
 cd ${SOURCE_DIRECTORY} &&
 if [ "$IRSSI_SVN" = "y" ]; then
 NOCONFIGURE=yes ./autogen.sh
+fi &&
+if [ "$IRSSI_SVN" = "n" ]; then
+  patch  -p0  <  $SCRIPT_DIRECTORY/irssi-0.8.10-dcc-segv.patch
 fi
diff --git a/chat-irc/irssi/irssi-0.8.10-dcc-segv.patch b/chat-irc/irssi/irssi-0.8.10-dcc-segv.patch
new file mode 100644
index 0000000..3d2b3dc
--- /dev/null
+++ b/chat-irc/irssi/irssi-0.8.10-dcc-segv.patch
@@ -0,0 +1,12 @@
+--- src/irc/dcc/dcc.c.orig	2006-08-28 07:08:13.000000000 +0500
++++ src/irc/dcc/dcc.c	2006-08-28 07:09:17.000000000 +0500
+@@ -58,8 +58,8 @@
+ 
+ 	pos = gslist_find_string(dcc_types, type);
+ 	if (pos != NULL) {
+-                dcc_types = g_slist_remove(dcc_types, pos->data);
+ 		g_free(pos->data);
++                dcc_types = g_slist_remove(dcc_types, pos->data);
+ 	}
+ }
+ 



More information about the SM-Commit mailing list