Date: Tue, 28 Mar 2017 07:22:10 +0000 (UTC) From: "Vanilla I. Shu" <vanilla@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r437096 - in head/www/ufdbguard: . files Message-ID: <201703280722.v2S7MAFw038028@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: vanilla Date: Tue Mar 28 07:22:10 2017 New Revision: 437096 URL: https://svnweb.freebsd.org/changeset/ports/437096 Log: Update to 1.33.1. PR: 218171 Submitted by: maintainer Added: head/www/ufdbguard/files/patch-src_sg.h.in (contents, props changed) Modified: head/www/ufdbguard/Makefile head/www/ufdbguard/distinfo head/www/ufdbguard/files/patch-src_Makefile.in head/www/ufdbguard/files/patch-src_check__config__file head/www/ufdbguard/files/patch-src_install__etcfiles.sh.in head/www/ufdbguard/files/patch-src_ufdbGuard.conf.in Modified: head/www/ufdbguard/Makefile ============================================================================== --- head/www/ufdbguard/Makefile Tue Mar 28 05:30:50 2017 (r437095) +++ head/www/ufdbguard/Makefile Tue Mar 28 07:22:10 2017 (r437096) @@ -2,9 +2,9 @@ # $FreeBSD$ PORTNAME= ufdbGuard -PORTVERSION= 1.32.4 +PORTVERSION= 1.33.1 CATEGORIES= www -MASTER_SITES= SF/ufdbguard/1.32 +MASTER_SITES= SF/ufdbguard/1.33 MAINTAINER= timp87@gmail.com COMMENT= URL filter for the Squid web proxy @@ -64,6 +64,16 @@ UNIXSOCKETS_CONFIGURE_OFF= --without-uni UNIXSOCKETS_DESC= Unix sockets support +.include <bsd.port.pre.mk> + +.if ${SSL_DEFAULT:Mopenssl-devel} +BROKEN= Does not build with openssl-devel +.endif + +.if ${SSL_DEFAULT:Mlibressl-devel} +BROKEN= Does not build with libressl-devel +.endif + post-install: @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/ufdbguardd \ ${STAGEDIR}${PREFIX}/bin/ufdbgclient \ @@ -72,4 +82,4 @@ post-install: ${STAGEDIR}${PREFIX}/bin/ufdbAnalyse \ ${STAGEDIR}${PREFIX}/bin/ufdbhttpd -.include <bsd.port.mk> +.include <bsd.port.post.mk> Modified: head/www/ufdbguard/distinfo ============================================================================== --- head/www/ufdbguard/distinfo Tue Mar 28 05:30:50 2017 (r437095) +++ head/www/ufdbguard/distinfo Tue Mar 28 07:22:10 2017 (r437096) @@ -1,3 +1,3 @@ TIMESTAMP = 1480157749 -SHA256 (ufdbGuard-1.32.4.tar.gz) = 037d2652087a544e4bfa10fefcb9e155e730536baf39331b3e9dca26c605e3df -SIZE (ufdbGuard-1.32.4.tar.gz) = 2499206 +SHA256 (ufdbGuard-1.33.1.tar.gz) = f927410049e0ba8d1757daf3de67bb1bb1bf1e5caa1d51f19ed052b52f135a92 +SIZE (ufdbGuard-1.33.1.tar.gz) = 2481303 Modified: head/www/ufdbguard/files/patch-src_Makefile.in ============================================================================== --- head/www/ufdbguard/files/patch-src_Makefile.in Tue Mar 28 05:30:50 2017 (r437095) +++ head/www/ufdbguard/files/patch-src_Makefile.in Tue Mar 28 07:22:10 2017 (r437096) @@ -1,4 +1,4 @@ ---- src/Makefile.in.orig 2016-10-19 19:37:29 UTC +--- src/Makefile.in.orig 2017-03-14 18:52:13 UTC +++ src/Makefile.in @@ -224,7 +224,7 @@ install.bin: ufdbGenTable ufdbAnalyse uf $(INSTALL_PROGRAM) ufdb_top_urls.pl $(DESTDIR)$(bindir)/ufdb_top_urls Modified: head/www/ufdbguard/files/patch-src_check__config__file ============================================================================== --- head/www/ufdbguard/files/patch-src_check__config__file Tue Mar 28 05:30:50 2017 (r437095) +++ head/www/ufdbguard/files/patch-src_check__config__file Tue Mar 28 07:22:10 2017 (r437096) @@ -1,15 +1,15 @@ ---- src/check_config_file.orig 2015-06-09 01:03:32 UTC +--- src/check_config_file.orig 2017-03-01 14:25:22 UTC +++ src/check_config_file @@ -32,16 +32,6 @@ then exit 1 fi --if [ ! -f $CONFIG.pre-v1.32 ] +-if [ ! -f $CONFIG.pre-v1.33 ] -then -- cp $CONFIG $CONFIG.pre-v1.32 -- if [ ! -f $CONFIG.pre-v1.32 ] +- cp $CONFIG $CONFIG.pre-v1.33 +- if [ ! -f $CONFIG.pre-v1.33 ] - then -- echo "cannot copy configuration file to $CONFIG.pre-v1.32" +- echo "cannot copy configuration file to $CONFIG.pre-v1.33" - exit 1 - fi -fi @@ -17,11 +17,11 @@ if [ ! -w $CONFIG ] then chmod u+w $CONFIG -@@ -340,7 +330,6 @@ then +@@ -496,7 +486,6 @@ then echo "It is recommended to verify all ACLs for the inclusion of these URL categories ******" fi --echo "The original configuration file is saved in $CONFIG.pre-v1.32" +-echo "The original configuration file is saved in $CONFIG.pre-v1.33" echo exit 0 Modified: head/www/ufdbguard/files/patch-src_install__etcfiles.sh.in ============================================================================== --- head/www/ufdbguard/files/patch-src_install__etcfiles.sh.in Tue Mar 28 05:30:50 2017 (r437095) +++ head/www/ufdbguard/files/patch-src_install__etcfiles.sh.in Tue Mar 28 07:22:10 2017 (r437096) @@ -1,4 +1,4 @@ ---- src/install_etcfiles.sh.in.orig 2016-08-02 02:36:07 UTC +--- src/install_etcfiles.sh.in.orig 2017-02-27 13:27:26 UTC +++ src/install_etcfiles.sh.in @@ -25,15 +25,6 @@ then DESTDIR=${RPM_BUILD_ROOT:-} @@ -29,18 +29,20 @@ esac -@@ -395,14 +384,3 @@ fi +@@ -395,16 +384,3 @@ fi # TODO: copy parameters from ufdbUpdate to $SYSCFGFILE ************************************************************ fix_piddir_permissions - --SERVICE=`grep -E -e ufdbguardd /etc/services` --if [ "$SERVICE" = "" ] --then -- ( -- echo "" -- echo "# for URLfilterDB daemon : " -- echo "ufdbguardd 3977/tcp" -- ) >> /etc/services --fi +-# the addition of the ufdbguardd service to /etc/services is deiabled since +-# ufdbguardd uses by default a named socket. +-# SERVICE=`grep -E -e ufdbguardd $DESTDIR/etc/services` +-# if [ "$SERVICE" = "" ] +-# then +-# ( +-# echo "" +-# echo "# for URLfilterDB daemon : " +-# echo "ufdbguardd 3977/tcp" +-# ) >> $DESTDIR/etc/services +-# fi - Added: head/www/ufdbguard/files/patch-src_sg.h.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/ufdbguard/files/patch-src_sg.h.in Tue Mar 28 07:22:10 2017 (r437096) @@ -0,0 +1,11 @@ +--- src/sg.h.in.orig 2017-03-26 18:55:50 UTC ++++ src/sg.h.in +@@ -56,6 +56,8 @@ extern "C" { + + #define YY_NEVER_INTERACTIVE 1 + ++#include <netinet/in.h> ++#include <sys/socket.h> + #include <stdio.h> + #include <unistd.h> + #include <stdlib.h> Modified: head/www/ufdbguard/files/patch-src_ufdbGuard.conf.in ============================================================================== --- head/www/ufdbguard/files/patch-src_ufdbGuard.conf.in Tue Mar 28 05:30:50 2017 (r437095) +++ head/www/ufdbguard/files/patch-src_ufdbGuard.conf.in Tue Mar 28 07:22:10 2017 (r437096) @@ -1,4 +1,4 @@ ---- src/ufdbGuard.conf.in.orig 2016-10-16 22:05:14 UTC +--- src/ufdbGuard.conf.in.orig 2017-03-08 20:47:38 UTC +++ src/ufdbGuard.conf.in @@ -33,7 +33,7 @@ logall off # valid version numbers are: 2.6, 2.7, 3.0, 3.1, 3.2, 3.3, 3.4, 3.5 and 4.0
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201703280722.v2S7MAFw038028>