1
0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-01 05:45:45 +00:00

- Update to 1.5.7

PR:		ports/66321
Submitted by:	Fumihiko Kimura <jfkimura@yahoo.co.jp> (maintainer)
This commit is contained in:
Pav Lucistnik 2004-05-06 13:13:11 +00:00
parent 77d559b208
commit 2681ce42a1
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=108552
10 changed files with 10 additions and 402 deletions

View File

@ -6,13 +6,12 @@
#
PORTNAME= tdiary
PORTVERSION= 1.5.6
PORTREVISION= 2
PORTVERSION= 1.5.7
CATEGORIES?= www ruby
MASTER_SITES= \
${MASTER_SITE_SOURCEFORGE} \
http://www.tdiary.org/download/
MASTER_SITE_SUBDIR= sourceforge/${PORTNAME}
MASTER_SITE_SUBDIR= ${PORTNAME}
DISTNAME= ${PORTNAME}-full-${PORTVERSION}
MAINTAINER= jfkimura@yahoo.co.jp
@ -26,7 +25,7 @@ USE_RUBY= yes
USE_RUBY_FEATURES= fileutils
.endif
RUBY_SHEBANG_FILES= index.rb update.rb misc/convert2.rb misc/posttdiary.rb misc/plugin/squeeze.rb \
RUBY_SHEBANG_FILES= index.rb update.rb misc/convert2.rb misc/plugin/squeeze.rb \
misc/plugin/windex.rb misc/plugin/a/a_conf.rb misc/plugin/trackback/tb.rb
TDIARYDIR= ${EXAMPLESDIR}
@ -56,10 +55,6 @@ do-install:
@${SED} -e 's,@@@@PREFIX@@@@,${PREFIX},g' \
-e 's,@@@@LANG@@@@,${TDIARY_LANG},g' \
${FILESDIR}/tdiaryinst.rb.in > ${TDIARYDIR}/tdiaryinst.rb
@${SED} -e 's,@@@@PREFIX@@@@,${PREFIX},g' \
-e 's,@@@@LANG@@@@,${TDIARY_LANG},g' \
${FILESDIR}/tdiary-FreeBSD.sh.in > ${TDIARYDIR}/tdiary-FreeBSD.sh
@${CHMOD} ugo=rx ${TDIARYDIR}/tdiary-FreeBSD.sh
@${CP} -pR ${WRKSRC}/ ${TDIARYDIR}
.if ${TDIARY_LANG} == tdiary.conf-en
@${ECHO_MSG} "===> TDIARY : English Language messages support"

View File

@ -1,2 +1,2 @@
MD5 (tdiary-full-1.5.6.tar.gz) = 559fd40263ae7fc76a1792fc71757c8f
SIZE (tdiary-full-1.5.6.tar.gz) = 1628374
MD5 (tdiary-full-1.5.7.tar.gz) = 13f728291eed51bc6033fae1510731bc
SIZE (tdiary-full-1.5.7.tar.gz) = 1640373

View File

@ -1,47 +0,0 @@
--- tdiary.rb Thu Nov 13 15:34:22 2003
+++ tdiary.rb.new Fri Nov 21 16:11:26 2003
@@ -1,13 +1,13 @@
=begin
== NAME
tDiary: the "tsukkomi-able" web diary system.
-tdiary.rb $Revision: 1.156 $
+tdiary.rb $Revision: 1.159 $
Copyright (C) 2001-2003, TADA Tadashi <sho@spc.gr.jp>
You can redistribute it and/or modify it under GPL2.
=end
-TDIARY_VERSION = '1.5.6'
+TDIARY_VERSION = '1.5.6.20031118'
require 'cgi'
begin
@@ -62,10 +62,14 @@
module Safe
def safe( level = 4 )
result = nil
- Thread.start {
- $SAFE = level
+ if $SAFE < level then
+ Thread.start {
+ $SAFE = level
+ result = yield
+ }.join
+ else
result = yield
- }.join
+ end
result
end
module_function :safe
@@ -740,7 +744,9 @@
r = str.dup
if @options['apply_plugin'] and str.index( '<%' ) then
r = str.untaint if $SAFE < 3
- r = ERbLight.new( r ).result( binding )
+ Safe::safe( @conf.secure ? 4 : 1 ) do
+ r = ERbLight.new( r ).result( binding )
+ end
end
r.gsub!( /<.*?>/, '' ) if remove_tag
r

