Merge branch 'thirteen' of ssh://git.ipfire.org/pub/git/ipfire-2.x into thirteen

diff --git a/config/etc/profile b/config/etc/profile
index 912d3d0b9154fe1a74413569fc5a49676b2c93c6..2d66685588f07b8aeacf77624beb1909532c159a 100644 (file)
--- a/config/etc/profile
+++ b/config/etc/profile
@@ -35,11 +35,13 @@ fi
 
 # Path manipulation
 if [ "$EUID" = "0" ]; then
+    pathmunge /sbin
     pathmunge /usr/sbin
     pathmunge /usr/local/sbin
 else
     pathmunge /usr/local/sbin after
     pathmunge /usr/sbin after
+    pathmunge /sbin after
 fi
 
 HOSTNAME=`/bin/hostname 2>/dev/null`

diff --git a/config/profile.d/extrapaths.sh b/config/profile.d/extrapaths.sh
new file mode 100644 (file)
index 0000000..d712736
--- /dev/null
+++ b/config/profile.d/extrapaths.sh
@@ -0,0 +1,11 @@
+# Make sure the basic paths are always available.
+
+pathmunge /bin
+pathmunge /usr/bin
+pathmunge /usr/local/bin
+
+for directory in $(find /opt/*/bin -maxdepth 1 -type d 2>/dev/null); do
+        pathmunge ${directory} after
+done
+
+unset directory

diff --git a/config/profile.d/glib2-locale.sh b/config/profile.d/glib2-locale.sh
new file mode 100644 (file)
index 0000000..8dd50d5
--- /dev/null
+++ b/config/profile.d/glib2-locale.sh
@@ -0,0 +1,3 @@
+# Use the current locale charset for filenames
+# in applications using GLib
+export G_FILENAME_ENCODING=@locale

diff --git a/lfs/bash b/lfs/bash
index 4fef89e9b88c45214ea3804e999e84f8a9ef962e..c89ff545a99b6e1a6952f219b19abd8ffecbe4d6 100644 (file)
--- a/lfs/bash
+++ b/lfs/bash
@@ -95,6 +95,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 
        cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/bash-4.0-paths-1.patch
        cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/bash-4.0-profile-1.patch
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/bash-3.2-ssh_source_bash.patch
        cd $(DIR_APP) && ./configure $(EXTRA_CONFIG)
        cd $(DIR_APP) && make $(EXTRA_MAKE)
        cd $(DIR_APP) && make $(EXTRA_INSTALL) install

diff --git a/src/patches/bash-3.2-ssh_source_bash.patch b/src/patches/bash-3.2-ssh_source_bash.patch
new file mode 100644 (file)
index 0000000..4b37132
--- /dev/null
+++ b/src/patches/bash-3.2-ssh_source_bash.patch
@@ -0,0 +1,9 @@
+diff -up bash-3.2/config-top.h.ssh_source_bash bash-3.2/config-top.h
+--- bash-3.2/config-top.h.ssh_source_bash      2008-10-23 15:08:04.000000000 +0200
++++ bash-3.2/config-top.h      2008-10-23 15:08:33.000000000 +0200
+@@ -86,4 +86,4 @@
+ 
+ /* 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