- updated

Changed files:
    irssi-dynamic.patch -> 1.7
    irssi-gcc4.patch -> 1.2
    irssi-home_etc.patch -> 1.3
    irssi-invalid_free.patch -> 1.2
    irssi-tinfo.patch -> 1.2

diff --git a/irssi-dynamic.patch b/irssi-dynamic.patch
index cc361b6df8a2170956f6ab936129723114861e84..f7f457c8cacf57d76c0c91705dfad6756329afd6 100644 (file)
--- a/irssi-dynamic.patch
+++ b/irssi-dynamic.patch
@@ -12,15 +12,6 @@ diff -ur irssi-0.8.10-rc5-o/configure.in irssi-0.8.10-rc5/configure.in
  
  AC_CHECK_FUNCS(mkfifo fcntl nl_langinfo)
  
-@@ -351,7 +355,7 @@
-     AC_MSG_RESULT([yes, using it])
- 
-     dnl * we have to do this at this point so we know what libs gmodule needs
--    if test ! -f $GLIB_DIR/.libs/libglib.a; then
-+    if test ! -f $GLIB_DIR/.libs/libglib.la; then
-       echo
-       echo "configuring GLib ..."
-       echo
 @@ -745,21 +749,21 @@
                        dnl * building with static perl support
                        dnl * all PERL_LDFLAGS linking is done in fe-text

diff --git a/irssi-gcc4.patch b/irssi-gcc4.patch
index 1ae6f33adf2c71a6f1a19dd33d0aba70fffb6973..a26e5df4c48a3f4aca092a7bd105b57595f84f7e 100644 (file)
--- a/irssi-gcc4.patch
+++ b/irssi-gcc4.patch
@@ -1,5 +1,5 @@
---- irssi-0.8.10-rc5/src/core/misc.h.orig      2004-03-23 23:10:02.000000000 +0100
-+++ irssi-0.8.10-rc5/src/core/misc.h   2005-03-01 20:23:20.306008696 +0100
+--- irssi-0.8.11/src/core/misc.h       2007-04-25 20:13:56.000000000 +0200
++++ irssi-0.8.11/src/core/misc.h-new   2007-06-07 01:41:35.677176190 +0200
 @@ -1,6 +1,10 @@
  #ifndef __MISC_H
  #define __MISC_H
@@ -11,9 +11,11 @@
  /* `str' should be type char[MAX_INT_STRLEN] */
  #define ltoa(str, num) \
        g_snprintf(str, sizeof(str), "%d", num)
---- irssi-0.8.10-rc5/src/perl/module.h.orig    2001-12-14 02:54:12.000000000 +0100
-+++ irssi-0.8.10-rc5/src/perl/module.h 2005-03-01 20:23:50.545411608 +0100
-@@ -1,3 +1,7 @@
+--- irssi-0.8.11/src/perl/module.h     2007-04-25 20:13:56.000000000 +0200
++++ irssi-0.8.11/src/perl/module.h-new 2007-06-07 01:42:22.832959937 +0200
+@@ -1,5 +1,9 @@
+ #include "common.h"
+ 
 +#ifdef HAVE_CONFIG_H
 +#include "config.h"
 +#endif

diff --git a/irssi-home_etc.patch b/irssi-home_etc.patch
index 60f5015fb8882c3544c5b646ff5819e5544638a6..e31a8f0365f70c43b655d845565b78c52db2da65 100644 (file)
--- a/irssi-home_etc.patch
+++ b/irssi-home_etc.patch
@@ -1,4 +1,3 @@
-diff -Nru irssi-0.8.6.orig/src/core/core.c irssi-0.8.6/src/core/core.c
 --- irssi-0.8.6.orig/src/core/core.c   2002-10-19 20:00:06.000000000 +0200
 +++ irssi-0.8.6/src/core/core.c        2003-11-09 12:46:25.000000000 +0100
 @@ -193,7 +193,9 @@
@@ -11,28 +10,23 @@ diff -Nru irssi-0.8.6.orig/src/core/core.c irssi-0.8.6/src/core/core.c
 +                      home = g_get_home_dir();
                if (home == NULL)
                        home = ".";
- 
-diff -Nru irssi-0.8.9/src/core/log-away.c.orig irssi-0.8.9/src/core/log-away.c
---- irssi-0.8.9/src/core/log-away.c.orig       2002-12-28 19:00:03.000000000 +0100
-+++ irssi-0.8.9/src/core/log-away.c    2003-12-19 19:34:08.000000000 +0100
-@@ -102,7 +102,15 @@
-       away_filepos = 0;
+
+--- irssi-0.8.11/src/core/log-away.c.orig      2007-04-25 20:13:56.000000000 +0200
++++ irssi-0.8.11/src/core/log-away.c   2007-06-07 01:31:08.951362144 +0200
+@@ -105,7 +105,12 @@
        away_msgs = 0;
  
