Attachment 200800 Details for Bug 234637 – update webfwlog to 1.1.1

[patch] update webfwlog to 1.1.1

webfwlog.diffs (text/plain), 6.75 KB, created by zeus on 2019-01-05 16:54:40 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: zeus

Created: 2019-01-05 16:54:40 UTC

Size: 6.75 KB

patch

obsolete

>Index: security/webfwlog/Makefile
>===================================================================
>--- security/webfwlog/Makefile	(revision 489280)
>+++ security/webfwlog/Makefile	(working copy)
>@@ -2,10 +2,10 @@
> # $FreeBSD$
> 
> PORTNAME=	webfwlog
>-PORTVERSION=	1.1.0
>-PORTREVISION=	2
>+PORTVERSION=	1.1.1
> CATEGORIES=	security
>-MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
>+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/
>+MASTER_SITES=	http://devel.webfwlog.net/download/v1.1.x/
> 
> MAINTAINER=	zeus@ix.netcom.com
> COMMENT=	Web-based firewall log analyzer
>@@ -17,9 +17,10 @@
> 			--sysconfdir=${ETCDIR} \
> 			--disable-dependency-tracking
> 
>-USE_PHP=	session
>+USES=			php:web
>+USE_PHP=		session
> 
>-OPTIONS_DEFINE=		MODPHP DOCS
>+OPTIONS_DEFINE=		DOCS
> 
> OPTIONS_MULTI=		BACKENDS
> OPTIONS_MULTI_BACKENDS=	MYSQLIPV6 MYSQL PGSQL
>@@ -26,15 +27,11 @@
> 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_GROUP_GEOIPV2=	LIBMAXMINDDB MAXMINDDB BDB
>+GEOIPV2_DESC=		GEOIPv2 support
> 
> 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_USE=		php=mysqli
> 
>@@ -44,6 +41,7 @@
> 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
> MYSQLIPV6_USE=			ldconfig=${MYSQLIPV6_PLUGIN_DIR}
> MYSQLIPV6_PLIST_FILES=		${MYSQLIPV6_PLUGIN_DIR_REL}/libwebfwlog_udf.so \
> 				${MYSQLIPV6_PLUGIN_DIR_REL}/libwebfwlog_udf.so.0 \
>@@ -52,21 +50,26 @@
> 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_DESC=		Full geoipv2 support for file logs, and lookup only
> LIBMAXMINDDB_CONFIGURE_WITH=	libmaxminddb
>-LIBMAXMINDDB_CONFIGURE_ENV=	CPPFLAGS=-I${LOCALBASE}/include LDFLAGS=-L${LOCALBASE}/lib
>+LIBMAXMINDDB_CPPFLAGS=		-I${LOCALBASE}/include
>+LIBMAXMINDDB_LDFLAGS=		-L${LOCALBASE}/lib
> LIBMAXMINDDB_LIB_DEPENDS=	libmaxminddb.so:net/libmaxminddb
> 
>-BDB_DESC=			Berkeley DB support (implies LIBMAXMINDDB)
>+MAXMINDDB_DESC=			PHP extension for geoipv2 speed (implies LIBMAXMINDDB)
>+MAXMINDDB_IMPLIES=		LIBMAXMINDDB
>+MAXMINDDB_RUN_DEPENDS=		${PHPBASE}/lib/php/${PHP_EXT_DIR}/maxminddb.so:devel/php-maxminddb
>+
>+BDB_DESC=			Use berkeley DB for file log speed (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_CONFIGURE_WITH=		libdb=${BDB_LIB_NAME}
>+BDB_CPPFLAGS=			-I${BDB_INCLUDE_DIR}
>+BDB_LDFLAGS=			-L${BDB_LIB_DIR}
> BDB_USES=			bdb
> 
> PORTDOCS=	AUTHORS COPYING CREDITS ChangeLog INSTALL \
>-		README ReleaseNotes
>+		README README.geoip README.pdf ReleaseNotes
> 
> SUB_FILES=	pkg-message
> SUB_LIST+=	VERSION=${PORTVERSION}
>@@ -86,6 +89,9 @@
> 	${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/)
>+	@${MKDIR} ${STAGEDIR}${WWWDIR}-vendor
>+	@(cd ${WRKSRC}/webfwlog-vendor/ && ${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR}-vendor)
>+	@${RM} -r ${STAGEDIR}${WWWDIR}-vendor/maxmind-db/reader/ext
> 	@${ECHO} "Installed web files in ${WWWDIR}"
> 	@${MKDIR} ${STAGEDIR}${ETCDIR}
> 	${INSTALL_DATA} ${WRKSRC}/webfwlog.conf ${STAGEDIR}${ETCDIR}/webfwlog.conf.sample
>Index: security/webfwlog/distinfo
>===================================================================
>--- security/webfwlog/distinfo	(revision 489280)
>+++ security/webfwlog/distinfo	(working copy)
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1472227956
>-SHA256 (webfwlog-1.1.0.tar.gz) = b7291cc16d6b82d19eb6e415411e61ccf074c32a4498894e6d1a8e6d77cab5b8
>-SIZE (webfwlog-1.1.0.tar.gz) = 814736
>+TIMESTAMP = 1544045012
>+SHA256 (webfwlog-1.1.1.tar.gz) = 6f128ab57db061f7c39e804eb0af1171237079e9b2a5a9354cad29eb4fcc21f2
>+SIZE (webfwlog-1.1.1.tar.gz) = 807539
>Index: security/webfwlog/pkg-descr
>===================================================================
>--- security/webfwlog/pkg-descr	(revision 489280)
>+++ security/webfwlog/pkg-descr	(working copy)
>@@ -4,10 +4,10 @@
> With Webfwlog you can design reports to use on your firewall logs in whatever
> configuration you desire.  Included are example reports as a starting
> point.  You can sort a report with a single click, "drill-down" on the reports
>-all the way to the packet level, and save your reports for later use.  You can
>-also create a link directly to any saved report.
>+all the way to the packet level, and save your report definitions for later
>+use. You can also create a link directly to any saved report definition.
> 
>-Webfwlog requires a web server with PHP support and a MySQL or PostgresSQL
>-database server.
>+Webfwlog requires a web server with PHP support and a MySQL, mariadb or
>+PostgresSQL database server.
> 
> WWW: http://www.webfwlog.net/
>Index: security/webfwlog/pkg-plist
>===================================================================
>--- security/webfwlog/pkg-plist	(revision 489280)
>+++ security/webfwlog/pkg-plist	(working copy)
>@@ -7,6 +7,7 @@
> %%WWWDIR%%/include/edit_doc.php
> %%WWWDIR%%/include/edit_report.php
> %%WWWDIR%%/include/functions.php
>+%%WWWDIR%%/include/functions_geoip.php
> %%WWWDIR%%/include/home.php
> %%WWWDIR%%/include/html_out.php
> %%WWWDIR%%/include/import.php
>@@ -22,6 +23,25 @@
> %%WWWDIR%%/include/update_cache.php
> %%WWWDIR%%/index.php
> %%WWWDIR%%/style.css
>+%%WWWDIR%%-vendor/autoload.php
>+%%WWWDIR%%-vendor/composer/ClassLoader.php
>+%%WWWDIR%%-vendor/composer/LICENSE
>+%%WWWDIR%%-vendor/composer/autoload_classmap.php
>+%%WWWDIR%%-vendor/composer/autoload_namespaces.php
>+%%WWWDIR%%-vendor/composer/autoload_psr4.php
>+%%WWWDIR%%-vendor/composer/autoload_real.php
>+%%WWWDIR%%-vendor/composer/autoload_static.php
>+%%WWWDIR%%-vendor/composer/installed.json
>+%%WWWDIR%%-vendor/maxmind-db/reader/CHANGELOG.md
>+%%WWWDIR%%-vendor/maxmind-db/reader/LICENSE
>+%%WWWDIR%%-vendor/maxmind-db/reader/README.md
>+%%WWWDIR%%-vendor/maxmind-db/reader/autoload.php
>+%%WWWDIR%%-vendor/maxmind-db/reader/composer.json
>+%%WWWDIR%%-vendor/maxmind-db/reader/src/MaxMind/Db/Reader.php
>+%%WWWDIR%%-vendor/maxmind-db/reader/src/MaxMind/Db/Reader/Decoder.php
>+%%WWWDIR%%-vendor/maxmind-db/reader/src/MaxMind/Db/Reader/InvalidDatabaseException.php
>+%%WWWDIR%%-vendor/maxmind-db/reader/src/MaxMind/Db/Reader/Metadata.php
>+%%WWWDIR%%-vendor/maxmind-db/reader/src/MaxMind/Db/Reader/Util.php
> %%PORTDOCS%%%%DOCSDIR%%/examples/basic
> %%PORTDOCS%%%%DOCSDIR%%/examples/current_count
> %%PORTDOCS%%%%DOCSDIR%%/examples/current_dport

Actions: View | Diff

Attachments on bug 234637: 200800