Sun Jun 29 11:11:44 2008 UTC ()
pullup ticket 2437 requested by tron
phpmyadmin: bug fixes many

pkgsrc/databases/phpmyadmin/Makefile	1.71,1.72
pkgsrc/databases/phpmyadmin/distinfo	1.34,1.35

    Module Name:	pkgsrc
    Committed By:	tron
    Date:		Sun Jun  8 14:15:28 UTC 2008

    Modified Files:
    	pkgsrc/databases/phpmyadmin: Makefile distinfo

    Log Message:
    Update "phpmyadmin" package to version 2.11.6. Changes since 2.11.5.2:
    - bug #1903724 [interface] Displaying of very large queries
      in error message
    - bug #1905711 [compatibility] Functions deprecated in PHP 5.3:
      is_a() and get_magic_quotes_gpc()
    - bug [lang] catalan wrong accented characters
    - bug #1893034 [Export] SET NAMES for importing with command-line
      client
    + [lang] Russian update
    - bug #1910485 [core] Unsetting the whitelist during the loop
    - bug #1906980 [Export] Import of VIEWs fails if temp table exists
    - bug #1812763 [Copy] Table copy when server is in ANSI_QUOTES
      sql_mode
    - bug #1918531 [compatibility] Navigation isn't w3.org valid
    - bug #1926357 [data] BIT defaults displayed incorrectly
    - patch #1930057 [auth] colon in password prevents HTTP login
      on CGI/IIS
    - patch #1929553 [lang] Don't output BOM character in Swedish
      language file
    - patch #1895796 [lang] Typo in Japanese lang files
    - bug #1935652 [auth] Access denied (show warning about mcrypt
      on login page)
    - bug #1906983 [export] Reimport of FUNCTION fails
    - bug #1919808 [operations] Renaming a database fails to handle
      functions
    - bug #1934401 [core] Cannot force a language
    - bug #1944077 [core] Config file containing a BOM
    - bug #1947189 [scripts] Missing head tag in scripts/signon.php
    + [lang] Romanian update

    ------------------------------------------------------------------------

    Module Name:	pkgsrc
    Committed By:	tron
    Date:		Sat Jun 28 11:11:15 UTC 2008

    Modified Files:
    	pkgsrc/databases/phpmyadmin: Makefile distinfo

    Log Message:
    Update "phpmyadmin" package to version 2.11.7. Changes since 2.11.6:
    - bug #1908719 [interface] New field cannot be auto-increment and
      primary key
    - [dbi] Incorrect interpretation for some mysqli field flags
    - bug #1910621 [display] part 1: do not display a TEXT utf8_bin
      as BLOB (fixed for mysqli extension only)
    - [interface] sanitize the after_field parameter,
      thanks to Norman Hippert
    - [structure] do not remove the BINARY attribute in drop-down
    - bug #1955386 [session] Overriding session.hash_bits_per_character
    - [interface] sanitize the table comments in table print view,
      thanks to Norman Hippert
    - bug #1939031 Auto_Increment selected for TimeStamp by Default
    - patch #1957998 [display] No tilde for InnoDB row counter when
      we know it for sure, thanks to Vladyslav Bakayev - dandy76
    - bug #1955572 [display] alt text causes duplicated strings
    - bug #1762029 [interface] Cannot upload BLOB into existing row
    - bug #1981043 [export] HTML in exports getting corrupted,
      thanks to Jason Judge - jasonjudge
    - bug #1936761 [interface] BINARY not treated as BLOB:
      update/delete issues
    - protection against XSS when register_globals is on and .htaccess
      has no effect, thanks to Tim Starling
    - bug #1996943 [export] Firefox 3 and .sql.gz (corrupted);
      detect Gecko 1.9, thanks to Juergen Wind


(rtr)
diff -r1.67.2.1 -r1.67.2.2 pkgsrc/databases/phpmyadmin/Makefile
diff -r1.32.2.1 -r1.32.2.2 pkgsrc/databases/phpmyadmin/distinfo
cvs diff -r1.67.2.1 -r1.67.2.2 pkgsrc/databases/phpmyadmin/Makefile (switch to unified diff)