--      settings_add_str("log", "awaylog_file", IRSSI_DIR_SHORT"/away.log");
+       awaylog_file = g_strconcat(get_irssi_dir(), "/away.log", NULL);
+-      settings_add_str("log", "awaylog_file", awaylog_file);
 +      char *home_etc = getenv("HOME_ETC");
-+      
 +      if (home_etc) {
 +              char *log = g_strdup_printf("%s/.irssi/away.log", home_etc);
-+              
 +              settings_add_str("log", "awaylog_file", log);
 +      } else
-+              settings_add_str("log", "awaylog_file", IRSSI_DIR_SHORT"/away.log");
-+
++              settings_add_str("log", "awaylog_file", awaylog_file);
+       g_free(awaylog_file);
        settings_add_level("log", "awaylog_level", "msgs hilight");
- 
-       signal_add("log written", (SIGNAL_FUNC) sig_log_written);
-diff -Nru irssi-0.8.6.orig/src/lib-popt/poptconfig.c irssi-0.8.6/src/lib-popt/poptconfig.c
+
 --- irssi-0.8.6.orig/src/lib-popt/poptconfig.c 2002-01-27 21:45:58.000000000 +0100
 +++ irssi-0.8.6/src/lib-popt/poptconfig.c      2003-11-09 12:36:55.000000000 +0100
 @@ -130,7 +130,9 @@
