Date: Sat, 2 Dec 2006 23:14:51 +0900 (JST) From: TAKATSU Tomonari <tota@rtfm.jp> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/106208: [MAINTAINER] www/tdiary: update to 2.0.3 Message-ID: <20061202141451.325256D44D@rtfm.jp> Resent-Message-ID: <200612021420.kB2EKMpY031542@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 106208 >Category: ports >Synopsis: [MAINTAINER] www/tdiary: update to 2.0.3 >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Sat Dec 02 14:20:17 GMT 2006 >Closed-Date: >Last-Modified: >Originator: TAKATSU Tomonari >Release: FreeBSD 6.2-PRERELEASE i386 >Organization: none (personal) >Environment: System: FreeBSD photon.rtfm.jp 6.2-PRERELEASE FreeBSD 6.2-PRERELEASE #0: Tue Nov 21 20:55:36 JST 2006 >Description: - update to 2.0.3 fixed XSS Vulnerability in tDiary http://sourceforge.net/forum/forum.php?forum_id=638868 Generated with FreeBSD Port Tools 0.77 >How-To-Repeat: >Fix: begin 644 tdiary-2.0.3.patch diff -urN /usr/ports/www/tdiary.orig/Makefile /usr/ports/www/tdiary/Makefile --- /usr/ports/www/tdiary.orig/Makefile Wed Sep 20 00:18:06 2006 +++ /usr/ports/www/tdiary/Makefile Sat Dec 2 22:29:33 2006 @@ -6,8 +6,7 @@ # PORTNAME= tdiary -PORTVERSION= 2.0.2 -PORTREVISION= 1 +PORTVERSION= 2.0.3 CATEGORIES?= www ruby MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \ http://www.tdiary.org/download/ @@ -18,11 +17,13 @@ COMMENT= A Web-based diary system (like weblog) written in Ruby NO_BUILD= yes -CONFLICTS?= ja-tdiary-[0-9]* +CONFLICTS?= tdiary-devel-[0-9]* \ + ja-tdiary-[0-9]* \ + ja-tdiary-devel-[0-9]* PKGMESSAGE= ${WRKDIR}/pkg-message USE_RUBY= yes -.if !defined(WITHOUT_RUBY_FEATURES) +.if !defined(WITHOUT_RUBY_FEATURES) USE_RUBY_FEATURES= fileutils .endif @@ -36,12 +37,8 @@ #TDIARY_LANG ja:Japanese en:English zh:Traditional-Chinese -.if !defined(TDIARY_LANG) +.if !defined(TDIARY_LANG) || ( defined(TDIARY_LANG) && ${TDIARY_LANG} != ja ) TDIARY_LANG= en -.else -.if ${TDIARY_LANG} == "tdiary.conf-ja" -TDIARY_LANG= ja -.endif .endif .if defined(WITH_TDIARY_UCONV) RUN_DEPENDS+= ${RUBY_SITEARCHLIBDIR}/uconv.so:${PORTSDIR}/japanese/ruby-uconv @@ -49,15 +46,17 @@ .if defined(WITH_TDIARY_NORA) RUN_DEPENDS+= ${RUBY_SITEARCHLIBDIR}/web/escape_ext.so:${PORTSDIR}/www/ruby-nora .endif + .include <bsd.port.pre.mk> .if ${RUBY_VERSION_CODE} < 167 -IGNORE= Needs ruby 1.6.7 or higher, check ruby's version and try again +IGNORE= only works with Ruby 1.6.7 or later .endif do-install: @-${MKDIR} ${TDIARYDIR} - @${SED} -e 's,@@@@PREFIX@@@@,${PREFIX},g' \ + @${SED} -e 's,#!/usr/bin/env ruby,#!${RUBY},' \ + -e 's,@@@@PREFIX@@@@,${PREFIX},g' \ -e 's,@@@@LANG@@@@,${TDIARY_LANG},g' \ ${FILESDIR}/tdiaryinst.rb.in > ${TDIARYDIR}/tdiaryinst.rb @${CP} -pR ${WRKSRC}/ ${TDIARYDIR} diff -urN /usr/ports/www/tdiary.orig/distinfo /usr/ports/www/tdiary/distinfo --- /usr/ports/www/tdiary.orig/distinfo Sun Feb 19 20:38:26 2006 +++ /usr/ports/www/tdiary/distinfo Sat Dec 2 20:46:11 2006 @@ -1,3 +1,3 @@ -MD5 (tdiary-full-2.0.2.tar.gz) = 1c4d1dd765d10b4d074b3bc50d2e65ff -SHA256 (tdiary-full-2.0.2.tar.gz) = d0e0d29b24be6e8e0c334969ff50fffaabedc0391cc9096de6f2b0bc597e9a7f -SIZE (tdiary-full-2.0.2.tar.gz) = 2121313 +MD5 (tdiary-full-2.0.3.tar.gz) = 291119b2ccac6c9ede339c0a03d4d13c +SHA256 (tdiary-full-2.0.3.tar.gz) = 7f98121758f00706db641a6782d06e7bd438f627b7c4947926567854d417e91b +SIZE (tdiary-full-2.0.3.tar.gz) = 2128791 diff -urN /usr/ports/www/tdiary.orig/files/pkg-message.in /usr/ports/www/tdiary/files/pkg-message.in --- /usr/ports/www/tdiary.orig/files/pkg-message.in Sat Mar 13 14:53:13 2004 +++ /usr/ports/www/tdiary/files/pkg-message.in Sat Dec 2 20:47:48 2006 @@ -11,11 +11,9 @@ --help Display Help information --- -There is a document by English in the following directories. +There are documents in the following directories. See ... + %%EXAMPLESDIR%%/doc/ %%EXAMPLESDIR%%/misc/i18n/ - and - Explanation by English of a tDiary system can refer to the following page : - - http://tdiary-users.sourceforge.jp/cgi-bin/wiki.cgi?FrontPage_en ============================================================================= + end >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20061202141451.325256D44D>