[gentoo-commits] proj/baselayout:master commit in: /

["William Hubbs" <williamh@gentoo.org>]

commit:     2a075fb8bbffdbe3d948e2379a2300729a7bab93
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Wed May 23 21:47:48 2018 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Wed May 23 21:47:48 2018 +0000
URL:        https://gitweb.gentoo.org/proj/baselayout.git/commit/?id=2a075fb8

Update ChangeLog

 ChangeLog | 195 ++++++++++++++++++++++++++++++++------------------------------
 1 file changed, 100 insertions(+), 95 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index d03be873..8a334b83 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,153 +1,158 @@
-commit ec3d9fb5d4f9252bc524ad4c1fc901867cb3bb63
+commit bc596e56ff93ca121317a12d7033c5a5f5440046
 Author: William Hubbs <williamh@gentoo.org>
 Commit: William Hubbs <williamh@gentoo.org>
 
-    etc/profile: replace PATH with ROOTPATH if the user is root
+    Fix installation of .keep files
     
-    This is part of the following bug.
-    
-    X-Gentoo-Bug: 255695
-    X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=255695
+    This partially reverts commit c4887e88316e2176dc99c173ccc6af825c10f745.
+    We need these .keep files.
 
-commit a3cd4d5b362239f4d9104c2a9e3af9ba0eec421c
-Author: David Michael <david.michael@coreos.com>
-Commit: William Hubbs <williamh@gentoo.org>
-
-    etc/services: add etcd services
-    
-    X-Gentoo-Bug: 604704
-    X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=604704
-
-commit ef383418788f2ed46f5f4ad7b26fbe5b5b25707f
+commit 9bbb700a3bfeaca7307a154564db00feff201e6e
 Author: William Hubbs <williamh@gentoo.org>
 Commit: William Hubbs <williamh@gentoo.org>
 
-    etc/env.d: move default settings to 50bbaselayout instead of 00basic
-    
-    This allows other packages to append or pre-pend any of our defaults.
-    
-    X-Gentoo-Bug: 255695
-    X-Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=255695
-
-commit 0af4f400f3edb8e840df1cb9e9df0165961b432f
-Author: William Hubbs <williamh@gentoo.org>
-Commit: William Hubbs <williamh@gentoo.org>
-
-    version 2.4
-
-commit ff4d400d6f6651ecd06a66245fd43fb909e91955
-Author: Lars Wendler <polynomial-c@gentoo.org>
-Commit: William Hubbs <williamh@gentoo.org>
-
-    etc/shells: Add mksh to login shells
+    Makefile: layout-usrmerge should do nothing on non-Linux systems
 
-commit 3068c8e4af7ddfa2f2a04f0baf009578bf1a7d28
+commit c4887e88316e2176dc99c173ccc6af825c10f745
 Author: William Hubbs <williamh@gentoo.org>
 Commit: William Hubbs <williamh@gentoo.org>
 
-    add ChangeLog
+    Do not install .keep files
 
-commit 8f970ff82c88b86565d88852624da143bb2d5288
+commit 77e9c6f275399cdef64d432a19da51bc9c9cd0bf
 Author: William Hubbs <williamh@gentoo.org>
 Commit: William Hubbs <williamh@gentoo.org>
 
-    Makefile: add changelog target
-
-commit 89f852f823cad807dc360325ec92817e583835e8
-Author: Martin Vath <martin@mvath.de>
-Commit: William Hubbs <williamh@gentoo.org>
-
-    etc/profile: Make set -u work for the profile
-    
-    X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=555762
+    add layout-usrmerge to optionally support the /usr merge
 
-commit d32173ea399cc37837985dec55134d1e0e2ebf72
+commit 9cac4dd130637fa2c1f1a64bf3c9d2509284e6dd
 Author: William Hubbs <williamh@gentoo.org>
 Commit: William Hubbs <williamh@gentoo.org>
 
