Attachment 48696 Details for Bug 74492 – base-1.0.diff

[patch] base-1.0.diff

base-1.0.diff (text/plain), 10.85 KB, created by Linh Pham on 2004-11-28 21:50:29 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Linh Pham

Created: 2004-11-28 21:50:29 UTC

Size: 10.85 KB

patch

obsolete

>diff -ruN /usr/ports/security/acid/Makefile base/Makefile
>--- /usr/ports/security/acid/Makefile	Thu Jun 3 11:04:18 2004
>+++ base/Makefile	Sun Nov 28 13:38:12 2004
>@@ -5,13 +5,13 @@
> # $FreeBSD: ports/security/acid/Makefile,v 1.17 2004/05/25 00:01:44 pav Exp $
> #
> 
>-PORTNAME=	acid
>-PORTVERSION=	0.9.6b23
>+PORTNAME=	base
>+PORTVERSION=	1.0
> CATEGORIES=	security
>-MASTER_SITES=	http://www.andrew.cmu.edu/user/rdanyliw/snort/
>+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
> 
>-MAINTAINER=	possamai@xs4all.nl
>-COMMENT=	Analysis Console for Intrusion Databases (ACID) with Snort and MySQL
>+MAINTAINER=	question+fbsdports@closedsrc.org
>+COMMENT=	Basic Analysis and Security Engine, based on ACID, for analyzing SNORT alerts
> 
> RUN_DEPENDS=	${LOCALBASE}/bin/snort:${PORTSDIR}/security/snort \
> 		${LOCALBASE}/share/adodb/adodb.inc.php:${PORTSDIR}/databases/adodb
>@@ -21,17 +21,10 @@
> NO_BUILD=	yes
> 
> do-install:
>-	@${MKDIR} ${PREFIX}/www/acid
>-.for ext in html php sql css inc
>-	@${INSTALL_DATA} ${WRKSRC}/*.${ext} ${PREFIX}/www/acid
>-.endfor
>-.ifndef(NOPORTDOCS)
>-	@${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/www/acid
>-	@${INSTALL_DATA} ${WRKSRC}/README.mssql ${PREFIX}/www/acid
>-	@${INSTALL_DATA} ${WRKSRC}/CREDITS ${PREFIX}/www/acid
>-	@${INSTALL_DATA} ${WRKSRC}/TODO ${PREFIX}/www/acid
>-	@${INSTALL_DATA} ${WRKSRC}/CHANGELOG ${PREFIX}/www/acid
>-.endif
>+	@${MKDIR} ${PREFIX}/www/base
>+	@${CP} -R ${WRKSRC}/* ${PREFIX}/www/base/
>+	@${RM} ${PREFIX}/www/base/base_conf.php.dist.orig
>+	@${MV} ${PREFIX}/www/base/base_conf.php.dist ${PREFIX}/www/base/base_conf.php
> 
> post-install:
> 	@${SED} 's|%%PREFIX%%|${PREFIX}|' ${PKGMESSAGE}
>diff -ruN /usr/ports/security/acid/README.html base/README.html
>--- /usr/ports/security/acid/README.html	Sat Jan 10 18:00:37 2004
>+++ base/README.html	Wed Dec 31 16:00:00 1969
>@@ -1,43 +0,0 @@
>-<!DOCTYPE html PUBLIC "-//IETF//DTD HTML 2.0//EN">
>-
>-<html>
>- <head>
>- <title>The FreeBSD Ports Collection (security/acid)</title>
>- </head>
>-
>- <body>
>- <h1>The FreeBSD Ports Collection (security/acid)</h1>
>- <hr>
>-
>- You are now in the directory for the port "security/acid".
>-
>- The package name of this port is "acid-0.9.6b23".
>-
>- This is the one-line description for this port:
>- <hr>
>-
>- 
>-Analysis Console for Intrusion Databases (ACID) with Snort and MySQL
>- 
>- <hr>
>-
>- Please read the "<a href="pkg-descr">description file</a>" for a
>- longer description and/or visit the <a href="http://www.cert.org/kb/acid/">web site</a> for futher informations.
>-
>- If needed, you may contact the <a href=
>- "mailto:possamai@xs4all.nl">maintainer</a> of this port or the port <a href=
>- "mailto:ports@FreeBSD.org">mailing-list</a>.
>-
>- 
>-
>- This port requires package(s) "adodb-3.60_1 apache-1.3.29_1 expat-1.95.6_1 mod_php4-4.3.4_2,1 mysql-client-3.23.58 mysql-client-4.0.16 mysql-server-3.23.58 p5-DBI-137-1.37 p5-Data-ShowTable-3.3 p5-Mysql-modules-1.2219 perl-5.6.1_15 snort-2.0.5" to run.
>-
>- Go to the <a href="../../README.html">top of the ports tree</a> for
>- a summary on how to use the ports collection.
>- <hr>
>-
>- <a href="../README.html">Go up one level</a> | <a href=
>- "../../README.html">Go to top of ports tree</a>
>- </body>
>-</html>
>-
>diff -ruN /usr/ports/security/acid/distinfo base/distinfo
>--- /usr/ports/security/acid/distinfo	Mon Feb 23 19:44:16 2004
>+++ base/distinfo	Sun Nov 28 13:12:20 2004
>@@ -1,2 +1,2 @@
>-MD5 (acid-0.9.6b23.tar.gz) = d8c49614393fa05ac140de349f57e438
>-SIZE (acid-0.9.6b23.tar.gz) = 116728
>+MD5 (base-1.0.tar.gz) = ee1cd5f730879d3d15dfd4d6434667be
>+SIZE (base-1.0.tar.gz) = 247642
>diff -ruN /usr/ports/security/acid/files/patch-aa base/files/patch-aa
>--- /usr/ports/security/acid/files/patch-aa	Fri Aug 30 20:17:23 2002
>+++ base/files/patch-aa	Sun Nov 28 13:19:08 2004
>@@ -1,6 +1,6 @@
>---- acid_conf.php	Mon Mar 4 00:02:44 2002
>-+++ /usr/local/www/acid/acid_conf.php	Wed Apr 10 00:22:38 2002
>-@@ -9,7 +9,7 @@
>+--- base_conf.php.dist.orig	Sun Nov 28 13:18:30 2004
>++++ base_conf.php.dist	Sun Nov 28 13:18:43 2004
>+@@ -46,7 +46,7 @@
> * $foo = "c:\tmp" [OK]
> * $foo = "c:\tmp\" [WRONG]
> */
>diff -ruN /usr/ports/security/acid/pkg-descr base/pkg-descr
>--- /usr/ports/security/acid/pkg-descr	Mon Sep 25 19:58:04 2000
>+++ base/pkg-descr	Sun Nov 28 13:40:23 2004
>@@ -1,6 +1,6 @@
>-ACID is a PHP-based analysis engine to search and process a database of 
>-security incidents generated by the NDIS Snort. The features currently
>-include:
>+BASE is a PHP-based analysis engine based on ACID to search and process a
>+database of security incidents generated by the NDIS Snort. The features
>+currently include:
> 
> - Search interface for finding alerts matching practically any criteria.
> This includes arrival time, signature time, source/dest address/port,
>@@ -15,4 +15,4 @@
> 
> - All features are provided in real-time 
> 
>-WWW: http://www.cert.org/kb/acid/
>+WWW: http://base.secureideas.net/
>diff -ruN /usr/ports/security/acid/pkg-message base/pkg-message
>--- /usr/ports/security/acid/pkg-message	Mon Feb 23 19:44:16 2004
>+++ base/pkg-message	Sun Nov 28 13:37:01 2004
>@@ -1,8 +1,8 @@
> ************************************************************
> Please read the README file located at:
> 
>-%%PREFIX%%/www/acid/README
>+%%PREFIX%%/www/base/docs/README
> 
>-for how to configure %%PREFIX%%/www/acid/acid_conf.php after
>+for how to configure %%PREFIX%%/www/base/base_conf.php after
> installation.
> ************************************************************
>diff -ruN /usr/ports/security/acid/pkg-plist base/pkg-plist
>--- /usr/ports/security/acid/pkg-plist	Wed Feb 26 00:28:54 2003
>+++ base/pkg-plist	Sun Nov 28 13:38:25 2004
>@@ -1,58 +1,114 @@
>-www/acid/CHANGELOG
>-www/acid/CREDITS
>-www/acid/README
>-www/acid/README.mssql
>-www/acid/TODO
>-www/acid/acid_action.inc
>-www/acid/acid_ag_common.php
>-www/acid/acid_ag_main.php
>-www/acid/acid_app_faq.php
>-www/acid/acid_cache.inc
>-www/acid/acid_common.php
>-www/acid/acid_conf.php
>-www/acid/acid_constants.inc
>-www/acid/acid_db.inc
>-www/acid/acid_db_common.php
>-www/acid/acid_db_setup.php
>-www/acid/acid_footer.html
>-www/acid/acid_graph_common.php
>-www/acid/acid_graph_display.php
>-www/acid/acid_graph_form.php
>-www/acid/acid_graph_main.php
>-www/acid/acid_hdr1.html
>-www/acid/acid_hdr2.html
>-www/acid/acid_include.inc
>-www/acid/acid_log_error.inc
>-www/acid/acid_log_timing.inc
>-www/acid/acid_main.php
>-www/acid/acid_maintenance.php
>-www/acid/acid_net.inc
>-www/acid/acid_output_html.inc
>-www/acid/acid_output_query.inc
>-www/acid/acid_qry_alert.php
>-www/acid/acid_qry_common.php
>-www/acid/acid_qry_form.php
>-www/acid/acid_qry_main.php
>-www/acid/acid_qry_sqlcalls.php
>-www/acid/acid_signature.inc
>-www/acid/acid_stat_alerts.php
>-www/acid/acid_stat_class.php
>-www/acid/acid_stat_common.php
>-www/acid/acid_stat_ipaddr.php
>-www/acid/acid_stat_iplink.php
>-www/acid/acid_stat_ports.php
>-www/acid/acid_stat_sensor.php
>-www/acid/acid_stat_time.php
>-www/acid/acid_stat_uaddr.php
>-www/acid/acid_state_citems.inc
>-www/acid/acid_state_common.inc
>-www/acid/acid_state_criteria.inc
>-www/acid/acid_state_query.inc
>-www/acid/acid_style.css
>-www/acid/create_acid_tbls_mssql.sql
>-www/acid/create_acid_tbls_mssql_extra.sql
>-www/acid/create_acid_tbls_mysql.sql
>-www/acid/create_acid_tbls_pgsql.sql
>-www/acid/create_acid_tbls_pgsql_extra.sql
>-www/acid/index.html
>-@dirrm www/acid
>+www/base/base_ag_common.php
>+www/base/base_ag_main.php
>+www/base/base_common.php
>+www/base/base_db_common.php
>+www/base/base_db_setup.php
>+www/base/base_denied.php
>+www/base/base_footer.php
>+www/base/base_graph_common.php
>+www/base/base_graph_display.php
>+www/base/base_graph_form.php
>+www/base/base_graph_main.php
>+www/base/base_hdr1.php
>+www/base/base_hdr2.php
>+www/base/base_main.php
>+www/base/base_maintenance.php
>+www/base/base_qry_alert.php
>+www/base/base_qry_common.php
>+www/base/base_user.php
>+www/base/base_qry_form.php
>+www/base/base_qry_main.php
>+www/base/base_qry_sqlcalls.php
>+www/base/base_stat_alerts.php
>+www/base/base_stat_class.php
>+www/base/base_stat_common.php
>+www/base/base_stat_ipaddr.php
>+www/base/base_stat_iplink.php
>+www/base/base_stat_ports.php
>+www/base/base_stat_sensor.php
>+www/base/base_stat_time.php
>+www/base/base_stat_uaddr.php
>+www/base/index.php
>+www/base/docs/README
>+www/base/docs/CHANGELOG
>+www/base/docs/CREDITS
>+www/base/docs/GPL
>+www/base/docs/README.mssql
>+www/base/docs/TODO
>+www/base/docs/UPGRADE
>+www/base/images/button_edit.png
>+www/base/images/button_delete.png
>+www/base/images/greencheck.gif
>+www/base/images/redcheck.gif
>+www/base/images/button_exclamation.png
>+www/base/images/greencheck.png
>+www/base/help/base_app_faq.php
>+www/base/help/base_help.php
>+www/base/help/base_setup_help.php
>+www/base/styles/base_style.css
>+www/base/includes/base_action.inc.php
>+www/base/includes/base_cache.inc.php
>+www/base/includes/base_capabilities.php
>+www/base/includes/base_constants.inc.php
>+www/base/includes/base_db.inc.php
>+www/base/includes/base_include.inc.php
>+www/base/includes/base_log_error.inc.php
>+www/base/includes/base_log_timing.inc.php
>+www/base/includes/base_net.inc.php
>+www/base/includes/base_output_html.inc.php
>+www/base/includes/base_output_query.inc.php
>+www/base/includes/base_signature.inc.php
>+www/base/includes/base_state_citems.inc.php
>+www/base/includes/base_state_common.inc.php
>+www/base/includes/class.ezpdf.php
>+www/base/includes/base_state_criteria.inc.php
>+www/base/includes/base_state_query.inc.php
>+www/base/includes/base_auth.inc.php
>+www/base/includes/base_template.php
>+www/base/includes/class.pdf.php
>+www/base/includes/base_user.inc.php
>+www/base/includes/base_setup.inc.php
>+www/base/setup/setup3.php
>+www/base/setup/setup1.php
>+www/base/setup/setup2.php
>+www/base/setup/index.php
>+www/base/setup/setup4.php
>+www/base/setup/setup5.php
>+www/base/setup/base_conf_contents.php
>+www/base/languages/danish.lang.php
>+www/base/languages/english.lang.php
>+www/base/languages/japanese.lang.php
>+www/base/languages/french.lang.php
>+www/base/languages/russian.lang.php
>+www/base/languages/norwegian.lang.php
>+www/base/languages/german.lang.php
>+www/base/languages/swedish.lang.php
>+www/base/languages/portuguese.lang.php
>+www/base/languages/spanish.lang.php
>+www/base/languages/italian.lang.php
>+www/base/languages/index.php
>+www/base/sql/acid2base_tbls_pgsql.sql
>+www/base/sql/create_base_tbls_mssql_extra.sql
>+www/base/sql/create_base_tbls_mysql.sql
>+www/base/sql/create_base_tbls_pgsql.sql
>+www/base/sql/create_base_tbls_pgsql_extra.sql
>+www/base/sql/acid2base_tbls_mysql.sql
>+www/base/sql/acid2base_tbls_mssql.sql
>+www/base/sql/upgrade_0.9.x_to_1.0-mysql.sql
>+www/base/sql/create_base_tbls_mssql.sql
>+www/base/admin/index.php
>+www/base/admin/base_useradmin.php
>+www/base/admin/base_roleadmin.php
>+www/base/base_conf.php
>+@dirrm www/base/docs
>+@dirrm www/base/images
>+@dirrm www/base/help
>+@dirrm www/base/styles
>+@dirrm www/base/includes/templates/default
>+@dirrm www/base/includes/templates
>+@dirrm www/base/includes
>+@dirrm www/base/setup
>+@dirrm www/base/languages
>+@dirrm www/base/sql
>+@dirrm www/base/admin
>+@dirrm www/base

Actions: View | Diff

Attachments on bug 74492: 48696