svn commit: r457724 - in head/security/webfwlog: . files

Kurt Jaeger pi at FreeBSD.org
Sun Dec 31 20:14:48 UTC 2017 

Author: pi
Date: Sun Dec 31 20:14:46 2017
New Revision: 457724
URL: https://svnweb.freebsd.org/changeset/ports/457724

Log:
  security/webfwlog: update 1.01 -> 1.1.0
  
  - unbreak, remove DEPRECATED, EXPIRATION_DATE
  - PORTREVISION needed because 1.1.0 is not larger than 1.01
  
  PR:		219755
  Submitted by:	zeus at ix.netcom.com (maintainer)
  Changes:	https://sourceforge.net/p/webfwlog/code/HEAD/tree/webfwlog/trunk/ChangeLog
  Relnotes:	https://sourceforge.net/p/webfwlog/code/HEAD/tree/webfwlog/trunk/ReleaseNotes

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	Sun Dec 31 20:10:39 2017	(r457723)
+++ head/security/webfwlog/Makefile	Sun Dec 31 20:14:46 2017	(r457724)
@@ -2,8 +2,8 @@
 # $FreeBSD$
 
 PORTNAME=	webfwlog
-PORTVERSION=	1.01
-PORTREVISION=	1
+PORTVERSION=	1.1.0
+PORTREVISION=	2
 CATEGORIES=	security
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 
@@ -12,74 +12,86 @@ COMMENT=	Web-based firewall log analyzer
 
 LICENSE=	GPLv2
 
-BROKEN=		missing header
-DEPRECATED=	Broken for more than 6 months
-EXPIRATION_DATE=	2018-01-27
-
-OPTIONS_DEFINE=		MYSQL MYSQLIPV6 PGSQL DOCS
-OPTIONS_DEFAULT=	MYSQL MYSQLIPV6
-
-MYSQLIPV6_DESC=		Shared library plugin for Mysql IPv6 support
-
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+=	--with-html-doc-root=${WWWDIR} \
-			--enable-syslog \
+CONFIGURE_ARGS+=	--enable-syslog \
 			--sysconfdir=${ETCDIR} \
 			--disable-dependency-tracking
 
+USE_PHP=	session
+
+OPTIONS_DEFINE=		MODPHP DOCS
+
+OPTIONS_MULTI=		BACKENDS
+OPTIONS_MULTI_BACKENDS=	MYSQLIPV6 MYSQL PGSQL
+BACKENDS_DESC=		Database backends, choose at least one
+
+OPTIONS_GROUP=		GEOIPV2
+OPTIONS_GROUP_GEOIPV2=	LIBMAXMINDDB BDB
+GEOIPV2_DESC=		GEOIPv2 support, LIBMAXMINDDB required, BDB optional
+
+OPTIONS_DEFAULT=	MYSQLIPV6 MYSQL
+
+MODPHP_DESC=		Require mod_php (adds apache dependency)
+MODPHP_USES=		php:mod
+MODPHP_USES_OFF=	php:web
+
 MYSQL_CONFIGURE_WITH=	mysql
-MYSQL_USES=		mysql:server
-PGSQL_CONFIGURE_WITH=	pgsql
+MYSQL_USE=		php=mysqli
+MYSQL_USES=		mysql:client
+
+MYSQLIPV6_DESC=			Build plugin for Mysql IPv6 support (implies MYSQL)
+MYSQLIPV6_IMPLIES=		MYSQL
 MYSQLIPV6_CONFIGURE_ENABLE=	mysql-ipv6
+MYSQLIPV6_PLUGIN_DIR_REL=	lib/mysql/plugin
+MYSQLIPV6_PLUGIN_DIR=		${LOCALBASE}/${MYSQLIPV6_PLUGIN_DIR_REL}
+MYSQLIPV6_CONFIGURE_ON=		--libdir=${MYSQLIPV6_PLUGIN_DIR}
+MYSQLIPV6_USES=			libtool mysql:server,client
+MYSQLIPV6_USE=			ldconfig=${MYSQLIPV6_PLUGIN_DIR}
+MYSQLIPV6_PLIST_FILES=		${MYSQLIPV6_PLUGIN_DIR_REL}/libwebfwlog_udf.so \
+				${MYSQLIPV6_PLUGIN_DIR_REL}/libwebfwlog_udf.so.0 \
+				${MYSQLIPV6_PLUGIN_DIR_REL}/libwebfwlog_udf.so.0.0.0
 
-USE_PHP=	session
-USES=		php:web
+PGSQL_CONFIGURE_WITH=	pgsql
+PGSQL_USE=		php=pgsql
+PGSQL_USES=		pgsql
+PGSQL_ARGS=		want_pgsql=client
 
