From: Renat Lumpau Date: Wed, 28 Feb 2007 13:35:21 +0000 (+0000) Subject: Version bump X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=95fe4531e234c65a58f50d028b8b268d105ba6e8;p=gentoo.git Version bump Package-Manager: portage-2.1.2-r10 --- diff --git a/dev-db/phpmyadmin/ChangeLog b/dev-db/phpmyadmin/ChangeLog index b2453bd45765..2dbff6ee5fcc 100644 --- a/dev-db/phpmyadmin/ChangeLog +++ b/dev-db/phpmyadmin/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for dev-db/phpmyadmin # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/ChangeLog,v 1.240 2007/02/04 14:57:16 rl03 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/ChangeLog,v 1.241 2007/02/28 13:35:21 rl03 Exp $ + +*phpmyadmin-2.10.0 (28 Feb 2007) + + 28 Feb 2007; Renat Lumpau + -files/config.default.php-2.8.0.patch, + +files/config.default.php-2.9.10.patch, -phpmyadmin-2.9.2.ebuild, + +phpmyadmin-2.10.0.ebuild: + Version bump 04 Feb 2007; Renat Lumpau -phpmyadmin-2.9.1.1.ebuild: Removed vulnerable version diff --git a/dev-db/phpmyadmin/Manifest b/dev-db/phpmyadmin/Manifest index 404530733e2e..918768d5ba3b 100644 --- a/dev-db/phpmyadmin/Manifest +++ b/dev-db/phpmyadmin/Manifest @@ -5,10 +5,10 @@ AUX common.lib.php.diff 272 RMD160 47977c97e73ed2d5a09e9951c7f814eb993a04ec SHA1 MD5 da50258f238da90ef88e4600b6068a55 files/common.lib.php.diff 272 RMD160 47977c97e73ed2d5a09e9951c7f814eb993a04ec files/common.lib.php.diff 272 SHA256 066b0241e466db73d1f9ca694e96b6bb23a56e3e4fa16d9b31bf4e5d3fd6b57a files/common.lib.php.diff 272 -AUX config.default.php-2.8.0.patch 5553 RMD160 60869c33523751098a98a067fee3482c2c26795a SHA1 329047d7eaaf3c24bc1deb86809361fe6eb35b7c SHA256 78ab8d8910101accd03f8820210feb49a997571e66156d86255dc8fafebf16ce -MD5 9dc203a856638d41f9992d0e54f8c8f8 files/config.default.php-2.8.0.patch 5553 -RMD160 60869c33523751098a98a067fee3482c2c26795a files/config.default.php-2.8.0.patch 5553 -SHA256 78ab8d8910101accd03f8820210feb49a997571e66156d86255dc8fafebf16ce files/config.default.php-2.8.0.patch 5553 +AUX config.default.php-2.9.10.patch 5716 RMD160 c17c424cc7419715f7a5b7f8f1ba0b9a3e7bde1a SHA1 cd812161cc9e7ba883ced1376365200dcec252e9 SHA256 e2e993fe3c30d1e6fdd47d2e32ddbcccb5cc691271ac7481f39c251353ef8855 +MD5 624fed7d6c80b269d3f0729931e852f7 files/config.default.php-2.9.10.patch 5716 +RMD160 c17c424cc7419715f7a5b7f8f1ba0b9a3e7bde1a files/config.default.php-2.9.10.patch 5716 +SHA256 e2e993fe3c30d1e6fdd47d2e32ddbcccb5cc691271ac7481f39c251353ef8855 files/config.default.php-2.9.10.patch 5716 AUX config.default.php-2.9.2.patch 5290 RMD160 065246a1fe6ec281518210a96d61b600d0941d99 SHA1 1328ad58e0f253bbf0ad2c2262f68fcfd6d38035 SHA256 9f676484fd42a96ade7a8890dbc39294663d889a65af432273f05a58c6b9f0e0 MD5 31a8f5e607ee6379bc9841c200b9262c files/config.default.php-2.9.2.patch 5290 RMD160 065246a1fe6ec281518210a96d61b600d0941d99 files/config.default.php-2.9.2.patch 5290 @@ -25,34 +25,34 @@ AUX reconfig-2.8 329 RMD160 993162aa564ab7d37c7f32db439518c5cab9ace5 SHA1 0557bd MD5 cf0af0543cb29eb88163220df6f14669 files/reconfig-2.8 329 RMD160 993162aa564ab7d37c7f32db439518c5cab9ace5 files/reconfig-2.8 329 SHA256 526f7efb31adde131ffaff0271ea12693315c2d4e8a1f96ae4af6947815d6612 files/reconfig-2.8 329 -DIST phpMyAdmin-2.9.2-all-languages-utf-8-only.tar.bz2 1546499 RMD160 9ac84c22f2759363b7710bbe7748bfa01fdf9e9e SHA1 d4fc289ee1784a7ee1bdd1e97600440c69cde17e SHA256 28f8610adff238207dbd09a12e8da33f38b224e2fda3a50902443be2e663b29e +DIST phpMyAdmin-2.10.0-all-languages-utf-8-only.tar.bz2 2188767 RMD160 2f529a3edd56cc808f89742eb1d35244ba9c81c6 SHA1 e361c8d46ff3fdbd348420385bde22693be39728 SHA256 3d6d469431e7b320189f76906bc9e7a20629486538237fabe0c94c8cc01b0332 DIST phpMyAdmin-2.9.2-rc1-all-languages-utf-8-only.tar.bz2 1546404 RMD160 f8254e0a357ae75817e4a588119d923f4c9cb2ba SHA1 345cee890fbebe9773dad6a0bacf8a2a2f822c42 SHA256 2597d79b5386ead817ac8c7afbe8cc95f3c0847f4e3a113a6dfff5ffe107dc1e -EBUILD phpmyadmin-2.9.2.ebuild 2623 RMD160 4f1b2f5883c4014af15458706afbb68fbcec64df SHA1 fb0244dbd2ed911543581627885fee32a66fb542 SHA256 d09bdefe5a35ebdb33eb9ddbeed8a08fd467ae40a1fe722661be51b5773d2445 -MD5 9d0b43efe820ceae5c6466b58f21f04c phpmyadmin-2.9.2.ebuild 2623 -RMD160 4f1b2f5883c4014af15458706afbb68fbcec64df phpmyadmin-2.9.2.ebuild 2623 -SHA256 d09bdefe5a35ebdb33eb9ddbeed8a08fd467ae40a1fe722661be51b5773d2445 phpmyadmin-2.9.2.ebuild 2623 +EBUILD phpmyadmin-2.10.0.ebuild 2625 RMD160 36b0e65a42ea77434915f4c15a4fac589d25748e SHA1 67e132b8e5ae738ebbf254b4c49f089d21c5c5b7 SHA256 152d581a8e8b5c5ff0d0633b01f420be180a98067f9b9998d5c08f5fd55c4898 +MD5 5a205675c921d0ac8a1ff14488501dc8 phpmyadmin-2.10.0.ebuild 2625 +RMD160 36b0e65a42ea77434915f4c15a4fac589d25748e phpmyadmin-2.10.0.ebuild 2625 +SHA256 152d581a8e8b5c5ff0d0633b01f420be180a98067f9b9998d5c08f5fd55c4898 phpmyadmin-2.10.0.ebuild 2625 EBUILD phpmyadmin-2.9.2_rc1.ebuild 2623 RMD160 29c730c13ed82024bbb3d7c8204a945294480024 SHA1 a96c9a2414f534ce387c6881bd1b5fb4d6fbca8a SHA256 cd68fb36a8937bc44cb8675f2a96f710163be62d6cc49edb445679f48125c59a MD5 34ba2a88ea7880b0f9d010fedfa46484 phpmyadmin-2.9.2_rc1.ebuild 2623 RMD160 29c730c13ed82024bbb3d7c8204a945294480024 phpmyadmin-2.9.2_rc1.ebuild 2623 SHA256 cd68fb36a8937bc44cb8675f2a96f710163be62d6cc49edb445679f48125c59a phpmyadmin-2.9.2_rc1.ebuild 2623 -MISC ChangeLog 32767 RMD160 4655db0fe4c25d69c8afbd254311c8bd755003eb SHA1 4114d3bb4582672d2ce1bf844fb43e3b6469e016 SHA256 3b6b6469f77bbbebd7978674f5ac904fc45ae0204facd8d1afe181a2dc07e156 -MD5 83cc138380414f31299e4b23c8167daf ChangeLog 32767 -RMD160 4655db0fe4c25d69c8afbd254311c8bd755003eb ChangeLog 32767 -SHA256 3b6b6469f77bbbebd7978674f5ac904fc45ae0204facd8d1afe181a2dc07e156 ChangeLog 32767 +MISC ChangeLog 33001 RMD160 f617bbfc0caf98d880fcd646b536401663ed3152 SHA1 916373f3ecdd7c24d5fd90dc461af33b77ab8c54 SHA256 a36f136d722a7dbc92669373fed57fc008182b2e1b63c3c3cf30746c11ca11f8 +MD5 e8c16ac09a51e74b93a30d5ca1abd56c ChangeLog 33001 +RMD160 f617bbfc0caf98d880fcd646b536401663ed3152 ChangeLog 33001 +SHA256 a36f136d722a7dbc92669373fed57fc008182b2e1b63c3c3cf30746c11ca11f8 ChangeLog 33001 MISC metadata.xml 182 RMD160 9b377947041edce61a201266f0c982e3b7c91d8d SHA1 a6d1f4b69883a0940325b7b4ad1de261c7b8c485 SHA256 cf12fb82ad3a864f109328701bfc9b17657184fdb51c04b4af301b3322def6c1 MD5 4bfbfdac057f18787bab530fdaf64fdf metadata.xml 182 RMD160 9b377947041edce61a201266f0c982e3b7c91d8d metadata.xml 182 SHA256 cf12fb82ad3a864f109328701bfc9b17657184fdb51c04b4af301b3322def6c1 metadata.xml 182 -MD5 9e1829773dd503edb8baf099b181a364 files/digest-phpmyadmin-2.9.2 331 -RMD160 1c88f81730cd1959891f12e71ae371f68b59492b files/digest-phpmyadmin-2.9.2 331 -SHA256 4c926a2915d3ef2b25754715d080a6fe22bf28f99827a6c0c59952619bb9972e files/digest-phpmyadmin-2.9.2 331 +MD5 406738d8fd90bfccf2dae11d5c9851d2 files/digest-phpmyadmin-2.10.0 334 +RMD160 8ed0e5710d857d93c23fb929b6b74d8073c3db6c files/digest-phpmyadmin-2.10.0 334 +SHA256 24128e96dbe2a2b73a1060283e4eca67f02c65972ba8b3bc759a4df46c32a96a files/digest-phpmyadmin-2.10.0 334 MD5 9f43e978247073c7e88b034c1c29caf0 files/digest-phpmyadmin-2.9.2_rc1 343 RMD160 8adf920c095f0b1bb8e678e081ca057cc59d7de5 files/digest-phpmyadmin-2.9.2_rc1 343 SHA256 8ea1ccd705a491d9e2290b09f54864fa97169f62531a426a789296d8c85efd1f files/digest-phpmyadmin-2.9.2_rc1 343 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.5 (GNU/Linux) -iD8DBQFFxfRVEzitwsaoONoRAhDqAKCZfYIKHoTt2IRNmdB/ENURLYkKowCg1l2k -xnFFyfczkxI8tsbMBAk1mXs= -=v5t1 +iD8DBQFF5YUhEzitwsaoONoRAnrmAKCO4DFbmIsj5QKw+EwKN/46qNd1fQCgoIyo +Y++fHgt+CyR7E271sNtZ+z4= +=r19Q -----END PGP SIGNATURE----- diff --git a/dev-db/phpmyadmin/files/config.default.php-2.8.0.patch b/dev-db/phpmyadmin/files/config.default.php-2.9.10.patch similarity index 62% rename from dev-db/phpmyadmin/files/config.default.php-2.8.0.patch rename to dev-db/phpmyadmin/files/config.default.php-2.9.10.patch index 8a199a23b041..5852d25c1f8b 100644 --- a/dev-db/phpmyadmin/files/config.default.php-2.8.0.patch +++ b/dev-db/phpmyadmin/files/config.default.php-2.9.10.patch @@ -1,66 +1,62 @@ ---- libraries/config.default.php.org 2003-12-02 21:59:24.000000000 +0000 -+++ libraries/config.default.php 2003-12-29 01:09:58.000000000 +0000 -@@ -72,14 +72,15 @@ - $cfg['Servers'][$i]['connect_type'] = 'tcp'; // How to connect to MySQL server ('tcp' or 'socket') +--- libraries/config.default.php 2007-02-28 13:26:55.000000000 +0000 ++++ libraries/config.default.php.patched 2007-02-28 13:30:09.000000000 +0000 +@@ -61,14 +61,14 @@ $cfg['Servers'][$i]['connect_type'] = ' + $cfg['Servers'][$i]['extension'] = 'mysql'; // 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 -+$cfg['Servers'][$i]['controluser'] = 'pma'; // MySQL control user settings ++$cfg['Servers'][$i]['controluser'] = 'pma'; // MySQL control user settings // (this user must have read-only -$cfg['Servers'][$i]['controlpass'] = ''; // access to the "mysql/user" -+$cfg['Servers'][$i]['controlpass'] = '@pmapass@'; -+ // access to the "mysql/user" ++$cfg['Servers'][$i]['controlpass'] = '@pmapass@'; // access to the "mysql/user" // and "mysql/db" tables). // The controluser is also // used for all relational // features (pmadb) --$cfg['Servers'][$i]['auth_type'] = 'config'; // Authentication method (config, http or cookie based)? -+$cfg['Servers'][$i]['auth_type'] = 'http'; // Authentication method (config, http or cookie based)? +-$cfg['Servers'][$i]['auth_type'] = 'config'; // Authentication method (valid choices: config, http, HTTP, signon or cookie) ++$cfg['Servers'][$i]['auth_type'] = 'http'; // Authentication method (valid choices: config, http, HTTP, signon or cookie) $cfg['Servers'][$i]['user'] = 'root'; // MySQL user $cfg['Servers'][$i]['password'] = ''; // MySQL password (only needed // with 'config' auth_type) -@@ -88,29 +89,36 @@ - // It may also be an array of db-names, where sorting order is relevant. +@@ -82,32 +82,32 @@ $cfg['Servers'][$i]['only_db'] = ' + $cfg['Servers'][$i]['hide_db'] = ''; // Database name to be hidden from listings $cfg['Servers'][$i]['verbose'] = ''; // Verbose name for this host - leave blank to show the hostname -$cfg['Servers'][$i]['pmadb'] = ''; // Database used for Relation, Bookmark and PDF Features -+$cfg['Servers'][$i]['pmadb'] = 'pmadb'; // Database used for Relation, Bookmark and PDF Features ++$cfg['Servers'][$i]['pmadb'] = 'pmadb'; // Database used for Relation, Bookmark and PDF Features // (see scripts/create_tables.sql) // - leave blank for no support // DEFAULT: 'phpmyadmin' -$cfg['Servers'][$i]['bookmarktable'] = ''; // Bookmark table -+$cfg['Servers'][$i]['bookmarktable'] = 'PMA_bookmark'; -+ // Bookmark table ++$cfg['Servers'][$i]['bookmarktable'] = 'PMA_bookmark'; // Bookmark table // - leave blank for no bookmark support // DEFAULT: 'pma_bookmark' -$cfg['Servers'][$i]['relation'] = ''; // table to describe the relation between links (see doc) -+$cfg['Servers'][$i]['relation'] = 'PMA_relation'; -+ // table to describe the relation between links (see doc) ++$cfg['Servers'][$i]['relation'] = 'PMA_relation'; // table to describe the relation between links (see doc) // - leave blank for no relation-links support // DEFAULT: 'pma_relation' -$cfg['Servers'][$i]['table_info'] = ''; // table to describe the display fields -+$cfg['Servers'][$i]['table_info'] = 'PMA_table_info'; -+ // table to describe the display fields ++$cfg['Servers'][$i]['table_info'] = 'PMA_table_info'; // table to describe the display fields // - leave blank for no display fields support // DEFAULT: 'pma_table_info' -$cfg['Servers'][$i]['table_coords'] = ''; // table to describe the tables position for the PDF schema -+$cfg['Servers'][$i]['table_coords'] = 'PMA_table_coords'; -+ // table to describe the tables position for the PDF schema ++$cfg['Servers'][$i]['table_coords'] = 'PMA_table_coords'; // table to describe the tables position for the PDF schema // - leave blank for no PDF schema support // DEFAULT: 'pma_table_coords' -$cfg['Servers'][$i]['pdf_pages'] = ''; // table to describe pages of relationpdf -+$cfg['Servers'][$i]['pdf_pages'] = 'PMA_pdf_pages'; -+ // table to describe pages of relationpdf ++$cfg['Servers'][$i]['pdf_pages'] = 'PMA_pdf_pages'; // table to describe pages of relationpdf // - leave blank if you don't want to use this // DEFAULT: 'pma_pdf_pages' -$cfg['Servers'][$i]['column_info'] = ''; // table to store column information -+$cfg['Servers'][$i]['column_info'] = 'PMA_column_info'; -+ // table to store column information ++$cfg['Servers'][$i]['column_info'] = 'PMA_column_info'; // table to store column information // - leave blank for no column comments/mime types // DEFAULT: 'pma_column_info' -$cfg['Servers'][$i]['history'] = ''; // table to store SQL history -+$cfg['Servers'][$i]['history'] = 'PMA_history'; -+ // table to store SQL history ++$cfg['Servers'][$i]['history'] = 'PMA_history'; // table to store SQL history // - leave blank for no SQL query history // DEFAULT: 'pma_history' +-$cfg['Servers'][$i]['designer_coords'] = ''; // table to store the coordinates for Designer ++$cfg['Servers'][$i]['designer_coords'] = 'PMA_designer_coords'; // table to store the coordinates for Designer + // - leave blank for no Designer feature + // DEFAULT: 'pma_designer_coords' $cfg['Servers'][$i]['verbose_check'] = TRUE; // set to FALSE if you know that your pma_* tables diff --git a/dev-db/phpmyadmin/files/digest-phpmyadmin-2.10.0 b/dev-db/phpmyadmin/files/digest-phpmyadmin-2.10.0 new file mode 100644 index 000000000000..5d225d661491 --- /dev/null +++ b/dev-db/phpmyadmin/files/digest-phpmyadmin-2.10.0 @@ -0,0 +1,3 @@ +MD5 5e203616485ef81ec6a51e0f4ac4da53 phpMyAdmin-2.10.0-all-languages-utf-8-only.tar.bz2 2188767 +RMD160 2f529a3edd56cc808f89742eb1d35244ba9c81c6 phpMyAdmin-2.10.0-all-languages-utf-8-only.tar.bz2 2188767 +SHA256 3d6d469431e7b320189f76906bc9e7a20629486538237fabe0c94c8cc01b0332 phpMyAdmin-2.10.0-all-languages-utf-8-only.tar.bz2 2188767 diff --git a/dev-db/phpmyadmin/files/digest-phpmyadmin-2.9.2 b/dev-db/phpmyadmin/files/digest-phpmyadmin-2.9.2 deleted file mode 100644 index 27395f188f37..000000000000 --- a/dev-db/phpmyadmin/files/digest-phpmyadmin-2.9.2 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 aba8f8fe4e69fc49772b22404401bc4a phpMyAdmin-2.9.2-all-languages-utf-8-only.tar.bz2 1546499 -RMD160 9ac84c22f2759363b7710bbe7748bfa01fdf9e9e phpMyAdmin-2.9.2-all-languages-utf-8-only.tar.bz2 1546499 -SHA256 28f8610adff238207dbd09a12e8da33f38b224e2fda3a50902443be2e663b29e phpMyAdmin-2.9.2-all-languages-utf-8-only.tar.bz2 1546499 diff --git a/dev-db/phpmyadmin/phpmyadmin-2.9.2.ebuild b/dev-db/phpmyadmin/phpmyadmin-2.10.0.ebuild similarity index 96% rename from dev-db/phpmyadmin/phpmyadmin-2.9.2.ebuild rename to dev-db/phpmyadmin/phpmyadmin-2.10.0.ebuild index aa25818f09b2..5ea9077321b0 100644 --- a/dev-db/phpmyadmin/phpmyadmin-2.9.2.ebuild +++ b/dev-db/phpmyadmin/phpmyadmin-2.10.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/phpmyadmin-2.9.2.ebuild,v 1.1 2007/01/22 00:09:33 rl03 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/phpmyadmin-2.10.0.ebuild,v 1.1 2007/02/28 13:35:21 rl03 Exp $ inherit eutils webapp depend.php @@ -40,7 +40,7 @@ pkg_setup() { src_unpack() { unpack ${A} cd ${S} - epatch ${FILESDIR}/config.default.php-2.9.2.patch + epatch ${FILESDIR}/config.default.php-2.9.10.patch # bug 152933 cd libraries && epatch ${FILESDIR}/common.lib.php.diff cd ..