diff --git a/.cvsignore b/.cvsignore index 10708d1..5864279 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -phpMyAdmin-3.2.5-all-languages.tar.bz2 +phpMyAdmin-3.3.3-all-languages.tar.bz2 diff --git a/phpMyAdmin-3.3.3-vendor.patch b/phpMyAdmin-3.3.3-vendor.patch new file mode 100644 index 0000000..1578018 --- /dev/null +++ b/phpMyAdmin-3.3.3-vendor.patch @@ -0,0 +1,38 @@ +Patch by Remi Collet for phpMyAdmin >= 3.3.0, which adds the possibility to put +config.inc.php into a FHS conform path (e.g. /etc/phpMyAdmin/) without the use of a symlink. More details +can be found at: https://sourceforge.net/tracker/?func=detail&aid=2965613&group_id=23067&atid=377411 + +--- phpMyAdmin-3.3.3-all-languages/libraries/common.inc.php 2010-05-10 18:32:36.000000000 +0200 ++++ phpMyAdmin-3.3.3-all-languages/libraries/common.inc.php.vendor 2010-06-26 21:50:25.000000000 +0200 +@@ -536,7 +536,7 @@ + * force reading of config file, because we removed sensitive values + * in the previous iteration + */ +-$_SESSION['PMA_Config'] = new PMA_Config('./config.inc.php'); ++$_SESSION['PMA_Config'] = new PMA_Config(CONFIG_FILE); + + if (!defined('PMA_MINIMUM_COMMON')) { + $_SESSION['PMA_Config']->checkPmaAbsoluteUri(); +@@ -586,7 +586,7 @@ + if ($_SESSION['PMA_Config']->error_config_file) { + $error = $strConfigFileError + . '

' +- . ($_SESSION['PMA_Config']->getSource() == './config.inc.php' ? ++ . ($_SESSION['PMA_Config']->getSource() == CONFIG_FILE ? + '' . $_SESSION['PMA_Config']->getSource() . '' + : +--- phpMyAdmin-3.3.3-all-languages/libraries/vendor_config.php 2010-05-10 18:32:36.000000000 +0200 ++++ phpMyAdmin-3.3.3-all-languages/libraries/vendor_config.php.vendor 2010-06-26 21:51:06.000000000 +0200 +@@ -11,6 +11,11 @@ + * @package phpMyAdmin + */ + ++ /** ++ * Path to Configuration file ++ */ ++define('CONFIG_FILE', './config.inc.php'); ++ + /** + * Path to changelog file, can be gzip compressed. Useful when you want to + * have documentation somewhere else, eg. /usr/share/doc. diff --git a/phpMyAdmin-config.inc.php b/phpMyAdmin-config.inc.php index dcc2a69..9a49706 100644 --- a/phpMyAdmin-config.inc.php +++ b/phpMyAdmin-config.inc.php @@ -1,4 +1,11 @@ . + */ /* * This is needed for cookie based authentication to encrypt password in @@ -10,6 +17,7 @@ $cfg['blowfish_secret'] = ''; /* YOU MUST FILL IN THIS FOR COOKIE AUTH! */ * Server(s) configuration */ $i = 0; + // The $cfg['Servers'] array starts with $cfg['Servers'][1]. Do not use // $cfg['Servers'][0]. You can disable a server config entry by setting host // to ''. If you want more than one server, just copy following section @@ -20,7 +28,7 @@ $cfg['Servers'][$i]['host'] = 'localhost'; // MySQL hostname or IP addr $cfg['Servers'][$i]['port'] = ''; // MySQL port - leave blank for default port $cfg['Servers'][$i]['socket'] = ''; // Path to the socket - leave blank for default socket $cfg['Servers'][$i]['connect_type'] = 'tcp'; // How to connect to MySQL server ('tcp' or 'socket') -$cfg['Servers'][$i]['extension'] = 'mysql'; // The php MySQL extension to use ('mysql' or 'mysqli') +$cfg['Servers'][$i]['extension'] = 'mysqli'; // The php MySQL extension to use ('mysql' or 'mysqli') $cfg['Servers'][$i]['compress'] = FALSE; // Use compressed protocol for the MySQL connection // (requires PHP >= 4.3.0) $cfg['Servers'][$i]['controluser'] = ''; // MySQL control user settings @@ -73,4 +81,26 @@ $cfg['Servers'][$i]['AllowDeny']['order'] // Host authentication order = ''; $cfg['Servers'][$i]['AllowDeny']['rules'] // Host authentication rules, leave blank for defaults = array(); +$cfg['Servers'][$i]['AllowNoPassword'] // Allow logins without a password. Do not change the FALSE + = FALSE; // default unless you're running a passwordless MySQL server +$cfg['Servers'][$i]['designer_coords'] // Leave blank (default) for no Designer support, otherwise + = ''; // set to suggested 'pma_designer_coords' if really needed +$cfg['Servers'][$i]['bs_garbage_threshold'] // Blobstreaming: Recommented default value from upstream + = 50; // DEFAULT: '50' +$cfg['Servers'][$i]['bs_repository_threshold'] // Blobstreaming: Recommented default value from upstream + = '32M'; // DEFAULT: '32M' +$cfg['Servers'][$i]['bs_temp_blob_timeout'] // Blobstreaming: Recommented default value from upstream + = 600; // DEFAULT: '600' +$cfg['Servers'][$i]['bs_temp_log_threshold'] // Blobstreaming: Recommented default value from upstream + = '32M'; // DEFAULT: '32M' +/* + * End of servers configuration + */ + +/* + * Directories for saving/loading files from server + */ +$cfg['UploadDir'] = '/var/lib/phpMyAdmin/upload'; +$cfg['SaveDir'] = '/var/lib/phpMyAdmin/save'; + ?> diff --git a/phpMyAdmin.htaccess b/phpMyAdmin.htaccess index 0d57efc..017ed06 100644 --- a/phpMyAdmin.htaccess +++ b/phpMyAdmin.htaccess @@ -7,17 +7,31 @@ Alias /phpMyAdmin /usr/share/phpMyAdmin Alias /phpmyadmin /usr/share/phpMyAdmin + - order deny,allow - deny from all - allow from 127.0.0.1 - allow from ::1 + Order Deny,Allow + Deny from All + Allow from 127.0.0.1 + Allow from ::1 + + + + Order Deny,Allow + Deny from All + Allow from 127.0.0.1 + Allow from ::1 -# This directory does not require access over HTTP - taken from the original +# These directories do not require access over HTTP - taken from the original # phpMyAdmin upstream tarball # - + + Order Deny,Allow + Deny from All + Allow from None + + + Order Deny,Allow Deny from All Allow from None @@ -27,8 +41,7 @@ Alias /phpmyadmin /usr/share/phpMyAdmin # filtering SQL etc. This may break your mod_security implementation. # # -# +# # SecRuleInheritance Off # # - diff --git a/phpMyAdmin.spec b/phpMyAdmin.spec index 5c89bc7..575e991 100644 --- a/phpMyAdmin.spec +++ b/phpMyAdmin.spec @@ -1,60 +1,77 @@ Name: phpMyAdmin -Version: 3.2.5 +Version: 3.3.3 Release: 1%{?dist} Summary: Web based MySQL browser written in php -Group: Applications/Internet +Group: Applications/Internet License: GPLv2+ -URL: http://www.phpmyadmin.net/ +URL: http://www.phpmyadmin.net/ Source0: http://downloads.sourceforge.net/sourceforge/%{name}/%{name}-%{version}-all-languages.tar.bz2 Source1: phpMyAdmin-config.inc.php Source2: phpMyAdmin.htaccess +Patch0: phpMyAdmin-3.3.3-vendor.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -Requires: webserver +Requires: httpd Requires: php >= 5.2.0 Requires: php-mysql >= 5.2.0 Requires: php-mbstring >= 5.2.0 Requires: php-mcrypt >= 5.2.0 -Provides: phpmyadmin +Requires: php-gd >= 5.2.0 +Provides: phpmyadmin = %{version}-%{release} %description phpMyAdmin is a tool written in PHP intended to handle the administration of MySQL over the Web. Currently it can create and drop databases, create/drop/alter tables, delete/edit/add fields, execute any SQL statement, -manage keys on fields, manage privileges,export data into various formats and -is available in 50 languages +manage keys on fields, manage privileges, export data into various formats and +is available in over 55 languages. %prep -%setup -qn phpMyAdmin-%{version}-all-languages +%setup -q -n %{name}-%{version}-all-languages +%patch0 -p1 + +# Setup vendor config file +sed -e "/'CHANGELOG_FILE'/s@./ChangeLog@%{_datadir}/doc/%{name}-%{version}/ChangeLog@" \ + -e "/'LICENSE_FILE'/s@./LICENSE@%{_datadir}/doc/%{name}-%{version}/LICENSE@" \ + -e "/'CONFIG_FILE'/s@./config.inc.php@%{_sysconfdir}/%{name}/config.inc.php@" \ + -e "/'SETUP_CONFIG_FILE'/s@./config/config.inc.php@%{_localstatedir}/lib/%{name}/config/config.inc.php@" \ + -i libraries/vendor_config.php + +%build %install rm -rf %{buildroot} -%{__mkdir} -p %{buildroot}/%{_datadir}/%{name} -%{__mkdir} -p %{buildroot}/%{_sysconfdir}/httpd/conf.d/ -%{__mkdir} -p %{buildroot}/%{_sysconfdir}/%{name} -%{__cp} -ad ./* %{buildroot}/%{_datadir}/%{name} -%{__cp} %{SOURCE2} %{buildroot}/%{_sysconfdir}/httpd/conf.d/phpMyAdmin.conf -%{__cp} %{SOURCE1} %{buildroot}/%{_sysconfdir}/%{name}/config.inc.php -ln -s %{_sysconfdir}/%{name}/config.inc.php %{buildroot}/%{_datadir}/%{name}/config.inc.php - -%{__rm} -f %{buildroot}/%{_datadir}/%{name}/*txt -%{__rm} -f %{buildroot}/%{_datadir}/%{name}/[IRLT]* -%{__rm} -f %{buildroot}/%{_datadir}/%{name}/CREDITS -%{__rm} -f %{buildroot}/%{_datadir}/%{name}/libraries/.htaccess +%{__mkdir} -p %{buildroot}{%{_datadir}/%{name},%{_sysconfdir}/{httpd/conf.d,%{name}}} +%{__mkdir} -p %{buildroot}%{_localstatedir}/lib/%{name}/{upload,save,config} +%{__cp} -ad ./* %{buildroot}%{_datadir}/%{name} +%{__cp} -p %{SOURCE2} %{buildroot}%{_sysconfdir}/httpd/conf.d/%{name}.conf +%{__cp} -p %{SOURCE1} %{buildroot}%{_sysconfdir}/%{name}/config.inc.php + +%{__rm} -f %{buildroot}%{_datadir}/%{name}/{[CIRLT]*,*txt} +%{__rm} -f %{buildroot}%{_datadir}/%{name}/{libraries,setup/lib}/.htaccess +%{__rm} -rf %{buildroot}%{_datadir}/%{name}/{contrib,documentation-gsoc} %clean rm -rf %{buildroot} %files %defattr(-,root,root,-) -%doc INSTALL README LICENSE CREDITS TODO Documentation.txt -%{_datadir}/%{name} -%config(noreplace) %{_sysconfdir}/httpd/conf.d/phpMyAdmin.conf -%config(noreplace) %{_sysconfdir}/%{name} +%doc ChangeLog README LICENSE CREDITS TODO Documentation.txt documentation-gsoc +%{_datadir}/%{name}/ +%dir %{_sysconfdir}/%{name}/ +%config(noreplace) %{_sysconfdir}/%{name}/config.inc.php +%config(noreplace) %{_sysconfdir}/httpd/conf.d/%{name}.conf +%dir %{_localstatedir}/lib/%{name}/ +%dir %attr(0755,apache,apache) %{_localstatedir}/lib/%{name}/upload +%dir %attr(0755,apache,apache) %{_localstatedir}/lib/%{name}/save +%dir %attr(0755,apache,apache) %{_localstatedir}/lib/%{name}/config %changelog +* Sat Jun 26 2010 Robert Scheck 3.3.3-1 +- Upstream released 3.3.3 (#558322, #589288, #589487) + * Sun Jan 10 2010 Robert Scheck 3.2.5-1 - Upstream released 3.2.5 diff --git a/sources b/sources index d4cbb11..7db37d4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -6083ea867a152f58f5c332d0c9b92ac1 phpMyAdmin-3.2.5-all-languages.tar.bz2 +7f670239eededfb038785cd15a12545b phpMyAdmin-3.3.3-all-languages.tar.bz2