+LIBMAXMINDDB_DESC=		Libmaxminddb support for geoipv2 (.mmdb extension)
+LIBMAXMINDDB_CONFIGURE_WITH=	libmaxminddb
+LIBMAXMINDDB_CONFIGURE_ENV=	CPPFLAGS=-I${LOCALBASE}/include LDFLAGS=-L${LOCALBASE}/lib
+LIBMAXMINDDB_LIB_DEPENDS=	libmaxminddb.so:net/libmaxminddb
+
+BDB_DESC=			Berkeley DB support (implies LIBMAXMINDDB)
+BDB_IMPLIES=			LIBMAXMINDDB
+BDB_CONFIGURE_WITH=		libdb
+BDB_CONFIGURE_ENV=		CPPFLAGS="-I${BDB_INCLUDE_DIR} -I${LOCALBASE}/include" LDFLAGS=-L${LOCALBASE}/lib LIBS=-l${BDB_LIB_NAME}
+BDB_USES=			bdb
+
 PORTDOCS=	AUTHORS COPYING CREDITS ChangeLog INSTALL \
 		README ReleaseNotes
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MMYSQL}
-USE_PHP+=	mysqli
-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
-USES+=	pgsql
-WANT_PGSQL=	server client
-.endif
-
 SUB_FILES=	pkg-message
 SUB_LIST+=	VERSION=${PORTVERSION}
 
 PLIST_SUB+=	WWWGRP=${WWWGRP}
 
+.include <bsd.port.options.mk>
+
 do-install:
 	@${MKDIR} ${STAGEDIR}${WWWDIR}/include/
