From owner-freebsd-ports-bugs@FreeBSD.ORG Sat Jun 10 06:40:16 2006 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id EC90E16A474 for ; Sat, 10 Jun 2006 06:40:16 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id B333543D7B for ; Sat, 10 Jun 2006 06:40:15 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id k5A6eFkv003276 for ; Sat, 10 Jun 2006 06:40:15 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id k5A6eFor003275; Sat, 10 Jun 2006 06:40:15 GMT (envelope-from gnats) Resent-Date: Sat, 10 Jun 2006 06:40:15 GMT Resent-Message-Id: <200606100640.k5A6eFor003275@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, chinsan Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7467F16A418; Sat, 10 Jun 2006 06:36:35 +0000 (UTC) (envelope-from chinsan.tw@gmail.com) Received: from smtp2.bc.hgc.com.tw (smtp2.bc.hgc.com.tw [203.133.1.156]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0246043D70; Sat, 10 Jun 2006 06:36:34 +0000 (GMT) (envelope-from chinsan.tw@gmail.com) Received: from smtp2.bc.hgc.com.tw (u14-109.u203-187.giga.net.tw [203.187.14.109]) by smtp2.bc.hgc.com.tw (Postfix) with SMTP id 8D2D82E97C; Sat, 10 Jun 2006 14:36:34 +0800 (CST) Received: by smtp2.bc.hgc.com.tw (sSMTP sendmail emulation); Sat, 10 Jun 2006 14:37:19 +0800 Message-Id: <20060610063634.8D2D82E97C@smtp2.bc.hgc.com.tw> Date: Sat, 10 Jun 2006 14:37:19 +0800 From: chinsan To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: clsung@FreeBSD.org Subject: ports/98777: [MAINTAINER] chinese/phpbb-tw: update to 2.0.21 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: Sat, 10 Jun 2006 06:40:17 -0000 >Number: 98777 >Category: ports >Synopsis: [MAINTAINER] chinese/phpbb-tw: update to 2.0.21 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Sat Jun 10 06:40:15 GMT 2006 >Closed-Date: >Last-Modified: >Originator: chinsan >Release: FreeBSD 6.1-STABLE i386 >Organization: FreeBSD Taiwan >Environment: System: FreeBSD chinsan2.twbbs.org 6.1-STABLE FreeBSD 6.1-STABLE #1: Fri Jun 2 16:44:35 CST >Description: - Update to 2.0.21 Added file(s): - files/security-patch-includes-sessions.php Removed file(s): - files/patch-includes-sessions.php Generated with FreeBSD Port Tools 0.77 >How-To-Repeat: >Fix: --- phpbb-tw-2.0.21.patch begins here --- diff -ruN --exclude=CVS /usr/ports/chinese/phpbb-tw/Makefile /usr/home/chinsan/project/phpbb-tw/Makefile --- /usr/ports/chinese/phpbb-tw/Makefile Sat May 6 01:22:18 2006 +++ /usr/home/chinsan/project/phpbb-tw/Makefile Sat Jun 10 14:26:31 2006 @@ -2,16 +2,16 @@ # Date created: 2005/11/14 # Whom: chinsan # -# $FreeBSD: ports/chinese/phpbb-tw/Makefile,v 1.5 2006/05/03 23:38:32 edwin Exp $ +# $FreeBSD: ports/chinese/phpbb-tw/Makefile,v 1.3 2006/02/02 14:14:08 vanilla Exp $ # PORTNAME= phpbb -PORTVERSION= 2.0.20 +PORTVERSION= 2.0.21 CATEGORIES= chinese www MASTER_SITES= http://chinsan2.twbbs.org/distfiles/ \ ftp://chinsan2.twbbs.org/distfiles/ PKGNAMESUFFIX= -tw -DISTNAME= phpBB-${PORTVERSION} +DISTNAME= phpBB-tw-${PORTVERSION} MAINTAINER= chinsan.tw@gmail.com COMMENT= The Traditional Chinese version of phpBB @@ -19,6 +19,7 @@ RUN_DEPENDS= ${LOCALBASE}/share/pear/System.php:${PORTSDIR}/devel/pear CONFLICTS= phpbb-[0-9]* +USE_DOS2UNIX= yes # Get HOSTNAME .if exists(/sbin/sysctl) diff -ruN --exclude=CVS /usr/ports/chinese/phpbb-tw/distinfo /usr/home/chinsan/project/phpbb-tw/distinfo --- /usr/ports/chinese/phpbb-tw/distinfo Sat Apr 15 17:33:45 2006 +++ /usr/home/chinsan/project/phpbb-tw/distinfo Sat Jun 10 14:16:24 2006 @@ -1,3 +1,3 @@ -MD5 (phpBB-2.0.20.tar.gz) = 897066bef29732fdf6cf97905ef96542 -SHA256 (phpBB-2.0.20.tar.gz) = d13deacb0cee3dd6db4813f630aac98927097d75ed742c76b5af7d0c8bf1dc2d -SIZE (phpBB-2.0.20.tar.gz) = 654954 +MD5 (phpBB-tw-2.0.21.tar.gz) = d8189b577925125e1fc4206d68203b7a +SHA256 (phpBB-tw-2.0.21.tar.gz) = 221e9e76480fd059eb2d4cc56600f591a54d992a4b821002d6a8ce29400260fc +SIZE (phpBB-tw-2.0.21.tar.gz) = 620058 diff -ruN --exclude=CVS /usr/ports/chinese/phpbb-tw/files/patch-includes-sessions.php /usr/home/chinsan/project/phpbb-tw/files/patch-includes-sessions.php --- /usr/ports/chinese/phpbb-tw/files/patch-includes-sessions.php Tue Nov 15 00:07:16 2005 +++ /usr/home/chinsan/project/phpbb-tw/files/patch-includes-sessions.php Thu Jan 1 08:00:00 1970 @@ -1,11 +0,0 @@ ---- includes/sessions.php.orig Sat May 14 05:04:00 2005 -+++ includes/sessions.php Sun May 15 18:53:48 2005 -@@ -167,7 +167,7 @@ - $sql = "INSERT INTO " . SESSIONS_TABLE . " - (session_id, session_user_id, session_start, session_time, session_ip, session_page, session_logged_in, session_admin) - VALUES ('$session_id', $user_id, $current_time, $current_time, '$user_ip', $page_id, $login, $admin)"; -- if ( !$db->sql_query($sql) ) -+ if ( $user_id != ANONYMOUS && !$db->sql_query($sql) ) - { - message_die(CRITICAL_ERROR, 'Error creating new session', '', __LINE__, __FILE__, $sql); - } diff -ruN --exclude=CVS /usr/ports/chinese/phpbb-tw/files/security-patch-includes-sessions.php /usr/home/chinsan/project/phpbb-tw/files/security-patch-includes-sessions.php --- /usr/ports/chinese/phpbb-tw/files/security-patch-includes-sessions.php Thu Jan 1 08:00:00 1970 +++ /usr/home/chinsan/project/phpbb-tw/files/security-patch-includes-sessions.php Sat Jun 10 11:34:14 2006 @@ -0,0 +1,11 @@ +--- includes/sessions.php.orig Sat May 14 05:04:00 2005 ++++ includes/sessions.php Sun May 15 18:53:48 2005 +@@ -167,7 +167,7 @@ + $sql = "INSERT INTO " . SESSIONS_TABLE . " + (session_id, session_user_id, session_start, session_time, session_ip, session_page, session_logged_in, session_admin) + VALUES ('$session_id', $user_id, $current_time, $current_time, '$user_ip', $page_id, $login, $admin)"; +- if ( !$db->sql_query($sql) ) ++ if ( $user_id != ANONYMOUS && !$db->sql_query($sql) ) + { + message_die(CRITICAL_ERROR, 'Error creating new session', '', __LINE__, __FILE__, $sql); + } diff -ruN --exclude=CVS /usr/ports/chinese/phpbb-tw/pkg-plist /usr/home/chinsan/project/phpbb-tw/pkg-plist --- /usr/ports/chinese/phpbb-tw/pkg-plist Mon May 22 14:13:13 2006 +++ /usr/home/chinsan/project/phpbb-tw/pkg-plist Sat Jun 10 14:27:27 2006 @@ -139,8 +139,6 @@ %%PHPBBDIR%%/language/lang_chinese_traditional_taiwan/lang_bbcode.php %%PHPBBDIR%%/language/lang_chinese_traditional_taiwan/lang_faq.php %%PHPBBDIR%%/language/lang_chinese_traditional_taiwan/lang_main.php -%%PHPBBDIR%%/language/lang_chinese_traditional_taiwan/search_stopwords.txt -%%PHPBBDIR%%/language/lang_chinese_traditional_taiwan/search_synonyms.txt %%PHPBBDIR%%/language/lang_english/email/admin_activate.tpl %%PHPBBDIR%%/language/lang_english/email/admin_send_email.tpl %%PHPBBDIR%%/language/lang_english/email/admin_welcome_activated.tpl @@ -180,6 +178,7 @@ %%PHPBBDIR%%/templates/subSilver/admin/auth_ug_body.tpl %%PHPBBDIR%%/templates/subSilver/admin/board_config_body.tpl %%PHPBBDIR%%/templates/subSilver/admin/category_edit_body.tpl +%%PHPBBDIR%%/templates/subSilver/admin/confirm_body.tpl %%PHPBBDIR%%/templates/subSilver/admin/db_utils_backup_body.tpl %%PHPBBDIR%%/templates/subSilver/admin/db_utils_restore_body.tpl %%PHPBBDIR%%/templates/subSilver/admin/disallow_body.tpl @@ -223,7 +222,6 @@ %%PHPBBDIR%%/templates/subSilver/groupcp_info_body.tpl %%PHPBBDIR%%/templates/subSilver/groupcp_pending_info.tpl %%PHPBBDIR%%/templates/subSilver/groupcp_user_body.tpl -%%PHPBBDIR%%/templates/subSilver/images/Thumbs.db %%PHPBBDIR%%/templates/subSilver/images/cellpic.gif %%PHPBBDIR%%/templates/subSilver/images/cellpic1.gif %%PHPBBDIR%%/templates/subSilver/images/cellpic2.jpg @@ -256,7 +254,6 @@ %%PHPBBDIR%%/templates/subSilver/images/icon_minipost_new.gif %%PHPBBDIR%%/templates/subSilver/images/icon_newest_reply.gif %%PHPBBDIR%%/templates/subSilver/images/index.htm -%%PHPBBDIR%%/templates/subSilver/images/lang_chinese_traditional_taiwan/Thumbs.db %%PHPBBDIR%%/templates/subSilver/images/lang_chinese_traditional_taiwan/icon_aim.gif %%PHPBBDIR%%/templates/subSilver/images/lang_chinese_traditional_taiwan/icon_edit.gif %%PHPBBDIR%%/templates/subSilver/images/lang_chinese_traditional_taiwan/icon_email.gif @@ -273,7 +270,6 @@ %%PHPBBDIR%%/templates/subSilver/images/lang_chinese_traditional_taiwan/post.gif %%PHPBBDIR%%/templates/subSilver/images/lang_chinese_traditional_taiwan/reply-locked.gif %%PHPBBDIR%%/templates/subSilver/images/lang_chinese_traditional_taiwan/reply.gif -%%PHPBBDIR%%/templates/subSilver/images/lang_english/Thumbs.db %%PHPBBDIR%%/templates/subSilver/images/lang_english/icon_aim.gif %%PHPBBDIR%%/templates/subSilver/images/lang_english/icon_edit.gif %%PHPBBDIR%%/templates/subSilver/images/lang_english/icon_email.gif @@ -378,5 +374,5 @@ @dirrmtry %%PHPBBDIR%%/templates/subSilver/images @dirrmtry %%PHPBBDIR%%/templates/subSilver @dirrmtry %%PHPBBDIR%%/templates -@unexec rmdir %D/%%PHPBBDIR%% 2>/dev/null || echo "Note: %D/%%PHPBBDIR%% not empty -- not deleted!" +@dirrmtry %%PHPBBDIR%% || echo "Note: %D/%%PHPBBDIR%% not empty -- not deleted!" @dirrmtry www/data --- phpbb-tw-2.0.21.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: