[git.ipfire.org] IPFire 2.x development tree branch, thirteen, updated. 83cc9084a9c86d64cc092ae766cf0884b44f6e24

[git.ipfire.org] IPFire 2.x development tree branch, thirteen, updated. 83cc9084a9c86d64cc092ae766cf0884b44f6e24

[git]

[-- Attachment #1: Type: text/plain, Size: 4734 bytes --]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".

The branch, thirteen has been updated
       via  83cc9084a9c86d64cc092ae766cf0884b44f6e24 (commit)
       via  44d148b9a8017c83860f2eb4a385619313e3a7f9 (commit)
       via  3f350057661c1c2982cb88cbadef3b22870b52b4 (commit)
       via  746c2e6a2282ced1123fe4328e14016ff9b78443 (commit)
      from  7a6448326f80cfa1349ded50eae96fd92df1565a (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 83cc9084a9c86d64cc092ae766cf0884b44f6e24
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Thu Nov 15 13:50:36 2012 +0100

    bash startfiles: Add file to make sure that all paths are available.

commit 44d148b9a8017c83860f2eb4a385619313e3a7f9
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Thu Nov 15 13:50:15 2012 +0100

    bash startfiles: Fix locale of path names in glib2.

commit 3f350057661c1c2982cb88cbadef3b22870b52b4
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Thu Nov 15 13:49:51 2012 +0100

    bash startfiles: Add /sbin.

commit 746c2e6a2282ced1123fe4328e14016ff9b78443
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Thu Nov 15 13:49:23 2012 +0100

    bash: Execute start files when loggin in over SSH.

-----------------------------------------------------------------------

Summary of changes:
 config/etc/profile                         |    2 ++
 config/profile.d/extrapaths.sh             |   11 +++++++++++
 config/profile.d/glib2-locale.sh           |    3 +++
 lfs/bash                                   |    1 +
 src/patches/bash-3.2-ssh_source_bash.patch |    9 +++++++++
 5 files changed, 26 insertions(+), 0 deletions(-)
 create mode 100644 config/profile.d/extrapaths.sh
 create mode 100644 config/profile.d/glib2-locale.sh
 create mode 100644 src/patches/bash-3.2-ssh_source_bash.patch

Difference in files:
diff --git a/config/etc/profile b/config/etc/profile
index 912d3d0..2d66685 100644
--- 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
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
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 4fef89e..c89ff54 100644
--- 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
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


hooks/post-receive
--
IPFire 2.x development tree