From owner-freebsd-ports-bugs@FreeBSD.ORG Mon Apr 4 04:40:05 2005 Return-Path: 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 2044516A4CE for ; Mon, 4 Apr 2005 04:40:05 +0000 (GMT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id CA08D43D5A for ; Mon, 4 Apr 2005 04:40:04 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.3/8.13.3) with ESMTP id j344e428034988 for ; Mon, 4 Apr 2005 04:40:04 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.3/8.13.1/Submit) id j344e4lO034987; Mon, 4 Apr 2005 04:40:04 GMT (envelope-from gnats) Resent-Date: Mon, 4 Apr 2005 04:40:04 GMT Resent-Message-Id: <200504040440.j344e4lO034987@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, Linh Pham Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 22F1F16A4CE for ; Mon, 4 Apr 2005 04:34:15 +0000 (GMT) Received: from q.closedsrc.org (ip233.gte244.dsl-acs2.sea.iinet.com [209.20.244.233]) by mx1.FreeBSD.org (Postfix) with ESMTP id B0E1143D53 for ; Mon, 4 Apr 2005 04:34:14 +0000 (GMT) (envelope-from question@closedsrc.org) Received: by q.closedsrc.org (Postfix, from userid 1001) id 98E8C45020; Sun, 3 Apr 2005 21:34:07 -0700 (PDT) Message-Id: <20050404043407.98E8C45020@q.closedsrc.org> Date: Sun, 3 Apr 2005 21:34:07 -0700 (PDT) From: Linh Pham To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: ports/79515: Update port: security/base to 1.1 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 04 Apr 2005 04:40:05 -0000 >Number: 79515 >Category: ports >Synopsis: Update port: security/base to 1.1 >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: Mon Apr 04 04:40:04 GMT 2005 >Closed-Date: >Last-Modified: >Originator: Linh Pham >Release: FreeBSD 5.3-RELEASE-p4 i386 >Organization: >Environment: System: FreeBSD q.internal.closedsrc.org 5.3-RELEASE-p4 FreeBSD 5.3-RELEASE-p4 #5: Sat Jan 8 23:34:57 PST 2005 question@q.internal.closedsrc.org:/usr/obj/usr/src/sys/Q i386 >Description: Update port to 1.1, which no longer requires graphics/jpgraph as a dependency. Updated pkg-plist to not remove ${PREFIX}/www/base if there is anything left (say base_conf.php). The base 1.1 source tarball includes a modified base_conf.php which shouldn't be installed. Hope everything looks good. >How-To-Repeat: >Fix: --- base-1.1.diff begins here --- diff -ruN /usr/ports/security/base/Makefile base/Makefile --- /usr/ports/security/base/Makefile Sun Feb 20 16:17:25 2005 +++ base/Makefile Sun Apr 3 21:31:07 2005 @@ -6,7 +6,7 @@ # PORTNAME= base -PORTVERSION= 1.0.2 +PORTVERSION= 1.1 CATEGORIES= security MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= secureideas @@ -15,25 +15,23 @@ COMMENT= Basic Analysis and Security Engine - analyzing Snort alerts RUN_DEPENDS= ${LOCALBASE}/bin/snort:${PORTSDIR}/security/snort \ - ${ADODB_DIR}/adodb.inc.php:${PORTSDIR}/databases/adodb \ - ${JPGRAPH_DIR}/jpgraph.php:${PORTSDIR}/graphics/jpgraph + ${ADODB_DIR}/adodb.inc.php:${PORTSDIR}/databases/adodb USE_PHP= yes USE_REINPLACE= yes ADODB_DIR= ${LOCALBASE}/share/adodb -JPGRAPH_DIR= ${LOCALBASE}/share/jpgraph SUB_FILES= pkg-message DOCS= docs/CHANGELOG docs/CREDITS docs/README docs/TODO docs/UPGRADE do-build: @${REINPLACE_CMD} -e 's,DBlib_path = "",DBlib_path = "${ADODB_DIR}",' \ - -e 's,ChartLib_path = "",ChartLib_path = "${JPGRAPH_DIR}",' \ ${WRKSRC}/base_conf.php.dist do-install: @${MKDIR} ${PREFIX}/www/base/includes/templates/default + @${RM} ${WRKSRC}/base_conf.php ${INSTALL_DATA} ${WRKSRC}/*.php ${WRKSRC}/*.dist ${PREFIX}/www/base .for dir in admin help includes languages setup @${MKDIR} ${PREFIX}/www/base/${dir} diff -ruN /usr/ports/security/base/distinfo base/distinfo --- /usr/ports/security/base/distinfo Sun Feb 20 16:17:25 2005 +++ base/distinfo Sun Apr 3 19:30:56 2005 @@ -1,2 +1,2 @@ -MD5 (base-1.0.2.tar.gz) = 579378300f88d3076d645f26c30b7ec4 -SIZE (base-1.0.2.tar.gz) = 265051 +MD5 (base-1.1.tar.gz) = 38a5e02337103754de743fbaaa1bfdae +SIZE (base-1.1.tar.gz) = 277864 diff -ruN /usr/ports/security/base/pkg-plist base/pkg-plist --- /usr/ports/security/base/pkg-plist Sun Feb 20 16:17:25 2005 +++ base/pkg-plist Sun Apr 3 20:55:19 2005 @@ -99,6 +99,7 @@ www/base/sql/create_base_tbls_mssql.sql www/base/sql/create_base_tbls_mssql_extra.sql www/base/sql/create_base_tbls_mysql.sql +www/base/sql/create_base_tbls_oracle.sql www/base/sql/create_base_tbls_pgsql.sql www/base/sql/create_base_tbls_pgsql_extra.sql www/base/sql/upgrade_0.9.x_to_1.0-mysql.sql @@ -113,4 +114,4 @@ @dirrm www/base/images @dirrm www/base/help @dirrm www/base/admin -@dirrm www/base +@unexec rmdir %D/www/base 2>/dev/null || true --- base-1.1.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: