From c72882c133738216fb4a275c2081c3ac80e2d6ebb12e7de45f5542742ef3c0b9 Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Fri, 17 Jun 2011 08:54:47 +0000 Subject: [PATCH 1/2] Updating link to change in openSUSE:Factory/phpMyAdmin revision 6.0 OBS-URL: https://build.opensuse.org/package/show/server:php:applications/phpMyAdmin?expand=0&rev=f5829ce33c28f6af6fa83669f5e31c82 --- phpMyAdmin.spec | 9 --------- 1 file changed, 9 deletions(-) diff --git a/phpMyAdmin.spec b/phpMyAdmin.spec index 5e7cb2e..ba16ea2 100644 --- a/phpMyAdmin.spec +++ b/phpMyAdmin.spec @@ -54,7 +54,6 @@ Requires: mod_php_any php-bz2 php-gd php-iconv Requires: php-mbstring php-mcrypt php-mysql php-session php-zlib Recommends: php5-zip - %description phpMyAdmin can manage a whole MySQL server (needs a super-user) as well as a single database. To accomplish the latter you'll need a properly set up MySQL @@ -100,10 +99,8 @@ find . -type f -name '*.orig' -exec rm {} \; #rm lang/*.sh %{__rm} libraries/.htaccess - %build - %install #%{__install} -d -m0750 $RPM_BUILD_ROOT%{_sysconfdir}/%{name} %{__install} -d -m0755 $RPM_BUILD_ROOT%{ap_docroot}/%{name} @@ -133,7 +130,6 @@ find $RPM_BUILD_ROOT%{ap_docroot}/%{name} -maxdepth 1 -type f | grep -v 'config. %fdupes -s ${RPM_BUILD_ROOT} %endif - %post # on `rpm -ivh` PARAM is 1 # on `rpm -Uvh` PARAM is 2 @@ -151,15 +147,12 @@ if [ -f /etc/php5/conf.d/suhosin.ini ]; then %{_sysconfdir}/php5/conf.d/suhosin.ini fi - %postun %restart_on_update apache2 - %clean %{__rm} -rf $RPM_BUILD_ROOT - %files -f FILELIST %defattr(644,root,root,755) %doc CREDITS ChangeLog Documentation.* docs.css @@ -171,6 +164,4 @@ fi %dir %{ap_docroot}/%{name} %config(noreplace) %{ap_sysconfdir}/conf.d/%{name}.conf - - %changelog From 97f1dcf46a3a4237f57b1b65d755772542900f126ca95676b7a1f3d1d6e77178 Mon Sep 17 00:00:00 2001 From: Christian Wittmer Date: Wed, 22 Jun 2011 09:09:21 +0000 Subject: [PATCH 2/2] Accepting request 74297 from home:computersalat:devel:php fix bnc#697748 OBS-URL: https://build.opensuse.org/request/show/74297 OBS-URL: https://build.opensuse.org/package/show/server:php:applications/phpMyAdmin?expand=0&rev=9 --- phpMyAdmin.changes | 10 +++++++++- phpMyAdmin.http | 7 +++++++ phpMyAdmin.spec | 10 ---------- 3 files changed, 16 insertions(+), 11 deletions(-) diff --git a/phpMyAdmin.changes b/phpMyAdmin.changes index 1f7ae91..187e633 100644 --- a/phpMyAdmin.changes +++ b/phpMyAdmin.changes @@ -1,7 +1,15 @@ +------------------------------------------------------------------- +Wed Jun 22 09:01:52 UTC 2011 - chris@computersalat.de + +- fix changelog + o update to 3.4.2.0 -> update to 3.4.2 +- fix bnc#697748 (suhosin customization) + o moved from spec's %post to http_conf file + ------------------------------------------------------------------- Thu Jun 09 14:41:00 UTC 2011 - jweberhofer@weberhofer.at -- update to 3.4.2.0 +- update to 3.4.2 - bug #3301249 [interface] Iconic table operations does not remove inline edit label - bug #3303869 [interface] Unnecessary scrolling on Databases page - patch #3303813 [setup] Define a label that was missing diff --git a/phpMyAdmin.http b/phpMyAdmin.http index 862709b..5ae47d3 100644 --- a/phpMyAdmin.http +++ b/phpMyAdmin.http @@ -9,6 +9,13 @@ php_admin_flag zend.ze1_compatibility_mode off php_admin_flag safe_mode Off php_admin_value open_basedir "@ap_docroot@/@name@:/var/lib/php5:/tmp:@docdir@/@name@:/etc/@name@" + # 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 ba16ea2..d2316b4 100644 --- a/phpMyAdmin.spec +++ b/phpMyAdmin.spec @@ -136,16 +136,6 @@ find $RPM_BUILD_ROOT%{ap_docroot}/%{name} -maxdepth 1 -type f | grep -v 'config. # set PmaAbsoluteUri ### generate blowfish secret %{__sed} -i -e "s,@FQDN@,$(cat /etc/HOSTNAME)," \ -e "s/\\\$cfg\['blowfish_secret'\] = ''/\$cfg['blowfish_secret'] = '`pwgen -s -1 46`'/" %{pma_config} -if [ -f /etc/php5/conf.d/suhosin.ini ]; then - %{__sed} -i \ - -e "s/^;\(suhosin.post.max_array_index_length =\).*/\1 256/" \ - -e "s/^;\(suhosin.post.max_totalname_length =\).*/\1 8192/" \ - -e "s/^;\(suhosin.post.max_vars =\).*/\1 2048/" \ - -e "s/^;\(suhosin.request.max_array_index_length =\).*/\1 256/" \ - -e "s/^;\(suhosin.request.max_totalname_length =\).*/\1 8192/" \ - -e "s/^;\(suhosin.request.max_vars =\).*/\1 2048/" \ - %{_sysconfdir}/php5/conf.d/suhosin.ini -fi %postun %restart_on_update apache2