-	@${INSTALL_DATA} ${WRKSRC}/webfwlog/style.css ${STAGEDIR}${WWWDIR}
-	@${INSTALL_DATA} ${WRKSRC}/webfwlog/index.php ${STAGEDIR}${WWWDIR}
+	${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
+	${INSTALL_DATA} ${WRKSRC}/webfwlog.conf ${STAGEDIR}${ETCDIR}/webfwlog.conf.sample
 	@${ECHO} "Installed ${ETCDIR}/webfwlog.conf"
-	@${INSTALL_PROGRAM} ${WRKSRC}/src/wfwl_syslog ${STAGEDIR}${PREFIX}/bin/
+	${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}
+.if ${PORT_OPTIONS:MMYSQLIPV6} && exists (${MYSQLIPV6_PLUGIN_DIR})
+	@${MKDIR} ${STAGEDIR}${MYSQLIPV6_PLUGIN_DIR}
 	@(cd ${WRKSRC}/src/mysql && ${MAKE} DESTDIR=${STAGEDIR} install-strip)
-	@${ECHO} "Installed mysql shared library in ${MYSQL_PLUGIN_DIR}"
+	@${ECHO} "Installed mysql shared library in ${MYSQLIPV6_PLUGIN_DIR}"
 .endif
 
 post-install-DOCS-on:
@@ -90,7 +102,7 @@ post-install-DOCS-on:
 	@(cd ${WRKSRC}/pgsql/ && ${COPYTREE_SHARE} \* ${STAGEDIR}${DOCSDIR}/pgsql/)
 	@(cd ${WRKSRC}/examples/ && ${COPYTREE_SHARE} \* ${STAGEDIR}${DOCSDIR}/examples/)
 .for docs in ${PORTDOCS}
-	@${INSTALL_DATA} ${WRKSRC}/${docs} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/${docs} ${STAGEDIR}${DOCSDIR}
 .endfor
 
 .include <bsd.port.mk>

Modified: head/security/webfwlog/distinfo
==============================================================================
--- head/security/webfwlog/distinfo	Sun Dec 31 20:10:39 2017	(r457723)
+++ head/security/webfwlog/distinfo	Sun Dec 31 20:14:46 2017	(r457724)
@@ -1,2 +1,3 @@
-SHA256 (webfwlog-1.01.tar.gz) = 9992746d8db5cb851aed246a92073b56061128580cf550f0a366432052a978f9
-SIZE (webfwlog-1.01.tar.gz) = 741394
+TIMESTAMP = 1472227956
+SHA256 (webfwlog-1.1.0.tar.gz) = b7291cc16d6b82d19eb6e415411e61ccf074c32a4498894e6d1a8e6d77cab5b8
+SIZE (webfwlog-1.1.0.tar.gz) = 814736

Modified: head/security/webfwlog/files/pkg-message.in
==============================================================================
--- head/security/webfwlog/files/pkg-message.in	Sun Dec 31 20:10:39 2017	(r457723)
+++ head/security/webfwlog/files/pkg-message.in	Sun Dec 31 20:14:46 2017	(r457724)
@@ -1,6 +1,7 @@
 Webfwlog-%%VERSION%% has been installed in %%WWWDIR%%.
-You should update your web server's configuration to provide access to this
-directory.
+
+You should update your web server's configuration to provide access to
+%%WWWDIR%%.
 
 You should also read the README in the mysql or pgsql directoy in
 %%DOCSDIR%% for information on setting up your MySQL or

Modified: head/security/webfwlog/pkg-plist
==============================================================================
--- head/security/webfwlog/pkg-plist	Sun Dec 31 20:10:39 2017	(r457723)
+++ head/security/webfwlog/pkg-plist	Sun Dec 31 20:14:46 2017	(r457724)
@@ -1,5 +1,27 @@
 @(root,%%WWWGRP%%,4550) bin/wfwl_syslog
 @sample(root,%%WWWGRP%%,0640) %%ETCDIR%%/webfwlog.conf.sample
+%%WWWDIR%%/include/config.php
+%%WWWDIR%%/include/criteria.php
+%%WWWDIR%%/include/debug.php
+%%WWWDIR%%/include/delete_report.php
+%%WWWDIR%%/include/edit_doc.php
+%%WWWDIR%%/include/edit_report.php
+%%WWWDIR%%/include/functions.php
+%%WWWDIR%%/include/home.php
+%%WWWDIR%%/include/html_out.php
+%%WWWDIR%%/include/import.php
+%%WWWDIR%%/include/orders.php
+%%WWWDIR%%/include/packet.php
+%%WWWDIR%%/include/save_report.php
+%%WWWDIR%%/include/selection.php
+%%WWWDIR%%/include/sorting.php
+%%WWWDIR%%/include/sql.php
+%%WWWDIR%%/include/state.php
+%%WWWDIR%%/include/static.php
+%%WWWDIR%%/include/syslog.php
+%%WWWDIR%%/include/update_cache.php
+%%WWWDIR%%/index.php
+%%WWWDIR%%/style.css
 %%PORTDOCS%%%%DOCSDIR%%/examples/basic
 %%PORTDOCS%%%%DOCSDIR%%/examples/current_count
 %%PORTDOCS%%%%DOCSDIR%%/examples/current_dport
@@ -21,7 +43,9 @@
 %%PORTDOCS%%%%DOCSDIR%%/mysql/scripts/wfwl_reports_altercol
 %%PORTDOCS%%%%DOCSDIR%%/mysql/scripts/wfwl_reports_create
 %%PORTDOCS%%%%DOCSDIR%%/mysql/scripts/wfwl_services_create
-@(,,0555) %%PORTDOCS%%%%DOCSDIR%%/mysql/setup
+ at mode 0755
+%%PORTDOCS%%%%DOCSDIR%%/mysql/setup
+ at mode 0644
 %%PORTDOCS%%%%DOCSDIR%%/pgsql/README
 %%PORTDOCS%%%%DOCSDIR%%/pgsql/pgsql_data_table.sql
 %%PORTDOCS%%%%DOCSDIR%%/pgsql/scripts/snort_view
@@ -30,26 +54,8 @@
 %%PORTDOCS%%%%DOCSDIR%%/pgsql/scripts/wfwl_reports_addcol
 %%PORTDOCS%%%%DOCSDIR%%/pgsql/scripts/wfwl_reports_create
 %%PORTDOCS%%%%DOCSDIR%%/pgsql/scripts/wfwl_services_create
-@(,,0555) %%PORTDOCS%%%%DOCSDIR%%/pgsql/setup
-%%WWWDIR%%/include/config.php
-%%WWWDIR%%/include/criteria.php
-%%WWWDIR%%/include/debug.php
-%%WWWDIR%%/include/delete_report.php
-%%WWWDIR%%/include/edit_doc.php
-%%WWWDIR%%/include/edit_report.php
-%%WWWDIR%%/include/functions.php
-%%WWWDIR%%/include/home.php
-%%WWWDIR%%/include/html_out.php
-%%WWWDIR%%/include/import.php
-%%WWWDIR%%/include/orders.php
-%%WWWDIR%%/include/packet.php
-%%WWWDIR%%/include/save_report.php
-%%WWWDIR%%/include/selection.php
-%%WWWDIR%%/include/sorting.php
-%%WWWDIR%%/include/sql.php
-%%WWWDIR%%/include/state.php
-%%WWWDIR%%/include/static.php
-%%WWWDIR%%/include/syslog.php
-%%WWWDIR%%/include/update_cache.php
-%%WWWDIR%%/index.php
-%%WWWDIR%%/style.css
+%%PORTDOCS%%%%DOCSDIR%%/pgsql/README.geoip
+%%PORTDOCS%%%%DOCSDIR%%/pgsql/pgsql_geoip2_tables.sql
+ at mode 0755
+%%PORTDOCS%%%%DOCSDIR%%/pgsql/setup
+ at mode 0644

More information about the svn-ports-all mailing list