- rediffed

[packages/bash.git] / bash-paths.patch

diff --git a/bash-paths.patch b/bash-paths.patch
index 21736d50379fc87600bf1ccb6de82e6471d1c226..5c98b7db87112558625dc57ba629c9fb8052abbf 100644 (file)
--- a/bash-paths.patch
+++ b/bash-paths.patch
@@ -1,17 +1,6 @@
-diff -urbB bash-3.0.org/config.h.in bash-3.0/config.h.in
---- bash-3.0.org/config.h.in   2004-07-21 22:08:31.000000000 +0200
-+++ bash-3.0/config.h.in       2005-10-08 19:35:26.593219000 +0200
-@@ -197,7 +197,7 @@
- 
- /* System paths */
- 
--#define DEFAULT_MAIL_DIRECTORY "/usr/spool/mail"
-+#define DEFAULT_MAIL_DIRECTORY "/var/mail"
- 
- /* Characteristics of the system's header files and libraries that affect
-    the compilation environment. */
---- bash-5.0/config-top.h~     2019-03-21 14:06:54.000000000 +0100
-+++ bash-5.0/config-top.h      2019-03-21 14:08:18.043987487 +0100
+diff -urNp -x '*.orig' bash-5.1.org/config-top.h bash-5.1/config-top.h
+--- bash-5.1.org/config-top.h  2020-11-16 16:34:26.000000000 +0100
++++ bash-5.1/config-top.h      2021-03-21 13:21:08.467594925 +0100
 @@ -63,7 +63,7 @@
  /* The default value of the PATH variable. */
  #ifndef DEFAULT_PATH_VALUE
@@ -30,8 +19,8 @@ diff -urbB bash-3.0.org/config.h.in bash-3.0/config.h.in
  #endif
  
  /* Default primary and secondary prompt strings. */
-@@ -73,7 +73,7 @@
- #define KSH_COMPATIBLE_SELECT
+@@ -91,7 +91,7 @@
+ #define DEFAULT_BASHRC "~/.bashrc"
  
  /* System-wide .bashrc file for interactive shells. */
 -/* #define SYS_BASHRC "/etc/bash.bashrc" */
@@ -39,3 +28,15 @@ diff -urbB bash-3.0.org/config.h.in bash-3.0/config.h.in
  
  /* System-wide .bash_logout for login shells. */
  /* #define SYS_BASH_LOGOUT "/etc/bash.bash_logout" */
+diff -urNp -x '*.orig' bash-5.1.org/config.h.in bash-5.1/config.h.in
+--- bash-5.1.org/config.h.in   2020-05-19 19:54:22.000000000 +0200
++++ bash-5.1/config.h.in       2021-03-21 13:21:08.467594925 +0100
+@@ -247,7 +247,7 @@
+ 
+ /* System paths */
+ 
+-#define DEFAULT_MAIL_DIRECTORY "/usr/spool/mail"
++#define DEFAULT_MAIL_DIRECTORY "/var/mail"
+ 
+ /* Characteristics of the system's header files and libraries that affect
+    the compilation environment. */