From cbfc1d53e74bf5a9f4b4e29f65d3aeaa7211e179 Mon Sep 17 00:00:00 2001 From: roy Date: Tue, 13 Jan 2009 14:40:40 +0000 Subject: Update to 4.2.2 Fixes PR pkg/38536 and CVE-2008-5587 Remove all pkglint warnings ok: joerg --- databases/phppgadmin/DESCR | 1 - databases/phppgadmin/Makefile | 13 ++++++----- databases/phppgadmin/PLIST | 34 +++++++++++++++++++---------- databases/phppgadmin/distinfo | 8 +++---- databases/phppgadmin/files/apache.conf-dist | 2 +- 5 files changed, 35 insertions(+), 23 deletions(-) (limited to 'databases') diff --git a/databases/phppgadmin/DESCR b/databases/phppgadmin/DESCR index ad80d70100d..8d309a044b2 100644 --- a/databases/phppgadmin/DESCR +++ b/databases/phppgadmin/DESCR @@ -22,4 +22,3 @@ Features include: - Excellent language support: * Available in 18 languages * No encoding conflicts. Edit Russian data using a Japanese interface! -- Easy to install and configure diff --git a/databases/phppgadmin/Makefile b/databases/phppgadmin/Makefile index c8bd71ba6ce..72e180081cf 100644 --- a/databases/phppgadmin/Makefile +++ b/databases/phppgadmin/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.22 2008/01/30 10:07:34 tnn Exp $ +# $NetBSD: Makefile,v 1.23 2009/01/13 14:40:40 roy Exp $ -DISTNAME= phpPgAdmin-4.1.3 +DISTNAME= phpPgAdmin-4.2.2 PKGNAME= ${DISTNAME:S/PgAdmin/pgadmin/} CATEGORIES= databases www MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=phppgadmin/} @@ -29,15 +29,14 @@ DOCDIR= ${PREFIX}/share/doc/phppgadmin CONF_FILES= ${EGDIR}/config.inc.php-dist ${PHPPGBASE}/conf/config.inc.php DOC_FILES= CREDITS DEVELOPERS FAQ HISTORY INSTALL LICENSE TODO \ TRANSLATORS -REQD_DIRS+= ${PHPPGBASE} ${PHPPGBASE}/conf do-configure: - @${SED} -e "s#/usr/bin/pg#${PREFIX}/bin/pg#" \ + ${SED} -e "s#/usr/bin/pg#${PREFIX}/bin/pg#" \ ${WRKSRC}/conf/config.inc.php-dist > \ ${WRKSRC}/conf/config.inc.php-dist.tmp - @${MV} ${WRKSRC}/conf/config.inc.php-dist.tmp \ + ${MV} ${WRKSRC}/conf/config.inc.php-dist.tmp \ ${WRKSRC}/conf/config.inc.php-dist - @${SED} -e "s#@PHPPGBASE@#${PHPPGBASE}#g" ${FILESDIR}/apache.conf-dist \ + ${SED} -e "s#@PHPPGBASE@#${PHPPGBASE}#g" ${FILESDIR}/apache.conf-dist \ > ${WRKDIR}/apache.conf do-install: @@ -67,6 +66,8 @@ do-install: ${DESTDIR}${PHPPGBASE}/libraries/adodb/drivers ${INSTALL_DATA} ${WRKSRC}/themes/default/global.css \ ${DESTDIR}${PHPPGBASE}/themes/default + ${INSTALL_DATA} ${WRKSRC}/xloadtree/*.* \ + ${DESTDIR}${PHPPGBASE}/xloadtree ${INSTALL_DATA} ${WRKSRC}/conf/config.inc.php-dist ${DESTDIR}${EGDIR} ${INSTALL_DATA} ${WRKDIR}/apache.conf ${DESTDIR}${EGDIR} diff --git a/databases/phppgadmin/PLIST b/databases/phppgadmin/PLIST index 387c9d63e1b..152b2efa86c 100644 --- a/databases/phppgadmin/PLIST +++ b/databases/phppgadmin/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.10 2008/01/30 10:07:34 tnn Exp $ +@comment $NetBSD: PLIST,v 1.11 2009/01/13 14:40:40 roy Exp $ share/doc/phppgadmin/CREDITS share/doc/phppgadmin/DEVELOPERS share/doc/phppgadmin/FAQ @@ -30,6 +30,7 @@ share/phppgadmin/classes/database/Postgres74.php share/phppgadmin/classes/database/Postgres80.php share/phppgadmin/classes/database/Postgres81.php share/phppgadmin/classes/database/Postgres82.php +share/phppgadmin/classes/database/Postgres83.php share/phppgadmin/colproperties.php share/phppgadmin/constraints.php share/phppgadmin/conversions.php @@ -39,6 +40,7 @@ share/phppgadmin/dataimport.php share/phppgadmin/dbexport.php share/phppgadmin/display.php share/phppgadmin/domains.php +share/phppgadmin/fulltext.php share/phppgadmin/functions.js share/phppgadmin/functions.php share/phppgadmin/groups.php @@ -51,6 +53,8 @@ share/phppgadmin/help/PostgresDoc74.php share/phppgadmin/help/PostgresDoc80.php share/phppgadmin/help/PostgresDoc81.php share/phppgadmin/help/PostgresDoc82.php +share/phppgadmin/help/PostgresDoc83.php +share/phppgadmin/history.php share/phppgadmin/images/themes/default/AddArguments.png share/phppgadmin/images/themes/default/Admin.png share/phppgadmin/images/themes/default/Aggregate.png @@ -88,10 +92,16 @@ share/phppgadmin/images/themes/default/Explain.png share/phppgadmin/images/themes/default/Export.png share/phppgadmin/images/themes/default/Filter.png share/phppgadmin/images/themes/default/ForeignKey.png +share/phppgadmin/images/themes/default/Fts.png +share/phppgadmin/images/themes/default/FtsCfg.png +share/phppgadmin/images/themes/default/FtsDict.png +share/phppgadmin/images/themes/default/FtsParser.png share/phppgadmin/images/themes/default/Function.png share/phppgadmin/images/themes/default/Functions.png share/phppgadmin/images/themes/default/GurusHint.png share/phppgadmin/images/themes/default/Help.png +share/phppgadmin/images/themes/default/Histories.png +share/phppgadmin/images/themes/default/History.png share/phppgadmin/images/themes/default/I.png share/phppgadmin/images/themes/default/Import.png share/phppgadmin/images/themes/default/Index.png @@ -126,11 +136,14 @@ share/phppgadmin/images/themes/default/Privileges.png share/phppgadmin/images/themes/default/Processes.png share/phppgadmin/images/themes/default/Property.png share/phppgadmin/images/themes/default/RaiseArgument.png +share/phppgadmin/images/themes/default/Record.png +share/phppgadmin/images/themes/default/Records.png share/phppgadmin/images/themes/default/Redo.png share/phppgadmin/images/themes/default/Refresh.png share/phppgadmin/images/themes/default/RemoveArgument.png share/phppgadmin/images/themes/default/Replication.png share/phppgadmin/images/themes/default/ReplicationSets.png +share/phppgadmin/images/themes/default/Report.png share/phppgadmin/images/themes/default/Reports.png share/phppgadmin/images/themes/default/Restore.png share/phppgadmin/images/themes/default/Roles.png @@ -186,6 +199,8 @@ share/phppgadmin/lang/arabic.php share/phppgadmin/lang/catalan.php share/phppgadmin/lang/chinese-sim.php share/phppgadmin/lang/chinese-tr.php +share/phppgadmin/lang/chinese-utf8-zh_CN.php +share/phppgadmin/lang/chinese-utf8-zh_TW.php share/phppgadmin/lang/convert.awk share/phppgadmin/lang/czech.php share/phppgadmin/lang/danish.php @@ -206,6 +221,8 @@ share/phppgadmin/lang/recoded/arabic.php share/phppgadmin/lang/recoded/catalan.php share/phppgadmin/lang/recoded/chinese-sim.php share/phppgadmin/lang/recoded/chinese-tr.php +share/phppgadmin/lang/recoded/chinese-utf8-zh_CN.php +share/phppgadmin/lang/recoded/chinese-utf8-zh_TW.php share/phppgadmin/lang/recoded/czech.php share/phppgadmin/lang/recoded/danish.php share/phppgadmin/lang/recoded/dutch.php @@ -239,25 +256,17 @@ share/phppgadmin/languages.php share/phppgadmin/libraries/adodb/adodb-csvlib.inc.php share/phppgadmin/libraries/adodb/adodb-datadict.inc.php share/phppgadmin/libraries/adodb/adodb-error.inc.php -share/phppgadmin/libraries/adodb/adodb-errorhandler.inc.php -share/phppgadmin/libraries/adodb/adodb-errorpear.inc.php -share/phppgadmin/libraries/adodb/adodb-exceptions.inc.php share/phppgadmin/libraries/adodb/adodb-iterator.inc.php share/phppgadmin/libraries/adodb/adodb-lib.inc.php -share/phppgadmin/libraries/adodb/adodb-pear.inc.php share/phppgadmin/libraries/adodb/adodb-php4.inc.php share/phppgadmin/libraries/adodb/adodb-time.inc.php -share/phppgadmin/libraries/adodb/adodb-xmlschema.inc.php share/phppgadmin/libraries/adodb/adodb.inc.php share/phppgadmin/libraries/adodb/drivers/adodb-postgres.inc.php share/phppgadmin/libraries/adodb/drivers/adodb-postgres64.inc.php share/phppgadmin/libraries/adodb/drivers/adodb-postgres7.inc.php share/phppgadmin/libraries/adodb/drivers/adodb-postgres8.inc.php share/phppgadmin/libraries/adodb/license.txt -share/phppgadmin/libraries/adodb/pivottable.inc.php share/phppgadmin/libraries/adodb/readme.txt -share/phppgadmin/libraries/adodb/rsfilter.inc.php -share/phppgadmin/libraries/adodb/server.php share/phppgadmin/libraries/adodb/toexport.inc.php share/phppgadmin/libraries/adodb/tohtml.inc.php share/phppgadmin/libraries/decorator.inc.php @@ -267,6 +276,7 @@ share/phppgadmin/libraries/lib.inc.php share/phppgadmin/links.js share/phppgadmin/login.php share/phppgadmin/logout.php +share/phppgadmin/multiactionform.js share/phppgadmin/opclasses.php share/phppgadmin/operators.php share/phppgadmin/plugin_slony.php @@ -292,7 +302,8 @@ share/phppgadmin/types.php share/phppgadmin/users.php share/phppgadmin/viewproperties.php share/phppgadmin/views.php -@exec ${MKDIR} %D/share/phppgadmin/xloadtree +share/phppgadmin/xloadtree/xloadtree2.js +share/phppgadmin/xloadtree/xtree2.js @dirrm share/phppgadmin/xloadtree @dirrm share/phppgadmin/themes/default @dirrm share/phppgadmin/themes @@ -308,12 +319,13 @@ share/phppgadmin/views.php @dirrm share/phppgadmin/images/themes @dirrm share/phppgadmin/images @dirrm share/phppgadmin/help -@exec ${MKDIR} %D/share/phppgadmin/conf @dirrm share/phppgadmin/conf @exec ${MKDIR} %D/share/phppgadmin/classes/plugins @dirrm share/phppgadmin/classes/plugins @dirrm share/phppgadmin/classes/database @dirrm share/phppgadmin/classes +@exec ${MKDIR} %D/share/phppgadmin/conf +@dirrm share/phppgadmin/conf @dirrm share/phppgadmin @dirrm share/examples/phppgadmin @dirrm share/doc/phppgadmin diff --git a/databases/phppgadmin/distinfo b/databases/phppgadmin/distinfo index b7e50324661..6e6d6190be6 100644 --- a/databases/phppgadmin/distinfo +++ b/databases/phppgadmin/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.9 2008/01/30 10:07:34 tnn Exp $ +$NetBSD: distinfo,v 1.10 2009/01/13 14:40:40 roy Exp $ -SHA1 (phpPgAdmin-4.1.3.tar.bz2) = b8d8f85f05e75ce4196a2b2954a4d742025f72b8 -RMD160 (phpPgAdmin-4.1.3.tar.bz2) = 3f1593555aa0162cff150be64e528ed4319dfeab -Size (phpPgAdmin-4.1.3.tar.bz2) = 618396 bytes +SHA1 (phpPgAdmin-4.2.2.tar.bz2) = 3a0b6fbed26d7faeb7a6a33525d021de941944cc +RMD160 (phpPgAdmin-4.2.2.tar.bz2) = a41ce2278d09a2d791630b24db90edd0d3cc71d3 +Size (phpPgAdmin-4.2.2.tar.bz2) = 664619 bytes diff --git a/databases/phppgadmin/files/apache.conf-dist b/databases/phppgadmin/files/apache.conf-dist index 311e8a00252..1b0352c7f16 100644 --- a/databases/phppgadmin/files/apache.conf-dist +++ b/databases/phppgadmin/files/apache.conf-dist @@ -1,5 +1,5 @@ - Alias /phppgadmin/ "@PHPPGBASE@/" + Alias /phppgadmin "@PHPPGBASE@" -- cgit v1.2.3