From 0d037a53941be78cf2175d1359801ec0a814333df0afdca2be51510e655b4949 Mon Sep 17 00:00:00 2001 From: Christian Wittmer Date: Mon, 20 Mar 2017 22:22:05 +0000 Subject: [PATCH] Accepting request 481632 from home:computersalat:devel:php include one file for php5/php7 admin flags/values OBS-URL: https://build.opensuse.org/request/show/481632 OBS-URL: https://build.opensuse.org/package/show/server:php:applications/phpMyAdmin?expand=0&rev=278 --- phpMyAdmin.changes | 6 ++++++ phpMyAdmin.http | 28 ++-------------------------- phpMyAdmin.http.inc | 13 +++++++++++++ phpMyAdmin.spec | 5 ++++- 4 files changed, 25 insertions(+), 27 deletions(-) create mode 100644 phpMyAdmin.http.inc diff --git a/phpMyAdmin.changes b/phpMyAdmin.changes index 1fd2f2c..00c6e17 100644 --- a/phpMyAdmin.changes +++ b/phpMyAdmin.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Mar 20 22:13:20 UTC 2017 - chris@computersalat.de + +- add http.inc file + * include one file for php5/php7 admin flags/values + ------------------------------------------------------------------- Wed Jan 25 22:12:33 UTC 2017 - chris@computersalat.de diff --git a/phpMyAdmin.http b/phpMyAdmin.http index 2bba0e7..9400ce2 100644 --- a/phpMyAdmin.http +++ b/phpMyAdmin.http @@ -3,37 +3,13 @@ AllowOverride None - 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/@name@.inc 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 - 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/@name@.inc 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 diff --git a/phpMyAdmin.http.inc b/phpMyAdmin.http.inc new file mode 100644 index 0000000..fcef0be --- /dev/null +++ b/phpMyAdmin.http.inc @@ -0,0 +1,13 @@ +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 diff --git a/phpMyAdmin.spec b/phpMyAdmin.spec index fe1b1eb..f94c00e 100644 --- a/phpMyAdmin.spec +++ b/phpMyAdmin.spec @@ -40,6 +40,7 @@ Source1: https://files.phpmyadmin.net/phpMyAdmin/%{version}/%{name}-%{ver # 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 @@ sed -i -e "s,@docdir@,%{_docdir}/%{name},g" -e "s,@sysconfdir@,%{_sysconfdir}/%{ 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 @@ fi %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