/[smecontribs]/rpms/smeserver-phpmyadmin/contribs10/smeserver-phpmyadmin-4.0.10.2-bz11043-configure-php-pool.patch
ViewVC logotype

Diff of /rpms/smeserver-phpmyadmin/contribs10/smeserver-phpmyadmin-4.0.10.2-bz11043-configure-php-pool.patch

Parent Directory Parent Directory | Revision Log Revision Log | View Revision Graph Revision Graph | View Patch Patch

Revision 1.1 by jcrisp, Fri Dec 18 15:44:29 2020 UTC Revision 1.2 by jcrisp, Tue Dec 22 13:51:37 2020 UTC
# Line 1  Line 1 
1  diff -ruN smeserver-phpmyadmin-4.0.10.2.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/86PhpmyadminAlias smeserver-phpmyadmin-4.0.10.2/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/86PhpmyadminAlias  diff -ruN smeserver-phpmyadmin-4.0.10.2.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/86PhpmyadminAlias smeserver-phpmyadmin-4.0.10.2/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/86PhpmyadminAlias
2  --- smeserver-phpmyadmin-4.0.10.2.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/86PhpmyadminAlias    2020-12-18 12:50:59.934881670 +0100  --- smeserver-phpmyadmin-4.0.10.2.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/86PhpmyadminAlias    2020-12-18 12:50:59.934881670 +0100
3  +++ smeserver-phpmyadmin-4.0.10.2/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/86PhpmyadminAlias        2020-12-18 16:33:05.269855203 +0100  +++ smeserver-phpmyadmin-4.0.10.2/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/86PhpmyadminAlias        2020-12-22 14:43:20.167546078 +0100
4  @@ -1,14 +1,14 @@  @@ -1,14 +1,15 @@
5    +# 86PhpmyadminAlias Start
6   {   {
7   # phpmyadmin  -# phpmyadmin
8    +
9     my $status = $phpmyadmin{'status'} || 'disabled';     my $status = $phpmyadmin{'status'} || 'disabled';
10  -  -
11  +  +
# Line 18  diff -ruN smeserver-phpmyadmin-4.0.10.2. Line 20  diff -ruN smeserver-phpmyadmin-4.0.10.2.
20     my $adminaccess = ($phpmyadmin{'adminaccess'} || 'enabled');     my $adminaccess = ($phpmyadmin{'adminaccess'} || 'enabled');
21     my $multiaccess = ($phpmyadmin{'multiaccess'} || 'disabled');     my $multiaccess = ($phpmyadmin{'multiaccess'} || 'disabled');
22       if (("$adminaccess" eq "enabled") || ("$multiaccess" eq "enabled"))       if (("$adminaccess" eq "enabled") || ("$multiaccess" eq "enabled"))
23    @@ -29,7 +30,6 @@
24           $OUT .= "# phpMyAdmin Multiuser access disabled\n";
25         }
26    
27    -
28         $OUT .= qq(
29     <Location /phpmyadmin>
30         AuthName "phpmyadmin"
31    @@ -41,6 +41,7 @@
32    
33         $OUT .= qq(
34     <Directory /usr/share/phpMyAdmin>
35    +    SetEnvIf Authorization "(.*)" HTTP_AUTHORIZATION=\$1
36         SSLRequireSSL
37         Options -Indexes
38         AllowOverride None
39    @@ -48,7 +49,6 @@
40         deny from all
41         );
42    
43    -
44       my $access = ($phpmyadmin{'access'} || 'private');
45    
46         if ("$access" eq "private")
47  @@ -60,27 +60,16 @@  @@ -60,27 +60,16 @@
48         $OUT .= "allow from all";         $OUT .= "allow from all";
49       }       }
# Line 48  diff -ruN smeserver-phpmyadmin-4.0.10.2. Line 74  diff -ruN smeserver-phpmyadmin-4.0.10.2.
74   </Directory>   </Directory>
75    
76    
77    @@ -118,4 +107,4 @@
78           $OUT .= "# phpmyadmin is disabled";
79         }
80     }
81    -
82    +# 86PhpmyadminAlias End
83  diff -ruN smeserver-phpmyadmin-4.0.10.2.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/30PhpmyadminAlias smeserver-phpmyadmin-4.0.10.2/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/30PhpmyadminAlias  diff -ruN smeserver-phpmyadmin-4.0.10.2.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/30PhpmyadminAlias smeserver-phpmyadmin-4.0.10.2/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/30PhpmyadminAlias
84  --- smeserver-phpmyadmin-4.0.10.2.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/30PhpmyadminAlias       2020-12-18 12:50:59.934881670 +0100  --- smeserver-phpmyadmin-4.0.10.2.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/30PhpmyadminAlias       2020-12-18 12:50:59.934881670 +0100
85  +++ smeserver-phpmyadmin-4.0.10.2/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/30PhpmyadminAlias   2020-12-18 16:11:18.242843437 +0100  +++ smeserver-phpmyadmin-4.0.10.2/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/30PhpmyadminAlias   2020-12-22 14:43:33.375754951 +0100
86  @@ -1,7 +1,11 @@  @@ -1,7 +1,8 @@
87  +#  +# 30phpmyadmin start
 +# 30phpmyadmin  
 +#  
 +  
