From owner-freebsd-ports-bugs@FreeBSD.ORG Mon Dec 17 11:40:01 2007 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A9F7916A418 for ; Mon, 17 Dec 2007 11:40:01 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 9D90113C46A for ; Mon, 17 Dec 2007 11:40:01 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.14.2/8.14.2) with ESMTP id lBHBe1x9012967 for ; Mon, 17 Dec 2007 11:40:01 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.2/8.14.1/Submit) id lBHBe1xJ012966; Mon, 17 Dec 2007 11:40:01 GMT (envelope-from gnats) Resent-Date: Mon, 17 Dec 2007 11:40:01 GMT Resent-Message-Id: <200712171140.lBHBe1xJ012966@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, TAKATSU Tomonari Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 21B6916A420 for ; Mon, 17 Dec 2007 11:31:41 +0000 (UTC) (envelope-from tts7500@www2.inetd.co.jp) Received: from www2.inetd.co.jp (www2.inetd.co.jp [211.13.206.150]) by mx1.freebsd.org (Postfix) with ESMTP id ED17B13C465 for ; Mon, 17 Dec 2007 11:31:40 +0000 (UTC) (envelope-from tts7500@www2.inetd.co.jp) Received: from www2.inetd.co.jp (www2.inetd.co.jp [211.13.206.150]) by www2.inetd.co.jp (8.13.8/3.7W07120413) with ESMTP id lBHBV5Jh040894 for ; Mon, 17 Dec 2007 20:31:05 +0900 (JST) Received: (from tts7500@localhost) by www2.inetd.co.jp (8.13.8/8.12.8/Submit) id lBHBV4jN040892; Mon, 17 Dec 2007 20:31:04 +0900 (JST) (envelope-from tts7500) Message-Id: <200712171131.lBHBV4jN040892@www2.inetd.co.jp> Date: Mon, 17 Dec 2007 20:31:04 +0900 (JST) From: TAKATSU Tomonari To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/118772: [MAINTAINER] www/tdiary: update to 2.2.0 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 17 Dec 2007 11:40:01 -0000 >Number: 118772 >Category: ports >Synopsis: [MAINTAINER] www/tdiary: update to 2.2.0 >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: Mon Dec 17 11:40:01 UTC 2007 >Closed-Date: >Last-Modified: >Originator: TAKATSU Tomonari >Release: FreeBSD 6.2-STABLE i386 >Organization: >Environment: System: FreeBSD photon.rtfm.jp 6.2-STABLE FreeBSD 6.2-STABLE #0: Sun Oct 21 17:56:31 JST 2007 >Description: - update to 2.2.0 - fix vulnerability http://www.tdiary.org/20071215.html (written in Japanese) Generated with FreeBSD Port Tools 0.77 >How-To-Repeat: >Fix: diff -urN tdiary.orig/Makefile tdiary/Makefile --- tdiary.orig/Makefile 2006-12-14 20:06:41.000000000 +0900 +++ tdiary/Makefile 2007-12-16 16:15:34.000000000 +0900 @@ -6,7 +6,7 @@ # PORTNAME= tdiary -PORTVERSION= 2.0.4 +PORTVERSION= 2.2.0 CATEGORIES?= www ruby MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \ http://www.tdiary.org/download/ @@ -23,13 +23,11 @@ PKGMESSAGE= ${WRKDIR}/pkg-message USE_RUBY= yes -.if !defined(WITHOUT_RUBY_FEATURES) -USE_RUBY_FEATURES= fileutils -.endif - -RUBY_SHEBANG_FILES= index.rb update.rb misc/convert2.rb misc/plugin/squeeze.rb \ - misc/plugin/windex.rb \ - misc/plugin/trackback/tb.rb misc/style/etdiary/etdiary_test.rb +RUBY_SHEBANG_FILES= index.rb update.rb misc/convert2.rb \ + misc/plugin/amazon/amazonimg.rb misc/plugin/pingback/pb.rb \ + misc/plugin/squeeze.rb misc/plugin/trackback/tb.rb \ + misc/plugin/xmlrpc/xmlrpc.rb misc/style/etdiary/etdiary_test.rb \ + tdiary/wiki_style_test.rb PLIST_FILES= ${TDIARYDIR:S|${LOCALBASE}/||}/tdiaryinst.rb TDIARYDIR= ${EXAMPLESDIR} @@ -43,16 +41,10 @@ .if defined(WITH_TDIARY_UCONV) RUN_DEPENDS+= ${RUBY_SITEARCHLIBDIR}/uconv.so:${PORTSDIR}/japanese/ruby-uconv .endif -.if defined(WITH_TDIARY_NORA) +.if !defined(WITHOUT_TDIARY_NORA) RUN_DEPENDS+= ${RUBY_SITEARCHLIBDIR}/web/escape_ext.so:${PORTSDIR}/www/ruby-nora .endif -.include - -.if ${RUBY_VERSION_CODE} < 167 -IGNORE= only works with Ruby 1.6.7 or later -.endif - do-install: @-${MKDIR} ${TDIARYDIR} @${SED} -e 's,#!/usr/bin/env ruby,#!${RUBY},' \ @@ -74,4 +66,4 @@ @${SED} -e 's|%%EXAMPLESDIR%%|${EXAMPLESDIR}|' < ${FILESDIR}/pkg-message.in > ${PKGMESSAGE} @${CAT} ${PKGMESSAGE} -.include +.include diff -urN tdiary.orig/distinfo tdiary/distinfo --- tdiary.orig/distinfo 2006-12-14 20:06:41.000000000 +0900 +++ tdiary/distinfo 2007-12-16 14:52:23.000000000 +0900 @@ -1,3 +1,3 @@ -MD5 (tdiary-full-2.0.4.tar.gz) = 8c6a5768cdbcedaa5e643ef79d8713a7 -SHA256 (tdiary-full-2.0.4.tar.gz) = 850f7b78ff0bfd35f533226f69064cc189628dda96e823d924ec28f5931acfe6 -SIZE (tdiary-full-2.0.4.tar.gz) = 2128834 +MD5 (tdiary-full-2.2.0.tar.gz) = 3fffc82a8ff3972a3bb036ed74202220 +SHA256 (tdiary-full-2.2.0.tar.gz) = 7b9089a2a879df283f5958caa34e632434a06daa321ccfe3c498bf59241e7f9b +SIZE (tdiary-full-2.2.0.tar.gz) = 3862083 diff -urN tdiary.orig/files/tdiaryinst.rb.in tdiary/files/tdiaryinst.rb.in --- tdiary.orig/files/tdiaryinst.rb.in 2006-01-30 00:41:09.000000000 +0900 +++ tdiary/files/tdiaryinst.rb.in 2007-12-16 16:35:08.000000000 +0900 @@ -218,7 +218,6 @@ def copyBaseFile FileUtils16.cp_r("#{@tdiarymaster}/doc", "#{@passwd.dir}/#{@httpdir}/#{@diarydir}", :preserve, *@fileutilOptions) - FileUtils16.cp_r("#{@tdiarymaster}/erb", "#{@passwd.dir}/#{@httpdir}/#{@diarydir}", :preserve, *@fileutilOptions) FileUtils16.cp_r("#{@tdiarymaster}/misc", "#{@passwd.dir}/#{@httpdir}/#{@diarydir}", :preserve, *@fileutilOptions) FileUtils16.cp_r("#{@tdiarymaster}/plugin", "#{@passwd.dir}/#{@httpdir}/#{@diarydir}", :preserve, *@fileutilOptions) FileUtils16.cp_r("#{@tdiarymaster}/skel", "#{@passwd.dir}/#{@httpdir}/#{@diarydir}", :preserve, *@fileutilOptions) diff -urN tdiary.orig/pkg-descr tdiary/pkg-descr --- tdiary.orig/pkg-descr 2005-07-25 23:31:40.000000000 +0900 +++ tdiary/pkg-descr 2007-12-16 16:51:41.000000000 +0900 @@ -1,7 +1,7 @@ tDiary is a Web-based interface system that works as a personal diary. It is possible for diary readers to add comments to your diary. - - require Ruby 1.6.7 or later + - require Ruby 1.8.0 or later - currently supported: Japanese, English, Traditional-Chinese tDiary is developed on http://sourceforge.net/projects/tdiary/ . >Release-Note: >Audit-Trail: >Unformatted: