From owner-freebsd-ports-bugs@FreeBSD.ORG Sun Oct 21 11:40:00 2012 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id D9E5F575 for ; Sun, 21 Oct 2012 11:40:00 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.FreeBSD.org [8.8.178.135]) by mx1.freebsd.org (Postfix) with ESMTP id AD7F98FC12 for ; Sun, 21 Oct 2012 11:40:00 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.5/8.14.5) with ESMTP id q9LBe05B015557 for ; Sun, 21 Oct 2012 11:40:00 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.5/8.14.5/Submit) id q9LBe0eR015556; Sun, 21 Oct 2012 11:40:00 GMT (envelope-from gnats) Resent-Date: Sun, 21 Oct 2012 11:40:00 GMT Resent-Message-Id: <201210211140.q9LBe0eR015556@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, Neil Darlow Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id A3F9248A for ; Sun, 21 Oct 2012 11:37:41 +0000 (UTC) (envelope-from neil@darlow.co.uk) Received: from relay.darlow.co.uk (relay.darlow.co.uk [195.3.137.233]) by mx1.freebsd.org (Postfix) with ESMTP id 4805D8FC0C for ; Sun, 21 Oct 2012 11:37:40 +0000 (UTC) Received: from bumblebee.darlow.co.uk (cpc1-bigg2-0-0-cust442.9-2.cable.virginmedia.com [80.6.45.187]) by relay.darlow.co.uk (8.14.5/8.14.5) with ESMTP id q9LBbdVk089443 (version=TLSv1/SSLv3 cipher=DHE-RSA-CAMELLIA256-SHA bits=256 verify=OK) for ; Sun, 21 Oct 2012 12:37:39 +0100 (BST) (envelope-from neil@darlow.co.uk) Received: by bumblebee.darlow.co.uk (Postfix, from userid 1004) id 3XkzPG6m0cz1504; Sun, 21 Oct 2012 12:37:38 +0100 (BST) Message-Id: <3XkzPG6m0cz1504@bumblebee.darlow.co.uk> Date: Sun, 21 Oct 2012 12:37:38 +0100 (BST) From: Neil Darlow To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: ports/172929: www/hastymail2 update to 1.1 final from beta X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: Neil Darlow List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 21 Oct 2012 11:40:00 -0000 >Number: 172929 >Category: ports >Synopsis: www/hastymail2 update to 1.1 final from beta >Confidential: no >Severity: serious >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Sun Oct 21 11:40:00 UTC 2012 >Closed-Date: >Last-Modified: >Originator: Neil Darlow >Release: FreeBSD 9.0-RELEASE-p4 amd64 >Organization: >Environment: System: FreeBSD bumblebee.darlow.co.uk 9.0-RELEASE-p4 FreeBSD 9.0-RELEASE-p4 #0: Tue Aug 7 13:39:13 BST 2012 root@bumblebee.darlow.co.uk:/usr/obj/usr/src/sys/GENERIC amd64 >Description: Updates www/hastymail2 from Beta version of 1.1 to 1.1 final. Security vulnerabilities are fixed in this version. Addresses the concerns on Report #165549 which was closed because no patch was forthcoming. >How-To-Repeat: N/A >Fix: A patch follows. diff -ur www/hastymail2.orig/Makefile www/hastymail2/Makefile --- www/hastymail2.orig/Makefile 2011-09-17 09:42:11.000000000 +0100 +++ www/hastymail2/Makefile 2012-09-14 09:42:36.000000000 +0100 @@ -7,10 +7,10 @@ PORTNAME= hastymail2 PORTVERSION= 1.1 -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 1 CATEGORIES= www mail -MASTER_SITES= SF/hastymail/Hastymail2%20Stable%20Releases/Hastymail2%201.01/ +MASTER_SITES= SF/hastymail/Hastymail2%20Stable%20Releases/Hastymail2%201.1/ DISTNAME= hastymail2_${WIKEDVERSION} MAINTAINER= graudeejs@gmail.com @@ -21,22 +21,23 @@ NO_BUILD= yes SUB_FILES= pkg-message -CONFLICTS= hastymail2-devel-1.[0-9]* +CONFLICTS= hastymail-* hastymail2-devel-* -INSTALL_DIR?= www/${PORTNAME} PLIST= ${WRKDIR}/pkg-plist WANT_PHP_WEB= yes -USE_PHP= session imap pcre +USE_PHP= ctype pcre session xml -WIKEDVERSION= 1_01 +WIKEDVERSION= 1_1 WRKSRC= ${WRKDIR}/${PORTNAME}_${WIKEDVERSION} NO_BUILD= yes FIND_SKIP_OPTS= -not -name hastymail2.conf.example -not -name '*.orig' OPTIONS= PGSQL "Use PostgreSQL" off \ MYSQL "Use MySQL" off \ - DB "Use older pear DB (instead of MDB2)" off + DB "Use older pear DB (instead of MDB2)" off \ + ICONV "Support character set conversion" off \ + MBSTRING "Support multi-byte character sets" off .include @@ -58,6 +59,14 @@ RUN_DEPENDS+= ${LOCALBASE}/share/pear/DB.php:${PORTSDIR}/databases/pear-DB .endif +.if defined(WITH_ICONV) +USE_PHP+= iconv +.endif + +.if defined(WITH_MBSTRING) +USE_PHP+= mbstring +.endif + post-patch: @${SED} -I.orig -e "s#'/etc/hastymail2/hastymail2.rc'#'${PREFIX}/etc/hastymail2/hastymail2.rc'#" \ ${WRKSRC}/index.php @@ -66,17 +75,17 @@ pre-install: @${FIND} -s -d ${WRKSRC}/ -type f ${FIND_SKIP_OPTS} \ - | ${SED} "s#${WRKSRC}#${INSTALL_DIR}#g" > ${PLIST} + | ${SED} "s#${WRKSRC}#${WWWDIR_REL}#g" > ${PLIST} @${ECHO_CMD} etc/hastymail2/hastymail2.conf.sample >> ${PLIST} @${FIND} -s -d ${WRKSRC}/ -type d ${FIND_SKIP_OPTS} \ - | ${SED} "s#${WRKSRC}#@dirrm ${INSTALL_DIR}#g" >> ${PLIST} + | ${SED} "s#${WRKSRC}#@dirrm ${WWWDIR_REL}#g" >> ${PLIST} @${ECHO_CMD} @dirrmtry etc/hastymail2 >> ${PLIST} do-install: - @${MKDIR} ${PREFIX}/${INSTALL_DIR} + @${MKDIR} ${WWWDIR} @cd ${WRKSRC} && ${FIND} . ${FIND_SKIP_OPTS} \ - | ${PAX} -rwd ${PREFIX}/${INSTALL_DIR} - @${CHOWN} -R ${WWWOWN}:${WWWGRP} ${PREFIX}/${INSTALL_DIR} + | ${PAX} -rwd ${WWWDIR} + @${CHOWN} -R ${WWWOWN}:${WWWGRP} ${WWWDIR} @${MKDIR} ${PREFIX}/etc/hastymail2 @${INSTALL_DATA} ${WRKSRC}/hastymail2.conf.example \ ${PREFIX}/etc/hastymail2/hastymail2.conf.sample diff -ur www/hastymail2.orig/distinfo www/hastymail2/distinfo --- www/hastymail2.orig/distinfo 2010-12-16 23:05:48.000000000 +0000 +++ www/hastymail2/distinfo 2012-09-14 09:43:22.000000000 +0100 @@ -1,2 +1,2 @@ -SHA256 (hastymail2_1_01.tar.gz) = 70e599ed0cae544bb1a2ea064dead7cdb1bb42d8fa7c46e9d2183d6aae7c73f6 -SIZE (hastymail2_1_01.tar.gz) = 1858492 +SHA256 (hastymail2_1_1.tar.gz) = 84a53fadfe943b334ea0e9c8c364fe1c4b3b3692ff8935e61743547901193a4e +SIZE (hastymail2_1_1.tar.gz) = 2421216 >Release-Note: >Audit-Trail: >Unformatted: