Date: Wed, 4 Jun 2014 11:07:20 +0000 (UTC) From: Martin Wilke <miwi@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r356463 - in head/security/webfwlog: . files Message-ID: <201406041107.s54B7KkF036495@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: miwi Date: Wed Jun 4 11:07:19 2014 New Revision: 356463 URL: http://svnweb.freebsd.org/changeset/ports/356463 QAT: https://qat.redports.org/buildarchive/r356463/ Log: - Update to 1.00 - Stage support PR: 189964 Submitted by: maintainer Modified: head/security/webfwlog/Makefile head/security/webfwlog/distinfo head/security/webfwlog/files/pkg-message.in head/security/webfwlog/pkg-plist Modified: head/security/webfwlog/Makefile ============================================================================== --- head/security/webfwlog/Makefile Wed Jun 4 11:06:25 2014 (r356462) +++ head/security/webfwlog/Makefile Wed Jun 4 11:07:19 2014 (r356463) @@ -2,96 +2,90 @@ # $FreeBSD$ PORTNAME= webfwlog -PORTVERSION= 0.94 -PORTREVISION= 2 +PORTVERSION= 1.00 CATEGORIES= security MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION} -PATCHFILES= webfwlog-0.94-tcpflags.patch -PATCH_SITES= http://devel.webfwlog.net/download/patches/ - MAINTAINER= zeus@ix.netcom.com COMMENT= A web-based firewall log analyzer -OPTIONS_DEFINE= MYSQL PGSQL EXAMPLES -OPTIONS_DEFAULTS= MYSQL +LICENSE= GPLv2 + +OPTIONS_DEFINE= MYSQL MYSQLIPV6 PGSQL +OPTIONS_DEFAULTS= MYSQL MYSQLIPV6 + +MYSQLIPV6_DESC= Shared library plugin for Mysql IPv6 support GNU_CONFIGURE= yes -CONFIGURE_ARGS+= --with-html-doc-root=${PREFIX} -CONFIGURE_ARGS+= --enable-syslog +CONFIGURE_ARGS+= --with-html-doc-root=${WWWDIR} \ + --enable-syslog \ + --sysconfdir=${ETCDIR} \ + --disable-dependency-tracking + +MYSQL_CONFIGURE_WITH= mysql +PGSQL_CONFIGURE_WITH= pgsql +MYSQLIPV6_CONFIGURE_ENABLE= mysql-ipv6 -USE_PHP= session pcre +USE_PHP= session WANT_PHP_WEB= yes -SUB_FILES= pkg-message -SUB_LIST+= VERSION=${PORTVERSION} - PORTDOCS= AUTHORS COPYING CREDITS ChangeLog INSTALL \ README ReleaseNotes -PORTEXAMPLES= * -NO_STAGE= yes .include <bsd.port.options.mk> .if ${PORT_OPTIONS:MMYSQL} -USE_PHP+= mysql -USE_MYSQL= yes -CONFIGURE_ARGS+= --with-mysql +USE_PHP+= mysqli +USE_MYSQL= server +MYSQL_PLUGIN_DIR_REL= lib/mysql/plugin +MYSQL_PLUGIN_DIR= ${LOCALBASE}/${MYSQL_PLUGIN_DIR_REL} +.if ${PORT_OPTIONS:MMYSQLIPV6} && exists (${MYSQL_PLUGIN_DIR}) +USES+= libtool +CONFIGURE_ARGS+= --libdir=${MYSQL_PLUGIN_DIR} +USE_LDCONFIG= ${MYSQL_PLUGIN_DIR} +PLIST_FILES+= ${MYSQL_PLUGIN_DIR_REL}/libwebfwlog_udf.so +PLIST_FILES+= ${MYSQL_PLUGIN_DIR_REL}/libwebfwlog_udf.so.0 +PLIST_FILES+= ${MYSQL_PLUGIN_DIR_REL}/libwebfwlog_udf.so.0.0.0 +.endif .endif .if ${PORT_OPTIONS:MPGSQL} USE_PHP+= pgsql -USE_PGSQL= yes -CONFIGURE_ARGS+= --with-pgsql +USES+= pgsql +WANT_PGSQL= server client .endif -BINMODE= 4550 -BINGRP= ${WWWGRP} +SUB_FILES= pkg-message +SUB_LIST+= VERSION=${PORTVERSION} + +PLIST_SUB+= WWWGRP=${WWWGRP} do-install: - @${MKDIR} ${WWWDIR} - @${MKDIR} ${WWWDIR}/include/ - @(cd ${WRKSRC}/webfwlog/include/ && ${COPYTREE_SHARE} \*.php ${WWWDIR}/include/) - ${CHMOD} 555 ${WWWDIR}/include - ${INSTALL_PROGRAM} ${WRKSRC}/syslog/wfwl_syslog ${PREFIX}/bin/ - ${INSTALL_DATA} ${WRKSRC}/webfwlog/style.css ${WWWDIR} - ${INSTALL_DATA} ${WRKSRC}/webfwlog/index.php ${WWWDIR} + @${MKDIR} ${STAGEDIR}${WWWDIR}/include/ + @${INSTALL_DATA} ${WRKSRC}/webfwlog/style.css ${STAGEDIR}${WWWDIR} + @${INSTALL_DATA} ${WRKSRC}/webfwlog/index.php ${STAGEDIR}${WWWDIR} + @(cd ${WRKSRC}/webfwlog/include/ && ${COPYTREE_SHARE} \*.php ${STAGEDIR}${WWWDIR}/include/) + @${ECHO} "Installed web files in ${WWWDIR}" + @${MKDIR} ${STAGEDIR}${ETCDIR} + @${INSTALL_DATA} ${WRKSRC}/webfwlog.conf ${STAGEDIR}${ETCDIR}/webfwlog.conf.sample + @${ECHO} "Installed ${ETCDIR}/webfwlog.conf" + @${INSTALL_PROGRAM} ${WRKSRC}/src/wfwl_syslog ${STAGEDIR}${PREFIX}/bin/ + @${ECHO} "Installed ${PREFIX}/bin/wfwl_syslog" +.if ${PORT_OPTIONS:MMYSQLIPV6} && exists (${MYSQL_PLUGIN_DIR}) + @${MKDIR} ${STAGEDIR}${MYSQL_PLUGIN_DIR} + @(cd ${WRKSRC}/src/mysql && ${MAKE} DESTDIR=${STAGEDIR} install-strip) + @${ECHO} "Installed mysql shared library in ${MYSQL_PLUGIN_DIR}" +.endif post-install: -.if ${PORT_OPTIONS:MDOCS} - @${MKDIR} ${DOCSDIR}/mysql - @${MKDIR} ${DOCSDIR}/pgsql - @(cd ${WRKSRC}/mysql/ && ${COPYTREE_SHARE} \* ${DOCSDIR}/mysql/) - @(cd ${WRKSRC}/pgsql/ && ${COPYTREE_SHARE} \* ${DOCSDIR}/pgsql/) + @${MKDIR} ${STAGEDIR}${DOCSDIR}/mysql + @${MKDIR} ${STAGEDIR}${DOCSDIR}/pgsql + @${MKDIR} ${STAGEDIR}${DOCSDIR}/examples + @(cd ${WRKSRC}/mysql/ && ${COPYTREE_SHARE} \* ${STAGEDIR}${DOCSDIR}/mysql/) + @(cd ${WRKSRC}/pgsql/ && ${COPYTREE_SHARE} \* ${STAGEDIR}${DOCSDIR}/pgsql/) + @(cd ${WRKSRC}/examples/ && ${COPYTREE_SHARE} \* ${STAGEDIR}${DOCSDIR}/examples/) .for docs in ${PORTDOCS} - ${INSTALL_DATA} ${WRKSRC}/${docs} ${DOCSDIR} + @${INSTALL_DATA} ${WRKSRC}/${docs} ${STAGEDIR}${DOCSDIR} .endfor -.endif - -.if ${PORT_OPTIONS:MEXAMPLES} - ${MKDIR} ${EXAMPLESDIR} - ${INSTALL_DATA} ${WRKSRC}/examples/* ${EXAMPLESDIR} -.endif - - @if test -f ${PREFIX}/etc/webfwlog.conf; \ - then \ - ${CHOWN} :${WWWGRP} ${PREFIX}/etc/webfwlog.conf; \ - ${CHMOD} 0640 ${PREFIX}/etc/webfwlog.conf; \ - fi - @${INSTALL_DATA} ${WRKSRC}/webfwlog.conf ${PREFIX}/etc/webfwlog.conf.sample - @${CHOWN} :${WWWGRP} ${PREFIX}/etc/webfwlog.conf.sample - @${CHMOD} 0640 ${PREFIX}/etc/webfwlog.conf.sample - @if test -f ${PREFIX}/etc/webfwlog.conf && \ - test -f ${PREFIX}/etc/webfwlog.conf.sample && \ - test "`diff ${PREFIX}/etc/webfwlog.conf ${PREFIX}/etc/webfwlog.conf.sample`" ; \ - then :; \ - else \ - ${RM} -f ${PREFIX}/etc/webfwlog.conf; \ - fi - @${RM} -f ${PREFIX}/etc/webfwlog.conf.new - - @${ECHO} - @${CAT} ${PKGMESSAGE} - @${ECHO} .include <bsd.port.mk> Modified: head/security/webfwlog/distinfo ============================================================================== --- head/security/webfwlog/distinfo Wed Jun 4 11:06:25 2014 (r356462) +++ head/security/webfwlog/distinfo Wed Jun 4 11:07:19 2014 (r356463) @@ -1,4 +1,2 @@ -SHA256 (webfwlog-0.94.tar.gz) = c1b84dd4036aa9f81fc4fbd527eda202e51c3767659b8f1eef12bfb3381c5b36 -SIZE (webfwlog-0.94.tar.gz) = 288138 -SHA256 (webfwlog-0.94-tcpflags.patch) = b29df0df2b62ec99f121e50033b852e1a5177f0db1b31ecf12a8c535a16812dd -SIZE (webfwlog-0.94-tcpflags.patch) = 455 +SHA256 (webfwlog-1.00.tar.gz) = 205775a4ff0cdf3dffe257228bdcbdc5752b7e5fed122f67d2330fb12a901957 +SIZE (webfwlog-1.00.tar.gz) = 732212 Modified: head/security/webfwlog/files/pkg-message.in ============================================================================== --- head/security/webfwlog/files/pkg-message.in Wed Jun 4 11:06:25 2014 (r356462) +++ head/security/webfwlog/files/pkg-message.in Wed Jun 4 11:07:19 2014 (r356463) @@ -1,5 +1,9 @@ -Webfwlog-%%VERSION%% has been installed. You should read the README in the mysql or -pgsql directoy in %%DOCSDIR%% for information -on setting up your MySQL or PostgreSQL server for use with webfwlog, and also -copy the webfwlog.conf.sample file in %%PREFIX%%/etc to webfwlog.conf and -adjust it to your installation. This file is well-commented. +Webfwlog-%%VERSION%% has been installed in %%WWWDIR%%. +You should update your web server's configuration to provide access to this +directory. + +You should also read the README in the mysql or pgsql directoy in +%%DOCSDIR%% for information on setting up your MySQL or +PostgreSQL server for use with webfwlog, and edit the webfwlog.conf file in +%%ETCDIR%% and adjust it to your installation. This file is +well-commented. Modified: head/security/webfwlog/pkg-plist ============================================================================== --- head/security/webfwlog/pkg-plist Wed Jun 4 11:06:25 2014 (r356462) +++ head/security/webfwlog/pkg-plist Wed Jun 4 11:07:19 2014 (r356463) @@ -1,30 +1,46 @@ +@owner root +@group %%WWWGRP%% +@mode 4550 bin/wfwl_syslog -etc/webfwlog.conf.sample +@mode 640 +@sample %%ETCDIR%%/webfwlog.conf.sample +@mode +@group wheel +%%PORTDOCS%%%%DOCSDIR%%/examples/basic +%%PORTDOCS%%%%DOCSDIR%%/examples/current_count +%%PORTDOCS%%%%DOCSDIR%%/examples/current_dport +%%PORTDOCS%%%%DOCSDIR%%/examples/last20hosts +%%PORTDOCS%%%%DOCSDIR%%/examples/latest_logged_packets +%%PORTDOCS%%%%DOCSDIR%%/examples/recent_active +%%PORTDOCS%%%%DOCSDIR%%/examples/tcpports +%%PORTDOCS%%%%DOCSDIR%%/examples/tcpsyn +%%PORTDOCS%%%%DOCSDIR%%/examples/udpports %%PORTDOCS%%%%DOCSDIR%%/mysql/README -%%PORTDOCS%%%%DOCSDIR%%/mysql/setup -%%PORTDOCS%%%%DOCSDIR%%/mysql/scripts/temp_grants -%%PORTDOCS%%%%DOCSDIR%%/mysql/scripts/ulog_copy -%%PORTDOCS%%%%DOCSDIR%%/mysql/scripts/ulog_local -%%PORTDOCS%%%%DOCSDIR%%/mysql/scripts/ulogd_grants +%%PORTDOCS%%%%DOCSDIR%%/mysql/mysql_data_table.sql +%%PORTDOCS%%%%DOCSDIR%%/mysql/scripts/snort_view +%%PORTDOCS%%%%DOCSDIR%%/mysql/scripts/wfwl_function_grants +%%PORTDOCS%%%%DOCSDIR%%/mysql/scripts/wfwl_functions %%PORTDOCS%%%%DOCSDIR%%/mysql/scripts/wfwl_grants %%PORTDOCS%%%%DOCSDIR%%/mysql/scripts/wfwl_hostnames_create +%%PORTDOCS%%%%DOCSDIR%%/mysql/scripts/wfwl_hostnames_create_bin %%PORTDOCS%%%%DOCSDIR%%/mysql/scripts/wfwl_reports_addcol %%PORTDOCS%%%%DOCSDIR%%/mysql/scripts/wfwl_reports_altercol %%PORTDOCS%%%%DOCSDIR%%/mysql/scripts/wfwl_reports_create %%PORTDOCS%%%%DOCSDIR%%/mysql/scripts/wfwl_services_create +@mode 555 +%%PORTDOCS%%%%DOCSDIR%%/mysql/setup +@mode %%PORTDOCS%%%%DOCSDIR%%/pgsql/README -%%PORTDOCS%%%%DOCSDIR%%/pgsql/setup -%%PORTDOCS%%%%DOCSDIR%%/pgsql/scripts/ulog_copy -%%PORTDOCS%%%%DOCSDIR%%/pgsql/scripts/ulog_local -%%PORTDOCS%%%%DOCSDIR%%/pgsql/scripts/ulogd_73_grants -%%PORTDOCS%%%%DOCSDIR%%/pgsql/scripts/ulogd_grants -%%PORTDOCS%%%%DOCSDIR%%/pgsql/scripts/wfwl_73_grants +%%PORTDOCS%%%%DOCSDIR%%/pgsql/pgsql_data_table.sql +%%PORTDOCS%%%%DOCSDIR%%/pgsql/scripts/snort_view %%PORTDOCS%%%%DOCSDIR%%/pgsql/scripts/wfwl_functions -%%PORTDOCS%%%%DOCSDIR%%/pgsql/scripts/wfwl_grants %%PORTDOCS%%%%DOCSDIR%%/pgsql/scripts/wfwl_hostnames_create %%PORTDOCS%%%%DOCSDIR%%/pgsql/scripts/wfwl_reports_addcol %%PORTDOCS%%%%DOCSDIR%%/pgsql/scripts/wfwl_reports_create %%PORTDOCS%%%%DOCSDIR%%/pgsql/scripts/wfwl_services_create +@mode 555 +%%PORTDOCS%%%%DOCSDIR%%/pgsql/setup +@mode %%WWWDIR%%/include/config.php %%WWWDIR%%/include/criteria.php %%WWWDIR%%/include/debug.php @@ -45,11 +61,13 @@ etc/webfwlog.conf.sample %%WWWDIR%%/include/static.php %%WWWDIR%%/include/syslog.php %%WWWDIR%%/include/update_cache.php -%%WWWDIR%%/style.css %%WWWDIR%%/index.php -%%PORTDOCS%%@dirrm %%DOCSDIR%%/pgsql/scripts -%%PORTDOCS%%@dirrm %%DOCSDIR%%/pgsql -%%PORTDOCS%%@dirrm %%DOCSDIR%%/mysql/scripts -%%PORTDOCS%%@dirrm %%DOCSDIR%%/mysql -@dirrm %%WWWDIR%%/include +%%WWWDIR%%/style.css +@dirrmtry %%ETCDIR%% +%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/examples +%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/mysql/scripts +%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/mysql +%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/pgsql/scripts +%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/pgsql +@dirrmtry %%WWWDIR%%/include @dirrmtry %%WWWDIR%%
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201406041107.s54B7KkF036495>