ports/58872: [PATCH] Update request databases/phpMyAdmin
Melvyn Sopacua
melvyn at webteckies.org
Mon Nov 3 15:10:23 UTC 2003
>Number: 58872
>Category: ports
>Synopsis: [PATCH] Update request databases/phpMyAdmin
>Confidential: no
>Severity: non-critical
>Priority: medium
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Mon Nov 03 07:10:21 PST 2003
>Closed-Date:
>Last-Modified:
>Originator: Melvyn Sopacua
>Release: FreeBSD 4.9-RC i386
>Organization:
>Environment:
System: FreeBSD ghost.lan.webteckies.org 4.9-RC FreeBSD 4.9-RC #6: Wed Oct 1 07:44:36 CEST 2003 root at ghost.lan.webteckies.org:/usr/obj/usr/src/sys/GHOST i386
>Description:
phpMyAdmin is @ 2.5.4, which fixes a bug in the relation view,
currently present in 2.5.2.
>How-To-Repeat:
Not applicable.
>Fix:
Patch below and 4 new files, which fix 2 things. One fix for a serious
error with INNODB tables, which can cause loss of indexes (also
announced at the website). Another fix for running with E_NOTICE
errorlevel (undefined variable).
Because of these 2 fixes I've set PORTREVISION to 1, but that may
not be correct.
After the patch, I've added two blank lines followed by a shar archive,
to be run inside:
${PORTSDIR}/databases/phpmyadmin
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/databases/phpmyadmin/Makefile,v
retrieving revision 1.9
diff -u -r1.9 Makefile
--- Makefile 19 Aug 2003 20:23:40 -0000 1.9
+++ Makefile 3 Nov 2003 14:46:22 -0000
@@ -6,7 +6,8 @@
#
PORTNAME= phpMyAdmin
-PORTVERSION= 2.5.2
+PORTVERSION= 2.5.4
+PORTREVISION= 1
CATEGORIES= databases www
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= phpmyadmin
@@ -26,8 +27,10 @@
.if defined(WITH_PHP3)
PHP_SUFX= php3
+EXTRA_PATCHES= files/fix-libraries::display_tbl.lib.php3 files/fix-tbl_relation.php3
.else
PHP_SUFX= php
+EXTRA_PATCHES= files/fix-libraries::display_tbl.lib.php files/fix-tbl_relation.php
.endif
PLIST_SUB+= MYADMDIR=${MYADMDIR} PHP_SUFX=${PHP_SUFX}
@@ -39,6 +42,7 @@
post-patch:
@${MV} ${WRKSRC}/config.inc.${PHP_SUFX} ${WRKSRC}/config.inc.${PHP_SUFX}.sample
+ @${RM} ${WRKSRC}/*.orig ${WRKSRC}/libraries/*.orig
do-install:
@${MKDIR} ${PREFIX}/${MYADMDIR}
Index: distinfo
===================================================================
RCS file: /home/ncvs/ports/databases/phpmyadmin/distinfo,v
retrieving revision 1.8
diff -u -r1.8 distinfo
--- distinfo 19 Aug 2003 20:23:40 -0000 1.8
+++ distinfo 3 Nov 2003 14:46:22 -0000
@@ -1,2 +1,2 @@
-MD5 (phpMyAdmin-2.5.2-php.tar.bz2) = c8998f5ef17b8ee9cbf6ed67e9441359
-MD5 (phpMyAdmin-2.5.2-php3.tar.bz2) = e8d61008e9807cf07a41bbff6a2d26cf
+MD5 (phpMyAdmin-2.5.4-php3.tar.bz2) = 7b6b5dcb9071ebfcd71f5db7785db865
+MD5 (phpMyAdmin-2.5.4-php.tar.bz2) = c3a8d771c9846dd95b7283c7ce0f20dd
Index: pkg-plist
===================================================================
RCS file: /home/ncvs/ports/databases/phpmyadmin/pkg-plist,v
retrieving revision 1.6
diff -u -r1.6 pkg-plist
--- pkg-plist 19 Aug 2003 20:23:40 -0000 1.6
+++ pkg-plist 3 Nov 2003 14:46:22 -0000
@@ -6,9 +6,10 @@
%%MYADMDIR%%/INSTALL
%%MYADMDIR%%/LICENSE
%%MYADMDIR%%/README
-%%MYADMDIR%%/RELEASE-DATE-2.5.2
+%%MYADMDIR%%/RELEASE-DATE-2.5.4
%%MYADMDIR%%/TODO
%%MYADMDIR%%/badwords.txt
+%%MYADMDIR%%/browse_foreigners.%%PHP_SUFX%%
%%MYADMDIR%%/chk_rel.%%PHP_SUFX%%
%%MYADMDIR%%/config.inc.%%PHP_SUFX%%.sample
%%MYADMDIR%%/css/phpmyadmin.css.%%PHP_SUFX%%
@@ -24,7 +25,6 @@
%%MYADMDIR%%/db_details_structure.%%PHP_SUFX%%
%%MYADMDIR%%/db_printview.%%PHP_SUFX%%
%%MYADMDIR%%/db_search.%%PHP_SUFX%%
-%%MYADMDIR%%/docSQL/README
%%MYADMDIR%%/docs.css
%%MYADMDIR%%/export.%%PHP_SUFX%%
%%MYADMDIR%%/footer.inc.%%PHP_SUFX%%
@@ -34,6 +34,26 @@
%%MYADMDIR%%/images/arrow_rtl.gif
%%MYADMDIR%%/images/asc_order.png
%%MYADMDIR%%/images/browse.png
+%%MYADMDIR%%/images/button_browse.png
+%%MYADMDIR%%/images/button_drop.png
+%%MYADMDIR%%/images/button_edit.png
+%%MYADMDIR%%/images/button_empty.png
+%%MYADMDIR%%/images/button_fulltext.png
+%%MYADMDIR%%/images/button_index.png
+%%MYADMDIR%%/images/button_insert.png
+%%MYADMDIR%%/images/button_nobrowse.png
+%%MYADMDIR%%/images/button_nodrop.png
+%%MYADMDIR%%/images/button_noempty.png
+%%MYADMDIR%%/images/button_nofulltext.png
+%%MYADMDIR%%/images/button_noindex.png
+%%MYADMDIR%%/images/button_noprimary.png
+%%MYADMDIR%%/images/button_noselect.png
+%%MYADMDIR%%/images/button_nounique.png
+%%MYADMDIR%%/images/button_primary.png
+%%MYADMDIR%%/images/button_properties.png
+%%MYADMDIR%%/images/button_select.png
+%%MYADMDIR%%/images/button_smallbrowse.png
+%%MYADMDIR%%/images/button_unique.png
%%MYADMDIR%%/images/desc_order.png
%%MYADMDIR%%/images/fulltext.png
%%MYADMDIR%%/images/item_ltr.png
@@ -53,6 +73,10 @@
%%MYADMDIR%%/lang/albanian-utf-8.inc.%%PHP_SUFX%%
%%MYADMDIR%%/lang/arabic-utf-8.inc.%%PHP_SUFX%%
%%MYADMDIR%%/lang/arabic-windows-1256.inc.%%PHP_SUFX%%
+%%MYADMDIR%%/lang/azerbaijani-iso-8859-9.inc.%%PHP_SUFX%%
+%%MYADMDIR%%/lang/azerbaijani-utf-8.inc.%%PHP_SUFX%%
+%%MYADMDIR%%/lang/bosnian-utf-8.inc.%%PHP_SUFX%%
+%%MYADMDIR%%/lang/bosnian-windows-1250.inc.%%PHP_SUFX%%
%%MYADMDIR%%/lang/brazilian_portuguese-iso-8859-1.inc.%%PHP_SUFX%%
%%MYADMDIR%%/lang/brazilian_portuguese-utf-8.inc.%%PHP_SUFX%%
%%MYADMDIR%%/lang/bulgarian-koi8-r.inc.%%PHP_SUFX%%
@@ -110,6 +134,8 @@
%%MYADMDIR%%/lang/malay-utf-8.inc.%%PHP_SUFX%%
%%MYADMDIR%%/lang/norwegian-iso-8859-1.inc.%%PHP_SUFX%%
%%MYADMDIR%%/lang/norwegian-utf-8.inc.%%PHP_SUFX%%
+%%MYADMDIR%%/lang/persian-utf-8.inc.%%PHP_SUFX%%
+%%MYADMDIR%%/lang/persian-windows-1256.inc.%%PHP_SUFX%%
%%MYADMDIR%%/lang/polish-iso-8859-2.inc.%%PHP_SUFX%%
%%MYADMDIR%%/lang/polish-utf-8.inc.%%PHP_SUFX%%
%%MYADMDIR%%/lang/portuguese-iso-8859-1.inc.%%PHP_SUFX%%
@@ -121,8 +147,10 @@
%%MYADMDIR%%/lang/russian-koi8-r.inc.%%PHP_SUFX%%
%%MYADMDIR%%/lang/russian-utf-8.inc.%%PHP_SUFX%%
%%MYADMDIR%%/lang/russian-windows-1251.inc.%%PHP_SUFX%%
-%%MYADMDIR%%/lang/serbian-utf-8.inc.%%PHP_SUFX%%
-%%MYADMDIR%%/lang/serbian-windows-1250.inc.%%PHP_SUFX%%
+%%MYADMDIR%%/lang/serbian_cyrillic-utf-8.inc.%%PHP_SUFX%%
+%%MYADMDIR%%/lang/serbian_cyrillic-windows-1251.inc.%%PHP_SUFX%%
+%%MYADMDIR%%/lang/serbian_latin-utf-8.inc.%%PHP_SUFX%%
+%%MYADMDIR%%/lang/serbian_latin-windows-1250.inc.%%PHP_SUFX%%
%%MYADMDIR%%/lang/slovak-iso-8859-2.inc.%%PHP_SUFX%%
%%MYADMDIR%%/lang/slovak-utf-8.inc.%%PHP_SUFX%%
%%MYADMDIR%%/lang/slovak-windows-1250.inc.%%PHP_SUFX%%
@@ -161,6 +189,7 @@
%%MYADMDIR%%/libraries/defines_php.lib.%%PHP_SUFX%%
%%MYADMDIR%%/libraries/display_export.lib.%%PHP_SUFX%%
%%MYADMDIR%%/libraries/display_tbl.lib.%%PHP_SUFX%%
+%%MYADMDIR%%/libraries/display_tbl_links.lib.%%PHP_SUFX%%
%%MYADMDIR%%/libraries/dom-drag.js
%%MYADMDIR%%/libraries/export/csv.%%PHP_SUFX%%
%%MYADMDIR%%/libraries/export/latex.%%PHP_SUFX%%
@@ -242,6 +271,7 @@
%%MYADMDIR%%/scripts/inno2pma.sh
%%MYADMDIR%%/scripts/remove_control_m.sh
%%MYADMDIR%%/scripts/updatedocs.sh
+%%MYADMDIR%%/server_collations.%%PHP_SUFX%%
%%MYADMDIR%%/server_common.inc.%%PHP_SUFX%%
%%MYADMDIR%%/server_databases.%%PHP_SUFX%%
%%MYADMDIR%%/server_export.%%PHP_SUFX%%
@@ -271,6 +301,7 @@
%%MYADMDIR%%/tbl_rename.%%PHP_SUFX%%
%%MYADMDIR%%/tbl_replace.%%PHP_SUFX%%
%%MYADMDIR%%/tbl_replace_fields.%%PHP_SUFX%%
+%%MYADMDIR%%/tbl_row_delete.%%PHP_SUFX%%
%%MYADMDIR%%/tbl_select.%%PHP_SUFX%%
%%MYADMDIR%%/transformation_wrapper.%%PHP_SUFX%%
%%MYADMDIR%%/translators.html
@@ -285,6 +316,5 @@
@dirrm %%MYADMDIR%%/libraries
@dirrm %%MYADMDIR%%/lang
@dirrm %%MYADMDIR%%/images
- at dirrm %%MYADMDIR%%/docSQL
@dirrm %%MYADMDIR%%/css
@dirrm %%MYADMDIR%%
# This is a shell archive. Save it in a file, remove anything before
# this line, and then unpack it by entering "sh file". Note, it may
# create directories; files and directories will be owned by you and
# have default permissions.
#
# This archive contains:
#
# files
# files/fix-tbl_relation.php3
# files/fix-tbl_relation.php
# files/fix-libraries::display_tbl.lib.php
# files/fix-libraries::display_tbl.lib.php3
#
echo c - files
mkdir -p files > /dev/null 2>&1
echo x - files/fix-tbl_relation.php3
sed 's/^X//' >files/fix-tbl_relation.php3 << 'END-of-files/fix-tbl_relation.php3'
Xretrieving revision 1.38
Xretrieving revision 1.39
Xdiff -u -r1.38 -r1.39
X--- tbl_relation.php.orig 2003/09/09 08:26:43 1.38
X+++ tbl_relation.php 2003/10/21 17:08:20 1.39
X@@ -1,5 +1,5 @@
X <?php
X-/* $Id: tbl_relation.php,v 1.38 2003/09/09 08:26:43 nijel Exp $ */
X+/* $Id: tbl_relation.php,v 1.39 2003/10/21 17:08:20 lem9 Exp $ */
X // vim: expandtab sw=4 ts=4 sts=4:
X
X /**
X@@ -280,6 +280,9 @@
X $selectboxall[$field_full] = $field_v;
X // there could be more than one segment of the primary
X // so do not break
X+
X+ // Please watch here, tbl_type is INNODB but the
X+ // resulting value of SHOW KEYS is InnoDB
X
X if ($tbl_type=='INNODB' && isset($curr_table[1]) && $curr_table[1]=='InnoDB') {
X $selectboxall_innodb[$field_full] = $field_v;
X@@ -295,6 +298,13 @@
X if ($tbl_type=='INNODB' && isset($curr_table[1]) && $curr_table[1]=='InnoDB') {
X $selectboxall_innodb[$field_full] = $field_v;
X }
X+
X+ // for InnoDB, any index is allowed
X+ } else if ($tbl_type=='INNODB' && isset($curr_table[1]) && $curr_table[1]=='InnoDB') {
X+ $field_full = $db . '.' . $curr_field['Table'] . '.' . $curr_field['Column_name'];
X+ $field_v = $curr_field['Table'] . '->' . $curr_field['Column_name'];
X+ $selectboxall_innodb[$field_full] = $field_v;
X+
X } // end if
X } // end while over keys
X } // end if (mysql_num_rows)
END-of-files/fix-tbl_relation.php3
echo x - files/fix-tbl_relation.php
sed 's/^X//' >files/fix-tbl_relation.php << 'END-of-files/fix-tbl_relation.php'
Xretrieving revision 1.38
Xretrieving revision 1.39
Xdiff -u -r1.38 -r1.39
X--- tbl_relation.php.orig 2003/09/09 08:26:43 1.38
X+++ tbl_relation.php 2003/10/21 17:08:20 1.39
X@@ -1,5 +1,5 @@
X <?php
X-/* $Id: tbl_relation.php,v 1.38 2003/09/09 08:26:43 nijel Exp $ */
X+/* $Id: tbl_relation.php,v 1.39 2003/10/21 17:08:20 lem9 Exp $ */
X // vim: expandtab sw=4 ts=4 sts=4:
X
X /**
X@@ -280,6 +280,9 @@
X $selectboxall[$field_full] = $field_v;
X // there could be more than one segment of the primary
X // so do not break
X+
X+ // Please watch here, tbl_type is INNODB but the
X+ // resulting value of SHOW KEYS is InnoDB
X
X if ($tbl_type=='INNODB' && isset($curr_table[1]) && $curr_table[1]=='InnoDB') {
X $selectboxall_innodb[$field_full] = $field_v;
X@@ -295,6 +298,13 @@
X if ($tbl_type=='INNODB' && isset($curr_table[1]) && $curr_table[1]=='InnoDB') {
X $selectboxall_innodb[$field_full] = $field_v;
X }
X+
X+ // for InnoDB, any index is allowed
X+ } else if ($tbl_type=='INNODB' && isset($curr_table[1]) && $curr_table[1]=='InnoDB') {
X+ $field_full = $db . '.' . $curr_field['Table'] . '.' . $curr_field['Column_name'];
X+ $field_v = $curr_field['Table'] . '->' . $curr_field['Column_name'];
X+ $selectboxall_innodb[$field_full] = $field_v;
X+
X } // end if
X } // end while over keys
X } // end if (mysql_num_rows)
END-of-files/fix-tbl_relation.php
echo x - files/fix-libraries::display_tbl.lib.php
sed 's/^X//' >files/fix-libraries::display_tbl.lib.php << 'END-of-files/fix-libraries::display_tbl.lib.php'
X--- libraries/display_tbl.lib.php.orig Sat Oct 18 23:32:07 2003
X+++ libraries/display_tbl.lib.php Mon Nov 3 15:32:22 2003
X@@ -541,7 +541,7 @@
X echo '<input type="hidden" name="dontlimitchars" value="' . $dontlimitchars . '" />' . "\n";
X echo $GLOBALS['strSortByKey'] . ': <select name="sql_query"> ';
X $used_index = false;
X- $local_order = str_replace(' ', ' ', $sql_order);
X+ $local_order = (isset($sql_order) ? str_replace(' ', ' ', $sql_order) : '');
X while (list($key, $val) = each($indexes_data)) {
X $asc_sort = 'ORDER BY ';
X $desc_sort = 'ORDER BY ';
END-of-files/fix-libraries::display_tbl.lib.php
echo x - files/fix-libraries::display_tbl.lib.php3
sed 's/^X//' >files/fix-libraries::display_tbl.lib.php3 << 'END-of-files/fix-libraries::display_tbl.lib.php3'
X--- libraries/display_tbl.lib.php.orig Sat Oct 18 23:32:07 2003
X+++ libraries/display_tbl.lib.php Mon Nov 3 15:32:22 2003
X@@ -541,7 +541,7 @@
X echo '<input type="hidden" name="dontlimitchars" value="' . $dontlimitchars . '" />' . "\n";
X echo $GLOBALS['strSortByKey'] . ': <select name="sql_query"> ';
X $used_index = false;
X- $local_order = str_replace(' ', ' ', $sql_order);
X+ $local_order = (isset($sql_order) ? str_replace(' ', ' ', $sql_order) : '');
X while (list($key, $val) = each($indexes_data)) {
X $asc_sort = 'ORDER BY ';
X $desc_sort = 'ORDER BY ';
END-of-files/fix-libraries::display_tbl.lib.php3
exit
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list