View File

@ -1,143 +0,0 @@
#!/bin/sh
#
# tdiary-FreeBSD.sh - tDiary user directory copy script
#
# $FreeBSD$
#
# usage:
# % /usr/local/share/examples/tdiary/tdiary-FreeBSD.sh install
# or
# # /usr/local/share/examples/tdiary/tdiary-FreeBSD.sh USERid
#
USERNAME=$1
DIARYDIR=diary
PUBLICHTML=public_html
PREFIX=@@@@PREFIX@@@@
TDCONFIG=@@@@LANG@@@@
EXAMPLES=${PREFIX}/share/examples
HOMEOWN=`grep ^$1: /etc/passwd | cut -f3 -d':'`
HOMEGRP=`grep ^$1: /etc/passwd | cut -f4 -d':'`
AUTHORN=`grep ^$1: /etc/passwd | cut -f5 -d':'`
HOMEDIR=`grep ^$1: /etc/passwd | cut -f6 -d':'`
HOSTSMTP=`hostname`
cd ${EXAMPLES}
if [ -z "$1" ]; then
echo "Usage: `basename $0` {username} or install"
exit 1
else
if [ -z "${HOMEOWN}" ] ; then
if [ "$1" = "install" ] ; then
if [ $(id -u) -eq 0 ]; then
echo "root can not use 'install' parameter."
exit 1
fi
else
echo "User unknown or no exist User Directory -> " $1 "-" ${HOMEDIR}
echo "Usage: `basename $0` {username} or install"
exit 1
fi
fi
fi
echo "************************************************************"
echo ""
case "$1" in
root)
echo "You can not copy ROOT Directory"
exit 1
;;
install)
HOMEOWN=`grep ^$USER: /etc/passwd | cut -f3 -d':'`
HOMEGRP=`grep ^$USER: /etc/passwd | cut -f4 -d':'`
HOMEDIR=`grep ^$USER: /etc/passwd | cut -f6 -d':'`
echo "HOME Directory : " ${HOMEDIR}
USERNAME=$USER
;;
*)
echo "HOME Directory : " ${HOMEDIR}
echo "USERNAME : " ${USERNAME}
USERNAME=$USER
;;
esac
if [ -x ${HOMEDIR} ]; then
if [ -z "$1" ]; then
echo "Usage: `basename $0` {username} or install"
exit 1
else
echo ""
echo "************************************************************"
echo "Starting tDiary for FreeBSD user directory installation ..."
echo ""
if [ ! -e ${HOMEDIR}/${DIARYDIR} ]; then
echo "Create ..." ${HOMEDIR}/${DIARYDIR}
mkdir ${HOMEDIR}/${DIARYDIR}
echo "Done"
fi
chmod o+rwx ${HOMEDIR}/${DIARYDIR}
chown ${HOMEOWN}:${HOMEGRP} ${HOMEDIR}/${DIARYDIR}
if [ ! -e ${HOMEDIR}/${PUBLICHTML} ]; then
echo "Create ..." ${HOMEDIR}/${USERNAME}/${PUBLICHTML}
mkdir ${HOMEDIR}/${PUBLICHTML}
chown ${HOMEOWN}:${HOMEGRP} ${HOMEDIR}/${PUBLICHTML}
echo "Done"
fi
echo "Copy tDiary ..." ${EXAMPLES}/tdiary/
echo " to " ${HOMEDIR}/${PUBLICHTML}/${DIARYDIR}/
cp -pR ${EXAMPLES}/tdiary/ ${HOMEDIR}/${PUBLICHTML}/${DIARYDIR}/
chown -R ${HOMEOWN}:${HOMEGRP} ${HOMEDIR}/${PUBLICHTML}/${DIARYDIR}/
chmod o+rwx ${HOMEDIR}/${PUBLICHTML}/${DIARYDIR}
echo "Done"
sed -e 's#'/home/foo/diary'#'${HOMEDIR}'/'${DIARYDIR}'#g' \
-e 's#smtp.example.net#'${HOSTSMTP}'#g' \
-e "s#foo@example.net#"${USERNAME}"@"${HOSTSMTP}"#g" \
-e "s#Your name#${AUTHORN}#g" \
-e "s#hogehoge diary#${AUTHORN} Diary#g" \
-e "s#http://www.example.net/~foo/#http://"${HOSTSMTP}"/~"${USERNAME}"#g" \
< ${EXAMPLES}/tdiary/tdiary.conf.sample > ${HOMEDIR}/${PUBLICHTML}/${DIARYDIR}/tdiary.conf-ja
chown ${HOMEOWN}:${HOMEGRP} ${HOMEDIR}/${PUBLICHTML}/${DIARYDIR}/tdiary.conf-ja
if [ -e ${HOMEDIR}/${PUBLICHTML}/${DIARYDIR}/.htaccess ]; then
sed -e 's#foo#'${USERNAME}'#g' < ${EXAMPLES}/tdiary/dot.htaccess > ${HOMEDIR}/${PUBLICHTML}/${DIARYDIR}/dot.htaccess.orig
chown ${HOMEOWN}:${HOMEGRP} ${HOMEDIR}/${PUBLICHTML}/${DIARYDIR}/dot.htaccess.orig
else
sed -e 's#foo#'${USERNAME}'#g' < ${EXAMPLES}/tdiary/dot.htaccess > ${HOMEDIR}/${PUBLICHTML}/${DIARYDIR}/.htaccess
chown ${HOMEOWN}:${HOMEGRP} ${HOMEDIR}/${PUBLICHTML}/${DIARYDIR}/.htaccess
fi
sed -e 's#'/home/foo/diary'#'${HOMEDIR}'/'${DIARYDIR}'#g' \
-e 's#smtp.example.net#'${HOSTSMTP}'#g' \
-e "s#foo@example.net#"${USERNAME}"@"${HOSTSMTP}"#g" \
-e "s#Your name#${AUTHORN}#g" \
-e "s#foobar diary#${AUTHORN} Diary#g" \
-e "s#Foo\'s diary#${AUTHORN}\'s Diary#g" \
-e "s#http://www.example.net/~foo/#http://"${HOSTSMTP}"/~"${USERNAME}"#g" \
< ${EXAMPLES}/tdiary/misc/i18n/tdiary.conf.sample-en > ${HOMEDIR}/${PUBLICHTML}/${DIARYDIR}/tdiary.conf-en
chown ${HOMEOWN}:${HOMEGRP} ${HOMEDIR}/${PUBLICHTML}/${DIARYDIR}/tdiary.conf-en
rm -f ${HOMEDIR}/${PUBLICHTML}/${DIARYDIR}/tdiary-FreeBSD.sh
if [ -e ${HOMEDIR}/${PUBLICHTML}/${DIARYDIR}/tdiary.conf ]; then
echo ""
else
echo "Install ${TDCONFIG} ... Done"
mv ${HOMEDIR}/${PUBLICHTML}/${DIARYDIR}/${TDCONFIG} ${HOMEDIR}/${PUBLICHTML}/${DIARYDIR}/tdiary.conf
fi
fi
else
echo ""
echo "User unknown or no exist User Directory -> " $1 "-" ${HOMEDIR}
echo "Usage: `basename $0` {username} or install"
exit 1
fi
echo ""
echo ""
echo "***"
echo "You have to execute the following commands:"
echo " % /usr/local/sbin/htpasswd -c" ${HOMEDIR}/.htpasswd ${USERNAME}
echo ""
echo "Be sure to read the ${HOMEDIR}/${PUBLICHTML}/${DIARYDIR}/README"
echo " file for additional information."
echo "************************************************************"
echo ""
exit 0

