diff options
author | adrianp <adrianp@pkgsrc.org> | 2004-12-14 20:38:46 +0000 |
---|---|---|
committer | adrianp <adrianp@pkgsrc.org> | 2004-12-14 20:38:46 +0000 |
commit | 35a375c8f677f02de0d29d5865187165c7a6cdbb (patch) | |
tree | 089b13a64872b2627120ea72e946dba2c2eef2cd | |
parent | 37867029438ccaebe41fa8b5d0ccabc91468f46e (diff) | |
download | pkgsrc-35a375c8f677f02de0d29d5865187165c7a6cdbb.tar.gz |
- Update phpmyadmin to 2.6.1-rc1
- Fix permissions on config file as it could contain sensitive data
- Fix missing ChangeLog link
- Lots of bugfixes and updates, see ChangeLog for all the details
- Inclues security update for PMASA-2004-4
-rw-r--r-- | databases/phpmyadmin/Makefile | 9 | ||||
-rw-r--r-- | databases/phpmyadmin/PLIST | 12 | ||||
-rw-r--r-- | databases/phpmyadmin/distinfo | 6 |
3 files changed, 16 insertions, 11 deletions
diff --git a/databases/phpmyadmin/Makefile b/databases/phpmyadmin/Makefile index 56267195792..29ec184ed77 100644 --- a/databases/phpmyadmin/Makefile +++ b/databases/phpmyadmin/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.21 2004/12/14 00:07:17 tron Exp $ +# $NetBSD: Makefile,v 1.22 2004/12/14 20:38:46 adrianp Exp $ DISTNAME= phpMyAdmin-${DIST_VERSION} PKGNAME= phpmyadmin-${DIST_VERSION:S/-//} -PKGREVISION= 1 CATEGORIES= databases www MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=phpmyadmin/} EXTRACT_SUFX= .tar.bz2 @@ -19,16 +18,19 @@ MESSAGE_SUBST+= PKG_SYSCONFDIR=${PKG_SYSCONFDIR} PMCONFFILE=${PMCONFFILE} \ PMDIR=${PMDIR} EXDIR=${EXDIR} CONF_INC_PHP= ${PREFIX}/share/phpmyadmin/config.inc.php -DIST_VERSION= 2.6.0-pl2 +DIST_VERSION= 2.6.1-rc1 DOC_FILES= CREDITS ChangeLog \ Documentation.txt INSTALL LICENSE README \ RELEASE-DATE-${DIST_VERSION} TODO +APACHE_USER?= www EXDIR= ${PREFIX}/share/examples/phpmyadmin PMCONFFILE= ${PKG_SYSCONFDIR}/config.inc.php PMDIR= ${PREFIX}/share/phpmyadmin NO_BUILDLINK= YES CONF_FILES= ${EXDIR}/config.inc.php ${PKG_SYSCONFDIR}/config.inc.php +SPECIAL_PERMS= ${PKG_SYSCONFDIR}/config.inc.php ${APACHE_USER} wheel 0600 +BUILD_DEFS+= APACHE_USER USE_PKGINSTALL= YES PKG_SYSCONFSUBDIR?= phpmyadmin @@ -69,6 +71,7 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/Documentation.html ${PMDIR} ${INSTALL_DATA} ${WRKSRC}/translators.html ${PMDIR} + ${INSTALL_DATA} ${WRKSRC}/ChangeLog ${PMDIR} for dir in ${INSTALL_DIRS}; do \ for file in "${WRKSRC}/$$dir"/*; do \ diff --git a/databases/phpmyadmin/PLIST b/databases/phpmyadmin/PLIST index f2f925ebb7c..f9336c27b60 100644 --- a/databases/phpmyadmin/PLIST +++ b/databases/phpmyadmin/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.7 2004/11/06 13:28:32 jdolecek Exp $ +@comment $NetBSD: PLIST,v 1.8 2004/12/14 20:38:47 adrianp Exp $ share/doc/phpmyadmin/CREDITS share/doc/phpmyadmin/ChangeLog share/doc/phpmyadmin/Documentation.txt @@ -9,6 +9,7 @@ share/doc/phpmyadmin/TODO share/doc/phpmyadmin/RELEASE-DATE-${DIST_VERSION} share/examples/phpmyadmin/config.inc.php share/examples/phpmyadmin/apache.conf +share/phpmyadmin/ChangeLog share/phpmyadmin/Documentation.html share/phpmyadmin/browse_foreigners.php share/phpmyadmin/calendar.php @@ -30,6 +31,7 @@ share/phpmyadmin/db_details_importdocsql.php share/phpmyadmin/db_details_links.php share/phpmyadmin/db_details_qbe.php share/phpmyadmin/db_details_structure.php +share/phpmyadmin/db_operations.php share/phpmyadmin/db_printview.php share/phpmyadmin/db_search.php share/phpmyadmin/export.php @@ -191,6 +193,7 @@ share/phpmyadmin/libraries/indexes.js share/phpmyadmin/libraries/ip_allow_deny.lib.php share/phpmyadmin/libraries/kanji-encoding.lib.php share/phpmyadmin/libraries/left.js +share/phpmyadmin/libraries/mcrypt.lib.php share/phpmyadmin/libraries/mysql_charsets.lib.php share/phpmyadmin/libraries/ob.lib.php share/phpmyadmin/libraries/read_dump.lib.php @@ -206,6 +209,8 @@ share/phpmyadmin/libraries/sqlvalidator.class.php share/phpmyadmin/libraries/sqlvalidator.lib.php share/phpmyadmin/libraries/string.lib.php share/phpmyadmin/libraries/tbl_change.js +share/phpmyadmin/libraries/tbl_indexes.lib.php +share/phpmyadmin/libraries/tbl_move_copy.php share/phpmyadmin/libraries/transformations.lib.php share/phpmyadmin/libraries/transformations/README share/phpmyadmin/libraries/transformations/TEMPLATE @@ -237,6 +242,7 @@ share/phpmyadmin/scripts/convertcfg.pl share/phpmyadmin/scripts/create_tables.sql share/phpmyadmin/scripts/create_tables_mysql_4_1_2+.sql share/phpmyadmin/scripts/upgrade_tables_mysql_4_1_2+.sql +share/phpmyadmin/server_binlog.php share/phpmyadmin/server_collations.php share/phpmyadmin/server_common.inc.php share/phpmyadmin/server_databases.php @@ -273,9 +279,7 @@ share/phpmyadmin/themes.php share/phpmyadmin/themes/darkblue_orange/css/theme_left.css.php share/phpmyadmin/themes/darkblue_orange/css/theme_print.css.php share/phpmyadmin/themes/darkblue_orange/css/theme_right.css.php -share/phpmyadmin/themes/darkblue_orange/img/arrow_ltr.gif share/phpmyadmin/themes/darkblue_orange/img/arrow_ltr.png -share/phpmyadmin/themes/darkblue_orange/img/arrow_rtl.gif share/phpmyadmin/themes/darkblue_orange/img/arrow_rtl.png share/phpmyadmin/themes/darkblue_orange/img/asc_order.png share/phpmyadmin/themes/darkblue_orange/img/b_bookmark.png @@ -396,9 +400,7 @@ share/phpmyadmin/themes/darkblue_orange/screen.png share/phpmyadmin/themes/original/css/theme_left.css.php share/phpmyadmin/themes/original/css/theme_print.css.php share/phpmyadmin/themes/original/css/theme_right.css.php -share/phpmyadmin/themes/original/img/arrow_ltr.gif share/phpmyadmin/themes/original/img/arrow_ltr.png -share/phpmyadmin/themes/original/img/arrow_rtl.gif share/phpmyadmin/themes/original/img/arrow_rtl.png share/phpmyadmin/themes/original/img/asc_order.png share/phpmyadmin/themes/original/img/b_bookmark.png diff --git a/databases/phpmyadmin/distinfo b/databases/phpmyadmin/distinfo index 357200c57c5..fd62039cf61 100644 --- a/databases/phpmyadmin/distinfo +++ b/databases/phpmyadmin/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.7 2004/11/06 13:28:32 jdolecek Exp $ +$NetBSD: distinfo,v 1.8 2004/12/14 20:38:47 adrianp Exp $ -SHA1 (phpMyAdmin-2.6.0-pl2.tar.bz2) = 0d3028d7c6cff2a16e9b28bd087ffc2413471434 -Size (phpMyAdmin-2.6.0-pl2.tar.bz2) = 1278267 bytes +SHA1 (phpMyAdmin-2.6.1-rc1.tar.bz2) = 944ce58619c3e23f30da5fffd15925ef00ade2c0 +Size (phpMyAdmin-2.6.1-rc1.tar.bz2) = 1311277 bytes |