From 86bc5ea5bc7864870f36ca070789540a09db4971 Mon Sep 17 00:00:00 2001 From: DPorts Builder Date: Sat, 6 May 2017 23:08:24 -0700 Subject: [PATCH] Update www/ufdbguard to version 1.33.1 --- www/ufdbguard/Makefile | 16 ++++++++++--- www/ufdbguard/distinfo | 4 ++-- .../dragonfly/patch-src_mtserver_Makefile.in | 13 ---------- www/ufdbguard/files/patch-src_Makefile.in | 2 +- .../files/patch-src_check__config__file | 14 +++++------ .../files/patch-src_install__etcfiles.sh.in | 24 ++++++++++--------- www/ufdbguard/files/patch-src_sg.h.in | 11 +++++++++ .../files/patch-src_ufdbGuard.conf.in | 2 +- 8 files changed, 48 insertions(+), 38 deletions(-) delete mode 100644 www/ufdbguard/dragonfly/patch-src_mtserver_Makefile.in create mode 100644 www/ufdbguard/files/patch-src_sg.h.in diff --git a/www/ufdbguard/Makefile b/www/ufdbguard/Makefile index d8853126b6e..21397769ecf 100644 --- a/www/ufdbguard/Makefile +++ b/www/ufdbguard/Makefile @@ -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-unix-sockets UNIXSOCKETS_DESC= Unix sockets support +.include + +.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 +.include diff --git a/www/ufdbguard/distinfo b/www/ufdbguard/distinfo index 693c6a3f56c..1a71a107072 100644 --- a/www/ufdbguard/distinfo +++ b/www/ufdbguard/distinfo @@ -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 diff --git a/www/ufdbguard/dragonfly/patch-src_mtserver_Makefile.in b/www/ufdbguard/dragonfly/patch-src_mtserver_Makefile.in deleted file mode 100644 index cf993a6ceec..00000000000 --- a/www/ufdbguard/dragonfly/patch-src_mtserver_Makefile.in +++ /dev/null @@ -1,13 +0,0 @@ -Strange one.. - ---- src/mtserver/Makefile.in.orig 2016-10-19 22:37:29.000000000 +0300 -+++ src/mtserver/Makefile.in -@@ -70,7 +70,7 @@ $(MYLIB): ../crypt.o ../lex.yy.o ../sgDi - ../ufdbglobals.o ../ufdbHostnames.o - -@rm -f $(MYLIB) - ar rc $(MYLIB) ../crypt.o ../lex.yy.o ../sgDiv.o ../sgLog.o ../ufdbLogConfig.o ../ufdbLookup.o \ -- ../ufdblib.o ../ufdbdb.o ../ufdbUserlist.o ../y.tab.o ../ufdbbase.o ../engine.o \ -+ ../ufdblib.o ../ufdbdb.o ../ufdbUserlist.o ../y.tab.o ../ufdbbase.o engine.o \ - ../ufdbglobals.o ../ufdbHostnames.o - - ptmalloc3/libptmalloc3.a: diff --git a/www/ufdbguard/files/patch-src_Makefile.in b/www/ufdbguard/files/patch-src_Makefile.in index aa518f6dc68..9bc38072519 100644 --- a/www/ufdbguard/files/patch-src_Makefile.in +++ b/www/ufdbguard/files/patch-src_Makefile.in @@ -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 diff --git a/www/ufdbguard/files/patch-src_check__config__file b/www/ufdbguard/files/patch-src_check__config__file index e2bbb3110dd..fbe412e0049 100644 --- a/www/ufdbguard/files/patch-src_check__config__file +++ b/www/ufdbguard/files/patch-src_check__config__file @@ -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 diff --git a/www/ufdbguard/files/patch-src_install__etcfiles.sh.in b/www/ufdbguard/files/patch-src_install__etcfiles.sh.in index f2ca4c68e16..13afd97bcd9 100644 --- a/www/ufdbguard/files/patch-src_install__etcfiles.sh.in +++ b/www/ufdbguard/files/patch-src_install__etcfiles.sh.in @@ -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 - diff --git a/www/ufdbguard/files/patch-src_sg.h.in b/www/ufdbguard/files/patch-src_sg.h.in new file mode 100644 index 00000000000..5e9b09db625 --- /dev/null +++ b/www/ufdbguard/files/patch-src_sg.h.in @@ -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 ++#include + #include + #include + #include diff --git a/www/ufdbguard/files/patch-src_ufdbGuard.conf.in b/www/ufdbguard/files/patch-src_ufdbGuard.conf.in index a09beb6449f..dd471e1c2f9 100644 --- a/www/ufdbguard/files/patch-src_ufdbGuard.conf.in +++ b/www/ufdbguard/files/patch-src_ufdbGuard.conf.in @@ -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 -- 2.41.0