- update to 4.11

Changed files:
    aegis-etc_dir.patch -> 1.2

diff --git a/aegis-etc_dir.patch b/aegis-etc_dir.patch
index ef6798da5b1ba0b9f18f20efdae63d0f1d26caf1..e2fcaac7b0e8b42fd95284a617149ddd73fa3c49 100644 (file)
--- a/aegis-etc_dir.patch
+++ b/aegis-etc_dir.patch
@@ -1,21 +1,20 @@
-diff -Nru aegis-3.18/libaegis/user.c aegis-3.18.new/libaegis/user.c
---- aegis-3.18/libaegis/user.c Thu Jul  8 22:36:21 1999
-+++ aegis-3.18.new/libaegis/user.c     Sat Mar 22 16:55:45 2003
-@@ -874,8 +874,15 @@
-       trace(("user_uconf_get(up = %08lX)\n{\n"/*}*/, up));
-       lock_sync(up);
-       if (!up->uconf_path)
--              up->uconf_path =
--                      str_format("%S/.aegisrc", up->home);
-+      {
-+              char *etc_dir = getenv("ETC_DIR");
-+              if (etc_dir)
-+                      up->uconf_path =
-+                              str_format("%S/aegisrc", str_from_c(etc_dir));
-+              else
-+                      up->uconf_path =
-+                              str_format("%S/.aegisrc", up->home);
-+  }
-       if (!up->uconf_data)
-       {
-               uconf           data;
+--- aegis-4.11/libaegis/user.c.orig    2003-04-05 15:58:05.000000000 +0200
++++ aegis-4.11/libaegis/user.c 2003-07-03 22:32:32.000000000 +0200
+@@ -1024,7 +1024,16 @@
+     trace(("user_uconf_get(up = %08lX)\n{\n", (long)up));
+     lock_sync(up);
+     if (!up->uconf_path)
+-      up->uconf_path = str_format("%S/.aegisrc", up->home);
++       up->uconf_path = str_format("%S/.aegisrc", up->home);
++      {
++        char *etc_dir = getenv("ETC_DIR");
++        if (etc_dir)
++            up->uconf_path =
++             str_format("%S/aegisrc", str_from_c(etc_dir));
++        else
++             up->uconf_path =
++             str_format("%S/.aegisrc", up->home);
++      }
+ 
+     /*
+      * Read in the user preferences.  There are several sources of