From: Frank Brehm <frank@brehm-online.com>
Date: Wed, 1 Mar 2017 14:58:21 +0000 (+0100)
Subject: saving uncommitted changes in /etc prior to emerge run
X-Git-Url: https://git.uhu-banane.org/?a=commitdiff_plain;h=90773b8e0f04797c90e4679534bb0e7ff6d2170b;p=config%2Fberta%2Fetc.git

saving uncommitted changes in /etc prior to emerge run
---

diff --git a/csh.env b/csh.env
index 684555a..b20f778 100644
--- a/csh.env
+++ b/csh.env
@@ -3,7 +3,7 @@
 # GO INTO /etc/csh.cshrc NOT /etc/csh.env
 
 setenv CONFIG_PROTECT '/usr/share/gnupg/qualified.txt'
-setenv CONFIG_PROTECT_MASK '/etc/gentoo-release /etc/sandbox.d /etc/php/cli-php5.6/ext-active/ /etc/php/cgi-php5.6/ext-active/ /etc/php/apache2-php5.6/ext-active/ /etc/fonts/fonts.conf /etc/terminfo /etc/ca-certificates.conf /etc/revdep-rebuild'
+setenv CONFIG_PROTECT_MASK '/etc/gentoo-release /etc/sandbox.d /etc/php/cli-php5.6/ext-active/ /etc/php/cgi-php5.6/ext-active/ /etc/php/apache2-php5.6/ext-active/ /etc/php/cli-php7.0/ext-active/ /etc/php/cgi-php7.0/ext-active/ /etc/php/apache2-php7.0/ext-active/ /etc/fonts/fonts.conf /etc/terminfo /etc/ca-certificates.conf /etc/revdep-rebuild'
 setenv EDITOR '/usr/bin/vi'
 setenv FACTERDIR '/usr'
 setenv GCC_SPECS ''
@@ -13,7 +13,7 @@ setenv LANG 'de_DE.utf8'
 setenv LESS '-R -M --shift 5'
 setenv LESSOPEN '|lesspipe %s'
 setenv MANPAGER 'manpager'
-setenv MANPATH '/usr/local/share/man:/usr/share/man:/usr/share/gcc-data/x86_64-pc-linux-gnu/4.9.4/man:/usr/share/binutils-data/x86_64-pc-linux-gnu/2.25.1/man:/etc/java-config-2/current-system-vm/man/:/usr/lib64/php5.6/man/:/usr/share/postgresql/man/:/usr/share/postgresql-9.5/man/'
+setenv MANPATH '/usr/local/share/man:/usr/share/man:/usr/share/gcc-data/x86_64-pc-linux-gnu/4.9.4/man:/usr/share/binutils-data/x86_64-pc-linux-gnu/2.25.1/man:/etc/java-config-2/current-system-vm/man/:/usr/lib64/php5.6/man/:/usr/lib64/php7.0/man/:/usr/share/postgresql/man/:/usr/share/postgresql-9.5/man/'
 setenv MULTIOSDIRS '../lib64:../lib32'
 setenv ORACLE_HOME '/usr/lib64/oracle/12.1/client'
 setenv PATH '/opt/bin:/usr/x86_64-pc-linux-gnu/gcc-bin/4.9.4:/usr/lib64/subversion/bin'
diff --git a/login.defs b/login.defs
index 76dbfc8..ccd6b83 100644
--- a/login.defs
+++ b/login.defs
@@ -414,3 +414,8 @@ USERGROUPS_ENAB yes
 #
 CREATE_HOME yes
 
+#
+# Force use shadow, even if shadow passwd & shadow group files are
+# missing.
+#
+#FORCE_SHADOW    yes
diff --git a/profile.env b/profile.env
index 2839f33..c8478d3 100644
--- a/profile.env
+++ b/profile.env
@@ -3,7 +3,7 @@
 # GO INTO /etc/profile NOT /etc/profile.env
 
 export CONFIG_PROTECT='/usr/share/gnupg/qualified.txt'
-export CONFIG_PROTECT_MASK='/etc/gentoo-release /etc/sandbox.d /etc/php/cli-php5.6/ext-active/ /etc/php/cgi-php5.6/ext-active/ /etc/php/apache2-php5.6/ext-active/ /etc/fonts/fonts.conf /etc/terminfo /etc/ca-certificates.conf /etc/revdep-rebuild'
+export CONFIG_PROTECT_MASK='/etc/gentoo-release /etc/sandbox.d /etc/php/cli-php5.6/ext-active/ /etc/php/cgi-php5.6/ext-active/ /etc/php/apache2-php5.6/ext-active/ /etc/php/cli-php7.0/ext-active/ /etc/php/cgi-php7.0/ext-active/ /etc/php/apache2-php7.0/ext-active/ /etc/fonts/fonts.conf /etc/terminfo /etc/ca-certificates.conf /etc/revdep-rebuild'
 export EDITOR='/usr/bin/vi'
 export FACTERDIR='/usr'
 export GCC_SPECS=''
@@ -13,7 +13,7 @@ export LANG='de_DE.utf8'
 export LESS='-R -M --shift 5'
 export LESSOPEN='|lesspipe %s'
 export MANPAGER='manpager'
-export MANPATH='/usr/local/share/man:/usr/share/man:/usr/share/gcc-data/x86_64-pc-linux-gnu/4.9.4/man:/usr/share/binutils-data/x86_64-pc-linux-gnu/2.25.1/man:/etc/java-config-2/current-system-vm/man/:/usr/lib64/php5.6/man/:/usr/share/postgresql/man/:/usr/share/postgresql-9.5/man/'
+export MANPATH='/usr/local/share/man:/usr/share/man:/usr/share/gcc-data/x86_64-pc-linux-gnu/4.9.4/man:/usr/share/binutils-data/x86_64-pc-linux-gnu/2.25.1/man:/etc/java-config-2/current-system-vm/man/:/usr/lib64/php5.6/man/:/usr/lib64/php7.0/man/:/usr/share/postgresql/man/:/usr/share/postgresql-9.5/man/'
 export MULTIOSDIRS='../lib64:../lib32'
 export ORACLE_HOME='/usr/lib64/oracle/12.1/client'
 export PATH='/opt/bin:/usr/x86_64-pc-linux-gnu/gcc-bin/4.9.4:/usr/lib64/subversion/bin'