View File

@ -1,2 +1 @@
%%EXAMPLESDIR%%/tdiaryinst.rb
%%EXAMPLESDIR%%/tdiary-FreeBSD.sh

View File

@ -6,13 +6,12 @@
#
PORTNAME= tdiary
PORTVERSION= 1.5.6
PORTREVISION= 2
PORTVERSION= 1.5.7
CATEGORIES?= www ruby
MASTER_SITES= \
${MASTER_SITE_SOURCEFORGE} \
http://www.tdiary.org/download/
MASTER_SITE_SUBDIR= sourceforge/${PORTNAME}
MASTER_SITE_SUBDIR= ${PORTNAME}
DISTNAME= ${PORTNAME}-full-${PORTVERSION}
MAINTAINER= jfkimura@yahoo.co.jp
@ -26,7 +25,7 @@ USE_RUBY= yes
USE_RUBY_FEATURES= fileutils
.endif
RUBY_SHEBANG_FILES= index.rb update.rb misc/convert2.rb misc/posttdiary.rb misc/plugin/squeeze.rb \
RUBY_SHEBANG_FILES= index.rb update.rb misc/convert2.rb misc/plugin/squeeze.rb \
misc/plugin/windex.rb misc/plugin/a/a_conf.rb misc/plugin/trackback/tb.rb
TDIARYDIR= ${EXAMPLESDIR}
@ -56,10 +55,6 @@ do-install:
@${SED} -e 's,@@@@PREFIX@@@@,${PREFIX},g' \
-e 's,@@@@LANG@@@@,${TDIARY_LANG},g' \
${FILESDIR}/tdiaryinst.rb.in > ${TDIARYDIR}/tdiaryinst.rb
@${SED} -e 's,@@@@PREFIX@@@@,${PREFIX},g' \
-e 's,@@@@LANG@@@@,${TDIARY_LANG},g' \
${FILESDIR}/tdiary-FreeBSD.sh.in > ${TDIARYDIR}/tdiary-FreeBSD.sh
@${CHMOD} ugo=rx ${TDIARYDIR}/tdiary-FreeBSD.sh
@${CP} -pR ${WRKSRC}/ ${TDIARYDIR}
.if ${TDIARY_LANG} == tdiary.conf-en
@${ECHO_MSG} "===> TDIARY : English Language messages support"