--- pkgsrc/databases/phpmyadmin/Makefile 2008/04/28 10:41:30 1.67.2.1
+++ pkgsrc/databases/phpmyadmin/Makefile 2008/06/29 11:11:44 1.67.2.2
@@ -1,106 +1,106 @@ @@ -1,106 +1,106 @@
1# $NetBSD: Makefile,v 1.67.2.1 2008/04/28 10:41:30 rtr Exp $ 1# $NetBSD: Makefile,v 1.67.2.2 2008/06/29 11:11:44 rtr Exp $
2 2
3DISTNAME= phpMyAdmin-${DIST_VERSION}-all-languages 3DISTNAME= phpMyAdmin-${DIST_VERSION}-all-languages
4PKGNAME= phpmyadmin-${DIST_VERSION:S/-//} 4PKGNAME= phpmyadmin-${DIST_VERSION:S/-//}
5CATEGORIES= databases www 5CATEGORIES= databases www
6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=phpmyadmin/} 6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=phpmyadmin/}
7EXTRACT_SUFX= .tar.bz2 7EXTRACT_SUFX= .tar.bz2
8 8
9MAINTAINER= tron@NetBSD.org 9MAINTAINER= tron@NetBSD.org
10HOMEPAGE= http://www.phpmyadmin.net/ 10HOMEPAGE= http://www.phpmyadmin.net/
11COMMENT= Set of PHP-scripts to adminstrate MySQL over the WWW 11COMMENT= Set of PHP-scripts to adminstrate MySQL over the WWW
12 12
13DEPENDS+= ${PHP_PKG_PREFIX}-mbstring>=4.3.3:../../misc/php-mbstring 13DEPENDS+= ${PHP_PKG_PREFIX}-mbstring>=4.3.3:../../misc/php-mbstring
14DEPENDS+= ${PHP_PKG_PREFIX}-mysql{,i}>=4.3.3:../../databases/php-mysql 14DEPENDS+= ${PHP_PKG_PREFIX}-mysql{,i}>=4.3.3:../../databases/php-mysql
15 15
16PKG_DESTDIR_SUPPORT= user-destdir 16PKG_DESTDIR_SUPPORT= user-destdir
17 17
18FILES_SUBST+= CONF_INC_PHP=${CONF_INC_PHP:Q} PMCONFFILE=${PMCONFFILE:Q} 18FILES_SUBST+= CONF_INC_PHP=${CONF_INC_PHP:Q} PMCONFFILE=${PMCONFFILE:Q}
19PLIST_SUBST+= DIST_VERSION=${DIST_VERSION:Q} 19PLIST_SUBST+= DIST_VERSION=${DIST_VERSION:Q}
20MESSAGE_SUBST+= CONF_INC_PHP=${CONF_INC_PHP} PMCONFFILE=${PMCONFFILE:Q} \ 20MESSAGE_SUBST+= CONF_INC_PHP=${CONF_INC_PHP} PMCONFFILE=${PMCONFFILE:Q} \
21 EXDIR=${EXDIR:Q} 21 EXDIR=${EXDIR:Q}
22USE_TOOLS+= perl:run 22USE_TOOLS+= perl:run
23 23
24CONF_INC_PHP= ${PREFIX}/share/phpmyadmin/config.inc.php 24CONF_INC_PHP= ${PREFIX}/share/phpmyadmin/config.inc.php
25DIST_VERSION= 2.11.5.2 25DIST_VERSION= 2.11.7
26DOC_FILES= CREDITS ChangeLog \ 26DOC_FILES= CREDITS ChangeLog \
27 Documentation.txt INSTALL LICENSE README \ 27 Documentation.txt INSTALL LICENSE README \
28 RELEASE-DATE-${DIST_VERSION} TODO 28 RELEASE-DATE-${DIST_VERSION} TODO
29 29
30APACHE_USER?= www 30APACHE_USER?= www
31APACHE_GROUP?= www 31APACHE_GROUP?= www
32PKG_GROUPS= ${APACHE_GROUP} 32PKG_GROUPS= ${APACHE_GROUP}
33PKG_USERS= ${APACHE_USER}:${APACHE_GROUP} 33PKG_USERS= ${APACHE_USER}:${APACHE_GROUP}
34BUILD_DEFS+= APACHE_USER APACHE_GROUP 34BUILD_DEFS+= APACHE_USER APACHE_GROUP
35 35
36PKG_USERS_VARS+= APACHE_USER 36PKG_USERS_VARS+= APACHE_USER
37PKG_GROUPS_VARS+= APACHE_GROUP 37PKG_GROUPS_VARS+= APACHE_GROUP
38 38
39EXDIR= ${PREFIX}/share/examples/phpmyadmin 39EXDIR= ${PREFIX}/share/examples/phpmyadmin
40PMCONFFILE= ${PKG_SYSCONFDIR}/config.inc.php 40PMCONFFILE= ${PKG_SYSCONFDIR}/config.inc.php
41PMDIR= ${PREFIX}/share/phpmyadmin 41PMDIR= ${PREFIX}/share/phpmyadmin
42REPLACE_PERL+= scripts/convertcfg.pl 42REPLACE_PERL+= scripts/convertcfg.pl
43 43
44PKG_SYSCONFSUBDIR?= phpmyadmin 44PKG_SYSCONFSUBDIR?= phpmyadmin
45 45
46NO_BUILD= yes 46NO_BUILD= yes
47 47
48INSTALL_DIRS= js lang libraries libraries/auth libraries/dbg \ 48INSTALL_DIRS= js lang libraries libraries/auth libraries/dbg \
49 libraries/dbi libraries/engines libraries/export \ 49 libraries/dbi libraries/engines libraries/export \
50 libraries/import libraries/tcpdf libraries/tcpdf/font \ 50 libraries/import libraries/tcpdf libraries/tcpdf/font \
51 libraries/transformations pmd pmd/images pmd/scripts \ 51 libraries/transformations pmd pmd/images pmd/scripts \
52 pmd/styles pmd/styles/default pmd/styles/default/images \ 52 pmd/styles pmd/styles/default pmd/styles/default/images \
53 themes themes/darkblue_orange \ 53 themes themes/darkblue_orange \
54 themes/darkblue_orange/css themes/darkblue_orange/img \ 54 themes/darkblue_orange/css themes/darkblue_orange/img \
55 themes/original themes/original/css themes/original/img 55 themes/original themes/original/css themes/original/img
56 56
57do-configure: 57do-configure:
58 ${SED} -e "s|@PMDIR@|${PMDIR}|g" ${FILESDIR}/phpmyadmin.conf \ 58 ${SED} -e "s|@PMDIR@|${PMDIR}|g" ${FILESDIR}/phpmyadmin.conf \
59 >${WRKDIR}/phpmyadmin.conf 59 >${WRKDIR}/phpmyadmin.conf
60 60
61do-install: 61do-install:
62 ${FIND} ${WRKSRC} -name "*.orig" -print | ${XARGS} ${RM} 62 ${FIND} ${WRKSRC} -name "*.orig" -print | ${XARGS} ${RM}
63 ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/phpmyadmin 63 ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/phpmyadmin
64 ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/examples/phpmyadmin 64 ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/examples/phpmyadmin
65 ${INSTALL_DATA_DIR} ${DESTDIR}${PMDIR} 65 ${INSTALL_DATA_DIR} ${DESTDIR}${PMDIR}
66 for dir in ${INSTALL_DIRS}; do \ 66 for dir in ${INSTALL_DIRS}; do \
67 ${INSTALL_DATA_DIR} ${DESTDIR}${PMDIR}/$$dir; \ 67 ${INSTALL_DATA_DIR} ${DESTDIR}${PMDIR}/$$dir; \
68 done 68 done
69 ${INSTALL_DATA_DIR} ${DESTDIR}${PMDIR}/scripts 69 ${INSTALL_DATA_DIR} ${DESTDIR}${PMDIR}/scripts
70 70
71 ${INSTALL_DATA} ${WRKSRC}/*.php ${DESTDIR}${PMDIR} 71 ${INSTALL_DATA} ${WRKSRC}/*.php ${DESTDIR}${PMDIR}
72 ${INSTALL_DATA} ${WRKSRC}/*.css ${DESTDIR}${PMDIR} 72 ${INSTALL_DATA} ${WRKSRC}/*.css ${DESTDIR}${PMDIR}
73 ${MV} ${DESTDIR}${PREFIX}/share/phpmyadmin/config.sample.inc.php \ 73 ${MV} ${DESTDIR}${PREFIX}/share/phpmyadmin/config.sample.inc.php \
74 ${DESTDIR}${EXDIR}/config.inc.php 74 ${DESTDIR}${EXDIR}/config.inc.php
75 75
76 ${INSTALL_DATA} ${WRKSRC}/Documentation.html ${DESTDIR}${PMDIR} 76 ${INSTALL_DATA} ${WRKSRC}/Documentation.html ${DESTDIR}${PMDIR}
77 ${INSTALL_DATA} ${WRKSRC}/translators.html ${DESTDIR}${PMDIR} 77 ${INSTALL_DATA} ${WRKSRC}/translators.html ${DESTDIR}${PMDIR}
78 ${INSTALL_DATA} ${WRKSRC}/ChangeLog ${DESTDIR}${PMDIR} 78 ${INSTALL_DATA} ${WRKSRC}/ChangeLog ${DESTDIR}${PMDIR}
79 79
80 for dir in ${INSTALL_DIRS}; do \ 80 for dir in ${INSTALL_DIRS}; do \
81 for file in ${WRKSRC}/$$dir/*; do \ 81 for file in ${WRKSRC}/$$dir/*; do \
82 case "$$file" in \ 82 case "$$file" in \
83 *.sh) \ 83 *.sh) \
84 ;; \ 84 ;; \
85 *) \ 85 *) \
86 if [ -f "$$file" ]; then \ 86 if [ -f "$$file" ]; then \
87 ${INSTALL_DATA} "$$file" \ 87 ${INSTALL_DATA} "$$file" \
88 ${DESTDIR}${PMDIR}/$$dir; \ 88 ${DESTDIR}${PMDIR}/$$dir; \
89 fi \ 89 fi \
90 ;; \ 90 ;; \
91 esac; \ 91 esac; \
92 done \ 92 done \
93 done 93 done
94 94
95 ${INSTALL_DATA} ${WRKSRC}/scripts/*.sql ${DESTDIR}${PMDIR}/scripts 95 ${INSTALL_DATA} ${WRKSRC}/scripts/*.sql ${DESTDIR}${PMDIR}/scripts
96 ${INSTALL_SCRIPT} ${WRKSRC}/scripts/convertcfg.pl \ 96 ${INSTALL_SCRIPT} ${WRKSRC}/scripts/convertcfg.pl \
97 ${DESTDIR}${PMDIR}/scripts 97 ${DESTDIR}${PMDIR}/scripts
98 98
99 cd ${WRKSRC} && \ 99 cd ${WRKSRC} && \
100 ${INSTALL_DATA} ${DOC_FILES} ${DESTDIR}${PREFIX}/share/doc/phpmyadmin 100 ${INSTALL_DATA} ${DOC_FILES} ${DESTDIR}${PREFIX}/share/doc/phpmyadmin
101 ${INSTALL_DATA} ${WRKDIR}/phpmyadmin.conf ${DESTDIR}${EXDIR}/apache.conf 101 ${INSTALL_DATA} ${WRKDIR}/phpmyadmin.conf ${DESTDIR}${EXDIR}/apache.conf
102 102
103 ${RM} -f ${DESTDIR}${PREFIX}/share/phpmyadmin/libraries/footer.inc.php.orig 103 ${RM} -f ${DESTDIR}${PREFIX}/share/phpmyadmin/libraries/footer.inc.php.orig
104 104
105.include "../../lang/php/phpversion.mk" 105.include "../../lang/php/phpversion.mk"
106.include "../../mk/bsd.pkg.mk" 106.include "../../mk/bsd.pkg.mk"
cvs diff -r1.32.2.1 -r1.32.2.2 pkgsrc/databases/phpmyadmin/distinfo (switch to unified diff)

--- pkgsrc/databases/phpmyadmin/distinfo 2008/04/28 10:41:30 1.32.2.1
+++ pkgsrc/databases/phpmyadmin/distinfo 2008/06/29 11:11:44 1.32.2.2
@@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
1$NetBSD: distinfo,v 1.32.2.1 2008/04/28 10:41:30 rtr Exp $ 1$NetBSD: distinfo,v 1.32.2.2 2008/06/29 11:11:44 rtr Exp $
2 2
3SHA1 (phpMyAdmin-2.11.5.2-all-languages.tar.bz2) = 13eae6eb086da00ff64720f473fe2ed9fcfd874b 3SHA1 (phpMyAdmin-2.11.7-all-languages.tar.bz2) = 4663b6cd45471ba8547e35e47b10fc8fd1622052
4RMD160 (phpMyAdmin-2.11.5.2-all-languages.tar.bz2) = 5b034c1c75da11cb05f4e9a5e9109f8383787cd7 4RMD160 (phpMyAdmin-2.11.7-all-languages.tar.bz2) = 117ce8dd3a6f932e80a2355a221623d68e38eb36
5Size (phpMyAdmin-2.11.5.2-all-languages.tar.bz2) = 3093323 bytes 5Size (phpMyAdmin-2.11.7-all-languages.tar.bz2) = 3098110 bytes