From 8002f3af82bd9ada9c8fddb202896434d908063d Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Sun, 10 Jun 2012 07:14:25 +0200 Subject: repo reorg --- Makefile | 4 + README | 8 ++ phpMyAdmin.htaccess | 73 +++++++++++ phpMyAdmin.spec | 349 ++++++++++++++++++++++++++++++++++++++++++++++++++++ pma-php54.patch | 11 ++ 5 files changed, 445 insertions(+) create mode 100644 Makefile create mode 100644 README create mode 100644 phpMyAdmin.htaccess create mode 100644 phpMyAdmin.spec create mode 100644 pma-php54.patch diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..1e65467 --- /dev/null +++ b/Makefile @@ -0,0 +1,4 @@ +SRCDIR := $(shell pwd) +NAME := $(shell basename $(SRCDIR)) +include ../common/Makefile + diff --git a/README b/README new file mode 100644 index 0000000..9b57574 --- /dev/null +++ b/README @@ -0,0 +1,8 @@ +phpMyAdmin +---------- + +Diff from fedora packages + +- version 3.4.x +- embeded themes +- don't requires httpd diff --git a/phpMyAdmin.htaccess b/phpMyAdmin.htaccess new file mode 100644 index 0000000..e2d301f --- /dev/null +++ b/phpMyAdmin.htaccess @@ -0,0 +1,73 @@ +# phpMyAdmin - Web based MySQL browser written in php +# +# Allows only localhost by default +# +# But allowing phpMyAdmin to anyone other than localhost should be considered +# dangerous unless properly secured by SSL + +Alias /phpMyAdmin /usr/share/phpMyAdmin +Alias /phpmyadmin /usr/share/phpMyAdmin + + + + # Apache 2.4 + + Require ip 127.0.0.1 + Require ip ::1 + + + + # Apache 2.2 + Order Deny,Allow + Deny from All + Allow from 127.0.0.1 + Allow from ::1 + + + + + + # Apache 2.4 + + Require ip 127.0.0.1 + Require ip ::1 + + + + # Apache 2.2 + Order Deny,Allow + Deny from All + Allow from 127.0.0.1 + Allow from ::1 + + + +# 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 + + + + Order Deny,Allow + Deny from All + Allow from None + + +# This configuration prevents mod_security at phpMyAdmin directories from +# filtering SQL etc. This may break your mod_security implementation. +# +# +# +# SecRuleInheritance Off +# +# diff --git a/phpMyAdmin.spec b/phpMyAdmin.spec new file mode 100644 index 0000000..c53340a --- /dev/null +++ b/phpMyAdmin.spec @@ -0,0 +1,349 @@ +Name: phpMyAdmin +Version: 3.5.1 +Release: 2%{?dist} +Summary: Web based MySQL browser written in php + +Group: Applications/Internet +License: GPLv2+ +URL: http://www.phpmyadmin.net/ +Source0: http://downloads.sourceforge.net/sourceforge/phpmyadmin/%{name}-%{version}-all-languages.tar.bz2 +Source2: phpMyAdmin.htaccess + +Source10: http://downloads.sourceforge.net/sourceforge/phpmyadmin/darkblue_orange-2.10.zip +Source11: http://downloads.sourceforge.net/sourceforge/phpmyadmin/graphite-1.0.zip +Source12: http://downloads.sourceforge.net/sourceforge/phpmyadmin/toba-0.2.zip +Source13: http://downloads.sourceforge.net/sourceforge/phpmyadmin/paradice-3.4.zip + +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildArch: noarch +BuildRequires: unzip + +Requires: webserver +Requires: php-mysql >= 5.2.0 +Requires: php-mbstring >= 5.2.0 +Requires: php-gd >= 5.2.0 +Requires: php-mcrypt >= 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 + + +%prep +%setup -qn phpMyAdmin-%{version}-all-languages + +# Minimal configuration file +sed -e "/'extension'/s@'mysql'@'mysqli'@" \ + -e "/'blowfish_secret'/s@''@'MUSTBECHANGEDONINSTALL'@" \ + -e "/'UploadDir'/s@''@'%{_localstatedir}/lib/%{name}/upload'@" \ + -e "/'SaveDir'/s@''@'%{_localstatedir}/lib/%{name}/save'@" \ + config.sample.inc.php >CONFIG + +# 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_DIR'/s@'./'@'%{_sysconfdir}/%{name}/'@" \ + -e "/'SETUP_CONFIG_FILE'/s@./config/config.inc.php@%{_localstatedir}/lib/%{name}/config/config.inc.php@" \ + -i libraries/vendor_config.php + +# For debug +grep '^define' libraries/vendor_config.php + +# to avoid rpmlint warnings +find . -name \*.php -exec chmod -x {} \; + +for archive in %{SOURCE10} %{SOURCE11} %{SOURCE12} %{SOURCE13} +do + %{__unzip} -q $archive -d themes +done + + +%build +# Nothing to do + + +%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} CONFIG %{buildroot}/%{_sysconfdir}/%{name}/config.inc.php + +%{__rm} -f %{buildroot}/%{_datadir}/%{name}/*txt +%{__rm} -f %{buildroot}/%{_datadir}/%{name}/[CIRLT]* +%{__rm} -f %{buildroot}/%{_datadir}/%{name}/libraries/.htaccess +%{__rm} -f %{buildroot}/%{_datadir}/%{name}/setup/lib/.htaccess +%{__rm} -f %{buildroot}/%{_datadir}/%{name}/setup/frames/.htaccess +%{__rm} -rf %{buildroot}/%{_datadir}/%{name}/contrib + +%{__mkdir} -p %{buildroot}/%{_localstatedir}/lib/%{name}/{upload,save,config} + + +%clean +rm -rf %{buildroot} + + +%if %{?fedora}%{!?fedora:99} <= 12 +%pre +echo -e "\nWARNING : Fedora %{fedora} is now EOL :" +echo -e "You should consider upgrading to a supported release.\n" +%endif + +%post +# generate a secret key for this install +sed -i -e "/'blowfish_secret'/s/MUSTBECHANGEDONINSTALL/$RANDOM$RANDOM$RANDOM$RANDOM/" \ + %{_sysconfdir}/%{name}/config.inc.php + + +%files +%defattr(-,root,root,-) +%doc ChangeLog README LICENSE Documentation.txt +%{_datadir}/%{name} +%dir %{_sysconfdir}/%{name} +%config(noreplace) %{_sysconfdir}/%{name}/config.inc.php +%config(noreplace) %{_sysconfdir}/httpd/conf.d/%{name}.conf +%dir %{_localstatedir}/lib/%{name}/upload +%dir %attr(755,apache,root) %{_localstatedir}/lib/%{name}/save +%dir %attr(755,apache,root) %{_localstatedir}/lib/%{name}/config + + +%changelog +* Sat May 05 2012 Remi Collet 3.5.1-2 +- make config compatible httpd 2.2 / 2.4 + +* Fri May 04 2012 Remi Collet 3.5.1-1 +- Upstream released 3.5.1 (bugfix release) + +* Tue Apr 10 2012 Remi Collet 3.5.0-1 +- Upstream released 3.5.0 + +* Wed Mar 28 2012 Remi Collet 3.4.10.2-1 +- Upstream released 3.4.10.2 (security) + fix PMASA-2012-2 + +* Sat Feb 18 2012 Remi Collet 3.4.10.1-1 +- Upstream released 3.4.10.1 (security) + fix PMASA-2012-1 + +* Tue Feb 14 2012 Remi Collet 3.4.10-1 +- Upstream released 3.4.10 (bugfix) + +* Wed Dec 21 2011 Remi Collet 3.4.9-1 +- Upstream released 3.4.9 (bugfix and minor security) + Fix PMASA-2011-19 and PMASA-2011-20 + +* Thu Dec 01 2011 Remi Collet 3.4.8-1 +- Upstream released 3.4.8 (security) + Fix PMASA-2011-18 +- remove patch merged upstream + +* Sun Nov 13 2011 Remi Collet 3.4.7.1-2 +- add patch to avoid notice with php 5.4 + +* Sat Nov 12 2011 Remi Collet 3.4.7.1-1 +- Upstream released 3.4.7.1 (security) + Fix PMASA-2011-17 + +* Sun Oct 23 2011 Remi Collet 3.4.7-1 +- Upstream released 3.4.7 (bugfix) +- add Paradice 3.4 theme + +* Sun Oct 16 2011 Remi Collet 3.4.6-1 +- Upstream released 3.4.6 (security) + Fix PMASA-2011-15 and PMASA-2011-16 + +* Wed Sep 14 2011 Remi Collet 3.4.5-1 +- Upstream released 3.4.5 (security) + http://www.phpmyadmin.net/home_page/security/PMASA-2011-14.php + +* Wed Aug 24 2011 Remi Collet 3.4.4-1 +- Upstream released 3.4.4 (security) + http://www.phpmyadmin.net/home_page/security/PMASA-2011-13.php + +* Sat Jul 23 2011 Remi Collet 3.4.3.2-1 +- Upstream released 3.4.3.2 (security) + http://www.phpmyadmin.net/home_page/security/PMASA-2011-12.php + http://www.phpmyadmin.net/home_page/security/PMASA-2011-9.php + +* Sun Jul 3 2011 Remi Collet 3.4.3.1-1 +- Upstream released 3.4.3.1 (security) + http://www.phpmyadmin.net/home_page/security/PMASA-2011-8.php + http://www.phpmyadmin.net/home_page/security/PMASA-2011-5.php + +* Mon Jun 27 2011 Remi Collet 3.4.3-1 +- Upstream released 3.4.3 + +* Fri Jun 10 2011 Remi Collet 3.4.2-1 +- Upstream released 3.4.2 + +* Thu May 26 2011 Remi Collet 3.4.1-1 +- Upstream released 3.4.1 + http://www.phpmyadmin.net/home_page/security/PMASA-2011-3.php + http://www.phpmyadmin.net/home_page/security/PMASA-2011-4.php + +* Wed May 11 2011 Remi Collet 3.4.0-1 +- Upstream released 3.4.0 +- remove 3.3 themes and add 3.4 ones + +* Sat Mar 19 2011 Remi Collet 3.3.10-1 +- Upstream released 3.3.10 + +* Fri Feb 11 2011 Remi Collet 3.3.9.2-1 +- Upstream released 3.3.9.2 + http://www.phpmyadmin.net/home_page/security/PMASA-2011-2.php + +* Tue Feb 08 2011 Remi Collet 3.3.9.1-1 +- Upstream released 3.3.9.1 + http://www.phpmyadmin.net/home_page/security/PMASA-2011-1.php + +* Sat Feb 05 2011 Remi Collet 3.3.9-2 +- upstream patches for CVE-2010-4480 and CVE-2010-4481 + +* Mon Jan 03 2011 Remi Collet 3.3.9-1 +- Upstream released 3.3.9 +- update pmamhomme to 1.0b +- don't requires php (to allow nginx or lighttpd instead of apache) + +* Mon Oct 25 2010 Remi Collet 3.3.8.1-1 +- Upstream released 3.3.8.1 +- add pmamhomme 1.0 theme + +* Mon Oct 25 2010 Remi Collet 3.3.8-1 +- Upstream released 3.3.8 + +* Tue Sep 07 2010 Remi Collet 3.3.7-1 +- Upstream released 3.3.7 + +* Sun Aug 29 2010 Remi Collet 3.3.6-1 +- Upstream released 3.3.6 + +* Fri Aug 20 2010 Remi Collet 3.3.5.1-1 +- Upstream released 3.3.5.1 + +* Mon Jul 26 2010 Remi Collet 3.3.5-1 +- Upstream released 3.3.5 + +* Tue Jun 29 2010 Remi Collet 3.3.4-1 +- Upstream released 3.3.4 +- add Paradice 3.0b theme + +* Mon May 10 2010 Remi Collet 3.3.3-1.###.remi +- Upstream released 3.3.3 +- clean old changelog entry (version < 3.0.0) + +* Thu Mar 18 2010 Remi Collet 3.3.1-1.###.remi +- Upstream released 3.3.1 + +* Mon Mar 08 2010 Remi Collet 3.3.0-1.###.remi +- Upstream released 3.3.0 +- remove obsolete 3.2 themes (clearview3, crimson_gray, grid, hillside, paradice) +- add new 3.3 themes (smooth_yellow, arctic_ocean) +- add some required extensions (gd, mcrypt) +- add upload, save, config dir in /var/lib/phpMyAdmin +- use vendor_config.php +- swicth to mysqli + +* Sun Jan 10 2010 Remi Collet 3.2.5-1.###.remi +- Upstream released 3.2.5 (bug fixes) +- build for EOL fedora and EL + +* Wed Dec 02 2009 Remi Collet 3.2.4-1.###.remi +- Upstream released 3.2.4 (bug fixes) +- build for EOL fedora and EL + +* Fri Oct 30 2009 Remi Collet 3.2.3-1.###.remi +- Upstream released 3.2.3 (bug fixes) +- build for EOL fedora and EL + +* Tue Oct 13 2009 Remi Collet 3.2.2.1-1.###.remi +- Upstream released 3.2.2.1 (security fix) +- build for EOL fedora and EL + +* Sun Sep 13 2009 Remi Collet 3.2.2-1.###.remi +- Upstream released 3.2.2 (bug fixes) +- build for EOL fedora and EL + +* Wed Jun 30 2009 Remi Collet 3.2.1-1.###.remi +- Upstream released 3.2.1 (bug fixes and a new language: Uzbek) +- build for EOL fedora and EL + +* Wed Jun 30 2009 Remi Collet 3.2.0.1-1.###.remi +- Upstream released 3.2.0.1 (security release) +- build for EOL fedora and EL + +* Mon Jun 15 2009 Remi Collet 3.2.0-1.###.remi +- Upstream released 3.2.0 +- build for EOL fedora and EL +- add theme clearview3-3.1.zip +- add theme crimson_gray-3.1-3.2.zip +- add theme grid-2.11d.zip +- add theme hillside-3.0.zip +- add theme paradice-3.0a.zip + +* Fri May 15 2009 Remi Collet 3.1.5-1.###.remi +- Upstream released 3.1.5 +- build for EOL fedora and EL + +* Sat Apr 25 2009 Remi Collet 3.1.4-1.###.remi +- Upstream released 3.1.4 +- build for EOL fedora and EL + +* Tue Apr 14 2009 Remi Collet 3.1.3.2-1.###.remi +- Upstream released 3.1.3.1 +- build for EOL fedora and EL + +* Wed Mar 25 2009 Remi Collet 3.1.3.1-1.###.remi +- build for EOL fedora and EL + +* Wed Mar 25 2009 Robert Scheck 3.1.3.1-1 +- Upstream released 3.1.3.1 (#492066) + +* Sun Mar 01 2009 Remi Collet 3.1.3-1.###.remi +- Upstream released 3.1.3 +- build for EOL fedora and EL + +* Tue Jan 20 2009 Remi Collet 3.1.2-1.###.remi +- rebuild for EOL fedora and EL + +* Tue Jan 20 2009 Robert Scheck 3.1.2-1 +- Upstream released 3.1.2 + +* Fri Dec 12 2008 Remi Collet 3.1.1-1.###.remi +- rebuild for EOL fedora and EL + +* Thu Dec 11 2008 Robert Scheck 3.1.1-1 +- Upstream released 3.1.1 (#475954) + +* Sat Nov 29 2008 Remi Collet 3.1.0-1.###.remi +- rebuild for EOL fedora and EL + +* Sat Nov 29 2008 Robert Scheck 3.1.0-1 +- Upstream released 3.1.0 +- Replaced LocationMatch with Directory directive (#469451) + +* Fri Oct 31 2008 Remi Collet 3.0.1.1-1.###.remi +- rebuild for EOL fedora and EL + +* Thu Oct 30 2008 Robert Scheck 3.0.1.1-1 +- Upstream released 3.0.1.1 (#468974) + +* Thu Oct 23 2008 Remi Collet 3.0.1-1.###.remi +- rebuild for EOL fedora + +* Wed Oct 22 2008 Robert Scheck 3.0.1-1 +- Upstream released 3.0.1 + +* Sun Oct 19 2008 Robert Scheck 3.0.0-1 +- Upstream released 3.0.0 + +* Sun Oct 12 2008 Remi Collet 3.0.0-1.fc#.remi +- update to 3.0.0 +- update requires for php 5.2.0 + diff --git a/pma-php54.patch b/pma-php54.patch new file mode 100644 index 0000000..65cea87 --- /dev/null +++ b/pma-php54.patch @@ -0,0 +1,11 @@ +--- libraries/Error.class.php.orig 2011-11-13 18:40:23.860385540 +0100 ++++ libraries/Error.class.php 2011-11-13 18:42:40.538840132 +0100 +@@ -175,7 +175,7 @@ + $this->getMessage() . + $this->getFile() . + $this->getLine() . +- $this->getBacktrace() ++ serialize($this->getBacktrace()) + ); + } + -- cgit