View File

@ -1,2 +1,2 @@
MD5 (tdiary-full-1.5.6.tar.gz) = 559fd40263ae7fc76a1792fc71757c8f
SIZE (tdiary-full-1.5.6.tar.gz) = 1628374
MD5 (tdiary-full-1.5.7.tar.gz) = 13f728291eed51bc6033fae1510731bc
SIZE (tdiary-full-1.5.7.tar.gz) = 1640373

View File

@ -1,47 +0,0 @@
--- tdiary.rb Thu Nov 13 15:34:22 2003
+++ tdiary.rb.new Fri Nov 21 16:11:26 2003
@@ -1,13 +1,13 @@
=begin
== NAME
tDiary: the "tsukkomi-able" web diary system.
-tdiary.rb $Revision: 1.156 $
+tdiary.rb $Revision: 1.159 $
Copyright (C) 2001-2003, TADA Tadashi <sho@spc.gr.jp>
You can redistribute it and/or modify it under GPL2.
=end
-TDIARY_VERSION = '1.5.6'
+TDIARY_VERSION = '1.5.6.20031118'
require 'cgi'
begin
@@ -62,10 +62,14 @@
module Safe
def safe( level = 4 )
result = nil
- Thread.start {
- $SAFE = level
+ if $SAFE < level then
+ Thread.start {
+ $SAFE = level
+ result = yield
+ }.join
+ else
result = yield
- }.join
+ end
result
end
module_function :safe
@@ -740,7 +744,9 @@
r = str.dup
if @options['apply_plugin'] and str.index( '<%' ) then
r = str.untaint if $SAFE < 3
- r = ERbLight.new( r ).result( binding )
+ Safe::safe( @conf.secure ? 4 : 1 ) do
+ r = ERbLight.new( r ).result( binding )
+ end
end
r.gsub!( /<.*?>/, '' ) if remove_tag
r