@@ -45,4 +39,4 @@ diff -Nru irssi-0.8.6.orig/src/lib-popt/poptconfig.c irssi-0.8.6/src/lib-popt/po
 +    if (home) {
        fn = malloc(strlen(home) + 20);
        strcpy(fn, home);
-       strcat(fn, "/.popt");
+       strcat(fn, "/.popt"); 

diff --git a/irssi-invalid_free.patch b/irssi-invalid_free.patch
index f5d2bcf86ad4486f6c2279cecf35859fd1396a7b..fbfa4ff37aa9412c7ab6cb9fe945754301e5b01b 100644 (file)
--- a/irssi-invalid_free.patch
+++ b/irssi-invalid_free.patch
@@ -1,8 +1,5 @@
-after call of g_slist_remove() the `pos` points to released area,
-so dereferencing pos->data isn't acceptable.
-
---- irssi-0.8.10/src/irc/dcc/dcc.c.orig        2005-10-19 04:13:31.000000000 +0200
-+++ irssi-0.8.10/src/irc/dcc/dcc.c     2006-05-02 22:33:11.000000000 +0200
+--- irssi-0.8.11/src/irc/dcc/dcc.c     2007-06-07 01:49:35.928848024 +0200
++++ irssi-0.8.11/src/irc/dcc/dcc.c-new 2007-06-07 01:52:47.442154599 +0200
 @@ -55,11 +55,13 @@
  void dcc_unregister_type(const char *type)
  {
@@ -11,8 +8,8 @@ so dereferencing pos->data isn't acceptable.
  
        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);
 +              data = pos->data;
 +              dcc_types = g_slist_remove(dcc_types, data);
 +              g_free(data);

diff --git a/irssi-tinfo.patch b/irssi-tinfo.patch
index c526d10d1c7f91d4e6f4c288744f018cb83e7763..3af12562d54701cae38272b4823943fa094bad4d 100644 (file)
--- a/irssi-tinfo.patch
+++ b/irssi-tinfo.patch
@@ -1,38 +1,26 @@
---- irssi-0.8.5/curses.m4~     Sun Jul 29 01:10:02 2001
-+++ irssi-0.8.5/curses.m4      Sat Nov 23 04:31:32 2002
-@@ -131,7 +131,7 @@
-         if test x$withval = xno ; then
-               search_ncurses=false
-         elif test x$withval != xyes ; then
--              AC_NCURSES($withval/include, ncurses.h, -L$withval/lib -lncurses, -I$withval/include, "ncurses on $withval/include")
-+              AC_NCURSES($withval/include, ncurses.h, -L$withval/lib -lncurses -ltinfo, -I$withval/include, "ncurses on $withval/include")
-         fi
-       )
- 
---- irssi-0.8.5/curses.m4~     Sat Nov 23 04:32:37 2002
-+++ irssi-0.8.5/curses.m4      Sat Nov 23 04:35:46 2002
-@@ -232,16 +232,16 @@
+--- irssi-0.8.11/curses.m4.orig        2007-06-07 01:22:01.709666033 +0200
++++ irssi-0.8.11/curses.m4     2007-06-07 01:24:43.928073732 +0200
+@@ -232,17 +232,17 @@
  AC_DEFUN(AC_SEARCH_NCURSES, [
      AC_CHECKING("location of ncurses.h file")
  
--    AC_NCURSES(/usr/include, ncurses.h, -lncurses,, "ncurses on /usr/include")
--    AC_NCURSES(/usr/include/ncurses, ncurses.h, -lncurses, -I/usr/include/ncurses, "ncurses on /usr/include/ncurses")
--    AC_NCURSES(/usr/local/include, ncurses.h, -L/usr/local/lib -lncurses, -I/usr/local/include, "ncurses on /usr/local")
--    AC_NCURSES(/usr/pkg/include, ncurses.h, -L/usr/pkg/lib -lncurses, -I/usr/pkg/include, "ncurses on /usr/pkg")
--    AC_NCURSES(/usr/contrib/include, ncurses.h, -L/usr/contrib/lib -lncurses, -I/usr/contrib/include, "ncurses on /usr/contrib")
--    AC_NCURSES(/usr/local/include/ncurses, ncurses.h, -L/usr/local/lib -L/usr/local/lib/ncurses -lncurses, -I/usr/local/include/ncurses, "ncurses on /usr/local/include/ncurses")
-+    AC_NCURSES(/usr/include, ncurses.h, -lncurses -ltinfo,, "ncurses on /usr/include")
-+    AC_NCURSES(/usr/include/ncurses, ncurses.h, -lncurses -ltinfo, -I/usr/include/ncurses, "ncurses on /usr/include/ncurses")
-+    AC_NCURSES(/usr/local/include, ncurses.h, -L/usr/local/lib -lncurses -ltinfo, -I/usr/local/include, "ncurses on /usr/local")
-+    AC_NCURSES(/usr/pkg/include, ncurses.h, -L/usr/pkg/lib -lncurses -ltinfo, -I/usr/pkg/include, "ncurses on /usr/pkg")
-+    AC_NCURSES(/usr/contrib/include, ncurses.h, -L/usr/contrib/lib -lncurses -ltinfo, -I/usr/contrib/include, "ncurses on /usr/contrib")
-+    AC_NCURSES(/usr/local/include/ncurses, ncurses.h, -L/usr/local/lib -L/usr/local/lib/ncurses -lncurses -ltinfo, -I/usr/local/include/ncurses, "ncurses on /usr/local/include/ncurses")
- 
--    AC_NCURSES(/usr/local/include/ncurses, curses.h, -L/usr/local/lib -lncurses, -I/usr/local/include/ncurses -DRENAMED_NCURSES, "renamed ncurses on /usr/local/.../ncurses")
-+    AC_NCURSES(/usr/local/include/ncurses, curses.h, -L/usr/local/lib -lncurses -ltinfo, -I/usr/local/include/ncurses -DRENAMED_NCURSES, "renamed ncurses on /usr/local/.../ncurses")
- 
--    AC_NCURSES(/usr/include/ncurses, curses.h, -lncurses, -I/usr/include/ncurses -DRENAMED_NCURSES, "renamed ncurses on /usr/include/ncurses")
-+    AC_NCURSES(/usr/include/ncurses, curses.h, -lncurses -ltinfo, -I/usr/include/ncurses -DRENAMED_NCURSES, "renamed ncurses on /usr/include/ncurses")
+-    AC_NCURSES(/usr/include, ncurses.h, -lncurses,,
++    AC_NCURSES(/usr/include, ncurses.h, -lncurses -ltinfo,,
+              [ncurses in /usr/include])
+-    AC_NCURSES(/usr/include/ncurses, ncurses.h, -lncurses, -I/usr/include/ncurses,
++    AC_NCURSES(/usr/include/ncurses, ncurses.h, -lncurses -ltinfo, -I/usr/include/ncurses,
+              [ncurses in /usr/include/ncurses])
+-    AC_NCURSES(/usr/local/include, ncurses.h, -L/usr/local/lib -lncurses, -I/usr/local/include,
++    AC_NCURSES(/usr/local/include, ncurses.h, -L/usr/local/lib -lncurses -ltinfo, -I/usr/local/include,
+              [ncurses in /usr/local/include])
+-    AC_NCURSES(/usr/local/include/ncurses, ncurses.h, -L/usr/local/lib -lncurses, -I/usr/local/include/ncurses,
++    AC_NCURSES(/usr/local/include/ncurses, ncurses.h, -L/usr/local/lib -lncurses -ltinfo, -I/usr/local/include/ncurses,
+              [ncurses in /usr/local/include/ncurses])
+-    AC_NCURSES(/usr/local/include/ncurses, curses.h, -L/usr/local/lib -lncurses, -I/usr/local/include/ncurses -DRENAMED_NCURSES,
++    AC_NCURSES(/usr/local/include/ncurses, curses.h, -L/usr/local/lib -lncurses -ltinfo, -I/usr/local/include/ncurses -DRENAMED_NCURSES,
+              [renamed ncurses in /usr/local/include/ncurses])
+-    AC_NCURSES(/usr/include/ncurses, curses.h, -lncurses, -I/usr/include/ncurses -DRENAMED_NCURSES,
++    AC_NCURSES(/usr/include/ncurses, curses.h, -lncurses -ltinfo, -I/usr/include/ncurses -DRENAMED_NCURSES,
+              [renamed ncurses in /usr/include/ncurses])
  
      dnl
-     dnl We couldn't find ncurses, try SysV curses