Mercurial Mercurial > upstream > oracle > userland-gate / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
components/bash/patches/solaris-001.config-top.h.patch
author Stefan Teleman <stefan.teleman@oracle.com>
Mon, 29 Feb 2016 10:09:14 -0800
changeset 5518 c47fe0edc204
parent 115 c360825c3a3f
child 7485 89b2d849f322
permissions -rw-r--r--
20612604 upgrade bash to 4.3
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
5518
c47fe0edc204 20612604 upgrade bash to 4.3
Stefan Teleman <stefan.teleman@oracle.com>
parents: 115
diff changeset 
     1
 
# Define defaults for Solaris.
c47fe0edc204 20612604 upgrade bash to 4.3
Stefan Teleman <stefan.teleman@oracle.com>
parents: 115
diff changeset 
     2
 
# Solaris-specific patch.
c47fe0edc204 20612604 upgrade bash to 4.3
Stefan Teleman <stefan.teleman@oracle.com>
parents: 115
diff changeset 
     3
 
# Not for upstream.
c47fe0edc204 20612604 upgrade bash to 4.3
Stefan Teleman <stefan.teleman@oracle.com>
parents: 115
diff changeset 
     4
 
--- config-top.h	2012-08-18 17:51:30.000000000 -0700
c47fe0edc204 20612604 upgrade bash to 4.3
Stefan Teleman <stefan.teleman@oracle.com>
parents: 115
diff changeset 
     5
 
+++ config-top.h	2015-04-02 10:08:29.143843829 -0700
c47fe0edc204 20612604 upgrade bash to 4.3
Stefan Teleman <stefan.teleman@oracle.com>
parents: 115
diff changeset 
     6
 
@@ -59,14 +59,14 @@
110
77641682ba6f 7015638 bash needs to move to userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
     7
 
 /* The default value of the PATH variable. */
77641682ba6f 7015638 bash needs to move to userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
     8
 
 #ifndef DEFAULT_PATH_VALUE
77641682ba6f 7015638 bash needs to move to userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
     9
 
 #define DEFAULT_PATH_VALUE \
5518
c47fe0edc204 20612604 upgrade bash to 4.3
Stefan Teleman <stefan.teleman@oracle.com>
parents: 115
diff changeset 
    10
 
-  "/usr/local/bin:/usr/local/sbin:/usr/bin:/usr/sbin:/bin:/sbin:."
110
77641682ba6f 7015638 bash needs to move to userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    11
 
+  "/usr/gnu/bin:/bin:/usr/bin:/sbin:/usr/sbin:."
77641682ba6f 7015638 bash needs to move to userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    12
 
 #endif
77641682ba6f 7015638 bash needs to move to userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    13
77641682ba6f 7015638 bash needs to move to userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    14
 
 /* The value for PATH when invoking `command -p'.  This is only used when
77641682ba6f 7015638 bash needs to move to userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    15
 
    the Posix.2 confstr () function, or CS_PATH define are not present. */
77641682ba6f 7015638 bash needs to move to userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    16
 
 #ifndef STANDARD_UTILS_PATH
77641682ba6f 7015638 bash needs to move to userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    17
 
 #define STANDARD_UTILS_PATH \
77641682ba6f 7015638 bash needs to move to userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    18
 
-  "/bin:/usr/bin:/sbin:/usr/sbin:/etc:/usr/etc"
77641682ba6f 7015638 bash needs to move to userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    19
 
+  "/usr/gnu/bin:/bin:/usr/bin:/sbin:/usr/sbin:/etc:/etc/bash"
77641682ba6f 7015638 bash needs to move to userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    20
 
 #endif
77641682ba6f 7015638 bash needs to move to userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    21
77641682ba6f 7015638 bash needs to move to userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    22
 
 /* Default primary and secondary prompt strings. */
5518
c47fe0edc204 20612604 upgrade bash to 4.3
Stefan Teleman <stefan.teleman@oracle.com>
parents: 115
diff changeset 
    23
 
@@ -80,14 +80,14 @@
110
77641682ba6f 7015638 bash needs to move to userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    24
 
 #define KSH_COMPATIBLE_SELECT
77641682ba6f 7015638 bash needs to move to userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    25
77641682ba6f 7015638 bash needs to move to userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    26
 
 /* System-wide .bashrc file for interactive shells. */
77641682ba6f 7015638 bash needs to move to userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    27
 
-/* #define SYS_BASHRC "/etc/bash.bashrc" */
77641682ba6f 7015638 bash needs to move to userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    28
 
+#define SYS_BASHRC "/etc/bash/bashrc"
77641682ba6f 7015638 bash needs to move to userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    29
77641682ba6f 7015638 bash needs to move to userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    30
 
 /* System-wide .bash_logout for login shells. */
77641682ba6f 7015638 bash needs to move to userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    31
 
-/* #define SYS_BASH_LOGOUT "/etc/bash.bash_logout" */
77641682ba6f 7015638 bash needs to move to userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    32
 
+#define SYS_BASH_LOGOUT "/etc/bash/bash_logout"
77641682ba6f 7015638 bash needs to move to userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    33
77641682ba6f 7015638 bash needs to move to userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    34
 
 /* Define this to make non-interactive shells begun with argv[0][0] == '-'
77641682ba6f 7015638 bash needs to move to userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    35
 
    run the startup files when not in posix mode. */
77641682ba6f 7015638 bash needs to move to userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    36
 
-/* #define NON_INTERACTIVE_LOGIN_SHELLS */
77641682ba6f 7015638 bash needs to move to userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    37
 
+#define NON_INTERACTIVE_LOGIN_SHELLS 1
77641682ba6f 7015638 bash needs to move to userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    38
77641682ba6f 7015638 bash needs to move to userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    39
 
 /* Define this if you want bash to try to check whether it's being run by
77641682ba6f 7015638 bash needs to move to userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    40
 
    sshd and source the .bashrc if so (like the rshd behavior).  This checks
upstream/oracle/userland-gate