View File

@ -1,143 +0,0 @@
#!/bin/sh
#
# tdiary-FreeBSD.sh - tDiary user directory copy script
#
# $FreeBSD$
#
# usage:
# % /usr/local/share/examples/tdiary/tdiary-FreeBSD.sh install
# or
# # /usr/local/share/examples/tdiary/tdiary-FreeBSD.sh USERid
#
USERNAME=$1
DIARYDIR=diary
PUBLICHTML=public_html
PREFIX=@@@@PREFIX@@@@
TDCONFIG=@@@@LANG@@@@
EXAMPLES=${PREFIX}/share/examples
HOMEOWN=`grep ^$1: /etc/passwd | cut -f3 -d':'`
HOMEGRP=`grep ^$1: /etc/passwd | cut -f4 -d':'`
AUTHORN=`grep ^$1: /etc/passwd | cut -f5 -d':'`
HOMEDIR=`grep ^$1: /etc/passwd | cut -f6 -d':'`
HOSTSMTP=`hostname`
cd ${EXAMPLES}
if [ -z "$1" ]; then
echo "Usage: `basename $0` {username} or install"
exit 1
else
if [ -z "${HOMEOWN}" ] ; then
if [ "$1" = "install" ] ; then
if [ $(id -u) -eq 0 ]; then
echo "root can not use 'install' parameter."
exit 1
fi
else
echo "User unknown or no exist User Directory -> " $1 "-" ${HOMEDIR}
echo "Usage: `basename $0` {username} or install"
exit 1
fi
fi
fi
echo "************************************************************"
echo ""
case "$1" in
root)
echo "You can not copy ROOT Directory"
exit 1
;;
install)
HOMEOWN=`grep ^$USER: /etc/passwd | cut -f3 -d':'`
HOMEGRP=`grep ^$USER: /etc/passwd | cut -f4 -d':'`
HOMEDIR=`grep ^$USER: /etc/passwd | cut -f6 -d':'`
echo "HOME Directory : " ${HOMEDIR}
USERNAME=$USER
;;
*)
echo "HOME Directory : " ${HOMEDIR}
echo "USERNAME : " ${USERNAME}
USERNAME=$USER
;;
esac
if [ -x ${HOMEDIR} ]; then
if [ -z "$1" ]; then
echo "Usage: `basename $0` {username} or install"
exit 1
else
echo ""
echo "************************************************************"
echo "Starting tDiary for FreeBSD user directory installation ..."
echo ""
if [ ! -e ${HOMEDIR}/${DIARYDIR} ]; then
echo "Create ..." ${HOMEDIR}/${DIARYDIR}
mkdir ${HOMEDIR}/${DIARYDIR}
echo "Done"
fi
chmod o+rwx ${HOMEDIR}/${DIARYDIR}
chown ${HOMEOWN}:${HOMEGRP} ${HOMEDIR}/${DIARYDIR}
if [ ! -e ${HOMEDIR}/${PUBLICHTML} ]; then
echo "Create ..." ${HOMEDIR}/${USERNAME}/${PUBLICHTML}
mkdir ${HOMEDIR}/${PUBLICHTML}
chown ${HOMEOWN}:${HOMEGRP} ${HOMEDIR}/${PUBLICHTML}
echo "Done"
fi
echo "Copy tDiary ..." ${EXAMPLES}/tdiary/
echo " to " ${HOMEDIR}/${PUBLICHTML}/${DIARYDIR}/
cp -pR ${EXAMPLES}/tdiary/ ${HOMEDIR}/${PUBLICHTML}/${DIARYDIR}/
chown -R ${HOMEOWN}:${HOMEGRP} ${HOMEDIR}/${PUBLICHTML}/${DIARYDIR}/
chmod o+rwx ${HOMEDIR}/${PUBLICHTML}/${DIARYDIR}
echo "Done"
sed -e 's#'/home/foo/diary'#'${HOMEDIR}'/'${DIARYDIR}'#g' \
-e 's#smtp.example.net#'${HOSTSMTP}'#g' \
-e "s#foo@example.net#"${USERNAME}"@"${HOSTSMTP}"#g" \
-e "s#Your name#${AUTHORN}#g" \
-e "s#hogehoge diary#${AUTHORN} Diary#g" \
-e "s#http://www.example.net/~foo/#http://"${HOSTSMTP}"/~"${USERNAME}"#g" \
< ${EXAMPLES}/tdiary/tdiary.conf.sample > ${HOMEDIR}/${PUBLICHTML}/${DIARYDIR}/tdiary.conf-ja
chown ${HOMEOWN}:${HOMEGRP} ${HOMEDIR}/${PUBLICHTML}/${DIARYDIR}/tdiary.conf-ja
if [ -e ${HOMEDIR}/${PUBLICHTML}/${DIARYDIR}/.htaccess ]; then
sed -e 's#foo#'${USERNAME}'#g' < ${EXAMPLES}/tdiary/dot.htaccess > ${HOMEDIR}/${PUBLICHTML}/${DIARYDIR}/dot.htaccess.orig
chown ${HOMEOWN}:${HOMEGRP} ${HOMEDIR}/${PUBLICHTML}/${DIARYDIR}/dot.htaccess.orig
else
sed -e 's#foo#'${USERNAME}'#g' < ${EXAMPLES}/tdiary/dot.htaccess > ${HOMEDIR}/${PUBLICHTML}/${DIARYDIR}/.htaccess
chown ${HOMEOWN}:${HOMEGRP} ${HOMEDIR}/${PUBLICHTML}/${DIARYDIR}/.htaccess
fi
sed -e 's#'/home/foo/diary'#'${HOMEDIR}'/'${DIARYDIR}'#g' \
-e 's#smtp.example.net#'${HOSTSMTP}'#g' \
-e "s#foo@example.net#"${USERNAME}"@"${HOSTSMTP}"#g" \
-e "s#Your name#${AUTHORN}#g" \
-e "s#foobar diary#${AUTHORN} Diary#g" \
-e "s#Foo\'s diary#${AUTHORN}\'s Diary#g" \
-e "s#http://www.example.net/~foo/#http://"${HOSTSMTP}"/~"${USERNAME}"#g" \
< ${EXAMPLES}/tdiary/misc/i18n/tdiary.conf.sample-en > ${HOMEDIR}/${PUBLICHTML}/${DIARYDIR}/tdiary.conf-en
chown ${HOMEOWN}:${HOMEGRP} ${HOMEDIR}/${PUBLICHTML}/${DIARYDIR}/tdiary.conf-en
rm -f ${HOMEDIR}/${PUBLICHTML}/${DIARYDIR}/tdiary-FreeBSD.sh
if [ -e ${HOMEDIR}/${PUBLICHTML}/${DIARYDIR}/tdiary.conf ]; then
echo ""
else
echo "Install ${TDCONFIG} ... Done"
mv ${HOMEDIR}/${PUBLICHTML}/${DIARYDIR}/${TDCONFIG} ${HOMEDIR}/${PUBLICHTML}/${DIARYDIR}/tdiary.conf
fi
fi
else
echo ""
echo "User unknown or no exist User Directory -> " $1 "-" ${HOMEDIR}
echo "Usage: `basename $0` {username} or install"
exit 1
fi
echo ""
echo ""
echo "***"
echo "You have to execute the following commands:"
echo " % /usr/local/sbin/htpasswd -c" ${HOMEDIR}/.htpasswd ${USERNAME}
echo ""
echo "Be sure to read the ${HOMEDIR}/${PUBLICHTML}/${DIARYDIR}/README"
echo " file for additional information."
echo "************************************************************"
echo ""
exit 0

View File

@ -1,2 +1 @@
%%EXAMPLESDIR%%/tdiaryinst.rb
%%EXAMPLESDIR%%/tdiary-FreeBSD.sh