Hello community, here is the log from the commit of package phpMyAdmin for openSUSE:Factory checked in at 2017-03-21 22:51:27 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/phpMyAdmin (Old) and /work/SRC/openSUSE:Factory/.phpMyAdmin.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "phpMyAdmin" Tue Mar 21 22:51:27 2017 rev:134 rq:481633 version:4.6.6 Changes: -------- --- /work/SRC/openSUSE:Factory/phpMyAdmin/phpMyAdmin.changes 2017-02-03 18:55:43.831584092 +0100 +++ /work/SRC/openSUSE:Factory/.phpMyAdmin.new/phpMyAdmin.changes 2017-03-21 22:51:28.590433914 +0100 @@ -1,0 +2,6 @@ +Mon Mar 20 22:13:20 UTC 2017 - [email protected] + +- add http.inc file + * include one file for php5/php7 admin flags/values + +------------------------------------------------------------------- New: ---- phpMyAdmin.http.inc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ phpMyAdmin.spec ++++++ --- /var/tmp/diff_new_pack.QKlZE3/_old 2017-03-21 22:51:31.881968585 +0100 +++ /var/tmp/diff_new_pack.QKlZE3/_new 2017-03-21 22:51:31.885968020 +0100 @@ -40,6 +40,7 @@ # http://docs.phpmyadmin.net/en/latest/setup.html#verifying-phpmyadmin-releases Source2: https://files.phpmyadmin.net/phpmyadmin.keyring#/%{name}.keyring Source3: %{name}.http +Source4: %{name}.http.inc Source100: %{name}-rpmlintrc # Fix-SuSE: provide useful default config Patch0: %{name}-config.patch @@ -146,9 +147,10 @@ find %{buildroot}%{ap_docroot}/%{name} -mindepth 1 -maxdepth 1 -type d | sed -e "s@$RPM_BUILD_ROOT@@" > FILELIST find %{buildroot}%{ap_docroot}/%{name} -maxdepth 1 -type f | grep -v 'config.inc.php' | sed -e "s@$RPM_BUILD_ROOT@@" >> FILELIST install -D -m0644 %{SOURCE3} %{buildroot}%{ap_sysconfdir}/conf.d/%{name}.conf +install -D -m0644 %{SOURCE4} %{buildroot}%{ap_sysconfdir}/conf.d/%{name}.inc # fix paths in http config sed -i -e "s,@ap_docroot@,%{ap_docroot},g" -e "s,@name@,%{name},g" \ - -e "s,@docdir@,%{_docdir},g" %{buildroot}%{ap_sysconfdir}/conf.d/%{name}.conf + -e "s,@docdir@,%{_docdir},g" -e "s,@ap_sysconfdir@,%{ap_sysconfdir},g" %{buildroot}%{ap_sysconfdir}/conf.d/%{name}.conf # rpmlint stuff %if 0%{?suse_version} > 1020 @@ -195,5 +197,6 @@ %config(noreplace) %{_sysconfdir}/%{name}/config.inc.php %dir %{ap_docroot}/%{name} %config(noreplace) %{ap_sysconfdir}/conf.d/%{name}.conf +%config(noreplace) %{ap_sysconfdir}/conf.d/%{name}.inc %changelog ++++++ phpMyAdmin.http ++++++ --- /var/tmp/diff_new_pack.QKlZE3/_old 2017-03-21 22:51:31.953958408 +0100 +++ /var/tmp/diff_new_pack.QKlZE3/_new 2017-03-21 22:51:31.953958408 +0100 @@ -3,37 +3,13 @@ AllowOverride None <IfModule mod_php5.c> - php_admin_flag register_globals off - php_admin_flag magic_quotes_gpc off - php_admin_flag allow_url_include off - php_admin_flag allow_url_fopen off - php_admin_flag zend.ze1_compatibility_mode off - php_admin_flag safe_mode Off + Include @ap_sysconfdir@/conf.d/@[email protected] php_admin_value open_basedir "@ap_docroot@/@name@:/var/lib/php5:/tmp:@docdir@/@name@:/etc/@name@:/proc/meminfo:/proc/stat" - # customize suhosin - php_admin_value suhosin.post.max_array_index_length 256 - php_admin_value suhosin.post.max_totalname_length 8192 - php_admin_value suhosin.post.max_vars 2048 - php_admin_value suhosin.request.max_array_index_length 256 - php_admin_value suhosin.request.max_totalname_length 8192 - php_admin_value suhosin.request.max_vars 2048 </IfModule> <IfModule mod_php7.c> - php_admin_flag register_globals off - php_admin_flag magic_quotes_gpc off - php_admin_flag allow_url_include off - php_admin_flag allow_url_fopen off - php_admin_flag zend.ze1_compatibility_mode off - php_admin_flag safe_mode Off + Include @ap_sysconfdir@/conf.d/@[email protected] php_admin_value open_basedir "@ap_docroot@/@name@:/var/lib/php7:/tmp:@docdir@/@name@:/etc/@name@:/proc/meminfo:/proc/stat" - # customize suhosin - php_admin_value suhosin.post.max_array_index_length 256 - php_admin_value suhosin.post.max_totalname_length 8192 - php_admin_value suhosin.post.max_vars 2048 - php_admin_value suhosin.request.max_array_index_length 256 - php_admin_value suhosin.request.max_totalname_length 8192 - php_admin_value suhosin.request.max_vars 2048 </IfModule> </Directory> ++++++ phpMyAdmin.http.inc ++++++ php_admin_flag register_globals off php_admin_flag magic_quotes_gpc off php_admin_flag allow_url_include off php_admin_flag allow_url_fopen off php_admin_flag zend.ze1_compatibility_mode off php_admin_flag safe_mode Off # customize suhosin php_admin_value suhosin.post.max_array_index_length 256 php_admin_value suhosin.post.max_totalname_length 8192 php_admin_value suhosin.post.max_vars 2048 php_admin_value suhosin.request.max_array_index_length 256 php_admin_value suhosin.request.max_totalname_length 8192 php_admin_value suhosin.request.max_vars 2048
