saving uncommitted changes in /etc prior to emerge run

diff --git a/php/apache2-php7.1/php.ini b/php/apache2-php7.1/php.ini
index 434ecee29261c3200ccc4c02b74421d9e8ecf0f5..0e73d48c7dc386e69c5047a88acb9b7674184493 100644 (file)
--- a/php/apache2-php7.1/php.ini
+++ b/php/apache2-php7.1/php.ini
@@ -884,7 +884,6 @@ default_socket_timeout = 60
 ; default extension directory.
 ;
 ; Windows Extensions
-; Note that ODBC support is built in, so no dll is needed for it.
 ; Note that many DLL files are located in the extensions/ (PHP 4) ext/ (PHP 5+)
 ; extension folders as well as the separate PECL DLL download (PHP 5+).
 ; Be sure to appropriately set the extension_dir directive.
@@ -904,6 +903,7 @@ default_socket_timeout = 60
 ;extension=php_exif.dll      ; Must be after mbstring as it depends on it
 ;extension=php_mysqli.dll
 ;extension=php_oci8_12c.dll  ; Use with Oracle Database 12c Instant Client
+;extension=php_odbc.dll
 ;extension=php_openssl.dll
 ;extension=php_pdo_firebird.dll
 ;extension=php_pdo_mysql.dll
@@ -1049,7 +1049,7 @@ smtp_port = 25
 ;mail.force_extra_parameters =
 
 ; Add X-PHP-Originating-Script: that will include uid of the script followed by the filename
-mail.add_x_header = On
+mail.add_x_header = Off
 
 ; The path to a log file that will log all mail() calls. Log entries include
 ; the full path of the script, line number, To address and headers.

diff --git a/php/cgi-php7.1/php.ini b/php/cgi-php7.1/php.ini
index 434ecee29261c3200ccc4c02b74421d9e8ecf0f5..0e73d48c7dc386e69c5047a88acb9b7674184493 100644 (file)
--- a/php/cgi-php7.1/php.ini
+++ b/php/cgi-php7.1/php.ini
@@ -884,7 +884,6 @@ default_socket_timeout = 60
 ; default extension directory.
 ;
 ; Windows Extensions
-; Note that ODBC support is built in, so no dll is needed for it.
 ; Note that many DLL files are located in the extensions/ (PHP 4) ext/ (PHP 5+)
 ; extension folders as well as the separate PECL DLL download (PHP 5+).
 ; Be sure to appropriately set the extension_dir directive.
@@ -904,6 +903,7 @@ default_socket_timeout = 60
 ;extension=php_exif.dll      ; Must be after mbstring as it depends on it
 ;extension=php_mysqli.dll
 ;extension=php_oci8_12c.dll  ; Use with Oracle Database 12c Instant Client
+;extension=php_odbc.dll
 ;extension=php_openssl.dll
 ;extension=php_pdo_firebird.dll
 ;extension=php_pdo_mysql.dll
@@ -1049,7 +1049,7 @@ smtp_port = 25
 ;mail.force_extra_parameters =
 
 ; Add X-PHP-Originating-Script: that will include uid of the script followed by the filename
-mail.add_x_header = On
+mail.add_x_header = Off
 
 ; The path to a log file that will log all mail() calls. Log entries include
 ; the full path of the script, line number, To address and headers.

diff --git a/php/cli-php7.1/php.ini b/php/cli-php7.1/php.ini
index 434ecee29261c3200ccc4c02b74421d9e8ecf0f5..0e73d48c7dc386e69c5047a88acb9b7674184493 100644 (file)
--- a/php/cli-php7.1/php.ini
+++ b/php/cli-php7.1/php.ini
@@ -884,7 +884,6 @@ default_socket_timeout = 60
 ; default extension directory.
 ;
 ; Windows Extensions
-; Note that ODBC support is built in, so no dll is needed for it.
 ; Note that many DLL files are located in the extensions/ (PHP 4) ext/ (PHP 5+)
 ; extension folders as well as the separate PECL DLL download (PHP 5+).
 ; Be sure to appropriately set the extension_dir directive.
@@ -904,6 +903,7 @@ default_socket_timeout = 60
 ;extension=php_exif.dll      ; Must be after mbstring as it depends on it
 ;extension=php_mysqli.dll
 ;extension=php_oci8_12c.dll  ; Use with Oracle Database 12c Instant Client
+;extension=php_odbc.dll
 ;extension=php_openssl.dll
 ;extension=php_pdo_firebird.dll
 ;extension=php_pdo_mysql.dll
