From eaf298ace3d77413f7732d7d543b664f73fecdf9 Mon Sep 17 00:00:00 2001 From: schmonz Date: Sat, 25 Jul 2009 19:33:45 +0000 Subject: Update to 2.2.1. From the changelog: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Fixed downloading tar-gz-archives when using gz-extension * Improved output when svn-command could not be executed correctly * Added config option to use full alphabetic order (independent of folder or file type) * Fixed multiple links and minor issues * Fixed issues: 212, 213, 214, 215, 216, 217, 219, 222, 223, 224, 225, 227, 228, 229, 230, 231, 232, 234, 237, 238 2.2.0: * Fixed revision handling to use PEG revision instead of OPERATIVE revision * This fixes many (but not all) cases when working with moved/renamed/deleted files * Removed dependencies to external command * Added PEAR Archive_Tar * Added PEAR Text_Diff * Added usage of gz extension if available * Added usage of PHP touch function * Improved scalability of parent path handling * Added support for upcoming PHP 5.3 * Added separate customizable extension mapping for GeSHi * Added possiblity to ignore whitespace on compare and diff * Added support for aliases in access file and handle continuation lines correctly * Added config option to set custom config path * Added config option to exclude specific paths from the set of repositories added by parentPath * Added config option to add a subpath of a repository to the list of repositories * Added config option to switch between showing age and date in log and listing view (the other is displayed in the title attribute) * Added auto detection of Windows * Added message when config file does not exist * Added new logo and favicon * Fixed some broken links when navigating through a repository * Fixed created archive to be identical (for the same revision) across multiple request * This works under Linux with any PHP version and under Windows with PHP 5.3 * Fixed parsing of access file to support usernames containing equal characters * Updated translations * Dutch * French * Italian 2.1.0: * Fixed: Several security fixed * Added: Added GeSHi for code highlighting. * Added: New languages. * Changed: Separated modified files and directory listing. * Changed: Updated used libraries. FIX: XSS vulnarabilities (Issue 179) FIX: Hide modified files in revision view based on authentication. FIX: Numerous other security problems. NEW: Added translations: hungarian, indonesian, slovak, uzbek. CHANGED: Some code cleanup. 2.0: * Changed: many cleanups and optimisations. * Added: more documentation for *.php files. * Removed: extraneous bits. * Changed: line endings now use UNIX-style across the board. NEW: New default template theme offered by Erik Pöhler NEW: Template files may now be specified on a per repository basis NEW: Add RSS 'alternate' elements to the HTML headers in directory listings. This lets you, for example, easily create a 'live bookmark' in Firefox to monitor commits to a particular SVN path. NEW: Russian translation. CHANGE: Bugtraq handling has been updated to account for the latest spec. FIX: Syntax highlighting across lines has been fixed (Issue 85) 1.62: NEW: RSS feed can now list changed files NEW: Templates can now show an open folder icon NEW: Polish translation NEW: Dutch translation CHANGE: Window is scrolled to appropriate location when opening a new directory FIX: Allow repository names containing '/' FIX: Fixed sloppy HTML in diff templates FIX: Fix problems with the diff output FIX: Repositories on Windows network shares can now be accessed. FIX: Accented characters weren't shown correctly in the directory comparison view. FIX: Remove error when only one revision was available pkgsrc changes: * Use a more typical PKG_SYSCONFDIR. * Don't depend on Apache PHP module; this runs anywhere PHP does. --- www/websvn/Makefile | 34 +++-- www/websvn/PLIST | 316 ++++++++++++++++++++++++++++++++++++-------- www/websvn/distinfo | 15 +-- www/websvn/patches/patch-aa | 16 --- www/websvn/patches/patch-ab | 35 ----- www/websvn/patches/patch-ac | 16 --- www/websvn/patches/patch-ad | 16 --- www/websvn/patches/patch-ae | 13 -- www/websvn/patches/patch-af | 26 ---- www/websvn/patches/patch-ag | 18 +++ 10 files changed, 302 insertions(+), 203 deletions(-) delete mode 100644 www/websvn/patches/patch-aa delete mode 100644 www/websvn/patches/patch-ab delete mode 100644 www/websvn/patches/patch-ac delete mode 100644 www/websvn/patches/patch-ad delete mode 100644 www/websvn/patches/patch-ae delete mode 100644 www/websvn/patches/patch-af create mode 100644 www/websvn/patches/patch-ag (limited to 'www') diff --git a/www/websvn/Makefile b/www/websvn/Makefile index c247f672a47..bf6ef3a0e58 100644 --- a/www/websvn/Makefile +++ b/www/websvn/Makefile @@ -1,11 +1,9 @@ -# $NetBSD: Makefile,v 1.18 2008/07/13 11:15:27 tonnerre Exp $ +# $NetBSD: Makefile,v 1.19 2009/07/25 19:33:45 schmonz Exp $ # -DISTNAME= WebSVN_161 -PKGNAME= websvn-1.61 -PKGREVISION= 8 +DISTNAME= websvn-2.2.1 CATEGORIES= www -MASTER_SITES= http://websvn.tigris.org/files/documents/1380/14334/ +MASTER_SITES= http://websvn.tigris.org/files/documents/1380/45918/ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://websvn.tigris.org/ @@ -13,16 +11,12 @@ COMMENT= Subversion repository web frontend PKG_DESTDIR_SUPPORT= user-destdir -DEPENDS+= ${APACHE_PKG_PREFIX}-${PHP_PKG_PREFIX}>=4.0.0:../../www/ap-php +DEPENDS+= ${PHP_PKG_PREFIX}-iconv-[0-9]*:../../converters/php-iconv DEPENDS+= ${PHP_PKG_PREFIX}-zlib-[0-9]*:../../archivers/php-zlib -WRKSRC= ${WRKDIR}/WebSVN NO_BUILD= yes - USE_TOOLS+= pax -PKG_SYSCONFDIR.websvn= ${PREFIX}/${HTTPD_ROOT}/websvn/include - MESSAGE_SUBST+= PKGBASE=${PKGBASE} MESSAGE_SUBST+= HTTPD_ROOT=${HTTPD_ROOT} PLIST_SUBST+= HTTPD_ROOT=${HTTPD_ROOT:Q} @@ -32,20 +26,22 @@ HTTPD_ROOT?= share/httpd/htdocs BUILD_DEFS+= HTTPD_ROOT EGDIR= ${PREFIX}/share/examples/websvn -REQD_DIRS= ${PREFIX}/${HTTPD_ROOT}/websvn/include -CONF_FILES= ${EGDIR}/distconfig.inc ${PKG_SYSCONFDIR}/config.inc +CONF_FILES= ${EGDIR}/distconfig.php ${PKG_SYSCONFDIR}/websvn.conf -INSTALLATION_DIRS= ${HTTPD_ROOT}/websvn share/examples/websvn +SUBST_CLASSES+= conf +SUBST_STAGE.conf= do-configure +SUBST_MESSAGE.conf= Fixing paths to configuration files. +SUBST_FILES.conf= include/setup.php +SUBST_SED.conf= -e "s|@EGDIR@|${EGDIR}|g" +SUBST_SED.conf+= -e "s|@PKG_SYSCONFDIR@|${PKG_SYSCONFDIR}|g" -post-extract: - chmod -R go-w ${WRKSRC} +INSTALLATION_DIRS= ${HTTPD_ROOT}/websvn share/examples/websvn do-install: - ${INSTALL_DATA} ${WRKSRC}/include/distconfig.inc ${DESTDIR}${EGDIR} - cd ${WRKSRC} && rm -f *.orig + ${INSTALL_DATA} ${WRKSRC}/include/distconfig.php ${DESTDIR}${EGDIR} + cd ${WRKSRC} && rm -f *.orig */*.orig cd ${WRKSRC} && pax -rwppm . ${DESTDIR}${PREFIX}/${HTTPD_ROOT}/websvn - ${RM} ${DESTDIR}${PREFIX}/${HTTPD_ROOT}/websvn/include/distconfig.inc + ${RM} ${DESTDIR}${PREFIX}/${HTTPD_ROOT}/websvn/include/distconfig.php -.include "../../mk/apachever.mk" .include "../../lang/php/phpversion.mk" .include "../../mk/bsd.pkg.mk" diff --git a/www/websvn/PLIST b/www/websvn/PLIST index f4c9af2de51..a69c3d71be8 100644 --- a/www/websvn/PLIST +++ b/www/websvn/PLIST @@ -1,54 +1,228 @@ -@comment $NetBSD: PLIST,v 1.5 2009/06/14 22:00:40 joerg Exp $ -share/examples/websvn/distconfig.inc +@comment $NetBSD: PLIST,v 1.6 2009/07/25 19:33:45 schmonz Exp $ +share/examples/websvn/distconfig.php ${HTTPD_ROOT}/websvn/blame.php ${HTTPD_ROOT}/websvn/cache/tmp ${HTTPD_ROOT}/websvn/changes.txt ${HTTPD_ROOT}/websvn/comp.php ${HTTPD_ROOT}/websvn/diff.php ${HTTPD_ROOT}/websvn/dl.php +${HTTPD_ROOT}/websvn/doc/install.html +${HTTPD_ROOT}/websvn/doc/style.css +${HTTPD_ROOT}/websvn/doc/templates.html ${HTTPD_ROOT}/websvn/filedetails.php ${HTTPD_ROOT}/websvn/form.php -${HTTPD_ROOT}/websvn/include/bugtraq.inc -${HTTPD_ROOT}/websvn/include/command.inc -${HTTPD_ROOT}/websvn/include/configclass.inc -${HTTPD_ROOT}/websvn/include/feedcreator.class.php -${HTTPD_ROOT}/websvn/include/setup.inc -${HTTPD_ROOT}/websvn/include/svnlook.inc -${HTTPD_ROOT}/websvn/include/template.inc -${HTTPD_ROOT}/websvn/include/utils.inc -${HTTPD_ROOT}/websvn/include/version.inc +${HTTPD_ROOT}/websvn/include/accessfile.php +${HTTPD_ROOT}/websvn/include/auth.php +${HTTPD_ROOT}/websvn/include/bugtraq.php +${HTTPD_ROOT}/websvn/include/command.php +${HTTPD_ROOT}/websvn/include/configclass.php +${HTTPD_ROOT}/websvn/include/diff_inc.php +${HTTPD_ROOT}/websvn/include/header +${HTTPD_ROOT}/websvn/include/setup.php +${HTTPD_ROOT}/websvn/include/svnlook.php +${HTTPD_ROOT}/websvn/include/template.php +${HTTPD_ROOT}/websvn/include/utils.php +${HTTPD_ROOT}/websvn/include/version.php ${HTTPD_ROOT}/websvn/index.php -${HTTPD_ROOT}/websvn/install.txt -${HTTPD_ROOT}/websvn/languages/english.inc -${HTTPD_ROOT}/websvn/languages/french.inc -${HTTPD_ROOT}/websvn/languages/german.inc -${HTTPD_ROOT}/websvn/languages/japanese-euc.inc -${HTTPD_ROOT}/websvn/languages/japanese-jis.inc -${HTTPD_ROOT}/websvn/languages/japanese-sjis.inc -${HTTPD_ROOT}/websvn/languages/japanese-utf8.inc -${HTTPD_ROOT}/websvn/languages/korean-euc.inc -${HTTPD_ROOT}/websvn/languages/korean-utf8.inc -${HTTPD_ROOT}/websvn/languages/portuguese.inc -${HTTPD_ROOT}/websvn/languages/russian.inc -${HTTPD_ROOT}/websvn/languages/spanish.inc -${HTTPD_ROOT}/websvn/languages/swedish.inc -${HTTPD_ROOT}/websvn/languages/tchinese-utf8.inc -${HTTPD_ROOT}/websvn/languages/tchinese.inc -${HTTPD_ROOT}/websvn/licence.txt +${HTTPD_ROOT}/websvn/languages/catalan.php +${HTTPD_ROOT}/websvn/languages/czech.php +${HTTPD_ROOT}/websvn/languages/danish.php +${HTTPD_ROOT}/websvn/languages/dutch.php +${HTTPD_ROOT}/websvn/languages/english.php +${HTTPD_ROOT}/websvn/languages/finnish.php +${HTTPD_ROOT}/websvn/languages/french.php +${HTTPD_ROOT}/websvn/languages/german.php +${HTTPD_ROOT}/websvn/languages/hebrew.php +${HTTPD_ROOT}/websvn/languages/hungarian.php +${HTTPD_ROOT}/websvn/languages/indonesian.php +${HTTPD_ROOT}/websvn/languages/italian.php +${HTTPD_ROOT}/websvn/languages/japanese.php +${HTTPD_ROOT}/websvn/languages/korean.php +${HTTPD_ROOT}/websvn/languages/languages.php +${HTTPD_ROOT}/websvn/languages/norwegian.php +${HTTPD_ROOT}/websvn/languages/polish.php +${HTTPD_ROOT}/websvn/languages/portuguese-br.php +${HTTPD_ROOT}/websvn/languages/portuguese.php +${HTTPD_ROOT}/websvn/languages/russian.php +${HTTPD_ROOT}/websvn/languages/schinese.php +${HTTPD_ROOT}/websvn/languages/slovak.php +${HTTPD_ROOT}/websvn/languages/slovenian.php +${HTTPD_ROOT}/websvn/languages/spanish.php +${HTTPD_ROOT}/websvn/languages/swedish.php +${HTTPD_ROOT}/websvn/languages/tchinese.php +${HTTPD_ROOT}/websvn/languages/turkish.php +${HTTPD_ROOT}/websvn/languages/uzbek.php +${HTTPD_ROOT}/websvn/lib/feedcreator.class.php +${HTTPD_ROOT}/websvn/lib/geshi.php +${HTTPD_ROOT}/websvn/lib/geshi/abap.php +${HTTPD_ROOT}/websvn/lib/geshi/actionscript.php +${HTTPD_ROOT}/websvn/lib/geshi/actionscript3.php +${HTTPD_ROOT}/websvn/lib/geshi/ada.php +${HTTPD_ROOT}/websvn/lib/geshi/apache.php +${HTTPD_ROOT}/websvn/lib/geshi/${LOWER_VENDOR}script.php +${HTTPD_ROOT}/websvn/lib/geshi/apt_sources.php +${HTTPD_ROOT}/websvn/lib/geshi/asm.php +${HTTPD_ROOT}/websvn/lib/geshi/asp.php +${HTTPD_ROOT}/websvn/lib/geshi/autoit.php +${HTTPD_ROOT}/websvn/lib/geshi/avisynth.php +${HTTPD_ROOT}/websvn/lib/geshi/bash.php +${HTTPD_ROOT}/websvn/lib/geshi/basic4gl.php +${HTTPD_ROOT}/websvn/lib/geshi/bf.php +${HTTPD_ROOT}/websvn/lib/geshi/blitzbasic.php +${HTTPD_ROOT}/websvn/lib/geshi/bnf.php +${HTTPD_ROOT}/websvn/lib/geshi/boo.php +${HTTPD_ROOT}/websvn/lib/geshi/c.php +${HTTPD_ROOT}/websvn/lib/geshi/c_mac.php +${HTTPD_ROOT}/websvn/lib/geshi/caddcl.php +${HTTPD_ROOT}/websvn/lib/geshi/cadlisp.php +${HTTPD_ROOT}/websvn/lib/geshi/cfdg.php +${HTTPD_ROOT}/websvn/lib/geshi/cfm.php +${HTTPD_ROOT}/websvn/lib/geshi/cil.php +${HTTPD_ROOT}/websvn/lib/geshi/cobol.php +${HTTPD_ROOT}/websvn/lib/geshi/cpp-qt.php +${HTTPD_ROOT}/websvn/lib/geshi/cpp.php +${HTTPD_ROOT}/websvn/lib/geshi/csharp.php +${HTTPD_ROOT}/websvn/lib/geshi/css.php +${HTTPD_ROOT}/websvn/lib/geshi/d.php +${HTTPD_ROOT}/websvn/lib/geshi/dcs.php +${HTTPD_ROOT}/websvn/lib/geshi/delphi.php +${HTTPD_ROOT}/websvn/lib/geshi/diff.php +${HTTPD_ROOT}/websvn/lib/geshi/div.php +${HTTPD_ROOT}/websvn/lib/geshi/dos.php +${HTTPD_ROOT}/websvn/lib/geshi/dot.php +${HTTPD_ROOT}/websvn/lib/geshi/eiffel.php +${HTTPD_ROOT}/websvn/lib/geshi/email.php +${HTTPD_ROOT}/websvn/lib/geshi/fortran.php +${HTTPD_ROOT}/websvn/lib/geshi/freebasic.php +${HTTPD_ROOT}/websvn/lib/geshi/genero.php +${HTTPD_ROOT}/websvn/lib/geshi/gettext.php +${HTTPD_ROOT}/websvn/lib/geshi/glsl.php +${HTTPD_ROOT}/websvn/lib/geshi/gml.php +${HTTPD_ROOT}/websvn/lib/geshi/gnuplot.php +${HTTPD_ROOT}/websvn/lib/geshi/groovy.php +${HTTPD_ROOT}/websvn/lib/geshi/haskell.php +${HTTPD_ROOT}/websvn/lib/geshi/hq9plus.php +${HTTPD_ROOT}/websvn/lib/geshi/html4strict.php +${HTTPD_ROOT}/websvn/lib/geshi/idl.php +${HTTPD_ROOT}/websvn/lib/geshi/ini.php +${HTTPD_ROOT}/websvn/lib/geshi/inno.php +${HTTPD_ROOT}/websvn/lib/geshi/intercal.php +${HTTPD_ROOT}/websvn/lib/geshi/io.php +${HTTPD_ROOT}/websvn/lib/geshi/java.php +${HTTPD_ROOT}/websvn/lib/geshi/java5.php +${HTTPD_ROOT}/websvn/lib/geshi/javascript.php +${HTTPD_ROOT}/websvn/lib/geshi/kixtart.php +${HTTPD_ROOT}/websvn/lib/geshi/klonec.php +${HTTPD_ROOT}/websvn/lib/geshi/klonecpp.php +${HTTPD_ROOT}/websvn/lib/geshi/latex.php +${HTTPD_ROOT}/websvn/lib/geshi/lisp.php +${HTTPD_ROOT}/websvn/lib/geshi/locobasic.php +${HTTPD_ROOT}/websvn/lib/geshi/lolcode.php +${HTTPD_ROOT}/websvn/lib/geshi/lotusformulas.php +${HTTPD_ROOT}/websvn/lib/geshi/lotusscript.php +${HTTPD_ROOT}/websvn/lib/geshi/lscript.php +${HTTPD_ROOT}/websvn/lib/geshi/lsl2.php +${HTTPD_ROOT}/websvn/lib/geshi/lua.php +${HTTPD_ROOT}/websvn/lib/geshi/m68k.php +${HTTPD_ROOT}/websvn/lib/geshi/make.php +${HTTPD_ROOT}/websvn/lib/geshi/matlab.php +${HTTPD_ROOT}/websvn/lib/geshi/mirc.php +${HTTPD_ROOT}/websvn/lib/geshi/modula3.php +${HTTPD_ROOT}/websvn/lib/geshi/mpasm.php +${HTTPD_ROOT}/websvn/lib/geshi/mxml.php +${HTTPD_ROOT}/websvn/lib/geshi/mysql.php +${HTTPD_ROOT}/websvn/lib/geshi/nsis.php +${HTTPD_ROOT}/websvn/lib/geshi/oberon2.php +${HTTPD_ROOT}/websvn/lib/geshi/objc.php +${HTTPD_ROOT}/websvn/lib/geshi/ocaml-brief.php +${HTTPD_ROOT}/websvn/lib/geshi/ocaml.php +${HTTPD_ROOT}/websvn/lib/geshi/oobas.php +${HTTPD_ROOT}/websvn/lib/geshi/oracle11.php +${HTTPD_ROOT}/websvn/lib/geshi/oracle8.php +${HTTPD_ROOT}/websvn/lib/geshi/pascal.php +${HTTPD_ROOT}/websvn/lib/geshi/per.php +${HTTPD_ROOT}/websvn/lib/geshi/perl.php +${HTTPD_ROOT}/websvn/lib/geshi/php-brief.php +${HTTPD_ROOT}/websvn/lib/geshi/php.php +${HTTPD_ROOT}/websvn/lib/geshi/pic16.php +${HTTPD_ROOT}/websvn/lib/geshi/pixelbender.php +${HTTPD_ROOT}/websvn/lib/geshi/plsql.php +${HTTPD_ROOT}/websvn/lib/geshi/povray.php +${HTTPD_ROOT}/websvn/lib/geshi/powershell.php +${HTTPD_ROOT}/websvn/lib/geshi/progress.php +${HTTPD_ROOT}/websvn/lib/geshi/prolog.php +${HTTPD_ROOT}/websvn/lib/geshi/providex.php +${HTTPD_ROOT}/websvn/lib/geshi/python.php +${HTTPD_ROOT}/websvn/lib/geshi/qbasic.php +${HTTPD_ROOT}/websvn/lib/geshi/rails.php +${HTTPD_ROOT}/websvn/lib/geshi/rebol.php +${HTTPD_ROOT}/websvn/lib/geshi/reg.php +${HTTPD_ROOT}/websvn/lib/geshi/robots.php +${HTTPD_ROOT}/websvn/lib/geshi/ruby.php +${HTTPD_ROOT}/websvn/lib/geshi/sas.php +${HTTPD_ROOT}/websvn/lib/geshi/scala.php +${HTTPD_ROOT}/websvn/lib/geshi/scheme.php +${HTTPD_ROOT}/websvn/lib/geshi/scilab.php +${HTTPD_ROOT}/websvn/lib/geshi/sdlbasic.php +${HTTPD_ROOT}/websvn/lib/geshi/smalltalk.php +${HTTPD_ROOT}/websvn/lib/geshi/smarty.php +${HTTPD_ROOT}/websvn/lib/geshi/sql.php +${HTTPD_ROOT}/websvn/lib/geshi/tcl.php +${HTTPD_ROOT}/websvn/lib/geshi/teraterm.php +${HTTPD_ROOT}/websvn/lib/geshi/text.php +${HTTPD_ROOT}/websvn/lib/geshi/thinbasic.php +${HTTPD_ROOT}/websvn/lib/geshi/tsql.php +${HTTPD_ROOT}/websvn/lib/geshi/typoscript.php +${HTTPD_ROOT}/websvn/lib/geshi/vb.php +${HTTPD_ROOT}/websvn/lib/geshi/vbnet.php +${HTTPD_ROOT}/websvn/lib/geshi/verilog.php +${HTTPD_ROOT}/websvn/lib/geshi/vhdl.php +${HTTPD_ROOT}/websvn/lib/geshi/vim.php +${HTTPD_ROOT}/websvn/lib/geshi/visualfoxpro.php +${HTTPD_ROOT}/websvn/lib/geshi/visualprolog.php +${HTTPD_ROOT}/websvn/lib/geshi/whitespace.php +${HTTPD_ROOT}/websvn/lib/geshi/winbatch.php +${HTTPD_ROOT}/websvn/lib/geshi/xml.php +${HTTPD_ROOT}/websvn/lib/geshi/xorg_conf.php +${HTTPD_ROOT}/websvn/lib/geshi/xpp.php +${HTTPD_ROOT}/websvn/lib/geshi/z80.php +${HTTPD_ROOT}/websvn/lib/pear/Archive/Tar.php +${HTTPD_ROOT}/websvn/lib/pear/PEAR.php +${HTTPD_ROOT}/websvn/lib/pear/Text/Diff.php +${HTTPD_ROOT}/websvn/lib/pear/Text/Diff/Engine/native.php +${HTTPD_ROOT}/websvn/lib/pear/Text/Diff/Engine/shell.php +${HTTPD_ROOT}/websvn/lib/pear/Text/Diff/Engine/string.php +${HTTPD_ROOT}/websvn/lib/pear/Text/Diff/Engine/xdiff.php +${HTTPD_ROOT}/websvn/lib/pear/Text/Diff/Mapped.php +${HTTPD_ROOT}/websvn/lib/pear/Text/Diff/Renderer.php +${HTTPD_ROOT}/websvn/lib/pear/Text/Diff/Renderer/context.php +${HTTPD_ROOT}/websvn/lib/pear/Text/Diff/Renderer/inline.php +${HTTPD_ROOT}/websvn/lib/pear/Text/Diff/Renderer/unified.php +${HTTPD_ROOT}/websvn/lib/pear/Text/Diff/ThreeWay.php +${HTTPD_ROOT}/websvn/lib/pear/Text/Diff3.php +${HTTPD_ROOT}/websvn/license.txt ${HTTPD_ROOT}/websvn/listing.php ${HTTPD_ROOT}/websvn/log.php +${HTTPD_ROOT}/websvn/revision.php ${HTTPD_ROOT}/websvn/rss.php -${HTTPD_ROOT}/websvn/templates.txt ${HTTPD_ROOT}/websvn/templates/BlueGrey/blame.tmpl +${HTTPD_ROOT}/websvn/templates/BlueGrey/collapse.js ${HTTPD_ROOT}/websvn/templates/BlueGrey/compare.tmpl ${HTTPD_ROOT}/websvn/templates/BlueGrey/diff.tmpl ${HTTPD_ROOT}/websvn/templates/BlueGrey/directory.tmpl ${HTTPD_ROOT}/websvn/templates/BlueGrey/e-node.png +${HTTPD_ROOT}/websvn/templates/BlueGrey/favicon.ico ${HTTPD_ROOT}/websvn/templates/BlueGrey/file.png ${HTTPD_ROOT}/websvn/templates/BlueGrey/file.tmpl ${HTTPD_ROOT}/websvn/templates/BlueGrey/filec.png +${HTTPD_ROOT}/websvn/templates/BlueGrey/filecpp.png ${HTTPD_ROOT}/websvn/templates/BlueGrey/fileh.png +${HTTPD_ROOT}/websvn/templates/BlueGrey/filehtml.png +${HTTPD_ROOT}/websvn/templates/BlueGrey/filejava.png +${HTTPD_ROOT}/websvn/templates/BlueGrey/filem.png +${HTTPD_ROOT}/websvn/templates/BlueGrey/filepy.png ${HTTPD_ROOT}/websvn/templates/BlueGrey/files.png +${HTTPD_ROOT}/websvn/templates/BlueGrey/folder-open.png ${HTTPD_ROOT}/websvn/templates/BlueGrey/folder.png ${HTTPD_ROOT}/websvn/templates/BlueGrey/footer.tmpl ${HTTPD_ROOT}/websvn/templates/BlueGrey/header.tmpl @@ -58,30 +232,68 @@ ${HTTPD_ROOT}/websvn/templates/BlueGrey/l-node.png ${HTTPD_ROOT}/websvn/templates/BlueGrey/log.tmpl ${HTTPD_ROOT}/websvn/templates/BlueGrey/png.js ${HTTPD_ROOT}/websvn/templates/BlueGrey/repo.png +${HTTPD_ROOT}/websvn/templates/BlueGrey/revision.tmpl +${HTTPD_ROOT}/websvn/templates/BlueGrey/rss.gif ${HTTPD_ROOT}/websvn/templates/BlueGrey/styles.css -${HTTPD_ROOT}/websvn/templates/BlueGrey/subversion.png ${HTTPD_ROOT}/websvn/templates/BlueGrey/t-node.png -${HTTPD_ROOT}/websvn/templates/BlueGrey/xml.gif -${HTTPD_ROOT}/websvn/templates/Standard/blame.tmpl -${HTTPD_ROOT}/websvn/templates/Standard/compare.tmpl -${HTTPD_ROOT}/websvn/templates/Standard/diff.tmpl -${HTTPD_ROOT}/websvn/templates/Standard/directory.tmpl -${HTTPD_ROOT}/websvn/templates/Standard/file.tmpl -${HTTPD_ROOT}/websvn/templates/Standard/footer.tmpl -${HTTPD_ROOT}/websvn/templates/Standard/header.tmpl -${HTTPD_ROOT}/websvn/templates/Standard/index.tmpl -${HTTPD_ROOT}/websvn/templates/Standard/log.tmpl -${HTTPD_ROOT}/websvn/templates/Standard/styles.css -${HTTPD_ROOT}/websvn/templates/Standard/xml.gif -${HTTPD_ROOT}/websvn/templates/Zinn/blame.tmpl -${HTTPD_ROOT}/websvn/templates/Zinn/compare.tmpl -${HTTPD_ROOT}/websvn/templates/Zinn/diff.tmpl -${HTTPD_ROOT}/websvn/templates/Zinn/directory.tmpl -${HTTPD_ROOT}/websvn/templates/Zinn/file.tmpl -${HTTPD_ROOT}/websvn/templates/Zinn/footer.tmpl -${HTTPD_ROOT}/websvn/templates/Zinn/header.tmpl -${HTTPD_ROOT}/websvn/templates/Zinn/index.tmpl -${HTTPD_ROOT}/websvn/templates/Zinn/log.tmpl -${HTTPD_ROOT}/websvn/templates/Zinn/styles.css +${HTTPD_ROOT}/websvn/templates/BlueGrey/websvn.png +${HTTPD_ROOT}/websvn/templates/calm/README.txt +${HTTPD_ROOT}/websvn/templates/calm/blame.tmpl +${HTTPD_ROOT}/websvn/templates/calm/collapse.js +${HTTPD_ROOT}/websvn/templates/calm/compare.tmpl +${HTTPD_ROOT}/websvn/templates/calm/diff.tmpl +${HTTPD_ROOT}/websvn/templates/calm/directory.tmpl +${HTTPD_ROOT}/websvn/templates/calm/file.tmpl +${HTTPD_ROOT}/websvn/templates/calm/footer.tmpl +${HTTPD_ROOT}/websvn/templates/calm/header.tmpl +${HTTPD_ROOT}/websvn/templates/calm/images/add.png +${HTTPD_ROOT}/websvn/templates/calm/images/arrow_in.png +${HTTPD_ROOT}/websvn/templates/calm/images/arrow_out.png +${HTTPD_ROOT}/websvn/templates/calm/images/blame.png +${HTTPD_ROOT}/websvn/templates/calm/images/bullet_add.png +${HTTPD_ROOT}/websvn/templates/calm/images/bullet_delete.png +${HTTPD_ROOT}/websvn/templates/calm/images/bullet_yellow.png +${HTTPD_ROOT}/websvn/templates/calm/images/compress.png +${HTTPD_ROOT}/websvn/templates/calm/images/css.png +${HTTPD_ROOT}/websvn/templates/calm/images/cube_green.png +${HTTPD_ROOT}/websvn/templates/calm/images/delete.png +${HTTPD_ROOT}/websvn/templates/calm/images/diff.png +${HTTPD_ROOT}/websvn/templates/calm/images/e-node.png +${HTTPD_ROOT}/websvn/templates/calm/images/exclamation.png +${HTTPD_ROOT}/websvn/templates/calm/images/favicon.ico +${HTTPD_ROOT}/websvn/templates/calm/images/file.png +${HTTPD_ROOT}/websvn/templates/calm/images/filec.png +${HTTPD_ROOT}/websvn/templates/calm/images/filedb.png +${HTTPD_ROOT}/websvn/templates/calm/images/fileh.png +${HTTPD_ROOT}/websvn/templates/calm/images/filepaint.png +${HTTPD_ROOT}/websvn/templates/calm/images/filephp.png +${HTTPD_ROOT}/websvn/templates/calm/images/files.png +${HTTPD_ROOT}/websvn/templates/calm/images/filetxt.png +${HTTPD_ROOT}/websvn/templates/calm/images/filexml.png +${HTTPD_ROOT}/websvn/templates/calm/images/folder.png +${HTTPD_ROOT}/websvn/templates/calm/images/html.png +${HTTPD_ROOT}/websvn/templates/calm/images/i-node.png +${HTTPD_ROOT}/websvn/templates/calm/images/l-node.png +${HTTPD_ROOT}/websvn/templates/calm/images/log.png +${HTTPD_ROOT}/websvn/templates/calm/images/page_white_add.png +${HTTPD_ROOT}/websvn/templates/calm/images/page_white_delete.png +${HTTPD_ROOT}/websvn/templates/calm/images/page_white_edit.png +${HTTPD_ROOT}/websvn/templates/calm/images/pilcrow.png +${HTTPD_ROOT}/websvn/templates/calm/images/pilcrow_delete.png +${HTTPD_ROOT}/websvn/templates/calm/images/script.png +${HTTPD_ROOT}/websvn/templates/calm/images/sitemap_color.png +${HTTPD_ROOT}/websvn/templates/calm/images/submitbg.png +${HTTPD_ROOT}/websvn/templates/calm/images/t-node.png +${HTTPD_ROOT}/websvn/templates/calm/images/textbg.png +${HTTPD_ROOT}/websvn/templates/calm/images/toggledown.png +${HTTPD_ROOT}/websvn/templates/calm/images/toggleup.png +${HTTPD_ROOT}/websvn/templates/calm/images/up.png +${HTTPD_ROOT}/websvn/templates/calm/images/xml.gif +${HTTPD_ROOT}/websvn/templates/calm/index.tmpl +${HTTPD_ROOT}/websvn/templates/calm/log.tmpl +${HTTPD_ROOT}/websvn/templates/calm/png.js +${HTTPD_ROOT}/websvn/templates/calm/revision.tmpl +${HTTPD_ROOT}/websvn/templates/calm/styles.css ${HTTPD_ROOT}/websvn/wsvn.php +@pkgdir ${HTTPD_ROOT}/websvn/www @pkgdir ${HTTPD_ROOT}/websvn/temp diff --git a/www/websvn/distinfo b/www/websvn/distinfo index a5b9233c879..147b9c68735 100644 --- a/www/websvn/distinfo +++ b/www/websvn/distinfo @@ -1,11 +1,6 @@ -$NetBSD: distinfo,v 1.5 2008/07/13 11:15:27 tonnerre Exp $ +$NetBSD: distinfo,v 1.6 2009/07/25 19:33:45 schmonz Exp $ -SHA1 (WebSVN_161.tar.gz) = 7fecbaa9619e3061ea57dda0a4bfcb4a3cca888d -RMD160 (WebSVN_161.tar.gz) = aedd187926ff286b5582f2359cbe3fb56d7a0bc9 -Size (WebSVN_161.tar.gz) = 89305 bytes -SHA1 (patch-aa) = 021727c38d33ccedeaec8c82de912ed94baae565 -SHA1 (patch-ab) = 4724707d5fd3f3699918dfd9754ac92eefec9c8f -SHA1 (patch-ac) = 6cde8ef4cf0ee0dfd4619a5acebfe09aff40e95c -SHA1 (patch-ad) = a4c673d6f27629573d520213bd66b9d084a11a64 -SHA1 (patch-ae) = d74b9be874c88edd213fbbd297e8cd0f8bbaf46a -SHA1 (patch-af) = 92464e74e3aa86529bb0438d7d015dfce9c82de5 +SHA1 (websvn-2.2.1.tar.gz) = 4e4bd9ec58cb54f9430913695e03dfd766d873be +RMD160 (websvn-2.2.1.tar.gz) = 02d4d8d264d1a685bbca1c88175baf0da1e45b42 +Size (websvn-2.2.1.tar.gz) = 664548 bytes +SHA1 (patch-ag) = 5dbac2f9264001f86db1845d9dc937acd6e080af diff --git a/www/websvn/patches/patch-aa b/www/websvn/patches/patch-aa deleted file mode 100644 index fb46ff65788..00000000000 --- a/www/websvn/patches/patch-aa +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-aa,v 1.1 2008/07/13 11:15:27 tonnerre Exp $ - ---- blame.php.orig 2004-08-26 10:29:32.000000000 +0200 -+++ blame.php -@@ -49,9 +49,9 @@ else - $pos = strrpos($ppath, "/"); - $parent = substr($ppath, 0, $pos + 1); - --$vars["repname"] = $rep->name; -+$vars["repname"] = htmlentities($rep->name, ENT_QUOTES, 'UTF-8'); - $vars["rev"] = $rev; --$vars["path"] = $ppath; -+$vars["path"] = htmlentities($ppath, ENT_QUOTES, 'UTF-8'); - - createDirLinks($rep, $ppath, $rev, $showchanged); - diff --git a/www/websvn/patches/patch-ab b/www/websvn/patches/patch-ab deleted file mode 100644 index 6d5dd22d76e..00000000000 --- a/www/websvn/patches/patch-ab +++ /dev/null @@ -1,35 +0,0 @@ -$NetBSD: patch-ab,v 1.1 2008/07/13 11:15:27 tonnerre Exp $ - ---- comp.php.orig 2004-08-30 14:28:10.000000000 +0200 -+++ comp.php -@@ -54,8 +54,8 @@ $svnrep = new SVNRepository($rep->path); - // Retrieve the request information - $path1 = @$_REQUEST["compare"][0]; - $path2 = @$_REQUEST["compare"][1]; --$rev1 = @$_REQUEST["compare_rev"][0]; --$rev2 = @$_REQUEST["compare_rev"][1]; -+$rev1 = (int)@$_REQUEST["compare_rev"][0]; -+$rev2 = (int)@$_REQUEST["compare_rev"][1]; - - // Some page links put the revision with the path... - if (strpos($path1, "@")) list($path1, $rev1) = explode("@", $path1); -@@ -89,15 +89,15 @@ if ($rev2 == 0) $rev2 = "HEAD"; - $vars["repname"] = $rep->name; - $vars["action"] = $lang["PATHCOMPARISON"]; - $vars["compare_form"] = "
"; --$vars["compare_path1input"] = ""; -+$vars["compare_path1input"] = ""; - $vars["compare_rev1input"] = ""; --$vars["compare_path2input"] = ""; -+$vars["compare_path2input"] = ""; - $vars["compare_rev2input"] = ""; - $vars["compare_submit"] = ""; - $vars["compare_endform"] = "
"; - --$vars["path1"] = $path1; --$vars["path2"] = $path2; -+$vars["path1"] = htmlentities($path1, ENT_QUOTES, 'UTF-8'); -+$vars["path2"] = htmlentities($path2, ENT_QUOTES, 'UTF-8'); - - $vars["rev1"] = $rev1; - $vars["rev2"] = $rev2; diff --git a/www/websvn/patches/patch-ac b/www/websvn/patches/patch-ac deleted file mode 100644 index a8752c2f6ac..00000000000 --- a/www/websvn/patches/patch-ac +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-ac,v 1.1 2008/07/13 11:15:27 tonnerre Exp $ - ---- diff.php.orig 2004-08-26 10:29:32.000000000 +0200 -+++ diff.php -@@ -59,9 +59,9 @@ else - - $prevrev = @$history[1]["rev"]; - --$vars["repname"] = $rep->name; -+$vars["repname"] = htmlentities($rep->name, ENT_QUOTES, 'UTF-8'); - $vars["rev"] = $rev; --$vars["path"] = $ppath; -+$vars["path"] = htmlentities($ppath, ENT_QUOTES, 'UTF-8'); - $vars["prevrev"] = $prevrev; - - $vars["rev1"] = $history[0]["rev"]; diff --git a/www/websvn/patches/patch-ad b/www/websvn/patches/patch-ad deleted file mode 100644 index 766090e7f8e..00000000000 --- a/www/websvn/patches/patch-ad +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-ad,v 1.1 2008/07/13 11:15:27 tonnerre Exp $ - ---- filedetails.php.orig 2004-08-26 10:29:32.000000000 +0200 -+++ filedetails.php -@@ -127,9 +127,9 @@ else - $vars["goyoungestlink"] = ""; - - $vars["action"] = ""; --$vars["repname"] = $rep->name; -+$vars["repname"] = htmlentitites($rep->name, ENT_QUOTES, 'UTF-8'); - $vars["rev"] = $rev; --$vars["path"] = $ppath; -+$vars["path"] = htmlentities($ppath, ENT_QUOTES, 'UTF-8'); - - createDirLinks($rep, $ppath, $passrev, $showchanged); - diff --git a/www/websvn/patches/patch-ae b/www/websvn/patches/patch-ae deleted file mode 100644 index 6b0894b7cfd..00000000000 --- a/www/websvn/patches/patch-ae +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ae,v 1.1 2008/07/13 11:15:27 tonnerre Exp $ - ---- listing.php.orig 2004-08-30 10:49:58.000000000 +0200 -+++ listing.php -@@ -235,7 +235,7 @@ $vars["date"] = $log['date']; - $vars["log"] = nl2br($bugtraq->replaceIDs(create_anchors($log['message']))); - $vars["rev"] = $rev; - $vars["lastchangedrev"] = $logrev; --$vars["path"] = $ppath; -+$vars["path"] = htmlentities($ppath, ENT_QUOTES, 'UTF-8'); - - if (!$showchanged) - { diff --git a/www/websvn/patches/patch-af b/www/websvn/patches/patch-af deleted file mode 100644 index 4d8e68bb655..00000000000 --- a/www/websvn/patches/patch-af +++ /dev/null @@ -1,26 +0,0 @@ -$NetBSD: patch-af,v 1.1 2008/07/13 11:15:27 tonnerre Exp $ - ---- log.php.orig 2004-08-26 14:47:30.000000000 +0200 -+++ log.php -@@ -98,9 +98,9 @@ else - $ppath = $path; - - $vars["action"] = $lang["LOG"]; --$vars["repname"] = $rep->name; -+$vars["repname"] = htmlentities($rep->name, ENT_QUOTES, 'UTF-8'); - $vars["rev"] = $rev; --$vars["path"] = $ppath; -+$vars["path"] = htmlentities($ppath, ENT_QUOTES, 'UTF-8'); - - createDirLinks($rep, $ppath, $passrev, $showchanged); - -@@ -278,7 +278,8 @@ if ($pages > 1) - $url = $config->getURL($rep, $path, "log"); - $vars["logsearch_form"] = "
"; - --$vars["logsearch_inputbox"] = ""; -+$vars["logsearch_inputbox"] = ""; - - $vars["logsearch_submit"] = ""; - $vars["logsearch_endform"] = "". diff --git a/www/websvn/patches/patch-ag b/www/websvn/patches/patch-ag new file mode 100644 index 00000000000..9a6dfff677c --- /dev/null +++ b/www/websvn/patches/patch-ag @@ -0,0 +1,18 @@ +$NetBSD: patch-ag,v 1.1 2009/07/25 19:33:46 schmonz Exp $ + +--- include/setup.php.orig 2009-05-10 07:19:20.000000000 -0400 ++++ include/setup.php +@@ -316,10 +316,10 @@ $extGeshi = array + require 'languages/english.php'; + + // Get the user's personalised config (requires the locwebsvnhttp stuff above) +-if (file_exists(dirname(__FILE__).DIRECTORY_SEPARATOR.'config.php')) { +- require_once 'config.php'; ++if (file_exists('@PKG_SYSCONFDIR@'.DIRECTORY_SEPARATOR.'websvn.conf')) { ++ require_once '@PKG_SYSCONFDIR@'.DIRECTORY_SEPARATOR.'websvn.conf'; + } else { +- die('File "includes'.DIRECTORY_SEPARATOR.'config.php" does not exists, please create one. The example is located under "includes'.DIRECTORY_SEPARATOR.'distconfig.php"'); ++ die('File "@PKG_SYSCONFDIR@'.DIRECTORY_SEPARATOR.'websvn.conf" does not exists, please create one. The example is located under "@EGDIR@'.DIRECTORY_SEPARATOR.'distconfig.php"'); + } + + require_once 'include/svnlook.php'; -- cgit v1.2.3