From: Frank Brehm Date: Mon, 5 Jan 2015 14:09:15 +0000 (+0100) Subject: Current state X-Git-Url: https://git.uhu-banane.net/?a=commitdiff_plain;h=44c1dbadcde5790b6252886cd3f6a64019ce76ca;p=config%2Fuhu1%2Fetc.git Current state --- diff --git a/.etckeeper b/.etckeeper index b3afe37..32cbf14 100755 --- a/.etckeeper +++ b/.etckeeper @@ -763,7 +763,6 @@ maybe chmod 0755 'env.d' maybe chmod 0644 'env.d/00basic' maybe chmod 0644 'env.d/00glibc' maybe chmod 0644 'env.d/01cvs' -maybe chmod 0644 'env.d/02locale' maybe chmod 0644 'env.d/03opengl' maybe chmod 0644 'env.d/04gcc-x86_64-pc-linux-gnu' maybe chmod 0644 'env.d/05binutils' diff --git a/csh.env b/csh.env index aec8ee2..787fbb5 100644 --- a/csh.env +++ b/csh.env @@ -11,19 +11,6 @@ setenv GCC_SPECS '' setenv GUILE_LOAD_PATH '/usr/share/guile/1.8' setenv HG '/usr/bin/hg' setenv INFOPATH '/usr/share/info:/usr/share/gcc-data/x86_64-pc-linux-gnu/4.8.3/info:/usr/share/binutils-data/x86_64-pc-linux-gnu/2.24/info' -setenv LANG 'en_US.UTF-8' -setenv LC_ADDRESS 'en_US.utf8' -setenv LC_COLLATE 'en_US.utf8' -setenv LC_CTYPE 'en_US.utf8' -setenv LC_IDENTIFICATION 'en_US.utf8' -setenv LC_MEASUREMENT 'en_US.utf8' -setenv LC_MESSAGES 'en_US.utf8' -setenv LC_MONETARY 'en_US.utf8' -setenv LC_NAME 'en_US.utf8' -setenv LC_NUMERIC 'en_US.utf8' -setenv LC_PAPER 'en_US.utf8' -setenv LC_TELEPHONE 'en_US.utf8' -setenv LC_TIME 'en_US.utf8' setenv LESS '-R -M --shift 5' setenv LESSOPEN '|lesspipe %s' setenv MANPATH '/usr/local/share/man:/usr/share/man:/usr/share/gcc-data/x86_64-pc-linux-gnu/4.8.3/man:/usr/share/binutils-data/x86_64-pc-linux-gnu/2.24/man:/etc/java-config-2/current-system-vm/man/:/usr/lib64/php5.5/man/:/usr/share/postgresql/man/:/usr/share/postgresql-9.3/man/' diff --git a/env.d/02locale b/env.d/02locale deleted file mode 100644 index b0ec067..0000000 --- a/env.d/02locale +++ /dev/null @@ -1,13 +0,0 @@ -LANG="en_US.UTF-8" -LC_CTYPE="en_US.utf8" -LC_NUMERIC="en_US.utf8" -LC_TIME="en_US.utf8" -LC_COLLATE="en_US.utf8" -LC_MONETARY="en_US.utf8" -LC_MESSAGES="en_US.utf8" -LC_PAPER="en_US.utf8" -LC_NAME="en_US.utf8" -LC_ADDRESS="en_US.utf8" -LC_TELEPHONE="en_US.utf8" -LC_MEASUREMENT="en_US.utf8" -LC_IDENTIFICATION="en_US.utf8" diff --git a/php/apache2-php5.5/php.ini b/php/apache2-php5.5/php.ini index 717f4f9..8d5ae6c 100644 --- a/php/apache2-php5.5/php.ini +++ b/php/apache2-php5.5/php.ini @@ -293,20 +293,17 @@ serialize_precision = 17 ; open_basedir, if set, limits all file operations to the defined directory ; and below. This directive makes most sense if used in a per-directory -; or per-virtualhost web server configuration file. This directive is -; *NOT* affected by whether Safe Mode is turned On or Off. +; or per-virtualhost web server configuration file. ; http://php.net/open-basedir ;open_basedir = ; This directive allows you to disable certain functions for security reasons. -; It receives a comma-delimited list of function names. This directive is -; *NOT* affected by whether Safe Mode is turned On or Off. +; It receives a comma-delimited list of function names. ; http://php.net/disable-functions disable_functions = ; This directive allows you to disable certain classes for security reasons. -; It receives a comma-delimited list of class names. This directive is -; *NOT* affected by whether Safe Mode is turned On or Off. +; It receives a comma-delimited list of class names. ; http://php.net/disable-classes disable_classes = @@ -1005,7 +1002,7 @@ smtp_port = 25 ; Force the addition of the specified parameters to be passed as extra parameters ; to the sendmail binary. These parameters will always replace the value of -; the 5th parameter to mail(), even in safe mode. +; the 5th parameter to mail(). ;mail.force_extra_parameters = ; Add X-PHP-Originating-Script: that will include uid of the script followed by the filename diff --git a/php/cgi-php5.5/php.ini b/php/cgi-php5.5/php.ini index 717f4f9..8d5ae6c 100644 --- a/php/cgi-php5.5/php.ini +++ b/php/cgi-php5.5/php.ini @@ -293,20 +293,17 @@ serialize_precision = 17 ; open_basedir, if set, limits all file operations to the defined directory ; and below. This directive makes most sense if used in a per-directory -; or per-virtualhost web server configuration file. This directive is -; *NOT* affected by whether Safe Mode is turned On or Off. +; or per-virtualhost web server configuration file. ; http://php.net/open-basedir ;open_basedir = ; This directive allows you to disable certain functions for security reasons. -; It receives a comma-delimited list of function names. This directive is -; *NOT* affected by whether Safe Mode is turned On or Off. +; It receives a comma-delimited list of function names. ; http://php.net/disable-functions disable_functions = ; This directive allows you to disable certain classes for security reasons. -; It receives a comma-delimited list of class names. This directive is -; *NOT* affected by whether Safe Mode is turned On or Off. +; It receives a comma-delimited list of class names. ; http://php.net/disable-classes disable_classes = @@ -1005,7 +1002,7 @@ smtp_port = 25 ; Force the addition of the specified parameters to be passed as extra parameters ; to the sendmail binary. These parameters will always replace the value of -; the 5th parameter to mail(), even in safe mode. +; the 5th parameter to mail(). ;mail.force_extra_parameters = ; Add X-PHP-Originating-Script: that will include uid of the script followed by the filename diff --git a/php/cli-php5.5/php.ini b/php/cli-php5.5/php.ini index 717f4f9..8d5ae6c 100644 --- a/php/cli-php5.5/php.ini +++ b/php/cli-php5.5/php.ini @@ -293,20 +293,17 @@ serialize_precision = 17 ; open_basedir, if set, limits all file operations to the defined directory ; and below. This directive makes most sense if used in a per-directory -; or per-virtualhost web server configuration file. This directive is -; *NOT* affected by whether Safe Mode is turned On or Off. +; or per-virtualhost web server configuration file. ; http://php.net/open-basedir ;open_basedir = ; This directive allows you to disable certain functions for security reasons. -; It receives a comma-delimited list of function names. This directive is -; *NOT* affected by whether Safe Mode is turned On or Off. +; It receives a comma-delimited list of function names. ; http://php.net/disable-functions disable_functions = ; This directive allows you to disable certain classes for security reasons. -; It receives a comma-delimited list of class names. This directive is -; *NOT* affected by whether Safe Mode is turned On or Off. +; It receives a comma-delimited list of class names. ; http://php.net/disable-classes disable_classes = @@ -1005,7 +1002,7 @@ smtp_port = 25 ; Force the addition of the specified parameters to be passed as extra parameters ; to the sendmail binary. These parameters will always replace the value of -; the 5th parameter to mail(), even in safe mode. +; the 5th parameter to mail(). ;mail.force_extra_parameters = ; Add X-PHP-Originating-Script: that will include uid of the script followed by the filename diff --git a/php/embed-php5.5/php.ini b/php/embed-php5.5/php.ini index 717f4f9..8d5ae6c 100644 --- a/php/embed-php5.5/php.ini +++ b/php/embed-php5.5/php.ini @@ -293,20 +293,17 @@ serialize_precision = 17 ; open_basedir, if set, limits all file operations to the defined directory ; and below. This directive makes most sense if used in a per-directory -; or per-virtualhost web server configuration file. This directive is -; *NOT* affected by whether Safe Mode is turned On or Off. +; or per-virtualhost web server configuration file. ; http://php.net/open-basedir ;open_basedir = ; This directive allows you to disable certain functions for security reasons. -; It receives a comma-delimited list of function names. This directive is -; *NOT* affected by whether Safe Mode is turned On or Off. +; It receives a comma-delimited list of function names. ; http://php.net/disable-functions disable_functions = ; This directive allows you to disable certain classes for security reasons. -; It receives a comma-delimited list of class names. This directive is -; *NOT* affected by whether Safe Mode is turned On or Off. +; It receives a comma-delimited list of class names. ; http://php.net/disable-classes disable_classes = @@ -1005,7 +1002,7 @@ smtp_port = 25 ; Force the addition of the specified parameters to be passed as extra parameters ; to the sendmail binary. These parameters will always replace the value of -; the 5th parameter to mail(), even in safe mode. +; the 5th parameter to mail(). ;mail.force_extra_parameters = ; Add X-PHP-Originating-Script: that will include uid of the script followed by the filename diff --git a/php/fpm-php5.5/php.ini b/php/fpm-php5.5/php.ini index 717f4f9..8d5ae6c 100644 --- a/php/fpm-php5.5/php.ini +++ b/php/fpm-php5.5/php.ini @@ -293,20 +293,17 @@ serialize_precision = 17 ; open_basedir, if set, limits all file operations to the defined directory ; and below. This directive makes most sense if used in a per-directory -; or per-virtualhost web server configuration file. This directive is -; *NOT* affected by whether Safe Mode is turned On or Off. +; or per-virtualhost web server configuration file. ; http://php.net/open-basedir ;open_basedir = ; This directive allows you to disable certain functions for security reasons. -; It receives a comma-delimited list of function names. This directive is -; *NOT* affected by whether Safe Mode is turned On or Off. +; It receives a comma-delimited list of function names. ; http://php.net/disable-functions disable_functions = ; This directive allows you to disable certain classes for security reasons. -; It receives a comma-delimited list of class names. This directive is -; *NOT* affected by whether Safe Mode is turned On or Off. +; It receives a comma-delimited list of class names. ; http://php.net/disable-classes disable_classes = @@ -1005,7 +1002,7 @@ smtp_port = 25 ; Force the addition of the specified parameters to be passed as extra parameters ; to the sendmail binary. These parameters will always replace the value of -; the 5th parameter to mail(), even in safe mode. +; the 5th parameter to mail(). ;mail.force_extra_parameters = ; Add X-PHP-Originating-Script: that will include uid of the script followed by the filename diff --git a/portage/package.keywords b/portage/package.keywords index d608fe7..23c4411 100644 --- a/portage/package.keywords +++ b/portage/package.keywords @@ -346,6 +346,8 @@ dev-python/fbrehm-libs ~net-fs/autofs-5.0.6 +~net-misc/ntp-4.2.8 + ~net-nds/phpldapadmin-1.2.2 ~net-nds/phpldapadmin-1.2.3 diff --git a/profile.env b/profile.env index 1140dc6..e245552 100644 --- a/profile.env +++ b/profile.env @@ -11,19 +11,6 @@ export GCC_SPECS='' export GUILE_LOAD_PATH='/usr/share/guile/1.8' export HG='/usr/bin/hg' export INFOPATH='/usr/share/info:/usr/share/gcc-data/x86_64-pc-linux-gnu/4.8.3/info:/usr/share/binutils-data/x86_64-pc-linux-gnu/2.24/info' -export LANG='en_US.UTF-8' -export LC_ADDRESS='en_US.utf8' -export LC_COLLATE='en_US.utf8' -export LC_CTYPE='en_US.utf8' -export LC_IDENTIFICATION='en_US.utf8' -export LC_MEASUREMENT='en_US.utf8' -export LC_MESSAGES='en_US.utf8' -export LC_MONETARY='en_US.utf8' -export LC_NAME='en_US.utf8' -export LC_NUMERIC='en_US.utf8' -export LC_PAPER='en_US.utf8' -export LC_TELEPHONE='en_US.utf8' -export LC_TIME='en_US.utf8' export LESS='-R -M --shift 5' export LESSOPEN='|lesspipe %s' export MANPATH='/usr/local/share/man:/usr/share/man:/usr/share/gcc-data/x86_64-pc-linux-gnu/4.8.3/man:/usr/share/binutils-data/x86_64-pc-linux-gnu/2.24/man:/etc/java-config-2/current-system-vm/man/:/usr/lib64/php5.5/man/:/usr/share/postgresql/man/:/usr/share/postgresql-9.3/man/'