88   {   {
89       $haveSSL = (exists ${modSSL}{status} and ${modSSL}{status} eq "enabled") ?  'yes' : 'no';       $haveSSL = (exists ${modSSL}{status} and ${modSSL}{status} eq "enabled") ?  'yes' : 'no';
90  -my $adminaccess = ($phpmyadmin{'adminaccess'} || 'enabled');  -my $adminaccess = ($phpmyadmin{'adminaccess'} || 'enabled');
# Line 65  diff -ruN smeserver-phpmyadmin-4.0.10.2. Line 94  diff -ruN smeserver-phpmyadmin-4.0.10.2.
94    
95       if (($port eq "80") && ($haveSSL eq 'yes')  && ("$adminaccess" eq "enabled" || "$multiaccess" eq "enabled"))       if (($port eq "80") && ($haveSSL eq 'yes')  && ("$adminaccess" eq "enabled" || "$multiaccess" eq "enabled"))
96           {           {
97    @@ -14,4 +15,4 @@
98                 $OUT .= "    RewriteRule ^/phpmyadmin-multi(/.*|\$)    https://%{HTTP_HOST}/phpmyadmin-multi\$1 [L,R]\n";
99             }
100     }
101    -
102    +# 30phpmyadmin end
103  diff -ruN smeserver-phpmyadmin-4.0.10.2.old/root/etc/e-smith/templates/etc/php-fpm.d/www.conf/15phpmyadmin smeserver-phpmyadmin-4.0.10.2/root/etc/e-smith/templates/etc/php-fpm.d/www.conf/15phpmyadmin  diff -ruN smeserver-phpmyadmin-4.0.10.2.old/root/etc/e-smith/templates/etc/php-fpm.d/www.conf/15phpmyadmin smeserver-phpmyadmin-4.0.10.2/root/etc/e-smith/templates/etc/php-fpm.d/www.conf/15phpmyadmin
104  --- smeserver-phpmyadmin-4.0.10.2.old/root/etc/e-smith/templates/etc/php-fpm.d/www.conf/15phpmyadmin    1970-01-01 01:00:00.000000000 +0100  --- smeserver-phpmyadmin-4.0.10.2.old/root/etc/e-smith/templates/etc/php-fpm.d/www.conf/15phpmyadmin    1970-01-01 01:00:00.000000000 +0100
105  +++ smeserver-phpmyadmin-4.0.10.2/root/etc/e-smith/templates/etc/php-fpm.d/www.conf/15phpmyadmin        2020-12-18 16:32:44.798527156 +0100  +++ smeserver-phpmyadmin-4.0.10.2/root/etc/e-smith/templates/etc/php-fpm.d/www.conf/15phpmyadmin        2020-12-22 14:11:13.590207009 +0100
106  @@ -0,0 +1,70 @@  @@ -0,0 +1,74 @@
107  +{  +{
108  +  +
109  +if ($PHP_VERSION eq '73'){  +if ($PHP_VERSION eq '73'){
# Line 130  diff -ruN smeserver-phpmyadmin-4.0.10.2. Line 165  diff -ruN smeserver-phpmyadmin-4.0.10.2.
165  +php_admin_value[session.save_handler] = files  +php_admin_value[session.save_handler] = files
166  +php_admin_flag[output_buffering] = off  +php_admin_flag[output_buffering] = off
167  +  +
168    +; For HTTP AUTH
169    +; disabled for now
170    +;php_admin_value[auto_prepend_file] = /usr/share/php/auth_translation.php
171    +
172  +_EOF  +_EOF
173  +  +
174  +  }  +  }
# Line 141  diff -ruN smeserver-phpmyadmin-4.0.10.2. Line 180  diff -ruN smeserver-phpmyadmin-4.0.10.2.
180  +  +
181  diff -ruN smeserver-phpmyadmin-4.0.10.2.old/root/etc/e-smith/templates/etc/phpMyAdmin/config.inc.php/10config smeserver-phpmyadmin-4.0.10.2/root/etc/e-smith/templates/etc/phpMyAdmin/config.inc.php/10config  diff -ruN smeserver-phpmyadmin-4.0.10.2.old/root/etc/e-smith/templates/etc/phpMyAdmin/config.inc.php/10config smeserver-phpmyadmin-4.0.10.2/root/etc/e-smith/templates/etc/phpMyAdmin/config.inc.php/10config
182  --- smeserver-phpmyadmin-4.0.10.2.old/root/etc/e-smith/templates/etc/phpMyAdmin/config.inc.php/10config 2020-12-18 12:50:59.934881670 +0100  --- smeserver-phpmyadmin-4.0.10.2.old/root/etc/e-smith/templates/etc/phpMyAdmin/config.inc.php/10config 2020-12-18 12:50:59.934881670 +0100
183  +++ smeserver-phpmyadmin-4.0.10.2/root/etc/e-smith/templates/etc/phpMyAdmin/config.inc.php/10config     2020-12-18 16:11:18.243843454 +0100  +++ smeserver-phpmyadmin-4.0.10.2/root/etc/e-smith/templates/etc/phpMyAdmin/config.inc.php/10config     2020-12-18 16:42:50.631355859 +0100
184  @@ -39,7 +39,7 @@  @@ -39,7 +39,7 @@
185     }     }
186   else   else
# Line 153  diff -ruN smeserver-phpmyadmin-4.0.10.2. Line 192  diff -ruN smeserver-phpmyadmin-4.0.10.2.
192   # end of  standalone login part   # end of  standalone login part
193  diff -ruN smeserver-phpmyadmin-4.0.10.2.old/root/usr/share/phpMyAdmin/.unit.ini smeserver-phpmyadmin-4.0.10.2/root/usr/share/phpMyAdmin/.unit.ini  diff -ruN smeserver-phpmyadmin-4.0.10.2.old/root/usr/share/phpMyAdmin/.unit.ini smeserver-phpmyadmin-4.0.10.2/root/usr/share/phpMyAdmin/.unit.ini
194  --- smeserver-phpmyadmin-4.0.10.2.old/root/usr/share/phpMyAdmin/.unit.ini       2020-12-18 12:50:59.934881670 +0100  --- smeserver-phpmyadmin-4.0.10.2.old/root/usr/share/phpMyAdmin/.unit.ini       2020-12-18 12:50:59.934881670 +0100
195  +++ smeserver-phpmyadmin-4.0.10.2/root/usr/share/phpMyAdmin/.unit.ini   2020-12-18 16:11:18.243843454 +0100  +++ smeserver-phpmyadmin-4.0.10.2/root/usr/share/phpMyAdmin/.unit.ini   2020-12-18 16:42:50.631355859 +0100
196  @@ -1,10 +1,11 @@  @@ -1,10 +1,11 @@
197  -magic_quotes_gpc= on  -magic_quotes_gpc= on
198  -track_vars= on  -track_vars= on

Legend:
Removed lines/characters  
Changed lines/characters
  Added lines/characters
admin@koozali.org
 ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed