Rediff patches.

[packages/irssi.git] / irssi-home_etc.patch

diff --git a/irssi-home_etc.patch b/irssi-home_etc.patch
index b848d8af11aae11071448550b8c58d7ff5c1654f..08d6b94fed958264667fdbd762768e693a490408 100644 (file)
--- a/irssi-home_etc.patch
+++ b/irssi-home_etc.patch
@@ -1,8 +1,8 @@
-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 @@
-       args_register(options);
+diff -urNp -x '*.orig' irssi-1.2.2.org/src/core/core.c irssi-1.2.2/src/core/core.c
+--- irssi-1.2.2.org/src/core/core.c    2019-08-29 15:48:46.000000000 +0200
++++ irssi-1.2.2/src/core/core.c        2021-05-04 21:22:39.960299530 +0200
+@@ -193,7 +193,9 @@ void core_preinit(const char *path)
+       int len;
  
        if (irssi_dir == NULL) {
 -              home = g_get_home_dir();
@@ -12,37 +12,20 @@ diff -Nru irssi-0.8.6.orig/src/core/core.c irssi-0.8.6/src/core/core.c
                if (home == NULL)
                        home = ".";
  
-diff -Nru irssi-0.8.6.orig/src/core/log-away.c irssi-0.8.6/src/core/log-away.c
---- irssi-0.8.6.orig/src/core/log-away.c       2001-07-15 16:07:48.000000000 +0200
-+++ irssi-0.8.6/src/core/log-away.c    2003-11-09 12:53:24.000000000 +0100
-@@ -104,8 +104,14 @@
-       awaylog = NULL;
-       away_filepos = 0;
+diff -urNp -x '*.orig' irssi-1.2.2.org/src/core/log-away.c irssi-1.2.2/src/core/log-away.c
+--- irssi-1.2.2.org/src/core/log-away.c        2019-08-29 15:48:46.000000000 +0200
++++ irssi-1.2.2/src/core/log-away.c    2021-05-04 21:22:39.960299530 +0200
+@@ -112,7 +112,12 @@ void log_away_init(void)
        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/away.log", 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_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 @@
-     if (getuid() != geteuid()) return 0;
- #endif
++              settings_add_str("log", "awaylog_file", awaylog_file);
+       g_free(awaylog_file);
+       settings_add_level("log", "awaylog_level", "msgs hilight");
  
--    if ((home = getenv("HOME"))) {
-+    home = getenv("HOME_ETC");
-+              if (!home) home = getenv("HOME");
-+    if (home) {
-       fn = malloc(strlen(home) + 20);
-       strcpy(fn, home);
-       strcat(fn, "/.popt");