@@ -1049,7 +1049,7 @@ smtp_port = 25
 ;mail.force_extra_parameters =
 
 ; Add X-PHP-Originating-Script: that will include uid of the script followed by the filename
-mail.add_x_header = On
+mail.add_x_header = Off
 
 ; The path to a log file that will log all mail() calls. Log entries include
 ; the full path of the script, line number, To address and headers.

diff --git a/php/embed-php7.1/php.ini b/php/embed-php7.1/php.ini
index 434ecee29261c3200ccc4c02b74421d9e8ecf0f5..0e73d48c7dc386e69c5047a88acb9b7674184493 100644 (file)
--- a/php/embed-php7.1/php.ini
+++ b/php/embed-php7.1/php.ini
@@ -884,7 +884,6 @@ default_socket_timeout = 60
 ; default extension directory.
 ;
 ; Windows Extensions
-; Note that ODBC support is built in, so no dll is needed for it.
 ; Note that many DLL files are located in the extensions/ (PHP 4) ext/ (PHP 5+)
 ; extension folders as well as the separate PECL DLL download (PHP 5+).
 ; Be sure to appropriately set the extension_dir directive.
@@ -904,6 +903,7 @@ default_socket_timeout = 60
 ;extension=php_exif.dll      ; Must be after mbstring as it depends on it
 ;extension=php_mysqli.dll
 ;extension=php_oci8_12c.dll  ; Use with Oracle Database 12c Instant Client
+;extension=php_odbc.dll
 ;extension=php_openssl.dll
 ;extension=php_pdo_firebird.dll
 ;extension=php_pdo_mysql.dll
@@ -1049,7 +1049,7 @@ smtp_port = 25
 ;mail.force_extra_parameters =
 
 ; Add X-PHP-Originating-Script: that will include uid of the script followed by the filename
-mail.add_x_header = On
+mail.add_x_header = Off
 
 ; The path to a log file that will log all mail() calls. Log entries include
 ; the full path of the script, line number, To address and headers.

diff --git a/php/fpm-php7.1/fpm.d/www.conf b/php/fpm-php7.1/fpm.d/www.conf
index d9a27b036d23f40a181b6a6b3dec2fa5cdb4ab5d..679402e5167df958aa3cd3e5a16d9f1d7ccc7378 100644 (file)
--- a/php/fpm-php7.1/fpm.d/www.conf
+++ b/php/fpm-php7.1/fpm.d/www.conf
@@ -69,6 +69,12 @@ listen = 127.0.0.1:9000
 ; Default Value: no set
 ; process.priority = -19
 
+; Set the process dumpable flag (PR_SET_DUMPABLE prctl) even if the process user
+; or group is differrent than the master process user. It allows to create process
+; core dump and ptrace the process for the pool user.
+; Default Value: no
+; process.dumpable = yes
+
 ; Choose how the process manager will control the number of child processes.
 ; Possible Values:
 ;   static  - a fixed number (pm.max_children) of child processes;

diff --git a/php/fpm-php7.1/php.ini b/php/fpm-php7.1/php.ini
index 434ecee29261c3200ccc4c02b74421d9e8ecf0f5..0e73d48c7dc386e69c5047a88acb9b7674184493 100644 (file)
--- a/php/fpm-php7.1/php.ini
+++ b/php/fpm-php7.1/php.ini
@@ -884,7 +884,6 @@ default_socket_timeout = 60
 ; default extension directory.
 ;
 ; Windows Extensions
-; Note that ODBC support is built in, so no dll is needed for it.
 ; Note that many DLL files are located in the extensions/ (PHP 4) ext/ (PHP 5+)
 ; extension folders as well as the separate PECL DLL download (PHP 5+).
 ; Be sure to appropriately set the extension_dir directive.
@@ -904,6 +903,7 @@ default_socket_timeout = 60
 ;extension=php_exif.dll      ; Must be after mbstring as it depends on it
 ;extension=php_mysqli.dll
 ;extension=php_oci8_12c.dll  ; Use with Oracle Database 12c Instant Client
+;extension=php_odbc.dll
 ;extension=php_openssl.dll
 ;extension=php_pdo_firebird.dll
 ;extension=php_pdo_mysql.dll
@@ -1049,7 +1049,7 @@ smtp_port = 25
 ;mail.force_extra_parameters =
 
 ; Add X-PHP-Originating-Script: that will include uid of the script followed by the filename
-mail.add_x_header = On
+mail.add_x_header = Off
 
 ; The path to a log file that will log all mail() calls. Log entries include
 ; the full path of the script, line number, To address and headers.