1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
|
#! /bin/sh -e
if [ $# -eq 3 -a "$2" = '-d' ]; then
pdir="-d $3"
elif [ $# -ne 1 ]; then
echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
exit 1
fi
case "$1" in
-patch) patch $pdir -f --no-backup-if-mismatch -p1 < $0;;
-unpatch) patch $pdir -f --no-backup-if-mismatch -R -p1 < $0;;
*)
echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
exit 1
esac
exit 0
# DP: Changed compile time configuration options:
# DP:
# DP: - Set the default path to comply with Debian policy
# DP:
# DP: - Define DONT_REPORT_SIGPIPE: We don't want to see `Broken pipe' messages
# DP: when a job like `cat jobs.c | exit 1' is executed. Fixes part of #7047,
# DP: #10259, #10433 and #10494. Comment from the upstream author: "The
# DP: default bash behavior with respect to the exit status of a pipeline
# DP: will not change. Changing it as suggested in the discussion of #10494
# DP: would render bash incompatible with every other shell out there.".
# DP:
# DP: - Enable System-wide .bashrc file for interactive shells.
# DP:
# DP: - Enable System-wide .bash_logout file for interactive shells.
# DP:
# DP: - make non-interactive shells begun with argv[0][0] == '-'
# DP: run the startup files when not in posix mode.
# DP:
# DP: - try to check whether bash is being run by sshd and source
# DP: the .bashrc if so (like the rshd behavior).
# DP:
# DP: - don't define a default DEFAULT_MAIL_DIRECTORY, because it
# DP: can cause a timeout on NFS mounts.
diff -urb bash.orig/config-top.h bash/config-top.h
--- bash.orig/config-top.h 2003-08-05 16:36:12.000000000 +0200
+++ bash/config-top.h 2003-09-28 00:20:03.000000000 +0200
@@ -47,19 +47,19 @@
/* Define DONT_REPORT_SIGPIPE if you don't want to see `Broken pipe' messages
when a job like `cat jobs.c | exit 1' is executed. */
-/* #define DONT_REPORT_SIGPIPE */
+#define DONT_REPORT_SIGPIPE
/* The default value of the PATH variable. */
#ifndef DEFAULT_PATH_VALUE
#define DEFAULT_PATH_VALUE \
- "/usr/gnu/bin:/usr/local/bin:/bin:/usr/bin:."
+ "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
#endif
/* The value for PATH when invoking `command -p'. This is only used when
the Posix.2 confstr () function, or CS_PATH define are not present. */
#ifndef STANDARD_UTILS_PATH
#define STANDARD_UTILS_PATH \
- "/bin:/usr/bin:/sbin:/usr/sbin:/etc:/usr/etc"
+ "/bin:/usr/bin:/sbin:/usr/sbin"
#endif
/* Default primary and secondary prompt strings. */
@@ -73,15 +73,15 @@
#define KSH_COMPATIBLE_SELECT
/* System-wide .bashrc file for interactive shells. */
-/* #define SYS_BASHRC "/etc/bash.bashrc" */
+#define SYS_BASHRC "/etc/bash.bashrc"
/* System-wide .bash_logout for login shells. */
-/* #define SYS_BASH_LOGOUT "/etc/bash.bash_logout" */
+#define SYS_BASH_LOGOUT "/etc/bash.bash_logout"
/* Define this to make non-interactive shells begun with argv[0][0] == '-'
run the startup files when not in posix mode. */
-/* #define NON_INTERACTIVE_LOGIN_SHELLS */
+#define NON_INTERACTIVE_LOGIN_SHELLS
/* Define this if you want bash to try to check whether it's being run by
sshd and source the .bashrc if so (like the rshd behavior). */
-/* #define SSH_SOURCE_BASHRC */
+#define SSH_SOURCE_BASHRC
--- bash/config-bot.h~ 2003-09-19 21:57:38.000000000 +0200
+++ bash/config-bot.h 2003-10-09 21:06:01.000000000 +0200
@@ -178,4 +178,4 @@
/******************************************************************/
/* If you don't want bash to provide a default mail file to check. */
-/* #undef DEFAULT_MAIL_DIRECTORY */
+#undef DEFAULT_MAIL_DIRECTORY
|