-    etc.Linux/sysctl.comf: disable rp_filter by default
-    
-    See https://lwn.net/Articles/578621/
-    
-    X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=586210
-
-commit db65c12659a298d3795d042079868f171432eb5c
+    Drop support for ROOTPATH
+    
+    The following is taken from /etc/profile:
+    
+    > Set up PATH depending on whether we're root or a normal user.
+    > There's no real reason to exclude sbin paths from the normal user,
+    > but it can make tab-completion easier when they aren't in the
+    > user's PATH to pollute the executable namespace.
+    
+    This seems like a minor inconvenience, and excluding sbin paths for the
+    normal user can cause bigger issues which will offset this inconvenience.
+    
+    commit ac52b58e7a8a7f8085de9f806645881740b22c5e
+    Author: William Hubbs <williamh@gentoo.org>
+    Date:   Wed Oct 4 17:12:33 2017 -0500
+    
+        Drop support for ROOTPATH
+    
+        The following is taken from /etc/profile:
+    
+        This seems like a minor inconvenience, and not having *sbin in the path
+        can cause bigger compatibility issues which offset this inconvenience.
+    
+    diff --git a/etc/env.d/50baselayout b/etc/env.d/50baselayout
+    index e8662e0e..b10a2c4d 100644
+    --- a/etc/env.d/50baselayout
+    +++ b/etc/env.d/50baselayout
+    @@ -1,8 +1,7 @@
+     # /etc/env.d/50baselayout
+     # Do not edit this file
+    
+    -PATH="/usr/local/bin:/usr/bin:/bin:/opt/bin"
+    -ROOTPATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin"
+    +PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin"
+     MANPATH="/usr/local/share/man:/usr/share/man"
+     INFOPATH="/usr/share/info"
+     CONFIG_PROTECT_MASK="/etc/gentoo-release"
+    diff --git a/etc/profile b/etc/profile
+    index 8e92e824..4579bd17 100644
+    --- a/etc/profile
+    +++ b/etc/profile
+    @@ -18,16 +18,6 @@ export PAGER=${PAGER:-/usr/bin/less}
+     # 077 would be more secure, but 022 is generally quite realistic
+     umask 022
+    
+    -# Set up PATH depending on whether we're root or a normal user.
+    -# There's no real reason to exclude sbin paths from the normal user,
+    -# but it can make tab-completion easier when they aren't in the
+    -# user's PATH to pollute the executable namespace.
+    -if [ "${EUID-}" = "0" ] || [ "${USER-}" = "root" ] ; then
+    -       PATH="${ROOTPATH}"
+    -fi
+    -export PATH
+    -unset ROOTPATH
+    -
+     # process *.sh files in /etc/profiled.d
+     for sh in /etc/profile.d/*.sh ; do
+            [ -r "$sh" ] && . "$sh"
+
+commit 3d46659bf88caf23cfb631671dbece20bfdf8572
 Author: William Hubbs <williamh@gentoo.org>
 Commit: William Hubbs <williamh@gentoo.org>
 
-    etc/services: add assignment for ircs-u
+    process files in /etc/profile.d before /etc/bash/bashrc for consistency
     
-    X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=592368
+    Bug: https://bugs.gentoo.org/show_bug.cgi?id=610898
 
-commit 4328a2fa4b6abc7f4004da33b351ed6597ac975f
+commit 38a5b8a104616a720296f15fa6c1e67f7faee6c8
 Author: William Hubbs <williamh@gentoo.org>
 Commit: William Hubbs <williamh@gentoo.org>
 
-    etc/services: add gpsd and xmpp-bosh services
-    
-    X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=538708
+    version 2.5
 
-commit e302b8402399f18ecfe856c854a3d247cc2c646f
+commit 266f213bfedaba6fdedb581df6f0cd1e6c365aae
 Author: William Hubbs <williamh@gentoo.org>
 Commit: William Hubbs <williamh@gentoo.org>
 
-    os-release: Update Gentoo web site and support URLs
-    
-    https://bugs.gentoo.org/show_bug.cgi?id=545516
+    makefile: do not set DESTDIR
 
-commit 5ee3c95d2086e626247640ca35cf2da78c4c9846
+commit 0aacdc243b40f3bd5a651fb50a0043e9650af1c4
 Author: William Hubbs <williamh@gentoo.org>
 Commit: William Hubbs <williamh@gentoo.org>
 
-    share.Linux/shadow: mark portage user as locked out
-    
-    X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=521970
+    update ChangeLog
 
-commit f313f3c5de9fe1e52ef4abc62935090a299a51b8
+commit 8b91d77f9ec7431f8d9eca9f6bf918fce78646b8
 Author: William Hubbs <williamh@gentoo.org>
 Commit: William Hubbs <williamh@gentoo.org>
 
-    etc/profile: remove comments about whoami
-    
-    X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=587612
+    version 2.4.1
 
-commit 24af4fb374c67661fb1bf9dfb842fae70fd7f5f2
+commit ec3d9fb5d4f9252bc524ad4c1fc901867cb3bb63
 Author: William Hubbs <williamh@gentoo.org>
 Commit: William Hubbs <williamh@gentoo.org>
 
-    etc/hosts: document the alias order
+    etc/profile: replace PATH with ROOTPATH if the user is root
     
-    Add documentation showing that the first host alias is the canonical
-    host name.
+    This is part of the following bug.
     
-    X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=536624
+    X-Gentoo-Bug: 255695
+    X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=255695
 
-commit b5f197fc4070f8a1aa6beb2e85944f18c2fb4bbc
-Author: William Hubbs <williamh@gentoo.org>
+commit a3cd4d5b362239f4d9104c2a9e3af9ba0eec421c
+Author: David Michael <david.michael@coreos.com>
 Commit: William Hubbs <williamh@gentoo.org>
 
-    share.BSD/fstab: make device names generic
+    etc/services: add etcd services
     
-    X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=442690
+    X-Gentoo-Bug: 604704
+    X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=604704
 
-commit e8bbd89949b85a8359fb691c02fb12f0820f19ac
+commit ef383418788f2ed46f5f4ad7b26fbe5b5b25707f
 Author: William Hubbs <williamh@gentoo.org>
 Commit: William Hubbs <williamh@gentoo.org>
 
-    share.Linux/passwd: change "operator" login shell to /sbin/nologin
+    etc/env.d: move default settings to 50bbaselayout instead of 00basic
     
-    X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=346483
-
-commit 89621f070195cab17d2f4ee6f7ac084946bba02a
-Author: Mike Gilbert <floppym@gentoo.org>
-Commit: William Hubbs <williamh@gentoo.org>
-
-    share.Linux/fstab: update advice regarding labels and UUIDS
+    This allows other packages to append or pre-pend any of our defaults.
+    
+    X-Gentoo-Bug: 255695
+    X-Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=255695
 
-commit 90edf00e9382044ed33a0e5a7656b0440870f96d
-Author: Mike Gilbert <floppym@gentoo.org>
+commit 0af4f400f3edb8e840df1cb9e9df0165961b432f
+Author: William Hubbs <williamh@gentoo.org>
 Commit: William Hubbs <williamh@gentoo.org>
 
-    Comment out fstab entries by default
-    
-    Bug: https://bugs.gentoo.org/578390
+    version 2.4